Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2004-12-28 22:32:08 UTC
Modified files:
ircd/match.c ircd/ircd.c ircd/gline.c
Log message:
Eliminate use of TRUE and FALSE and functions from <arpa/inet.h>.
---------------------- diff included ----------------------
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.55 ircu2.10/ircd/gline.c:1.56
--- ircu2.10/ircd/gline.c:1.55 Fri Dec 10 21:13:44 2004
+++ ircu2.10/ircd/gline.c Tue Dec 28 14:31:58 2004
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.55 2004/12/11 05:13:44 klmitch Exp $
+ * @version $Id: gline.c,v 1.56 2004/12/28 22:31:58 entrope Exp $
*/
#include "config.h"
@@ -43,14 +43,12 @@
#include "msg.h"
#include "numnicks.h"
#include "numeric.h"
-#include "sys.h" /* FALSE bleah */
#include "whocmds.h"
/* #include <assert.h> -- Now using assert in ircd_log.h */
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
-#include <arpa/inet.h> /* for inet_ntoa */
#define CHECK_APPROVED 0 /**< Mask is acceptable */
#define CHECK_OVERRIDABLE 1 /**< Mask is acceptable, but not by default */
@@ -244,7 +242,7 @@
/* let the ops know about it */
sendto_opmask_butone(0, SNO_GLINE, "G-line active for %s",
- get_client_name(acptr, TRUE));
+ get_client_name(acptr, SHOW_IP));
/* and get rid of him */
if ((tval = exit_client_msg(cptr, acptr, &me, "G-lined (%s)",
Index: ircu2.10/ircd/ircd.c
diff -u ircu2.10/ircd/ircd.c:1.76 ircu2.10/ircd/ircd.c:1.77
--- ircu2.10/ircd/ircd.c:1.76 Fri Dec 10 21:13:44 2004
+++ ircu2.10/ircd/ircd.c Tue Dec 28 14:31:58 2004
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Entry point and other initialization functions for the daemon.
- * @version $Id: ircd.c,v 1.76 2004/12/11 05:13:44 klmitch Exp $
+ * @version $Id: ircd.c,v 1.77 2004/12/28 22:31:58 entrope Exp $
*/
#include "config.h"
@@ -244,79 +244,61 @@
*/
static void try_connections(struct Event* ev) {
struct ConfItem* aconf;
- struct Client* cptr;
struct ConfItem** pconf;
- int connecting;
- int confrq;
time_t next = 0;
struct ConnectionClass* cltmp;
- struct ConfItem* con_conf = 0;
struct Jupe* ajupe;
- const char* con_class = NULL;
assert(ET_EXPIRE == ev_type(ev));
assert(0 != ev_timer(ev));
- connecting = FALSE;
Debug((DEBUG_NOTICE, "Connection check at : %s", myctime(CurrentTime)));
for (aconf = GlobalConfList; aconf; aconf = aconf->next) {
- /* Also when already connecting! (update holdtimes) --SRB */
- if (!(aconf->status & CONF_SERVER) || aconf->address.port == 0 ||
aconf->hold == 0)
- continue;
-
- /* Also skip juped servers */
- if ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe))
+ /* Only consider server items with non-zero port and non-zero
+ * connect times that are not actively juped.
+ */
+ if (!(aconf->status & CONF_SERVER)
+ || aconf->address.port == 0
+ || aconf->hold == 0
+ || ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe)))
continue;
- /* Skip this entry if the use of it is still on hold until
- * future. Otherwise handle this entry (and set it on hold until next
- * time). Will reset only hold times, if already made one successfull
- * connection... [this algorithm is a bit fuzzy... -- msa >;) ]
+ /* Update next possible connection check time. */
+ if (next > aconf->hold || next == 0)
+ next = aconf->hold;
+
+ /* Skip this entry if its use is still on hold until future, too
+ * many links in its connection class, it is already linked, or if
+ * connect rules forbid a link now.
*/
- if (aconf->hold > CurrentTime && (next > aconf->hold || next == 0)) {
- next = aconf->hold;
+ cltmp = aconf->conn_class;
+ if ((aconf->hold > CurrentTime)
+ || (Links(cltmp) >= MaxLinks(cltmp))
+ || FindServer(aconf->name)
+ || conf_eval_crule(aconf->name, CRULE_MASK))
continue;
- }
- cltmp = aconf->conn_class;
- confrq = get_con_freq(cltmp);
- if(confrq == 0)
- aconf->hold = next = 0;
- else
- aconf->hold = CurrentTime + confrq;
+ /* We want to connect; update entry's hold time. */
+ aconf->hold = ConFreq(cltmp) ? CurrentTime + ConFreq(cltmp) : 0;
- /* Found a CONNECT config with port specified, scan clients and see if
- * this server is already connected?
- */
- cptr = FindServer(aconf->name);
-
- if (!cptr && (Links(cltmp) < MaxLinks(cltmp)) &&
- (!connecting /*|| (ConClass(cltmp) > con_class)*/)) {
- /*
- * Check connect rules to see if we're allowed to try
- */
- if (0 == conf_eval_crule(aconf->name, CRULE_MASK)) {
- con_class = ConClass(cltmp);
- con_conf = aconf;
- /* We connect only one at time... */
- connecting = TRUE;
- }
- }
- if ((next > aconf->hold) || (next == 0))
- next = aconf->hold;
- }
- if (connecting) {
- if (con_conf->next) { /* are we already last? */
- /* Put the current one at the end and make sure we try all connections */
- for (pconf = &GlobalConfList; (aconf = *pconf); pconf = &(aconf->next))
- if (aconf == con_conf)
+ /* Ensure it is at the end of the list for future checks. */
+ if (aconf->next) {
+ /* Find aconf's location in the list and splice it out. */
+ for (pconf = &GlobalConfList; *pconf; pconf = &(*pconf)->next)
+ if (*pconf == aconf)
*pconf = aconf->next;
- (*pconf = con_conf)->next = 0;
+ /* Reinsert it at the end of the list (where pconf is now). */
+ *pconf = aconf;
+ aconf->next = 0;
}
- if (connect_server(con_conf, 0))
+ /* Activate the connection itself. */
+ if (connect_server(aconf, 0))
sendto_opmask_butone(0, SNO_OLDSNO, "Connection to %s activated.",
- con_conf->name);
+ aconf->name);
+
+ /* And stop looking for further candidates. */
+ break;
}
if (next == 0)
Index: ircu2.10/ircd/match.c
diff -u ircu2.10/ircd/match.c:1.11 ircu2.10/ircd/match.c:1.12
--- ircu2.10/ircd/match.c:1.11 Sat Oct 16 18:58:17 2004
+++ ircu2.10/ircd/match.c Tue Dec 28 14:31:57 2004
@@ -18,7 +18,7 @@
*/
/** @file
* @brief Functions to match strings against IRC mask strings.
- * @version $Id: match.c,v 1.11 2004/10/17 01:58:17 entrope Exp $
+ * @version $Id: match.c,v 1.12 2004/12/28 22:31:57 entrope Exp $
*/
#include "config.h"
@@ -847,7 +847,6 @@
#include <string.h>
#include <sys/socket.h>
#include <netinet/in.h>
-#include <arpa/inet.h>
/** Parse an input string as an IPv4 address.
* @param[in] in Text form of address.
@@ -857,15 +856,13 @@
static int ipmask_parse_ipv4(const char *in, struct in_addr *out)
{
int class;
- char ipname[16];
int ad[4] = { 0 };
int bits = 0;
class = sscanf(in, "%d.%d.%d.%d/%d", &ad[0], &ad[1], &ad[2], &ad[3], &bits);
if (class != 5)
bits = class * 8;
- ircd_snprintf(0, ipname, sizeof(ipname), "%d.%d.%d.%d", ad[0], ad[1], ad[2],
ad[3]);
- out->s_addr = inet_addr(ipname);
+ out->s_addr = ntohl((ad[0] << 24) | (ad[1] << 16) | (ad[2] << 8) | ad[3]);
return bits;
}
----------------------- End of diff -----------------------
