ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/include/channel_mode.h
(Generate patch)

Comparing ircd-hybrid/trunk/include/channel_mode.h (file contents):
Revision 2896 by michael, Tue Jan 21 20:05:40 2014 UTC vs.
Revision 3707 by michael, Fri May 30 16:20:47 2014 UTC

# Line 60 | Line 60 | enum
60   #define CHFL_CHANOP     0x0001 /* Channel operator   */
61   #define CHFL_HALFOP     0x0002 /* Channel half op    */
62   #define CHFL_VOICE      0x0004 /* the power to speak */
63 < #define CHFL_DEOPPED    0x0008 /* deopped by us, modes need to be bounced */
64 < #define CHFL_BAN        0x0010 /* ban channel flag */
65 < #define CHFL_EXCEPTION  0x0020 /* exception to ban channel flag */
66 < #define CHFL_INVEX      0x0040
63 > #define CHFL_BAN        0x0008 /* ban channel flag */
64 > #define CHFL_EXCEPTION  0x0010 /* exception to ban channel flag */
65 > #define CHFL_INVEX      0x0020
66  
67   /* channel modes ONLY */
68 < #define MODE_PRIVATE    0x0001
69 < #define MODE_SECRET     0x0002
70 < #define MODE_MODERATED  0x0004
71 < #define MODE_TOPICLIMIT 0x0008
72 < #define MODE_INVITEONLY 0x0010
73 < #define MODE_NOPRIVMSGS 0x0020
74 < #define MODE_SSLONLY    0x0040
75 < #define MODE_OPERONLY   0x0080
76 < #define MODE_REGISTERED 0x0100 /* Channel has been registered with ChanServ */
77 < #define MODE_REGONLY    0x0200
78 < #define MODE_NOCTRL     0x0400
79 < #define MODE_MODREG     0x0800
68 > #define MODE_PRIVATE    0x0001  /**< */
69 > #define MODE_SECRET     0x0002  /**< Channel does not show up on NAMES or LIST */
70 > #define MODE_MODERATED  0x0004  /**< Users without +v/h/o cannot send text to the channel */
71 > #define MODE_TOPICLIMIT 0x0008  /**< Only chanops can change the topic */
72 > #define MODE_INVITEONLY 0x0010  /**< Only invited usersmay join this channel */
73 > #define MODE_NOPRIVMSGS 0x0020  /**< Users must be in the channel to send text to it */
74 > #define MODE_SSLONLY    0x0040  /**< Prevents anyone who isn't connected via SSL/TLS from joining the channel */
75 > #define MODE_OPERONLY   0x0080  /**< Prevents anyone who hasn't obtained IRC operator status from joining the channel */
76 > #define MODE_REGISTERED 0x0100  /**< Channel has been registered with ChanServ */
77 > #define MODE_REGONLY    0x0200  /**< Only registered clients may join a channel with that mode set */
78 > #define MODE_NOCTRL     0x0400  /**< Prevents users from sending messages containing control codes to the channel */
79 > #define MODE_MODREG     0x0800  /**< Unregistered/unidentified clients cannot send text to the channel */
80  
81   /* cache flags for silence on ban */
82   #define CHFL_BAN_CHECKED  0x0080
# Line 85 | Line 84 | enum
84  
85   /* name invisible */
86   #define SecretChannel(x)        (((x)->mode.mode & MODE_SECRET))
87 < #define PubChannel(x)           (!SecretChannel(x))
88 < /* knock is forbidden, halfops can't kick/deop other halfops.
90 < * +pi means paranoid and will generate notices on each invite */
87 > #define PubChannel(x)           (((x)->mode.mode & (MODE_PRIVATE | MODE_SECRET)) == 0)
88 > /* knock is forbidden, halfops can't kick/deop other halfops. */
89   #define PrivateChannel(x)       (((x)->mode.mode & MODE_PRIVATE))
90  
91   struct ChModeChange
# Line 96 | Line 94 | struct ChModeChange
94    const char *arg;
95    const char *id;
96    int dir;
99 –  unsigned int caps;
100 –  unsigned int nocaps;
97    int mems;
102 –  struct Client *client;
103 – };
104 –
105 – struct ChCapCombo
106 – {
107 –  int count;
108 –  unsigned int cap_yes;
109 –  unsigned int cap_no;
98   };
99  
100   struct mode_letter
# Line 116 | Line 104 | struct mode_letter
104   };
105  
106   extern const struct mode_letter chan_modes[];
107 < extern int add_id(struct Client *, struct Channel *, char *, int);
108 < extern void set_channel_mode(struct Client *, struct Client *, struct Channel *,
109 <                             struct Membership *, int, char **, char *);
107 >
108 > extern int add_id(struct Client *, struct Channel *, char *, unsigned int);
109 > extern void set_channel_mode(struct Client *, struct Channel *,
110 >                             struct Membership *, int, char **);
111   extern void clear_ban_cache(struct Channel *);
112   extern void clear_ban_cache_client(struct Client *);
124 – extern void init_chcap_usage_counts(void);
125 – extern void set_chcap_usage_counts(struct Client *);
126 – extern void unset_chcap_usage_counts(struct Client *);
113   #endif /* INCLUDED_channel_mode_h */

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)