ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/trunk/include/channel.h

Comparing:
ircd-hybrid-8/include/channel.h (file contents), Revision 1156 by michael, Tue Aug 9 20:29:20 2011 UTC vs.
ircd-hybrid/trunk/include/channel.h (file contents), Revision 2133 by michael, Wed May 29 18:27:24 2013 UTC

#	Line 29 | Line 29
29
30		#include "ircd_defs.h"        /* KEYLEN, CHANNELLEN */
31
32	+	/* channel visible */
33	+	#define ShowChannel(v,c)        (PubChannel(c) || IsMember((v),(c)))
34	+
35	+	#define IsMember(who, chan) ((find_channel_link(who, chan)) ? 1 : 0)
36	+	#define AddMemberFlag(x, y) ((x)->flags |=  (y))
37	+	#define DelMemberFlag(x, y) ((x)->flags &= ~(y))
38	+
39	+	#define FLOOD_NOTICED           1
40	+	#define JOIN_FLOOD_NOTICED      2
41	+
42	+	#define SetFloodNoticed(x)   ((x)->flags |= FLOOD_NOTICED)
43	+	#define IsSetFloodNoticed(x) ((x)->flags & FLOOD_NOTICED)
44	+	#define ClearFloodNoticed(x) ((x)->flags &= ~FLOOD_NOTICED)
45	+
46	+	#define SetJoinFloodNoticed(x)   ((x)->flags |= JOIN_FLOOD_NOTICED)
47	+	#define IsSetJoinFloodNoticed(x) ((x)->flags & JOIN_FLOOD_NOTICED)
48	+	#define ClearJoinFloodNoticed(x) ((x)->flags &= ~JOIN_FLOOD_NOTICED)
49	+
50		struct Client;
51
52		/*! \brief Mode structure for channels */
#	Line 36 | Line 54 | struct Mode
54		{
55		unsigned int mode;   /*!< simple modes */
56		unsigned int limit;  /*!< +l userlimit */
57	<	char key[KEYLEN];    /*!< +k key */
57	>	char key[KEYLEN + 1];    /*!< +k key */
58		};
59
60		/*! \brief Channel structure */
#	Line 47 | Line 65 | struct Channel
65		struct Channel *hnextch;
66		struct Mode mode;
67
68	<	char *topic;
69	<	char *topic_info;
68	>	char topic[TOPICLEN + 1];
69	>	char topic_info[USERHOST_REPLYLEN];
70
71		time_t channelts;
72		time_t topic_time;
#	Line 91 | Line 109 | struct Ban
109		time_t when;
110		struct irc_ssaddr addr;
111		int bits;
112	<	char type;
112	>	int type;
113		};
114
115		extern dlink_list global_channel_list;
116
117	<	extern int check_channel_name(const char *, int);
118	<	extern int can_send(struct Channel *, struct Client *, struct Membership *);
117	>	extern int check_channel_name(const char *, const int);
118	>	extern int can_send(struct Channel *, struct Client *, struct Membership *, const char *);
119		extern int is_banned(const struct Channel *, const struct Client *);
120		extern int can_join(struct Client *, struct Channel *, const char *);
121	<	extern int has_member_flags(struct Membership *, unsigned int);
121	>	extern int has_member_flags(const struct Membership *, const unsigned int);
122
123		extern void remove_ban(struct Ban *, dlink_list *);
124	<	extern void init_channels(void);
124	>	extern void channel_init(void);
125		extern void add_user_to_channel(struct Channel *, struct Client *,
126		unsigned int, int);
127		extern void remove_user_from_channel(struct Membership *);
#	Line 115 | Line 133 | extern void channel_modes(struct Channel
133		extern void check_spambot_warning(struct Client *, const char *);
134		extern void check_splitmode(void *);
135		extern void free_channel_list(dlink_list *);
118	–	extern void free_topic(struct Channel *);
136		extern void destroy_channel(struct Channel *);
137	<	extern void set_channel_topic(struct Channel *, const char *, const char *, time_t);
137	>	extern void set_channel_topic(struct Channel *, const char *, const char *, time_t, int);
138
139	<	extern const char *get_member_status(const struct Membership *, int);
139	>	extern const char *get_member_status(const struct Membership *, const int);
140
141		extern struct Channel *make_channel(const char *);
142		extern struct Membership *find_channel_link(struct Client *, struct Channel *);
126	–
127	–	/* channel visible */
128	–	#define ShowChannel(v,c)        (PubChannel(c) || IsMember((v),(c)))
129	–
130	–	#define IsMember(who, chan) ((find_channel_link(who, chan)) ? 1 : 0)
131	–	#define AddMemberFlag(x, y) ((x)->flags |=  (y))
132	–	#define DelMemberFlag(x, y) ((x)->flags &= ~(y))
133	–
134	–	#define FLOOD_NOTICED           1
135	–	#define JOIN_FLOOD_NOTICED      2
136	–
137	–	#define SetFloodNoticed(x)   ((x)->flags |= FLOOD_NOTICED)
138	–	#define IsSetFloodNoticed(x) ((x)->flags & FLOOD_NOTICED)
139	–	#define ClearFloodNoticed(x) ((x)->flags &= ~FLOOD_NOTICED)
140	–
141	–	#define SetJoinFloodNoticed(x)   ((x)->flags |= JOIN_FLOOD_NOTICED)
142	–	#define IsSetJoinFloodNoticed(x) ((x)->flags & JOIN_FLOOD_NOTICED)
143	–	#define ClearJoinFloodNoticed(x) ((x)->flags &= ~JOIN_FLOOD_NOTICED)
144	–
143		#endif  /* INCLUDED_channel_h */

Diff Legend

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