From 288cf9e695ee1c4b4446e0bfbc97bff363120577 Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Sat, 19 Feb 2005 02:36:02 +0000 Subject: [PATCH] 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 --- ChangeLog | 8 ++++++++ ircd/s_bsd.c | 6 ++++++ ircd/s_stats.c | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3a959e9..d5814ae 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-02-18 Michael Poole + + * 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 * 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 ead38df..0ddd46d 100644 --- 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 1b332af..7c54ad2 100644 --- 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) -- 2.20.1