[cvslog] Module eggdrop1.6: Change committed

cvslog cvs at tsss.iavalley.cc.ia.us
Fri May 18 17:36:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2001-05-18 22:35:15 UTC
Commited by: guppy

Modified files:
     eggdrop.advanced.conf eggdrop.complete.conf doc/UPDATES1.6
     doc/html/mod-server.html doc/settings/mod.server src/patch.h
     src/mod/server.mod/server.c src/mod/server.mod/servmsg.c

Log message:

ooo legacy code

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.99 eggdrop1.6/doc/UPDATES1.6:1.100
--- eggdrop1.6/doc/UPDATES1.6:1.99	Mon May 14 11:17:00 2001
+++ eggdrop1.6/doc/UPDATES1.6	Fri May 18 17:35:03 2001
@@ -4,7 +4,8 @@
 
 1.6.5
 Found by  Fixed by  What...
-           guppy     fixed a little bug that wil happen in September of 2001
+          guppy     removed legacy /trace support for keep-nick
+          guppy     fixed a little bug that will happen in September of 2001
           TaKeDa    show the handle when rejecting a duplicate bot connection
           fuchs     small fix to MSGM's bind table
 slennox   Sup       Updated the help channels in the docs.
Index: eggdrop1.6/doc/html/mod-server.html
diff -u eggdrop1.6/doc/html/mod-server.html:1.7 eggdrop1.6/doc/html/mod-server.html:1.8
--- eggdrop1.6/doc/html/mod-server.html:1.7	Wed Nov  8 14:11:05 2000
+++ eggdrop1.6/doc/html/mod-server.html	Fri May 18 17:35:04 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.7 2000/11/08 20:11:05 guppy Exp $ -->
+<!-- $Id: mod-server.html,v 1.8 2001/05/18 22:35:04 guppy Exp $ -->
 
 <html>
   <head>
@@ -207,18 +207,6 @@
         <dd>
           <p>If you want your bot to exit the server if it receives a error
           msg set this to 1</p>
-
-          <p>Valid settings are 0 and 1.</p>
-        </dd>
-
-        <dt><strong><em>set use-ison 1</em></strong></dt>
-
-        <dd>
-          <p>This setting makes the bot not use /ison instead of /trace when
-          checking to see if its default nick or alternate nick is in use</p>
-
-          <p>Please note: some irc admins, look for excessive use of
-          /trace</p>
 
           <p>Valid settings are 0 and 1.</p>
         </dd>
Index: eggdrop1.6/doc/settings/mod.server
diff -u eggdrop1.6/doc/settings/mod.server:1.7 eggdrop1.6/doc/settings/mod.server:1.8
--- eggdrop1.6/doc/settings/mod.server:1.7	Wed Nov  8 14:11:05 2000
+++ eggdrop1.6/doc/settings/mod.server	Fri May 18 17:35:04 2001
@@ -114,13 +114,6 @@
     Valid settings are 0 for OFF and 1 ON.
 
 
-set use-ison 1
-    This setting makes the bot not u se /trace but /ison to check if our
-    botnick is free or being used.
-    Please note: some irc admins, look for excessive use of /trace
-    Valid settings are 0 for OFF and 1 ON.
-
-
 set max-queue-msg 300
     Set here the maximum number of lines to queue to the server. If you're
     going to dump large chunks of text to people over irc, you will probably
Index: eggdrop1.6/eggdrop.advanced.conf
diff -u eggdrop1.6/eggdrop.advanced.conf:1.24 eggdrop1.6/eggdrop.advanced.conf:1.25
--- eggdrop1.6/eggdrop.advanced.conf:1.24	Tue Nov 28 21:10:23 2000
+++ eggdrop1.6/eggdrop.advanced.conf	Fri May 18 17:35:03 2001
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- set that to the directory eggdrop is in i.e. "#! /home/lamest/egg/eggdrop"
 #
-# $Id: eggdrop.advanced.conf,v 1.24 2000/11/29 03:10:23 guppy Exp $
+# $Id: eggdrop.advanced.conf,v 1.25 2001/05/18 22:35:03 guppy Exp $
 #
 # This is a sample configuration file for your bot.  You will definitely
 # want to edit this, to set up your bot.  Right now it creates a bot called
@@ -643,10 +643,6 @@
 # [0/1] if the bot's nickname is changed (for example, if the intended
 # nickname is already in use) keep trying to get the nick back?
 set keep-nick 1
-
-# [0/1] use /ison instead of /trace to see if our botnick is free or being
-# used? (note: some irc admins, look for excessive use of /trace)
-set use-ison 1
 
 # [0/1] if this is set, a leading '~' on user at hosts WON'T be stripped off
 set strict-host 0
Index: eggdrop1.6/eggdrop.complete.conf
diff -u eggdrop1.6/eggdrop.complete.conf:1.27 eggdrop1.6/eggdrop.complete.conf:1.28
--- eggdrop1.6/eggdrop.complete.conf:1.27	Tue Jan 30 23:34:23 2001
+++ eggdrop1.6/eggdrop.complete.conf	Fri May 18 17:35:03 2001
@@ -1,7 +1,7 @@
 #! /path/to/executable/eggdrop
 # ^- set that to the directory eggdrop is in ie "#! /home/lamest/egg/eggdrop"
 #
-# $Id: eggdrop.complete.conf,v 1.27 2001/01/31 05:34:23 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.28 2001/05/18 22:35:03 guppy Exp $
 #
 # this config file includes all possible options you can
 # use to configure your bot properly.
@@ -717,10 +717,6 @@
 # [0/1] if the bot's nickname is changed (for example, if the intended
 # nickname is already in use) keep trying to get the nick back?
 set keep-nick 1
-
-# [0/1] use /ison instead of /trace to see if our botnick is free or being
-# used? (note: some irc admins, look for excessive use of /trace)
-set use-ison 1
 
 # [0/1] if this is set, a leading '~' on user at hosts WON'T be stripped off
 set strict-host 0
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.62 eggdrop1.6/src/mod/server.mod/server.c:1.63
--- eggdrop1.6/src/mod/server.mod/server.c:1.62	Sat May 12 15:48:36 2001
+++ eggdrop1.6/src/mod/server.mod/server.c	Fri May 18 17:35:04 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.62 2001/05/12 20:48:36 guppy Exp $
+ * $Id: server.c,v 1.63 2001/05/18 22:35:04 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -80,7 +80,6 @@
 static int lowercase_ctcp;	/* answer lowercase CTCP's (non-standard) */
 static char bothost[81];	/* dont mind me, Im stupid */
 static int check_mode_r;	/* check for IRCNET +r modes */
-static int use_ison;		/* arthur2 static */
 static int net_type;
 static char connectserver[121];	/* what, if anything, to do before connect
 				   to the server */
@@ -1277,7 +1276,6 @@
   {"server-cycle-wait",		(int *) &server_cycle_wait,	0},
   {"default-port",		&default_port,			0},
   {"check-mode-r",		&check_mode_r,			0},
-  {"use-ison",			&use_ison,			0},
   {"net-type",			&net_type,			0},
   {"ctcp-mode",			&ctcp_mode,			0},
   {"double-mode",		&double_mode,			0},/* G`Quann */
@@ -1814,7 +1812,6 @@
   check_mode_r = 0;
   maxqmsg = 300;
   burst = 0;
-  use_ison = 1;
   net_type = NETT_EFNET;
   double_mode = 0;
   double_server = 0;
Index: eggdrop1.6/src/mod/server.mod/servmsg.c
diff -u eggdrop1.6/src/mod/server.mod/servmsg.c:1.52 eggdrop1.6/src/mod/server.mod/servmsg.c:1.53
--- eggdrop1.6/src/mod/server.mod/servmsg.c:1.52	Wed Apr 11 21:39:47 2001
+++ eggdrop1.6/src/mod/server.mod/servmsg.c	Fri May 18 17:35:04 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.52 2001/04/12 02:39:47 guppy Exp $
+ * $Id: servmsg.c,v 1.53 2001/05/18 22:35:04 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -707,18 +707,11 @@
      */
     if (strncmp(botname, origbotname, strlen(botname))) {
       /* See if my nickname is in use and if if my nick is right.  */
-      if (use_ison) {
-	/* Save space and use the same ISON :P */
 	alt = get_altbotnick();
 	if (alt[0] && egg_strcasecmp (botname, alt))
 	  dprintf(DP_SERVER, "ISON :%s %s %s\n", botname, origbotname, alt);
 	else
           dprintf(DP_SERVER, "ISON :%s %s\n", botname, origbotname);
-      } else
-	dprintf(DP_SERVER, "TRACE %s\n", origbotname);
-      /* Will return 206(undernet), 401(other), or 402(efnet) numeric if
-       * not online.
-      */
     }
   }
   if (min_servs == 0)
@@ -759,7 +752,7 @@
   char *tmp, *alt;
   int ison_orig = 0, ison_alt = 0;
 
-  if (!use_ison || !keepnick ||
+  if (!keepnick ||
       !strncmp(botname, origbotname, strlen(botname))) {
     return;
   }
@@ -785,19 +778,6 @@
   }
 }
 
-/* Trace failed! meaning my nick is not in use! 206 (undernet)
- * 401 (other non-efnet) 402 (Efnet)
- */
-static int trace_fail(char *from, char *msg)
-{
-  if (keepnick && !use_ison  && !egg_strcasecmp (botname, origbotname)) {
-    if (!nick_juped)
-      putlog(LOG_MISC, "*", IRC_GETORIGNICK, origbotname);
-    dprintf(DP_SERVER, "NICK %s\n", origbotname);
-  }
-  return 0;
-}
-
 /* 432 : Bad nickname
  */
 static int got432(char *from, char *msg)
@@ -1100,18 +1080,6 @@
   return 0;
 }
 
-/* Additional 3sec penalty if a link was traced.
- */
-static int tracepenalty(char *from, char *msg)
-{
-  if (use_penalties) {
-    last_time += 3;
-    if (debug_output)
-      putlog(LOG_SRVOUT, "*", "adding 3secs penalty (traced link)");
-  }
-  return 0;
-}
-
 /* Another sec penalty if bot did a whois on another server.
  */
 static int whoispenalty(char *from, char *msg)
@@ -1152,11 +1120,8 @@
   {"PONG",	"",	(Function) gotpong,		NULL},
   {"WALLOPS",	"",	(Function) gotwall,		NULL},
   {"001",	"",	(Function) got001,		NULL},
-  {"206",	"",	(Function) trace_fail,		NULL},
   {"251",	"",	(Function) got251,		NULL},
   {"303",	"",	(Function) got303,		NULL},
-  {"401",	"",	(Function) trace_fail,		NULL},
-  {"402",	"",	(Function) trace_fail,		NULL},
   {"432",	"",	(Function) got432,		NULL},
   {"433",	"",	(Function) got433,		NULL},
   {"437",	"",	(Function) got437,		NULL},
@@ -1166,7 +1131,6 @@
   {"NICK",	"",	(Function) gotnick,		NULL},
   {"ERROR",	"",	(Function) goterror,		NULL},
   {"KICK",	"",	(Function) gotkick,		NULL},
-  {"200",	"",	(Function) tracepenalty,	NULL},
   {"318",	"",	(Function) whoispenalty,	NULL},
   {NULL,	NULL,	NULL,				NULL}
 };
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.468 eggdrop1.6/src/patch.h:1.469
--- eggdrop1.6/src/patch.h:1.468	Mon May 14 11:17:00 2001
+++ eggdrop1.6/src/patch.h	Fri May 18 17:35:04 2001
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.468 2001/05/14 16:17:00 guppy Exp $
+ * $Id: patch.h,v 1.469 2001/05/18 22:35:04 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("989856944");		/* current unixtime */
+patch("990225292");		/* current unixtime */
 /*
  *
  *
  */
-patch("september");
+patch("legacytrace");
 /*
  *
  *
----------------------- End of diff -----------------------



More information about the Changes mailing list