Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-02-19 02:36:13 UTC
Modified files:
ircd/s_stats.c ircd/s_bsd.c ChangeLog
Log message:
Fix /stats U and TOS settings for outbound server connects.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.548 ircu2.10/ChangeLog:1.549
--- ircu2.10/ChangeLog:1.548 Wed Feb 9 19:51:27 2005
+++ ircu2.10/ChangeLog Fri Feb 18 18:36:02 2005
@@ -1,3 +1,11 @@
+2005-02-18 Michael Poole <[EMAIL PROTECTED]>
+
+ * 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 <[EMAIL PROTECTED]>
* configure.in (YACC): Only warn if we cannot get a version number
Index: ircu2.10/ircd/s_bsd.c
diff -u ircu2.10/ircd/s_bsd.c:1.72 ircu2.10/ircd/s_bsd.c:1.73
--- ircu2.10/ircd/s_bsd.c:1.72 Tue Dec 28 19:08:09 2004
+++ ircu2.10/ircd/s_bsd.c Fri Feb 18 18:36:02 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Functions that now (or in the past) relied on BSD APIs.
- * @version $Id: s_bsd.c,v 1.72 2004/12/29 03:08:09 entrope Exp $
+ * @version $Id: s_bsd.c,v 1.73 2005/02/19 02:36:02 entrope Exp $
*/
#include "config.h"
@@ -259,6 +259,12 @@
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);
Index: ircu2.10/ircd/s_stats.c
diff -u ircu2.10/ircd/s_stats.c:1.30 ircu2.10/ircd/s_stats.c:1.31
--- ircu2.10/ircd/s_stats.c:1.30 Sun Nov 7 12:57:49 2004
+++ ircu2.10/ircd/s_stats.c Fri Feb 18 18:36:01 2005
@@ -60,7 +60,7 @@
/** @file
* @brief Report configuration lines and other statistics from this
* server.
- * @version $Id: s_stats.c,v 1.30 2004/11/07 20:57:49 entrope Exp $
+ * @version $Id: s_stats.c,v 1.31 2005/02/19 02:36:01 entrope Exp $
*
* Note: The info is reported in the order the server uses
* it--not reversed as in ircd.conf!
@@ -100,7 +100,7 @@
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)
----------------------- End of diff -----------------------
