X-Git-Url: https://jfr.im/git/irc/quakenet/newserv.git/blobdiff_plain/ae79842dd6d3f3ef6570cfacf2a047d77df2682f..8c684fca9c7dbb4a2601628c744be9236ee68641:/serverlist/serverlist.c diff --git a/serverlist/serverlist.c b/serverlist/serverlist.c index 75db9146..47e9ba7c 100644 --- a/serverlist/serverlist.c +++ b/serverlist/serverlist.c @@ -5,6 +5,9 @@ #include "../localuser/localuserchannel.h" #include "../control/control.h" #include "../usercount/usercount.h" +#include "../lib/version.h" + +MODULE_VERSION("") #include #include @@ -66,7 +69,7 @@ int cmd_serverlist(void *sender, int cargc, char **cargv) { nick *np = (nick*)sender; int a, i, ucount, acount, scount; - controlreply(np, "%-7s %-30s %5s/%5s/%-5s %-15s %-20s", "Numeric", "Hostname", "EClients", "Clients", "MaxCl", "Connected for", "Version"); + controlreply(np, "%-7s %-30s %5s/%5s/%-5s %-7s %-15s %-20s", "Numeric", "Hostname", "ECl", "Cl", "MaxCl", "Flags", "Connected for", "Version"); scount = acount = 0; @@ -74,15 +77,17 @@ int cmd_serverlist(void *sender, int cargc, char **cargv) { if (serverlist[i].linkstate == LS_LINKED && (cargc < 1 || match2strings(cargv[0], serverlist[i].name->content))) { ucount = 0; - for (a = 0; a < serverlist[i].maxusernum; a++) + for (a = 0; a <= serverlist[i].maxusernum; a++) if (servernicks[i][a] != NULL) ucount++; acount += ucount; scount++; - controlreply(np, "%-7d %-30s %5d/%5d/%-5d %-15s %-20s - %s", i, serverlist[i].name->content, - servercount[i], ucount, serverlist[i].maxusernum, longtoduration(getnettime() - serverinfo[i].ts, 0), + controlreply(np, "%-7d %-30s %5d/%5d/%-5d %-7s %-15s %-20s - %s", i, serverlist[i].name->content, + servercount[i], ucount, serverlist[i].maxusernum, + printflags(serverlist[i].flags, smodeflags), + longtoduration(getnettime() - serverinfo[i].ts, 0), serverinfo[i].version1 ? serverinfo[i].version1->content : "Unknown", serverinfo[i].version2 ? serverinfo[i].version2->content : "Unknown"); }