X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=src%2Fopserv.c;h=ccede743d5fb9f1ff7b6677cfd83333ee3a48ba4;hb=91aeb5684130fc8d5322af1eca7be2e2f3d1e928;hp=92abb8dc0a4af58f542720ba8af1c63763e5875f;hpb=093f707afd62edb079b5f64d165ee128f912e71f;p=srvx.git diff --git a/src/opserv.c b/src/opserv.c index 92abb8d..ccede74 100644 --- a/src/opserv.c +++ b/src/opserv.c @@ -79,6 +79,8 @@ #define KEY_ISSUER "issuer" #define KEY_ISSUED "issued" #define KEY_DEVNULL_CLASSES "classes" +#define KEY_DEVNULL_LASTID "devnull_id" +#define KEY_DEVNULL_ID "id" #define KEY_DEVNULL_NAME "class" #define KEY_DEVNULL_MODE "modes" #define KEY_DEVNULL_MAXCHAN "chanlimit" @@ -329,6 +331,7 @@ static unsigned int new_user_flood; const char *devnull_modes = DEVNULL_MODES; static char *level_strings[1001]; static char devnull_inverse_modes[256]; +unsigned int devnull_last_id = 1; void *devnull_check_priv_func = NULL; @@ -2816,12 +2819,16 @@ trusted_host_read(const char *host, void *data, UNUSED_ARG(void *extra)) } static void -opserv_add_devnull_class(const char *name, unsigned long modes, unsigned long maxchan, unsigned long maxsendq) +opserv_add_devnull_class(const char *name, unsigned int id, unsigned long modes, unsigned long maxchan, unsigned long maxsendq) { struct devnull_class *th; th = calloc(1, sizeof(*th)); if (!th) return; + if(id) + th->id = id; + else + th->id = (++devnull_last_id); th->name = strdup(name); th->modes = modes; th->maxchan = maxchan; @@ -2841,14 +2848,18 @@ 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 ii; + unsigned int id, ii; if (rd->type == RECDB_OBJECT) { dict_t obj = GET_RECORD_OBJECT(rd); /* new style structure */ - nameb = database_get_data(obj, KEY_DEVNULL_NAME, RECDB_QSTRING); + str = database_get_data(obj, KEY_DEVNULL_ID, RECDB_QSTRING); + if(str) + id = atoi(str); + else + id = 0; str = database_get_data(obj, KEY_DEVNULL_MODE, RECDB_QSTRING); modes = 0; if (str) { @@ -2862,7 +2873,7 @@ devnull_class_read(const char *name, void *data, UNUSED_ARG(void *extra)) } else return 0; - opserv_add_devnull_class(nameb, modes, maxchan, maxsendq); + opserv_add_devnull_class(name, id, modes, maxchan, maxsendq); return 0; } @@ -2873,6 +2884,7 @@ opserv_saxdb_read(struct dict *conf_db) struct record_data *rd; dict_iterator_t it; unsigned int nn; + char *str; if ((object = database_get_data(conf_db, KEY_RESERVES, RECDB_OBJECT))) dict_foreach(object, add_reserved, opserv_reserved_nick_dict); @@ -2902,12 +2914,13 @@ opserv_saxdb_read(struct dict *conf_db) dict_insert(opserv_exempt_channels, strdup(rd->d.slist->list[nn]), NULL); } if ((object = database_get_data(conf_db, KEY_MAX_CLIENTS, RECDB_OBJECT))) { - char *str; if ((str = database_get_data(object, KEY_MAX, RECDB_QSTRING))) max_clients = atoi(str); 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))) @@ -2974,8 +2987,8 @@ opserv_saxdb_write(struct saxdb_context *ctx) saxdb_start_record(ctx, KEY_DEVNULL_CLASSES, 1); for (it = dict_first(opserv_devnull_classes); it; it = iter_next(it)) { struct devnull_class *th = iter_data(it); - saxdb_start_record(ctx, iter_key(it), 0); - if (th->name) saxdb_write_string(ctx, KEY_DEVNULL_NAME, th->name); + saxdb_start_record(ctx, th->name, 0); + saxdb_write_int(ctx, KEY_DEVNULL_ID, th->id); if (th->modes) { int ii, flen; char flags[50]; @@ -2991,6 +3004,7 @@ 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; @@ -4430,7 +4444,7 @@ static MODCMD_FUNC(cmd_adddevnull) return 0; } - opserv_add_devnull_class(argv[1], 0, 0, 0); + opserv_add_devnull_class(argv[1], (++devnull_last_id), 0, 0, 0); reply("OSMSG_DEVNULL_ADDED",argv[1]); return 1; } @@ -4444,7 +4458,7 @@ static MODCMD_FUNC(cmd_deldevnull) struct devnull_class *th = dict_find(opserv_devnull_classes, argv[n], NULL); if (!th) continue; - nickserv_devnull_delete(th->name); + nickserv_devnull_delete(th->id); dict_remove(opserv_devnull_classes, argv[n]); reply("OSMSG_DEVNULL_REMOVED",argv[n]); } @@ -4459,8 +4473,7 @@ static MODCMD_FUNC(cmd_renamedevnull) return 0; } if ((th = dict_find(opserv_devnull_classes, argv[1], NULL))) { - opserv_add_devnull_class(argv[2], th->modes, th->maxchan, th->maxsendq); - nickserv_devnull_rename(th->name,argv[2]); + opserv_add_devnull_class(argv[2], th->id, th->modes, th->maxchan, th->maxsendq); dict_remove(opserv_devnull_classes, argv[1]); reply("OSMSG_DEVNULL_RENAMED",argv[1],argv[2]); } else { @@ -4712,37 +4725,57 @@ static MODCMD_FUNC(cmd_setdevnull) return 1; } -int devnull_check_name(const char *name) { - if (dict_find(opserv_devnull_classes, name, NULL)) { - return 1; +struct devnull_class *devnull_find_id(unsigned int id) { + dict_iterator_t it; + for (it = dict_first(opserv_devnull_classes); it; it = iter_next(it)) { + struct devnull_class *th = iter_data(it); + if(th->id == id) + return th; } - return 0; + return NULL; +} + +struct devnull_class *devnull_find_name(const char *name) { + struct devnull_class *th; + if ((th = dict_find(opserv_devnull_classes, name, NULL))) { + return th; + } + return NULL; } 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))