[cvslog] (2002-09-22 18:10:31 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sun Sep 22 13:11:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-09-22 18:10:31 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/patch.h src/mod/irc.mod/chan.c
     src/mod/transfer.mod/transfer.c

Log message:

* Adding a missing killsock and lostdcc in eof_dcc_send() and eof_dcc_get(). Patch by Eule.
* Fixed indenting from auto-logic.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.412 eggdrop1.6/doc/UPDATES1.6:1.413
--- eggdrop1.6/doc/UPDATES1.6:1.412	Sun Sep 22 03:12:30 2002
+++ eggdrop1.6/doc/UPDATES1.6	Sun Sep 22 13:10:21 2002
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.412 2002/09/22 08:12:30 wcc Exp $
+$Id: UPDATES1.6,v 1.413 2002/09/22 18:10:21 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.13
 Found by  Fixed by  What...
+          Eule      adding a missing killsock and lostdcc in eof_dcc_send() and
+                    eof_dcc_get()
           Wcc       fixed the logic in check_this_member()
           BarkerJr  made the timestamp style definable in src/eggdrop.h
           Eule      added a missing return in bot_actchan()
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.97 eggdrop1.6/src/mod/irc.mod/chan.c:1.98
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.97	Sun Sep 22 04:22:10 2002
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Sun Sep 22 13:10:21 2002
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.97 2002/09/22 09:22:10 wcc Exp $
+ * $Id: chan.c,v 1.98 2002/09/22 18:10:21 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -734,9 +734,9 @@
           m->flags |= SENTOP;
 	}
       } else if (!chan_hasop(m) && !chan_hashalfop(m) && (chan_halfop(*fr) ||
-               (glob_halfop(*fr) && !chan_dehalfop(*fr))) &&
-               (channel_autohalfop(chan) || glob_autohalfop(*fr) ||
-               chan_autohalfop(*fr))) {
+                 (glob_halfop(*fr) && !chan_dehalfop(*fr))) &&
+                 (channel_autohalfop(chan) || glob_autohalfop(*fr) ||
+                 chan_autohalfop(*fr))) {
         if (!chan->aop_min)
           add_mode(chan, '+', 'h', m->nick);
         else {
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.53 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.54
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.53	Mon Sep  9 21:22:01 2002
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Sun Sep 22 13:10:21 2002
@@ -1,7 +1,7 @@
 /*
  * transfer.c -- part of transfer.mod
  *
- * $Id: transfer.c,v 1.53 2002/09/10 02:22:01 wcc Exp $
+ * $Id: transfer.c,v 1.54 2002/09/22 18:10:21 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -834,14 +834,12 @@
 		   dcc[y].nick);
       botnet_send_unlinked(y, dcc[y].nick, s);
       chatout("*** %s\n", dcc[y].nick, s);
-      if (y < idx) {
-	int t = y;
-
-	y = idx;
-	idx = t;
+      if (y != idx) {
+	killsock(dcc[y].sock);
+	lostdcc(y);
       }
-      killsock(dcc[y].sock);
-      lostdcc(y);
+      killsock(dcc[idx].sock);
+      lostdcc(idx);
     }
   } else {
     putlog(LOG_FILES, "*",TRANSFER_LOST_DCCSEND,
@@ -1065,14 +1063,12 @@
 		 dcc[y].nick);
     botnet_send_unlinked(y, dcc[y].nick, s);
     chatout("*** %s\n", s);
-    if (y < idx) {
-      int t = y;
-
-      y = idx;
-      idx = t;
+    if (y != idx) {
+      killsock(dcc[y].sock);
+      lostdcc(y);
     }
-    killsock(dcc[y].sock);
-    lostdcc(y);
+    killsock(dcc[idx].sock);
+    lostdcc(idx);
     return;
   } else {
     struct userrec *u;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.828 eggdrop1.6/src/patch.h:1.829
--- eggdrop1.6/src/patch.h:1.828	Sun Sep 22 04:22:10 2002
+++ eggdrop1.6/src/patch.h	Sun Sep 22 13:10:21 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.828 2002/09/22 09:22:10 wcc Exp $
+ * $Id: patch.h,v 1.829 2002/09/22 18:10:21 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1032686288");		/* current unixtime */
+patch("1032717736");		/* current unixtime */
 /*
  *
  *
  */
-patch("auto-logic2");
+patch("send_unlinked");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list