Author: Isomer <isomer@coders.net>

[ircu2.10.12-pk.git] / include / gline.h

diff --git a/include/gline.h b/include/gline.h
index 7763063eadc4320054674ebb940bd3384e0c0c67..4a904664b0f57a88058a18d2844b13d7c1ef2a39 100644 (file)
--- a/include/gline.h
+++ b/include/gline.h
@@ -30,6 +30,7 @@
 #define INCLUDED_sys_types_h
 #endif
 
+#include <netinet/in.h>
 
 struct Client;
 
@@ -43,6 +44,8 @@ struct Gline {
   char        *gl_reason;
   time_t       gl_expire;
   time_t       gl_lastmod;
+  struct in_addr ipnum;  /* We store the IP in binary for ip glines */
+  char                 bits;
   unsigned int gl_flags;
 };
 
@@ -53,10 +56,16 @@ struct Gline {
 #define GLINE_ANY      0x0010
 #define GLINE_FORCE    0x0020
 #define GLINE_EXACT    0x0040
+#define GLINE_LDEACT   0x0080  /* locally deactivated */
+#define GLINE_GLOBAL   0x0100  /* find only global glines */
+#define GLINE_LASTMOD  0x0200  /* find only glines with non-zero lastmod */
 
 #define GLINE_MASK     (GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL)
+#define GLINE_ACTMASK  (GLINE_ACTIVE | GLINE_LDEACT)
 
-#define GlineIsActive(g)       ((g)->gl_flags & GLINE_ACTIVE)
+#define GlineIsActive(g)       (((g)->gl_flags & GLINE_ACTMASK) == \
+                                GLINE_ACTIVE)
+#define GlineIsRemActive(g)    ((g)->gl_flags & GLINE_ACTIVE)
 #define GlineIsIpMask(g)       ((g)->gl_flags & GLINE_IPMASK)
 #define GlineIsBadChan(g)      ((g)->gl_flags & GLINE_BADCHAN)
 #define GlineIsLocal(g)                ((g)->gl_flags & GLINE_LOCAL)
@@ -76,7 +85,7 @@ extern int gline_deactivate(struct Client *cptr, struct Client *sptr,
                            struct Gline *gline, time_t lastmod,
                            unsigned int flags);
 extern struct Gline *gline_find(char *userhost, unsigned int flags);
-extern struct Gline *gline_lookup(struct Client *cptr);
+extern struct Gline *gline_lookup(struct Client *cptr, unsigned int flags);
 extern void gline_free(struct Gline *gline);
 extern void gline_burst(struct Client *cptr);
 extern int gline_resend(struct Client *cptr, struct Gline *gline);