continue;
}
- max_ping = IsRegistered(cptr) ? client_get_ping(cptr) :
- feature_int(FEAT_CONNECTTIMEOUT);
-
- Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s limit: %d current: %d",
+ Debug((DEBUG_DEBUG, "check_pings(%s)=status:%s current: %d",
cli_name(cptr),
IsPingSent(cptr) ? "[Ping Sent]" : "[]",
- max_ping, (int)(CurrentTime - cli_lasttime(cptr))));
-
- /* Ok, the thing that will happen most frequently, is that someone will
- * have sent something recently. Cover this first for speed.
- * --
- * If it's an unregistered client and hasn't managed to register within
- * max_ping then it's obviously having problems (broken client) or it's
- * just up to no good, so we won't skip it, even if its been sending
- * data to us.
- * -- hikari
- */
- if ((CurrentTime-cli_lasttime(cptr) < max_ping) && IsRegistered(cptr)) {
- expire = cli_lasttime(cptr) + max_ping;
- if (expire < next_check)
- next_check = expire;
- continue;
- }
+ (int)(CurrentTime - cli_lasttime(cptr))));
/* Unregistered clients pingout after max_ping seconds, they don't
* get given a second chance - if they were then people could not quite
*/
if (!IsRegistered(cptr)) {
assert(!IsServer(cptr));
+ max_ping = feature_int(FEAT_CONNECTTIMEOUT);
/* If client authorization time has expired, ask auth whether they
* should be checked again later. */
if ((CurrentTime-cli_firsttime(cptr) >= max_ping)
&& auth_ping_timeout(cptr))
continue;
- /* OK, they still have enough time left, so we'll just skip to the
- * next client. Set the next check to be when their time is up, if
- * that's before the currently scheduled next check -- hikari */
- expire = cli_firsttime(cptr) + max_ping;
+ if (!IsRegistered(cptr)) {
+ /* OK, they still have enough time left, so we'll just skip to the
+ * next client. Set the next check to be when their time is up, if
+ * that's before the currently scheduled next check -- hikari */
+ expire = cli_firsttime(cptr) + max_ping;
+ if (expire < next_check)
+ next_check = expire;
+ continue;
+ }
+ }
+
+ max_ping = client_get_ping(cptr);
+
+ /* If it's a server and we have not sent an AsLL lately, do so. */
+ if (IsServer(cptr)) {
+ if (CurrentTime - cli_serv(cptr)->asll_last >= max_ping) {
+ char *asll_ts;
+
+ SetPingSent(cptr);
+ cli_serv(cptr)->asll_last = CurrentTime;
+ expire = cli_serv(cptr)->asll_last + max_ping;
+ asll_ts = militime_float(NULL);
+ sendcmdto_prio_one(&me, CMD_PING, cptr, "!%s %s %s", asll_ts,
+ cli_name(cptr), asll_ts);
+ }
+
+ expire = cli_serv(cptr)->asll_last + max_ping;
if (expire < next_check)
next_check = expire;
+ }
+
+ /* Ok, the thing that will happen most frequently, is that someone will
+ * have sent something recently. Cover this first for speed.
+ * --
+ * If it's an unregistered client and hasn't managed to register within
+ * max_ping then it's obviously having problems (broken client) or it's
+ * just up to no good, so we won't skip it, even if its been sending
+ * data to us.
+ * -- hikari
+ */
+ if ((CurrentTime-cli_lasttime(cptr) < max_ping) && IsRegistered(cptr)) {
+ expire = cli_lasttime(cptr) + max_ping;
+ if (expire < next_check)
+ next_check = expire;
continue;
}
if (IsUser(cptr))
sendrawto_one(cptr, MSG_PING " :%s", cli_name(&me));
else
- {
- char *asll_ts = militime_float(NULL);
- sendcmdto_one(&me, CMD_PING, cptr, "!%s %s %s", asll_ts,
- cli_name(cptr), asll_ts);
- }
+ sendcmdto_prio_one(&me, CMD_PING, cptr, ":%s", cli_name(&me));
}
expire = cli_lasttime(cptr) + max_ping * 2;
debuglevel = 0;
debugmode = optarg;
thisServer.bootopt |= BOOT_DEBUG;
+#ifndef DEBUGMODE
+ printf("WARNING: DEBUGMODE disabled; -x has no effect.\n");
+#endif
break;
default:
cli_lasttime(&me) = cli_since(&me) = cli_firsttime(&me) = CurrentTime;
hAddClient(&me);
+ SetIPv6(&me);
write_pidfile();
init_counters();