X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/ad740380e68eca0756c5b869d3e013fb1acc7824..8855bb48b449ed06cfd3ce528b3c0a77c37cb24b:/newsearch/newsearch.h?ds=sidebyside diff --git a/newsearch/newsearch.h b/newsearch/newsearch.h index 7ab3a6d5..a4414b30 100644 --- a/newsearch/newsearch.h +++ b/newsearch/newsearch.h @@ -1,27 +1,23 @@ #include "../nick/nick.h" +#include "../lib/sstring.h" #include "../parser/parser.h" #include "../channel/channel.h" #include "../lib/flags.h" #include "../authext/authext.h" +#include "../patricia/patricia.h" -#define SEARCHTYPE_CHANNEL 1 -#define SEARCHTYPE_NICK 2 -#define SEARCHTYPE_USER 3 - +#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 #define NSMAX_REASON_LEN 120 #define NSMAX_NOTICE_LEN 250 - +#define NSMAX_COMMAND_LEN 20 #define RETURNTYPE_BOOL 0x01 #define RETURNTYPE_INT 0x02 @@ -69,6 +65,21 @@ struct searchVariable { struct coercedata cdata; }; +typedef struct searchCmd { + void *defaultdisplayfunc; + sstring *name; + CommandHandler handler; + struct CommandTree *outputtree; + struct CommandTree *searchtree; +} searchCmd; + +typedef struct searchList { + void *cmd; + sstring *name; + char *help; + struct searchList *next; +} searchList; + typedef struct searchCtx { searchParseFunc parser; replyFunc reply; @@ -76,7 +87,10 @@ typedef struct searchCtx { void *arg; struct searchVariable vars[MAX_VARIABLES]; int lastvar; - int type; + struct searchCmd *searchcmd; + nick *sender; + int limit; + void *displayfn; } searchCtx; /* Core functions */ @@ -111,6 +125,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); @@ -122,6 +137,8 @@ struct searchNode *ip_parse(searchCtx *ctx, int argc, char **argv); 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); /* Channel functions (various types) */ struct searchNode *exists_parse(searchCtx *ctx, int argc, char **argv); @@ -130,13 +147,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); @@ -144,32 +160,43 @@ struct searchNode *var_parse(searchCtx *ctx, int argc, char **argv); /* Iteraterable functions */ struct searchNode *channeliter_parse(searchCtx *ctx, int argc, char **argv); +struct searchNode *nickiter_parse(searchCtx *ctx, int argc, char **argv); + +/* Functions that operate on strings */ +struct searchNode *cumodes_parse(searchCtx *ctx, int argc, char **argv); /* Force a node to return the thing you want */ struct searchNode *coerceNode(searchCtx *ctx, struct searchNode *thenode, int type); /* Registration functions */ -void registersearchterm(char *term, parseFunc parsefunc); -void deregistersearchterm(char *term, parseFunc parsefunc); -void regchandisp(const char *name, ChanDisplayFunc handler); -void unregchandisp(const char *name, ChanDisplayFunc handler); -void regnickdisp(const char *name, NickDisplayFunc handler); -void unregnickdisp(const char *name, NickDisplayFunc handler); -void reguserdisp(const char *name, UserDisplayFunc handler); -void unreguserdisp(const char *name, UserDisplayFunc handler); +searchCmd *registersearchcommand(char *name, int level, CommandHandler cmd, void *defaultdisplayfunc); +void deregistersearchcommand(searchCmd *scmd); +void registersearchterm(searchCmd *cmd, char *term, parseFunc parsefunc, int level, char *help); +void deregistersearchterm(searchCmd *cmd, char *term, parseFunc parsefunc); + +void registerglobalsearchterm(char *term, parseFunc parsefunc, char *help); +void deregisterglobalsearchterm(char *term, parseFunc parsefunc); + +void regdisp( searchCmd *cmd, const char *name, void *handler, int level, char *help); +void unregdisp( searchCmd *cmd, const char *name, void *handler); /* Special nick* printf */ void nssnprintf(char *, size_t, const char *, nick *); +#ifdef NEWSEARCH_NEWPARSER +void displaystrerror(replyFunc reply, nick *np, const char *input); +#endif + extern const char *parseError; extern nick *senderNSExtern; void printnick(searchCtx *, nick *, nick *); void printuser(searchCtx *, nick *, authname *); +void printchannel(searchCtx *, nick *, chanindex *); -void nicksearch_exe(struct searchNode *search, searchCtx *sctx, nick *sender, NickDisplayFunc display, int limit); -void chansearch_exe(struct searchNode *search, searchCtx *sctx, nick *sender, ChanDisplayFunc display, int limit); -void usersearch_exe(struct searchNode *search, searchCtx *ctx, nick *sender, UserDisplayFunc display, int limit); +void nicksearch_exe(struct searchNode *search, searchCtx *sctx); +void chansearch_exe(struct searchNode *search, searchCtx *sctx); +void usersearch_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); @@ -182,7 +209,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, int type); +void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender, void *displayfn, int limit); /* AST functions */ @@ -194,33 +221,42 @@ struct searchASTNode; /* items to store in the ast lookup cache */ #define AST_RECENT 10 +struct searchASTExpr; + +typedef struct searchASTNode { + parseFunc fn; + int argc; + struct searchASTExpr *argv; +} searchASTNode; + typedef struct searchASTExpr { int type; union { char *literal; - struct searchASTNode *child; + /* this was originally a pointer, but having it as one means you can't memcpy directly */ + struct searchASTNode child; } u; } searchASTExpr; -typedef struct searchASTNode { - parseFunc fn; - int argc; - struct searchASTExpr **argv; -} searchASTNode; +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__} +#define __NSASTRawNode(x, c, y) (searchASTNode){.fn = x, .argc = c, .argv = y} + +#define __NSASTSizeNode(x, y) __NSASTRawNode(x, __NSASTSizeOfArray(y), y) +#define __NSASTNode(x, ...) __NSASTSizeNode(x, ((searchASTExpr []){__VA_ARGS__})) -/* - * - * FEAR THE COMPOUND LITERALS - * MUHAHAHHAHAHAHAHAHAAH - * - */ -#define __NSASTExpr(x, y, ...) &(searchASTExpr){.type = x, .u.y = __VA_ARGS__} -#define __NSASTList(...) (searchASTExpr *[]){__VA_ARGS__} -#define __NSASTNode(x, ...) &(searchASTNode){.fn = x, .argc = sizeof(__NSASTList(__VA_ARGS__)) / sizeof(__NSASTList(__VA_ARGS__)[0]), .argv = __NSASTList(__VA_ARGS__)} #define __NSASTChild(...) __NSASTExpr(AST_NODE_CHILD, child, __VA_ARGS__) -#define NSASTLiteral(data) __NSASTExpr(AST_NODE_LITERAL, literal, data) +#define NSASTLiteral(value) __NSASTExpr(AST_NODE_LITERAL, literal, value) #define NSASTNode(fn, ...) __NSASTChild(__NSASTNode(fn, __VA_ARGS__)) +#define NSASTManualNode(fn, count, children) __NSASTChild(__NSASTRawNode(fn, count, children)) searchNode *search_astparse(searchCtx *, char *); @@ -228,12 +264,23 @@ int ast_nicksearch(searchASTExpr *tree, replyFunc reply, void *sender, wallFunc 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); -char *ast_printtree(char *buf, size_t bufsize, searchASTExpr *expr); +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); /* erk */ -extern CommandTree *searchTree; +extern searchList *globalterms; + +extern searchCmd *reg_nicksearch; +extern searchCmd *reg_chansearch; +extern searchCmd *reg_usersearch; extern UserDisplayFunc defaultuserfn; extern NickDisplayFunc defaultnickfn; extern ChanDisplayFunc defaultchanfn; +struct searchNode *argtoconststr(char *command, searchCtx *ctx, char *arg, char **p); + +#endif