[cvslog] Module eggdrop1.7: Change committed

cvslog cvs at tsss.org
Tue Dec 18 00:32:01 CST 2001


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.7
Commit time: 2001-12-18 06:31:05 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     eggdrop.complete.conf doc/html/mod-server.html
     doc/settings/mod.server lib/eggdrop/module.h
     modules/server/server.c modules/server/servmsg.c
     modules/server/help/set/server.help

Log message:

strict-servernames is gone, also I cleaned up a few leftovers from the old bind code ... hopefully it was done right otherwise stdarg is gonna murder me

---------------------- diff included ----------------------
Index: eggdrop1.7/doc/html/mod-server.html
diff -u eggdrop1.7/doc/html/mod-server.html:1.16 eggdrop1.7/doc/html/mod-server.html:1.17
--- eggdrop1.7/doc/html/mod-server.html:1.16	Mon Dec 17 23:33:19 2001
+++ eggdrop1.7/doc/html/mod-server.html	Tue Dec 18 00:30:54 2001
@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<!-- $Id: mod-server.html,v 1.16 2001/12/18 05:33:19 guppy Exp $ -->
+<!-- $Id: mod-server.html,v 1.17 2001/12/18 06:30:54 guppy Exp $ -->
 
 <html>
   <head>
@@ -125,18 +125,6 @@
         <dd>
           <p>Eggdrop will use this port if none is specified in the server
           list or given for the &#39;.jump&#39; command.</p>
-        </dd>
-
-        <dt><strong><em>set strict-servernames 0</em></strong></dt>
-
-        <dd>
-          <p>Often an irc server call itself somthing other then what its
-          real dns name is. If you want eggdrop to replace your server entry
-          in the config file with this name, set this to 1. If you turn this
-          setting to 0, eggdrop will keep this name separate from the server
-          list.</p>
-
-          <p>Valid settings are 0 and 1.</p>
         </dd>
 
         <dt><strong>set server-cycle-wait 60</strong></dt>
Index: eggdrop1.7/doc/settings/mod.server
diff -u eggdrop1.7/doc/settings/mod.server:1.15 eggdrop1.7/doc/settings/mod.server:1.16
--- eggdrop1.7/doc/settings/mod.server:1.15	Mon Dec 17 23:33:19 2001
+++ eggdrop1.7/doc/settings/mod.server	Tue Dec 18 00:30:54 2001
@@ -61,13 +61,6 @@
     '.jump' or in 'server'
 
 
-set strict-servernames 0
-    Often irc server call themself in another way then there dns is. If
-    you want eggdrop to replace your entry in the config file with this
-    name, set this to 1. If you turn this setting to 0, eggdrop will keep
-    a seperate list of the names irc servers call themselves
-    Valid settings are 0 for OFF and 1 ON.
-
 set server-cycle-wait 60
     This setting defines how long eggdrop should wait before moving from one
     server to another on disconnect.
Index: eggdrop1.7/eggdrop.complete.conf
diff -u eggdrop1.7/eggdrop.complete.conf:1.62 eggdrop1.7/eggdrop.complete.conf:1.63
--- eggdrop1.7/eggdrop.complete.conf:1.62	Mon Dec 17 23:49:38 2001
+++ eggdrop1.7/eggdrop.complete.conf	Tue Dec 18 00:30:54 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.complete.conf,v 1.62 2001/12/18 05:49:38 guppy Exp $
+# $Id: eggdrop.complete.conf,v 1.63 2001/12/18 06:30:54 guppy Exp $
 #
 # This config file includes all possible options you can
 # use to configure your bot properly.
@@ -693,12 +693,6 @@
 set flood-msg 5:60
 # how many CTCPs in how many seconds?
 set flood-ctcp 3:60
-
-# [0/1] If this setting is 0 then the eggdrop keeps a seperate list of the names
-# irc servers call themselves, retaining what you entered in the config file.
-# setting it to 1 will cause the bot to replace your entry with what
-# the server actually calls itself
-set strict-servernames 0
 
 # number of seconds to wait between each server connect (0 = no wait)
 # useful for preventing ircu throttling
Index: eggdrop1.7/lib/eggdrop/module.h
diff -u eggdrop1.7/lib/eggdrop/module.h:1.5 eggdrop1.7/lib/eggdrop/module.h:1.6
--- eggdrop1.7/lib/eggdrop/module.h:1.5	Sun Dec  9 21:22:28 2001
+++ eggdrop1.7/lib/eggdrop/module.h	Tue Dec 18 00:30:54 2001
@@ -1,7 +1,7 @@
 /*
  * module.h
  *
- * $Id: module.h,v 1.5 2001/12/10 03:22:28 guppy Exp $
+ * $Id: module.h,v 1.6 2001/12/18 06:30:54 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -155,7 +155,7 @@
 #define chatout (global[70])
 #define chanout_but ((void(*)())global[71])
 /* 72 - 75 */
-#define check_validity ((int (*) (char *,Function))global[72])
+/* #define check_validity ((int (*) (char *,Function))global[72]) */
 #define list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
 #define list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
 #define list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
Index: eggdrop1.7/modules/server/help/set/server.help
diff -u eggdrop1.7/modules/server/help/set/server.help:1.4 eggdrop1.7/modules/server/help/set/server.help:1.5
--- eggdrop1.7/modules/server/help/set/server.help:1.4	Mon Dec 17 23:33:19 2001
+++ eggdrop1.7/modules/server/help/set/server.help	Tue Dec 18 00:30:55 2001
@@ -44,14 +44,6 @@
    will change back to its intended nick within 60 seconds.
 
 see also: set nick, set altnick
-%{help=set strict-servernames}%{+n}
-###  %bset strict-servernames%b <0/1>
-   Some irc servers have different names on the IRC network to
-   what you use to connect, and this name may not resolve,
-   hence the bot no-longer changes the server name to reflect this
-   (it does record it however), enabling this setting will cause
-   the bot to change the entry for the server the name the server
-   thinks is it's name.
 %{help=set check-stoned}%{+n}
 ###  %bset check-stoned%b 0/1
    This setting, when enabled, will cause the bot to ping the server
@@ -154,7 +146,6 @@
      %bflood-ctcp%b           %bserver%b         %bcheck-stoned%b
      %bmax-queue-msg%b        %bstrict-host%b    %bbotnick%b
      %bserver-timeout%b       %bservers%b        %bkeep-nick%b
-     %bstrict-servernames%b   %bbotname%b        %bquiet-reject%b
+     %bbotname%b              %bquiet-reject%b   %bserver-cycle-wait%b
      %banswer-ctcp%b          %baltnick%b        %bflood-msg%b
      %btrigger-on-ignore%b    %bdefault-port%b   %brealname%b
-     %bserver-cycle-wait%b
Index: eggdrop1.7/modules/server/server.c
diff -u eggdrop1.7/modules/server/server.c:1.6 eggdrop1.7/modules/server/server.c:1.7
--- eggdrop1.7/modules/server/server.c:1.6	Mon Dec 17 23:33:19 2001
+++ eggdrop1.7/modules/server/server.c	Tue Dec 18 00:30:55 2001
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.6 2001/12/18 05:33:19 guppy Exp $
+ * $Id: server.c,v 1.7 2001/12/18 06:30:55 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -64,7 +64,6 @@
 					   re-beginning the server list */
 static char botrealname[121];	/* realname of bot */
 static int server_timeout;	/* server timeout for connecting */
-static int strict_servernames;	/* don't update server list */
 static struct server_list *serverlist;	/* old-style queue, still used by
 					   server list */
 static int cycle_time;		/* cycle time till next server connect */
@@ -1000,10 +999,6 @@
 	if (!strcasecmp(x->name, serv)) {
 	  *ptr = i;
 	  return;
-	} else if (x->realname && !strcasecmp(x->realname, serv)) {
-	  *ptr = i;
-	  strncpyz(serv, x->realname, sizeof serv);
-	  return;
 	}
       }
       i++;
@@ -1045,59 +1040,6 @@
     pass[0] = 0;
 }
 
-static int server_6char STDVAR
-{
-  Function F = (Function) cd;
-  char x[20];
-
-  BADARGS(7, 7, " nick user at host handle desto/chan keyword/nick text");
-  CHECKVALIDITY(server_6char);
-  snprintf(x, sizeof x, "%d",
-	       F(argv[1], argv[2], argv[3], argv[4], argv[5], argv[6]));
-  Tcl_AppendResult(irp, x, NULL);
-  return TCL_OK;
-}
-
-static int server_5char STDVAR
-{
-  Function F = (Function) cd;
-
-  BADARGS(6, 6, " nick user at host handle channel text");
-  CHECKVALIDITY(server_5char);
-  F(argv[1], argv[2], argv[3], argv[4], argv[5]);
-  return TCL_OK;
-}
-
-static int server_2char STDVAR
-{
-  Function F = (Function) cd;
-
-  BADARGS(3, 3, " nick msg");
-  CHECKVALIDITY(server_2char);
-  F(argv[1], argv[2]);
-  return TCL_OK;
-}
-
-static int server_msg STDVAR
-{
-  Function F = (Function) cd;
-
-  BADARGS(5, 5, " nick uhost hand buffer");
-  CHECKVALIDITY(server_msg);
-  F(argv[1], argv[2], get_user_by_handle(userlist, argv[3]), argv[4]);
-  return TCL_OK;
-}
-
-static int server_raw STDVAR
-{
-  Function F = (Function) cd;
-
-  BADARGS(4, 4, " from code args");
-  CHECKVALIDITY(server_raw);
-  Tcl_AppendResult(irp, int_to_base10(F(argv[1], argv[3])), NULL);
-  return TCL_OK;
-}
-
 /* Read/write normal string variable.
  */
 static char *nick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
@@ -1283,7 +1225,6 @@
   {"server-timeout",		&server_timeout,		0},
   {"server-online",		(int *) &server_online,		2},
   {"keep-nick",			&keepnick,			0},
-  {"strict-servernames",	&strict_servernames,		0},
   {"check-stoned",		&check_stoned,			0},
   {"quiet-reject",		&quiet_reject,			0},
   {"max-queue-msg",		&maxqmsg,			0},
@@ -1753,7 +1694,6 @@
   server_cycle_wait = 60;
   strcpy(botrealname, "A deranged product of evil coders");
   server_timeout = 60;
-  strict_servernames = 0;
   serverlist = NULL;
   cycle_time = 0;
   default_port = 6667;
Index: eggdrop1.7/modules/server/servmsg.c
diff -u eggdrop1.7/modules/server/servmsg.c:1.5 eggdrop1.7/modules/server/servmsg.c:1.6
--- eggdrop1.7/modules/server/servmsg.c:1.5	Mon Dec 17 23:33:19 2001
+++ eggdrop1.7/modules/server/servmsg.c	Tue Dec 18 00:30:55 2001
@@ -1,7 +1,7 @@
 /*
  * servmsg.c -- part of server.mod
  *
- * $Id: servmsg.c,v 1.5 2001/12/18 05:33:19 guppy Exp $
+ * $Id: servmsg.c,v 1.6 2001/12/18 06:30:55 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -212,13 +212,7 @@
     }
     if (x->realname)
       free(x->realname);
-    if (strict_servernames == 1) {
-      x->realname = NULL;
-      if (x->name)
-	free(x->name);
-      malloc_strcpy(x->name, from);
-    } else
-      malloc_strcpy(x->realname, from);
+    malloc_strcpy(x->realname, from);
   }
   return 0;
 }
@@ -955,15 +949,9 @@
   if (x && use_penalties) {
     i = ii = 0;
     for (; x; x = x->next) {
-      if (i == curserv) {
-        if ((strict_servernames == 1) || !x->realname) {
-          if (strcmp(x->name, from))
-            ii = 1;
-        } else {
-          if (strcmp(x->realname, from))
+      if (i == curserv)
+          if (strcmp(x->name, from) || strcmp(x->realname, from))
             ii = 1;
-        }
-      }
       i++;
     }
     if (ii) {
@@ -1115,7 +1103,6 @@
 
 static void server_resolve_success(int servidx)
 {
-  int oldserv = dcc[servidx].u.dns->ibuf;
   char s[121], pass[121];
 
   resolvserv = 0;
----------------------- End of diff -----------------------



More information about the Changes mailing list