X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/316868479d0e06a213e3a0cc6ba6a00386c1ce33..80e32fcd996025093c28b304d91d376b72c1496e:/newsearch/newsearch.h diff --git a/newsearch/newsearch.h b/newsearch/newsearch.h index 4bf21862..e8d66936 100644 --- a/newsearch/newsearch.h +++ b/newsearch/newsearch.h @@ -5,13 +5,13 @@ #include "../lib/flags.h" #include "../authext/authext.h" #include "../patricia/patricia.h" +#include "../whowas/whowas.h" #ifndef __NEWSEARCH_H #define __NEWSEARCH_H #define NSMAX_KILL_LIMIT 500 #define NSMAX_GLINE_LIMIT 500 -#define NSMAX_GLINE_CLONES 5 /* gline duration, in seconds */ #define NSGLINE_DURATION 3600 @@ -43,6 +43,7 @@ typedef void *(*exeFunc)(struct searchCtx *, struct searchNode *, void *); typedef void (*ChanDisplayFunc)(struct searchCtx *, nick *, chanindex *); typedef void (*NickDisplayFunc)(struct searchCtx *, nick *, nick *); typedef void (*UserDisplayFunc)(struct searchCtx *, nick *, authname *); +typedef void (*WhowasDisplayFunc)(struct searchCtx *, nick *, whowas *); typedef void (*HeaderFunc)(void *sender, void *arg); struct coercedata { @@ -91,6 +92,7 @@ typedef struct searchCtx { struct searchCmd *searchcmd; nick *sender; int limit; + void *target; void *displayfn; } searchCtx; @@ -126,6 +128,7 @@ struct searchNode *modes_parse(searchCtx *ctx, int argc, char **argv); /* Nick functions (various types) */ struct searchNode *hostmask_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *realname_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *away_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *authname_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *authts_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *ident_parse(searchCtx *ctx, int argc, char **argv); @@ -138,6 +141,16 @@ struct searchNode *channels_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *server_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *authid_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *cidr_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *ipv6_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *message_parse(searchCtx *ctx, int argc, char **argv); + +/* Whowas functions (various types) */ +struct searchNode *quit_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *killed_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *renamed_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *age_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *newnick_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *reason_parse(searchCtx *ctx, int argc, char **argv); /* Channel functions (various types) */ struct searchNode *exists_parse(searchCtx *ctx, int argc, char **argv); @@ -146,13 +159,12 @@ struct searchNode *size_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *name_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *topic_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *oppct_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *cumodecount_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *cumodepct_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *hostpct_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *authedpct_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *kick_parse(searchCtx *ctx, int argc, char **argv); -/* Interpret a string to give a node */ -struct searchNode *search_parse(searchCtx *ctx, char *input); - /* Iteration functions */ struct searchNode *any_parse(searchCtx *ctx, int argc, char **argv); struct searchNode *all_parse(searchCtx *ctx, int argc, char **argv); @@ -183,20 +195,25 @@ void unregdisp( searchCmd *cmd, const char *name, void *handler); /* Special nick* printf */ void nssnprintf(char *, size_t, const char *, nick *); +void displaystrerror(replyFunc reply, nick *np, const char *input); + extern const char *parseError; extern nick *senderNSExtern; void printnick(searchCtx *, nick *, nick *); void printuser(searchCtx *, nick *, authname *); void printchannel(searchCtx *, nick *, chanindex *); +void printwhowas(searchCtx *, nick *, whowas *); void nicksearch_exe(struct searchNode *search, searchCtx *sctx); void chansearch_exe(struct searchNode *search, searchCtx *sctx); void usersearch_exe(struct searchNode *search, searchCtx *ctx); +void whowassearch_exe(struct searchNode *search, searchCtx *ctx); int do_nicksearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv); int do_chansearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv); int do_usersearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv); +int do_whowassearch_real(replyFunc reply, wallFunc wall, void *source, int cargc, char **cargv); void *literal_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput); void literal_free(searchCtx *ctx, struct searchNode *thenode); @@ -205,7 +222,7 @@ struct searchVariable *var_register(searchCtx *ctx, char *arg, int type); searchNode *var_get(searchCtx *ctx, char *arg); void var_setstr(struct searchVariable *v, char *data); -void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender, void *displayfn, int limit); +void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender, void *displayfn, int limit, void *target); /* AST functions */ @@ -234,6 +251,12 @@ typedef struct searchASTExpr { } u; } searchASTExpr; +typedef struct searchASTCache { + searchASTExpr *tree; + searchASTExpr *cache[AST_RECENT]; + int nextpos; +} searchASTCache; + #define __NSASTSizeOfArray(x) (sizeof(x) / sizeof(x[0])) #define __NSASTExpr(x, y, ...) (searchASTExpr){.type = x, .u.y = __VA_ARGS__} @@ -250,15 +273,16 @@ typedef struct searchASTExpr { searchNode *search_astparse(searchCtx *, char *); -int ast_nicksearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, NickDisplayFunc display, HeaderFunc header, void *headerarg, int limit); -int ast_chansearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, ChanDisplayFunc display, HeaderFunc header, void *headerarg, int limit); -int ast_usersearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, UserDisplayFunc display, HeaderFunc header, void *headerarg, int limit); +int ast_nicksearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, NickDisplayFunc display, HeaderFunc header, void *headerarg, int limit, nick *); +int ast_chansearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, ChanDisplayFunc display, HeaderFunc header, void *headerarg, int limit, chanindex *); +int ast_usersearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, UserDisplayFunc display, HeaderFunc header, void *headerarg, int limit, authname *); +int ast_whowassearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc wall, WhowasDisplayFunc display, HeaderFunc header, void *headerarg, int limit, whowas *); char *ast_printtree(char *buf, size_t bufsize, searchASTExpr *expr, searchCmd *cmd); int parseopts(int cargc, char **cargv, int *arg, int *limit, void **subset, void *display, CommandTree *sl, replyFunc reply, void *sender); -typedef int (*ASTFunc)(searchASTExpr *, replyFunc, void *, wallFunc, void *, HeaderFunc, void *, int limit); +typedef int (*ASTFunc)(searchASTExpr *, replyFunc, void *, wallFunc, void *, HeaderFunc, void *, int limit, void *target); /* erk */ extern searchList *globalterms; @@ -266,10 +290,12 @@ extern searchList *globalterms; extern searchCmd *reg_nicksearch; extern searchCmd *reg_chansearch; extern searchCmd *reg_usersearch; +extern searchCmd *reg_whowassearch; extern UserDisplayFunc defaultuserfn; extern NickDisplayFunc defaultnickfn; extern ChanDisplayFunc defaultchanfn; +extern WhowasDisplayFunc defaultwhowasfn; struct searchNode *argtoconststr(char *command, searchCtx *ctx, char *arg, char **p);