[cvslog] (2008-04-28 23:54:36 UTC) Module eggdrop1.6: Change committed!

cvslog cvs at tsss.org
Mon Apr 28 17:54:38 CST 2008


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2008-04-28 23:54:34 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

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

Log message:

Quakenet has an auto-invite flag which in some cases could cause a bot to flood off the server, hopefully this fixes that problem

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.643 eggdrop1.6/doc/UPDATES1.6:1.644
--- eggdrop1.6/doc/UPDATES1.6:1.643	Sat Apr 19 09:57:10 2008
+++ eggdrop1.6/doc/UPDATES1.6	Mon Apr 28 18:54:13 2008
@@ -1,4 +1,4 @@
-$Id: UPDATES1.6,v 1.643 2008-04-19 14:57:10 guppy Exp $
+$Id: UPDATES1.6,v 1.644 2008-04-28 23:54:13 guppy Exp $
 
 Eggdrop Changes (since v1.6.0)
     _____________________________________________________________________
@@ -12,6 +12,8 @@
 
 
   1.6.20:
+    - changed some JOINs to use DP_SERVER instead of DP_MODE
+    * Found by: Komandar - Patch by: guppy
 
   1.6.19 (18 April 2008):
     - Update the recommended TCL version to 8.5
Index: eggdrop1.6/src/mod/irc.mod/chan.c
diff -u eggdrop1.6/src/mod/irc.mod/chan.c:1.125 eggdrop1.6/src/mod/irc.mod/chan.c:1.126
--- eggdrop1.6/src/mod/irc.mod/chan.c:1.125	Sat Feb 16 15:41:09 2008
+++ eggdrop1.6/src/mod/irc.mod/chan.c	Mon Apr 28 18:54:23 2008
@@ -6,7 +6,7 @@
  *   user kickban, kick, op, deop
  *   idle kicking
  *
- * $Id: chan.c,v 1.125 2008-02-16 21:41:09 guppy Exp $
+ * $Id: chan.c,v 1.126 2008-04-28 23:54:23 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1115,7 +1115,7 @@
            chan->dname);
     clear_channel(chan, 1);
     chan->status &= ~CHAN_ACTIVE;
-    dprintf(DP_MODE, "JOIN %s %s\n",
+    dprintf(DP_SERVER, "JOIN %s %s\n",
             (chan->name[0]) ? chan->name : chan->dname,
             chan->channel.key[0] ? chan->channel.key : chan->key_prot);
   } else if (me_op(chan))
@@ -1420,7 +1420,7 @@
   return 0;
 }
 
-/* got 475: can't goin channel, bad key
+/* got 475: can't join channel, bad key
  */
 static int got475(char *from, char *msg)
 {
@@ -1446,7 +1446,7 @@
       nfree(chan->channel.key);
       chan->channel.key = (char *) channel_malloc(1);
       chan->channel.key[0] = 0;
-      dprintf(DP_MODE, "JOIN %s %s\n", chan->dname, chan->key_prot);
+      dprintf(DP_SERVER, "JOIN %s %s\n", chan->dname, chan->key_prot);
     } else {
       check_tcl_need(chan->dname, "key");
 
@@ -1487,7 +1487,7 @@
   if (chan && (channel_pending(chan) || channel_active(chan)))
     dprintf(DP_HELP, "NOTICE %s :I'm already here.\n", nick);
   else if (chan && !channel_inactive(chan))
-    dprintf(DP_MODE, "JOIN %s %s\n", (chan->name[0]) ? chan->name : chan->dname,
+    dprintf(DP_SERVER, "JOIN %s %s\n", (chan->name[0]) ? chan->name : chan->dname,
             chan->channel.key[0] ? chan->channel.key : chan->key_prot);
   return 0;
 }
@@ -1940,7 +1940,7 @@
       clear_channel(chan, 1);
       chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
       if (!channel_inactive(chan))
-        dprintf(DP_MODE, "JOIN %s %s\n",
+        dprintf(DP_SERVER, "JOIN %s %s\n",
                 (chan->name[0]) ? chan->name : chan->dname,
                 chan->channel.key[0] ? chan->channel.key : chan->key_prot);
     } else
@@ -1971,7 +1971,7 @@
   if (match_my_nick(nick) && channel_pending(chan) &&
       !channel_inactive(chan)) {
     chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
-    dprintf(DP_MODE, "JOIN %s %s\n",
+    dprintf(DP_SERVER, "JOIN %s %s\n",
             (chan->name[0]) ? chan->name : chan->dname,
             chan->channel.key[0] ? chan->channel.key : chan->key_prot);
     clear_channel(chan, 1);
@@ -2014,7 +2014,7 @@
     /* Kicked ME?!? the sods! */
     if (match_my_nick(nick) && !channel_inactive(chan)) {
       chan->status &= ~(CHAN_ACTIVE | CHAN_PEND);
-      dprintf(DP_MODE, "JOIN %s %s\n",
+      dprintf(DP_SERVER, "JOIN %s %s\n",
               (chan->name[0]) ? chan->name : chan->dname,
               chan->channel.key[0] ? chan->channel.key : chan->key_prot);
       clear_channel(chan, 1);
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.106 eggdrop1.6/src/mod/irc.mod/irc.c:1.107
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.106	Sat Feb 16 15:41:09 2008
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Mon Apr 28 18:54:23 2008
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.106 2008-02-16 21:41:09 guppy Exp $
+ * $Id: irc.c,v 1.107 2008-04-28 23:54:23 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1182,7 +1182,7 @@
   }
   for (chan = chanset; chan; chan = chan->next) {
     if (!channel_inactive(chan))
-      dprintf(DP_MODE, "JOIN %s %s\n",
+      dprintf(DP_SERVER, "JOIN %s %s\n",
               (chan->name[0]) ? chan->name : chan->dname, chan->key_prot);
     chan->status &= ~(CHAN_ACTIVE | CHAN_PEND | CHAN_ASKEDBANS);
     chan->ircnet_status &= ~(CHAN_ASKED_INVITED | CHAN_ASKED_EXEMPTS);
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.95 eggdrop1.6/src/mod/server.mod/servmsg.c:1.96
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.95	Sat Feb 16 15:41:10 2008
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Mon Apr 28 18:54:24 2008
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.95 2008-02-16 21:41:10 guppy Exp $
+ * $Id: servmsg.c,v 1.96 2008-04-28 23:54:24 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -325,7 +325,7 @@
       if (me && me->funcs)
         (me->funcs[CHANNEL_CLEAR]) (chan, 1);
       chan->status &= ~CHAN_ACTIVE;
-      dprintf(DP_MODE, "JOIN %s %s\n", chan->name,
+      dprintf(DP_SERVER, "JOIN %s %s\n", chan->name,
               chan->channel.key[0] ? chan->channel.key : chan->key_prot);
     }
 
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1193 eggdrop1.6/src/patch.h:1.1194
--- eggdrop1.6/src/patch.h:1.1193	Sat Apr 19 09:57:11 2008
+++ eggdrop1.6/src/patch.h	Mon Apr 28 18:54:23 2008
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1193 2008-04-19 14:57:11 guppy Exp $
+ * $Id: patch.h,v 1.1194 2008-04-28 23:54:23 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1208616850");            /* current unixtime */
+patch("1209426755");            /* current unixtime */
 /*
  *
  *
  */
-patch("none");
+patch("joinqueue");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list