#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"
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;
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)))
}
saxdb_end_record(ctx);
}
- saxdb_write_int(ctx, KEY_DEVNULL_LASTID, devnull_last_id);
/* gags */
if (gagList) {
struct gag_entry *gag;
} else {
tbl.contents[ii][5] = off;
}
- if(DEVNULL_HAS_PRIV(th, CHSERVMODE)) {
+ if(DEVNULL_HAS_PRIV(th, SEEIDLE)) {
tbl.contents[ii][6] = on;
} else {
tbl.contents[ii][6] = off;
}
- if(DEVNULL_HAS_PRIV(th, XTRAOPMODE)) {
+ if(DEVNULL_HAS_PRIV(th, FORCEIDLEHIDE)) {
tbl.contents[ii][7] = on;
} else {
tbl.contents[ii][7] = off;
}
- if(DEVNULL_HAS_PRIV(th, NETSERVMODE)) {
+ if(DEVNULL_HAS_PRIV(th, OVERRIDECC)) {
tbl.contents[ii][8] = on;
} else {
tbl.contents[ii][8] = off;
}
- if(DEVNULL_HAS_PRIV(th, SEEIDLE)) {
+ if(DEVNULL_HAS_PRIV(th, OVERRIDENOAMSG)) {
tbl.contents[ii][9] = on;
} else {
tbl.contents[ii][9] = off;
}
- if(DEVNULL_HAS_PRIV(th, FORCEIDLEHIDE)) {
+ if(DEVNULL_HAS_PRIV(th, CHSERVMODE)) {
tbl.contents[ii][10] = on;
} else {
tbl.contents[ii][10] = off;
}
- if(DEVNULL_HAS_PRIV(th, OVERRIDECC)) {
+ if(DEVNULL_HAS_PRIV(th, NETSERVMODE)) {
tbl.contents[ii][11] = on;
} else {
tbl.contents[ii][11] = off;
}
- if(DEVNULL_HAS_PRIV(th, OVERRIDENOAMSG)) {
+ if(DEVNULL_HAS_PRIV(th, XTRAOPMODE)) {
tbl.contents[ii][12] = on;
} else {
tbl.contents[ii][12] = off;
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;
}