More cleanup

[solanum.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index 0f8bd314603173251207dbdd477a6ea6ef6d05e4..9069296e1228a3994e03e23e33a9b3dd971d9174 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -20,8 +20,6 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
  *  USA
- *
- *  $Id: channel.h 3580 2007-11-07 23:45:14Z jilles $
  */
 
 #ifndef INCLUDED_channel_h
@@ -33,6 +31,8 @@
 #define MAXMODEPARAMS   4
 #define MAXMODEPARAMSSERV 10
 
+#include <setup.h>
+
 struct Client;
 
 /* mode structure for channels */
@@ -73,9 +73,14 @@ struct Channel
        unsigned int join_count;  /* joins within delta */
        unsigned int join_delta;  /* last ts of join */
 
-       unsigned long bants;
+       time_t bants;
        time_t channelts;
        char *chname;
+
+       struct Client *last_checked_client;
+       time_t last_checked_ts;
+       unsigned int last_checked_type;
+       int last_checked_result;
 };
 
 struct membership
@@ -88,7 +93,7 @@ struct membership
        struct Client *client_p;
        unsigned int flags;
 
-       unsigned long bants;
+       time_t bants;
 };
 
 #define BANLEN 195
@@ -142,6 +147,7 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define CHFL_BANNED            0x0008  /* cached as banned */
 #define CHFL_QUIETED           0x0010  /* cached as being +q victim */
 #define ONLY_SERVERS           0x0020
+#define ONLY_OPERS             0x0040
 #define ALL_MEMBERS            CHFL_PEON
 #define ONLY_CHANOPS           CHFL_CHANOP
 #define ONLY_CHANOPSVOICED     (CHFL_CHANOP|CHFL_VOICE)
@@ -254,7 +260,7 @@ void resv_chan_forcepart(const char *name, const char *reason, int temp_time);
 extern void set_channel_mode(struct Client *client_p, struct Client *source_p,
                struct Channel *chptr, struct membership *msptr, int parc, const char *parv[]);
 extern void set_channel_mlock(struct Client *client_p, struct Client *source_p,
-               struct Channel *chptr, const char *newmlock, int propagate);
+               struct Channel *chptr, const char *newmlock, bool propagate);
 
 extern struct ChannelMode chmode_table[256];
 
@@ -270,7 +276,7 @@ extern int match_extban(const char *banstr, struct Client *client_p, struct Chan
 extern int valid_extban(const char *banstr, struct Client *client_p, struct Channel *chptr, long mode_type);
 const char * get_extban_string(void);
 
-extern int get_channel_access(struct Client *source_p, struct membership *msptr);
+extern int get_channel_access(struct Client *source_p, struct Channel *chptr, struct membership *msptr, int dir, const char *modestr);
 
 extern void send_channel_join(struct Channel *chptr, struct Client *client_p);