#include <stdio.h>
#include <string.h>
-
-#include "../control/control.h"
-#include "../nick/nick.h"
#include "../localuser/localuserchannel.h"
-#include "../core/hooks.h"
-#include "../server/server.h"
-#include "../parser/parser.h"
-#include "../core/schedule.h"
-#include "../lib/array.h"
-#include "../lib/base64.h"
-#include "../lib/irc_string.h"
-#include "../lib/splitline.h"
#include "glines.h"
/*
int handleglinemsg(void *source, int cargc, char **cargv) {
char *sender = (char *)source;
- char *target;
char *mask;
char *reason;
char *creator;
time_t lifetime = 0, expire = 0, lastmod = 0;
unsigned int flags = 0;
- int numlen;
long creatornum;
gline *agline;
nick *np;
+ glinebuf gbuf;
/**
* Valid GL tokens have X params:
* 2: Local modification to a local gline - ignored by services
+ * 4: ulined GL
* 5: 1.3.x GL Token
* 6: 1.4.x GL Token - adds lifetime parameter
*/
- switch ( cargc ) {
+ switch (cargc) {
case 2:
/* local modification which we reject later */
break;
+ case 4:
+ /* ulined GL */
+ break;
case 5:
/* 1.3.x GL Token */
break;
* 2 long numeric = server
* 5 long number = client
*/
- numlen = strlen(source);
- switch (numlen) {
+ switch (strlen(source)) {
case 2:
creatornum = numerictolong(sender, 2);
if (creatornum < 0) {
Error("gline", ERR_WARNING, "Failed to resolve numeric (%s) to server when adding G-Line from network!", sender);
creator = "unknown";
} else
- if (serverlist[(int)creatornum].name==NULL) {
+ if (serverlist[(int)creatornum].name == NULL) {
Error("gline", ERR_WARNING, "Received gline from non-existant server");
return CMD_ERROR;
} else {
- creator = serverlist[(int)creatornum].name->content, HOSTLEN;
+ creator = serverlist[(int)creatornum].name->content;
}
break;
case 5:
creatornum = numerictolong(sender, 5);
- if (!(np = getnickbynumeric(creatornum))) {
+ np = getnickbynumeric(creatornum);
+ if (!np) {
Error("gline", ERR_WARNING, "Failed to resolve numeric (%s) to nick when adding G-Line from network!", sender);
creator = "unknown";
} else
return CMD_ERROR;
}
- /* 1st param is target */
- target = cargv[0];
-
- /* anything other than a global G-Line is irrelevant */
- if (strcmp(target, "*")) {
- Error("gline", ERR_WARNING, "Received local g-line from %s - do they realise we're a service?", sender);
- return CMD_ERROR;
- }
-
/* 2nd param is mask */
mask = cargv[1];
+ if (*mask == '%') {
+ flags |= GLINE_DESTROY;
+ mask++;
+ }
+
switch (*mask) {
case '+':
flags |= GLINE_ACTIVATE;
switch (cargc) {
case 4:
/* asuka U:d, no lastmod */
+ lastmod = 0;
+ lifetime = expire;
reason = cargv[3];
break;
case 5:
/*asuka lastmod */
lastmod = atoi(cargv[3]);
- lifetime = gline_max(lastmod,expire); /* set lifetime = lastmod */
+ lifetime = gline_max(lastmod, expire); /* set lifetime = lastmod */
reason = cargv[4];
break;
case 6:
Error("debuggline", ERR_WARNING, "GL Received: Creator %s, Mask %s, Reason %s, Expire %lu, Lastmod %lu, Lifetime %lu", creator, mask, reason, expire, lastmod, lifetime);
- if ( (agline=gline_find(mask)) ) {
- if (agline->flags & GLINE_ACTIVE ) {
- Error("debuggline", ERR_WARNING, "Duplicate Gline recieved for %s - old lastmod %lu, expire %lu, lifetime %lu, reason %s, creator %s", mask, agline->lastmod, agline->expire, agline->lifetime, agline->reason->content, agline->creator->content );
+ agline = findgline(mask);
+
+ if (agline) {
+ Error("debuggline", ERR_WARNING, "Update for existing gline received for %s - old lastmod %lu, expire %lu, lifetime %lu, reason %s, creator %s", mask, agline->lastmod, agline->expire, agline->lifetime, agline->reason ? agline->reason->content : "", agline->creator->content);
+
+ agline->flags |= GLINE_ACTIVE;
+
+ /* check lastmod then assume the new gline is authoritive */
+ if (lastmod > agline->lastmod) {
+ agline->lastmod = lastmod;
+ agline->expire = expire;
+ agline->lifetime = lifetime;
+ freesstring(agline->creator);
+ agline->creator = getsstring(creator, 255);
+ freesstring(agline->reason);
+ agline->reason = getsstring(reason, 255);
} else {
- /* we're reactivating a gline - check lastmod then assume the new gline is authoritive */
- if ( lastmod > agline->lastmod ) {
- agline->lastmod = lastmod;
- agline->expire = expire;
- agline->lifetime = lifetime;
- agline->creator = getsstring(creator, 255);
- freesstring(agline->reason);
- agline->reason = getsstring(reason, 255);
- agline->flags |= GLINE_ACTIVE;
- } else {
- Error("debuggline", ERR_WARNING, "received a gline with a lower lastmod");
- /* @@@TODO resend our gline ? */
- }
- }
- /* TODO */
- return CMD_ERROR;
+ Error("debuggline", ERR_WARNING, "received a gline with a lower lastmod");
+ /* Don't send our gline as that might cause loops in case we don't understand the gline properly. */
+ }
+
+ return CMD_OK;
} else {
- gline_add( creator, mask, reason, expire, lastmod, lifetime);
+ glinebufinit(&gbuf, 0);
+ glinebufadd(&gbuf, mask, creator, reason, expire, lastmod, lifetime);
+ glinebufcommit(&gbuf, 0);
}
} else if (flags & GLINE_DEACTIVATE) {
/* deactivate gline */
- if ((agline = gline_find(mask))) {
+ agline = findgline(mask);
+
+ if (agline) {
switch (cargc) {
case 2:
/* asuka U:d, no last mod */
case 5:
/* asuka last mod */
lastmod = atoi(cargv[3]);
- gline_deactivate(agline, lastmod, 0);
+
+ if (flags & GLINE_DESTROY)
+ gline_destroy(agline, lastmod, 0);
+ else
+ gline_deactivate(agline, lastmod, 0);
+
break;
case 6:
/* snircd */
lastmod = atoi(cargv[3]);
- gline_deactivate(agline, lastmod, 0);
+
+ if (flags & GLINE_DESTROY)
+ gline_destroy(agline, lastmod, 0);
+ else
+ gline_deactivate(agline, lastmod, 0);
+
break;
default:
Error("gline", ERR_WARNING, "Gline Deactivate with invalid number (%d) of arguments", cargc);
return CMD_ERROR;
}
+
return CMD_OK;
} else {
Error("gline", ERR_WARNING, "Gline addition - adding deactivated gline - mask not found (%s)", mask);
case 5:
/*asuka lastmod */
lastmod = atoi(cargv[3]);
- lifetime = gline_max(lastmod,expire); /* set lifetime = lastmod */
+ lifetime = gline_max(lastmod, expire); /* set lifetime = lastmod */
reason = cargv[4];
break;
case 6:
return CMD_ERROR;
}
- if ((agline = gline_add( creator, mask, reason, expire, lastmod, lifetime)))
- gline_deactivate(agline, lastmod, 0);
- else
+ glinebufinit(&gbuf, 0);
+ agline = glinebufadd(&gbuf, mask, creator, reason, expire, lastmod, lifetime);
+
+ if (!agline) {
+ glinebufabort(&gbuf);
Error("gline", ERR_WARNING, "gline_add failed");
- return CMD_ERROR;
+ return CMD_ERROR;
+ }
+
+ gline_deactivate(agline, lastmod, 0);
+ glinebufcommit(&gbuf, 0);
+
+ return CMD_OK;
}
} else {
/* modification - only snircd 1.4.x */
- if ((agline = gline_find(mask))) {
+ agline = findgline(mask);
+
+ if (agline) {
expire = abs_expire(atoi(cargv[2]));
lastmod = atoi(cargv[3]);
lifetime = atoi(cargv[4]);
reason = cargv[5];
- if ( lastmod > agline->lastmod ) {
+ if (lastmod > agline->lastmod) {
agline->lastmod = lastmod;
agline->expire = expire;
agline->lifetime = lifetime;
agline->reason = getsstring(reason, 255);
} else {
Error("debuggline", ERR_WARNING, "received a gline modification with a lower lastmod");
- /* @@@TODO resend our gline ? */
}
+
return CMD_OK;
} else {
- Error("gline", ERR_WARNING, "Received modification for gline that does not exist for mask %s", mask);
+ Error("gline", ERR_WARNING, "Received modification for G-Line that does not exist for mask %s", mask);
return CMD_ERROR;
}
}
+
return CMD_OK;
}
-
void handleglinestats(int hooknum, void *arg) {
- if((long)arg > 10) {
+ if ((long)arg > 10) {
char message[100];
int glcount = 0;
gline *gl;
- for(gl=glinelist;gl;gl=gl->next) {
+ for(gl = glinelist; gl; gl = gl->next)
glcount++;
- }
- snprintf(message, sizeof(message), "Glines :%7d glines", glcount);
+ snprintf(message, sizeof(message), "G-Lines :%7d glines", glcount);
triggerhook(HOOK_CORE_STATSREPLY, message);
}
}
projects / irc / quakenet / newserv.git / blobdiff