Fix VERSION and RPL_MYINFO to only show modes that are enabled. Also fix up some...

[irc/rqf/shadowircd.git] / include / channel.h

diff --git a/include/channel.h b/include/channel.h
index 6a0a56a4c103e101815c67443ba75d8d55de6ae1..22f9d533fe2174d5fec9db5bf137da28d9452d23 100644 (file)
--- a/include/channel.h
+++ b/include/channel.h
@@ -21,7 +21,6 @@
  *  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
@@ -51,6 +50,7 @@ struct Channel
 {
        rb_dlink_node node;
        struct Mode mode;
+       char *mode_lock;
        char *topic;
        char *topic_info;
        time_t topic_time;
@@ -127,11 +127,13 @@ struct ChCapCombo
        int cap_no;
 };
 
+typedef void (*ChannelModeFunc)(struct Client *source_p, struct Channel *chptr,
+               int alevel, int parc, int *parn,
+               const char **parv, int *errors, int dir, char c, long mode_type);
+
 struct ChannelMode
 {
-       void (*set_func) (struct Client * source_p, struct Channel * chptr,
-                     int alevel, int parc, int *parn,
-                     const char **parv, int *errors, int dir, char c, long mode_type);
+       ChannelModeFunc set_func;
        long mode_type;
 };
 
@@ -154,8 +156,8 @@ typedef int (*ExtbanFunc)(const char *data, struct Client *client_p,
 #define CHFL_ADMIN             0x0080
 #define        ONLY_OPERS              0x0100
 #define ALL_MEMBERS            CHFL_PEON
-#define ONLY_CHANOPS           CHFL_CHANOP
-#define ONLY_CHANOPSVOICED     (CHFL_CHANOP|CHFL_VOICE)
+#define ONLY_CHANOPS           (CHFL_ADMIN|CHFL_CHANOP|CHFL_HALFOP)
+#define ONLY_CHANOPSVOICED     (CHFL_ADMIN|CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE)
 
 #define is_chmode_h(x) ((x) && (x)->flags & CHFL_HALFOP) /* does not check if halfop is enabled, should typically not be used */
 #define is_chmode_a(x) ((x) && (x)->flags & CHFL_ADMIN) /* does not check if admin is enabled, should typically not be used */
@@ -277,8 +279,12 @@ extern void unset_chcap_usage_counts(struct Client *serv_p);
 extern void send_cap_mode_changes(struct Client *client_p, struct Client *source_p,
                                  struct Channel *chptr, struct ChModeChange foo[], int);
 
+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);
 
 extern struct ChannelMode chmode_table[256];