Changeset fa271b8 in code

Timestamp:

Mar 4, 2014, 10:34:15 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

b4049f9

Parents:

a202ff1

Message:

Introduce session IDs and associated tree linkage

Files:

• icb.h (modified) (4 diffs)
• icbd.c (modified) (7 diffs)
• icbd.h (modified) (1 diff)

icb.h

@@ -16 +16 @@
 
 #include <sys/queue.h>
+#include <sys/tree.h>
 
 #define ICB_MSGSIZE              256
@@ -66 +67 @@
 
 struct icb_session {
+        uint64_t                 id;
         char                     nick[ICB_MAXNICKLEN];
         char                     client[ICB_MAXNICKLEN];
@@ -71 +73 @@
         char                     buffer[ICB_MSGSIZE+1];
         struct event             ev;
-        LIST_ENTRY(icb_session)  entry;
         struct bufferevent      *bev;
         struct icb_group        *group;
@@ -87 +88 @@
 #define ICB_SF_NOBEEP            0x10
 #define ICB_SF_NOBEEP2           0x20
+
+        /* session tree */
+        RB_ENTRY(icb_session)    node;
+
+        /* in-group linkage */
+        LIST_ENTRY(icb_session)  entry;
 };
 

icbd.c

@@ -20 +20 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/tree.h>
 #include <netinet/in_systm.h>
 #include <netinet/in.h>
@@ -44 +45 @@
 extern char *__progname;
 
+uint64_t sessionid;
 char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
 int  modtabcnt;
@@ -63 +65 @@
 void icbd_write(struct icb_session *, char *, ssize_t);
 
+static inline int icbd_session_cmp(struct icb_session *, struct icb_session *);
+
+RB_HEAD(icbd_sessions, icb_session) icbd_sessions;
+RB_PROTOTYPE(icbd_sessions, icb_session, node, icbd_session_cmp);
+RB_GENERATE(icbd_sessions, icb_session, node, icbd_session_cmp);
+
 int
 main(int argc, char *argv[])
@@ -70 +78 @@
         int ch, nsocks = 0, save_errno = 0;
         int inet4 = 0, inet6 = 0;
+
+        RB_INIT(&icbd_sessions);
 
         /* init group lists before calling icb_addgroup */
@@ -234 +244 @@
 }
 
+static inline int
+icbd_session_cmp(struct icb_session *a, struct icb_session *b)
+{
+        if (a->id > b->id)
+                return (1);
+        if (a->id < b->id)
+                return (-1);
+        return (0);
+}
+
+inline struct icb_session *
+icbd_session_lookup(uint64_t sid)
+{
+        struct icb_session key;
+
+        key.id = sid;
+        return (RB_FIND(icbd_sessions, &icbd_sessions, &key));
+}
+
 void
 icbd_accept(int fd, short event __attribute__((__unused__)),
@@ -270 +299 @@
                 return;
         }
+
+        is->id = sessionid++;
+        RB_INSERT(icbd_sessions, &icbd_sessions, is);
 
         /* save host information */
@@ -354 +386 @@
         (void)close(EVBUFFER_FD(is->bev));
         bufferevent_free(is->bev);
+        RB_REMOVE(icbd_sessions, &icbd_sessions, is);
         free(is);
 }

icbd.h

@@ -24 +24 @@
 
 /* icbd.c */
-time_t getmonotime(void);
+inline struct icb_session *icbd_session_lookup(uint64_t);
+time_t  getmonotime(void);
 
 /* dns.c */