Merge.

[irc/quakenet/newserv.git] / trojanscan / trojanscan.c

diff --git a/trojanscan/trojanscan.c b/trojanscan/trojanscan.c
index 309b50d3103766fa47e4fc7ae3fd230b041ab804..21d2849576eef63931c1f4442f58cbb61295c1db 100644 (file)
--- a/trojanscan/trojanscan.c
+++ b/trojanscan/trojanscan.c
@@ -15,6 +15,7 @@
 #include "../lib/strlfunc.h"
 #include "../lib/version.h"
 #include "../core/nsmalloc.h"
+#include <stdint.h>
 
 #define tmalloc(x)     nsmalloc(POOL_TROJANSCAN, x)
 #define tfree(x)       nsfree(POOL_TROJANSCAN, x)
@@ -129,6 +130,24 @@ void _fini(void) {
   for (i=0;i<trojanscan_tailpoolsize;i++)
     freesstring(trojanscan_tailpool[i]);
   trojanscan_database_close();
+
+  deletecommandfromtree(trojanscan_cmds, "showcommands", &trojanscan_showcommands);
+  deletecommandfromtree(trojanscan_cmds, "help", &trojanscan_help);
+  deletecommandfromtree(trojanscan_cmds, "hello", &trojanscan_hello);
+  deletecommandfromtree(trojanscan_cmds, "join", &trojanscan_userjoin);
+  deletecommandfromtree(trojanscan_cmds, "chanlist", &trojanscan_chanlist);
+  deletecommandfromtree(trojanscan_cmds, "whois", &trojanscan_whois);
+  deletecommandfromtree(trojanscan_cmds, "changelev", &trojanscan_changelev);
+  deletecommandfromtree(trojanscan_cmds, "deluser", &trojanscan_deluser);
+  deletecommandfromtree(trojanscan_cmds, "mew", &trojanscan_mew);
+  deletecommandfromtree(trojanscan_cmds, "status", &trojanscan_status);
+  deletecommandfromtree(trojanscan_cmds, "listusers", &trojanscan_listusers);
+  deletecommandfromtree(trojanscan_cmds, "rehash", &trojanscan_rehash);
+  deletecommandfromtree(trojanscan_cmds, "cat", &trojanscan_cat);
+  deletecommandfromtree(trojanscan_cmds, "reschedule", &trojanscan_reschedule);
+
+  destroycommandtree(trojanscan_cmds);
+  nscheckfreeall(POOL_TROJANSCAN);
 }
 
 static void trojanscan_connect_nick(void *arg) {
@@ -137,7 +156,7 @@ static void trojanscan_connect_nick(void *arg) {
 
   mnick = getcopyconfigitem("trojanscan", "nick", "T", NICKLEN);
   myident = getcopyconfigitem("trojanscan", "ident", "trojanscan", NICKLEN);
-  myhost = getcopyconfigitem("trojanscan", "hostname", "trojanscan.slug.netsplit.net", HOSTLEN);
+  myhost = getcopyconfigitem("trojanscan", "hostname", "trojanscan.quakenet.org", HOSTLEN);
   myrealname = getcopyconfigitem("trojanscan", "realname", "Trojanscan v" TROJANSCAN_VERSION, REALLEN);
   myauthname = getcopyconfigitem("trojanscan", "authname", "T", ACCOUNTLEN);
 
@@ -354,7 +373,9 @@ void trojanscan_free_database(void) {
   trojanscan_database.total_channels = 0;
   trojanscan_database.total_phrases = 0;
   trojanscan_database.total_worms = 0;
-  
+  trojanscan_database.channels = NULL;
+  trojanscan_database.phrases = NULL;
+  trojanscan_database.worms = NULL;  
 }
 
 char *trojanscan_sanitise(char *input) {
@@ -656,7 +677,7 @@ void trojanscan_registerclones(void *arg) {
   trojanscan_mainchanmsg("n: swarm (%d clones) created.", TROJANSCAN_CLONE_TOTAL);
   trojanscan_swarm_created = 1;
 
-  trojanscan_initialschedule = scheduleoneshot(time(NULL) + 5, &trojanscan_fill_channels, NULL);
+  trojanscan_initialschedule = scheduleoneshot(time(NULL) + 60, &trojanscan_fill_channels, NULL);
 }
 
 int trojanscan_status(void *sender, int cargc, char **cargv) {
@@ -720,7 +741,7 @@ int trojanscan_whois(void *sender, int cargc, char **cargv) {
     for(i=0;i<TROJANSCAN_CLONE_TOTAL;i++) {
       if(trojanscan_swarm[i].clone->nick && !ircd_strcmp(trojanscan_swarm[i].clone->nick, np2->nick)) {
         trojanscan_reply(np, "Nickname   : %s", np2->nick);
-        trojanscan_reply(np, "Swarm      : yes", trojanscan_swarm[i].clone->nick);
+        trojanscan_reply(np, "Swarm      : yes");
         return CMD_OK;
       }
     }
@@ -1419,7 +1440,7 @@ void trojanscan_watch_clone_update(struct trojanscan_prechannels *hp, int count)
   struct trojanscan_templist *markedlist = NULL;
 
   if(count > 0) {
-    markedlist = (struct trojanscan_templist *)malloc(count * sizeof(struct trojanscan_templist));
+    markedlist = (struct trojanscan_templist *)tmalloc(count * sizeof(struct trojanscan_templist));
     if (!markedlist)
       return;
     memset(markedlist, 0, sizeof(struct trojanscan_templist) * count);
@@ -1977,16 +1998,14 @@ static int trojanscan_hostcount(nick *sender, int hostmode, char *mask, int mask
   nick *np = NULL; /* sigh at warnings */
 
   if(hostmode)
-    for (j=0;j<NICKHASHSIZE;j++)
-      for (np=nicktable[j];np;np=np->next)
-        if (np->ipnode==sender->ipnode)
-          usercount++;
+    usercount = sender->ipnode->usercount;
 
   if(usercount > TROJANSCAN_MAX_HOST_GLINE) {
     hostmode = 0;
     usercount = 0;
   }
 
+  /* should really go through the ipnode I guess */
   if(!hostmode)
     for (j=0;j<NICKHASHSIZE;j++)
       for (np=nicktable[j];np;np=np->next)
@@ -2060,9 +2079,9 @@ void trojanscan_phrasematch(channel *chp, nick *sender, trojanscan_phrases *phra
     trojanscan_database_query("INSERT INTO hits (nickname, ident, host, phrase, messagetype, glined) VALUES ('%s', '%s', '%s', %d, '%c', %d)", enick, eident, ehost, phrase->id, messagetype, glining);
     trojanscan_database.glines++;
     
-    irc_send("%s GL * +%s %d :You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours\r\n", mynumeric->content, glinemask, glinetime * 3600, sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime);
+    irc_send("%s GL * +%s %d %jd :You (%s!%s@%s) are infected with a trojan (%s/%d), see %s%d for details - banned for %d hours\r\n", mynumeric->content, glinemask, glinetime * 3600, (intmax_t)time(NULL), sender->nick, sender->ident, sender->host->name->content, worm->name->content, phrase->id, TROJANSCAN_URL_PREFIX, worm->id, glinetime);
 
-    trojanscan_mainchanmsg("g: *!%s t: %c u: %s!%s@%s%s%s c: %d w: %s%s p: %d f: %d", glinemask, messagetype, sender->nick, sender->ident, sender->host->name->content, messagetype=='N'||messagetype=='M'||messagetype=='P'?" #: ":"", messagetype=='N'||messagetype=='M'||messagetype=='P'?chp->index->name->content:"", usercount, worm->name->content, worm->epidemic?"(E)":"", phrase->id, frequency);
+    trojanscan_mainchanmsg("g: *!%s t: %c u: %s!%s@%s%s%s c: %d w: %s%s p: %d f: %d%s%s", glinemask, messagetype, sender->nick, sender->ident, sender->host->name->content, messagetype=='N'||messagetype=='M'||messagetype=='P'?" #: ":"", messagetype=='N'||messagetype=='M'||messagetype=='P'?chp->index->name->content:"", usercount, worm->name->content, worm->epidemic?"(E)":"", phrase->id, frequency, matchbuf[0]?" --: ":"", matchbuf[0]?matchbuf:"");
   }
 }