Merge.

[irc/quakenet/newserv.git] / newsearch / newsearch.h

diff --git a/newsearch/newsearch.h b/newsearch/newsearch.h
index 0a4b107a9e11b152639017c38abf3576c4da1647..a4414b30f2f31cf8a22714846e4cc84cab0a9277 100644 (file)
--- a/newsearch/newsearch.h
+++ b/newsearch/newsearch.h
@@ -6,9 +6,11 @@
 #include "../authext/authext.h"
 #include "../patricia/patricia.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
@@ -87,6 +89,8 @@ typedef struct searchCtx {
   int lastvar;
   struct searchCmd *searchcmd;
   nick *sender;
+  int limit;
+  void *displayfn;
 } searchCtx;
 
 /* Core functions */
@@ -121,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);
@@ -132,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);
@@ -140,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);
@@ -154,6 +160,7 @@ 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);
@@ -176,6 +183,10 @@ 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;
 
@@ -183,9 +194,9 @@ 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);
@@ -198,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, searchCmd *cmd, nick *sender);
+void newsearch_ctxinit(searchCtx *ctx, searchParseFunc searchfn, replyFunc replyfn, wallFunc wallfn, void *arg, searchCmd *cmd, nick *sender, void *displayfn, int limit);
 
 /* AST functions */
 
@@ -227,6 +238,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__}
@@ -264,3 +281,6 @@ extern UserDisplayFunc defaultuserfn;
 extern NickDisplayFunc defaultnickfn;
 extern ChanDisplayFunc defaultchanfn;
 
+struct searchNode *argtoconststr(char *command, searchCtx *ctx, char *arg, char **p);
+
+#endif