From 813cddc249d56b473f18258e598f9c5263665c8c Mon Sep 17 00:00:00 2001 From: Michael Poole Date: Fri, 26 Aug 2005 03:23:23 +0000 Subject: [PATCH] The last class link-count tweaks for the night. I promise. git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@1468 c9e4aea6-c8fd-4c43-8297-357d70d61c8c --- ChangeLog | 7 +++++-- ircd/class.c | 4 ++-- ircd/m_trace.c | 4 ++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index acf7fd9..010416b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,8 +4,11 @@ suggestion, disallow channel manager talking after Apass is set, so they set and use Upass sooner. - * ircd/class.c (report_classes): Return links count plus one to - match old output. + * ircd/class.c (init_class): Default class should have 1 link. + (report_classes): Return links count minus one to match old output. + + * ircd/m_trace.c (do_trace): Fix links count here, too (spotted by + Reed). 2005-08-25 Michael Poole diff --git a/ircd/class.c b/ircd/class.c index 4a72ef8..825b0d0 100644 --- a/ircd/class.c +++ b/ircd/class.c @@ -101,7 +101,7 @@ void init_class(void) MaxLinks(connClassList) = feature_int(FEAT_MAXIMUM_LINKS); MaxSendq(connClassList) = feature_int(FEAT_DEFAULTMAXSENDQLENGTH); connClassList->valid = 1; - Links(connClassList) = 0; + Links(connClassList) = 1; connClassList->next = 0; } @@ -257,7 +257,7 @@ report_classes(struct Client *sptr, const struct StatDesc *sd, for (cltmp = connClassList; cltmp; cltmp = cltmp->next) send_reply(sptr, RPL_STATSYLINE, 'Y', ConClass(cltmp), PingFreq(cltmp), ConFreq(cltmp), MaxLinks(cltmp), MaxSendq(cltmp), - Links(cltmp) ? Links(cltmp) - 1 : 0); + Links(cltmp) - 1); } /** Return maximum SendQ length for a client. diff --git a/ircd/m_trace.c b/ircd/m_trace.c index d5e4a48..a0ba975 100644 --- a/ircd/m_trace.c +++ b/ircd/m_trace.c @@ -293,8 +293,8 @@ void do_trace(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) */ if (IsAnOper(sptr) && doall) { for (cl = get_class_list(); cl; cl = cl->next) { - if (Links(cl) > 0) - send_reply(sptr, RPL_TRACECLASS, ConClass(cl), Links(cl)); + if (Links(cl) > 1) + send_reply(sptr, RPL_TRACECLASS, ConClass(cl), Links(cl) - 1); } } send_reply(sptr, RPL_TRACEEND); -- 2.20.1