Committer : entrope
CVSROOT : /cvsroot/undernet-ircu
Module : ircu2.10
Commit time: 2005-09-02 03:34:44 UTC
Modified files:
ChangeLog ircd/gline.c
Log message:
Remove bits of old and dead code from gline handling.
---------------------- diff included ----------------------
Index: ircu2.10/ChangeLog
diff -u ircu2.10/ChangeLog:1.688 ircu2.10/ChangeLog:1.689
--- ircu2.10/ChangeLog:1.688 Thu Sep 1 20:27:27 2005
+++ ircu2.10/ChangeLog Thu Sep 1 20:34:34 2005
@@ -1,5 +1,12 @@
2005-09-01 Michael Poole <[EMAIL PROTECTED]>
+ * ircd/gline.c (make_gline): Remove debug output from when IPv6
+ support was being debugged.
+ (do_gline): Likewise.
+ (gline_lookup): Likewise, plus remove redundant code.
+
+2005-09-01 Michael Poole <[EMAIL PROTECTED]>
+
* ircd/channel.c (joinbuf_join): Ignore joinbuf type when joining
0, since no other call passes a null channel.
Index: ircu2.10/ircd/gline.c
diff -u ircu2.10/ircd/gline.c:1.59 ircu2.10/ircd/gline.c:1.60
--- ircu2.10/ircd/gline.c:1.59 Mon Jul 11 19:58:49 2005
+++ ircu2.10/ircd/gline.c Thu Sep 1 20:34:34 2005
@@ -19,7 +19,7 @@
*/
/** @file
* @brief Implementation of Gline manipulation functions.
- * @version $Id: gline.c,v 1.59 2005/07/12 02:58:49 entrope Exp $
+ * @version $Id: gline.c,v 1.60 2005/09/02 03:34:34 entrope Exp $
*/
#include "config.h"
@@ -161,10 +161,8 @@
else
gline->gl_host = NULL;
- if (*user != '$' && ipmask_parse(host, &gline->gl_addr, &gline->gl_bits)) {
- Debug((DEBUG_DEBUG,"IP gline: %s/%u", ircd_ntoa(&gline->gl_addr),
gline->gl_bits));
+ if (*user != '$' && ipmask_parse(host, &gline->gl_addr, &gline->gl_bits))
gline->gl_flags |= GLINE_IPMASK;
- }
if (after) {
gline->gl_next = after->gl_next;
@@ -223,10 +221,6 @@
continue;
if (GlineIsIpMask(gline)) {
-#ifdef DEBUGMODE
- char tbuf1[SOCKIPLEN], tbuf2[SOCKIPLEN];
- Debug((DEBUG_DEBUG,"IP gline: %s %s/%u", ircd_ntoa_r(tbuf1,
&cli_ip(acptr)), ircd_ntoa_r(tbuf2, &gline->gl_addr), gline->gl_bits));
-#endif
if (!ipmask_check(&cli_ip(acptr), &gline->gl_addr, gline->gl_bits))
continue;
}
@@ -693,7 +687,7 @@
gline_free(gline);
continue;
}
-
+
if ((flags & GLINE_GLOBAL && gline->gl_flags & GLINE_LOCAL) ||
(flags & GLINE_LASTMOD && !gline->gl_lastmod))
continue;
@@ -702,19 +696,12 @@
Debug((DEBUG_DEBUG,"realname gline: '%s'
'%s'",gline->gl_user,cli_info(cptr)));
if (match(gline->gl_user+2, cli_info(cptr)) != 0)
continue;
- if (!GlineIsActive(gline))
- continue;
- return gline;
}
else {
if (match(gline->gl_user, (cli_user(cptr))->username) != 0)
continue;
if (GlineIsIpMask(gline)) {
-#ifdef DEBUGMODE
- char tbuf1[SOCKIPLEN], tbuf2[SOCKIPLEN];
- Debug((DEBUG_DEBUG,"IP gline: %s %s/%u", ircd_ntoa_r(tbuf1,
&cli_ip(cptr)), ircd_ntoa_r(tbuf2, &gline->gl_addr), gline->gl_bits));
-#endif
if (!ipmask_check(&cli_ip(cptr), &gline->gl_addr, gline->gl_bits))
continue;
}
----------------------- End of diff -----------------------
_______________________________________________
Patches mailing list
[email protected]
http://undernet.sbg.org/mailman/listinfo/patches
