[cvslog] (2003-08-18 03:27:16 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Sun Aug 17 21:27:16 CST 2003


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2003-08-18 03:27:16 UTC
Commited by: Will Buckner <wcc at techmonkeys.org>

Modified files:
     eggdrop.conf doc/UPDATES1.6 doc/html/mod-irc.html
     doc/html/mod-server.html doc/settings/mod.irc
     doc/settings/mod.server src/patch.h src/mod/irc.mod/irc.c
     src/mod/server.mod/server.h
     src/mod/server.mod/help/set/server.help

Log message:

* Made appropriate changes to accommodate for EFnet's implementation of
  exempts and invites.

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.506 eggdrop1.6/doc/UPDATES1.6:1.507
--- eggdrop1.6/doc/UPDATES1.6:1.506	Sat Aug 16 18:22:32 2003
+++ eggdrop1.6/doc/UPDATES1.6	Sun Aug 17 22:27:05 2003
@@ -1,18 +1,25 @@
-$Id: UPDATES1.6,v 1.506 2003/08/16 23:22:32 wcc Exp $
+$Id: UPDATES1.6,v 1.507 2003/08/18 03:27:05 wcc Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.16
 Found by  Fixed by  What...
+          Wcc       made appropriate changes to accommodate for EFnet's
+	            implementation of exempts and invites
 |SmAsH|   Wcc       bind documentation updates
 BarkerJr  Wcc       exported strip_mirc_codes() and check_ansi() from dcc.c
           Paul E./  H_notc used wrong handler
           stdarg
 fbs       stdarg    check to make sure file we want to send exists when
                     resuming a transfer
+          Paladin   fixed exporting of MD5 functions to modules
+various   stdarg    the binary is no longer stripped unless ./configure
+                    --enable-strip is used
           tchaika   small fix to n_realloc()
 Wanderer| Wcc       fixed output of tcl_duration to not return extra spaces
+          stdarg    cmd_topic works for halfops now
+various   stdarg    fixed cmd_(de)voice logic
 paladinz  Wcc       don't compile inet_ntop compatability code unless USE_IPV6
                     is defined
 KuNgFo0   Wcc       typedef socklen_t to int if non-existant
Index: eggdrop1.6/doc/html/mod-irc.html
diff -u eggdrop1.6/doc/html/mod-irc.html:1.19 eggdrop1.6/doc/html/mod-irc.html:1.20
--- eggdrop1.6/doc/html/mod-irc.html:1.19	Thu Feb 13 17:56:43 2003
+++ eggdrop1.6/doc/html/mod-irc.html	Sun Aug 17 22:27:05 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-irc.html,v 1.19 2003/02/13 23:56:43 wcc Exp $ -->
+<!-- $Id: mod-irc.html,v 1.20 2003/08/18 03:27:05 wcc Exp $ -->
 
 <html>
   <head>
@@ -63,7 +63,7 @@
           <p>Set here the maximum number of bans you want the bot to set on a
           channel. Eggdrop will not place any more bans if this limit is
           reached. Undernet currently allows 45 bans, IRCnet allows 30, EFnet
-          allows 25, and DALnet allows 100.</p>
+          allows 100, and DALnet allows 100.</p>
         </dd>
 
         <dt><strong>set kick-fun 0</strong></dt>
Index: eggdrop1.6/doc/html/mod-server.html
diff -u eggdrop1.6/doc/html/mod-server.html:1.28 eggdrop1.6/doc/html/mod-server.html:1.29
--- eggdrop1.6/doc/html/mod-server.html:1.28	Tue May  6 19:23:24 2003
+++ eggdrop1.6/doc/html/mod-server.html	Sun Aug 17 22:27:05 2003
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.28 2003/05/07 00:23:24 wcc Exp $ -->
+<!-- $Id: mod-server.html,v 1.29 2003/08/18 03:27:05 wcc Exp $ -->
 
 <html>
   <head>
@@ -44,11 +44,11 @@
         <dd>
           <p>What is your network?</p>
 
-          <p>0 = Efnet (non +e/+I Hybrid)<br>
+          <p>0 = Efnet<br>
            1 = IRCnet<br>
            2 = Undernet<br>
            3 = Dalnet<br>
-           4 = +e/+I Hybrid<br>
+           4 = +e/+I/max-bans 20 Hybrid<br>
            5 = Others</p>
         </dd>
 
Index: eggdrop1.6/doc/settings/mod.irc
diff -u eggdrop1.6/doc/settings/mod.irc:1.15 eggdrop1.6/doc/settings/mod.irc:1.16
--- eggdrop1.6/doc/settings/mod.irc:1.15	Thu Feb 13 17:56:43 2003
+++ eggdrop1.6/doc/settings/mod.irc	Sun Aug 17 22:27:05 2003
@@ -31,10 +31,10 @@
      the same value as max-bans for networks that do not support +e/+I.
 
 
-   set max-bans 20
+   set max-bans 30
      Set here the maximum number of bans you want the bot to set on a channel.
      Eggdrop will not place any more bans if this limit is reached. Undernet
-     currently allows 45 bans, IRCnet allows 30, EFnet allows 25, and DALnet
+     currently allows 45 bans, IRCnet allows 30, EFnet allows 100, and DALnet
      allows 100.
 
 
Index: eggdrop1.6/doc/settings/mod.server
diff -u eggdrop1.6/doc/settings/mod.server:1.27 eggdrop1.6/doc/settings/mod.server:1.28
--- eggdrop1.6/doc/settings/mod.server:1.27	Tue May  6 19:23:24 2003
+++ eggdrop1.6/doc/settings/mod.server	Sun Aug 17 22:27:05 2003
@@ -20,11 +20,11 @@
 
    set net-type 0
      What is your network?
-       0 = EFnet (non +e/+I Hybrid)
+       0 = EFnet
        1 = IRCnet
        2 = Undernet
        3 = DALnet
-       4 = +e/+I Hybrid
+       4 = +e/+I/max-bans 20 Hybrid
        5 = Others
 
 
Index: eggdrop1.6/eggdrop.conf
diff -u eggdrop1.6/eggdrop.conf:1.27 eggdrop1.6/eggdrop.conf:1.28
--- eggdrop1.6/eggdrop.conf:1.27	Tue May  6 19:23:24 2003
+++ eggdrop1.6/eggdrop.conf	Sun Aug 17 22:27:05 2003
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- This should contain a fully qualified path to your Eggdrop executable.
 #
-# $Id: eggdrop.conf,v 1.27 2003/05/07 00:23:24 wcc Exp $
+# $Id: eggdrop.conf,v 1.28 2003/08/18 03:27:05 wcc Exp $
 #
 # This is a sample Eggdrop configuration file which includes all possible
 # settings that can be used to configure your bot.
@@ -768,11 +768,11 @@
 loadmodule server
 
 # What is your network?
-#   0 = EFnet (non +e/+I Hybrid)
+#   0 = EFnet
 #   1 = IRCnet
 #   2 = Undernet
 #   3 = DALnet
-#   4 = +e/+I Hybrid
+#   4 = +e/+I/max-modes 20 Hybrid
 #   5 = Others
 set net-type 0
 
@@ -953,19 +953,47 @@
 # Set this to 1 if you want to bounce all server bans.
 set bounce-bans 1
 
+# Set this to 1 if you want to bounce all server exemptions (+e modes).
+# This is disabled is use-exempts is disabled.
+set bounce-exempts 0
+
+# Set this to 1 if you want to bounce all server invitations (+I modes).
+# This is disabled is use-invites is disabled.
+set bounce-invites 0
+
 # Set this to 1 if you want to bounce all server modes.
 set bounce-modes 0
 
 # Set here the maximum number of bans you want the bot to set on a channel.
 # Eggdrop will not place any more bans if this limit is reached. Undernet
-# currently allows 45 bans, IRCnet allows 30, EFnet allows 25, and DALnet
+# currently allows 45 bans, IRCnet allows 30, EFnet allows 100, and DALnet
 # allows 100.
-set max-bans 20
+set max-bans 30
+
+# Set here the maximum number of exempts you want Eggdrop to set on a channel.
+# Eggdrop will not place any more exempts if this limit is reached.
+set max-exempts 20
+
+# Set here the maximum number of invites you want Eggdrop to set on a channel.
+# Eggdrop will not place any more invites if this limit is reached.
+set max-invites 20
 
 # There is a global limit for +b/+e/+I modes. This limit should be set to
 # the same value as max-bans for networks that do not support +e/+I.
 set max-modes 30
 
+# The following settings should be left commented unless the default values
+# are being overridden. By default, exempts and invites are on for EFnet and
+# IRCnet, but off for all other large networks. This behavior can be modified
+# with the following 2 flags. If your network doesn't support +e/+I modes then
+# you will be unable to use these features.
+#
+# Do you want to enable exempts (+e modes)?
+#set use-exempts 0
+
+# Do you want to enable invites (+I modes)?
+#set use-invites 0
+
 # Set this to 1 if you want the bot to kick for control character/ctcp
 # avalanches to a channel. Remember that if it does, it won't ban them.
 # This can start kick floods.
@@ -1015,37 +1043,9 @@
 # longer than wait-info).
 set no-chanrec-info 0
 
-### IRC MODULE - IRCnet SPECIFIC FEATURES (net-type 1) ###
+### IRC MODULE - IRCnet/EFnet SPECIFIC FEATURES (net-type 0/1/4) ###
 
 # Attention: Use these settings *only* if you set 'net-type' to 1!
-
-# Set this to 1 if you want to bounce all server exemptions (+e modes).
-# This is disabled is use-exempts is disabled.
-set bounce-exempts 0
-
-# Set this to 1 if you want to bounce all server invitations (+I modes).
-# This is disabled is use-invites is disabled.
-set bounce-invites 0
-
-# Set here the maximum number of exempts you want Eggdrop to set on a channel.
-# Eggdrop will not place any more exempts if this limit is reached.
-set max-exempts 20
-
-# Set here the maximum number of invites you want Eggdrop to set on a channel.
-# Eggdrop will not place any more invites if this limit is reached.
-set max-invites 20
-
-# The following settings should be left commented unless the default values
-# are being overridden. By default, exempts and invites are on for IRCnet,
-# but off for all other large networks. This behavior can be modified with
-# the following 2 flags. If your network doesn't support +e/+I modes then you
-# will be unable to use these features.
-#
-# Do you want to enable exempts (+e modes)?
-#set use-exempts 0
-
-# Do you want to enable invites (+I modes)?
-#set use-invites 0
 
 # At the moment, the current IRCnet IRCd version (2.10) doesn't support the
 # mixing of b, o and v modes with e and I modes. This might be changed in the
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.92 eggdrop1.6/src/mod/irc.mod/irc.c:1.93
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.92	Fri Mar  7 22:29:44 2003
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Sun Aug 17 22:27:06 2003
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.92 2003/03/08 04:29:44 wcc Exp $
+ * $Id: irc.c,v 1.93 2003/08/18 03:27:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -35,16 +35,16 @@
 
 static p_tcl_bind_list H_topc, H_splt, H_sign, H_rejn, H_part, H_pub, H_pubm;
 static p_tcl_bind_list H_nick, H_mode, H_kick, H_join, H_need;
+
 static Function *global = NULL, *channels_funcs = NULL, *server_funcs = NULL;
 
 static int ctcp_mode;
 static int net_type;
 static int strict_host;
-static int wait_split = 300;    /* Time to wait for user to return from
-                                 * net-split. */
+static int wait_split = 300;    /* Time to wait for user to return from net-split. */
 static int max_bans = 20;       /* Modified by net-type 1-4 */
-static int max_exempts = 20;
-static int max_invites = 20;
+static int max_exempts = 20;    /* Modified by net-type 1-4 */
+static int max_invites = 20;    /* Modified by net-type 1-4 */
 static int max_modes = 20;      /* Modified by net-type 1-4 */
 static int bounce_bans = 1;
 static int bounce_exempts = 0;
@@ -73,7 +73,6 @@
 #include "msgcmds.c"
 #include "tclirc.c"
 
-
 /* Contains the logic to decide wether we want to punish someone. Returns
  * true (1) if we want to, false (0) if not.
  */
@@ -965,57 +964,67 @@
 static void do_nettype()
 {
   switch (net_type) {
-  case 0:                      /* EFnet */
+  case 0: /* EFnet */
     kick_method = 1;
     modesperline = 4;
     use_354 = 0;
-    use_exempts = 0;
-    use_invites = 0;
-    max_bans = 25;
-    max_modes = 25;
+    use_exempts = 1;
+    use_invites = 1;
+    max_bans = 100;
+    max_exempts = 100;
+    max_invites = 100;
+    max_modes = 100;
     rfc_compliant = 1;
     include_lk = 0;
     break;
-  case 1:                      /* IRCnet */
+  case 1: /* IRCnet */
     kick_method = 4;
     modesperline = 3;
     use_354 = 0;
     use_exempts = 1;
     use_invites = 1;
     max_bans = 30;
+    max_exempts = 30;
+    max_invites = 30;
     max_modes = 30;
     rfc_compliant = 1;
     include_lk = 1;
     break;
-  case 2:                      /* UnderNet */
+  case 2: /* UnderNet */
     kick_method = 1;
     modesperline = 6;
     use_354 = 1;
     use_exempts = 0;
     use_invites = 0;
     max_bans = 45;
+    max_exempts = 45;
+    max_invites = 45;
     max_modes = 45;
     rfc_compliant = 1;
     include_lk = 1;
     break;
-  case 3:                      /* DALnet */
+  case 3: /* DALnet */
     kick_method = 1;
     modesperline = 6;
     use_354 = 0;
     use_exempts = 0;
     use_invites = 0;
     max_bans = 100;
+    max_exempts = 100;
+    max_invites = 100;
     max_modes = 100;
     rfc_compliant = 0;
     include_lk = 1;
     break;
-  case 4:                      /* Hybrid-6+ */
+  case 4: /* Hybrid-6+ */
     kick_method = 1;
     modesperline = 4;
     use_354 = 0;
     use_exempts = 1;
-    use_invites = 0;
+    use_invites = 1;
     max_bans = 20;
+    max_exempts = 20;
+    max_invites = 20;
     max_modes = 20;
     rfc_compliant = 1;
     include_lk = 0;
Index: eggdrop1.6/src/mod/server.mod/help/set/server.help
diff -u eggdrop1.6/src/mod/server.mod/help/set/server.help:1.8 eggdrop1.6/src/mod/server.mod/help/set/server.help:1.9
--- eggdrop1.6/src/mod/server.mod/help/set/server.help:1.8	Tue Jan 28 23:48:42 2003
+++ eggdrop1.6/src/mod/server.mod/help/set/server.help	Sun Aug 17 22:27:06 2003
@@ -165,8 +165,8 @@
    This read-only variable returns the current server of the bot.
 %{help=set net-type}%{+n}
 ###  %bset net-type%b
-   Defines the network the bot uses. 0 = EFnet, 1 = IRCnet, 2 = UnderNet,
-   3 = DALnet, 4 = EFnet +e/+I hybrid, 5 = Others.
+   Define the network the bot uses. 0 = EFnet, 1 = IRCnet, 2 = UnderNet,
+   3 = DALnet, 4 = EFnet +e/+I/max-bans 20 Hybrid, 5 = Others.
 %{help=server settings}%{+n}
 ###  Settings for the %bserver module%b
    This is a list of the Tcl variables the can be used to setup
Index: eggdrop1.6/src/mod/server.mod/server.h
diff -u eggdrop1.6/src/mod/server.mod/server.h:1.18 eggdrop1.6/src/mod/server.mod/server.h:1.19
--- eggdrop1.6/src/mod/server.mod/server.h:1.18	Wed Jan 29 18:41:24 2003
+++ eggdrop1.6/src/mod/server.mod/server.h	Sun Aug 17 22:27:06 2003
@@ -1,7 +1,7 @@
 /*
  * server.h -- part of server.mod
  *
- * $Id: server.h,v 1.18 2003/01/30 00:41:24 wcc Exp $
+ * $Id: server.h,v 1.19 2003/08/18 03:27:06 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -97,11 +97,11 @@
 
 /* Available net types.  */
 enum {
-  NETT_EFNET = 0,               /* EFnet (non +e/+I Hybrid.) */
-  NETT_IRCNET = 1,              /* IRCnet.                   */
-  NETT_UNDERNET = 2,            /* UnderNet.                 */
-  NETT_DALNET = 3,              /* DALnet.                   */
-  NETT_HYBRID_EFNET = 4         /* +e/+I Hybrid.             */
+  NETT_EFNET        = 0, /* EFnet                    */
+  NETT_IRCNET       = 1, /* IRCnet                   */
+  NETT_UNDERNET     = 2, /* UnderNet                 */
+  NETT_DALNET       = 3, /* DALnet                   */
+  NETT_HYBRID_EFNET = 4  /* +e/+I/max-bans 20 Hybrid */
 } nett_t;
 
 #endif /* _EGG_MOD_SERVER_SERVER_H */
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.1003 eggdrop1.6/src/patch.h:1.1004
--- eggdrop1.6/src/patch.h:1.1003	Sat Aug 16 16:26:57 2003
+++ eggdrop1.6/src/patch.h	Sun Aug 17 22:27:05 2003
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1003 2003/08/16 21:26:57 wcc Exp $
+ * $Id: patch.h,v 1.1004 2003/08/18 03:27:05 wcc Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1061069166");            /* current unixtime */
+patch("1061177186");            /* current unixtime */
 /*
  *
  *
  */
-patch("plshosthelp");
+patch("EFnet_E_I");
 /*
  *
  *
----------------------- End of diff -----------------------


More information about the Changes mailing list