X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fircd.c;h=6d59e35f1fc42fac0553b2d7afe120c58af762a8;hb=refs%2Fheads%2Fupstream;hp=175f1e8e50c06d06ce26863f3182a76c33ecb257;hpb=fc21303989a07d6091ef684150db29c49f682614;p=ircu2.10.12-pk.git diff --git a/ircd/ircd.c b/ircd/ircd.c index 175f1e8..6d59e35 100644 --- a/ircd/ircd.c +++ b/ircd/ircd.c @@ -69,6 +69,10 @@ #include #include #include +#include +#ifdef HAVE_SYS_RESOURCE_H +#include +#endif #include #include #include @@ -108,6 +112,7 @@ char *configfile = CPATH; /**< Server configuration file */ int debuglevel = -1; /**< Server debug level */ char *debugmode = ""; /**< Server debug level */ static char *dpath = DPATH; /**< Working directory for daemon */ +static char *dbg_client; /**< Client specifier for chkconf */ static struct Timer connect_timer; /**< timer structure for try_connections() */ static struct Timer ping_timer; /**< timer structure for check_pings() */ @@ -143,7 +148,7 @@ void server_die(const char *message) */ void server_panic(const char *message) { - /* inhibit sending server notice--we may be panicing due to low memory */ + /* inhibit sending server notice--we may be panicking due to low memory */ log_write(LS_SYSTEM, L_CRIT, LOG_NOSNOTICE, "Server panic: %s", message); flush_connections(0); log_close(); @@ -175,6 +180,8 @@ void server_restart(const char *message) close_connections(!(thisServer.bootopt & (BOOT_TTY | BOOT_DEBUG | BOOT_CHKCONF))); + reap_children(); + execv(SPATH, thisServer.argv); /* Have to reopen since it has been closed above */ @@ -244,86 +251,68 @@ static int check_pid(void) */ 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; + time_t next; struct Jupe* ajupe; - const char* con_class = NULL; + int hold; + int done; 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; + next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY); + done = 0; - /* Also skip juped servers */ - if ((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 >;) ] + for (aconf = GlobalConfList; aconf; aconf = aconf->next) { + /* Only consider server items with non-zero port and non-zero + * connect times that are not actively juped. */ - if (aconf->hold > CurrentTime && (next > aconf->hold || next == 0)) { - next = aconf->hold; + if (!(aconf->status & CONF_SERVER) + || aconf->address.port == 0 + || !(aconf->flags & CONF_AUTOCONNECT) + || ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe))) continue; - } - cltmp = aconf->conn_class; - confrq = get_con_freq(cltmp); - if(confrq == 0) - aconf->hold = next = 0; - else - aconf->hold = CurrentTime + confrq; + /* Do we need to postpone this connection further? */ + hold = aconf->hold > CurrentTime; + + /* Update next possible connection check time. */ + if (hold && next > aconf->hold) + next = aconf->hold; - /* Found a CONNECT config with port specified, scan clients and see if - * this server is already connected? + /* Do not try to connect if its use is still on hold until future, + * we have already initiated a connection this try_connections(), + * too many links in its connection class, it is already linked, + * or if connect rules forbid a link now. */ - cptr = FindServer(aconf->name); + if (hold || done + || (ConfLinks(aconf) > ConfMaxLinks(aconf)) + || FindServer(aconf->name) + || conf_eval_crule(aconf->name, CRULE_MASK)) + continue; - 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); - if (next == 0) - next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY); + /* And stop looking for further candidates. */ + done = 1; + } Debug((DEBUG_NOTICE, "Next connection check : %s", myctime(next))); - timer_add(&connect_timer, try_connections, 0, TT_ABSOLUTE, next); } @@ -359,18 +348,59 @@ static void check_pings(struct Event* ev) { continue; } - max_ping = IsRegistered(cptr) ? client_get_ping(cptr) : - feature_int(FEAT_CONNECTTIMEOUT); - - Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s limit: %d current: %d", + Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s current: %d", cli_name(cptr), IsPingSent(cptr) ? "[Ping Sent]" : "[]", - max_ping, (int)(CurrentTime - cli_lasttime(cptr)))); + (int)(CurrentTime - cli_lasttime(cptr)))); + + /* Unregistered clients pingout after max_ping seconds, they don't + * get given a second chance - if they were then people could not quite + * finish registration and hold resources without being subject to k/g + * lines + */ + if (!IsRegistered(cptr)) { + assert(!IsServer(cptr)); + max_ping = feature_int(FEAT_CONNECTTIMEOUT); + /* If client authorization time has expired, ask auth whether they + * should be checked again later. */ + if ((CurrentTime-cli_firsttime(cptr) >= max_ping) + && auth_ping_timeout(cptr)) + continue; + if (!IsRegistered(cptr)) { + /* OK, they still have enough time left, so we'll just skip to the + * next client. Set the next check to be when their time is up, if + * that's before the currently scheduled next check -- hikari */ + expire = cli_firsttime(cptr) + max_ping; + if (expire < next_check) + next_check = expire; + continue; + } + } + + max_ping = client_get_ping(cptr); + + /* If it's a server and we have not sent an AsLL lately, do so. */ + if (IsServer(cptr)) { + if (CurrentTime - cli_serv(cptr)->asll_last >= max_ping) { + char *asll_ts; + + SetPingSent(cptr); + cli_serv(cptr)->asll_last = CurrentTime; + expire = cli_serv(cptr)->asll_last + max_ping; + asll_ts = militime_float(NULL); + sendcmdto_prio_one(&me, CMD_PING, cptr, "!%s %s %s", asll_ts, + cli_name(cptr), asll_ts); + } + + expire = cli_serv(cptr)->asll_last + max_ping; + if (expire < next_check) + next_check = expire; + } /* Ok, the thing that will happen most frequently, is that someone will * have sent something recently. Cover this first for speed. * -- - * If it's an unregisterd client and hasn't managed to register within + * If it's an unregistered client and hasn't managed to register within * max_ping then it's obviously having problems (broken client) or it's * just up to no good, so we won't skip it, even if its been sending * data to us. @@ -383,37 +413,6 @@ static void check_pings(struct Event* ev) { continue; } - /* Unregistered clients pingout after max_ping seconds, they don't - * get given a second chance - if they were then people could not quite - * finish registration and hold resources without being subject to k/g - * lines - */ - if (!IsRegistered(cptr)) { - assert(!IsServer(cptr)); - if ((CurrentTime-cli_firsttime(cptr) >= max_ping)) { - /* Display message if they have sent a NICK and a USER but no - * nospoof PONG. - */ - if (*(cli_name(cptr)) && cli_user(cptr) && *(cli_user(cptr))->username) { - send_reply(cptr, SND_EXPLICIT | ERR_BADPING, - ":Your client may not be compatible with this server."); - send_reply(cptr, SND_EXPLICIT | ERR_BADPING, - ":Compatible clients are available at %s", - feature_str(FEAT_URL_CLIENTS)); - } - exit_client_msg(cptr,cptr,&me, "Registration Timeout"); - continue; - } else { - /* OK, they still have enough time left, so we'll just skip to the - * next client. Set the next check to be when their time is up, if - * that's before the currently scheduled next check -- hikari */ - expire = cli_firsttime(cptr) + max_ping; - if (expire < next_check) - next_check = expire; - continue; - } - } - /* Quit the client after max_ping*2 - they should have answered by now */ if (CurrentTime-cli_lasttime(cptr) >= (max_ping*2) ) { @@ -428,7 +427,7 @@ static void check_pings(struct Event* ev) { if (!IsPingSent(cptr)) { - /* If we havent PINGed the connection and we havent heard from it in a + /* If we haven't PINGed the connection and we haven't heard from it in a * while, PING it to make sure it is still alive. */ SetPingSent(cptr); @@ -439,11 +438,7 @@ static void check_pings(struct Event* ev) { if (IsUser(cptr)) sendrawto_one(cptr, MSG_PING " :%s", cli_name(&me)); else - { - char *asll_ts = militime_float(NULL); - sendcmdto_one(&me, CMD_PING, cptr, "!%s %s %s", asll_ts, - cli_name(cptr), asll_ts); - } + sendcmdto_prio_one(&me, CMD_PING, cptr, ":%s", cli_name(&me)); } expire = cli_lasttime(cptr) + max_ping * 2; @@ -468,18 +463,19 @@ static void check_pings(struct Event* ev) { * @param[in,out] argv Command-lne arguments. */ static void parse_command_line(int argc, char** argv) { - const char *options = "d:f:h:nktvx:"; + const char *options = "d:f:h:nktvx:c:"; int opt; if (thisServer.euid != thisServer.uid) setuid(thisServer.uid); - /* Do we really need to santiy check the non-NULLness of optarg? That's + /* Do we really need to sanity check the non-NULLness of optarg? That's * getopt()'s job... Removing those... -zs */ while ((opt = getopt(argc, argv, options)) != EOF) switch (opt) { - case 'k': thisServer.bootopt |= BOOT_CHKCONF; break; + case 'k': thisServer.bootopt |= BOOT_CHKCONF | BOOT_TTY; break; + case 'c': dbg_client = optarg; break; case 'n': case 't': thisServer.bootopt |= BOOT_TTY; break; case 'd': dpath = optarg; break; @@ -494,6 +490,9 @@ static void parse_command_line(int argc, char** argv) { #ifdef USE_DEVPOLL printf("/dev/poll "); #endif +#ifdef USE_EPOLL + printf("epoll_*() "); +#endif #ifdef USE_POLL printf("poll()"); #else @@ -504,19 +503,29 @@ static void parse_command_line(int argc, char** argv) { exit(0); break; - + case 'x': debuglevel = atoi(optarg); if (debuglevel < 0) debuglevel = 0; debugmode = optarg; thisServer.bootopt |= BOOT_DEBUG; +#ifndef DEBUGMODE + printf("WARNING: DEBUGMODE disabled; -x has no effect.\n"); +#endif break; - + default: - printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntvk]\n"); - printf("\n -n -t\t Don't detach\n -v\t display version\n -k\t exit after checking config\n\n"); - printf("Server not started.\n"); + printf("Usage: ircd [-f config] [-h servername] [-x loglevel] [-ntv] [-k [-c clispec]]\n" + "\n -f config\t specify explicit configuration file" + "\n -x loglevel\t set debug logging verbosity" + "\n -n or -t\t don't detach" + "\n -v\t\t display version" + "\n -k\t\t exit after checking config" + "\n -c clispec\t search for client/kill blocks matching client" + "\n\t\t clispec is comma-separated list of user@host," + "\n\t\t user@ip, $Rrealname, and port number" + "\n\nServer not started.\n"); exit(1); } } @@ -654,6 +663,28 @@ int main(int argc, char **argv) { close_connections(!(thisServer.bootopt & (BOOT_DEBUG | BOOT_TTY | BOOT_CHKCONF))); + /* daemon_init() must be before event_init() because kqueue() FDs + * are, perversely, not inherited across fork(). + */ + daemon_init(thisServer.bootopt & BOOT_TTY); + +#ifdef DEBUGMODE + /* Must reserve fd 2... */ + if (debuglevel >= 0 && !(thisServer.bootopt & BOOT_TTY)) { + int fd; + if ((fd = open("/dev/null", O_WRONLY)) < 0) { + fprintf(stderr, "Unable to open /dev/null (to reserve fd 2): %s\n", + strerror(errno)); + return 8; + } + if (fd != 2 && dup2(fd, 2) < 0) { + fprintf(stderr, "Unable to reserve fd 2; dup2 said: %s\n", + strerror(errno)); + return 8; + } + } +#endif + event_init(MAXCONNECTIONS); setup_signals(); @@ -661,11 +692,6 @@ int main(int argc, char **argv) { log_init(*argv); set_nomem_handler(outofmemory); - if (!init_string()) { - log_write(LS_SYSTEM, L_CRIT, 0, "Failed to initialize string module"); - return 6; - } - initload(); init_list(); init_hash(); @@ -687,12 +713,13 @@ int main(int argc, char **argv) { } if (thisServer.bootopt & BOOT_CHKCONF) { + if (dbg_client) + conf_debug_iline(dbg_client); fprintf(stderr, "Configuration file %s checked okay.\n", configfile); return 0; } debug_init(thisServer.bootopt & BOOT_TTY); - daemon_init(thisServer.bootopt & BOOT_TTY); if (check_pid()) { Debug((DEBUG_FATAL, "Failed to acquire PID file lock after fork")); exit(2); @@ -727,6 +754,7 @@ int main(int argc, char **argv) { cli_lasttime(&me) = cli_since(&me) = cli_firsttime(&me) = CurrentTime; hAddClient(&me); + SetIPv6(&me); write_pidfile(); init_counters();