fixed devnull id's

[srvx.git] / src / opserv.c

diff --git a/src/opserv.c b/src/opserv.c
index c4844b7604a67c8b53cd0767445bb72a1d3db4c2..bd52413b6ef6453e6db78c32f8b60f512ad4b671 100644 (file)
--- a/src/opserv.c
+++ b/src/opserv.c
@@ -79,7 +79,6 @@
 #define KEY_ISSUER "issuer"
 #define KEY_ISSUED "issued"
 #define KEY_DEVNULL_CLASSES "classes"
-#define KEY_DEVNULL_LASTID "lastid"
 #define KEY_DEVNULL_ID "id"
 #define KEY_DEVNULL_NAME "class"
 #define KEY_DEVNULL_MODE "modes"
@@ -2825,9 +2824,11 @@ opserv_add_devnull_class(const char *name, unsigned int id, unsigned long modes,
     th = calloc(1, sizeof(*th));
     if (!th)
         return;
-    if(id)
+    if(id) {
         th->id = id;
-    else
+        if(id >= devnull_last_id)
+            devnull_last_id = id+1;
+    } else
         th->id = (++devnull_last_id);
     th->name = strdup(name);
     th->modes = modes;
@@ -2848,7 +2849,7 @@ static int
 devnull_class_read(const char *name, void *data, UNUSED_ARG(void *extra))
 {
     struct record_data *rd = data;
-    const char *nameb = name, *str;
+    const char *str;
     unsigned long modes, maxchan, maxsendq;
     unsigned int id, ii;
 
@@ -2919,8 +2920,6 @@ opserv_saxdb_read(struct dict *conf_db)
         if ((str = database_get_data(object, KEY_TIME, RECDB_QSTRING)))
             max_clients_time = atoi(str);
     }
-    if ((str = database_get_data(object, KEY_DEVNULL_LASTID, RECDB_QSTRING)))
-        devnull_last_id = atoi(str);
     if ((object = database_get_data(conf_db, KEY_TRUSTED_HOSTS, RECDB_OBJECT)))
         dict_foreach(object, trusted_host_read, opserv_trusted_hosts);
     if ((object = database_get_data(conf_db, KEY_DEVNULL_CLASSES, RECDB_OBJECT)))
@@ -3004,7 +3003,6 @@ opserv_saxdb_write(struct saxdb_context *ctx)
         }
         saxdb_end_record(ctx);
     }
-    saxdb_write_int(ctx, KEY_DEVNULL_LASTID, devnull_last_id);
     /* gags */
     if (gagList) {
         struct gag_entry *gag;
@@ -4312,8 +4310,7 @@ static MODCMD_FUNC(cmd_listdevnull)
     tbl.contents[0][12] = "+X";
     tbl.contents[0][13] = "MaxQ";
     tbl.contents[0][14] = "OpMe";
-    if(!count)
-    {
+    if(!count) {
         table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
         reply("MSG_NONE");
         free(tbl.contents[0]);
@@ -4387,9 +4384,11 @@ static MODCMD_FUNC(cmd_listdevnull)
             tbl.contents[ii][12] = off;
         }
         if(DEVNULL_HAS_PRIV(th, MAXSENDQ)) {
-            tbl.contents[ii][13] = on;
+            char maxsenqbuf[MAXLEN];
+            sprintf(maxsenqbuf, "%lu", th->maxsendq);
+            tbl.contents[ii][13] = strdup(maxsenqbuf);
         } else {
-            tbl.contents[ii][13] = off;
+            tbl.contents[ii][13] = strdup(off);
         }
         if(DEVNULL_HAS_PRIV(th, OPME)) {
             tbl.contents[ii][14] = on;
@@ -4398,8 +4397,8 @@ static MODCMD_FUNC(cmd_listdevnull)
         }
     }
     table_send(cmd->parent->bot, user->nick, 0, NULL, tbl);
-    for(ii = 1; ii < tbl.length; ++ii)
-    {
+    for(ii = 1; ii < tbl.length; ++ii) {
+        free(tbl.contents[ii][13]);
         free(tbl.contents[ii]);
     }
     free(tbl.contents[0]);
@@ -4444,7 +4443,7 @@ static MODCMD_FUNC(cmd_adddevnull)
         return 0;
     }
     
-    opserv_add_devnull_class(argv[1], (++devnull_last_id), 0, 0, 0);
+    opserv_add_devnull_class(argv[1], 0, 0, 0, 0);
     reply("OSMSG_DEVNULL_ADDED",argv[1]);
     return 1;
 }
@@ -4745,28 +4744,37 @@ struct devnull_class *devnull_find_name(const char *name) {
 
 int devnull_user_has_priv(struct handle_info *hi, int devnull_priv) {
     if(devnull_check_priv_func) {
-        int ext_privs = ((struct devnull_class (*)(struct handle_info *))devnull_check_priv_func)(hi, devnull_priv);
-        if((ext_privs & devnull_priv))
-            return (ext_privs & devnull_priv);
+        struct devnull_class ext_class = ((struct devnull_class (*)(struct handle_info *))devnull_check_priv_func)(hi);
+        if((ext_class.modes & devnull_priv))
+            return (ext_class.modes & devnull_priv);
     }
     
-    if(!hi->devnull)
+    if(!hi->devnull_id)
         return 0;
-    struct devnull_class *th;
-    if(!(th = dict_find(opserv_devnull_classes, hi->devnull, NULL)))
+    struct devnull_class *th = devnull_find_id(hi->devnull_id);
+    if(!th)
         return 0;
-    
     return (th->modes & devnull_priv);
 }
 
 struct devnull_class devnull_user_get_class(struct handle_info *hi) {
     struct devnull_class th;
-    th.name = NULL;
-    th.modes = 0;
+    memset(&th, 0, sizeof(th));
+    
+    if(devnull_check_priv_func) {
+        struct devnull_class ext_class = ((struct devnull_class (*)(struct handle_info *))devnull_check_priv_func)(hi);
+        th.modes |= ext_class.modes;
+        if(ext_class.name)
+            th.name = ext_class.name;
+        if(DEVNULL_HAS_PRIV(&th, CHANLIMIT))
+            th.maxchan = ext_class.maxchan;
+        if(DEVNULL_HAS_PRIV(&th, MAXSENDQ))
+            th.maxsendq = ext_class.maxsendq;
+    }
     
-    if(hi->devnull) {
+    if(hi->devnull_id) {
         struct devnull_class *thp;
-        if((thp = dict_find(opserv_devnull_classes, hi->devnull, NULL))) {
+        if((thp = devnull_find_id(hi->devnull_id))) {
             if(DEVNULL_HAS_PRIV(thp, CHANLIMIT) && (!DEVNULL_HAS_PRIV(&th, CHANLIMIT) || th.maxchan < thp->maxchan))
                 th.maxchan = thp->maxchan;
             if(DEVNULL_HAS_PRIV(thp, MAXSENDQ) && (!DEVNULL_HAS_PRIV(&th, MAXSENDQ) || th.maxsendq < thp->maxsendq))