Changeset 831 for branches/ithildin-1.1

Timestamp:

02/09/09 00:42:56 (3 years ago)

Author:

wd

Message:

Clean up unknown client counting (hopefully fixed) and add some helper
functions for protocol transition.

Location:

branches/ithildin-1.1

Files:

• modules/ircd/client.c (modified) (13 diffs)
• modules/ircd/client.h (modified) (1 diff)
• modules/ircd/commands/protocol.c (modified) (1 diff)
• modules/ircd/commands/server.c (modified) (1 diff)
• modules/ircd/connection.c (modified) (3 diffs)
• modules/ircd/connection.h (modified) (1 diff)
• modules/ircd/doc/conf.txt (modified) (1 diff)
• modules/ircd/server.c (modified) (1 diff)
• source/conf.c (modified) (2 diffs)

branches/ithildin-1.1/modules/ircd/client.c

@@ -29 +29 @@
     cp->mdext = mdext_alloc(ircd.mdext.client);
 
+    /* all new clients are set unknown even if they're remote (this will get
+     * handled in register_client so it shouldn't be a big deal */
+    cp->flags |= IRCD_CLIENT_UNKNOWN;
+    ircd.stats.serv.unkclients++;
+
     if (conn != NULL) {
         conn->cli = cp;
@@ -34 +39 @@
         get_socket_address(isock_raddr(conn->sock), cp->ip, IPADDR_MAXLEN + 1,
                 NULL);
-        ircd.stats.serv.unkclients++;
     } else
         cp->pset = LIST_FIRST(ircd.privileges.sets);
@@ -49 +53 @@
     unsigned char *s;
 
-    if (cli->flags & IRCD_CLIENT_HISTORY) {
+    if (CLIENT_HISTORY(cli)) {
         /* just return the memory */
         mdext_free(ircd.mdext.client, cli->mdext);
@@ -110 +114 @@
         hash_delete(ircd.hashes.client, cli);
 
+    if (CLIENT_UNKNOWN(cli))
+        ircd.stats.serv.unkclients--;
+
     if (cli->conn != NULL) { /* dump it if it's ours */
-        if (!CLIENT_REGISTERED(cli))
-            ircd.stats.serv.unkclients--;
         cli->conn->cli = NULL;
 
@@ -126 +131 @@
     LIST_REMOVE(cli, lp);
 
-    if (!CLIENT_REGISTERED(cli)) {
+    if (!CLIENT_HISTORY(cli)) {
         /* if the client was registered then we need to preserve their client
          * entry for the history list */
@@ -189 +194 @@
             returns = hook_event(ircd.events.stage3_connect, cp);
             while (x < hook_num_returns) {
-                if (returns[x] != NULL) {/* denied, with a reason */
+                if (returns[x] != NULL) { /* denied, with a reason */
                     destroy_client(cli, (char *)returns[x]);
-                        return IRCD_CONNECTION_CLOSED; /* not successful */
+                    return IRCD_CONNECTION_CLOSED; /* not successful */
                 }
                 x++;
@@ -199 +204 @@
             LIST_REMOVE(cp, lp);
             LIST_INSERT_HEAD(ircd.connections.clients, cp, lp);
-            ircd.stats.serv.unkclients--;
-
         }
 
@@ -220 +223 @@
 
         /* accounting stuff */
+        if (CLIENT_UNKNOWN(cli))
+        {
+            cli->flags &= ~IRCD_CLIENT_UNKNOWN;
+            ircd.stats.serv.unkclients--;
+        }
         ircd.stats.serv.curclients++;
         if (ircd.stats.serv.maxclients < ircd.stats.serv.curclients)
@@ -541 +549 @@
          * overwrite old entries (maybe).  if the client table is larger
          * than the history table then we also let the history table grow,
-         * but if the two are * the same size we need to pop the oldest
+         * but if the two are the same size we need to pop the oldest
          * entry off. */
 
@@ -548 +556 @@
     }
 
-        chp = calloc(1, sizeof(struct client_history));
+    chp = calloc(1, sizeof(struct client_history));
 
     /* fill it in ... */
@@ -558 +566 @@
 
     /* insert it in the hash */
-        hash_insert(ircd.hashes.client_history, chp);
+    hash_insert(ircd.hashes.client_history, chp);
     TAILQ_INSERT_HEAD(ircd.lists.client_history, chp, lp);
 
@@ -579 +587 @@
     free(cli->hist);
     
-    if (cli->flags & IRCD_CLIENT_HISTORY)
+    if (CLIENT_HISTORY(cli))
         destroy_client(cli, NULL);
     else
@@ -599 +607 @@
     /* if we found it and they signed off at or after the current time minus
      * the time limit, return the entry. */
-    if (chp != NULL && !(chp->cli->flags & IRCD_CLIENT_HISTORY) &&
+    if (chp != NULL && !CLIENT_HISTORY(chp->cli) &&
             chp->signoff >= (limit ? me.now - limit : 0))
         return chp->cli;

branches/ithildin-1.1/modules/ircd/client.h

@@ -23 +23 @@
     char    info[GCOSLEN + 1];      /* gecos/gcos info (ircname) */
 
-#define IRCD_CLIENT_REGISTERED        0x0001
-    /* check to see if the client is registered or not */
+#define IRCD_CLIENT_UNKNOWN         0x0001
+#define IRCD_CLIENT_REGISTERED      0x0002
+#define IRCD_CLIENT_KILLED          0x0004
+#define IRCD_CLIENT_HISTORY         0x0008
+
+#define CLIENT_UNKNOWN(cli) (cli->flags & IRCD_CLIENT_UNKNOWN)
 #define CLIENT_REGISTERED(cli) (cli->flags & IRCD_CLIENT_REGISTERED)
-#define IRCD_CLIENT_KILLED        0x0002
-#define IRCD_CLIENT_HISTORY        0x0004
+#define CLIENT_KILLED(cli) (cli->flags & IRCD_CLIENT_KILLED)
+#define CLIENT_HISTORY(cli) (cli->flags & IRCD_CLIENT_HISTORY)
+
     int     flags;
 

branches/ithildin-1.1/modules/ircd/commands/protocol.c

@@ -38 +38 @@
     }
 
-    cp->proto = proto;
-    cp->proto->setup(cp);
+    set_connection_protocol(cp, proto);
 
     return IRCD_PROTOCOL_CHANGED;

branches/ithildin-1.1/modules/ircd/commands/server.c

@@ -228 +228 @@
     }
 
-    cp = cli->conn;
-    cli->conn = NULL; /* save/set client's connection to NULL so destroy_client
-                         doesn't nerf the connection in the process */
-    destroy_client(cli, ""); /* cli is no longer valid */
-    cp->cli = NULL;
-
     /* now we mock up a server connection.  joy of joys, our pass should still
      * have been saved.  we just reset the protocol, and setup the connection,
      * and then call the server version of the SERVER command.  This is pretty
      * dirty. :/ */
-    cp->proto = pp;
-    cp->proto->setup(cp);
+    set_connection_protocol(cp, pp);
     if ((ret = s_server_cmd(NULL, argc, argv, cp->srv)) != 0)
         return ret; /* Give them whatever s_server_cmd gave, it will always

branches/ithildin-1.1/modules/ircd/connection.c

@@ -25 +25 @@
 static void connection_init_lookups(connection_t *);
 
+/* set the protocol for a connection, possibly cleaning up if necessary for
+ * protocol changes */
+void set_connection_protocol(connection_t *cp, protocol_t *proto) {
+
+    if (cp->proto != NULL)
+        clear_connection_objects(cp);
+    
+    cp->proto = proto;
+    cp->proto->setup(cp);
+}
+
+/* safely remove both client and server objects from the connection */
+void clear_connection_objects(connection_t *cp) {
+    client_t *cli = cp->cli;
+    server_t *srv = cp->srv;
+
+    if (cli != NULL) {
+        cli->conn = NULL;
+        cp->cli = NULL;
+        destroy_client(cli, "");
+    }
+
+    if (srv != NULL) {
+        srv->conn = NULL;
+        cp->srv = NULL;
+        destroy_server(srv, "");
+    }
+}
+
 void destroy_connection(connection_t *c, char *reason) {
     char msg[512];
@@ -34 +63 @@
 #endif
     /* destroy_client/server will set the cli/srv entries to NULL, then call us
-     * again to really desotry the connection.  this makes it safe to call
+     * again to really destroy the connection.  this makes it safe to call
      * 'destroy_connection' even if you're not sure what kind of connection you
      * have. */
@@ -362 +391 @@
 
     /* now stick them in the default protocol */
-    c->proto = ircd.default_proto;
-    c->proto->setup(c);
+    set_connection_protocol(c, ircd.default_proto);
     c->last = me.now;
     /* and monitor them */

branches/ithildin-1.1/modules/ircd/connection.h

@@ -87 +87 @@
 };
 
+void set_connection_protocol(connection_t *, protocol_t *);
+void clear_connection_objects(connection_t *);
 void destroy_connection(connection_t *, char *);
 int close_unknown_connections(char *);

branches/ithildin-1.1/modules/ircd/doc/conf.txt

@@ -659 +659 @@
     protocol "some-protocol";
 
-    // ssl: (optional)
-    // this is a boolean flag which specifies whether SSL should be useed to
-    // establish a connection to the server.  using SSL will turn off use of
-    // password verification as well as the checking of IPs.
+    // ssl: (optional) this is a boolean flag which specifies whether
+    // SSL should be used to establish a connection to the server.
+    // using SSL will turn off use of password verification as well as
+    // the checking of IPs.
     ssl <yes|no>;
 

branches/ithildin-1.1/modules/ircd/server.c

@@ -477 +477 @@
     cp->cls = LIST_FIRST(ircd.lists.classes); /* stick them in the default class
                                             temporarily. */
-    cp->proto = proto;
     cp->signon = me.now;
     cp->last = me.now;
+    set_connection_protocol(cp, proto);
 
     /* put it on the stage2 list.  technically it should stay as stage2 until
      * the negotiation is finished and server_register() is called. */
     LIST_INSERT_HEAD(ircd.connections.stage2, cp, lp);
-    proto->setup(cp);
 
     sp = cp->srv;

branches/ithildin-1.1/source/conf.c

@@ -498 +498 @@
                     str++;
                     while (*str) {
-                        if (*str == '\\')
+                        if (*str == '\\' && *(str + 1) != '\0')
                             str += 2;
                         else if (*str == '"')
@@ -561 +561 @@
             }
             
-            *str++ = '\0';;
+            *str++ = '\0';
             continue;
         } else {