Clean up fakeusers even more.

--HG--
branch : fakeuser

diff --git a/fakeusers/fakeusers.c b/fakeusers/fakeusers.c
index 6fcedc234ff23fd2dd1eb060f7d98ae0fe87bef5..91274628047eaa7078fd6fc29c5fde6396ea5020 100644 (file)
--- a/fakeusers/fakeusers.c
+++ b/fakeusers/fakeusers.c
@@ -34,165 +34,170 @@ typedef struct fakeuser {
   struct fakeuser *next;
 } fakeuser;
 
-fakeuser *fakeuserlist = NULL;
-
-static void fakeuser_cleanup();
-static int fakeuser_loaddb();
-static void fakeusers_load(const DBAPIResult *res, void *arg);
-static void fakeuser_handler(nick *user, int command, void **params);
-static int fakeadd(void *sender, int cargc, char **cargv);
-static int fakelist(void *sender, int cargc, char **cargv);
-static int fakekill(void *sender, int cargc, char **cargv);
-static void schedulefakeuser(void *arg);
-static fakeuser *findfakeuserbynick(char *nick);
-static void fake_remove(char *nickname);
-static fakeuser *fake_add(fakeuser *details);
-
+static fakeuser *fakeuserlist;
 static DBAPIConn *nofudb;
 
-void fakeuser_cleanup() {
+static void reconnectfakeuser(void *arg);
+
+static fakeuser *findfakeuserbynick(char *nick) {
   fakeuser *fake;
-  void *next;
 
-  for (fake = fakeuserlist; fake; fake = next) {
-    deregisterlocaluser(fake->user, "Signing off");
-    next = fake->next;
-    free(fake);
-  }
+  for (fake = fakeuserlist; fake; fake = fake->next)
+    if (!ircd_strcmp(nick, fake->nick))
+      return fake;
 
-  fakeuserlist = NULL;
+  return NULL;
 }
 
-int fakeuser_loaddb() {
-  if (!nofudb) {
-    nofudb = dbapi2open(DBAPI2_DEFAULT, "fakeusers");
+static void fake_free(fakeuser *fake) {
+  fakeuser **pnext;
 
-    if (!nofudb) {
-      Error("fakeuser", ERR_STOP, "Could not connect to database.");
-      return 0;
+  if (fake->user)
+    deregisterlocaluser(fake->user, "Signing off");
+
+  deleteschedule(NULL, &reconnectfakeuser, fake);
+  
+  for (pnext = &fakeuserlist; *pnext; pnext = &((*pnext)->next)) {
+    if (*pnext == fake) {
+      *pnext = fake->next;
+      break;
     }
   }
 
-  nofudb->createtable(nofudb, NULL, NULL,
-                      "CREATE TABLE ? ("
-                      "nick      VARCHAR(?)  NOT NULL,"
-                      "ident     VARCHAR(?)  NOT NULL,"
-                      "host      VARCHAR(?)  NOT NULL,"
-                      "realname  VARCHAR(?)  NOT NULL,"
-                      "PRIMARY KEY (nick))", "Tdddd", "fakeusers", NICKLEN, USERLEN, HOSTLEN, REALLEN);
-
-  nofudb->query(nofudb, fakeusers_load, NULL,
-                "SELECT nick, ident, host, realname FROM ?", "T", "fakeusers");
+  free(fake);
+}
 
-  return 1;
+static void fake_remove(fakeuser *fake) {
+  nofudb->squery(nofudb, "DELETE FROM ? WHERE nick = ?", "Ts", "fakeusers", fake->nick);
+  
+  fake_free(fake);
 }
 
-void fakeusers_load(const DBAPIResult *res, void *arg) {
-  fakeuser fakeuser;
+static void fakeuser_handler(nick *user, int command, void **params) {
+  if (command == LU_KILLED) {
+    fakeuser *fake;
+    time_t timenow = time(NULL);
 
-  if (!res)
-    return;
+    fake = findfakeuserbynick(user->nick);
 
-  if (!res->success) {
-    Error("fakeuser", ERR_ERROR, "Error loading fakeuser list.");
-    res->clear(res);
-    return;
-  }
+    if (!fake) {
+      controlwall(NO_OPER, NL_FAKEUSERS, "Error: A fakeuser was killed, but wasn't found in the list");
+      Error("fakeuser", ERR_ERROR, "A fakeuser was killed, but wasn't found in the list");
+      return;
+    }
 
-  while (res->next(res)) {
-    strlcpy(fakeuser.nick, res->get(res, 0), NICKLEN + 1);
-    strlcpy(fakeuser.ident, res->get(res, 1), USERLEN + 1);
-    strlcpy(fakeuser.host, res->get(res, 2), HOSTLEN + 1);
-    strlcpy(fakeuser.realname, res->get(res, 3), REALLEN + 1);
-    fake_add(&fakeuser);
-  }
+    fake->user = NULL;
 
-  scheduleoneshot(time(NULL) + 1, schedulefakeuser, NULL);
-  res->clear(res);
+    if (timenow - fake->lastkill < KILL_TIME) {
+      controlwall(NO_OPER, NL_FAKEUSERS, "Fake user %s!%s@%s (%s) KILL'ed twice under in %d seconds. Removing.",
+                  fake->nick, fake->ident, fake->host, fake->realname, KILL_TIME);
+      fake_remove(fake);
+      return;
+    }
+
+    fake->lastkill = timenow;
+
+    scheduleoneshot(time(NULL) + KILL_WAIT, &reconnectfakeuser, fake);
+  }
 }
 
-nick *register_fakeuseronnet(fakeuser *details) {
+static void reconnectfakeuser(void *arg) {
+  fakeuser *fake = arg;
   nick *user;
+  
+  if (fake->user)
+    return;
 
-  if ((user = getnickbynick(details->nick)) && (IsOper(user) || IsService(user) || IsXOper(user))) {
-    return NULL;
-  }
+  if ((user = getnickbynick(fake->nick)) && (IsOper(user) || IsService(user) || IsXOper(user)))
+    return;
 
-  return registerlocaluser(details->nick, details->ident, details->host, details->realname,
-                           NULL, UMODE_INV | UMODE_DEAF, &fakeuser_handler);
+  fake->user = registerlocaluser(fake->nick, fake->ident, fake->host, fake->realname,
+                                 NULL, UMODE_INV | UMODE_DEAF, &fakeuser_handler);
 }
 
-fakeuser *fake_add(fakeuser *details) {
-  fakeuser *newfake;
+static fakeuser *fake_add(const char *nick, const char *ident, const char *host, const char *realname) {
+  fakeuser *fake;
 
-  newfake = malloc(sizeof(fakeuser));
+  fake = malloc(sizeof(fakeuser));
 
-  if (!newfake) {
+  if (!fake)
     return NULL;
-  }
 
-  memcpy(newfake, details, sizeof(fakeuser));
+  strlcpy(fake->nick, nick, NICKLEN + 1);
+  strlcpy(fake->ident, ident, USERLEN + 1);
+  strlcpy(fake->host, host, HOSTLEN + 1);
+  strlcpy(fake->realname, realname, REALLEN + 1);
 
-  newfake->user = NULL;
-  newfake->lastkill = 0;
+  fake->user = NULL;
+  fake->lastkill = 0;
 
-  newfake->next = fakeuserlist;
-  fakeuserlist = newfake;
-  return newfake;
+  fake->next = fakeuserlist;
+  fakeuserlist = fake;
+
+  scheduleoneshot(time(NULL) + 1, reconnectfakeuser, fake);
+  
+  return fake;
 }
 
-void fake_remove(char *nickname) {
-  fakeuser *fake, *prev;
+static fakeuser *fake_create(const char *nick, const char *ident, const char *host, const char *realname) {
+  fakeuser *fake;
+  
+  fake = fake_add(nick, ident, host, realname);
 
-  for (fake = fakeuserlist; fake; fake = fake->next) {
-    if (!ircd_strcmp(nickname, fake->nick)) {
-      if (fake == fakeuserlist)
-        fakeuserlist = fake->next;
-      else
-        prev->next = fake->next;
+  if (!fake)
+    return NULL;
+  
+  nofudb->squery(nofudb, "INSERT INTO ? (nick, ident, host, realname) VALUES (?,?,?,?)", "Tssss", "fakeusers",
+                 fake->nick, fake->ident, fake->host, fake->realname);
 
-      if(fake->user)
-        deregisterlocaluser(fake->user, "Signing off");
+  return fake;
+}
 
-      free(fake);
-      return;
-    }
+static void fakeusers_load(const DBAPIResult *res, void *arg) {
+  if (!res)
+    return;
 
-    prev = fake;
+  if (!res->success) {
+    Error("fakeuser", ERR_ERROR, "Error loading fakeuser list.");
+    res->clear(res);
+    return;
   }
-}
-
-void fakeuser_handler(nick *user, int command, void **params) {
-  if (command == LU_KILLED) {
-    fakeuser *item;
-    time_t timenow = time(NULL);
 
-    item = findfakeuserbynick(user->nick);
+  while (res->next(res))
+    fake_add(res->get(res, 0), res->get(res, 1), res->get(res, 2), res->get(res, 3));
 
-    if (!item) {
-      controlwall(NO_OPER, NL_FAKEUSERS, "Error: A fakeuser was killed, but wasn't found in the list");
-      Error("fakeuser", ERR_ERROR, "A fakeuser was killed, but wasn't found in the list");
-      return;
-    }
+  res->clear(res);
+}
 
-    item->user = NULL;
+static int fakeuser_loaddb() {
+  if (!nofudb) {
+    nofudb = dbapi2open(DBAPI2_DEFAULT, "fakeusers");
 
-    if (timenow - item->lastkill < KILL_TIME) {
-      controlwall(NO_OPER, NL_FAKEUSERS, "Fake user %s!%s@%s (%s) KILL'ed twice under in %d seconds. Removing.", item->nick, item->ident, item->host, item->realname, KILL_TIME);
-      nofudb->squery(nofudb, "DELETE FROM ? WHERE nick = ?", "Ts", "fakeusers", item->nick);
-      fake_remove(item->nick);
-      return;
+    if (!nofudb) {
+      Error("fakeuser", ERR_STOP, "Could not connect to database.");
+      return 0;
     }
+  }
 
-    item->lastkill = timenow;
+  nofudb->createtable(nofudb, NULL, NULL,
+                      "CREATE TABLE ? ("
+                      "nick      VARCHAR(?)  NOT NULL,"
+                      "ident     VARCHAR(?)  NOT NULL,"
+                      "host      VARCHAR(?)  NOT NULL,"
+                      "realname  VARCHAR(?)  NOT NULL,"
+                      "PRIMARY KEY (nick))", "Tdddd", "fakeusers", NICKLEN, USERLEN, HOSTLEN, REALLEN);
 
-    scheduleoneshot(time(NULL) + KILL_WAIT, schedulefakeuser, item);
-  }
+  nofudb->query(nofudb, fakeusers_load, NULL,
+                "SELECT nick, ident, host, realname FROM ?", "T", "fakeusers");
+
+  return 1;
 }
 
-int fakeadd(void *sender, int cargc, char **cargv) {
-  fakeuser newfake;
+static int fakeadd(void *source, int cargc, char **cargv) {
+  nick *sender = source;
   fakeuser *fake;
+  char *nick, *ident, *realname;
+  char host[HOSTLEN + 1];
 
   if (cargc == 0)
     return CMD_USAGE;
@@ -204,40 +209,38 @@ int fakeadd(void *sender, int cargc, char **cargv) {
     return CMD_ERROR;
   }
 
-  strlcpy(newfake.nick, cargv[0], NICKLEN + 1);
+  nick = cargv[0];
 
   if (cargc < 4)
-    strlcpy(newfake.realname, cargv[0], REALLEN + 1);
+    realname = cargv[0];
   else
-    strlcpy(newfake.realname, cargv[3], REALLEN + 1);
+    realname = cargv[3];
 
   if (cargc < 3) {
-    strlcpy(newfake.host, cargv[0], NICKLEN + 1);
-    strlcat(newfake.host, ".fakeusers.quakenet.org", HOSTLEN + 1);
+    strlcpy(host, cargv[0], NICKLEN + 1);
+    strlcat(host, ".fakeusers.quakenet.org", HOSTLEN + 1);
   } else
-    strlcpy(newfake.host, cargv[2], HOSTLEN + 1);
+    strlcpy(host, cargv[2], HOSTLEN + 1);
 
   if (cargc < 2)
-    strlcpy(newfake.ident, cargv[0], USERLEN + 1);
+    ident = cargv[0];
   else
-    strlcpy(newfake.ident, cargv[1], USERLEN + 1);
+    ident = cargv[1];
 
-  fake = fake_add(&newfake);
+  fake = fake_create(nick, ident, host, realname);
 
-  if (!fake) {
+  if (!fake)
     return CMD_ERROR;
-  }
 
-  nofudb->squery(nofudb, "INSERT INTO ? (nick, ident, host, realname) VALUES (?,?,?,?)", "Tssss", "fakeusers", fake->nick, fake->ident, fake->host, fake->realname);
   controlreply(sender, "Added fake user %s", fake->nick);
-  controlwall(NO_OPER, NL_FAKEUSERS, "Fake user %s!%s@%s (%s) added by %s/%s", fake->nick, fake->ident,
-              fake->host, fake->realname, ((nick *)sender)->nick, ((nick *)sender)->authname);
+  controlwall(NO_OPER, NL_FAKEUSERS, "%s added fake user: %s!%s@%s (%s)", controlid(sender),
+              fake->nick, fake->ident, fake->host, fake->realname);
 
-  scheduleoneshot(time(NULL) + 1, schedulefakeuser, fake);
+  scheduleoneshot(time(NULL) + 1, &reconnectfakeuser, fake);
   return CMD_OK;
 }
 
-int fakelist(void *sender, int cargc, char **cargv) {
+static int fakelist(void *sender, int cargc, char **cargv) {
   fakeuser *fake;
   int fakeusercount = 0;
 
@@ -256,7 +259,7 @@ int fakelist(void *sender, int cargc, char **cargv) {
   return CMD_OK;
 }
 
-int fakekill(void *sender, int cargc, char **cargv) {
+static int fakekill(void *sender, int cargc, char **cargv) {
   fakeuser *fake;
 
   if (cargc == 0)
@@ -274,28 +277,10 @@ int fakekill(void *sender, int cargc, char **cargv) {
   controlwall(NO_OPER, NL_FAKEUSERS, "Fake user %s!%s@%s (%s) removed by %s/%s", fake->nick, fake->ident,
               fake->host, fake->realname, ((nick *)sender)->nick, ((nick *)sender)->authname);
 
-  fake_remove(cargv[0]);
+  fake_remove(fake);
   return CMD_OK;
 }
 
-void schedulefakeuser(void *arg) {
-  fakeuser *fake;
-
-  for (fake = fakeuserlist; fake; fake = fake->next)
-    if (!fake->user)
-      fake->user = register_fakeuseronnet(fake);
-}
-
-fakeuser *findfakeuserbynick(char *nick) {
-  fakeuser *fake;
-
-  for (fake = fakeuserlist; fake; fake = fake->next)
-    if (!ircd_strcmp(nick, fake->nick))
-      return fake;
-
-  return NULL;
-}
-
 void _init() {
   if (!fakeuser_loaddb()) {
     Error("fakeuser", ERR_FATAL, "Cannot load database");
@@ -308,8 +293,13 @@ void _init() {
 }
 
 void _fini() {
-  fakeuser_cleanup();
-  deleteallschedules(schedulefakeuser);
+  fakeuser *fake, *next;
+
+  for (fake = fakeuserlist; fake; fake = next) {
+    next = fake->next;
+    fake_free(fake);
+  }
+
   deregistercontrolcmd("fakeuser", &fakeadd);
   deregistercontrolcmd("fakelist", &fakelist);
   deregistercontrolcmd("fakekill", &fakekill);