ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/channel_mode.c

Comparing ircd-hybrid/trunk/src/channel_mode.c (file contents):
Revision 3140 by michael, Wed Mar 12 19:23:20 2014 UTC vs.
Revision 4800 by michael, Tue Oct 28 13:59:43 2014 UTC

#	Line 15 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20		*/
21
#	Line 34 | Line 34
34		#include "irc_string.h"
35		#include "ircd.h"
36		#include "numeric.h"
37	<	#include "s_serv.h"
37	>	#include "server.h"
38		#include "send.h"
39		#include "memory.h"
40		#include "mempool.h"
#	Line 42 | Line 42
42
43		/* 10 is a magic number in hybrid 6 NFI where it comes from -db */
44		#define BAN_FUDGE       10
45	–	#define NCHCAPS         (sizeof(channel_capabs)/sizeof(int))
46	–	#define NCHCAP_COMBOS   (1 << NCHCAPS)
47	–
45
46		static char nuh_mask[MAXPARA][IRCD_BUFSIZE];
47		/* some buffers for rebuilding channel/nick lists with ,'s */
#	Line 56 | Line 53 | static unsigned int mode_limit;  /* numb
53		static unsigned int simple_modes_mask;  /* bit mask of simple modes already set */
54		extern mp_pool_t *ban_pool;
55
56	+	const struct mode_letter chan_modes[] =
57	+	{
58	+	{ MODE_NOCTRL,     'c' },
59	+	{ MODE_INVITEONLY, 'i' },
60	+	{ MODE_MODERATED,  'm' },
61	+	{ MODE_NOPRIVMSGS, 'n' },
62	+	{ MODE_PRIVATE,    'p' },
63	+	{ MODE_REGISTERED, 'r' },
64	+	{ MODE_SECRET,     's' },
65	+	{ MODE_TOPICLIMIT, 't' },
66	+	{ MODE_MODREG,     'M' },
67	+	{ MODE_OPERONLY,   'O' },
68	+	{ MODE_REGONLY,    'R' },
69	+	{ MODE_SSLONLY,    'S' },
70	+	{ 0, '\0' }
71	+	};
72	+
73
74		/* check_string()
75		*
#	Line 98 | Line 112 | int
112		add_id(struct Client *client_p, struct Channel *chptr, char *banid, unsigned int type)
113		{
114		dlink_list *list = NULL;
115	<	dlink_node *ban = NULL;
115	>	dlink_node *node = NULL;
116	>	struct Ban *banptr = NULL;
117		size_t len = 0;
118	<	struct Ban *ban_p = NULL;
119	<	unsigned int num_mask;
120	<	char name[NICKLEN + 1];
106	<	char user[USERLEN + 1];
107	<	char host[HOSTLEN + 1];
118	>	char name[NICKLEN + 1] = "";
119	>	char user[USERLEN + 1] = "";
120	>	char host[HOSTLEN + 1] = "";
121		struct split_nuh_item nuh;
122
123	<	/* dont let local clients overflow the b/e/I lists */
123	>	/* Don't let local clients overflow the b/e/I lists */
124		if (MyClient(client_p))
125		{
126	<	num_mask = dlink_list_length(&chptr->banlist) +
127	<	dlink_list_length(&chptr->exceptlist) +
128	<	dlink_list_length(&chptr->invexlist);
126	>	unsigned int num_mask = dlink_list_length(&chptr->banlist) +
127	>	dlink_list_length(&chptr->exceptlist) +
128	>	dlink_list_length(&chptr->invexlist);
129
130		if (num_mask >= ConfigChannel.max_bans)
131		{
132	<	sendto_one_numeric(client_p, &me, ERR_BANLISTFULL, chptr->chname, banid);
132	>	sendto_one_numeric(client_p, &me, ERR_BANLISTFULL, chptr->name, banid);
133		return 0;
134		}
135
#	Line 158 | Line 171 | add_id(struct Client *client_p, struct C
171		return 0;
172		}
173
174	<	DLINK_FOREACH(ban, list->head)
174	>	DLINK_FOREACH(node, list->head)
175		{
176	<	ban_p = ban->data;
176	>	banptr = node->data;
177
178	<	if (!irccmp(ban_p->name, name) &&
179	<	!irccmp(ban_p->user, user) &&
180	<	!irccmp(ban_p->host, host))
178	>	if (!irccmp(banptr->name, name) &&
179	>	!irccmp(banptr->user, user) &&
180	>	!irccmp(banptr->host, host))
181		return 0;
182		}
183
184	<	ban_p = mp_pool_get(ban_pool);
185	<	memset(ban_p, 0, sizeof(*ban_p));
186	<	ban_p->name = xstrdup(name);
187	<	ban_p->user = xstrdup(user);
188	<	ban_p->host = xstrdup(host);
189	<	ban_p->when = CurrentTime;
190	<	ban_p->len = len - 2;  /* -2 for @ and ! */
178	<	ban_p->type = parse_netmask(host, &ban_p->addr, &ban_p->bits);
184	>	banptr = mp_pool_get(ban_pool);
185	>	banptr->name = xstrdup(name);
186	>	banptr->user = xstrdup(user);
187	>	banptr->host = xstrdup(host);
188	>	banptr->when = CurrentTime;
189	>	banptr->len = len - 2;  /* -2 for ! + @ */
190	>	banptr->type = parse_netmask(host, &banptr->addr, &banptr->bits);
191
192		if (IsClient(client_p))
193		{
194	<	ban_p->who = MyMalloc(strlen(client_p->name) +
195	<	strlen(client_p->username) +
196	<	strlen(client_p->host) + 3);
197	<	sprintf(ban_p->who, "%s!%s@%s", client_p->name,
194	>	banptr->who = MyCalloc(strlen(client_p->name) +
195	>	strlen(client_p->username) +
196	>	strlen(client_p->host) + 3);
197	>	sprintf(banptr->who, "%s!%s@%s", client_p->name,
198		client_p->username, client_p->host);
199		}
200		else if (IsHidden(client_p) || (IsServer(client_p) && ConfigServerHide.hide_servers))
201	<	ban_p->who = xstrdup(me.name);
201	>	banptr->who = xstrdup(me.name);
202		else
203	<	ban_p->who = xstrdup(client_p->name);
203	>	banptr->who = xstrdup(client_p->name);
204
205	<	dlinkAdd(ban_p, &ban_p->node, list);
205	>	dlinkAdd(banptr, &banptr->node, list);
206
207		return 1;
208		}
#	Line 205 | Line 217 | add_id(struct Client *client_p, struct C
217		static int
218		del_id(struct Channel *chptr, char *banid, unsigned int type)
219		{
220	<	dlink_list *list;
221	<	dlink_node *ban;
222	<	struct Ban *banptr;
223	<	char name[NICKLEN + 1];
224	<	char user[USERLEN + 1];
213	<	char host[HOSTLEN + 1];
220	>	dlink_list *list = NULL;
221	>	dlink_node *node = NULL;
222	>	char name[NICKLEN + 1] = "";
223	>	char user[USERLEN + 1] = "";
224	>	char host[HOSTLEN + 1] = "";
225		struct split_nuh_item nuh;
226
227		assert(banid);
#	Line 250 | Line 261 | del_id(struct Channel *chptr, char *bani
261		return 0;
262		}
263
264	<	DLINK_FOREACH(ban, list->head)
264	>	DLINK_FOREACH(node, list->head)
265		{
266	<	banptr = ban->data;
266	>	struct Ban *banptr = node->data;
267
268		if (!irccmp(name, banptr->name) &&
269		!irccmp(user, banptr->user) &&
#	Line 266 | Line 277 | del_id(struct Channel *chptr, char *bani
277		return 0;
278		}
279
269	–	const struct mode_letter chan_modes[] =
270	–	{
271	–	{ MODE_NOCTRL,     'c' },
272	–	{ MODE_INVITEONLY, 'i' },
273	–	{ MODE_MODERATED,  'm' },
274	–	{ MODE_NOPRIVMSGS, 'n' },
275	–	{ MODE_PRIVATE,    'p' },
276	–	{ MODE_REGISTERED, 'r' },
277	–	{ MODE_SECRET,     's' },
278	–	{ MODE_TOPICLIMIT, 't' },
279	–	{ MODE_MODREG,     'M' },
280	–	{ MODE_OPERONLY,   'O' },
281	–	{ MODE_REGONLY,    'R' },
282	–	{ MODE_SSLONLY,    'S' },
283	–	{ 0, '\0' }
284	–	};
285	–
280		/* channel_modes()
281		*
282		* inputs       - pointer to channel
#	Line 294 | Line 288 | const struct mode_letter chan_modes[] =
288		* chptr onto buffer mbuf with the parameters in pbuf.
289		*/
290		void
291	<	channel_modes(struct Channel *chptr, struct Client *client_p,
298	<	char *mbuf, char *pbuf)
291	>	channel_modes(struct Channel *chptr, struct Client *client_p, char *mbuf, char *pbuf)
292		{
300	–	const struct mode_letter *tab = chan_modes;
301	–
293		*mbuf++ = '+';
294		*pbuf = '\0';
295
296	<	for (; tab->mode; ++tab)
296	>	for (const struct mode_letter *tab = chan_modes; tab->mode; ++tab)
297		if (chptr->mode.mode & tab->mode)
298		*mbuf++ = tab->letter;
299
#	Line 338 | Line 329 | fix_key(char *arg)
329		{
330		unsigned char *s, *t, c;
331
332	<	for (s = t = (unsigned char *)arg; (c = *s); s++)
332	>	for (s = t = (unsigned char *)arg; (c = *s); ++s)
333		{
334		c &= 0x7f;
335
#	Line 350 | Line 341 | fix_key(char *arg)
341		return arg;
342		}
343
344	<	/* fix_key_old()
345	<	*
346	<	* inputs       - pointer to key to clean up
347	<	* output       - pointer to cleaned up key
357	<	* side effects - input string is modifed
358	<	*
359	<	* Here we attempt to be compatible with older non-hybrid servers.
360	<	* We can't back down from the ':' issue however.  --Rodder
344	>	/*
345	>	* inputs       - pointer to channel
346	>	* output       - none
347	>	* side effects - clear ban cache
348		*/
349	<	static char *
350	<	fix_key_old(char *arg)
349	>	void
350	>	clear_ban_cache(struct Channel *chptr)
351		{
352	<	unsigned char *s, *t, c;
352	>	dlink_node *node = NULL;
353
354	<	for (s = t = (unsigned char *)arg; (c = *s); s++)
354	>	DLINK_FOREACH(node, chptr->locmembers.head)
355		{
356	<	c &= 0x7f;
357	<
371	<	if ((c != 0x0a) && (c != ':') &&
372	<	(c != 0x0d) && (c != ','))
373	<	*t++ = c;
356	>	struct Membership *ms = node->data;
357	>	ms->flags &= ~(CHFL_BAN_SILENCED|CHFL_BAN_CHECKED);
358		}
359	+	}
360
361	<	*t = '\0';
362	<	return arg;
361	>	void
362	>	clear_ban_cache_client(struct Client *client_p)
363	>	{
364	>	dlink_node *node = NULL;
365	>
366	>	DLINK_FOREACH(node, client_p->channel.head)
367	>	{
368	>	struct Membership *ms = node->data;
369	>	ms->flags &= ~(CHFL_BAN_SILENCED|CHFL_BAN_CHECKED);
370	>	}
371		}
372
373	<	/* bitmasks for various error returns that set_channel_mode should only return
373	>	/*
374	>	* Bitmasks for various error returns that set_channel_mode should only return
375		* once per call  -orabidoo
376		*/
377	<
378	<	#define SM_ERR_NOTS         0x00000001 /* No TS on channel  */
379	<	#define SM_ERR_NOOPS        0x00000002 /* No chan ops       */
380	<	#define SM_ERR_UNKNOWN      0x00000004
381	<	#define SM_ERR_RPL_B        0x00000008
382	<	#define SM_ERR_RPL_E        0x00000010
383	<	#define SM_ERR_NOTONCHANNEL 0x00000020 /* Not on channel    */
384	<	#define SM_ERR_RPL_I        0x00000040
385	<	#define SM_ERR_NOTOPER      0x00000080
386	<	#define SM_ERR_ONLYSERVER   0x00000100
377	>	enum
378	>	{
379	>	SM_ERR_NOOPS        = 1 << 0,  /* No chan ops */
380	>	SM_ERR_UNKNOWN      = 1 << 1,
381	>	SM_ERR_RPL_B        = 1 << 2,
382	>	SM_ERR_RPL_E        = 1 << 3,
383	>	SM_ERR_RPL_I        = 1 << 4,
384	>	SM_ERR_NOTONCHANNEL = 1 << 5,  /* Client is not on channel */
385	>	SM_ERR_NOTOPER      = 1 << 6,
386	>	SM_ERR_ONLYSERVER   = 1 << 7
387	>	};
388
389		/* Mode functions handle mode changes for a particular mode... */
390		static void
391	<	chm_nosuch(struct Client *client_p, struct Client *source_p,
397	<	struct Channel *chptr, int parc, int *parn,
391	>	chm_nosuch(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
392		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
393		{
394		if (*errors & SM_ERR_UNKNOWN)
#	Line 405 | Line 399 | chm_nosuch(struct Client *client_p, stru
399		}
400
401		static void
402	<	chm_simple(struct Client *client_p, struct Client *source_p, struct Channel *chptr,
403	<	int parc, int *parn, char **parv, int *errors, int alev, int dir,
410	<	char c, unsigned int d)
402	>	chm_simple(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
403	>	char **parv, int *errors, int alev, int dir, char c, unsigned int d)
404		{
405	<	if ((alev < CHACCESS_HALFOP) ||
413	<	((d == MODE_PRIVATE) && (alev < CHACCESS_CHANOP)))
405	>	if (alev < CHACCESS_HALFOP)
406		{
407		if (!(*errors & SM_ERR_NOOPS))
408		sendto_one_numeric(source_p, &me,
409		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
410	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
410	>	ERR_CHANOPRIVSNEEDED, chptr->name);
411		*errors |= SM_ERR_NOOPS;
412		return;
413		}
#	Line 439 | Line 431 | chm_simple(struct Client *client_p, stru
431		chptr->mode.mode |= d;
432
433		mode_changes[mode_count].letter = c;
434	<	mode_changes[mode_count].dir = MODE_ADD;
434	>	mode_changes[mode_count].arg = NULL;
435		mode_changes[mode_count].id = NULL;
436	<	mode_changes[mode_count].mems = ALL_MEMBERS;
445	<	mode_changes[mode_count++].arg = NULL;
436	>	mode_changes[mode_count++].dir = dir;
437		}
438		else if (dir == MODE_DEL) /* && (chptr->mode.mode & d)) */
439		{
#	Line 451 | Line 442 | chm_simple(struct Client *client_p, stru
442		chptr->mode.mode &= ~d;
443
444		mode_changes[mode_count].letter = c;
445	<	mode_changes[mode_count].dir = MODE_DEL;
455	<	mode_changes[mode_count].mems = ALL_MEMBERS;
445	>	mode_changes[mode_count].arg = NULL;
446		mode_changes[mode_count].id = NULL;
447	<	mode_changes[mode_count++].arg = NULL;
447	>	mode_changes[mode_count++].dir = dir;
448		}
449		}
450
451		static void
452	<	chm_registered(struct Client *client_p, struct Client *source_p, struct Channel *chptr,
453	<	int parc, int *parn, char **parv, int *errors, int alev, int dir,
464	<	char c, unsigned int d)
452	>	chm_registered(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
453	>	char **parv, int *errors, int alev, int dir, char c, unsigned int d)
454		{
455		if (!IsServer(source_p) && !HasFlag(source_p, FLAGS_SERVICE))
456		{
457		if (!(*errors & SM_ERR_ONLYSERVER))
458		sendto_one_numeric(source_p, &me,
459		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
460	<	ERR_ONLYSERVERSCANCHANGE, chptr->chname);
460	>	ERR_ONLYSERVERSCANCHANGE, chptr->name);
461		*errors |= SM_ERR_ONLYSERVER;
462		return;
463		}
#	Line 492 | Line 481 | chm_registered(struct Client *client_p,
481		chptr->mode.mode |= d;
482
483		mode_changes[mode_count].letter = c;
484	<	mode_changes[mode_count].dir = MODE_ADD;
484	>	mode_changes[mode_count].arg = NULL;
485		mode_changes[mode_count].id = NULL;
486	<	mode_changes[mode_count].mems = ALL_MEMBERS;
498	<	mode_changes[mode_count++].arg = NULL;
486	>	mode_changes[mode_count++].dir = dir;
487		}
488		else if (dir == MODE_DEL) /* && (chptr->mode.mode & d)) */
489		{
#	Line 504 | Line 492 | chm_registered(struct Client *client_p,
492		chptr->mode.mode &= ~d;
493
494		mode_changes[mode_count].letter = c;
495	<	mode_changes[mode_count].dir = MODE_DEL;
508	<	mode_changes[mode_count].mems = ALL_MEMBERS;
495	>	mode_changes[mode_count].arg = NULL;
496		mode_changes[mode_count].id = NULL;
497	<	mode_changes[mode_count++].arg = NULL;
497	>	mode_changes[mode_count++].dir = dir;
498		}
499		}
500
501		static void
502	<	chm_operonly(struct Client *client_p, struct Client *source_p, struct Channel *chptr,
503	<	int parc, int *parn, char **parv, int *errors, int alev, int dir,
517	<	char c, unsigned int d)
502	>	chm_operonly(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
503	>	char **parv, int *errors, int alev, int dir, char c, unsigned int d)
504		{
505	<	if ((alev < CHACCESS_HALFOP) ||
520	<	((d == MODE_PRIVATE) && (alev < CHACCESS_CHANOP)))
505	>	if (alev < CHACCESS_CHANOP)
506		{
507		if (!(*errors & SM_ERR_NOOPS))
508		sendto_one_numeric(source_p, &me,
509		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
510	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
510	>	ERR_CHANOPRIVSNEEDED, chptr->name);
511	>
512		*errors |= SM_ERR_NOOPS;
513		return;
514		}
515	<	else if (MyClient(source_p) && !HasUMode(source_p, UMODE_OPER))
515	>
516	>	if (MyClient(source_p) && !HasUMode(source_p, UMODE_OPER))
517		{
518		if (!(*errors & SM_ERR_NOTOPER))
519	<	{
533	<	if (alev == CHACCESS_NOTONCHAN)
534	<	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->chname);
535	<	else
536	<	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
537	<	}
519	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
520
521		*errors |= SM_ERR_NOTOPER;
522		return;
#	Line 551 | Line 533 | chm_operonly(struct Client *client_p, st
533		chptr->mode.mode |= d;
534
535		mode_changes[mode_count].letter = c;
536	<	mode_changes[mode_count].dir = MODE_ADD;
536	>	mode_changes[mode_count].arg = NULL;
537		mode_changes[mode_count].id = NULL;
538	<	mode_changes[mode_count].mems = ALL_MEMBERS;
557	<	mode_changes[mode_count].mems = ALL_MEMBERS;
558	<	mode_changes[mode_count++].arg = NULL;
538	>	mode_changes[mode_count++].dir = dir;
539		}
540		else if (dir == MODE_DEL) /* && (chptr->mode.mode & d)) */
541		{
#	Line 564 | Line 544 | chm_operonly(struct Client *client_p, st
544		chptr->mode.mode &= ~d;
545
546		mode_changes[mode_count].letter = c;
547	<	mode_changes[mode_count].dir = MODE_DEL;
568	<	mode_changes[mode_count].mems = ALL_MEMBERS;
547	>	mode_changes[mode_count].arg = NULL;
548		mode_changes[mode_count].id = NULL;
549	<	mode_changes[mode_count++].arg = NULL;
549	>	mode_changes[mode_count++].dir = dir;
550		}
551		}
552
553		static void
554	<	chm_ban(struct Client *client_p, struct Client *source_p,
576	<	struct Channel *chptr, int parc, int *parn,
554	>	chm_ban(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
555		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
556		{
557		char *mask = NULL;
558
559		if (dir == MODE_QUERY || parc <= *parn)
560		{
561	<	dlink_node *ptr = NULL;
561	>	dlink_node *node = NULL;
562
563		if (*errors & SM_ERR_RPL_B)
564		return;
565
566		*errors |= SM_ERR_RPL_B;
567
568	<	DLINK_FOREACH(ptr, chptr->banlist.head)
568	>	DLINK_FOREACH(node, chptr->banlist.head)
569		{
570	<	const struct Ban *banptr = ptr->data;
571	<	sendto_one_numeric(source_p, &me, RPL_BANLIST, chptr->chname,
570	>	const struct Ban *banptr = node->data;
571	>	sendto_one_numeric(source_p, &me, RPL_BANLIST, chptr->name,
572		banptr->name, banptr->user, banptr->host,
573		banptr->who, banptr->when);
574		}
575
576	<	sendto_one_numeric(source_p, &me, RPL_ENDOFBANLIST, chptr->chname);
576	>	sendto_one_numeric(source_p, &me, RPL_ENDOFBANLIST, chptr->name);
577		return;
578		}
579
#	Line 604 | Line 582 | chm_ban(struct Client *client_p, struct
582		if (!(*errors & SM_ERR_NOOPS))
583		sendto_one_numeric(source_p, &me,
584		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
585	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
585	>	ERR_CHANOPRIVSNEEDED, chptr->name);
586		*errors |= SM_ERR_NOOPS;
587		return;
588		}
#	Line 614 | Line 592 | chm_ban(struct Client *client_p, struct
592
593		mask = nuh_mask[*parn];
594		memcpy(mask, parv[*parn], sizeof(nuh_mask[*parn]));
595	<	++*parn;
595	>	++(*parn);
596
597	<	if (IsServer(client_p))
597	>	if (!MyConnect(source_p))
598		if (strchr(mask, ' '))
599		return;
600
#	Line 635 | Line 613 | chm_ban(struct Client *client_p, struct
613		}
614
615		mode_changes[mode_count].letter = c;
616	<	mode_changes[mode_count].dir = dir;
639	<	mode_changes[mode_count].mems = ALL_MEMBERS;
616	>	mode_changes[mode_count].arg = mask;
617		mode_changes[mode_count].id = NULL;
618	<	mode_changes[mode_count++].arg = mask;
618	>	mode_changes[mode_count++].dir = dir;
619		}
620
621		static void
622	<	chm_except(struct Client *client_p, struct Client *source_p,
646	<	struct Channel *chptr, int parc, int *parn,
622	>	chm_except(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
623		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
624		{
625		char *mask = NULL;
626
651	–	if (alev < CHACCESS_HALFOP)
652	–	{
653	–	if (!(*errors & SM_ERR_NOOPS))
654	–	sendto_one_numeric(source_p, &me,
655	–	alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
656	–	ERR_CHANOPRIVSNEEDED, chptr->chname);
657	–	*errors |= SM_ERR_NOOPS;
658	–	return;
659	–	}
660	–
627		if (dir == MODE_QUERY || parc <= *parn)
628		{
629	<	dlink_node *ptr = NULL;
629	>	dlink_node *node = NULL;
630
631		if (*errors & SM_ERR_RPL_E)
632		return;
633
634		*errors |= SM_ERR_RPL_E;
635
636	<	DLINK_FOREACH(ptr, chptr->exceptlist.head)
636	>	DLINK_FOREACH(node, chptr->exceptlist.head)
637		{
638	<	const struct Ban *banptr = ptr->data;
638	>	const struct Ban *banptr = node->data;
639
640	<	sendto_one_numeric(source_p, &me, RPL_EXCEPTLIST, chptr->chname,
640	>	sendto_one_numeric(source_p, &me, RPL_EXCEPTLIST, chptr->name,
641		banptr->name, banptr->user, banptr->host,
642		banptr->who, banptr->when);
643		}
644
645	<	sendto_one_numeric(source_p, &me, RPL_ENDOFEXCEPTLIST, chptr->chname);
645	>	sendto_one_numeric(source_p, &me, RPL_ENDOFEXCEPTLIST, chptr->name);
646	>	return;
647	>	}
648	>
649	>	if (alev < CHACCESS_HALFOP)
650	>	{
651	>	if (!(*errors & SM_ERR_NOOPS))
652	>	sendto_one_numeric(source_p, &me,
653	>	alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
654	>	ERR_CHANOPRIVSNEEDED, chptr->name);
655	>	*errors |= SM_ERR_NOOPS;
656		return;
657		}
658
#	Line 685 | Line 661 | chm_except(struct Client *client_p, stru
661
662		mask = nuh_mask[*parn];
663		memcpy(mask, parv[*parn], sizeof(nuh_mask[*parn]));
664	<	++*parn;
664	>	++(*parn);
665
666	<	if (IsServer(client_p))
666	>	if (!MyConnect(source_p))
667		if (strchr(mask, ' '))
668		return;
669
#	Line 706 | Line 682 | chm_except(struct Client *client_p, stru
682		}
683
684		mode_changes[mode_count].letter = c;
685	<	mode_changes[mode_count].dir = dir;
710	<	mode_changes[mode_count].mems = ONLY_CHANOPS;
685	>	mode_changes[mode_count].arg = mask;
686		mode_changes[mode_count].id = NULL;
687	<	mode_changes[mode_count++].arg = mask;
687	>	mode_changes[mode_count++].dir = dir;
688		}
689
690		static void
691	<	chm_invex(struct Client *client_p, struct Client *source_p,
717	<	struct Channel *chptr, int parc, int *parn,
691	>	chm_invex(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
692		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
693		{
694		char *mask = NULL;
695
722	–	if (alev < CHACCESS_HALFOP)
723	–	{
724	–	if (!(*errors & SM_ERR_NOOPS))
725	–	sendto_one_numeric(source_p, &me,
726	–	alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
727	–	ERR_CHANOPRIVSNEEDED, chptr->chname);
728	–	*errors |= SM_ERR_NOOPS;
729	–	return;
730	–	}
731	–
696		if (dir == MODE_QUERY || parc <= *parn)
697		{
698	<	dlink_node *ptr = NULL;
698	>	dlink_node *node = NULL;
699
700		if (*errors & SM_ERR_RPL_I)
701		return;
702
703		*errors |= SM_ERR_RPL_I;
704
705	<	DLINK_FOREACH(ptr, chptr->invexlist.head)
705	>	DLINK_FOREACH(node, chptr->invexlist.head)
706		{
707	<	const struct Ban *banptr = ptr->data;
707	>	const struct Ban *banptr = node->data;
708
709	<	sendto_one_numeric(source_p, &me, RPL_INVITELIST, chptr->chname,
709	>	sendto_one_numeric(source_p, &me, RPL_INVEXLIST, chptr->name,
710		banptr->name, banptr->user, banptr->host,
711		banptr->who, banptr->when);
712		}
713
714	<	sendto_one_numeric(source_p, &me, RPL_ENDOFINVITELIST, chptr->chname);
714	>	sendto_one_numeric(source_p, &me, RPL_ENDOFINVEXLIST, chptr->name);
715	>	return;
716	>	}
717	>
718	>	if (alev < CHACCESS_HALFOP)
719	>	{
720	>	if (!(*errors & SM_ERR_NOOPS))
721	>	sendto_one_numeric(source_p, &me,
722	>	alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
723	>	ERR_CHANOPRIVSNEEDED, chptr->name);
724	>	*errors |= SM_ERR_NOOPS;
725		return;
726		}
727
#	Line 756 | Line 730 | chm_invex(struct Client *client_p, struc
730
731		mask = nuh_mask[*parn];
732		memcpy(mask, parv[*parn], sizeof(nuh_mask[*parn]));
733	<	++*parn;
733	>	++(*parn);
734
735	<	if (IsServer(client_p))
735	>	if (!MyConnect(source_p))
736		if (strchr(mask, ' '))
737		return;
738
#	Line 777 | Line 751 | chm_invex(struct Client *client_p, struc
751		}
752
753		mode_changes[mode_count].letter = c;
754	<	mode_changes[mode_count].dir = dir;
781	<	mode_changes[mode_count].mems = ONLY_CHANOPS;
754	>	mode_changes[mode_count].arg = mask;
755		mode_changes[mode_count].id = NULL;
756	<	mode_changes[mode_count++].arg = mask;
784	<	}
785	<
786	<	/*
787	<	* inputs       - pointer to channel
788	<	* output       - none
789	<	* side effects - clear ban cache
790	<	*/
791	<	void
792	<	clear_ban_cache(struct Channel *chptr)
793	<	{
794	<	dlink_node *ptr = NULL;
795	<
796	<	DLINK_FOREACH(ptr, chptr->members.head)
797	<	{
798	<	struct Membership *ms = ptr->data;
799	<
800	<	if (MyConnect(ms->client_p))
801	<	ms->flags &= ~(CHFL_BAN_SILENCED|CHFL_BAN_CHECKED);
802	<	}
803	<	}
804	<
805	<	void
806	<	clear_ban_cache_client(struct Client *client_p)
807	<	{
808	<	dlink_node *ptr = NULL;
809	<
810	<	DLINK_FOREACH(ptr, client_p->channel.head)
811	<	{
812	<	struct Membership *ms = ptr->data;
813	<	ms->flags &= ~(CHFL_BAN_SILENCED|CHFL_BAN_CHECKED);
814	<	}
756	>	mode_changes[mode_count++].dir = dir;
757		}
758
759		static void
760	<	chm_voice(struct Client *client_p, struct Client *source_p,
819	<	struct Channel *chptr, int parc, int *parn,
760	>	chm_voice(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
761		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
762		{
763	<	const char *opnick = NULL;
823	<	struct Client *targ_p;
763	>	struct Client *target_p;
764		struct Membership *member;
765
766		if (alev < CHACCESS_HALFOP)
#	Line 828 | Line 768 | chm_voice(struct Client *client_p, struc
768		if (!(*errors & SM_ERR_NOOPS))
769		sendto_one_numeric(source_p, &me,
770		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
771	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
771	>	ERR_CHANOPRIVSNEEDED, chptr->name);
772		*errors |= SM_ERR_NOOPS;
773		return;
774		}
775
776	<	if ((dir == MODE_QUERY) || parc <= *parn)
776	>	if (dir == MODE_QUERY || parc <= *parn)
777		return;
778
779	<	opnick = parv[(*parn)++];
779	>	if ((target_p = find_chasing(source_p, parv[(*parn)++])) == NULL)
780	>	return;  /* find_chasing sends ERR_NOSUCHNICK */
781
782	<	if ((targ_p = find_chasing(source_p, opnick, NULL)) == NULL)
842	<	return;
843	<	if (!IsClient(targ_p))
844	<	return;
845	<
846	<	if ((member = find_channel_link(targ_p, chptr)) == NULL)
782	>	if ((member = find_channel_link(target_p, chptr)) == NULL)
783		{
784		if (!(*errors & SM_ERR_NOTONCHANNEL))
785	<	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, opnick, chptr->chname);
785	>	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, target_p->name, chptr->name);
786		*errors |= SM_ERR_NOTONCHANNEL;
787		return;
788		}
#	Line 860 | Line 796 | chm_voice(struct Client *client_p, struc
796		if (dir == MODE_DEL && !has_member_flags(member, CHFL_VOICE))
797		return;
798
799	<	mode_changes[mode_count].letter = 'v';
800	<	mode_changes[mode_count].dir = dir;
801	<	mode_changes[mode_count].mems = ALL_MEMBERS;
802	<	mode_changes[mode_count].id = targ_p->id;
867	<	mode_changes[mode_count].arg = targ_p->name;
868	<	mode_changes[mode_count++].client = targ_p;
799	>	mode_changes[mode_count].letter = c;
800	>	mode_changes[mode_count].arg = target_p->name;
801	>	mode_changes[mode_count].id = target_p->id;
802	>	mode_changes[mode_count++].dir = dir;
803
804		if (dir == MODE_ADD)
805		AddMemberFlag(member, CHFL_VOICE);
#	Line 873 | Line 807 | chm_voice(struct Client *client_p, struc
807		DelMemberFlag(member, CHFL_VOICE);
808		}
809
876	–	#ifdef HALFOPS
810		static void
811	<	chm_hop(struct Client *client_p, struct Client *source_p,
812	<	struct Channel *chptr, int parc, int *parn,
880	<	char **parv, int *errors, int alev, int dir, char c, unsigned int d)
811	>	chm_hop(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
812	>	char **parv, int *errors, int alev, int dir, char c, unsigned int d)
813		{
814	<	const char *opnick = NULL;
883	<	struct Client *targ_p;
814	>	struct Client *target_p;
815		struct Membership *member;
816
817	<	/* *sigh* - dont allow halfops to set +/-h, they could fully control a
887	<	* channel if there were no ops - it doesnt solve anything.. MODE_PRIVATE
888	<	* when used with MODE_SECRET is paranoid - cant use +p
889	<	*
890	<	* it needs to be optional per channel - but not via +p, that or remove
891	<	* paranoid.. -- fl_
892	<	*
893	<	* +p means paranoid, it is useless for anything else on modern IRC, as
894	<	* list isn't really usable. If you want to have a private channel these
895	<	* days, you set it +s. Halfops can no longer remove simple modes when
896	<	* +p is set (although they can set +p) so it is safe to use this to
897	<	* control whether they can (de)halfop...
898	<	*/
899	<	if (alev <
900	<	((chptr->mode.mode & MODE_PRIVATE) ? CHACCESS_CHANOP : CHACCESS_HALFOP))
817	>	if (alev < CHACCESS_CHANOP)
818		{
819		if (!(*errors & SM_ERR_NOOPS))
820		sendto_one_numeric(source_p, &me,
821		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
822	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
822	>	ERR_CHANOPRIVSNEEDED, chptr->name);
823		*errors |= SM_ERR_NOOPS;
824		return;
825		}
826
827	<	if ((dir == MODE_QUERY) || (parc <= *parn))
827	>	if (dir == MODE_QUERY || parc <= *parn)
828		return;
829
830	<	opnick = parv[(*parn)++];
831	<
915	<	if ((targ_p = find_chasing(source_p, opnick, NULL)) == NULL)
916	<	return;
917	<	if (!IsClient(targ_p))
918	<	return;
830	>	if ((target_p = find_chasing(source_p, parv[(*parn)++])) == NULL)
831	>	return;  /* find_chasing sends ERR_NOSUCHNICK */
832
833	<	if ((member = find_channel_link(targ_p, chptr)) == NULL)
833	>	if ((member = find_channel_link(target_p, chptr)) == NULL)
834		{
835		if (!(*errors & SM_ERR_NOTONCHANNEL))
836	<	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, opnick, chptr->chname);
836	>	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, target_p->name, chptr->name);
837		*errors |= SM_ERR_NOTONCHANNEL;
838		return;
839		}
#	Line 934 | Line 847 | chm_hop(struct Client *client_p, struct
847		if (dir == MODE_DEL && !has_member_flags(member, CHFL_HALFOP))
848		return;
849
850	<	mode_changes[mode_count].letter = 'h';
851	<	mode_changes[mode_count].dir = dir;
852	<	mode_changes[mode_count].mems = ALL_MEMBERS;
853	<	mode_changes[mode_count].id = targ_p->id;
941	<	mode_changes[mode_count].arg = targ_p->name;
942	<	mode_changes[mode_count++].client = targ_p;
850	>	mode_changes[mode_count].letter = c;
851	>	mode_changes[mode_count].arg = target_p->name;
852	>	mode_changes[mode_count].id = target_p->id;
853	>	mode_changes[mode_count++].dir = dir;
854
855		if (dir == MODE_ADD)
945	–	{
856		AddMemberFlag(member, CHFL_HALFOP);
947	–	DelMemberFlag(member, CHFL_DEOPPED);
948	–	}
857		else
858		DelMemberFlag(member, CHFL_HALFOP);
859		}
952	–	#endif
860
861		static void
862	<	chm_op(struct Client *client_p, struct Client *source_p,
956	<	struct Channel *chptr, int parc, int *parn,
862	>	chm_op(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
863		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
864		{
865	<	const char *opnick = NULL;
960	<	struct Client *targ_p;
865	>	struct Client *target_p;
866		struct Membership *member;
962	–	int caps = 0;
867
868		if (alev < CHACCESS_CHANOP)
869		{
870		if (!(*errors & SM_ERR_NOOPS))
871		sendto_one_numeric(source_p, &me,
872		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
873	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
873	>	ERR_CHANOPRIVSNEEDED, chptr->name);
874		*errors |= SM_ERR_NOOPS;
875		return;
876		}
877
878	<	if ((dir == MODE_QUERY) || (parc <= *parn))
878	>	if (dir == MODE_QUERY || parc <= *parn)
879		return;
880
881	<	opnick = parv[(*parn)++];
881	>	if ((target_p = find_chasing(source_p, parv[(*parn)++])) == NULL)
882	>	return;  /* find_chasing sends ERR_NOSUCHNICK */
883
884	<	if ((targ_p = find_chasing(source_p, opnick, NULL)) == NULL)
980	<	return;
981	<	if (!IsClient(targ_p))
982	<	return;
983	<
984	<	if ((member = find_channel_link(targ_p, chptr)) == NULL)
884	>	if ((member = find_channel_link(target_p, chptr)) == NULL)
885		{
886		if (!(*errors & SM_ERR_NOTONCHANNEL))
887	<	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, opnick, chptr->chname);
887	>	sendto_one_numeric(source_p, &me, ERR_USERNOTINCHANNEL, target_p->name, chptr->name);
888		*errors |= SM_ERR_NOTONCHANNEL;
889		return;
890		}
#	Line 998 | Line 898 | chm_op(struct Client *client_p, struct C
898		if (dir == MODE_DEL && !has_member_flags(member, CHFL_CHANOP))
899		return;
900
901	<	mode_changes[mode_count].letter = 'o';
902	<	mode_changes[mode_count].dir = dir;
903	<	mode_changes[mode_count].mems = ALL_MEMBERS;
904	<	mode_changes[mode_count].id = targ_p->id;
1005	<	mode_changes[mode_count].arg = targ_p->name;
1006	<	mode_changes[mode_count++].client = targ_p;
901	>	mode_changes[mode_count].letter = c;
902	>	mode_changes[mode_count].arg = target_p->name;
903	>	mode_changes[mode_count].id = target_p->id;
904	>	mode_changes[mode_count++].dir = dir;
905
906		if (dir == MODE_ADD)
1009	–	{
907		AddMemberFlag(member, CHFL_CHANOP);
1011	–	DelMemberFlag(member, CHFL_DEOPPED);
1012	–	}
908		else
909		DelMemberFlag(member, CHFL_CHANOP);
910		}
911
912		static void
913	<	chm_limit(struct Client *client_p, struct Client *source_p,
1019	<	struct Channel *chptr, int parc, int *parn,
913	>	chm_limit(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
914		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
915		{
916	<	unsigned int i;
1023	<	int limit;
1024	<	char *lstr;
916	>	int limit = 0;
917
918		if (alev < CHACCESS_HALFOP)
919		{
920		if (!(*errors & SM_ERR_NOOPS))
921		sendto_one_numeric(source_p, &me,
922		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
923	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
923	>	ERR_CHANOPRIVSNEEDED, chptr->name);
924		*errors |= SM_ERR_NOOPS;
925		return;
926		}
#	Line 1036 | Line 928 | chm_limit(struct Client *client_p, struc
928		if (dir == MODE_QUERY)
929		return;
930
931	<	if ((dir == MODE_ADD) && parc > *parn)
931	>	if (dir == MODE_ADD && parc > *parn)
932		{
933	<	lstr = parv[(*parn)++];
933	>	char *lstr = parv[(*parn)++];
934
935	<	if ((limit = atoi(lstr)) <= 0)
935	>	if (EmptyString(lstr) || (limit = atoi(lstr)) <= 0)
936		return;
937
938		sprintf(lstr, "%d", limit);
939
940	<	/* if somebody sets MODE #channel +ll 1 2, accept latter --fl */
941	<	for (i = 0; i < mode_count; i++)
940	>	/* If somebody sets MODE #channel +ll 1 2, accept latter --fl */
941	>	for (unsigned int i = 0; i < mode_count; ++i)
942		if (mode_changes[i].letter == c && mode_changes[i].dir == MODE_ADD)
943		mode_changes[i].letter = 0;
944
945		mode_changes[mode_count].letter = c;
946	<	mode_changes[mode_count].dir = MODE_ADD;
1055	<	mode_changes[mode_count].mems = ALL_MEMBERS;
946	>	mode_changes[mode_count].arg = lstr;
947		mode_changes[mode_count].id = NULL;
948	<	mode_changes[mode_count++].arg = lstr;
948	>	mode_changes[mode_count++].dir = dir;
949
950		chptr->mode.limit = limit;
951		}
#	Line 1066 | Line 957 | chm_limit(struct Client *client_p, struc
957		chptr->mode.limit = 0;
958
959		mode_changes[mode_count].letter = c;
960	<	mode_changes[mode_count].dir = MODE_DEL;
1070	<	mode_changes[mode_count].mems = ALL_MEMBERS;
960	>	mode_changes[mode_count].arg = NULL;
961		mode_changes[mode_count].id = NULL;
962	<	mode_changes[mode_count++].arg = NULL;
962	>	mode_changes[mode_count++].dir = dir;
963		}
964		}
965
966		static void
967	<	chm_key(struct Client *client_p, struct Client *source_p,
1078	<	struct Channel *chptr, int parc, int *parn,
967	>	chm_key(struct Client *source_p, struct Channel *chptr, int parc, int *parn,
968		char **parv, int *errors, int alev, int dir, char c, unsigned int d)
969		{
1081	–	unsigned int i;
1082	–	char *key;
1083	–
970		if (alev < CHACCESS_HALFOP)
971		{
972		if (!(*errors & SM_ERR_NOOPS))
973		sendto_one_numeric(source_p, &me,
974		alev == CHACCESS_NOTONCHAN ? ERR_NOTONCHANNEL :
975	<	ERR_CHANOPRIVSNEEDED, chptr->chname);
975	>	ERR_CHANOPRIVSNEEDED, chptr->name);
976		*errors |= SM_ERR_NOOPS;
977		return;
978		}
#	Line 1094 | Line 980 | chm_key(struct Client *client_p, struct
980		if (dir == MODE_QUERY)
981		return;
982
983	<	if ((dir == MODE_ADD) && parc > *parn)
983	>	if (dir == MODE_ADD && parc > *parn)
984		{
985	<	key = parv[(*parn)++];
985	>	char *key = fix_key(parv[(*parn)++]);
986
987	<	if (MyClient(source_p))
1102	<	fix_key(key);
1103	<	else
1104	<	fix_key_old(key);
1105	<
1106	<	if (*key == '\0')
987	>	if (EmptyString(key))
988		return;
989
990		assert(key[0] != ' ');
991		strlcpy(chptr->mode.key, key, sizeof(chptr->mode.key));
992
993	<	/* if somebody does MODE #channel +kk a b, accept latter --fl */
994	<	for (i = 0; i < mode_count; i++)
993	>	/* If somebody does MODE #channel +kk a b, accept latter --fl */
994	>	for (unsigned int i = 0; i < mode_count; ++i)
995		if (mode_changes[i].letter == c && mode_changes[i].dir == MODE_ADD)
996		mode_changes[i].letter = 0;
997
998		mode_changes[mode_count].letter = c;
999	<	mode_changes[mode_count].dir = MODE_ADD;
1119	<	mode_changes[mode_count].mems = ALL_MEMBERS;
999	>	mode_changes[mode_count].arg = chptr->mode.key;
1000		mode_changes[mode_count].id = NULL;
1001	<	mode_changes[mode_count++].arg = chptr->mode.key;
1001	>	mode_changes[mode_count++].dir = dir;
1002		}
1003		else if (dir == MODE_DEL)
1004		{
1005		if (parc > *parn)
1006	<	(*parn)++;
1006	>	++(*parn);
1007
1008		if (chptr->mode.key[0] == '\0')
1009		return;
#	Line 1131 | Line 1011 | chm_key(struct Client *client_p, struct
1011		chptr->mode.key[0] = '\0';
1012
1013		mode_changes[mode_count].letter = c;
1014	<	mode_changes[mode_count].dir = MODE_DEL;
1135	<	mode_changes[mode_count].mems = ALL_MEMBERS;
1014	>	mode_changes[mode_count].arg = "*";
1015		mode_changes[mode_count].id = NULL;
1016	<	mode_changes[mode_count++].arg = "*";
1016	>	mode_changes[mode_count++].dir = dir;
1017		}
1018		}
1019
1020	<	struct ChannelMode
1142	<	{
1143	<	void (*func)(struct Client *, struct Client *,
1144	<	struct Channel *, int, int *, char **,
1145	<	int *, int, int, char, unsigned int);
1146	<	unsigned int d;
1147	<	};
1148	<
1149	<	static struct ChannelMode ModeTable[256] =
1020	>	const struct ChannelMode ModeTable[256] =
1021		{
1022		{ chm_nosuch,  0 },                   /* 0x00 */
1023		{ chm_nosuch,  0 },                   /* 0x01 */
#	Line 1252 | Line 1123 | static struct ChannelMode ModeTable[256]
1123		{ chm_except,  0 },                   /* e */
1124		{ chm_nosuch,  0 },                   /* f */
1125		{ chm_nosuch,  0 },                   /* g */
1255	–	#ifdef HALFOPS
1126		{ chm_hop,     0 },                   /* h */
1257	–	#else
1258	–	{ chm_nosuch,  0 },                   /* h */
1259	–	#endif
1127		{ chm_simple,     MODE_INVITEONLY },  /* i */
1128		{ chm_nosuch,     0               },  /* j */
1129		{ chm_key,        0               },  /* k */
#	Line 1424 | Line 1291 | get_channel_access(const struct Client *
1291		{
1292		/* Let hacked servers in for now... */
1293		if (!MyClient(source_p))
1294	<	return CHACCESS_CHANOP;
1294	>	return CHACCESS_REMOTE;
1295
1296	<	if (member == NULL)
1296	>	if (!member)
1297		return CHACCESS_NOTONCHAN;
1298
1299	<	/* just to be sure.. */
1299	>	/* Just to be sure.. */
1300		assert(source_p == member->client_p);
1301
1302		if (has_member_flags(member, CHFL_CHANOP))
1303		return CHACCESS_CHANOP;
1304
1438	–	#ifdef HALFOPS
1305		if (has_member_flags(member, CHFL_HALFOP))
1306		return CHACCESS_HALFOP;
1441	–	#endif
1307
1308		return CHACCESS_PEON;
1309		}
1310
1311	<	/* void send_cap_mode_changes(struct Client *client_p,
1312	<	*                        struct Client *source_p,
1448	<	*                        struct Channel *chptr, int cap, int nocap)
1449	<	* Input: The client sending(client_p), the source client(source_p),
1311	>	/* send_mode_changes_server()
1312	>	* Input: the source client(source_p),
1313		*        the channel to send mode changes for(chptr)
1314		* Output: None.
1315	<	* Side-effects: Sends the appropriate mode changes to capable servers.
1315	>	* Side-effects: Sends the appropriate mode changes to servers.
1316		*
1454	–	* send_cap_mode_changes() will loop the server list itself, because
1455	–	* at this point in time we have 4 capabs for channels, CAP_IE, CAP_EX,
1456	–	* and a server could support any number of these..
1457	–	* so we make the modebufs per server, tailoring them to each servers
1458	–	* specific demand.  Its not very pretty, but its one of the few realistic
1459	–	* ways to handle having this many capabs for channel modes.. --fl_
1460	–	*
1461	–	* Reverted back to my original design, except that we now keep a count
1462	–	* of the number of servers which each combination as an optimisation, so
1463	–	* the capabs combinations which are not needed are not worked out. -A1kmm
1317		*/
1465	–	/* rewritten to ensure parabuf < MODEBUFLEN -db */
1466	–
1318		static void
1319	<	send_mode_changes_server(struct Client *client_p, struct Client *source_p,
1469	<	struct Channel *chptr)
1319	>	send_mode_changes_server(struct Client *source_p, struct Channel *chptr)
1320		{
1321	<	unsigned int i;
1322	<	int mbl, pbl, arglen, nc, mc;
1473	<	int len;
1474	<	const char *arg = NULL;
1475	<	char *parptr;
1321	>	int mbl = 0, pbl = 0, arglen = 0, nc = 0, mc = 0;
1322	>	int len = 0;
1323		int dir = MODE_QUERY;
1324	<
1325	<	mc = 0;
1479	<	nc = 0;
1480	<	pbl = 0;
1324	>	const char *arg = NULL;
1325	>	char *parptr = NULL;
1326
1327		parabuf[0] = '\0';
1328		parptr = parabuf;
1329
1330		mbl = snprintf(modebuf, sizeof(modebuf), ":%s TMODE %lu %s ", source_p->id,
1331	<	(unsigned long)chptr->channelts, chptr->chname);
1331	>	(unsigned long)chptr->channelts, chptr->name);
1332
1333	<	/* loop the list of - modes we have */
1334	<	for (i = 0; i < mode_count; ++i)
1333	>	/* Loop the list of modes we have */
1334	>	for (unsigned i = 0; i < mode_count; ++i)
1335		{
1336	<	/* if they dont support the cap we need, or they do support a cap they
1492	<	* cant have, then dont add it to the modebuf.. that way they wont see
1493	<	* the mode
1494	<	*/
1495	<	if (mode_changes[i].letter == 0) /* XXX: can it ever happen? */
1336	>	if (mode_changes[i].letter == 0)
1337		continue;
1338
1339	<	arg = mode_changes[i].id;
1339	>	if (mode_changes[i].id)
1340	>	arg = mode_changes[i].id;
1341	>	else
1342	>	arg = mode_changes[i].arg;
1343	>
1344	>	if (arg)
1345	>	arglen = strlen(arg);
1346	>	else
1347	>	arglen = 0;
1348
1349		/*
1350		* If we're creeping past the buf size, we need to send it and make
1351		* another line for the other modes
1352		*/
1504	–	arglen = strlen(arg);
1505	–
1353		if ((mc == MAXMODEPARAMS) ||
1354		((arglen + mbl + pbl + 2) > IRCD_BUFSIZE) ||
1355		(pbl + arglen + BAN_FUDGE) >= MODEBUFLEN)
1356		{
1357	<	if (nc != 0)
1358	<	sendto_server(client_p, NOCAPS, NOCAPS, "%s %s", modebuf, parabuf);
1357	>	if (nc)
1358	>	sendto_server(source_p, NOCAPS, NOCAPS, "%s %s", modebuf, parabuf);
1359	>
1360		nc = 0;
1361		mc = 0;
1362
1363		mbl = snprintf(modebuf, sizeof(modebuf), ":%s TMODE %lu %s ", source_p->id,
1364	<	(unsigned long)chptr->channelts, chptr->chname);
1364	>	(unsigned long)chptr->channelts, chptr->name);
1365
1366		pbl = 0;
1367		parabuf[0] = '\0';
#	Line 1529 | Line 1377 | send_mode_changes_server(struct Client *
1377
1378		modebuf[mbl++] = mode_changes[i].letter;
1379		modebuf[mbl] = '\0';
1380	<	nc++;
1380	>	++nc;
1381
1382	<	if (arg != NULL)
1382	>	if (arg)
1383		{
1384		len = sprintf(parptr, "%s ", arg);
1385		pbl += len;
1386		parptr += len;
1387	<	mc++;
1387	>	++mc;
1388		}
1389		}
1390
1391		if (pbl && parabuf[pbl - 1] == ' ')
1392	<	parabuf[pbl - 1] = 0;
1392	>	parabuf[pbl - 1] = '\0';
1393
1394	<	if (nc != 0)
1395	<	sendto_server(client_p, NOCAPS, NOCAPS, "%s %s", modebuf, parabuf);
1394	>	if (nc)
1395	>	sendto_server(source_p, NOCAPS, NOCAPS, "%s %s", modebuf, parabuf);
1396		}
1397
1398		/* void send_mode_changes(struct Client *client_p,
#	Line 1559 | Line 1407 | send_mode_changes_server(struct Client *
1407		*/
1408		/* ensure parabuf < MODEBUFLEN -db */
1409		static void
1410	<	send_mode_changes(struct Client *client_p, struct Client *source_p,
1563	<	struct Channel *chptr)
1410	>	send_mode_changes(struct Client *source_p, struct Channel *chptr)
1411		{
1412	<	unsigned int i;
1413	<	int mbl, pbl, arglen, nc, mc;
1567	<	int len;
1568	<	const char *arg = NULL;
1569	<	char *parptr;
1412	>	int mbl = 0, pbl = 0, arglen = 0, nc = 0, mc = 0;
1413	>	int len = 0;
1414		int dir = MODE_QUERY;
1415	+	const char *arg = NULL;
1416	+	char *parptr = NULL;
1417
1418	<	/* bail out if we have nothing to do... */
1418	>	/* Bail out if we have nothing to do... */
1419		if (!mode_count)
1420		return;
1421
1422		if (IsServer(source_p))
1423		mbl = snprintf(modebuf, sizeof(modebuf), ":%s MODE %s ", (IsHidden(source_p) ||
1424		ConfigServerHide.hide_servers) ?
1425	<	me.name : source_p->name, chptr->chname);
1425	>	me.name : source_p->name, chptr->name);
1426		else
1427		mbl = snprintf(modebuf, sizeof(modebuf), ":%s!%s@%s MODE %s ", source_p->name,
1428	<	source_p->username, source_p->host, chptr->chname);
1583	<
1584	<	mc = 0;
1585	<	nc = 0;
1586	<	pbl = 0;
1428	>	source_p->username, source_p->host, chptr->name);
1429
1430		parabuf[0] = '\0';
1431		parptr = parabuf;
1432
1433	<	for (i = 0; i < mode_count; ++i)
1433	>	for (unsigned int i = 0; i < mode_count; ++i)
1434		{
1435	<	if (mode_changes[i].letter == 0 ||
1594	<	mode_changes[i].mems == NON_CHANOPS ||
1595	<	mode_changes[i].mems == ONLY_SERVERS)
1435	>	if (mode_changes[i].letter == 0)
1436		continue;
1437
1438		arg = mode_changes[i].arg;
1439	<	if (arg != NULL)
1439	>	if (arg)
1440		arglen = strlen(arg);
1441		else
1442		arglen = 0;
1443
1444	<	if ((mc == MAXMODEPARAMS)  ||
1444	>	if ((mc == MAXMODEPARAMS) ||
1445		((arglen + mbl + pbl + 2) > IRCD_BUFSIZE) ||
1446		((arglen + pbl + BAN_FUDGE) >= MODEBUFLEN))
1447		{
1448		if (mbl && modebuf[mbl - 1] == '-')
1449		modebuf[mbl - 1] = '\0';
1450
1451	<	if (nc != 0)
1452	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, "%s %s", modebuf, parabuf);
1451	>	if (nc)
1452	>	sendto_channel_local(0, chptr, "%s %s", modebuf, parabuf);
1453
1454		nc = 0;
1455		mc = 0;
#	Line 1617 | Line 1457 | send_mode_changes(struct Client *client_
1457		if (IsServer(source_p))
1458		mbl = snprintf(modebuf, sizeof(modebuf), ":%s MODE %s ", (IsHidden(source_p) ||
1459		ConfigServerHide.hide_servers) ?
1460	<	me.name : source_p->name, chptr->chname);
1460	>	me.name : source_p->name, chptr->name);
1461		else
1462		mbl = snprintf(modebuf, sizeof(modebuf), ":%s!%s@%s MODE %s ", source_p->name,
1463	<	source_p->username, source_p->host, chptr->chname);
1463	>	source_p->username, source_p->host, chptr->name);
1464
1465		pbl = 0;
1466		parabuf[0] = '\0';
#	Line 1636 | Line 1476 | send_mode_changes(struct Client *client_
1476
1477		modebuf[mbl++] = mode_changes[i].letter;
1478		modebuf[mbl] = '\0';
1479	<	nc++;
1479	>	++nc;
1480
1481	<	if (arg != NULL)
1481	>	if (arg)
1482		{
1483		len = sprintf(parptr, "%s ", arg);
1484		pbl += len;
1485		parptr += len;
1486	<	mc++;
1486	>	++mc;
1487		}
1488		}
1489
1490		if (pbl && parabuf[pbl - 1] == ' ')
1491	<	parabuf[pbl - 1] = 0;
1491	>	parabuf[pbl - 1] = '\0';
1492
1493	<	if (nc != 0)
1494	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, "%s %s", modebuf, parabuf);
1493	>	if (nc)
1494	>	sendto_channel_local(0, chptr, "%s %s", modebuf, parabuf);
1495
1496	<	nc = 0;
1657	<	mc = 0;
1658	<
1659	<	send_mode_changes_server(client_p, source_p, chptr);
1496	>	send_mode_changes_server(source_p, chptr);
1497		}
1498
1499	<	/* void set_channel_mode(struct Client *client_p, struct Client *source_p,
1500	<	*               struct Channel *chptr, int parc, char **parv,
1664	<	*               char *chname)
1665	<	* Input: The client we received this from, the client this originated
1499	>	/*
1500	>	* Input: The the client this originated
1501		*        from, the channel, the parameter count starting at the modes,
1502		*        the parameters, the channel name.
1503		* Output: None.
#	Line 1671 | Line 1506 | send_mode_changes(struct Client *client_
1506		*               clients.
1507		*/
1508		void
1509	<	set_channel_mode(struct Client *client_p, struct Client *source_p, struct Channel *chptr,
1509	>	set_channel_mode(struct Client *source_p, struct Channel *chptr,
1510		struct Membership *member, int parc, char *parv[])
1511		{
1512		int dir = MODE_ADD;
1513		int parn = 1;
1514	<	int alevel, errors = 0;
1680	<	char *ml = parv[0], c;
1514	>	int alevel = 0, errors = 0;
1515
1516		mode_count = 0;
1517		mode_limit = 0;
#	Line 1685 | Line 1519 | set_channel_mode(struct Client *client_p
1519
1520		alevel = get_channel_access(source_p, member);
1521
1522	<	for (; (c = *ml); ++ml)
1522	>	for (const char *ml = parv[0]; *ml; ++ml)
1523		{
1524	<	switch (c)
1524	>	switch (*ml)
1525		{
1526		case '+':
1527		dir = MODE_ADD;
#	Line 1700 | Line 1534 | set_channel_mode(struct Client *client_p
1534		break;
1535		default:
1536		{
1537	<	struct ChannelMode *tptr = &ModeTable[(unsigned char)c];
1537	>	const struct ChannelMode *tptr = &ModeTable[(unsigned char)*ml];
1538
1539	<	tptr->func(client_p, source_p, chptr, parc, &parn,
1540	<	parv, &errors, alevel, dir, c, tptr->d);
1539	>	tptr->func(source_p, chptr, parc, &parn, parv,
1540	>	&errors, alevel, dir, *ml, tptr->d);
1541		break;
1542		}
1543		}
1544		}
1545
1546	<	send_mode_changes(client_p, source_p, chptr);
1546	>	send_mode_changes(source_p, chptr);
1547		}

Diff Legend

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