registersearchterm(reg_whowassearch, "ident",ident_parse, 0, "User's current ident");
registersearchterm(reg_nicksearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host");
registersearchterm(reg_whowassearch, "host",host_parse, 0, "User's host, allow \"host real\" to match real host");
- registersearchterm(reg_nicksearch, "channel",channel_parse, 0, "Valid Channel Name to match users against"); /* nick only */
+ registersearchterm(reg_nicksearch, "channel",channel_parse, 0, "Valid Channel Name to match users against");
+ registersearchterm(reg_whowassearch, "channel",channel_parse, 0, "Valid Channel Name to match users against");
registersearchterm(reg_nicksearch, "timestamp",timestamp_parse, 0, "User's Timestamp");
registersearchterm(reg_whowassearch, "timestamp",timestamp_parse, 0, "User's Timestamp");
registersearchterm(reg_nicksearch, "country",country_parse, 0, "2 letter country code (data source is geoip)");
registersearchterm(reg_nicksearch, "ipvsix",ipv6_parse, 0, "IPv6 user");
registersearchterm(reg_whowassearch, "ipvsix",ipv6_parse, 0, "IPv6 user");
registersearchterm(reg_nicksearch, "message",message_parse, 0, "Last message");
+ registersearchterm(reg_nicksearch, "age",age_parse, 0, "Nick record age in seconds");
+ registersearchterm(reg_whowassearch, "age",age_parse, 0, "Whowas record age in seconds");
+
/* Whowas operations */
registersearchterm(reg_whowassearch, "quit",quit_parse, 0, "User quit");
registersearchterm(reg_whowassearch, "killed",killed_parse, 0, "User was killed");
registersearchterm(reg_whowassearch, "renamed",renamed_parse, 0, "User changed nick");
- registersearchterm(reg_whowassearch, "age",age_parse, 0, "Whowas record age in seconds");
registersearchterm(reg_whowassearch, "newnick",newnick_parse, 0, "New nick (for rename whowas records)");
registersearchterm(reg_whowassearch, "reason",reason_parse, 0, "Quit/kill reason");
deregistersearchcommand( reg_nicksearch );
deregistersearchcommand( reg_chansearch );
deregistersearchcommand( reg_usersearch );
+ deregistersearchcommand( reg_whowassearch );
destroycommandtree( searchCmdTree );
}
int len=strlen(help);
sl->help=(char *)malloc(len+1);
if(!sl->help) {
+ freesstring(sl->name);
+ free(sl);
Error("newsearch", ERR_ERROR, "malloc failed: registerglobalsearchterm");
return;
}
deletecommandfromtree(cmd->searchtree, term, (CommandHandler) parsefunc);
}
-static void controlwallwrapper(int level, char *format, ...) __attribute__ ((format (printf, 2, 3)));
+static void controlwallwrapper(int level, char *format, ...) __attribute__ ((format (printf, 2, 3)));
static void controlwallwrapper(int level, char *format, ...) {
char buf[1024];
va_list ap;
if (ctx->targets) {
np = ((nick **)ctx->targets->content)[k];
if (!np)
- break;
+ continue;
}
if ((search->exe)(ctx, search, np)) {
/* The top-level node needs to return a BOOL */
search=coerceNode(ctx, search, RETURNTYPE_BOOL);
- for (i = whowasoffset; i < whowasoffset + WW_MAXENTRIES; i++) {
- ww = &whowasrecs[i % WW_MAXENTRIES];
+ for (i = whowasoffset; i < whowasoffset + whowasmax; i++) {
+ ww = &whowasrecs[i % whowasmax];
if (ww->type == WHOWAS_UNUSED)
continue;