X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fircd.c;h=6d59e35f1fc42fac0553b2d7afe120c58af762a8;hb=refs%2Fheads%2Fupstream;hp=2c0046fecb9ac39193d6e568a60f2a22ab4670c3;hpb=09af095aabc97e3a2d3ae6469e1c3d9dd9bf493c;p=ircu2.10.12-pk.git

diff --git a/ircd/ircd.c b/ircd/ircd.c
index 2c0046f..6d59e35 100644
--- a/ircd/ircd.c
+++ b/ircd/ircd.c
@@ -348,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.
@@ -372,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,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;
@@ -504,6 +510,9 @@ 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:
@@ -745,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();