[cvslog] (2002-12-24 03:33:34 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Mon Dec 23 21:34:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-12-24 03:33:34 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/botcmd.c src/botnet.c src/cmds.c src/patch.h
     src/proto.h src/tcldcc.c

Log message:

Show who unlinked a bot when unlinked remotely. Patch by BarkerJr.

Note: modified to show botnetnick instead of "script" when a bot is
      unlinked via the 'unlink' Tcl command.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.434 eggdrop1.6/doc/UPDATES1.6:1.435
--- eggdrop1.6/doc/UPDATES1.6:1.434	Wed Dec 11 21:42:34 2002
+++ eggdrop1.6/doc/UPDATES1.6	Mon Dec 23 21:33:24 2002
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.434 2002/12/12 03:42:34 wcc Exp $
+$Id: UPDATES1.6,v 1.435 2002/12/24 03:33:24 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.14
 Found by  Fixed by  What...
+          BarkerJr  show who unlinked a bot when unlinked remotely
           poptix    fixed default setting for the help-path and text-path settings
           The_Dawn  fixed a problem in cmd_kick()/cmd_kickban() where the
                     victim's access is checked instead of the user's
Index: eggdrop1.6/src/botcmd.c
diff -u eggdrop1.6/src/botcmd.c:1.33 eggdrop1.6/src/botcmd.c:1.34
--- eggdrop1.6/src/botcmd.c:1.33	Mon Dec 23 20:30:04 2002
+++ eggdrop1.6/src/botcmd.c	Mon Dec 23 21:33:24 2002
@@ -3,7 +3,7 @@
  *   commands that comes across the botnet
  *   userfile transfer and update commands from sharebots
  *
- * $Id: botcmd.c,v 1.33 2002/12/24 02:30:04 wcc Exp $
+ * $Id: botcmd.c,v 1.34 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -581,7 +581,7 @@
       rfrom = from;
     putlog(LOG_CMDS, "*", "#%s# unlink %s (%s)", rfrom, undes, par[0] ? par :
 	   "No reason");
-    i = botunlink(-3, undes, par[0] ? par : NULL);
+    i = botunlink(-3, undes, par[0] ? par : NULL, rfrom);
     if (i == 1) {
       p = strchr(from, '@');
       if (p) {
Index: eggdrop1.6/src/botnet.c
diff -u eggdrop1.6/src/botnet.c:1.45 eggdrop1.6/src/botnet.c:1.46
--- eggdrop1.6/src/botnet.c:1.45	Mon Dec 23 20:30:04 2002
+++ eggdrop1.6/src/botnet.c	Mon Dec 23 21:33:24 2002
@@ -7,7 +7,7 @@
  *   linking, unlinking, and relaying to another bot
  *   pinging the bots periodically and checking leaf status
  *
- * $Id: botnet.c,v 1.45 2002/12/24 02:30:04 wcc Exp $
+ * $Id: botnet.c,v 1.46 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -864,7 +864,7 @@
 
 /* Break link with a tandembot
  */
-int botunlink(int idx, char *nick, char *reason)
+int botunlink(int idx, char *nick, char *reason, char *from)
 {
   char s[20];
   register int i;
@@ -908,15 +908,16 @@
 	bots = bots_in_subtree(bot);
 	users = users_in_subtree(bot);
 	if (reason && reason[0]) {
-	  simple_sprintf(s, "%s %s (%s) (lost %d bot%s and %d user%s)",
-	  		 BOT_UNLINKEDFROM, dcc[i].nick, reason, bots,
+	  simple_sprintf(s, "%s %s (%s (%s)) (lost %d bot%s and %d user%s)",
+	  		 BOT_UNLINKEDFROM, dcc[i].nick, reason, from, bots,
 			 (bots != 1) ? "s" : "", users, (users != 1) ?
 			 "s" : "");
 	  dprintf(i, "bye %s\n", reason);
 	} else {
-	  simple_sprintf(s, "%s %s (lost %d bot%s and %d user%s)",
-	  		 BOT_UNLINKEDFROM, dcc[i].nick, bots, (bots != 1) ?
-			 "s" : "", users, (users != 1) ? "s" : "");
+	  simple_sprintf(s, "%s %s (%s) (lost %d bot%s and %d user%s)",
+	  		 BOT_UNLINKEDFROM, dcc[i].nick, from, bots,
+                         (bots != 1) ? "s" : "", users,
+                         (users != 1) ? "s" : ""); 
 	  dprintf(i, "bye No reason\n");
 	}
 	chatout("*** %s\n", s);
Index: eggdrop1.6/src/cmds.c
diff -u eggdrop1.6/src/cmds.c:1.85 eggdrop1.6/src/cmds.c:1.86
--- eggdrop1.6/src/cmds.c:1.85	Mon Dec 23 20:30:04 2002
+++ eggdrop1.6/src/cmds.c	Mon Dec 23 21:33:24 2002
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  *
- * $Id: cmds.c,v 1.85 2002/12/24 02:30:04 wcc Exp $
+ * $Id: cmds.c,v 1.86 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1163,14 +1163,14 @@
   bot = newsplit(&par);
   i = nextbot(bot);
   if (i < 0) {
-    botunlink(idx, bot, par);
+    botunlink(idx, bot, par, dcc[idx].nick);
     return;
   }
   /* If we're directly connected to that bot, just do it
    * (is nike gunna sue?)
    */
   if (!egg_strcasecmp(dcc[i].nick, bot))
-    botunlink(idx, bot, par);
+    botunlink(idx, bot, par, dcc[i].nick);
   else {
     char x[40];
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.861 eggdrop1.6/src/patch.h:1.862
--- eggdrop1.6/src/patch.h:1.861	Mon Dec 23 21:10:22 2002
+++ eggdrop1.6/src/patch.h	Mon Dec 23 21:33:24 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.861 2002/12/24 03:10:22 wcc Exp $
+ * $Id: patch.h,v 1.862 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1040699256");		/* current unixtime */
+patch("1040700578");		/* current unixtime */
 /*
  *
  *
  */
-patch("makefile-cosmetic");
+patch("unlinkedby");
 /*
  *
  *
Index: eggdrop1.6/src/proto.h
diff -u eggdrop1.6/src/proto.h:1.49 eggdrop1.6/src/proto.h:1.50
--- eggdrop1.6/src/proto.h:1.49	Mon Dec 23 20:30:05 2002
+++ eggdrop1.6/src/proto.h	Mon Dec 23 21:33:24 2002
@@ -7,7 +7,7 @@
  * because they use structures in those
  * (saves including those .h files EVERY time) - Beldin
  *
- * $Id: proto.h,v 1.49 2002/12/24 02:30:05 wcc Exp $
+ * $Id: proto.h,v 1.50 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -69,7 +69,7 @@
 void tell_bots(int);
 void tell_bottree(int, int);
 int botlink(char *, int, char *);
-int botunlink(int, char *, char *);
+int botunlink(int, char *, char *, char *);
 void dump_links(int);
 void addbot(char *, char *, char *, char, int);
 void updatebot(int, char *, char, int);
Index: eggdrop1.6/src/tcldcc.c
diff -u eggdrop1.6/src/tcldcc.c:1.36 eggdrop1.6/src/tcldcc.c:1.37
--- eggdrop1.6/src/tcldcc.c:1.36	Mon Dec 23 20:30:05 2002
+++ eggdrop1.6/src/tcldcc.c	Mon Dec 23 21:33:24 2002
@@ -2,7 +2,7 @@
  * tcldcc.c -- handles:
  *   Tcl stubs for the dcc commands
  *
- * $Id: tcldcc.c,v 1.36 2002/12/24 02:30:05 wcc Exp $
+ * $Id: tcldcc.c,v 1.37 2002/12/24 03:33:24 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -808,7 +808,7 @@
   else {
     x = 1;
     if (!egg_strcasecmp(bot, dcc[i].nick))
-      x = botunlink(-2, bot, argv[2]);
+      x = botunlink(-2, bot, argv[2], botnetnick);
     else
       botnet_send_unlink(i, botnetnick, lastbot(bot), bot, argv[2]);
   }
----------------------- End of diff -----------------------



More information about the Changes mailing list