X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fm_gline.c;h=95e2ac173b29471b0898194b303e27d3543f98e9;hb=0a448eb4337cd92f8eeb21d9560506eb384ad69d;hp=2e5975409fb618f10835ae16bb7118ca3975893d;hpb=7d05062a94eb0c6e7434d4d072e03f389492afda;p=ircu2.10.12-pk.git diff --git a/ircd/m_gline.c b/ircd/m_gline.c index 2e59754..95e2ac1 100644 --- a/ircd/m_gline.c +++ b/ircd/m_gline.c @@ -102,6 +102,19 @@ #include #include +#define PASTWATCH 157680000 /* number of seconds in 5 years */ + +/* + * If the expiration value, interpreted as an absolute timestamp, is + * more recent than 5 years in the past, we interpret it as an + * absolute timestamp; otherwise, we assume it's relative and convert + * it to an absolute timestamp. Either way, the output of this macro + * is an absolute timestamp--not guaranteed to be a *valid* timestamp, + * but you can't have everything in a macro ;) + */ +#define abs_expire(exp) \ + ((exp) >= CurrentTime - PASTWATCH ? (exp) : (exp) + CurrentTime) + /* * ms_gline - server message handler * @@ -118,7 +131,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) struct Gline *agline = 0; unsigned int flags = 0; enum GlineAction action = GLINE_MODIFY; - time_t expire_off = 0, lastmod = 0, lifetime = 0; + time_t expire = 0, lastmod = 0, lifetime = 0; char *mask = parv[2], *target = parv[1], *reason = "No reason", *tmp = 0; if (parc < 3) @@ -203,7 +216,8 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) if (parc < 5) /* check parameter count... */ return need_more_params(sptr, "GLINE"); - expire_off = atoi(parv[3]); /* get expiration... */ + expire = atoi(parv[3]); /* get expiration... */ + expire = abs_expire(expire); /* convert to absolute... */ reason = parv[parc - 1]; /* and reason */ if (IsMe(acptr)) { @@ -214,9 +228,9 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) Debug((DEBUG_DEBUG, "I am creating a local G-line here; target %s, " "mask %s, operforce %s, action %s, expire %Tu, reason: %s", target, mask, flags & GLINE_OPERFORCE ? "YES" : "NO", - action == GLINE_ACTIVATE ? "+" : "-", expire_off, reason)); + action == GLINE_ACTIVATE ? "+" : "-", expire, reason)); - return gline_add(cptr, sptr, mask, reason, expire_off, lastmod, + return gline_add(cptr, sptr, mask, reason, expire, lastmod, lifetime, flags | GLINE_ACTIVE); } } else if (IsMe(acptr)) { /* destroying a local G-line */ @@ -244,13 +258,13 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) "target %s, mask %s, operforce %s, action %c, expire %Tu, " "lastmod %Tu, reason: %s", target, mask, flags & GLINE_OPERFORCE ? "YES" : "NO", - action == GLINE_ACTIVATE ? '+' : '-', expire_off, CurrentTime, + action == GLINE_ACTIVATE ? '+' : '-', expire, CurrentTime, reason)); sendcmdto_one(sptr, CMD_GLINE, acptr, "%C %s%c%s %Tu %Tu :%s", acptr, flags & GLINE_OPERFORCE ? "!" : "", - action == GLINE_ACTIVATE ? '+' : '-', mask, expire_off, - CurrentTime, reason); + action == GLINE_ACTIVATE ? '+' : '-', mask, + expire - CurrentTime, CurrentTime, reason); return 0; /* all done */ } @@ -278,10 +292,8 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) case GLINE_MODIFY: /* modifying a G-line */ /* convert expire and lastmod, look for lifetime and reason */ if (parc > 4) { /* protect against fall-through from 4-param form */ - if (parc < 5) - return need_more_params(sptr, "GLINE"); - - expire_off = atoi(parv[3]); /* convert expiration and lastmod */ + expire = atoi(parv[3]); /* convert expiration and lastmod */ + expire = abs_expire(expire); lastmod = atoi(parv[4]); flags |= GLINE_EXPIRE; /* we have an expiration time update */ @@ -318,7 +330,7 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) (action == GLINE_DEACTIVATE ? "-" : (action == GLINE_LOCAL_ACTIVATE ? ">" : (action == GLINE_LOCAL_DEACTIVATE ? "<" : "(MODIFY)"))), - expire_off, lastmod, lifetime, reason, + expire, lastmod, lifetime, reason, agline ? "EXISTS" : "does not exist", flags & GLINE_EXPIRE ? "expire" : "", flags & GLINE_LIFETIME ? "lifetime" : "", @@ -328,14 +340,26 @@ ms_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) * Let's actually do the action! */ if (agline) - return gline_modify(cptr, sptr, agline, action, reason, expire_off, + return gline_modify(cptr, sptr, agline, action, reason, expire, lastmod, lifetime, flags); assert(action != GLINE_LOCAL_ACTIVATE); assert(action != GLINE_LOCAL_DEACTIVATE); assert(action != GLINE_MODIFY); - return gline_add(cptr, sptr, mask, reason, expire_off, lastmod, lifetime, + if (!expire) { /* Cannot *add* a G-line we don't have, but try hard */ + Debug((DEBUG_DEBUG, "Propagating G-line %s for G-line we don't have", + action == GLINE_ACTIVATE ? "activation" : "deactivation")); + + /* propagate the G-line, even though we don't have it */ + sendcmdto_serv_butone(sptr, CMD_GLINE, cptr, "* %c%s %Tu", + action == GLINE_ACTIVATE ? '+' : '-', + mask, lastmod); + + return 0; + } + + return gline_add(cptr, sptr, mask, reason, expire, lastmod, lifetime, flags | ((action == GLINE_ACTIVATE) ? GLINE_ACTIVE : 0)); } @@ -354,7 +378,7 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) struct Gline *agline = 0; unsigned int flags = 0; enum GlineAction action = GLINE_MODIFY; - time_t expire_off = 0; + time_t expire = 0; char *mask = parv[1], *target = 0, *reason = 0; if (parc < 2) @@ -398,12 +422,12 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) return need_more_params(sptr, "GLINE"); target = parv[2]; /* get the target... */ - expire_off = atoi(parv[3]); /* and the expiration */ + expire = atoi(parv[3]) + CurrentTime; /* and the expiration */ flags |= GLINE_EXPIRE; /* remember that we got an expire time */ if (parc > 4) { /* also got a reason... */ - reason = parv[4]; + reason = parv[parc - 1]; flags |= GLINE_REASON; } @@ -429,7 +453,7 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) if (parc > 3) { /* get expiration and target */ - expire_off = atoi(parv[parc - 2]); + expire = atoi(parv[parc - 2]) + CurrentTime; reason = parv[parc - 1]; flags |= GLINE_EXPIRE | GLINE_REASON; /* remember that we got 'em */ @@ -517,12 +541,12 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) "server; target %s, mask %s, operforce %s, action %c, " "expire %Tu, reason %s", target, mask, flags & GLINE_OPERFORCE ? "YES" : "NO", - action == GLINE_ACTIVATE ? '+' : '-', expire_off, reason)); + action == GLINE_ACTIVATE ? '+' : '-', expire, reason)); sendcmdto_one(sptr, CMD_GLINE, acptr, "%C %s%c%s %Tu %Tu :%s", acptr, flags & GLINE_OPERFORCE ? "!" : "", - action == GLINE_ACTIVATE ? '+' : '-', mask, expire_off, - CurrentTime, reason); + action == GLINE_ACTIVATE ? '+' : '-', mask, + expire - CurrentTime, CurrentTime, reason); return 0; /* all done */ } @@ -540,9 +564,9 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) Debug((DEBUG_DEBUG, "I am creating a local G-line here; target %s, " "mask %s, operforce %s, action %s, expire %Tu, reason: %s", target, mask, flags & GLINE_OPERFORCE ? "YES" : "NO", - action == GLINE_ACTIVATE ? "+" : "-", expire_off, reason)); + action == GLINE_ACTIVATE ? "+" : "-", expire, reason)); - return gline_add(cptr, sptr, mask, reason, expire_off, 0, 0, + return gline_add(cptr, sptr, mask, reason, expire, 0, 0, flags | GLINE_ACTIVE); } else { /* OK, it's a deactivation/destruction */ if (!agline) /* G-line doesn't exist, so let's complain... */ @@ -584,12 +608,12 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) (action == GLINE_DEACTIVATE ? "-" : (action == GLINE_LOCAL_ACTIVATE ? ">" : (action == GLINE_LOCAL_DEACTIVATE ? "<" : "(MODIFY)"))), - expire_off, reason, agline ? "EXISTS" : "does not exist", + expire, reason, agline ? "EXISTS" : "does not exist", flags & GLINE_EXPIRE ? "expire" : "", flags & GLINE_REASON ? "reason" : "")); if (agline) /* modifying an existing G-line */ - return gline_modify(cptr, sptr, agline, action, reason, expire_off, + return gline_modify(cptr, sptr, agline, action, reason, expire, CurrentTime, 0, flags); assert(action != GLINE_LOCAL_ACTIVATE); @@ -597,7 +621,7 @@ mo_gline(struct Client *cptr, struct Client *sptr, int parc, char *parv[]) assert(action != GLINE_MODIFY); /* create a new G-line */ - return gline_add(cptr, sptr, mask, reason, expire_off, CurrentTime, 0, + return gline_add(cptr, sptr, mask, reason, expire, CurrentTime, 0, flags | ((action == GLINE_ACTIVATE) ? GLINE_ACTIVE : 0)); }