X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fircd.c;h=6d59e35f1fc42fac0553b2d7afe120c58af762a8;hb=refs%2Fheads%2Fupstream;hp=aee6c7aee3562181169888860438cb749310f2a8;hpb=a8aaf2a7fbfbff14f3d8cd869fcca8b9c9c459cf;p=ircu2.10.12-pk.git diff --git a/ircd/ircd.c b/ircd/ircd.c index aee6c7a..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 @@ -176,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 */ @@ -246,39 +252,42 @@ static int check_pid(void) static void try_connections(struct Event* ev) { struct ConfItem* aconf; struct ConfItem** pconf; - time_t next = 0; - struct ConnectionClass* cltmp; + time_t next; struct Jupe* ajupe; - int hold; + int hold; + int done; assert(ET_EXPIRE == ev_type(ev)); assert(0 != ev_timer(ev)); Debug((DEBUG_NOTICE, "Connection check at : %s", myctime(CurrentTime))); + next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY); + done = 0; + 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->status & CONF_SERVER) || aconf->address.port == 0 + || !(aconf->flags & CONF_AUTOCONNECT) || ((ajupe = jupe_find(aconf->name)) && JupeIsActive(ajupe))) continue; + /* Do we need to postpone this connection further? */ + hold = aconf->hold > CurrentTime; + /* Update next possible connection check time. */ - if (next > aconf->hold || next == 0) + if (hold && next > aconf->hold) next = aconf->hold; - /* Update the next time we can consider this entry. */ - cltmp = aconf->conn_class; - hold = aconf->hold > CurrentTime; /* before we update aconf->hold */ - aconf->hold = ConFreq(cltmp) ? CurrentTime + ConFreq(cltmp) : 0; - /* 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. */ - if (hold - || (Links(cltmp) > MaxLinks(cltmp)) + if (hold || done + || (ConfLinks(aconf) > ConfMaxLinks(aconf)) || FindServer(aconf->name) || conf_eval_crule(aconf->name, CRULE_MASK)) continue; @@ -300,14 +309,10 @@ static void try_connections(struct Event* ev) { aconf->name); /* And stop looking for further candidates. */ - break; + done = 1; } - if (next == 0) - next = CurrentTime + feature_int(FEAT_CONNECTFREQUENCY); - Debug((DEBUG_NOTICE, "Next connection check : %s", myctime(next))); - timer_add(&connect_timer, try_connections, 0, TT_ABSOLUTE, next); } @@ -343,13 +348,54 @@ 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. @@ -367,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) ) { @@ -423,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; @@ -479,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 @@ -496,12 +510,22 @@ static void parse_command_line(int argc, char** argv) { 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); } } @@ -644,6 +668,23 @@ int main(int argc, char **argv) { */ 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(); @@ -651,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(); @@ -718,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();