[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Wed Dec 13 22:13:01 CST 2000


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2000-12-14 04:12:05 UTC

Modified files:
     doc/UPDATES1.6 src/patch.h src/mod/share.mod/share.c
     src/mod/share.mod/uf_features.c src/mod/transfer.mod/transfer.c

Log message:

guppy: fabian's share_status_message fix, fixes a few problems with userfile sharing

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.33 eggdrop1.6/doc/UPDATES1.6:1.34
--- eggdrop1.6/doc/UPDATES1.6:1.33	Sun Dec 10 09:10:26 2000
+++ eggdrop1.6/doc/UPDATES1.6	Wed Dec 13 22:11:54 2000
@@ -4,6 +4,8 @@
 
 1.6.2
 Found by  Fixed by  What...
+TaKeDa    Fabian    Parameter missing for share.mod's status information and
+                    a uff error message. Minor optimisations elsewhere.
           guppy     cleaned up Context; usage in the core
           guppy     rewrote tcl_duration
           guppy     more use of strncpyz and egg_snprintf in the core
Index: eggdrop1.6/src/mod/share.mod/share.c
diff -u eggdrop1.6/src/mod/share.mod/share.c:1.44 eggdrop1.6/src/mod/share.mod/share.c:1.45
--- eggdrop1.6/src/mod/share.mod/share.c:1.44	Sun Nov  5 22:06:44 2000
+++ eggdrop1.6/src/mod/share.mod/share.c	Wed Dec 13 22:11:54 2000
@@ -1,7 +1,7 @@
 /* 
  * share.c -- part of share.mod
  * 
- * $Id: share.c,v 1.44 2000/11/06 04:06:44 guppy Exp $
+ * $Id: share.c,v 1.45 2000/12/14 04:11:54 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -1027,7 +1027,7 @@
   } else {
     ip = newsplit(&par);
     port = newsplit(&par);
-    sock = getsock(SOCK_BINARY);
+    sock = getsock(SOCK_BINARY);	/* Don't buffer this -> mark binary. */
     if (sock < 0 || open_telnet_dcc(sock, ip, port) < 0) {
       killsock(sock);
       putlog(LOG_BOTS, "*", "Asynchronous connection failed!");
@@ -1037,18 +1037,16 @@
       i = new_dcc(&DCC_FORK_SEND, sizeof(struct xfer_info));
       dcc[i].addr = my_atoul(ip);
       dcc[i].port = atoi(port);
-      dcc[i].sock = (-1);
-      dcc[i].type = &DCC_FORK_SEND;
       strcpy(dcc[i].nick, "*users");
-      strcpy(dcc[i].host, dcc[idx].nick);
       dcc[i].u.xfer->filename = nmalloc(strlen(s) + 1);
       strcpy(dcc[i].u.xfer->filename, s);
       dcc[i].u.xfer->origname = dcc[i].u.xfer->filename;
       dcc[i].u.xfer->length = atoi(par);
-      dcc[idx].status |= STAT_GETTING;
       dcc[i].u.xfer->f = f;
-      /* Don't buffer this */
       dcc[i].sock = sock;
+      strcpy(dcc[i].host, dcc[idx].nick);
+
+      dcc[idx].status |= STAT_GETTING;
     }
   }
 }
@@ -2055,10 +2053,11 @@
 		      (int) (100.0 * ((float) dcc[j].status) /
 			     ((float) dcc[j].u.xfer->length)));
 	      ok = 1;
+	      break;
 	    }
 	  if (!ok)
-	    dprintf(idx,
-		 "Download userlist from %s (negotiating botentries)\n");
+	    dprintf(idx, "Download userlist from %s (negotiating "
+		    "botentries)\n", dcc[i].nick);
 	} else if (dcc[i].status & STAT_SENDING) {
 	  for (j = 0; j < dcc_total; j++) {
 	    if (((dcc[j].type->flags & (DCT_FILETRAN | DCT_FILESEND))
Index: eggdrop1.6/src/mod/share.mod/uf_features.c
diff -u eggdrop1.6/src/mod/share.mod/uf_features.c:1.4 eggdrop1.6/src/mod/share.mod/uf_features.c:1.5
--- eggdrop1.6/src/mod/share.mod/uf_features.c:1.4	Mon Sep 18 15:01:43 2000
+++ eggdrop1.6/src/mod/share.mod/uf_features.c	Wed Dec 13 22:11:54 2000
@@ -1,7 +1,7 @@
 /* 
  * uf_features.c -- part of share.mod
  * 
- * $Id: uf_features.c,v 1.4 2000/09/18 20:01:43 fabian Exp $
+ * $Id: uf_features.c,v 1.5 2000/12/14 04:11:54 guppy Exp $
  */
 /* 
  * Copyright (C) 2000  Eggheads
@@ -317,7 +317,7 @@
        *
        * In any case, we abort user file sharing.
        */
-      putlog(LOG_BOTS, "*", "Bot %s tried unsupported feature!");
+      putlog(LOG_BOTS, "*", "Bot %s tried unsupported feature!", dcc[idx].nick);
       dprintf(idx, "s e Attempt to use an unsupported feature\n");
       zapfbot(idx);
 
Index: eggdrop1.6/src/mod/transfer.mod/transfer.c
diff -u eggdrop1.6/src/mod/transfer.mod/transfer.c:1.32 eggdrop1.6/src/mod/transfer.mod/transfer.c:1.33
--- eggdrop1.6/src/mod/transfer.mod/transfer.c:1.32	Tue Dec  5 20:35:18 2000
+++ eggdrop1.6/src/mod/transfer.mod/transfer.c	Wed Dec 13 22:11:55 2000
@@ -1,7 +1,7 @@
 /* 
  * transfer.c -- part of transfer.mod
  * 
- * $Id: transfer.c,v 1.32 2000/12/06 02:35:18 guppy Exp $
+ * $Id: transfer.c,v 1.33 2000/12/14 04:11:55 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -716,11 +716,15 @@
 
     for (x = 0; x < dcc_total; x++)
       if ((!egg_strcasecmp(dcc[x].nick, dcc[idx].host)) &&
-	  (dcc[x].type->flags & DCT_BOT))
+	  (dcc[x].type->flags & DCT_BOT)) {
 	y = x;
+	break;
+      }
     if (y != 0) {
       dcc[y].status &= ~STAT_GETTING;
       dcc[y].status &= ~STAT_SHARE;
+      debug0("(!) Could not find bot responsible for sending us the userfile "
+	     "for which the transfer failed.");
     }
     putlog(LOG_BOTS, "*", USERF_FAILEDXFER);
     unlink(dcc[idx].u.xfer->filename);
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.400 eggdrop1.6/src/patch.h:1.401
--- eggdrop1.6/src/patch.h:1.400	Sun Dec 10 09:10:27 2000
+++ eggdrop1.6/src/patch.h	Wed Dec 13 22:11:54 2000
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.400 2000/12/10 15:10:27 guppy Exp $
+ * $Id: patch.h,v 1.401 2000/12/14 04:11:54 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("976459694");		/* current unixtime */
+patch("976766282");		/* current unixtime */
 /*
  *
  *
  */
-patch("core_cleanups");
+patch("share_status_message");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list