Fix /stats U and TOS settings for outbound server connects.

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

diff --git a/ChangeLog b/ChangeLog
index 3a959e9d0cf13e4be2a9f4f32aaea3ad133bcd59..d5814aea7a0548bb6518570af987f658364394db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-02-18  Michael Poole <mdpoole@troilus.org>
+
+       * ircd/s_bsd.c (connect_inet): Set IP TOS for outbound server
+       connections.
+
+       * ircd/s_stats.c (stats_configured_links): Display correct field
+       when listing CONF_UWORLD entries.
+
 2005-02-09  Michael Poole <mdpoole@troilus.org>
 
        * configure.in (YACC): Only warn if we cannot get a version number

diff --git a/ircd/s_bsd.c b/ircd/s_bsd.c
index ead38dfb887866e08b27ab5f5e1391b224f8e530..0ddd46db33fd60f508d7db7271beb344cf85a99b 100644 (file)
--- a/ircd/s_bsd.c
+++ b/ircd/s_bsd.c
@@ -259,6 +259,12 @@ static int connect_inet(struct ConfItem* aconf, struct Client* cptr)
     cli_fd(cptr) = -1;
     return 0;
   }
+  /*
+   * Set the TOS bits - this is nonfatal if it doesn't stick.
+   */
+  if (!os_set_tos(cli_fd(cptr), FEAT_TOS_SERVER)) {
+    report_error(TOS_ERROR_MSG, cli_name(cptr), errno);
+  }
   if ((result = os_connect_nonb(cli_fd(cptr), &aconf->address)) == IO_FAILURE) {
     cli_error(cptr) = errno;
     report_error(CONNECT_ERROR_MSG, cli_name(cptr), errno);

diff --git a/ircd/s_stats.c b/ircd/s_stats.c
index 1b332af99b78b708b09e39a314cd4a0acc904200..7c54ad208e11ef1a6e39cc67d82513213e3fc234 100644 (file)
--- a/ircd/s_stats.c
+++ b/ircd/s_stats.c
@@ -100,7 +100,7 @@ stats_configured_links(struct Client *sptr, const struct StatDesc* sd,
       maximum = tmp->maximum;
       port = tmp->address.port;
       if (tmp->status & CONF_UWORLD)
-       send_reply(sptr, RPL_STATSULINE, name);
+       send_reply(sptr, RPL_STATSULINE, host);
       else if (tmp->status & CONF_SERVER)
        send_reply(sptr, RPL_STATSCLINE, name, host, port, maximum, hub_limit, get_conf_class(tmp));
       else if (tmp->status & CONF_CLIENT)