Treat G-line-related times as network times, rather than local times.

[ircu2.10.12-pk.git] / ircd / gline.c

diff --git a/ircd/gline.c b/ircd/gline.c
index dfbf77d2394fdc38e946d9423fa68ba267edb20e..d2b2b9b7b68190a70f876aa31cf68137e8e4b3c5 100644 (file)
--- a/ircd/gline.c
+++ b/ircd/gline.c
@@ -86,11 +86,11 @@ struct Gline* BadChanGlineList = 0;
     /* Figure out the next pointer in list... */       \
     if ((((next) = (gl)->gl_next) || 1) &&             \
        /* Then see if it's expired */                  \
-       (gl)->gl_lifetime <= CurrentTime)               \
+       (gl)->gl_lifetime <= TStime())                  \
       /* Record has expired, so free the G-line */     \
       gline_free((gl));                                        \
     /* See if we need to expire the G-line */          \
-    else if ((((gl)->gl_expire > CurrentTime) ||        \
+    else if ((((gl)->gl_expire > TStime()) ||          \
              (((gl)->gl_flags &= ~GLINE_ACTIVE) && 0) ||       \
              ((gl)->gl_state = GLOCAL_GLOBAL)) && 0)   \
       ; /* empty statement */                          \
@@ -341,7 +341,7 @@ gline_propagate(struct Client *cptr, struct Client *sptr, struct Gline *gline)
                        GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
                        gline->gl_host ? "@" : "",
                        gline->gl_host ? gline->gl_host : "",
-                       gline->gl_expire - CurrentTime, gline->gl_lastmod,
+                       gline->gl_expire - TStime(), gline->gl_lastmod,
                        gline->gl_lifetime, gline->gl_reason);
 
   return 0;
@@ -499,11 +499,11 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
    * expiration time for greater than GLINE_MAX_EXPIRE.
    */
   if (!(flags & GLINE_FORCE) &&
-      (expire <= CurrentTime || expire > CurrentTime + GLINE_MAX_EXPIRE)) {
+      (expire <= TStime() || expire > TStime() + GLINE_MAX_EXPIRE)) {
     if (!IsServer(sptr) && MyConnect(sptr))
       send_reply(sptr, ERR_BADEXPIRE, expire);
     return 0;
-  } else if (expire <= CurrentTime) {
+  } else if (expire <= TStime()) {
     /* This expired G-line was forced to be added, so mark it inactive. */
     flags &= ~GLINE_ACTIVE;
   }
@@ -525,7 +525,7 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
                       (flags & GLINE_BADCHAN) ? "BADCHAN" : "GLINE", user,
                       (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : "@",
                       (flags & (GLINE_BADCHAN|GLINE_REALNAME)) ? "" : host,
-                      expire + TSoffset, reason);
+                      expire, reason);
 
   /* and log it */
   log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
@@ -534,7 +534,7 @@ gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
            flags & GLINE_BADCHAN ? "BADCHAN" : "GLINE", user,
            flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : "@",
            flags & (GLINE_BADCHAN|GLINE_REALNAME) ? "" : host,
-           expire + TSoffset, reason);
+           expire, reason);
 
   /* make the gline */
   agline = make_gline(user, host, reason, expire, lastmod, lifetime, flags);
@@ -592,14 +592,14 @@ gline_activate(struct Client *cptr, struct Client *sptr, struct Gline *gline,
                        GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                        gline->gl_user, gline->gl_host ? "@" : "",
                        gline->gl_host ? gline->gl_host : "",
-                       gline->gl_expire + TSoffset, gline->gl_reason);
-  
+                       gline->gl_expire, gline->gl_reason);
+
   log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
            "%#C activating global %s for %s%s%s, expiring at %Tu: %s", sptr,
            GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
            gline->gl_host ? "@" : "",
            gline->gl_host ? gline->gl_host : "",
-           gline->gl_expire + TSoffset, gline->gl_reason);
+           gline->gl_expire, gline->gl_reason);
 
   if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
     gline_propagate(cptr, sptr, gline);
@@ -660,14 +660,14 @@ gline_deactivate(struct Client *cptr, struct Client *sptr, struct Gline *gline,
                       msg, GlineIsBadChan(gline) ? "BADCHAN" : "GLINE",
                       gline->gl_user, gline->gl_host ? "@" : "",
                        gline->gl_host ? gline->gl_host : "",
-                      gline->gl_expire + TSoffset, gline->gl_reason);
+                      gline->gl_expire, gline->gl_reason);
 
   log_write(LS_GLINE, L_INFO, LOG_NOSNOTICE,
            "%#C %s %s for %s%s%s, expiring at %Tu: %s", sptr, msg,
            GlineIsBadChan(gline) ? "BADCHAN" : "GLINE", gline->gl_user,
            gline->gl_host ? "@" : "",
            gline->gl_host ? gline->gl_host : "",
-           gline->gl_expire + TSoffset, gline->gl_reason);
+           gline->gl_expire, gline->gl_reason);
 
   if (!(flags & GLINE_LOCAL)) /* don't propagate local changes */
     gline_propagate(cptr, sptr, gline);
@@ -727,7 +727,7 @@ gline_modify(struct Client *cptr, struct Client *sptr, struct Gline *gline,
   /* first, check out the expiration time... */
   if ((flags & GLINE_EXPIRE) && expire) {
     if (!(flags & GLINE_FORCE) &&
-       (expire <= CurrentTime || expire > CurrentTime + GLINE_MAX_EXPIRE)) {
+       (expire <= TStime() || expire > TStime() + GLINE_MAX_EXPIRE)) {
       if (!IsServer(sptr) && MyConnect(sptr)) /* bad expiration time */
        send_reply(sptr, ERR_BADEXPIRE, expire);
       return 0;
@@ -768,7 +768,7 @@ gline_modify(struct Client *cptr, struct Client *sptr, struct Gline *gline,
       (action == GLINE_LOCAL_DEACTIVATE &&
        (gline->gl_state == GLOCAL_DEACTIVATED)) ||
       /* can't activate an expired G-line */
-      IRCD_MAX(gline->gl_expire, expire) <= CurrentTime)
+      IRCD_MAX(gline->gl_expire, expire) <= TStime())
     action = GLINE_MODIFY; /* no activity state modifications */
 
   Debug((DEBUG_DEBUG,  "About to perform changes; flags 0x%04x, action %s",
@@ -873,7 +873,7 @@ gline_modify(struct Client *cptr, struct Client *sptr, struct Gline *gline,
                          flags & GLINE_OPERFORCE ? "!" : "", op,
                          gline->gl_user, gline->gl_host ? "@" : "",
                          gline->gl_host ? gline->gl_host : "",
-                         gline->gl_expire - CurrentTime, gline->gl_lastmod,
+                         gline->gl_expire - TStime(), gline->gl_lastmod,
                          gline->gl_lifetime, gline->gl_reason);
 
   /* OK, let's do the G-line... */
@@ -1049,7 +1049,7 @@ gline_burst(struct Client *cptr)
                    GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
                     gline->gl_host ? "@" : "",
                     gline->gl_host ? gline->gl_host : "",
-                   gline->gl_expire - CurrentTime, gline->gl_lastmod,
+                   gline->gl_expire - TStime(), gline->gl_lastmod,
                     gline->gl_lifetime, gline->gl_reason);
   }
 
@@ -1057,7 +1057,7 @@ gline_burst(struct Client *cptr)
     if (!GlineIsLocal(gline) && gline->gl_lastmod)
       sendcmdto_one(&me, CMD_GLINE, cptr, "* %c%s %Tu %Tu %Tu :%s",
                    GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
-                   gline->gl_expire - CurrentTime, gline->gl_lastmod,
+                   gline->gl_expire - TStime(), gline->gl_lastmod,
                    gline->gl_lifetime, gline->gl_reason);
   }
 }
@@ -1077,7 +1077,7 @@ gline_resend(struct Client *cptr, struct Gline *gline)
                GlineIsRemActive(gline) ? '+' : '-', gline->gl_user,
                gline->gl_host ? "@" : "",
                 gline->gl_host ? gline->gl_host : "",
-               gline->gl_expire - CurrentTime, gline->gl_lastmod,
+               gline->gl_expire - TStime(), gline->gl_lastmod,
                gline->gl_lifetime, gline->gl_reason);
 
   return 0;
@@ -1104,8 +1104,8 @@ gline_list(struct Client *sptr, char *userhost)
     send_reply(sptr, RPL_GLIST, gline->gl_user,
                gline->gl_host ? "@" : "",
                gline->gl_host ? gline->gl_host : "",
-              gline->gl_expire + TSoffset, gline->gl_lastmod,
-              gline->gl_lifetime + TSoffset,
+              gline->gl_expire, gline->gl_lastmod,
+              gline->gl_lifetime,
               GlineIsLocal(gline) ? cli_name(&me) : "*",
               gline->gl_state == GLOCAL_ACTIVATED ? ">" :
               (gline->gl_state == GLOCAL_DEACTIVATED ? "<" : ""),
@@ -1115,8 +1115,8 @@ gline_list(struct Client *sptr, char *userhost)
       send_reply(sptr, RPL_GLIST, gline->gl_user,
                 gline->gl_host ? "@" : "",
                 gline->gl_host ? gline->gl_host : "",
-                gline->gl_expire + TSoffset, gline->gl_lastmod,
-                gline->gl_lifetime + TSoffset,
+                gline->gl_expire, gline->gl_lastmod,
+                gline->gl_lifetime,
                 GlineIsLocal(gline) ? cli_name(&me) : "*",
                 gline->gl_state == GLOCAL_ACTIVATED ? ">" :
                 (gline->gl_state == GLOCAL_DEACTIVATED ? "<" : ""),
@@ -1125,8 +1125,8 @@ gline_list(struct Client *sptr, char *userhost)
 
     gliter(BadChanGlineList, gline, sgline) {
       send_reply(sptr, RPL_GLIST, gline->gl_user, "", "",
-                gline->gl_expire + TSoffset, gline->gl_lastmod,
-                gline->gl_lifetime + TSoffset,
+                gline->gl_expire, gline->gl_lastmod,
+                gline->gl_lifetime,
                 GlineIsLocal(gline) ? cli_name(&me) : "*",
                 gline->gl_state == GLOCAL_ACTIVATED ? ">" :
                 (gline->gl_state == GLOCAL_DEACTIVATED ? "<" : ""),
@@ -1154,8 +1154,8 @@ gline_stats(struct Client *sptr, const struct StatDesc *sd,
     send_reply(sptr, RPL_STATSGLINE, 'G', gline->gl_user,
               gline->gl_host ? "@" : "",
               gline->gl_host ? gline->gl_host : "",
-              gline->gl_expire + TSoffset, gline->gl_lastmod,
-              gline->gl_lifetime + TSoffset,
+              gline->gl_expire, gline->gl_lastmod,
+              gline->gl_lifetime,
               gline->gl_state == GLOCAL_ACTIVATED ? ">" :
               (gline->gl_state == GLOCAL_DEACTIVATED ? "<" : ""),
               GlineIsRemActive(gline) ? '+' : '-',