[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Tue Dec 4 22:13:00 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-12-05 04:12:17 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/patch.h src/mod/transfer.mod/transfer.c
     src/mod/transfer.mod/transfer.h
     src/mod/transfer.mod/language/transfer.english.lang

Log message:

part of the botnet protocol got put into a language entry for transfer.mod and another entry was in the wrong location which was causing a crash on all failed userfile transfers

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.238 eggdrop1.6/doc/UPDATES1.6:1.239
--- eggdrop1.6/doc/UPDATES1.6:1.238	Tue Dec  4 14:12:55 2001
+++ eggdrop1.6/doc/UPDATES1.6	Tue Dec  4 22:12:06 2001
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.238 2001/12/04 20:12:55 guppy Exp $
+$Id: UPDATES1.6,v 1.239 2001/12/05 04:12:06 guppy Exp $
 
 Changes in eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.7
 Found by  Fixed by  What...
+Wcc       guppy     fixed a mixed up transfer language entry that caused a crash
 various   nakee     added '--disable-cc-optimization' to disable -O2 flags
 Abraham   Eule      added a missing channel membercheck in a few commands
 S7reaM    guppy     tcl_newban had some silly guppy logic which caused a crash
Index: eggdrop1.6/src/mod/transfer.mod/language/transfer.english.lang
diff -u eggdrop1.6/src/mod/transfer.mod/language/transfer.english.lang:1.3 eggdrop1.6/src/mod/transfer.mod/language/transfer.english.lang:1.4
--- eggdrop1.6/src/mod/transfer.mod/language/transfer.english.lang:1.3	Sun Dec  2 15:38:57 2001
+++ eggdrop1.6/src/mod/transfer.mod/language/transfer.english.lang	Tue Dec  4 22:12:07 2001
@@ -33,7 +33,7 @@
 0xf1b,Thanks for the file!\n
 0xf1c,NOTICE %s :Thanks for the file!\n
 0xf1d,Lost userfile transfer from %s; aborting.
-0xf1e,bye\n
+# 0xf1e, < this one is now empty
 0xf1f,Disconnected %s (aborted userfile transfer)
 0xf20,Lost dcc send %s from %s!%s (%lu/%lu)
 0xf21,(!) reget packet from %s for %s is invalid!	
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.43 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.44
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.43	Sun Dec  2 01:35:07 2001
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Tue Dec  4 22:12:07 2001
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.43 2001/12/02 07:35:07 guppy Exp $
+ * $Id: transfer.c,v 1.44 2001/12/05 04:12:07 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -825,7 +825,7 @@
 	     dcc[y].nick);
       unlink(dcc[idx].u.xfer->filename);
       /* Drop that bot */
-      dprintf(y,TRANSFER_BYE);
+      dprintf(y, "bye\n");
       egg_snprintf(s, sizeof s,TRANSFER_USERFILE_DISCON,
 		   dcc[y].nick);
       botnet_send_unlinked(y, dcc[y].nick, s);
@@ -1056,7 +1056,7 @@
     /* Note: no need to unlink the xfer file, as it's already unlinked. */
     xnick[0] = 0;
     /* Drop that bot */
-    dprintf(-dcc[y].sock,TRANSFER_BYE);
+    dprintf(-dcc[y].sock, "bye\n");
     egg_snprintf(s, sizeof s, TRANSFER_USERFILE_DISCON,
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, s);
@@ -1142,7 +1142,7 @@
     }
     unlink(dcc[i].u.xfer->filename);
     putlog(LOG_BOTS, "*",TRANSFER_USERFILE_TIMEOUT);
-    dprintf(y,TRANSFER_BYE);
+    dprintf(y, "bye\n");
     egg_snprintf(xx, sizeof xx,TRANSFER_DICONNECT_TIMEOUT,
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, xx);
Index: eggdrop1.6/src/mod/transfer.mod/transfer.h
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.h:1.12 eggdrop1.6/src/mod/transfer.mod/transfer.h:1.13
--- eggdrop1.6/src/mod/transfer.mod/transfer.h:1.12	Sun Dec  2 01:11:15 2001
+++ eggdrop1.6/src/mod/transfer.mod/transfer.h	Tue Dec  4 22:12:07 2001
@@ -1,7 +1,7 @@
 /*
  * transfer.h -- part of transfer.mod
  *
- * $Id: transfer.h,v 1.12 2001/12/02 07:11:15 guppy Exp $
+ * $Id: transfer.h,v 1.13 2001/12/05 04:12:07 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -113,8 +113,8 @@
 #define TRANSFER_FAILED_MOVE        get_language(0xf1a)
 #define TRANSFER_THANKS             get_language(0xf1b)
 #define TRANSFER_NOTICE_THANKS      get_language(0xf1c)
-#define TRANSFER_BYE                get_language(0xf1d)
-#define TRANSFER_USERFILE_LOST      get_language(0xf1e)
+#define TRANSFER_USERFILE_LOST      get_language(0xf1d)
+/* #define TRANSFER_BYE	            get_language(0xf1e) */
 #define TRANSFER_USERFILE_DISCON    get_language(0xf1f)
 #define TRANSFER_LOST_DCCSEND       get_language(0xf20)
 #define TRANSFER_REGET_PACKET       get_language(0xf21)
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.614 eggdrop1.6/src/patch.h:1.615
--- eggdrop1.6/src/patch.h:1.614	Tue Dec  4 15:11:57 2001
+++ eggdrop1.6/src/patch.h	Tue Dec  4 22:12:06 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.614 2001/12/04 21:11:57 guppy Exp $
+ * $Id: patch.h,v 1.615 2001/12/05 04:12:06 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1007500125");		/* current unixtime */
+patch("1007525303");		/* current unixtime */
 /*
  *
  *
  */
-patch("nooptimize2");
+patch("transfercrash");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list