#define MODEBUFLEN 200
#define KEYLEN 23
+#define PASSLEN 23
#define CHANNELLEN 200
#define MAXJOINARGS 15 /* number of slots for join buffer */
#define CHFL_BANVALID 0x0800 /* CHFL_BANNED bit is valid */
#define CHFL_BANNED 0x1000 /* Channel member is banned */
#define CHFL_SILENCE_IPMASK 0x2000 /* silence mask is an IP-number mask */
+#define CHFL_BURST_ALREADY_OPPED 0x04000 /* In oob BURST, but was already joined and opped */
+#define CHFL_BURST_ALREADY_VOICED 0x08000 /* In oob BURST, but was already joined and voiced */
+#define CHFL_CHANNEL_MANAGER 0x10000 /* Set when creating channel or using Apass */
#define CHFL_OVERLAP (CHFL_CHANOP | CHFL_VOICE)
#define CHFL_BANVALIDMASK (CHFL_BANVALID | CHFL_BANNED)
#define MODE_KEY 0x0100
#define MODE_BAN 0x0200
#define MODE_LIMIT 0x0400
-#define MODE_SENDTS 0x0800 /* TS was 0 during a local user /join; send
- * temporary TS; can be removed when all 2.10 */
+#define MODE_REGONLY 0x0800 /* Only +r users may join */
#define MODE_LISTED 0x10000
#define MODE_SAVE 0x20000 /* save this mode-with-arg 'til later */
#define MODE_FREE 0x40000 /* string needs to be passed to MyFree() */
#define MODE_BURSTADDED 0x80000 /* channel was created by a BURST */
+#define MODE_UPASS 0x100000
+#define MODE_APASS 0x200000
/*
* mode flags which take another parameter (With PARAmeterS)
*/
-#define MODE_WPARAS (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT)
+#define MODE_WPARAS (MODE_CHANOP|MODE_VOICE|MODE_BAN|MODE_KEY|MODE_LIMIT|MODE_APASS|MODE_UPASS)
#define HoldChannel(x) (!(x))
/* name invisible */
/* channel not shown but names are */
#define HiddenChannel(x) ((x) && ((x)->mode.mode & MODE_PRIVATE))
/* channel visible */
-#define ShowChannel(v,c) (PubChannel(c) || find_channel_member((v),(c)))
+#define ShowChannel(v,c) (PubChannel(c) || find_channel_member((v),(c)) || \
+ (IsAnOper(v) && HasPriv(v, PRIV_LIST_CHAN)))
#define PubChannel(x) ((!x) || ((x)->mode.mode & \
(MODE_PRIVATE | MODE_SECRET)) == 0)
#define is_listed(x) ((x)->mode.mode & MODE_LISTED)
#define IsLocalChannel(name) (*(name) == '&')
-#define IsModelessChannel(name) (*(name) == '+')
#define IsChannelName(name) (*(name) == '#' || \
- IsModelessChannel(name) || IsLocalChannel(name))
+ IsLocalChannel(name))
typedef enum ChannelGetType {
CGT_NO_CREATE,
struct Membership* next_channel;
struct Membership* prev_channel;
unsigned int status;
+ unsigned short oplevel;
};
+#define MAXOPLEVELDIGITS 3
+#define MAXOPLEVEL 999
+
#define IsZombie(x) ((x)->status & CHFL_ZOMBIE)
#define IsDeopped(x) ((x)->status & CHFL_DEOPPED)
#define IsBanned(x) ((x)->status & CHFL_BANNED)
#define IsBanValid(x) ((x)->status & CHFL_BANVALID)
#define IsChanOp(x) ((x)->status & CHFL_CHANOP)
+#define OpLevel(x) ((x)->oplevel)
#define HasVoice(x) ((x)->status & CHFL_VOICE)
#define IsServOpOk(x) ((x)->status & CHFL_SERVOPOK)
#define IsBurstJoined(x) ((x)->status & CHFL_BURST_JOINED)
#define IsVoicedOrOpped(x) ((x)->status & CHFL_VOICED_OR_OPPED)
+#define IsChannelManager(x) ((x)->status & CHFL_CHANNEL_MANAGER)
#define SetBanned(x) ((x)->status |= CHFL_BANNED)
#define SetBanValid(x) ((x)->status |= CHFL_BANVALID)
#define SetServOpOk(x) ((x)->status |= CHFL_SERVOPOK)
#define SetBurstJoined(x) ((x)->status |= CHFL_BURST_JOINED)
#define SetZombie(x) ((x)->status |= CHFL_ZOMBIE)
+#define SetChannelManager(x) ((x)->status |= CHFL_CHANNEL_MANAGER)
+#define SetOpLevel(x, v) (void)((x)->oplevel = (v))
#define ClearBanned(x) ((x)->status &= ~CHFL_BANNED)
#define ClearBanValid(x) ((x)->status &= ~CHFL_BANVALID)
unsigned int mode;
unsigned int limit;
char key[KEYLEN + 1];
+ char upass[PASSLEN + 1];
+ char apass[PASSLEN + 1];
};
struct Channel {
struct Channel* next;
struct Channel* prev;
struct Channel* hnext;
+ struct DestructEvent* destruct_event;
time_t creationtime;
time_t topic_time;
unsigned int users;
/* A mode w/args */
};
-#define MODEBUF_DEST_CHANNEL 0x0001 /* Mode is flushed to channel */
-#define MODEBUF_DEST_SERVER 0x0002 /* Mode is flushed to server */
+#define MODEBUF_DEST_CHANNEL 0x00001 /* Mode is flushed to channel */
+#define MODEBUF_DEST_SERVER 0x00002 /* Mode is flushed to server */
+
+#define MODEBUF_DEST_OPMODE 0x00100 /* Send server mode as OPMODE */
+#define MODEBUF_DEST_DEOP 0x00200 /* Deop the offender */
+#define MODEBUF_DEST_BOUNCE 0x00400 /* Bounce the modes */
+#define MODEBUF_DEST_LOG 0x00800 /* Log the mode changes to OPATH */
-#define MODEBUF_DEST_OPMODE 0x0100 /* Send server mode as OPMODE */
-#define MODEBUF_DEST_DEOP 0x0200 /* Deop the offender */
-#define MODEBUF_DEST_BOUNCE 0x0400 /* Bounce the modes */
-#define MODEBUF_DEST_LOG 0x0800 /* Log the mode changes to OPATH */
+#define MODEBUF_DEST_HACK2 0x02000 /* Send a HACK(2) notice, reverse */
+#define MODEBUF_DEST_HACK3 0x04000 /* Send a HACK(3) notice, TS == 0 */
+#define MODEBUF_DEST_HACK4 0x08000 /* Send a HACK(4) notice, TS == 0 */
-#define MODEBUF_DEST_HACK2 0x2000 /* Send a HACK(2) notice, reverse */
-#define MODEBUF_DEST_HACK3 0x4000 /* Send a HACK(3) notice, TS == 0 */
-#define MODEBUF_DEST_HACK4 0x8000 /* Send a HACK(4) notice, TS == 0 */
+#define MODEBUF_DEST_NOKEY 0x10000 /* Don't send the real key */
#define MB_TYPE(mb, i) ((mb)->mb_modeargs[(i)].mbm_type)
#define MB_UINT(mb, i) ((mb)->mb_modeargs[(i)].mbm_arg.mbma_uint)
*/
extern void clean_channelname(char* name);
extern void channel_modes(struct Client *cptr, char *mbuf, char *pbuf,
- struct Channel *chptr);
+ int buflen, struct Channel *chptr,
+ struct Membership *member);
extern int set_mode(struct Client* cptr, struct Client* sptr,
struct Channel* chptr, int parc, char* parv[],
char* mbuf, char* pbuf, char* npbuf, int* badop);
extern struct Membership* find_member_link(struct Channel * chptr,
const struct Client* cptr);
extern int sub1_from_channel(struct Channel* chptr);
+extern int destruct_channel(struct Channel* chptr);
extern int can_join(struct Client *sptr, struct Channel *chptr, char *key);
extern void add_user_to_channel(struct Channel* chptr, struct Client* who,
- unsigned int flags);
+ unsigned int flags, int oplevel);
extern void cancel_mode(struct Client *sptr, struct Channel *chptr, char m,
const char *param, int *count);
extern void add_token_to_sendbuf(char *token, size_t *sblenp, int *firstp,
extern int is_chan_op(struct Client *cptr, struct Channel *chptr);
extern int is_zombie(struct Client *cptr, struct Channel *chptr);
extern int has_voice(struct Client *cptr, struct Channel *chptr);
+extern int IsInvited(struct Client* cptr, struct Channel* chptr);
extern void send_channel_modes(struct Client *cptr, struct Channel *chptr);
extern char *pretty_mask(char *mask);
extern void del_invite(struct Client *cptr, struct Channel *chptr);
extern int mode_parse(struct ModeBuf *mbuf, struct Client *cptr,
struct Client *sptr, struct Channel *chptr,
- int parc, char *parv[], unsigned int flags);
+ int parc, char *parv[], unsigned int flags,
+ struct Membership* member);
#define MODE_PARSE_SET 0x01 /* actually set channel modes */
#define MODE_PARSE_STRICT 0x02 /* +m +n +t style not supported */
projects / ircu2.10.12-pk.git / blobdiff