IPv6 support (hopefully with fewer future transition pains)

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

diff --git a/include/gline.h b/include/gline.h
index 50b951959e5afa1ec1f5fcb17fd46a9071da760c..50ef60862c566ef2f55a94c79cb90d790096cb85 100644 (file)
--- a/include/gline.h
+++ b/include/gline.h
@@ -22,16 +22,17 @@
  *
  * $Id$
  */
-#ifndef INCLUDED_config_h
-#include "config.h"
-#endif
 #ifndef INCLUDED_sys_types_h
 #include <sys/types.h>
 #define INCLUDED_sys_types_h
 #endif
 
+#ifndef INCLUDED_res_h
+#include "res.h"
+#endif
 
 struct Client;
+struct StatDesc;
 
 #define GLINE_MAX_EXPIRE 604800        /* max expire: 7 days */
 
@@ -43,6 +44,8 @@ struct Gline {
   char        *gl_reason;
   time_t       gl_expire;
   time_t       gl_lastmod;
+  struct irc_in_addr gl_addr;  /* We store the IP in binary for ip glines */
+  unsigned char gl_bits;
   unsigned int gl_flags;
 };
 
@@ -52,11 +55,21 @@ struct Gline {
 #define GLINE_LOCAL    0x0008
 #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_OPERFORCE        0x0400  /* oper forcing gline to be set */
+#define GLINE_REALNAME  0x0800  /* gline matches only the realname field */
 
-#define GLINE_MASK     (GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL)
+#define GLINE_MASK     (GLINE_ACTIVE | GLINE_BADCHAN | GLINE_LOCAL | GLINE_REALNAME)
+#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 GlineIsRealName(g)      ((g)->gl_flags & GLINE_REALNAME)
 #define GlineIsBadChan(g)      ((g)->gl_flags & GLINE_BADCHAN)
 #define GlineIsLocal(g)                ((g)->gl_flags & GLINE_LOCAL)
 
@@ -65,44 +78,25 @@ struct Gline {
 #define GlineReason(g)         ((g)->gl_reason)
 #define GlineLastMod(g)                ((g)->gl_lastmod)
 
+extern int gline_propagate(struct Client *cptr, struct Client *sptr,
+                          struct Gline *gline);
 extern int gline_add(struct Client *cptr, struct Client *sptr, char *userhost,
                     char *reason, time_t expire, time_t lastmod,
                     unsigned int flags);
 extern int gline_activate(struct Client *cptr, struct Client *sptr,
-                         struct Gline *gline, time_t lastmod);
+                         struct Gline *gline, time_t lastmod,
+                         unsigned int flags);
 extern int gline_deactivate(struct Client *cptr, struct Client *sptr,
-                           struct Gline *gline, time_t lastmod);
-extern struct Gline *gline_find(char *userhost);
-extern struct Gline *gline_lookup(struct Client *cptr);
+                           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, 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);
 extern int gline_list(struct Client *sptr, char *userhost);
-extern void gline_stats(struct Client *sptr);
-
-#ifdef 0 /* forget it! */
-#define SetActive(g)        ((g)->gl_flags |= GLINE_ACTIVE)
-#define ClearActive(g)      ((g)->gl_flags &= ~GLINE_ACTIVE)
-#define SetGlineIsIpMask(g) ((g)->gl_flags |= GLINE_IPMASK)
-#define SetGlineIsLocal(g)  ((g)->gl_flags |= GLINE_LOCAL)
-
-extern struct Gline* GlobalGlineList;
-extern struct Gline* BadChanGlineList;
-
-extern void gline_remove_expired(time_t now);
-
-extern void add_gline(struct Client *sptr, int ip_mask,
-                      char *host, char *comment, char *user,
-                      time_t expire, int local);
-extern struct Gline* make_gline(int is_ipmask, char *host, char *reason,
-                                char *name, time_t expire);
-extern struct Gline* find_gline(struct Client *cptr, struct Gline **pgline);
-extern void free_gline(struct Gline *gline, struct Gline *prev);
-
-#ifdef BADCHAN
-extern int bad_channel(const char* name);
-extern void bad_channel_remove_expired(time_t now);
-#endif
-#endif /* 0 */
+extern void gline_stats(struct Client *sptr, struct StatDesc *sd, int stat,
+                        char *param);
+extern int gline_memory_count(size_t *gl_size);
 
 #endif /* INCLUDED_gline_h */