SearchCtx should contain 'type' - this is to make life easier when defining new searc...

[irc/quakenet/newserv.git] / newsearch / ns-country.c

diff --git a/newsearch/ns-country.c b/newsearch/ns-country.c
index eeba0f31fbfbac614c762fb50b3d6ccbebb76389..7bdb15719019fb6a5a4475a5cbf3f4f8c23bba67 100644 (file)
--- a/newsearch/ns-country.c
+++ b/newsearch/ns-country.c
@@ -8,49 +8,66 @@
 #include <stdlib.h>
 
 #include "../irc/irc_config.h"
-#include "../nick/nick.h"
 #include "../lib/irc_string.h"
+#include "../geoip/geoip.h"
+#include "../core/modules.h"
 
-void *country_exe(struct searchNode *thenode, int type, void *theinput);
-void *country_exe_real(struct searchNode *thenode, int type, void *theinput);
-void country_free(struct searchNode *thenode);
+void *country_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput);
+void country_free(searchCtx *ctx, struct searchNode *thenode);
 
 int ext;
 
-struct searchNode *country_parse(int type, int argc, char **argv) {
+struct searchNode *country_parse(searchCtx *ctx, int argc, char **argv) {
   struct searchNode *thenode;
+  GeoIP_LookupCode l;
+  long target;
 
-  if (type != SEARCHTYPE_NICK) {
+  if (ctx->type != SEARCHTYPE_NICK) {
     parseError = "country: this function is only valid for nick searches.";
     return NULL;
   }
 
+  if (argc<1) {
+    parseError = "country: usage: country <country 2 character ISO code>";
+    return NULL;
+  }
+
   ext = findnickext("geoip");
   if(ext == -1) {
     parseError = "country: Geoip module not loaded.";
     return NULL;
   }
   
+  l = ndlsym("geoip", "geoip_lookupcode");
+  target = l(argv[0]);
+  if(target == -1) {
+    parseError = "country: invalid country.";
+    return NULL;
+  }
 
-  thenode=(struct searchNode *)malloc(sizeof (struct searchNode));
+  if (!(thenode=(struct searchNode *)malloc(sizeof (struct searchNode)))) {
+    parseError = "malloc: could not allocate memory for this search.";
+    return NULL;
+  }
 
-  thenode->returntype = RETURNTYPE_INT;
-  thenode->localdata = NULL;
+  thenode->returntype = RETURNTYPE_BOOL;
+  thenode->localdata = (void *)target;
   thenode->exe = country_exe;
   thenode->free = country_free;
 
   return thenode;
 }
 
-void *country_exe(struct searchNode *thenode, int type, void *theinput) {
+void *country_exe(searchCtx *ctx, struct searchNode *thenode, void *theinput) {
   nick *np = (nick *)theinput;
+  long country = (long)thenode->localdata, rc = (long)np->exts[ext];
 
-  if (type != RETURNTYPE_INT)
+  if(country == rc)
     return (void *)1;
 
-  return (void *)np->exts[ext];
+  return (void *)0;
 }
 
-void country_free(struct searchNode *thenode) {
+void country_free(searchCtx *ctx, struct searchNode *thenode) {
   free(thenode);
 }