lab/icbd
7
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove the session tree

Browse Source
This commit is contained in:
Mike Belopuhov 2014-03-09 16:10:52 +01:00
parent e87ab6d0e4
commit dcbd425530
2 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
icb.h
View File

@ -15,7 +15,6 @@
*/
#include <sys/queue.h>
#include <sys/tree.h>
/*
* ICB packet has the following format: <length><type><data>
@ -73,7 +72,6 @@ enum {
struct icb_group;
struct icb_session {
uint64_t id;
char nick[ICB_MAXNICKLEN];
char client[ICB_MAXNICKLEN];
char host[ICB_MAXHOSTLEN];
@ -97,9 +95,6 @@ struct icb_session {
#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;
};

33
icbd.c
View File

@ -19,7 +19,6 @@
#include <sys/queue.h>
#include <sys/socket.h>
#include <sys/stat.h>
#include <sys/tree.h>
#include <netinet/in_systm.h>
#include <netinet/in.h>
#include <netinet/ip.h>
@ -43,7 +42,6 @@
#include "icb.h"
#include "icbd.h"
uint64_t sessionid;
struct stat modtabst;
char modtabpath[MAXPATHLEN];
char modtab[ICB_MTABLEN][ICB_MAXNICKLEN];
@ -68,12 +66,6 @@ void icbd_grplist(char *);
void icbd_restrict(void);
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,8 +78,6 @@ main(int argc, char *argv[])
int ch, nsocks = 0, save_errno = 0;
int inet4 = 0, inet6 = 0;
RB_INIT(&icbd_sessions);
/* init group lists before calling icb_addgroup */
icb_init(&ic);
@ -248,25 +238,6 @@ main(int argc, char *argv[])
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));
}
void
icbd_accept(int fd, short event __attribute__((__unused__)),
void *arg)
@ -322,9 +293,6 @@ icbd_accept(int fd, short event __attribute__((__unused__)),
return;
}
is->id = sessionid++;
RB_INSERT(icbd_sessions, &icbd_sessions, is);
/* save host information */
getpeerinfo(is);
@ -449,7 +417,6 @@ icbd_drop(struct icb_session *is, char *reason)
(void)evbuffer_write(EVBUFFER_OUTPUT(is->bev), EVBUFFER_FD(is->bev));
(void)close(EVBUFFER_FD(is->bev));
bufferevent_free(is->bev);
RB_REMOVE(icbd_sessions, &icbd_sessions, is);
free(is);
}