[cvslog] (2003-01-02 00:07:56 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Wed Jan 1 18:08:01 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-01-02 00:07:56 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 doc/tcl-commands.doc src/patch.h
     src/mod/server.mod/servmsg.c

Log message:

Fixed parsing of userhosts in gotwall(). Patch by darko``.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.438 eggdrop1.6/doc/UPDATES1.6:1.439
--- eggdrop1.6/doc/UPDATES1.6:1.438	Fri Dec 27 16:39:32 2002
+++ eggdrop1.6/doc/UPDATES1.6	Wed Jan  1 18:07:46 2003
@@ -1,10 +1,11 @@
-$Id: UPDATES1.6,v 1.438 2002/12/27 22:39:32 wcc Exp $
+$Id: UPDATES1.6,v 1.439 2003/01/02 00:07:46 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.14
 Found by  Fixed by  What...
+          darko``   fixed parsing of userhosts in gotwall()
 reed      Wcc       updated UnderNet's max_bans to 45
 various   BarkerJr  config file updates
 various   Wcc/      removed quoting support from wild_match() which fixes several
Index: eggdrop1.6/doc/tcl-commands.doc
diff -u eggdrop1.6/doc/tcl-commands.doc:1.91 eggdrop1.6/doc/tcl-commands.doc:1.92
--- eggdrop1.6/doc/tcl-commands.doc:1.91	Mon Dec 23 20:30:02 2002
+++ eggdrop1.6/doc/tcl-commands.doc	Wed Jan  1 18:07:46 2003
@@ -1935,11 +1935,14 @@
 
     (33) WALL (stackable)
          bind wall <flags> <mask> <proc>
-         proc-name <handle> <msg>
+         proc-name <from> <msg>
 
          Description: when the bot receives a wallops, it invokes this
            binding. flags are ignored; the mask is matched against the text
-           of the wallops msg.
+           of the wallops msg. Note that RFC shows the server name as a source
+           of the message, whereas many IRCds send the nick!user at host of the
+           actual sender, thus, Eggdrop will not parse it at all, but simply
+           pass it to bind in its original form.
          Module: server
 
     (34) BCST (stackable)
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.65 eggdrop1.6/src/mod/server.mod/servmsg.c:1.66
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.65	Mon Dec 23 20:30:08 2002
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Wed Jan  1 18:07:46 2003
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.65 2002/12/24 02:30:08 wcc Exp $
+ * $Id: servmsg.c,v 1.66 2003/01/02 00:07:46 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -670,19 +670,19 @@
 static int gotwall(char *from, char *msg)
 {
   char *nick;
-  char *p;
   int r;
 
   fixcolon(msg);
-  p = strchr(from, '!');
-  if (p && (p == strrchr(from, '!'))) {
-    nick = splitnick(&from);
-    r = check_tcl_wall(nick, msg);
-    if (r == 0)
+  r = check_tcl_wall(from, msg);
+
+  if (r == 0) {
+    /* Following is not needed at all, but we'll keep it for compatibility sake,
+     * so not to confuse possible scripts that are parsing log files.
+     */
+    if (strchr(from,'!')) {
+      nick = splitnick(&from);
       putlog(LOG_WALL, "*", "!%s(%s)! %s", nick, from, msg);
-  } else {
-    r = check_tcl_wall(from, msg);
-    if (r == 0)
+    } else
       putlog(LOG_WALL, "*", "!%s! %s", from, msg);
   }
   return 0;
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.865 eggdrop1.6/src/patch.h:1.866
--- eggdrop1.6/src/patch.h:1.865	Fri Dec 27 16:39:32 2002
+++ eggdrop1.6/src/patch.h	Wed Jan  1 18:07:46 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.865 2002/12/27 22:39:32 wcc Exp $
+ * $Id: patch.h,v 1.866 2003/01/02 00:07:46 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1041028698");		/* current unixtime */
+patch("1041465885");		/* current unixtime */
 /*
  *
  *
  */
-patch("undernet_max_bans");
+patch("wallopsfix");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list