X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fs_misc.c;h=111e9c7dc56508c11028a717367c1fd604c31dc9;hb=541252724db32192e85571306ebc60949048a093;hp=c5d26f4ee907ed7cbfd81963289aa912b2eba896;hpb=8049d81b2a13d802a41016396781b02fad16f443;p=ircu2.10.12-pk.git diff --git a/ircd/s_misc.c b/ircd/s_misc.c index c5d26f4..111e9c7 100644 --- a/ircd/s_misc.c +++ b/ircd/s_misc.c @@ -19,9 +19,13 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ */ +/** @file + * @brief Miscellaneous support functions. + * @version $Id$ + */ +#include "config.h" + #include "s_misc.h" #include "IPcheck.h" #include "channel.h" @@ -29,8 +33,10 @@ #include "hash.h" #include "ircd.h" #include "ircd_alloc.h" +#include "ircd_features.h" #include "ircd_log.h" #include "ircd_reply.h" +#include "ircd_snprintf.h" #include "ircd_string.h" #include "list.h" #include "match.h" @@ -40,19 +46,19 @@ #include "parse.h" #include "querycmds.h" #include "res.h" +#include "s_auth.h" #include "s_bsd.h" #include "s_conf.h" #include "s_debug.h" +#include "s_stats.h" #include "s_user.h" #include "send.h" -#include "sprintf_irc.h" #include "struct.h" -#include "support.h" #include "sys.h" #include "uping.h" #include "userload.h" -#include +/* #include -- Now using assert in ircd_log.h */ #include #include #include @@ -60,13 +66,14 @@ #include #include - +/** Array of English month names (0 = January). */ static char *months[] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; +/** Array of English day names (0 = Sunday). */ static char *weekdays[] = { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" @@ -75,9 +82,16 @@ static char *weekdays[] = { /* * stats stuff */ +/** Global statistics structure. */ static struct ServerStatistics ircst; +/** Public pointer to global statistics structure. */ struct ServerStatistics* ServerStats = &ircst; +/** Formats a Unix time as a readable string. + * @param clock Unix time to format (0 means #CurrentTime). + * @return Pointer to a static buffer containing something like + * "Sunday January 1 2000 -- 09:30 +01:00" + */ char *date(time_t clock) { static char buf[80], plus; @@ -92,6 +106,9 @@ char *date(time_t clock) gm = &gmbuf; lt = localtime(&clock); + /* There is unfortunately no clean portable way to extract time zone + * offset information, so do ugly things. + */ minswest = (gm->tm_hour - lt->tm_hour) * 60 + (gm->tm_min - lt->tm_min); if (lt->tm_yday != gm->tm_yday) { @@ -114,19 +131,16 @@ char *date(time_t clock) return buf; } -/* - * myctime - * - * This is like standard ctime()-function, but it zaps away - * the newline from the end of that string. Also, it takes +/** Like ctime() but with no trailing newline. Also, it takes * the time value as parameter, instead of pointer to it. - * Note that it is necessary to copy the string to alternate - * buffer (who knows how ctime() implements it, maybe it statically - * has newline there and never 'refreshes' it -- zapping that - * might break things in other places...) + * @param value Unix time to format. + * @return Pointer to a static buffer containing formatted time. */ char *myctime(time_t value) { + /* Use a secondary buffer in case ctime() would not replace an + * overwritten newline. + */ static char buf[28]; char *p; @@ -137,84 +151,40 @@ char *myctime(time_t value) return buf; } -/* - * get_client_name - * Return the name of the client for various tracking and - * admin purposes. The main purpose of this function is to - * return the "socket host" name of the client, if that - * differs from the advertised name (other than case). - * But, this can be used to any client structure. - * - * Returns: - * "name[user@ip#.port]" if 'showip' is true; - * "name[sockethost]", if name and sockhost are different and - * showip is false; else - * "name". - * - * NOTE 1: - * Watch out the allocation of "nbuf", if either sptr->name - * or sptr->sockhost gets changed into pointers instead of - * directly allocated within the structure... - * - * NOTE 2: - * Function return either a pointer to the structure (sptr) or - * to internal buffer (nbuf). *NEVER* use the returned pointer - * to modify what it points!!! +/** Return the name of the client for various tracking and admin + * purposes. The main purpose of this function is to return the + * "socket host" name of the client, if that differs from the + * advertised name (other than case). But, this can be used on any + * client structure. + * @param sptr Client to operate on. + * @param showip If non-zero, append [username\@text-ip] to name. + * @return Either cli_name(\a sptr) or a static buffer. */ const char* get_client_name(const struct Client* sptr, int showip) { static char nbuf[HOSTLEN * 2 + USERLEN + 5]; - if (MyConnect(sptr)) { - if (showip) - sprintf_irc(nbuf, "%s[%s@%s]", sptr->name, - (IsIdented(sptr)) ? sptr->username : "", sptr->sock_ip); - else { - if (0 != ircd_strcmp(sptr->name, sptr->sockhost)) - sprintf_irc(nbuf, "%s[%s]", sptr->name, sptr->sockhost); - else - return sptr->name; - } - return nbuf; - } - return sptr->name; -} - -const char *get_client_host(const struct Client *cptr) -{ - return get_client_name(cptr, HIDE_IP); + if (!MyConnect(sptr) || !showip) + return cli_name(sptr); + ircd_snprintf(0, nbuf, sizeof(nbuf), "%s[%s@%s]", cli_name(sptr), + IsIdented(sptr) ? cli_username(sptr) : "", + cli_sock_ip(sptr)); + return nbuf; } -/* - * Form sockhost such that if the host is of form user@host, only the host - * portion is copied. - */ -void get_sockhost(struct Client *cptr, char *host) -{ - char *s; - if ((s = strchr(host, '@'))) - s++; - else - s = host; - ircd_strncpy(cptr->sockhost, s, HOSTLEN); -} - -/* +/** * Exit one client, local or remote. Assuming for local client that - * all dependants already have been removed, and socket is closed. - * - * Rewritten by Run - 24 sept 94 - * - * bcptr : client being (s)quitted - * sptr : The source (prefix) of the QUIT or SQUIT - * - * --Run + * all dependents already have been removed, and socket is closed. + * @param bcptr Client being (s)quitted. + * @param comment The QUIT comment to send. */ +/* Rewritten by Run - 24 sept 94 */ static void exit_one_client(struct Client* bcptr, const char* comment) { struct SLink *lp; + struct Ban *bp; - if (bcptr->serv && bcptr->serv->client_list) /* Was SetServerYXX called ? */ + if (cli_serv(bcptr) && cli_serv(bcptr)->client_list) /* Was SetServerYXX called ? */ ClearServerYXX(bcptr); /* Removes server from server_list[] */ if (IsUser(bcptr)) { /* @@ -225,10 +195,9 @@ static void exit_one_client(struct Client* bcptr, const char* comment) /* * Stop a running /LIST clean */ - if (MyUser(bcptr) && bcptr->listing) { - bcptr->listing->chptr->mode.mode &= ~MODE_LISTED; - MyFree(bcptr->listing); - bcptr->listing = NULL; + if (MyUser(bcptr) && cli_listing(bcptr)) { + MyFree(cli_listing(bcptr)); + cli_listing(bcptr) = NULL; } /* * If a person is on a channel, send a QUIT notice @@ -236,22 +205,32 @@ static void exit_one_client(struct Client* bcptr, const char* comment) * that the client can show the "**signoff" message). * (Note: The notice is to the local clients *only*) */ - sendcmdto_common_channels(bcptr, CMD_QUIT, ":%s", comment); + sendcmdto_common_channels_butone(bcptr, CMD_QUIT, NULL, ":%s", comment); remove_user_from_all_channels(bcptr); /* Clean up invitefield */ - while ((lp = bcptr->user->invited)) + while ((lp = cli_user(bcptr)->invited)) del_invite(bcptr, lp->value.chptr); /* Clean up silencefield */ - while ((lp = bcptr->user->silence)) - del_silence(bcptr, lp->value.cp); + while ((bp = cli_user(bcptr)->silence)) { + cli_user(bcptr)->silence = bp->next; + free_ban(bp); + } + + /* Clean up snotice lists */ + if (MyUser(bcptr)) + set_snomask(bcptr, ~0, SNO_DEL); - if (IsInvisible(bcptr)) + if (IsInvisible(bcptr)) { + assert(UserStats.inv_clients > 0); --UserStats.inv_clients; - if (IsOper(bcptr)) + } + if (IsOper(bcptr)) { + assert(UserStats.opers > 0); --UserStats.opers; + } if (MyConnect(bcptr)) Count_clientdisconnects(bcptr, UserStats); else @@ -260,8 +239,8 @@ static void exit_one_client(struct Client* bcptr, const char* comment) else if (IsServer(bcptr)) { /* Remove downlink list node of uplink */ - remove_dlink(&bcptr->serv->up->serv->down, bcptr->serv->updown); - bcptr->serv->updown = 0; + remove_dlink(&(cli_serv(cli_serv(bcptr)->up))->down, cli_serv(bcptr)->updown); + cli_serv(bcptr)->updown = 0; if (MyConnect(bcptr)) Count_serverdisconnects(UserStats); @@ -287,33 +266,32 @@ static void exit_one_client(struct Client* bcptr, const char* comment) * Remove from serv->client_list * NOTE: user is *always* NULL if this is a server */ - if (bcptr->user) { + if (cli_user(bcptr)) { assert(!IsServer(bcptr)); /* bcptr->user->server->serv->client_list[IndexYXX(bcptr)] = NULL; */ - RemoveYXXClient(bcptr->user->server, bcptr->yxx); + RemoveYXXClient(cli_user(bcptr)->server, cli_yxx(bcptr)); } /* Remove bcptr from the client list */ #ifdef DEBUGMODE if (hRemClient(bcptr) != 0) Debug((DEBUG_ERROR, "%p !in tab %s[%s] %p %p %p %d %d %p", - bcptr, bcptr->name, bcptr->from ? bcptr->from->sockhost : "??host", - bcptr->from, bcptr->next, bcptr->prev, bcptr->fd, - bcptr->status, bcptr->user)); + bcptr, cli_name(bcptr), cli_from(bcptr) ? cli_sockhost(cli_from(bcptr)) : "??host", + cli_from(bcptr), cli_next(bcptr), cli_prev(bcptr), cli_fd(bcptr), + cli_status(bcptr), cli_user(bcptr))); #else hRemClient(bcptr); #endif remove_client_from_list(bcptr); } -/* - * exit_downlinks - added by Run 25-9-94 - * + +/* exit_downlinks - added by Run 25-9-94 */ +/** * Removes all clients and downlinks (+clients) of any server * QUITs are generated and sent to local users. - * - * cptr : server that must have all dependents removed - * sptr : source who thought that this was a good idea - * comment : comment sent as sign off message to local clients + * @param cptr server that must have all dependents removed + * @param sptr source who thought that this was a good idea + * @param comment comment sent as sign off message to local clients */ static void exit_downlinks(struct Client *cptr, struct Client *sptr, char *comment) { @@ -324,27 +302,26 @@ static void exit_downlinks(struct Client *cptr, struct Client *sptr, char *comme int i; /* Run over all its downlinks */ - for (lp = cptr->serv->down; lp; lp = next) + for (lp = cli_serv(cptr)->down; lp; lp = next) { next = lp->next; acptr = lp->value.cptr; /* Remove the downlinks and client of the downlink */ exit_downlinks(acptr, sptr, comment); /* Remove the downlink itself */ - exit_one_client(acptr, me.name); + exit_one_client(acptr, cli_name(&me)); } /* Remove all clients of this server */ - acptrp = cptr->serv->client_list; - for (i = 0; i <= cptr->serv->nn_mask; ++acptrp, ++i) { + acptrp = cli_serv(cptr)->client_list; + for (i = 0; i <= cli_serv(cptr)->nn_mask; ++acptrp, ++i) { if (*acptrp) exit_one_client(*acptrp, comment); } } -/* - * exit_client, rewritten 25-9-94 by Run - * - * This function exits a client of *any* type (user, server, etc) +/* exit_client, rewritten 25-9-94 by Run */ +/** + * Exits a client of *any* type (user, server, etc) * from this server. Also, this generates all necessary prototol * messages that this exit may cause. * @@ -352,13 +329,13 @@ static void exit_downlinks(struct Client *cptr, struct Client *sptr, char *comme * this connection. * * For convenience, this function returns a suitable value for - * m_funtion return value: + * m_function return value: * * CPTR_KILLED if (cptr == bcptr) * 0 if (cptr != bcptr) * * This function can be called in two ways: - * 1) From before or in parse(), exitting the 'cptr', in which case it was + * 1) From before or in parse(), exiting the 'cptr', in which case it was * invoked as exit_client(cptr, cptr, &me,...), causing it to always * return CPTR_KILLED. * 2) Via parse from a m_function call, in which case it was invoked as @@ -372,67 +349,67 @@ static void exit_downlinks(struct Client *cptr, struct Client *sptr, char *comme * sptr->from. And CPTR_KILLED should be returned if cptr got removed (too). * * --Run + * @param cptr Connection currently being handled by read_message. + * @param victim Client being killed. + * @param killer Client that made the decision to remove \a victim. + * @param comment Reason for the exit. + * @return CPTR_KILLED if cptr == bcptr, else 0. */ -int exit_client(struct Client *cptr, /* Connection being handled by - read_message right now */ - struct Client* victim, /* Client being killed */ - struct Client* killer, /* The client that made the decision - to remove this one, never NULL */ - const char* comment) /* Reason for the exit */ +int exit_client(struct Client *cptr, + struct Client* victim, + struct Client* killer, + const char* comment) { struct Client* acptr = 0; struct DLink *dlp; -#ifdef FNAME_USERLOG time_t on_for; -#endif + char comment1[HOSTLEN + HOSTLEN + 2]; + assert(killer); + if (MyConnect(victim)) + { + SetFlag(victim, FLAG_CLOSING); - if (MyConnect(victim)) { - victim->flags |= FLAGS_CLOSING; -#ifdef ALLOW_SNO_CONNEXIT -#ifdef SNO_CONNEXIT_IP - if (IsUser(victim)) { + if (feature_bool(FEAT_CONNEXIT_NOTICES) && IsUser(victim)) sendto_opmask_butone(0, SNO_CONNEXIT, - "Client exiting: %s (%s@%s) [%s] [%s]", - victim->name, victim->user->username, - victim->user->host, comment, - ircd_ntoa((const char *)&victim->ip)); - } -#else /* SNO_CONNEXIT_IP */ - if (IsUser(victim)) { - sendto_opmask_butone(0, SNO_CONNEXIT, "Client exiting: %s (%s@%s) [%s]", - victim->name, victim->user->username, - victim->user->host, comment); - } -#endif /* SNO_CONNEXIT_IP */ -#endif /* ALLOW_SNO_CONNEXIT */ + "Client exiting: %s (%s@%s) [%s] [%s] <%s%s>", + cli_name(victim), cli_user(victim)->username, + cli_user(victim)->host, comment, + ircd_ntoa(&cli_ip(victim)), + NumNick(victim) /* two %s's */); update_load(); -#ifdef FNAME_USERLOG - on_for = CurrentTime - victim->firsttime; -#if defined(USE_SYSLOG) && defined(SYSLOG_USERS) - if (IsUser(victim)) - ircd_log(L_TRACE, "%s (%3d:%02d:%02d): %s@%s (%s)\n", - myctime(victim->firsttime), on_for / 3600, (on_for % 3600) / 60, - on_for % 60, victim->user->username, victim->sockhost, victim->name); -#else + + on_for = CurrentTime - cli_firsttime(victim); + + if (IsUser(victim) || IsUserPort(victim)) + auth_send_exit(victim); + if (IsUser(victim)) - write_log(FNAME_USERLOG, - "%s (%3d:%02d:%02d): %s@%s [%s]\n", - myctime(victim->firsttime), - on_for / 3600, (on_for % 3600) / 60, - on_for % 60, - victim->user->username, victim->user->host, victim->username); -#endif -#endif - if (victim != killer->from /* The source knows already */ + log_write(LS_USER, L_TRACE, 0, "%Tu %i %s@%s %s %s %s%s %s :%s", + cli_firsttime(victim), on_for, + cli_user(victim)->username, cli_sockhost(victim), + ircd_ntoa(&cli_ip(victim)), + cli_account(victim), + NumNick(victim), /* two %s's */ + cli_name(victim), cli_info(victim)); + + if (victim != cli_from(killer) /* The source knows already */ && IsClient(victim)) /* Not a Ping struct or Log file */ { if (IsServer(victim) || IsHandshake(victim)) - sendcmdto_one(killer, CMD_SQUIT, victim, "%s 0 :%s", me.name, comment); + sendcmdto_one(killer, CMD_SQUIT, victim, "%s 0 :%s", cli_name(&me), comment); else if (!IsConnecting(victim)) { - if (!IsDead(victim)) - sendrawto_one(victim, MSG_ERROR " :Closing Link: %s by %s (%s)", - victim->name, killer->name, comment); + if (!IsDead(victim)) { + if (IsServer(victim)) + sendcmdto_one(killer, CMD_ERROR, victim, + ":Closing Link: %s by %s (%s)", cli_name(victim), + cli_name(killer), comment); + else + sendrawto_one(victim, MSG_ERROR " :Closing Link: %s by %s (%s)", + cli_name(victim), + cli_name(IsServer(killer) ? &his : killer), + comment); + } } if ((IsServer(victim) || IsHandshake(victim) || IsConnecting(victim)) && (killer == &me || (IsServer(killer) && @@ -443,24 +420,24 @@ int exit_client(struct Client *cptr, /* Connection being handled by * Note: check user == user needed to make sure we have the same * client */ - if (victim->serv->user && *victim->serv->by && - (acptr = findNUser(victim->serv->by))) { - if (acptr->user == victim->serv->user) { + if (cli_serv(victim)->user && *(cli_serv(victim))->by && + (acptr = findNUser(cli_serv(victim)->by))) { + if (cli_user(acptr) == cli_serv(victim)->user) { sendcmdto_one(&me, CMD_NOTICE, acptr, - "%C :Link with %s cancelled: %s", acptr, - victim->name, comment); + "%C :Link with %s canceled: %s", acptr, + cli_name(victim), comment); } else { /* * not right client, set by to empty string */ acptr = 0; - *victim->serv->by = '\0'; + *(cli_serv(victim))->by = '\0'; } } if (killer == &me) - sendto_opmask_butone(acptr, SNO_OLDSNO, "Link with %s cancelled: %s", - victim->name, comment); + sendto_opmask_butone(acptr, SNO_OLDSNO, "Link with %s canceled: %s", + cli_name(victim), comment); } } /* @@ -471,34 +448,41 @@ int exit_client(struct Client *cptr, /* Connection being handled by if (IsServer(victim)) { - strcpy(comment1, victim->serv->up->name); - strcat(comment1, " "); - strcat(comment1, victim->name); + if (feature_bool(FEAT_HIS_NETSPLIT)) + strcpy(comment1, "*.net *.split"); + else + { + strcpy(comment1, cli_name(cli_serv(victim)->up)); + strcat(comment1, " "); + strcat(comment1, cli_name(victim)); + } + if (IsUser(killer)) sendto_opmask_butone(killer, SNO_OLDSNO, "%s SQUIT by %s [%s]:", - (killer->user->server == victim || - killer->user->server == victim->serv->up) ? + (cli_user(killer)->server == victim || + cli_user(killer)->server == cli_serv(victim)->up) ? "Local" : "Remote", get_client_name(killer, HIDE_IP), - killer->user->server->name); - else if (killer != &me && victim->serv->up != killer) + cli_name(cli_user(killer)->server)); + else if (killer != &me && cli_serv(victim)->up != killer) sendto_opmask_butone(0, SNO_OLDSNO, "Received SQUIT %s from %s :", - victim->name, IsServer(killer) ? killer->name : + cli_name(victim), IsServer(killer) ? cli_name(killer) : get_client_name(killer, HIDE_IP)); - sendto_opmask_butone(0, SNO_NETWORK, "Net break: %s (%s)", comment1, - comment); + sendto_opmask_butone(0, SNO_NETWORK, "Net break: %C %C (%s)", + cli_serv(victim)->up, victim, comment); } /* * First generate the needed protocol for the other server links * except the source: */ - for (dlp = me.serv->down; dlp; dlp = dlp->next) { - if (dlp->value.cptr != killer->from && dlp->value.cptr != victim) { + for (dlp = cli_serv(&me)->down; dlp; dlp = dlp->next) { + if (dlp->value.cptr != cli_from(killer) && dlp->value.cptr != victim) + { if (IsServer(victim)) sendcmdto_one(killer, CMD_SQUIT, dlp->value.cptr, "%s %Tu :%s", - victim->name, victim->serv->timestamp, comment); - else if (IsUser(victim) && 0 == (victim->flags & FLAGS_KILLED)) + cli_name(victim), cli_serv(victim)->timestamp, comment); + else if (IsUser(victim) && !HasFlag(victim, FLAG_KILLED)) sendcmdto_one(victim, CMD_QUIT, dlp->value.cptr, ":%s", comment); } } @@ -509,22 +493,39 @@ int exit_client(struct Client *cptr, /* Connection being handled by /* * cptr can only have been killed if it was cptr itself that got killed here, - * because cptr can never have been a dependant of victim --Run + * because cptr can never have been a dependent of victim --Run */ return (cptr == victim) ? CPTR_KILLED : 0; } -/* - * Exit client with formatted message, added 25-9-94 by Run +/** + * Exit client with formatted va_list message. + * Thin wrapper around exit_client(). + * @param cptr Connection being processed. + * @param bcptr Connection being closed. + * @param sptr Connection who asked to close the victim. + * @param pattern Format string for message. + * @param vl Stdargs argument list. + * @return Has a tail call to exit_client(). */ +/* added 25-9-94 by Run */ int vexit_client_msg(struct Client *cptr, struct Client *bcptr, struct Client *sptr, const char *pattern, va_list vl) { char msgbuf[1024]; - vsprintf_irc(msgbuf, pattern, vl); + ircd_vsnprintf(0, msgbuf, sizeof(msgbuf), pattern, vl); return exit_client(cptr, bcptr, sptr, msgbuf); } +/** + * Exit client with formatted message using a variable-length argument list. + * Thin wrapper around exit_client(). + * @param cptr Connection being processed. + * @param bcptr Connection being closed. + * @param sptr Connection who asked to close the victim. + * @param pattern Format string for message. + * @return Has a tail call to exit_client(). + */ int exit_client_msg(struct Client *cptr, struct Client *bcptr, struct Client *sptr, const char *pattern, ...) { @@ -532,18 +533,25 @@ int exit_client_msg(struct Client *cptr, struct Client *bcptr, char msgbuf[1024]; va_start(vl, pattern); - vsprintf_irc(msgbuf, pattern, vl); + ircd_vsnprintf(0, msgbuf, sizeof(msgbuf), pattern, vl); va_end(vl); return exit_client(cptr, bcptr, sptr, msgbuf); } +/** Initialize global server statistics. */ +/* (Kind of pointless since C guarantees it's already zero'ed, but... */ void initstats(void) { memset(&ircst, 0, sizeof(ircst)); } -void tstats(struct Client *cptr, char *name) +/** Report server statistics to a client. + * @param cptr Client who wants statistics. + * @param sd StatDesc structure being looked up (unused). + * @param param Extra parameter passed by user (unused). + */ +void tstats(struct Client *cptr, const struct StatDesc *sd, char *param) { struct Client *acptr; int i; @@ -558,41 +566,17 @@ void tstats(struct Client *cptr, char *name) continue; if (IsServer(acptr)) { - sp->is_sbs += acptr->sendB; - sp->is_sbr += acptr->receiveB; - sp->is_sks += acptr->sendK; - sp->is_skr += acptr->receiveK; - sp->is_sti += CurrentTime - acptr->firsttime; + sp->is_sbs += cli_sendB(acptr); + sp->is_sbr += cli_receiveB(acptr); + sp->is_sti += CurrentTime - cli_firsttime(acptr); sp->is_sv++; - if (sp->is_sbs > 1023) - { - sp->is_sks += (sp->is_sbs >> 10); - sp->is_sbs &= 0x3ff; - } - if (sp->is_sbr > 1023) - { - sp->is_skr += (sp->is_sbr >> 10); - sp->is_sbr &= 0x3ff; - } } else if (IsUser(acptr)) { - sp->is_cbs += acptr->sendB; - sp->is_cbr += acptr->receiveB; - sp->is_cks += acptr->sendK; - sp->is_ckr += acptr->receiveK; - sp->is_cti += CurrentTime - acptr->firsttime; + sp->is_cbs += cli_sendB(acptr); + sp->is_cbr += cli_receiveB(acptr); + sp->is_cti += CurrentTime - cli_firsttime(acptr); sp->is_cl++; - if (sp->is_cbs > 1023) - { - sp->is_cks += (sp->is_cbs >> 10); - sp->is_cbs &= 0x3ff; - } - if (sp->is_cbr > 1023) - { - sp->is_ckr += (sp->is_cbr >> 10); - sp->is_cbr &= 0x3ff; - } } else if (IsUnknown(acptr)) sp->is_ni++; @@ -615,10 +599,10 @@ void tstats(struct Client *cptr, char *name) send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":Client server"); send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":connected %u %u", sp->is_cl, sp->is_sv); - send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":bytes sent %u.%uK %u.%uK", - sp->is_cks, sp->is_cbs, sp->is_sks, sp->is_sbs); - send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":bytes recv %u.%uK %u.%uK", - sp->is_ckr, sp->is_cbr, sp->is_skr, sp->is_sbr); - send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":time connected %Tu %Tu", + send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":bytes sent %Lu %Lu", + sp->is_cbs, sp->is_sbs); + send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":bytes recv %Lu %Lu", + sp->is_cbr, sp->is_sbr); + send_reply(cptr, SND_EXPLICIT | RPL_STATSDEBUG, ":time connected %Lu %Lu", sp->is_cti, sp->is_sti); }