/* If we're connected to IRC, force a disconnect. */
if (connected) {
irc_send("%s SQ %s 0 :Resync [adding gline support]", mynumeric->content, myserver->content);
- irc_disconnected();
+ irc_disconnected(0);
}
registerserverhandler("GL", handleglinemsg, 6);
return 0;
if (gl->flags & GLINE_IPMASK) {
- if (!ipmask_check(&gl->ip, &np->p_ipaddr, gl->bits))
+ if (!ipmask_check(&gl->ip, &np->ipaddress, gl->bits))
return 0;
} else {
if (gl->host && match(gl->host->content, np->host->name->content) != 0)
if (agline->flags & GLINE_DESTROYED) {
#if SNIRCD_VERSION < 135
- controlwall(NO_OPER, NL_GLINES, "Tried to destroy G-Line on '%s' however SNIRCD_VERSION is too old.", glinetostring(agline));
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Tried to destroy G-Line on '%s' however SNIRCD_VERSION is too old.", glinetostring(agline));
#else
- controlwall(NO_OPER, NL_GLINES, "Destroying G-Line on '%s' lasting %s with reason '%s', created by: %s",
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Destroying G-Line on '%s' lasting %s with reason '%s', created by: %s",
glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
- agline->reason->content, agline->creator->content);
+ agline->reason ? agline->reason->content : "", agline->creator->content);
-#if 1
irc_send("%s GL * %%-%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#else
- controlwall(NO_OPER, NL_GLINES, "%s GL * %%-%s %lu %lu :%s\r\n", mynumeric->content,
- glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#endif
+ agline->lastmod, agline->reason ? agline->reason->content : "");
#endif /* SNIRCD_VERSION */
} else if (agline->flags & GLINE_ACTIVE) {
- controlwall(NO_OPER, NL_GLINES, "Activating G-Line on '%s' lasting %s created by %s with reason '%s'",
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Activating G-Line on '%s' lasting %s created by %s with reason '%s'",
glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
- agline->creator->content, agline->reason->content);
+ agline->creator->content, agline->reason ? agline->reason->content : "");
-#if 1
irc_send("%s GL * +%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#else
- controlwall(NO_OPER, NL_GLINES, "%s GL * +%s %lu %lu :%s\r\n", mynumeric->content,
- glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#endif
+ agline->lastmod, agline->reason ? agline->reason->content : "");
} else {
- controlwall(NO_OPER, NL_GLINES, "Deactivating G-Line on '%s' lasting %s created by %s with reason '%s'",
+ controlwall(NO_OPER, NL_GLINES_AUTO, "Deactivating G-Line on '%s' lasting %s created by %s with reason '%s'",
glinetostring(agline), longtoduration(agline->expire-getnettime(), 0),
- agline->creator->content, agline->reason->content);
+ agline->creator->content, agline->reason ? agline->reason->content : "");
-#if 1
irc_send("%s GL * -%s %lu %lu :%s\r\n", mynumeric->content,
glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#else
- controlwall(NO_OPER, NL_GLINES, "%s GL * -%s %lu %lu :%s\r\n", mynumeric->content,
- glinetostring(agline), agline->expire - getnettime(),
- agline->lastmod, agline->reason->content);
-#endif
+ agline->lastmod, agline->reason ? agline->reason->content : "");
}
}
if ((gla->flags & GLINE_REALNAME) != (glb->flags & GLINE_REALNAME))
return 0;
- if ((gla->flags & GLINE_IPMASK) != (glb->flags & GLINE_IPMASK))
- return 0;
-
if (gla->nick && !glb->nick)
return 0;
if (gla->user && glb->user && match(gla->user->content, glb->user->content) != 0)
return 0;
- if (gla->flags & GLINE_IPMASK) {
+ if (gla->flags & GLINE_IPMASK && glb->flags & GLINE_IPMASK) {
if (gla->bits > glb->bits)
return 0;
trusthost *th;
/* Reason is too short */
- if (strlen(gl->reason->content) < MINGLINEREASONLEN) {
+ if (!gl->reason || strlen(gl->reason->content) < MINGLINEREASONLEN) {
*hint = "G-Line reason is too short.";
return 0;
}
return 1;
}
+
+gline *glinedup(gline *gl) {
+ gline *sgl;
+
+ sgl = newgline();
+
+ if (!sgl)
+ return NULL;
+
+ if (gl->nick)
+ sgl->nick = getsstring(gl->nick->content, 512);
+
+ if (gl->user)
+ sgl->user = getsstring(gl->user->content, 512);
+
+ if (gl->host)
+ sgl->host = getsstring(gl->host->content, 512);
+
+ sgl->reason = gl->reason ? getsstring(gl->reason->content, 512) : NULL;
+ sgl->creator = getsstring(gl->creator->content, 512);
+
+ memcpy(&sgl->ip, &gl->ip, sizeof(gl->ip));
+ sgl->bits = gl->bits;
+
+ sgl->expire = gl->expire;
+ sgl->lastmod = gl->lastmod;
+ sgl->lifetime = gl->lifetime;
+
+ sgl->flags = gl->flags;
+
+ return sgl;
+}