Author: Bleep <tomh@inxpress.net>

Log message:
Merge 2.10.10

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

diff --git a/ChangeLog b/ChangeLog
index 580f1edfd8edbcef8293b1c947aedd58060c33f0..804098b99f78d9e233c0a3ca59b8be2810f66813 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -68,14 +68,6 @@
        * include/channel.h: added definition of ModeBuf, modebuf_*
        manipulation functions, and a couple of helper macros
 
-#
-# ChangeLog for ircu2.10.11
-#
-# $Id: ChangeLog,v 1.32 2000-03-27 21:16:56 kev Exp $
-#
-# Insert new changes at beginning of the change list.
-#
-#-----------------------------------------------------------------------------
 2000-03-24 Thomas Helvey <tomh@inxpress.net>
   * numicks.c: convert extended numerics to use original mask version
   * numnicks.h: ""
@@ -93,3 +85,11 @@
 * Merge in u2_10_10_beta07 changes --Bleep
 * Merge in u2_10_10_beta06 changes --Bleep
 * Start ircu2.10.11 development, beta branch u2_10_10 --Bleep
+#-----------------------------------------------------------------------------
+#
+# ChangeLog for ircu2.10.11
+#
+# $Id: ChangeLog,v 1.33 2000-03-28 00:52:14 bleep Exp $
+#
+# Insert new changes at beginning of the change list.
+#

diff --git a/ChangeLog.10 b/ChangeLog.10
index 6bf2630134b0fc98cc230fa00ae87881fcd917d0..95485d21f679a4cf0d547964b650860f350956be 100644 (file)
--- a/ChangeLog.10
+++ b/ChangeLog.10
@@ -1,10 +1,11 @@
 #
 # ChangeLog for ircu2.10.10
 #
-# $Id: ChangeLog.10,v 1.5 2000-03-27 03:33:25 bleep Exp $
+# $Id: ChangeLog.10,v 1.6 2000-03-28 00:52:14 bleep Exp $
 #
 # Insert new changes at beginning of the change list.
 #
+* Fix for Bogus protocol strings for P9 servers --Bleep
 * Hookup UPING code again, cleanups --Bleep
 * Convert numerics back to mask and shift extended numerics
   follow same mechanism --Bleep

diff --git a/include/patchlevel.h b/include/patchlevel.h
index 919c966ef6c27c8e7f310b83603d709d84ef6ffc..42203fab0733684cb0534a0d0d3829bbe6712888 100644 (file)
--- a/include/patchlevel.h
+++ b/include/patchlevel.h
@@ -22,6 +22,9 @@
 
 #define RELEASE ".11.alpha."
 
+/*
+ * Deliberate empty lines
+ */
 /* Do NOT edit those: */
 
 #ifndef BASE_VERSION

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index a492869a628e82c4bf89b4a42d185377dce73b6f..dccd0b14f33097a7f7e865faf9dcfb61bf0ab26b 100644 (file)
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -330,14 +330,13 @@ ircd.o: ircd.c ../include/ircd.h ../config/config.h ../config/setup.h \
  ../include/client.h ../include/dbuf.h ../include/ircd_handler.h \
  ../include/crule.h ../include/hash.h ../include/ircd_alloc.h \
  ../include/fda.h ../include/ircd_log.h ../include/ircd_signal.h \
- ../include/ircd_string.h ../include/ircd_chattr.h ../include/jupe.h \
- ../include/list.h ../include/listener.h ../include/match.h \
- ../include/numeric.h ../include/numnicks.h ../include/parse.h \
- ../include/res.h ../include/s_auth.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
- ../include/send.h ../include/sys.h ../include/uping.h \
- ../include/userload.h ../include/version.h ../include/whowas.h \
- ../include/msg.h
+ ../include/ircd_string.h ../include/ircd_chattr.h ../include/list.h \
+ ../include/listener.h ../include/match.h ../include/numeric.h \
+ ../include/numnicks.h ../include/parse.h ../include/res.h \
+ ../include/s_auth.h ../include/s_bsd.h ../include/s_conf.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/send.h \
+ ../include/sys.h ../include/uping.h ../include/userload.h \
+ ../include/version.h ../include/whowas.h ../include/msg.h
 ircd_alloc.o: ircd_alloc.c ../include/ircd_alloc.h ../include/fda.h \
  ../include/ircd_string.h ../config/config.h ../config/setup.h \
  ../include/ircd_chattr.h ../include/s_debug.h ../include/ircd_defs.h
@@ -672,11 +671,11 @@ m_server.o: m_server.c ../include/client.h ../include/dbuf.h \
  ../include/hash.h ../include/ircd.h ../config/config.h \
  ../config/setup.h ../include/struct.h ../include/ircd_log.h \
  ../include/ircd_reply.h ../include/ircd_string.h \
- ../include/ircd_chattr.h ../include/jupe.h ../include/list.h \
- ../include/match.h ../include/msg.h ../include/numeric.h \
- ../include/numnicks.h ../include/querycmds.h ../include/s_bsd.h \
- ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
- ../include/s_serv.h ../include/send.h ../include/userload.h
+ ../include/ircd_chattr.h ../include/list.h ../include/match.h \
+ ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+ ../include/querycmds.h ../include/s_bsd.h ../include/s_conf.h \
+ ../include/s_debug.h ../include/s_misc.h ../include/s_serv.h \
+ ../include/send.h ../include/userload.h
 m_settime.o: m_settime.c ../include/client.h ../include/dbuf.h \
  ../include/ircd_defs.h ../include/ircd_handler.h ../include/hash.h \
  ../include/ircd.h ../config/config.h ../config/setup.h \

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index b5ebc3ef352e1c770b315f1273a5efb871f446fa..08b391d848409a8faee81851e46fd3dd53bf9f2a 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -209,9 +209,14 @@ int server_estab(struct Client *cptr, struct ConfItem *aconf)
     /* acptr->from == acptr for acptr == cptr */
     if (acptr->from == cptr)
       continue;
-    if (IsServer(acptr))
-    {
-      char *protocol_str = IsBurst(acptr) ? "J" : "P";
+    if (IsServer(acptr)) {
+      const char* protocol_str;
+
+      if (Protocol(acptr) > 9)
+        protocol_str = IsBurst(acptr) ? "J" : "P";
+      else
+        protocol_str = IsBurst(acptr) ? "J0" : "P0";
+
       if (0 == match(me.name, acptr->name))
         continue;
       split = (MyConnect(acptr) && 

diff --git a/ircd/s_user.c b/ircd/s_user.c
index cfe8428e497cd96a0a9b75fcb82e6285d7674b5a..e908d10323a1a61147da4dbdfaf5e254f880631c 100644 (file)
--- a/ircd/s_user.c
+++ b/ircd/s_user.c
@@ -714,7 +714,7 @@ int set_nick_name(struct Client* cptr, struct Client* sptr,
     new_client->user->server = sptr;
     SetRemoteNumNick(new_client, parv[parc - 2]);
     /*
-     * IP address of remote client
+     * IP# of remote client
      */
     new_client->ip.s_addr = htonl(base64toint(parv[parc - 3]));