CHANSERV: remove accidental sendemail from SETEMAIL command.

[irc/quakenet/newserv.git] / trusts / migration.c

diff --git a/trusts/migration.c b/trusts/migration.c
index 37417e53c27492091337e174388ab2c1c74c78a1..34139292da0659343a8892cbc810b4bc5d5059ea 100644 (file)
--- a/trusts/migration.c
+++ b/trusts/migration.c
@@ -1,5 +1,6 @@
 #include "../nterfacer/nterfacer.h"
 #include "../lib/strlfunc.h"
+#include "../core/nsmalloc.h"
 #include "trusts.h"
 #include <stdio.h>
 #include <string.h>
@@ -17,83 +18,13 @@ static void tm_fini(trustmigration *tm, int errcode) {
     tm->schedule = NULL;
   }
 
-  free(tm);
+  nsfree(POOL_TRUSTS, tm);
 }
 
 void migration_stop(trustmigration *tm) {
   tm_fini(tm, MIGRATION_STOPPED);
 }
 
-static int tm_parsegroup(trustmigration *tm, unsigned int id, const char *oline) {
-  char *line, *createdby, *contact, *comment, *name;
-  unsigned int trustedfor, maxperident, mode, maxusage;
-  unsigned long expires, lastseen, lastmaxusereset;
-  char xbuf[1024];
-  int pos;
-
-/* ticket35153,14,20,1,1,17,1879854575,1222639249,0,nterfacer,Qwhois&2120764,Non-Commercial Bouncer (Created by: doomie)
-   name       ,current
-                 ,trustedfor
-                    ,mode
-                      ,maxperident
-                        ,maxusage
-                           ,expires  ,lastseen   ,lastmaxusereset
-                                                   ,createdby,contact       ,comment
-*/
-  int r;
-
-  strlcpy(xbuf, oline, sizeof(xbuf));
-  name = xbuf;
-
-  line = strchr(name, ',');
-  if(!line)
-    return 1;
-  *line++ = '\0';
-
-  r = sscanf(line, "%*u,%u,%u,%u,%u,%lu,%lu,%lu,%n",
-             /*current, */ &trustedfor, &mode, &maxperident, 
-             &maxusage, &expires, &lastseen, &lastmaxusereset, &pos);
-  if(r != 7)
-    return 2;
-
-  createdby = &line[pos];
-  contact = strchr(createdby, ',');
-  if(!contact)
-    return 3;
-  *contact++ = '\0';
-
-  comment = strchr(contact, ',');
-  if(!comment)
-    return 4;
-  *comment++ = '\0';  
-
-  tm->group(tm->tag, id, name, trustedfor, mode, maxperident, maxusage, (time_t)expires, (time_t)lastseen, (time_t)lastmaxusereset, createdby, contact, comment);
-  return 0;
-}
-
-static int tm_parsehost(trustmigration *tm, unsigned int id, char *line) {
-  unsigned int max;
-  unsigned long lastseen;
-  char *ip, xbuf[1024];
-
-/* 213.230.192.128/26,20,23,1222732944
-   ip                ,cur,max,lastseen */
-
-  strlcpy(xbuf, line, sizeof(xbuf));
-  ip = line = xbuf;
-
-  line = strchr(line, ',');
-  if(!line)
-    return 5;
-  *line++ = '\0';
-
-  if(sscanf(line, "%*u,%u,%lu", /*current, */&max, &lastseen) != 2)
-    return 6;
-
-  tm->host(tm->tag, id, ip, max, lastseen);
-  return 0;
-}
-
 static void tm_stage2(int failure, int linec, char **linev, void *tag) {
   trustmigration *tm = tag;
   char *finishline;
@@ -131,34 +62,47 @@ static void tm_stage2(int failure, int linec, char **linev, void *tag) {
 
   for(i=0;i<linec-1;i++) {
     char *linestart = &linev[i][2], type = linev[i][0];
-    if(type == 'G' || type == 'H') {
-      char *realline;
-      unsigned int id;
-      int pos, ret;
+    if(type == 'G') {
+      trustgroup tg;
 
-      if(sscanf(linestart, "#%u,%n", &id, &pos) != 1) {
-        tm_fini(tm, 10);
+      if(!parsetg(linestart, &tg, 1)) {
+        tm_fini(tm, 150);
         return;
       }
 
-      if(id > tm->cur) {
-        /* this one is missing and we've received a later one instead, update tm->cur to point to this one */
-        tm->cur = id;
-      } else if(id < tm->cur) {
+      if(tg.id >= tm->cur)
+        tm->group(tm->tag, &tg);
+          
+      freesstring(tg.name);
+      freesstring(tg.createdby);
+      freesstring(tg.contact);
+      freesstring(tg.comment);
+
+      if(tg.id < tm->cur) {
         tm_fini(tm, 11);
         return;
       }
 
-      realline = &linestart[pos];
-      if(type == 'G') {
-        ret = tm_parsegroup(tm, id, realline);
-      } else {
-        ret = tm_parsehost(tm, id, realline);
+      if(tg.id > tm->cur)
+        tm->cur = tg.id;
+    } else if (type == 'H') {
+      trusthost th;
+      unsigned int groupid;
+
+      if(!parseth(linestart, &th, &groupid, 1)) {
+        tm_fini(tm, 151);
+        return;
       }
-      if(ret) {
-        tm_fini(tm, ret);
+
+      if(groupid < tm->cur) {
+        tm_fini(tm, 11);
         return;
       }
+
+      if(groupid > tm->cur)
+        tm->cur = groupid;
+
+      tm->host(tm->tag, &th, groupid);
     } else {
       tm_fini(tm, 11);
       return;
@@ -172,7 +116,7 @@ static void tm_trustdump(trustmigration *tm) {
   char buf[100];
 
   if(tm->cur >= tm->count) {
-    tm->fini(tm->tag, 0);
+    tm_fini(tm, 0);
     return;
   }
 
@@ -206,7 +150,7 @@ static void tm_stage1(int failure, int linec, char **linev, void *tag) {
 }
 
 trustmigration *migration_start(TrustMigrationGroup group, TrustMigrationHost host, TrustMigrationFini fini, void *tag) {
-  trustmigration *tm = malloc(sizeof(trustmigration));
+  trustmigration *tm = nsmalloc(POOL_TRUSTS, sizeof(trustmigration));
   if(!tm)
     return NULL;
 
@@ -218,5 +162,10 @@ trustmigration *migration_start(TrustMigrationGroup group, TrustMigrationHost ho
   tm->tag = tag;
 
   tm->schedule = nterfacer_sendline("R", "relay", 4, (char *[]){"1", "1", "O", "trustdump #9999999 1"}, tm_stage1, tm);
+  if(!tm->schedule) {
+    nsfree(POOL_TRUSTS, tm);
+    return NULL;
+  }
+
   return tm;
 }