Bläddra i källkod

* Clear bot counter using handle, not userrec, in case it couldn't be looked up temporarily

Bryan Drewery 16 år sedan
förälder
incheckning
b32e6f0b31
3 ändrade filer med 5 tillägg och 6 borttagningar
  1. 2 3
      src/botnet.c
  2. 2 2
      src/mod/irc.mod/irc.c
  3. 1 1
      src/mod/irc.mod/irc.h

+ 2 - 3
src/botnet.c

@@ -72,7 +72,7 @@ tand_t *findbot(const char *who)
   return NULL;
 }
 
-extern void counter_clear(struct userrec*);
+extern void counter_clear(const char* botnick);
 
 /* Add a tandem bot to our chain list
  */
@@ -108,8 +108,7 @@ void addbot(char *who, char *from, char *next, char flag, int vlocalhub, time_t
     ptr2->uplink = findbot(next);
   tands++;
 
-  if (ptr2->u)
-    counter_clear(ptr2->u);
+  counter_clear(who);
 }
 
 #ifdef G_BACKUP

+ 2 - 2
src/mod/irc.mod/irc.c

@@ -448,8 +448,8 @@ sdprintf("cookie: %s", out);
 }
 
 // Clear counter for bot
-void counter_clear(struct userrec *u) {
-  bot_counters[u->handle] = 0;
+void counter_clear(const char* botnick) {
+  bot_counters[botnick] = 0;
 }
 
 static inline int checkcookie(const char *chname, const memberlist* opper, const memberlist* opped, const char *cookie, int indexHint) {

+ 1 - 1
src/mod/irc.mod/irc.h

@@ -65,7 +65,7 @@ static void cache_invite(struct chanset_t *, char *, char *, char *, bool, bool)
 //static char *makecookie(const char *, const memberlist*, const memberlist*, const memberlist* = NULL, const memberlist* = NULL);
 void makecookie(char*, size_t, const char *, const memberlist*, const memberlist*, const memberlist* = NULL, const memberlist* = NULL);
 static int checkcookie(const char*, const memberlist*, const memberlist*, const char*, int);
-extern void counter_clear(struct userrec *);
+extern void counter_clear(const char*);
 static bool me_voice(struct chanset_t *);
 static bool any_ops(struct chanset_t *);
 static char *getchanmode(struct chanset_t *);