/* Some utterly useless dog */
#include "../core/schedule.h"
+#include "../irc/irc.h"
#include "../lib/irc_string.h"
#include "../localuser/localuserchannel.h"
#include "../control/control.h"
#include <stdlib.h>
#include <string.h>
#include <stdarg.h>
+#include <stdio.h>
+#include <sys/time.h>
#include <pcre.h>
int cmd_serverlist(void *sender, int cargc, char **cargv);
void serverlist_hook_newserver(int hook, void *arg);
void serverlist_hook_lostserver(int hook, void *arg);
int serverlist_versionreply(void *source, int cargc, char **cargv);
+void serverlist_pingservers(void *arg);
+int serverlist_rpong(void *source, int cargc, char **cargv);
const flag servertypeflags[] = {
{ 'c', SERVERTYPEFLAG_CLIENT_SERVER },
struct {
int used;
- time_t ts;
+ int lag;
sstring *version1;
sstring *version2;
flag_t type;
service_re = compilefree(getcopyconfigitem("serverlist", "service_re", "^services\\d*\\..*$", 256));
hub_re = compilefree(getcopyconfigitem("serverlist", "hub_re", "^hub\\d*\\..*$", 256));
- not_client_re = compilefree(getcopyconfigitem("serverlist", "not_client_re", "^(testserv\\d*\\.|irc\\.ipv6\\.).*$", 256));
+ not_client_re = compilefree(getcopyconfigitem("serverlist", "not_client_re", "^(testserv\\d*\\.).*$", 256));
for (i = 0; i < MAXSERVERS; i++) {
if (serverlist[i].linkstate == LS_LINKED)
else
serverinfo[i].used = 0;
- serverinfo[i].ts = getnettime();
+ serverinfo[i].lag = -1;
serverinfo[i].version1 = NULL;
serverinfo[i].version2 = NULL;
serverinfo[i].type = getservertype(&serverlist[i]);
}
registernumerichandler(351, &serverlist_versionreply, 2);
+ registerserverhandler("RO", &serverlist_rpong, 4);
+
+ schedulerecurring(time(NULL)+1, 0, 60, &serverlist_pingservers, NULL);
}
void _fini(void) {
}
}
deregisternumerichandler(351, &serverlist_versionreply);
+ deregisterserverhandler("RO", &serverlist_rpong);
deregisterhook(HOOK_SERVER_NEWSERVER, &serverlist_hook_newserver);
deregisterhook(HOOK_SERVER_LOSTSERVER, &serverlist_hook_lostserver);
deregistercontrolcmd("serverlist",cmd_serverlist);
+ deleteschedule(NULL, &serverlist_pingservers, NULL);
+
freesstring(q_server);
freesstring(s_server);
pcre_free(service_re);
int cmd_serverlist(void *sender, int cargc, char **cargv) {
nick *np = (nick*)sender;
int a, i, ucount, acount, scount;
+ char lagstr[20];
char buf[512];
- controlreply(np, "%-7s %-30s %5s/%5s/%-5s %-7s %-7s %-15s %-20s", "Numeric", "Hostname", "ECl", "Cl", "MaxCl", "Flags", "Type", "Connected for", "Version");
+ controlreply(np, "%-7s %-35s %5s/%5s/%-7s %-7s %-7s %-20s %-8s %-20s", "Numeric", "Hostname", "ECl", "Cl", "MaxCl", "Flags", "Type", "Connected for", "Lag", "Version");
scount = acount = 0;
acount += ucount;
scount++;
+ if (serverinfo[i].lag == -1)
+ strcpy(lagstr, "-");
+ else
+ snprintf(lagstr, sizeof(lagstr), "%d", serverinfo[i].lag);
+
strlcpy(buf, printflags(serverinfo[i].type, servertypeflags), sizeof(buf));
- controlreply(np, "%-7d %-30s %5d/%5d/%-5d %-7s %-7s %-15s %-20s - %s", i, serverlist[i].name->content,
+ controlreply(np, "%-7d %-35s %5d/%5d/%-7d %-7s %-7s %-20s %-8s %-20s - %s", i, serverlist[i].name->content,
servercount[i], ucount, serverlist[i].maxusernum,
printflags(serverlist[i].flags, smodeflags), buf,
- longtoduration(getnettime() - serverinfo[i].ts, 0),
+ longtoduration(getnettime() - serverlist[i].ts, 0),
+ lagstr,
serverinfo[i].version1 ? serverinfo[i].version1->content : "Unknown",
serverinfo[i].version2 ? serverinfo[i].version2->content : "Unknown");
}
long num = (long)arg;
serverinfo[num].used = 1;
- serverinfo[num].ts = getnettime();
serverinfo[num].version1 = NULL;
serverinfo[num].version2 = NULL;
serverinfo[num].type = getservertype(&serverlist[num]);
}
}
-
if(not_client_re && (pcre_exec(not_client_re, NULL, server_name, server_len, 0, 0, NULL, 0) >= 0)) {
/* noop */
} else if(result == 0) {
return result;
}
+void serverlist_pingservers(void *arg) {
+ int i;
+ server *from, *to;
+ char fnum[10], tnum[10];
+ struct timeval tv;
+
+ if (!mynick)
+ return;
+
+ for(i=0;i<MAXSERVERS;i++) {
+ to = &serverlist[i];
+
+ if (to->parent == -1)
+ continue;
+
+ from = &serverlist[to->parent];
+
+ if (to->linkstate != LS_LINKED || from->linkstate != LS_LINKED)
+ continue;
+
+ strcpy(fnum, longtonumeric(to->parent,2));
+ strcpy(tnum, longtonumeric(i, 2));
+
+ if (from->parent == -1) { /* Are we the source? */
+ (void) gettimeofday(&tv, NULL);
+ irc_send("%s RI %s %s %jd %jd :RP", mynumeric->content, tnum, longtonumeric(mynick->numeric,5), (intmax_t)tv.tv_sec, (intmax_t)tv.tv_usec);
+ } else {
+ strcpy(fnum, longtonumeric(to->parent,2));
+ strcpy(tnum, longtonumeric(i, 2));
+ irc_send("%s RI %s %s :RP", longtonumeric(mynick->numeric,5), to->name->content, fnum);
+ }
+ }
+}
+
+int serverlist_rpong(void *source, int cargc, char **cargv) {
+ int to, lag;
+ struct timeval tv;
+
+ if (cargc < 4)
+ return CMD_ERROR;
+
+ if (cargc == 5) { /* From target to source server */
+ if (strcmp(cargv[4], "RP") != 0)
+ return CMD_OK;
+
+ to = numerictolong(source, 2);
+
+ (void) gettimeofday(&tv, NULL);
+ lag = (tv.tv_sec - strtoull(cargv[2], NULL, 10)) * 1000 + (tv.tv_usec - strtoull(cargv[3], NULL, 10)) / 1000;
+ } else { /* From source server to client */
+ if (strcmp(cargv[3], "RP") != 0)
+ return CMD_OK;
+
+ to = findserver(cargv[1]);
+
+ if (to == -1)
+ return CMD_ERROR;
+
+ lag = atoi(cargv[2]);
+ }
+
+ serverinfo[to].lag = lag;
+
+ return CMD_OK;
+}