Author: Isomer <isomer@coders.net>

Log message:

 * Nick kills are sent in both directions now, slightly more bandwidth - but
the network won't desync.  This lets us change to a forced nick change model
later.

 * Fix map buglet.

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@113 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index e9688c6bba405357547204bc364fa1df0768bbf2..c5612ff3f7c6319d81748d19d89d069ec8d4d6be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-03-30  Perry Lorier <isomer@coders.net>
+       * ircd/m_nick.c: send kills both ways so when we add nick change
+       on collision we don't desync the network.
+
+       * ircd/map.c: Fixup the map a bit more.
+
 2000-03-31  Kevin L. Mitchell  <klmitch@mit.edu>
 
        * ircd/m_clearmode.c (do_clearmode): Log the CLEARMODE to OPATH
@@ -253,7 +259,7 @@
 #
 # ChangeLog for ircu2.10.11
 #
-# $Id: ChangeLog,v 1.49 2000-03-31 19:42:03 kev Exp $
+# $Id: ChangeLog,v 1.50 2000-04-01 01:55:31 isomer Exp $
 #
 # Insert new changes at beginning of the change list.
 #

diff --git a/ircd/list.c b/ircd/list.c
index bc44e6325304fabfe02e57281251b3a2e95557c3..98eaaa646e6cb99120ec7ece4a22d54d94d2642c 100644 (file)
--- a/ircd/list.c
+++ b/ircd/list.c
@@ -153,7 +153,7 @@ struct Server *make_server(struct Client *cptr)
     servs.inuse++;
 #endif
     cptr->serv = serv;
-    cptr->serv->lag = 10000;
+    cptr->serv->lag = 60000;
     *serv->by = '\0';
     DupString(serv->last_error_msg, "<>");      /* String must be non-empty */
   }

diff --git a/ircd/m_nick.c b/ircd/m_nick.c
index 02c61f3943d3f2b051729288406291f5be9dff2c..fa2aab0dc7c5181ec95beb9d28fe0a5faaab4be7 100644 (file)
--- a/ircd/m_nick.c
+++ b/ircd/m_nick.c
@@ -298,7 +298,7 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
       /*
        * bad nick _change_
        */
-      sendto_highprot_butone(cptr, 10, "%s " TOK_KILL " %s :%s (%s <- %s!%s@%s)",
+      sendto_highprot_butone(&me, 10, "%s " TOK_KILL " %s :%s (%s <- %s!%s@%s)",
                              NumServ(&me), parv[0], me.name, cptr->name,
                              parv[0], sptr->user ? sptr->username : "",
                              sptr->user ? sptr->user->server->name : cptr->name);
@@ -439,7 +439,7 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     if ((differ && lastnick >= acptr->lastnick) || (!differ && lastnick <= acptr->lastnick)) {
       if (!IsServer(sptr)) {
         ++ServerStats->is_kill;
-        sendto_highprot_butone(cptr, 10,        /* Kill old from outgoing servers */
+        sendto_highprot_butone(&me, 10,        /* Kill old from outgoing servers */
                               "%s " TOK_KILL " %s%s :%s (%s <- %s (Nick collision))",
                               NumServ(&me), NumNick(sptr), me.name, acptr->from->name,
                               cptr->name);
@@ -472,7 +472,7 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
    * This exits the client we had before getting the NICK message
    */
   if (differ) {
-    sendto_highprot_butone(cptr, 10,        /* Kill our old from outgoing servers */
+    sendto_highprot_butone(&me, 10,        /* Kill our old from outgoing servers */
                            "%s " TOK_KILL " %s%s :%s (%s <- %s (older nick overruled))",
                            NumServ(&me), NumNick(acptr), me.name, acptr->from->name,
                            cptr->name);
@@ -482,7 +482,7 @@ int ms_nick(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     exit_client(cptr, acptr, &me, "Nick collision (older nick overruled)");
   }
   else {
-    sendto_highprot_butone(cptr, 10,        /* Kill our old from outgoing servers */
+    sendto_highprot_butone(&me, 10,        /* Kill our old from outgoing servers */
                           "%s " TOK_KILL " %s%s :%s (%s <- %s (nick collision from same user@host))",
                           NumServ(&me), NumNick(acptr), me.name, acptr->from->name,
                           cptr->name);
@@ -573,7 +573,7 @@ int m_nick(struct Client *cptr, struct Client *sptr, int parc, char *parv[])
             parv[1], nick, cptr->name);
       if (!IsServer(sptr))        /* bad nick _change_ */
       {
-        sendto_highprot_butone(cptr, 10, "%s " TOK_KILL " %s :%s (%s <- %s!%s@%s)",
+        sendto_highprot_butone(&me, 10, "%s " TOK_KILL " %s :%s (%s <- %s!%s@%s)",
             NumServ(&me), parv[0], me.name, cptr->name,
             parv[0], sptr->user ? sptr->username : "",
             sptr->user ? sptr->user->server->name : cptr->name);