Changeset dcbd425 in code for icbd.c

Timestamp:

Mar 9, 2014, 3:10:52 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

c4a43f1

Parents:

e87ab6d

Message:

Remove the session tree

File:

• icbd.c (modified) (7 diffs)

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 +43 @@
 #include "icbd.h"
 
-uint64_t sessionid;
 struct stat modtabst;
 char modtabpath[MAXPATHLEN];
@@ -69 +67 @@
 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);
-
 struct icbd_listener {
         struct event ev, pause;
@@ -86 +78 @@
         int ch, nsocks = 0, save_errno = 0;
         int inet4 = 0, inet6 = 0;
-
-        RB_INIT(&icbd_sessions);
 
         /* init group lists before calling icb_addgroup */
@@ -247 +237 @@
 
         return (EX_UNAVAILABLE);
-}
-
-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));
 }
 
@@ -322 +293 @@
                 return;
         }
-
-        is->id = sessionid++;
-        RB_INSERT(icbd_sessions, &icbd_sessions, is);
 
         /* save host information */
@@ -450 +418 @@
         (void)close(EVBUFFER_FD(is->bev));
         bufferevent_free(is->bev);
-        RB_REMOVE(icbd_sessions, &icbd_sessions, is);
         free(is);
 }