[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Sat Dec 23 00:12:01 CST 2000


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2000-12-23 06:11:44 UTC

Modified files:
     doc/UPDATES1.6 help/cmds2.help help/core.help src/cmds.c
     src/net.c src/patch.h

Log message:

ITE's trafficfix patch (slightly modified to fix a compiler warning and a problem in net.c dealing with extern)

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.38 eggdrop1.6/doc/UPDATES1.6:1.39
--- eggdrop1.6/doc/UPDATES1.6:1.38	Thu Dec 21 14:20:02 2000
+++ eggdrop1.6/doc/UPDATES1.6	Sat Dec 23 00:11:33 2000
@@ -4,6 +4,8 @@
 
 1.6.2
 Found by  Fixed by  What...
+SuperS    ITE       fixed the traffic accounting code when dealing 
+                    high amounts of traffic
           ITE       made configure work properly when called with an
                     absolute path
 Ian	  Ian/      share.mod now uses .share.nick.unixtime.users as a
Index: eggdrop1.6/help/cmds2.help
diff -u eggdrop1.6/help/cmds2.help:1.6 eggdrop1.6/help/cmds2.help:1.7
--- eggdrop1.6/help/cmds2.help:1.6	Fri Oct 27 14:38:08 2000
+++ eggdrop1.6/help/cmds2.help	Sat Dec 23 00:11:33 2000
@@ -152,6 +152,12 @@
    should probably not ever do this.
    
 see also: rehash, save
+%{help=traffic}%{+m|m}
+###  %btraffic%b
+   shows total and dayly net traffic stats since last %b'.restart'%b.
+   stats groups are IRC, Botnet, Partyline, Transfer.mod and Misc.
+   
+see also: restart
 %{help=restart}%{+m}
 ###  %brestart%b
    restarts the Tcl interpreter, wipes all timers and utimers, and
Index: eggdrop1.6/help/core.help
diff -u eggdrop1.6/help/core.help:1.4 eggdrop1.6/help/core.help:1.5
--- eggdrop1.6/help/core.help:1.4	Fri Jun  2 11:56:52 2000
+++ eggdrop1.6/help/core.help	Sat Dec 23 00:11:34 2000
@@ -30,6 +30,7 @@
 %{+m|m}
 For masters:
 %b  chattr       save         backup       reload       status%b
+%b  traffic%b
 %{+m}
 %b  +user        +ignore      comment      binds        ignores%b
 %b  -user        -ignore      dccstat      debug        banner%b
@@ -183,6 +184,7 @@
 %{+m|m}
 For masters:
 %b  chattr       save         backup       reload       status%b
+%b  traffic%b
 %{+m}
 %b  +user        +ignore      comment      binds        ignores%b
 %b  -user        -ignore      dccstat      debug        banner%b
Index: eggdrop1.6/src/cmds.c
diff -u eggdrop1.6/src/cmds.c:1.45 eggdrop1.6/src/cmds.c:1.46
--- eggdrop1.6/src/cmds.c:1.45	Sun Dec 10 09:10:26 2000
+++ eggdrop1.6/src/cmds.c	Sat Dec 23 00:11:34 2000
@@ -3,7 +3,7 @@
  *   commands from a user via dcc
  *   (split in 2, this portion contains no-irc commands)
  * 
- * $Id: cmds.c,v 1.45 2000/12/10 15:10:26 guppy Exp $
+ * $Id: cmds.c,v 1.46 2000/12/23 06:11:34 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -52,7 +52,7 @@
 extern time_t		 now, online_since;
 
 
-static char	*btos(int);
+static char	*btos(unsigned long);
 
 
 /* Add hostmask to a bot's record if possible.
@@ -2584,7 +2584,7 @@
 
 static void cmd_traffic(struct userrec *u, int idx, char *par)
 {
-  int itmp, itmp2;
+  unsigned long itmp, itmp2;
 
   dprintf(idx, "Traffic since last restart\n");
   dprintf(idx, "==========================\n");
@@ -2649,7 +2649,7 @@
 }
 
 static char traffictxt[20];
-static char *btos(int bytes)
+static char *btos(unsigned long  bytes)
 {
   char unit[10];
   float xbytes;
@@ -2675,7 +2675,7 @@
   if (bytes > 1024)
     sprintf(traffictxt, "%.2f %s", xbytes, unit);
   else
-    sprintf(traffictxt, "%d Bytes", bytes);
+    sprintf(traffictxt, "%lu Bytes", bytes);
   return traffictxt;
 }
 
Index: eggdrop1.6/src/net.c
diff -u eggdrop1.6/src/net.c:1.27 eggdrop1.6/src/net.c:1.28
--- eggdrop1.6/src/net.c:1.27	Sun Dec 10 09:10:27 2000
+++ eggdrop1.6/src/net.c	Sat Dec 23 00:11:34 2000
@@ -2,7 +2,7 @@
  * net.c -- handles:
  *   all raw network i/o
  * 
- * $Id: net.c,v 1.27 2000/12/10 15:10:27 guppy Exp $
+ * $Id: net.c,v 1.28 2000/12/23 06:11:34 guppy Exp $
  */
 /* 
  * This is hereby released into the public domain.
@@ -35,8 +35,8 @@
 #endif
 
 extern struct dcc_t	*dcc;
-extern int		 backgrd, use_stderr, resolve_timeout, dcc_total,
-			 otraffic_irc_today, otraffic_bn_today,
+extern int		 backgrd, use_stderr, resolve_timeout, dcc_total;
+extern unsigned long	 otraffic_irc_today, otraffic_bn_today,
 			 otraffic_dcc_today, otraffic_filesys_today,
 			 otraffic_trans_today, otraffic_unknown_today;
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.405 eggdrop1.6/src/patch.h:1.406
--- eggdrop1.6/src/patch.h:1.405	Thu Dec 21 14:20:03 2000
+++ eggdrop1.6/src/patch.h	Sat Dec 23 00:11:34 2000
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  * 
- * $Id: patch.h,v 1.405 2000/12/21 20:20:03 guppy Exp $
+ * $Id: patch.h,v 1.406 2000/12/23 06:11:34 guppy Exp $
  */
 /* 
  * Copyright (C) 1997  Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("977429770");		/* current unixtime */
+patch("977551580");		/* current unixtime */
 /*
  *
  *
  */
-patch("configurefix");
+patch("trafficfix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list