Merge branch 'master' into chanserv-live

[irc/quakenet/newserv.git] / glines / glines.h

diff --git a/glines/glines.h b/glines/glines.h
index 2641711736502509775769eacd01a614df3e9297..a5d29d723d7c8a82c5edcf0802195c23e287ff46 100644 (file)
--- a/glines/glines.h
+++ b/glines/glines.h
@@ -4,6 +4,7 @@
 #include "../lib/sstring.h"
 #include "../nick/nick.h"
 #include "../channel/channel.h"
+#include "../whowas/whowas.h"
 
 #define SNIRCD_VERSION 134
 
@@ -74,6 +75,7 @@ typedef struct gline {
   time_t lifetime;
 
   unsigned int flags;
+  int glinebufid;
 
   struct gline *next;
 } gline;
@@ -81,15 +83,23 @@ typedef struct gline {
 typedef struct glinebuf {
   int id;
   sstring *comment;
-  time_t flush;
+  time_t commit;
+  time_t amend;
 
-  int merge;
   gline *glines;
 
+  int hitsvalid;
   int userhits;
   int channelhits;
+
+  array hits;
 } glinebuf;
 
+typedef struct glineinfo {
+  int hits;
+  char *mask;
+} glineinfo;
+
 extern gline *glinelist;
 extern glinebuf *glinebuflog[MAXGLINELOG];
 extern int glinebuflogoffset;
@@ -113,22 +123,26 @@ char *glinetostring(gline *g);
 
 /* glines_util.c */
 int glinebyip(const char *user, struct irc_in_addr *ip, unsigned char bits, int duration, const char *reason, int flags, const char *creator);
+glineinfo *glinebynickex(nick *np, int duration, const char *reason, int flags, const char *creator);
 int glinebynick(nick *np, int duration, const char *reason, int flags, const char *creator);
 void glineunsetmask(const char *mask);
 
 /* glines_buf.c */
-void glinebufinit(glinebuf *gbuf, int merge);
+void glinebufinit(glinebuf *gbuf, int id);
 gline *glinebufadd(glinebuf *gbuf, const char *mask, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
-void glinebufaddbyip(glinebuf *gbuf, const char *user, struct irc_in_addr *ip, unsigned char bits, int flags, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
-void glinebufaddbynick(glinebuf *gbuf, nick *, int flags, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
-void glinebufcounthits(glinebuf *gbuf, int *users, int *channels, nick *spewto);
-int glinebufchecksane(glinebuf *gbuf, nick *spewto, int overridesanity, int overridelimit, int spewhits);
+char *glinebufaddbyip(glinebuf *gbuf, const char *user, struct irc_in_addr *ip, unsigned char bits, int flags, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
+char *glinebufaddbynick(glinebuf *gbuf, nick *, int flags, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
+void glinebufaddbywhowas(glinebuf *gbuf, whowas *, int flags, const char *creator, const char *reason, time_t expire, time_t lastmod, time_t lifetime);
+void glinebufcounthits(glinebuf *gbuf, int *users, int *channels);
+int glinebufchecksane(glinebuf *gbuf, nick *spewto, int overridesanity, int overridelimit);
 void glinebufspew(glinebuf *gbuf, nick *spewto);
-void glinebufcommit(glinebuf *gbuf, int propagate);
+void glinebufmerge(glinebuf *gbuf);
+int glinebufcommit(glinebuf *gbuf, int propagate);
 void glinebufabort(glinebuf *gbuf);
 int glinebufundo(int id);
 void glinebufcommentf(glinebuf *gbuf, const char *format, ...);
 void glinebufcommentv(glinebuf *gbuf, const char *prefix, int cargc, char **cargv);
+int glinebufwritelog(glinebuf *gbuf, int propagating);
 
 /* glines_alloc.c */
 void freegline(gline *);