X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_settime.c;h=39ec6aa39a708c926bba9ce48e14d542515dc925;hb=refs%2Fheads%2Fupstream;hp=6240b52c1f8c151cbe4672cd70fa99245be78602;hpb=5ba09703da9f8f21f3278dc0222cd6fe077cfe31;p=ircu2.10.12-pk.git

diff --git a/ircd/m_settime.c b/ircd/m_settime.c
index 6240b52..39ec6aa 100644
--- a/ircd/m_settime.c
+++ b/ircd/m_settime.c
@@ -85,6 +85,7 @@
 #include "hash.h"
 #include "ircd.h"
 #include "ircd_features.h"
+#include "ircd_log.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -96,7 +97,7 @@
 #include "send.h"
 #include "struct.h"
 
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
 #include <stdlib.h>
 
 /*
@@ -113,19 +114,20 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   static char tbuf[11];
   struct DLink *lp;
 
-  if (parc < 2)
+  if (parc < 2) /* verify argument count */
     return need_more_params(sptr, "SETTIME");
 
-  t = atoi(parv[1]);
+  t = atoi(parv[1]); /* convert time and compute delta */
   dt = TStime() - t;
 
+  /* verify value */
   if (t < OLDEST_TS || dt < -9000000)
   {
-    if (IsServer(sptr))
-      protocol_violation(sptr, "SETTIME: Bad value (%Tu, delta %l)", t, dt);
+    if (IsServer(sptr)) /* protocol violation if it's from a server */
+      protocol_violation(sptr, "SETTIME: Bad value (%Tu, delta %ld)", t, dt);
     else
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :SETTIME: Bad value (%Tu, "
-                    "delta %l)", sptr, t, dt);
+                    "delta %ld)", sptr, t, dt);
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :SETTIME: Bad value", sptr);
     return 0;
   }
@@ -137,7 +139,7 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     parv[1] = tbuf;
   }
 
-  if (BadPtr(parv[2]))
+  if (BadPtr(parv[2])) /* spam the network */
   {
     for (lp = cli_serv(&me)->down; lp; lp = lp->next)
       if (cptr != lp->value.cptr)
@@ -163,7 +165,7 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     /* don't apply settime--reliable */
     if ((dt > 600) || (dt < -600))
       sendcmdto_serv_butone(&me, CMD_DESYNCH, 0, ":Bad SETTIME from %s: %Tu "
-                            "(delta %l)", cli_name(sptr), t, dt);
+                            "(delta %ld)", cli_name(sptr), t, dt);
     /* Let user know we're ignoring him */
     if (IsUser(sptr))
     {
@@ -172,7 +174,7 @@ int ms_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
 		    (dt < 0) ? -dt : dt, (dt < 0) ? "forwards" : "backwards");
     }
   }
-  else
+  else /* tell opers about time change */
   {
     sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
 			 "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
@@ -208,13 +210,14 @@ int mo_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
   if (!IsOper(sptr))
     return send_reply(sptr, ERR_NOPRIVILEGES);
 
-  if (parc < 2)
+  if (parc < 2) /* verify argument count */
     return need_more_params(sptr, "SETTIME");
 
-  if (parc == 2 && MyUser(sptr))
+  if (parc == 2 && MyUser(sptr)) /* default to me */
     parv[parc++] = cli_name(&me);
 
-  t = atoi(parv[1]);
+  t = atoi(parv[1]); /* convert the time */
+
   /* If we're reliable_clock or if the oper specified a 0 time, use current */
   if (!t || feature_bool(FEAT_RELIABLE_CLOCK))
   {
@@ -223,35 +226,36 @@ int mo_settime(struct Client* cptr, struct Client* sptr, int parc, char* parv[])
     parv[1] = tbuf;
   }
 
-  dt = TStime() - t;
+  dt = TStime() - t; /* calculate the delta */
 
-  if (t < OLDEST_TS || dt < -9000000)
+  if (t < OLDEST_TS || dt < -9000000) /* verify value */
   {
     sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :SETTIME: Bad value", sptr);
     return 0;
   }
 
+  /* OK, send the message off to its destination */
   if (hunt_server_prio_cmd(sptr, CMD_SETTIME, cptr, 1, "%s %C", 2, parc,
                            parv) != HUNTED_ISME)
     return 0;
 
-  if (feature_bool(FEAT_RELIABLE_CLOCK))
+  if (feature_bool(FEAT_RELIABLE_CLOCK)) /* don't apply settime--reliable */
   {
     if ((dt > 600) || (dt < -600))
       sendcmdto_serv_butone(&me, CMD_DESYNCH, 0, ":Bad SETTIME from %s: %Tu "
-                            "(delta %l)", cli_name(sptr), t, dt);
-    if (IsUser(sptr))
+                            "(delta %ld)", cli_name(sptr), t, dt);
+    if (IsUser(sptr)) /* Let user know we're ignoring him */
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :clock is not set %ld seconds "
                     "%s: RELIABLE_CLOCK is defined", sptr, (dt < 0) ? -dt : dt,
-                    (dt < 0) ? "forward" : "backward");
+                    (dt < 0) ? "forwards" : "backwards");
   }
-  else
+  else /* tell opers about time change */
   {
     sendto_opmask_butone(0, SNO_OLDSNO, "SETTIME from %s, clock is set %ld "
 			 "seconds %s", cli_name(sptr), (dt < 0) ? -dt : dt,
 			 (dt < 0) ? "forwards" : "backwards");
-    TSoffset -= dt;
-    if (IsUser(sptr))
+    TSoffset -= dt; /* apply time change */
+    if (IsUser(sptr)) /* let user know what we did */
       sendcmdto_one(&me, CMD_NOTICE, sptr, "%C :clock is set %ld seconds %s",
 		    sptr, (dt < 0) ? -dt : dt,
 		    (dt < 0) ? "forwards" : "backwards");