[cvslog] [CVS] Module eggdrop1.8: Change committed

cvs at eggheads.org cvs at eggheads.org
Fri Mar 21 15:42:51 CST 2014


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.8
Commit time: 2014-03-21 21:42:51 UTC
Committer  : Thomas Sader <thommey at gmail.com>

Modified files:
     doc/Changes1.8 src/dcc.c src/patch.h

Log message:

Fix a potentially endless loop when looking up bot hostnames.

---------------------- diff included ----------------------
Index: eggdrop1.8/doc/Changes1.8
diff -u eggdrop1.8/doc/Changes1.8:1.76 eggdrop1.8/doc/Changes1.8:1.77
--- eggdrop1.8/doc/Changes1.8:1.76	Tue Jul 30 19:09:33 2013
+++ eggdrop1.8/doc/Changes1.8	Fri Mar 21 15:42:41 2014
@@ -1,4 +1,4 @@
-$Id: Changes1.8,v 1.76 2013/07/31 01:09:33 thommey Exp $
+$Id: Changes1.8,v 1.77 2014/03/21 21:42:41 thommey Exp $
 
 Eggdrop Changes (since version 1.8.0)
 
@@ -6,6 +6,9 @@
 
 1.8.0 (CVS):
 
+  - Fix a potentially endless loop when looking up bot hostnames.
+    Patch by: thommey / Found by: Kiril
+
   - We only support Tcl >= 8.2 now. Deal with it.
   - Remove servlimit variables, unused these days
     Patch by: guppy
Index: eggdrop1.8/src/dcc.c
diff -u eggdrop1.8/src/dcc.c:1.14 eggdrop1.8/src/dcc.c:1.15
--- eggdrop1.8/src/dcc.c:1.14	Tue Jul 30 18:20:05 2013
+++ eggdrop1.8/src/dcc.c	Fri Mar 21 15:42:41 2014
@@ -4,7 +4,7 @@
  *   disconnect on a dcc socket
  *   ...and that's it!  (but it's a LOT)
  *
- * $Id: dcc.c,v 1.14 2013/07/31 00:20:05 thommey Exp $
+ * $Id: dcc.c,v 1.15 2014/03/21 21:42:41 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -273,10 +273,10 @@
     return;
   }
 
-  /* Try next port */
+  /* Try next port, if it makes sense (no AF_UNSPEC, ...) */
   killsock(dcc[idx].sock);
   dcc[idx].timeval = now;
-  if (open_telnet(idx, dcc[idx].host, dcc[idx].port + 1) < 0)
+  if (open_telnet(idx, dcc[idx].host, dcc[idx].port + 1) == -1)
     failed_link(idx);
 }
 
Index: eggdrop1.8/src/patch.h
diff -u eggdrop1.8/src/patch.h:1.49 eggdrop1.8/src/patch.h:1.50
--- eggdrop1.8/src/patch.h:1.49	Tue Jul 30 18:45:38 2013
+++ eggdrop1.8/src/patch.h	Fri Mar 21 15:42:41 2014
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.49 2013/07/31 00:45:38 thommey Exp $
+ * $Id: patch.h,v 1.50 2014/03/21 21:42:41 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1375231490");            /* current unixtime */
+patch("1395438000");            /* current unixtime */
 /*
  *
  *
  */
-patch("preinit");
+patch("fixbotnetloop");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list