ViewVC Help

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

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

Comparing:
ircd-hybrid/src/channel.c (file contents), Revision 32 by knight, Sun Oct 2 20:41:23 2005 UTC vs.
ircd-hybrid/trunk/src/channel.c (file contents), Revision 3933 by michael, Mon Jun 9 17:56:42 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 25 | Line 25
25		*/
26
27		#include "stdinc.h"
28	<	#include "tools.h"
28	>	#include "list.h"
29		#include "channel.h"
30		#include "channel_mode.h"
31		#include "client.h"
32	–	#include "common.h"
32		#include "hash.h"
33	+	#include "conf.h"
34	+	#include "hostmask.h"
35		#include "irc_string.h"
35	–	#include "sprintf_irc.h"
36		#include "ircd.h"
37	–	#include "list.h"
37		#include "numeric.h"
38	<	#include "s_serv.h"             /* captab */
40	<	#include "s_user.h"
38	>	#include "server.h"
39		#include "send.h"
42	–	#include "s_conf.h"             /* ConfigFileEntry, ConfigChannel */
40		#include "event.h"
41		#include "memory.h"
42	<	#include "balloc.h"
42	>	#include "mempool.h"
43	>	#include "misc.h"
44	>	#include "resv.h"
45
47	–	struct config_channel_entry ConfigChannel;
48	–	dlink_list global_channel_list = { NULL, NULL, 0 };
49	–	dlink_list lazylink_channels = { NULL, NULL, 0 };
50	–	BlockHeap *ban_heap;    /*! \todo ban_heap shouldn't be a global var */
51	–
52	–	static BlockHeap *topic_heap = NULL;
53	–	static BlockHeap *member_heap = NULL;
54	–	static BlockHeap *channel_heap = NULL;
46
47	+	dlink_list global_channel_list;
48	+	mp_pool_t *ban_pool;    /*! \todo ban_pool shouldn't be a global var */
49	+
50	+	static mp_pool_t *member_pool, *channel_pool;
51		static char buf[IRCD_BUFSIZE];
57	–	static char modebuf[MODEBUFLEN];
58	–	static char parabuf[MODEBUFLEN];
52
53
54		/*! \brief Initializes the channel blockheap, adds known channel CAPAB
55		*/
56		void
57	<	init_channels(void)
57	>	channel_init(void)
58		{
66	–	/*
67	–	* XXX - These should get moved to somwhere else once we have
68	–	* a modular channelmode system
69	–	*/
59		add_capability("EX", CAP_EX, 1);
60		add_capability("IE", CAP_IE, 1);
72	–	add_capability("CHW", CAP_CHW, 1);
61
62	<	channel_heap = BlockHeapCreate("channel", sizeof(struct Channel), CHANNEL_HEAP_SIZE);
63	<	ban_heap = BlockHeapCreate("ban", sizeof(struct Ban), BAN_HEAP_SIZE);
64	<	topic_heap = BlockHeapCreate("topic", TOPICLEN+1 + USERHOST_REPLYLEN, TOPIC_HEAP_SIZE);
77	<	member_heap = BlockHeapCreate("member", sizeof(struct Membership), CHANNEL_HEAP_SIZE*2);
62	>	channel_pool = mp_pool_new(sizeof(struct Channel), MP_CHUNK_SIZE_CHANNEL);
63	>	ban_pool = mp_pool_new(sizeof(struct Ban), MP_CHUNK_SIZE_BAN);
64	>	member_pool = mp_pool_new(sizeof(struct Membership), MP_CHUNK_SIZE_MEMBER);
65		}
66
67	<	/*! \brief adds a user to a channel by adding another link to the
67	>	/*! \brief Adds a user to a channel by adding another link to the
68		*         channels member chain.
69	<	* \param chptr      pointer to channel to add client to
70	<	* \param who        pointer to client (who) to add
71	<	* \param flags      flags for chanops etc
72	<	* \param flood_ctrl whether to count this join in flood calculations
69	>	* \param chptr      Pointer to channel to add client to
70	>	* \param who        Pointer to client (who) to add
71	>	* \param flags      Flags for chanops etc
72	>	* \param flood_ctrl Whether to count this join in flood calculations
73		*/
74		void
75		add_user_to_channel(struct Channel *chptr, struct Client *who,
#	Line 93 | Line 80 | add_user_to_channel(struct Channel *chpt
80		if (GlobalSetOptions.joinfloodtime > 0)
81		{
82		if (flood_ctrl)
83	<	chptr->number_joined++;
83	>	++chptr->number_joined;
84
85		chptr->number_joined -= (CurrentTime - chptr->last_join_time) *
86		(((float)GlobalSetOptions.joinfloodcount) /
#	Line 111 | Line 98 | add_user_to_channel(struct Channel *chpt
98		if (!IsSetJoinFloodNoticed(chptr))
99		{
100		SetJoinFloodNoticed(chptr);
101	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
101	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
102		"Possible Join Flooder %s on %s target: %s",
103		get_client_name(who, HIDE_IP),
104		who->servptr->name, chptr->chname);
#	Line 121 | Line 108 | add_user_to_channel(struct Channel *chpt
108		chptr->last_join_time = CurrentTime;
109		}
110
111	<	ms = BlockHeapAlloc(member_heap);
111	>	ms = mp_pool_get(member_pool);
112	>	memset(ms, 0, sizeof(*ms));
113	>
114		ms->client_p = who;
115		ms->chptr = chptr;
116		ms->flags = flags;
117
118		dlinkAdd(ms, &ms->channode, &chptr->members);
130	–
131	–	if (MyConnect(who))
132	–	dlinkAdd(ms, &ms->locchannode, &chptr->locmembers);
133	–
119		dlinkAdd(ms, &ms->usernode, &who->channel);
120		}
121
122	<	/*! \brief deletes an user from a channel by removing a link in the
122	>	/*! \brief Deletes an user from a channel by removing a link in the
123		*         channels member chain.
124	<	* \param member pointer to Membership struct
124	>	* \param member Pointer to Membership struct
125		*/
126		void
127		remove_user_from_channel(struct Membership *member)
#	Line 145 | Line 130 | remove_user_from_channel(struct Membersh
130		struct Channel *chptr = member->chptr;
131
132		dlinkDelete(&member->channode, &chptr->members);
148	–
149	–	if (MyConnect(client_p))
150	–	dlinkDelete(&member->locchannode, &chptr->locmembers);
151	–
133		dlinkDelete(&member->usernode, &client_p->channel);
134
135	<	BlockHeapFree(member_heap, member);
135	>	mp_pool_release(member);
136
137	<	if (dlink_list_length(&chptr->members) == 0)
157	<	{
158	<	assert(dlink_list_length(&chptr->locmembers) == 0);
137	>	if (chptr->members.head == NULL)
138		destroy_channel(chptr);
160	–	}
139		}
140
141		/* send_members()
#	Line 168 | Line 146 | remove_user_from_channel(struct Membersh
146		*/
147		static void
148		send_members(struct Client *client_p, struct Channel *chptr,
149	<	char *lmodebuf, char *lparabuf)
149	>	char *modebuf, char *parabuf)
150		{
151	<	struct Membership *ms;
174	<	dlink_node *ptr;
151	>	const dlink_node *ptr = NULL;
152		int tlen;              /* length of text to append */
153		char *t, *start;       /* temp char pointer */
154
155	<	start = t = buf + ircsprintf(buf, ":%s SJOIN %lu %s %s %s:",
156	<	ID_or_name(&me, client_p),
157	<	(unsigned long)chptr->channelts,
181	<	chptr->chname, lmodebuf, lparabuf);
155	>	start = t = buf + snprintf(buf, sizeof(buf), ":%s SJOIN %lu %s %s %s:",
156	>	me.id, (unsigned long)chptr->channelts,
157	>	chptr->chname, modebuf, parabuf);
158
159		DLINK_FOREACH(ptr, chptr->members.head)
160		{
161	<	ms = ptr->data;
161	>	const struct Membership *ms = ptr->data;
162
163	<	tlen = strlen(IsCapable(client_p, CAP_TS6) ?
188	<	ID(ms->client_p) : ms->client_p->name) + 1;  /* nick + space */
163	>	tlen = strlen(ms->client_p->id) + 1;  /* nick + space */
164
165		if (ms->flags & CHFL_CHANOP)
166	<	tlen++;
192	<	#ifdef HALFOPS
166	>	++tlen;
167		if (ms->flags & CHFL_HALFOP)
168	<	tlen++;
195	<	#endif
168	>	++tlen;
169		if (ms->flags & CHFL_VOICE)
170	<	tlen++;
170	>	++tlen;
171
172	<	/* space will be converted into CR, but we also need space for LF..
173	<	* That's why we use '- 1' here
174	<	* -adx */
175	<	if (t + tlen - buf > sizeof(buf) - 1)
172	>	/*
173	>	* Space will be converted into CR, but we also need space for LF..
174	>	* That's why we use '- 1' here -adx
175	>	*/
176	>	if (t + tlen - buf > IRCD_BUFSIZE - 1)
177		{
178	<	*(t - 1) = '\0';  /* kill the space and terminate the string */
178	>	*(t - 1) = '\0';  /* Kill the space and terminate the string */
179		sendto_one(client_p, "%s", buf);
180		t = start;
181		}
182
183	<	strcpy(t, get_member_status(ms, YES));
184	<	t += strlen(t);
183	>	if (ms->flags & CHFL_CHANOP)
184	>	*t++ = '@';
185	>	if (ms->flags & CHFL_HALFOP)
186	>	*t++ = '%';
187	>	if (ms->flags & CHFL_VOICE)
188	>	*t++ = '+';
189	>
190	>	strcpy(t, ms->client_p->id);
191
212	–	if (IsCapable(client_p, CAP_TS6))
213	–	strcpy(t, ID(ms->client_p));
214	–	else
215	–	strcpy(t, ms->client_p->name);
192		t += strlen(t);
193		*t++ = ' ';
194		}
195
196	<	/* should always be non-NULL unless we have a kind of persistent channels */
197	<	if (chptr->members.head != NULL)
198	<	t--;  /* take the space out */
196	>	/* Should always be non-NULL unless we have a kind of persistent channels */
197	>	if (chptr->members.head)
198	>	t--;  /* Take the space out */
199		*t = '\0';
200		sendto_one(client_p, "%s", buf);
201		}
202
203	<	/*! \brief sends +b/+e/+I
204	<	* \param client_p client pointer to server
205	<	* \param chptr    pointer to channel
206	<	* \param top      pointer to top of mode link list to send
207	<	* \param flag     char flag flagging type of mode. Currently this can be 'b', e' or 'I'
203	>	/*! \brief Sends +b/+e/+I
204	>	* \param client_p Client pointer to server
205	>	* \param chptr    Pointer to channel
206	>	* \param top      Pointer to top of mode link list to send
207	>	* \param flag     Char flag flagging type of mode. Currently this can be 'b', e' or 'I'
208		*/
209		static void
210		send_mode_list(struct Client *client_p, struct Channel *chptr,
211	<	dlink_list *top, char flag)
211	>	const dlink_list *top, char flag)
212		{
213	<	int ts5 = !IsCapable(client_p, CAP_TS6);
214	<	dlink_node *lp;
215	<	struct Ban *banptr;
216	<	char pbuf[IRCD_BUFSIZE];
241	<	int tlen, mlen, cur_len, count = 0;
242	<	char *mp = NULL, *pp = pbuf;
213	>	const dlink_node *ptr = NULL;
214	>	char pbuf[IRCD_BUFSIZE] = "";
215	>	int tlen, mlen, cur_len;
216	>	char *pp = pbuf;
217
218	<	if (top == NULL || top->length == 0)
218	>	if (top->length == 0)
219		return;
220
221	<	if (ts5)
222	<	mlen = ircsprintf(buf, ":%s MODE %s +", me.name, chptr->chname);
223	<	else
250	<	mlen = ircsprintf(buf, ":%s BMASK %lu %s %c :", me.id,
251	<	(unsigned long)chptr->channelts, chptr->chname, flag);
221	>	mlen = snprintf(buf, sizeof(buf), ":%s BMASK %lu %s %c :", me.id,
222	>	(unsigned long)chptr->channelts, chptr->chname, flag);
223	>	cur_len = mlen;
224
225	<	/* MODE needs additional one byte for space between buf and pbuf */
254	<	cur_len = mlen + ts5;
255	<	mp = buf + mlen;
256	<
257	<	DLINK_FOREACH(lp, top->head)
225	>	DLINK_FOREACH(ptr, top->head)
226		{
227	<	banptr = lp->data;
227	>	const struct Ban *banptr = ptr->data;
228
229	<	/* must add another b/e/I letter if we use MODE */
262	<	tlen = banptr->len + 3 + ts5;
229	>	tlen = banptr->len + 3;
230
231		/*
232	<	* send buffer and start over if we cannot fit another ban,
232	>	* Send buffer and start over if we cannot fit another ban,
233		* or if the target is non-ts6 and we have too many modes in
234		* in this line.
235		*/
236	<	if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2 ||
270	<	(!IsCapable(client_p, CAP_TS6) &&
271	<	(count >= MAXMODEPARAMS || pp - pbuf >= MODEBUFLEN)))
236	>	if (cur_len + (tlen - 1) > IRCD_BUFSIZE - 2)
237		{
238	<	*(pp - 1) = '\0';  /* get rid of trailing space on buffer */
239	<	sendto_one(client_p, "%s%s%s", buf, ts5 ? " " : "", pbuf);
238	>	*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
239	>	sendto_one(client_p, "%s%s", buf, pbuf);
240
241	<	cur_len = mlen + ts5;
277	<	mp = buf + mlen;
241	>	cur_len = mlen;
242		pp = pbuf;
279	–	count = 0;
280	–	}
281	–
282	–	count++;
283	–	if (ts5)
284	–	{
285	–	*mp++ = flag;
286	–	*mp = '\0';
243		}
244
245	<	pp += ircsprintf(pp, "%s!%s@%s ", banptr->name, banptr->username,
246	<	banptr->host);
245	>	pp += sprintf(pp, "%s!%s@%s ", banptr->name, banptr->user,
246	>	banptr->host);
247		cur_len += tlen;
248		}
249
250	<	*(pp - 1) = '\0';  /* get rid of trailing space on buffer */
251	<	sendto_one(client_p, "%s%s%s", buf, ts5 ? " " : "", pbuf);
250	>	*(pp - 1) = '\0';  /* Get rid of trailing space on buffer */
251	>	sendto_one(client_p, "%s%s", buf, pbuf);
252		}
253
254	<	/*! \brief send "client_p" a full list of the modes for channel chptr
255	<	* \param client_p pointer to client client_p
256	<	* \param chptr    pointer to channel pointer
254	>	/*! \brief Send "client_p" a full list of the modes for channel chptr
255	>	* \param client_p Pointer to client client_p
256	>	* \param chptr    Pointer to channel pointer
257		*/
258		void
259		send_channel_modes(struct Client *client_p, struct Channel *chptr)
260		{
261	<	if (chptr->chname[0] != '#')
262	<	return;
261	>	char modebuf[MODEBUFLEN] = "";
262	>	char parabuf[MODEBUFLEN] = "";
263
308	–	*modebuf = *parabuf = '\0';
264		channel_modes(chptr, client_p, modebuf, parabuf);
265		send_members(client_p, chptr, modebuf, parabuf);
266
267		send_mode_list(client_p, chptr, &chptr->banlist, 'b');
268	<
269	<	if (IsCapable(client_p, CAP_EX))
315	<	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
316	<	if (IsCapable(client_p, CAP_IE))
317	<	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
268	>	send_mode_list(client_p, chptr, &chptr->exceptlist, 'e');
269	>	send_mode_list(client_p, chptr, &chptr->invexlist, 'I');
270		}
271
272	<	/*! \brief check channel name for invalid characters
273	<	* \param name pointer to channel name string
274	<	* \return TRUE (1) if name ok, FALSE (0) otherwise
272	>	/*! \brief Check channel name for invalid characters
273	>	* \param name Pointer to channel name string
274	>	* \param local Indicates whether it's a local or remote creation
275	>	* \return 0 if invalid, 1 otherwise
276		*/
277		int
278	<	check_channel_name(const char *name)
278	>	check_channel_name(const char *name, const int local)
279		{
280	<	const unsigned char *p = (const unsigned char *)name;
280	>	const char *p = name;
281	>
282		assert(name != NULL);
283
284	<	for (; *p; ++p)
285	<	if (!IsChanChar(*p))
286	<	return 0;
284	>	if (!IsChanPrefix(*p))
285	>	return 0;
286	>
287	>	if (!local || !ConfigChannel.disable_fake_channels)
288	>	{
289	>	while (*++p)
290	>	if (!IsChanChar(*p))
291	>	return 0;
292	>	}
293	>	else
294	>	{
295	>	while (*++p)
296	>	if (!IsVisibleChanChar(*p))
297	>	return 0;
298	>	}
299
300	<	return 1;
300	>	return p - name <= CHANNELLEN;
301		}
302
303		void
#	Line 340 | Line 306 | remove_ban(struct Ban *bptr, dlink_list
306		dlinkDelete(&bptr->node, list);
307
308		MyFree(bptr->name);
309	<	MyFree(bptr->username);
309	>	MyFree(bptr->user);
310		MyFree(bptr->host);
311		MyFree(bptr->who);
312
313	<	BlockHeapFree(ban_heap, bptr);
313	>	mp_pool_release(bptr);
314		}
315
316		/* free_channel_list()
#	Line 356 | Line 322 | remove_ban(struct Ban *bptr, dlink_list
322		void
323		free_channel_list(dlink_list *list)
324		{
325	<	dlink_node *ptr = NULL, *next_ptr = NULL;
325	>	dlink_node *ptr = NULL, *ptr_next = NULL;
326
327	<	DLINK_FOREACH_SAFE(ptr, next_ptr, list->head)
327	>	DLINK_FOREACH_SAFE(ptr, ptr_next, list->head)
328		remove_ban(ptr->data, list);
329
330		assert(list->tail == NULL && list->head == NULL);
#	Line 366 | Line 332 | free_channel_list(dlink_list *list)
332
333		/*! \brief Get Channel block for chname (and allocate a new channel
334		*         block, if it didn't exist before)
335	<	* \param client_p client pointer
336	<	* \param chname   channel name
371	<	* \param isnew    pointer to int flag whether channel was newly created or not
372	<	* \return channel block or NULL if illegal name
335	>	* \param chname Channel name
336	>	* \return Channel block
337		*/
338		struct Channel *
339	<	get_or_create_channel(struct Client *client_p, const char *chname, int *isnew)
339	>	make_channel(const char *chname)
340		{
341		struct Channel *chptr = NULL;
378	–	int len;
342
343	<	if (EmptyString(chname))
381	<	return NULL;
382	<
383	<	if ((len = strlen(chname)) > CHANNELLEN)
384	<	{
385	<	if (IsServer(client_p))
386	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
387	<	"*** Long channel name from %s (%d > %d): %s",
388	<	client_p->name, len, CHANNELLEN, chname);
389	<	return NULL;
390	<	}
391	<
392	<	if ((chptr = hash_find_channel(chname)) != NULL)
393	<	{
394	<	if (isnew != NULL)
395	<	*isnew = 0;
343	>	assert(!EmptyString(chname));
344
345	<	return chptr;
398	<	}
345	>	chptr = mp_pool_get(channel_pool);
346
347	<	if (isnew != NULL)
401	<	*isnew = 1;
347	>	memset(chptr, 0, sizeof(*chptr));
348
349	<	chptr = BlockHeapAlloc(channel_heap);
350	<	/* doesn't hurt to set it here */
351	<	chptr->channelts = chptr->last_join_time = CurrentTime;
349	>	/* Doesn't hurt to set it here */
350	>	chptr->channelts = CurrentTime;
351	>	chptr->last_join_time = CurrentTime;
352
353		strlcpy(chptr->chname, chname, sizeof(chptr->chname));
354		dlinkAdd(chptr, &chptr->node, &global_channel_list);
#	Line 412 | Line 358 | get_or_create_channel(struct Client *cli
358		return chptr;
359		}
360
361	<	/*! \brief walk through this channel, and destroy it.
362	<	* \param chptr channel pointer
361	>	/*! \brief Walk through this channel, and destroy it.
362	>	* \param chptr Channel pointer
363		*/
364		void
365		destroy_channel(struct Channel *chptr)
#	Line 423 | Line 369 | destroy_channel(struct Channel *chptr)
369		DLINK_FOREACH_SAFE(ptr, ptr_next, chptr->invites.head)
370		del_invite(chptr, ptr->data);
371
372	<	/* free ban/exception/invex lists */
372	>	/* Free ban/exception/invex lists */
373		free_channel_list(&chptr->banlist);
374		free_channel_list(&chptr->exceptlist);
375		free_channel_list(&chptr->invexlist);
376
431	–	/* Free the topic */
432	–	free_topic(chptr);
433	–
377		dlinkDelete(&chptr->node, &global_channel_list);
378		hash_del_channel(chptr);
379
380	<	if (ServerInfo.hub)
438	<	if ((ptr = dlinkFindDelete(&lazylink_channels, chptr)))
439	<	free_dlink_node(ptr);
440	<
441	<	BlockHeapFree(channel_heap, chptr);
380	>	mp_pool_release(chptr);
381		}
382
383		/*!
384	<	* \param chptr pointer to channel
385	<	* \return string pointer "=" if public, "@" if secret else "*"
384	>	* \param chptr Pointer to channel
385	>	* \return String pointer "=" if public, "@" if secret else "*"
386		*/
387		static const char *
388	<	channel_pub_or_secret(struct Channel *chptr)
388	>	channel_pub_or_secret(const struct Channel *chptr)
389		{
390		if (SecretChannel(chptr))
391		return "@";
#	Line 456 | Line 395 | channel_pub_or_secret(struct Channel *ch
395		}
396
397		/*! \brief lists all names on given channel
398	<	* \param source_p pointer to client struct requesting names
399	<	* \param chptr    pointer to channel block
400	<	* \param show_eon show ENDOFNAMES numeric or not
398	>	* \param source_p Pointer to client struct requesting names
399	>	* \param chptr    Pointer to channel block
400	>	* \param show_eon Show RPL_ENDOFNAMES numeric or not
401		*                 (don't want it with /names with no params)
402		*/
403		void
404		channel_member_names(struct Client *source_p, struct Channel *chptr,
405		int show_eon)
406		{
407	<	struct Client *target_p = NULL;
408	<	struct Membership *ms = NULL;
470	<	dlink_node *ptr = NULL;
471	<	char lbuf[IRCD_BUFSIZE + 1];
407	>	const dlink_node *ptr = NULL;
408	>	char lbuf[IRCD_BUFSIZE + 1] = "";
409		char *t = NULL, *start = NULL;
410		int tlen = 0;
411		int is_member = IsMember(source_p, chptr);
412	+	int multi_prefix = HasCap(source_p, CAP_MULTI_PREFIX) != 0;
413	+	int uhnames = HasCap(source_p, CAP_UHNAMES) != 0;
414
415		if (PubChannel(chptr) || is_member)
416		{
417	<	t = lbuf + ircsprintf(lbuf, form_str(RPL_NAMREPLY),
418	<	me.name, source_p->name,
419	<	channel_pub_or_secret(chptr),
481	<	chptr->chname);
417	>	t = lbuf + snprintf(lbuf, sizeof(lbuf), numeric_form(RPL_NAMREPLY),
418	>	me.name, source_p->name,
419	>	channel_pub_or_secret(chptr), chptr->chname);
420		start = t;
421
422		DLINK_FOREACH(ptr, chptr->members.head)
423		{
424	<	ms       = ptr->data;
487	<	target_p = ms->client_p;
424	>	const struct Membership *ms = ptr->data;
425
426	<	if (IsInvisible(target_p) && !is_member)
426	>	if (HasUMode(ms->client_p, UMODE_INVISIBLE) && !is_member)
427		continue;
428
429	<	tlen = strlen(target_p->name) + 1;  /* nick + space */
429	>	if (!uhnames)
430	>	tlen = strlen(ms->client_p->name) + 1;  /* nick + space */
431	>	else
432	>	tlen = strlen(ms->client_p->name) + strlen(ms->client_p->username) +
433	>	strlen(ms->client_p->host) + 3;
434
435	<	if (ms->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
436	<	++tlen;
437	<	if (t + tlen - lbuf > IRCD_BUFSIZE)
435	>	if (!multi_prefix)
436	>	{
437	>	if (ms->flags & (CHFL_CHANOP | CHFL_HALFOP | CHFL_VOICE))
438	>	++tlen;
439	>	}
440	>	else
441	>	{
442	>	if (ms->flags & CHFL_CHANOP)
443	>	++tlen;
444	>	if (ms->flags & CHFL_HALFOP)
445	>	++tlen;
446	>	if (ms->flags & CHFL_VOICE)
447	>	++tlen;
448	>	}
449	>
450	>	if (t + tlen - lbuf > IRCD_BUFSIZE - 2)
451		{
452		*(t - 1) = '\0';
453		sendto_one(source_p, "%s", lbuf);
454		t = start;
455		}
456
457	<	t += ircsprintf(t, "%s%s ", get_member_status(ms, NO),
458	<	target_p->name);
457	>	if (!uhnames)
458	>	t += sprintf(t, "%s%s ", get_member_status(ms, multi_prefix),
459	>	ms->client_p->name);
460	>	else
461	>	t += sprintf(t, "%s%s!%s@%s ", get_member_status(ms, multi_prefix),
462	>	ms->client_p->name, ms->client_p->username,
463	>	ms->client_p->host);
464		}
465
466	<	if (tlen != 0)
466	>	if (tlen)
467		{
468		*(t - 1) = '\0';
469		sendto_one(source_p, "%s", lbuf);
#	Line 512 | Line 471 | channel_member_names(struct Client *sour
471		}
472
473		if (show_eon)
474	<	sendto_one(source_p, form_str(RPL_ENDOFNAMES),
516	<	me.name, source_p->name, chptr->chname);
474	>	sendto_one_numeric(source_p, &me, RPL_ENDOFNAMES, chptr->chname);
475		}
476
477	<	/*! \brief adds client to invite list
478	<	* \param chptr pointer to channel block
479	<	* \param who   pointer to client to add invite to
477	>	/*! \brief Adds client to invite list
478	>	* \param chptr Pointer to channel block
479	>	* \param who   Pointer to client to add invite to
480		*/
481		void
482		add_invite(struct Channel *chptr, struct Client *who)
#	Line 526 | Line 484 | add_invite(struct Channel *chptr, struct
484		del_invite(chptr, who);
485
486		/*
487	<	* delete last link in chain if the list is max length
487	>	* Delete last link in chain if the list is max length
488		*/
489	<	if (dlink_list_length(&who->invited) >=
490	<	ConfigChannel.max_chans_per_user)
491	<	del_invite(who->invited.tail->data, who);
489	>	if (dlink_list_length(&who->localClient->invited) >=
490	>	ConfigChannel.max_channels)
491	>	del_invite(who->localClient->invited.tail->data, who);
492
493	<	/* add client to channel invite list */
493	>	/* Add client to channel invite list */
494		dlinkAdd(who, make_dlink_node(), &chptr->invites);
495
496	<	/* add channel to the end of the client invite list */
497	<	dlinkAdd(chptr, make_dlink_node(), &who->invited);
496	>	/* Add channel to the end of the client invite list */
497	>	dlinkAdd(chptr, make_dlink_node(), &who->localClient->invited);
498		}
499
500		/*! \brief Delete Invite block from channel invite list
501		*         and client invite list
502	<	* \param chptr pointer to Channel struct
503	<	* \param who   pointer to client to remove invites from
502	>	* \param chptr Pointer to Channel struct
503	>	* \param who   Pointer to client to remove invites from
504		*/
505		void
506		del_invite(struct Channel *chptr, struct Client *who)
507		{
508		dlink_node *ptr = NULL;
509
510	<	if ((ptr = dlinkFindDelete(&who->invited, chptr)))
510	>	if ((ptr = dlinkFindDelete(&who->localClient->invited, chptr)))
511		free_dlink_node(ptr);
512
513		if ((ptr = dlinkFindDelete(&chptr->invites, who)))
#	Line 568 | Line 526 | del_invite(struct Channel *chptr, struct
526		* (like in get_client_name)
527		*/
528		const char *
529	<	get_member_status(const struct Membership *ms, int combine)
529	>	get_member_status(const struct Membership *ms, const int combine)
530		{
531		static char buffer[4];
532	<	char *p = NULL;
575	<
576	<	if (ms == NULL)
577	<	return "";
578	<	p = buffer;
532	>	char *p = buffer;
533
534		if (ms->flags & CHFL_CHANOP)
535		{
#	Line 584 | Line 538 | get_member_status(const struct Membershi
538		*p++ = '@';
539		}
540
587	–	#ifdef HALFOPS
541		if (ms->flags & CHFL_HALFOP)
542		{
543		if (!combine)
544		return "%";
545		*p++ = '%';
546		}
594	–	#endif
547
548		if (ms->flags & CHFL_VOICE)
549		*p++ = '+';
#	Line 601 | Line 553 | get_member_status(const struct Membershi
553		}
554
555		/*!
556	<	* \param who  pointer to Client to check
557	<	* \param list pointer to ban list to search
556	>	* \param who  Pointer to Client to check
557	>	* \param list Pointer to ban list to search
558		* \return 1 if ban found for given n!u\@h mask, 0 otherwise
559		*
560		*/
#	Line 615 | Line 567 | find_bmask(const struct Client *who, con
567		{
568		const struct Ban *bp = ptr->data;
569
570	<	if (match(bp->name, who->name) &&
571	<	match(bp->username, who->username) &&
572	<	(match(bp->host, who->host) ||
573	<	match(bp->host, who->sockhost) ||
574	<	match_cidr(bp->host, who->sockhost)))
575	<	return 1;
570	>	if (!match(bp->name, who->name) && !match(bp->user, who->username))
571	>	{
572	>	switch (bp->type)
573	>	{
574	>	case HM_HOST:
575	>	if (!match(bp->host, who->host) || !match(bp->host, who->sockhost))
576	>	return 1;
577	>	break;
578	>	case HM_IPV4:
579	>	if (who->localClient->aftype == AF_INET)
580	>	if (match_ipv4(&who->localClient->ip, &bp->addr, bp->bits))
581	>	return 1;
582	>	break;
583	>	#ifdef IPV6
584	>	case HM_IPV6:
585	>	if (who->localClient->aftype == AF_INET6)
586	>	if (match_ipv6(&who->localClient->ip, &bp->addr, bp->bits))
587	>	return 1;
588	>	break;
589	>	#endif
590	>	default:
591	>	assert(0);
592	>	}
593	>	}
594		}
595
596		return 0;
597		}
598
599		/*!
600	<	* \param chptr pointer to channel block
601	<	* \param who   pointer to client to check access fo
600	>	* \param chptr Pointer to channel block
601	>	* \param who   Pointer to client to check access fo
602		* \return 0 if not banned, 1 otherwise
603		*/
604		int
605	<	is_banned(struct Channel *chptr, struct Client *who)
605	>	is_banned(const struct Channel *chptr, const struct Client *who)
606		{
607	<	assert(IsClient(who));
607	>	if (find_bmask(who, &chptr->banlist))
608	>	if (!find_bmask(who, &chptr->exceptlist))
609	>	return 1;
610
611	<	return find_bmask(who, &chptr->banlist) && (!ConfigChannel.use_except ||
640	<	!find_bmask(who, &chptr->exceptlist));
611	>	return 0;
612		}
613
614	<	/*!
615	<	* \param source_p pointer to client attempting to join
616	<	* \param chptr    pointer to channel
617	<	* \param key      key sent by client attempting to join if present
614	>	/*! Tests if a client can join a certain channel
615	>	* \param source_p Pointer to client attempting to join
616	>	* \param chptr    Pointer to channel
617	>	* \param key      Key sent by client attempting to join if present
618		* \return ERR_BANNEDFROMCHAN, ERR_INVITEONLYCHAN, ERR_CHANNELISFULL
619		*         or 0 if allowed to join.
620		*/
621		int
622		can_join(struct Client *source_p, struct Channel *chptr, const char *key)
623		{
624	<	if (find_bmask(source_p, &chptr->banlist))
625	<	if (!ConfigChannel.use_except || !find_bmask(source_p, &chptr->exceptlist))
626	<	return ERR_BANNEDFROMCHAN;
624	>	if ((chptr->mode.mode & MODE_SSLONLY) && !HasUMode(source_p, UMODE_SSL))
625	>	return ERR_SSLONLYCHAN;
626	>
627	>	if ((chptr->mode.mode & MODE_REGONLY) && !HasUMode(source_p, UMODE_REGISTERED))
628	>	return ERR_NEEDREGGEDNICK;
629	>
630	>	if ((chptr->mode.mode & MODE_OPERONLY) && !HasUMode(source_p, UMODE_OPER))
631	>	return ERR_OPERONLYCHAN;
632
633		if (chptr->mode.mode & MODE_INVITEONLY)
634	<	if (!dlinkFind(&source_p->invited, chptr))
635	<	if (!ConfigChannel.use_invex || !find_bmask(source_p, &chptr->invexlist))
634	>	if (!dlinkFind(&source_p->localClient->invited, chptr))
635	>	if (!find_bmask(source_p, &chptr->invexlist))
636		return ERR_INVITEONLYCHAN;
637
638	<	if (chptr->mode.key[0] && (EmptyString(key) || irccmp(chptr->mode.key, key)))
638	>	if (chptr->mode.key[0] && (!key || strcmp(chptr->mode.key, key)))
639		return ERR_BADCHANNELKEY;
640
641		if (chptr->mode.limit && dlink_list_length(&chptr->members) >=
642		chptr->mode.limit)
643		return ERR_CHANNELISFULL;
644
645	+	if (is_banned(chptr, source_p))
646	+	return ERR_BANNEDFROMCHAN;
647	+
648		return 0;
649		}
650
651		int
652	<	has_member_flags(struct Membership *ms, unsigned int flags)
652	>	has_member_flags(const struct Membership *ms, const unsigned int flags)
653		{
654	<	if (ms != NULL)
676	<	return ms->flags & flags;
677	<	return 0;
654	>	return ms && (ms->flags & flags);
655		}
656
657		struct Membership *
#	Line 685 | Line 662 | find_channel_link(struct Client *client_
662		if (!IsClient(client_p))
663		return NULL;
664
665	<	DLINK_FOREACH(ptr, client_p->channel.head)
666	<	if (((struct Membership *)ptr->data)->chptr == chptr)
667	<	return (struct Membership *)ptr->data;
665	>	if (dlink_list_length(&chptr->members) < dlink_list_length(&client_p->channel))
666	>	{
667	>	DLINK_FOREACH(ptr, chptr->members.head)
668	>	if (((struct Membership *)ptr->data)->client_p == client_p)
669	>	return ptr->data;
670	>	}
671	>	else
672	>	{
673	>	DLINK_FOREACH(ptr, client_p->channel.head)
674	>	if (((struct Membership *)ptr->data)->chptr == chptr)
675	>	return ptr->data;
676	>	}
677
678		return NULL;
679		}
680
681	<	/*!
682	<	* \param chptr    pointer to Channel struct
683	<	* \param source_p pointer to Client struct
681	>	/*! Tests if a client can send to a channel
682	>	* \param message The actual message string the client wants to send
683	>	* \return 1 if the message does contain any control codes, 0 otherwise
684	>	*/
685	>	static int
686	>	msg_has_ctrls(const char *message)
687	>	{
688	>	const unsigned char *p = (const unsigned char *)message;
689	>
690	>	for (; *p; ++p)
691	>	{
692	>	if (*p > 31 || *p == 1)
693	>	continue;  /* CTCP or no control code */
694	>
695	>	if (*p == 27)  /* Escape */
696	>	{
697	>	/* ISO 2022 charset shift sequence */
698	>	if (*(p + 1) == '$' ||
699	>	*(p + 1) == '(')
700	>	{
701	>	++p;
702	>	continue;
703	>	}
704	>	}
705	>
706	>	return 1;  /* Control code */
707	>	}
708	>
709	>	return 0;
710	>	}
711	>
712	>	/*! Tests if a client can send to a channel
713	>	* \param chptr    Pointer to Channel struct
714	>	* \param source_p Pointer to Client struct
715	>	* \param ms       Pointer to Membership struct (can be NULL)
716	>	* \param message  The actual message string the client wants to send
717		* \return CAN_SEND_OPV if op or voiced on channel\n
718		*         CAN_SEND_NONOP if can send to channel but is not an op\n
719	<	*         CAN_SEND_NO if they cannot send to channel\n
719	>	*         ERR_CANNOTSENDTOCHAN or ERR_NEEDREGGEDNICK if they cannot send to channel\n
720		*/
721		int
722	<	can_send(struct Channel *chptr, struct Client *source_p)
722	>	can_send(struct Channel *chptr, struct Client *source_p,
723	>	struct Membership *ms, const char *message)
724		{
725	<	struct Membership *ms = NULL;
725	>	struct MaskItem *conf = NULL;
726
727	<	if (IsServer(source_p))
727	>	if (IsServer(source_p) || HasFlag(source_p, FLAGS_SERVICE))
728		return CAN_SEND_OPV;
729
730	<	if (MyClient(source_p) && !IsExemptResv(source_p) &&
731	<	!(IsOper(source_p) && ConfigFileEntry.oper_pass_resv) &&
732	<	(!hash_find_resv(chptr->chname) == ConfigChannel.restrict_channels))
733	<	return CAN_SEND_NO;
734	<
735	<	if ((ms = find_channel_link(source_p, chptr)) == NULL)
736	<	{
737	<	if (chptr->mode.mode & MODE_NOPRIVMSGS)
718	<	return CAN_SEND_NO;
719	<	}
720	<	else
721	<	{
730	>	if (MyClient(source_p) && !IsExemptResv(source_p))
731	>	if (!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv))
732	>	if ((conf = match_find_resv(chptr->chname)) && !resv_find_exempt(source_p, conf))
733	>	return ERR_CANNOTSENDTOCHAN;
734	>
735	>	if ((chptr->mode.mode & MODE_NOCTRL) && msg_has_ctrls(message))
736	>	return ERR_NOCTRLSONCHAN;
737	>	if (ms || (ms = find_channel_link(source_p, chptr)))
738		if (ms->flags & (CHFL_CHANOP|CHFL_HALFOP|CHFL_VOICE))
739		return CAN_SEND_OPV;
740	+	if (!ms && (chptr->mode.mode & MODE_NOPRIVMSGS))
741	+	return ERR_CANNOTSENDTOCHAN;
742	+	if (chptr->mode.mode & MODE_MODERATED)
743	+	return ERR_CANNOTSENDTOCHAN;
744	+	if ((chptr->mode.mode & MODE_MODREG) && !HasUMode(source_p, UMODE_REGISTERED))
745	+	return ERR_NEEDREGGEDNICK;
746
747	<	/* cache can send if quiet_on_ban and banned */
748	<	if (ConfigChannel.quiet_on_ban && MyClient(source_p))
747	>	/* Cache can send if banned */
748	>	if (MyClient(source_p))
749	>	{
750	>	if (ms)
751		{
752		if (ms->flags & CHFL_BAN_SILENCED)
753	<	return CAN_SEND_NO;
753	>	return ERR_CANNOTSENDTOCHAN;
754
755		if (!(ms->flags & CHFL_BAN_CHECKED))
756		{
757		if (is_banned(chptr, source_p))
758		{
759		ms->flags |= (CHFL_BAN_CHECKED|CHFL_BAN_SILENCED);
760	<	return CAN_SEND_NO;
760	>	return ERR_CANNOTSENDTOCHAN;
761		}
762
763		ms->flags |= CHFL_BAN_CHECKED;
764		}
765		}
766	+	else if (is_banned(chptr, source_p))
767	+	return ERR_CANNOTSENDTOCHAN;
768		}
769
744	–	if (chptr->mode.mode & MODE_MODERATED)
745	–	return CAN_SEND_NO;
746	–
747	–	return CAN_SEND_NONOP;
748	–	}
749	–
750	–	/*! \brief Checks to see if given client can send a part message
751	–	* \param member     pointer to channel membership
752	–	* \param chptr      pointer to channel struct
753	–	* \param source_p   pointer to struct Client to check
754	–	*/
755	–	int
756	–	can_send_part(struct Membership *member, struct Channel *chptr,
757	–	struct Client *source_p)
758	–	{
759	–	if (has_member_flags(member, CHFL_CHANOP|CHFL_HALFOP))
760	–	return CAN_SEND_OPV;
761	–
762	–	if (chptr->mode.mode & MODE_MODERATED)
763	–	return CAN_SEND_NO;
764	–
765	–	if (ConfigChannel.quiet_on_ban && MyClient(source_p) &&
766	–	is_banned(chptr, source_p))
767	–	return CAN_SEND_NO;
768	–
770		return CAN_SEND_NONOP;
771		}
772
773		/*! \brief Updates the client's oper_warn_count_down, warns the
774		*         IRC operators if necessary, and updates
775		*         join_leave_countdown as needed.
776	<	* \param source_p pointer to struct Client to check
777	<	* \param name     channel name or NULL if this is a part.
776	>	* \param source_p Pointer to struct Client to check
777	>	* \param name     Channel name or NULL if this is a part.
778		*/
779		void
780		check_spambot_warning(struct Client *source_p, const char *name)
#	Line 792 | Line 793 | check_spambot_warning(struct Client *sou
793
794		if (source_p->localClient->oper_warn_count_down == 0)
795		{
796	<	/* Its already known as a possible spambot */
797	<	if (name != NULL)
798	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
796	>	/* It's already known as a possible spambot */
797	>	if (name)
798	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
799		"User %s (%s@%s) trying to join %s is a possible spambot",
800		source_p->name, source_p->username,
801		source_p->host, name);
802		else
803	<	sendto_realops_flags(UMODE_BOTS, L_ALL,
803	>	sendto_realops_flags(UMODE_BOTS, L_ALL, SEND_NOTICE,
804		"User %s (%s@%s) is a possible spambot",
805		source_p->name, source_p->username,
806		source_p->host);
#	Line 821 | Line 822 | check_spambot_warning(struct Client *sou
822		{
823		if ((CurrentTime - (source_p->localClient->last_join_time)) <
824		GlobalSetOptions.spam_time)
825	<	{
825	<	/* oh, its a possible spambot */
826	<	source_p->localClient->join_leave_count++;
827	<	}
825	>	source_p->localClient->join_leave_count++;  /* It's a possible spambot */
826		}
827
828	<	if (name != NULL)
828	>	if (name)
829		source_p->localClient->last_join_time = CurrentTime;
830		else
831		source_p->localClient->last_leave_time = CurrentTime;
832		}
833		}
834
835	<	/*! \brief compares usercount and servercount against their split
835	>	/*! \brief Compares usercount and servercount against their split
836		*         values and adjusts splitmode accordingly
837		* \param unused Unused address pointer
838		*/
#	Line 850 | Line 848 | check_splitmode(void *unused)
848		{
849		splitmode = 1;
850
851	<	sendto_realops_flags(UMODE_ALL,L_ALL,
851	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
852		"Network split, activating splitmode");
853		eventAddIsh("check_splitmode", check_splitmode, NULL, 10);
854		}
#	Line 858 | Line 856 | check_splitmode(void *unused)
856		{
857		splitmode = 0;
858
859	<	sendto_realops_flags(UMODE_ALL, L_ALL,
859	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
860		"Network rejoined, deactivating splitmode");
861		eventDelete(check_splitmode, NULL);
862		}
863		}
864		}
865
866	<	/*! \brief Allocates a new topic
867	<	* \param chptr Channel to allocate a new topic for
866	>	/*! \brief Sets the channel topic for a certain channel
867	>	* \param chptr      Pointer to struct Channel
868	>	* \param topic      The topic string
869	>	* \param topic_info n!u\@h formatted string of the topic setter
870	>	* \param topicts    Timestamp on the topic
871	>	* \param local      Whether the topic is set by a local client
872		*/
873	<	static void
874	<	allocate_topic(struct Channel *chptr)
873	>	void
874	>	set_channel_topic(struct Channel *chptr, const char *topic,
875	>	const char *topic_info, time_t topicts, int local)
876		{
877	<	void *ptr = NULL;
877	>	if (local)
878	>	strlcpy(chptr->topic, topic, IRCD_MIN(sizeof(chptr->topic), ServerInfo.max_topic_length + 1));
879	>	else
880	>	strlcpy(chptr->topic, topic, sizeof(chptr->topic));
881
882	<	if (chptr == NULL)
883	<	return;
882	>	strlcpy(chptr->topic_info, topic_info, sizeof(chptr->topic_info));
883	>	chptr->topic_time = topicts;
884	>	}
885
886	<	ptr = BlockHeapAlloc(topic_heap);
886	>	/* do_join_0()
887	>	*
888	>	* inputs       - pointer to client doing join 0
889	>	* output       - NONE
890	>	* side effects - Use has decided to join 0. This is legacy
891	>	*                from the days when channels were numbers not names. *sigh*
892	>	*                There is a bunch of evilness necessary here due to
893	>	*                anti spambot code.
894	>	*/
895	>	void
896	>	channel_do_join_0(struct Client *source_p)
897	>	{
898	>	dlink_node *ptr = NULL, *ptr_next = NULL;
899
900	<	/* Basically we allocate one large block for the topic and
901	<	* the topic info.  We then split it up into two and shove it
902	<	* in the chptr
903	<	*/
904	<	chptr->topic       = ptr;
905	<	chptr->topic_info  = (char *)ptr + TOPICLEN+1;
906	<	*chptr->topic      = '\0';
907	<	*chptr->topic_info = '\0';
900	>	if (source_p->channel.head)
901	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
902	>	check_spambot_warning(source_p, NULL);
903	>
904	>	DLINK_FOREACH_SAFE(ptr, ptr_next, source_p->channel.head)
905	>	{
906	>	struct Channel *chptr = ((struct Membership *)ptr->data)->chptr;
907	>
908	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
909	>	source_p->id, chptr->chname);
910	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
911	>	source_p->name, source_p->username,
912	>	source_p->host, chptr->chname);
913	>
914	>	remove_user_from_channel(ptr->data);
915	>	}
916	>	}
917	>
918	>	static char *
919	>	channel_find_last0(struct Client *source_p, char *chanlist)
920	>	{
921	>	int join0 = 0;
922	>
923	>	for (char *p = chanlist; *p; ++p)  /* Find last "JOIN 0" */
924	>	{
925	>	if (*p == '0' && (*(p + 1) == ',' || *(p + 1) == '\0'))
926	>	{
927	>	if ((*p + 1) == ',')
928	>	++p;
929	>
930	>	chanlist = p + 1;
931	>	join0 = 1;
932	>	}
933	>	else
934	>	{
935	>	while (*p != ',' && *p != '\0')  /* Skip past channel name */
936	>	++p;
937	>
938	>	if (*p == '\0')  /* Hit the end */
939	>	break;
940	>	}
941	>	}
942	>
943	>	if (join0)
944	>	channel_do_join_0(source_p);
945	>
946	>	return chanlist;
947		}
948
949		void
950	<	free_topic(struct Channel *chptr)
950	>	channel_do_join(struct Client *source_p, char *parv[])
951		{
952	<	void *ptr = NULL;
953	<	assert(chptr);
954	<	if (chptr->topic == NULL)
955	<	return;
952	>	char *p = NULL;
953	>	char *key_list = NULL;
954	>	char *chan_list = NULL;
955	>	char *chan = NULL;
956	>	struct Channel *chptr = NULL;
957	>	struct MaskItem *conf = NULL;
958	>	const struct ClassItem *class = get_class_ptr(&source_p->localClient->confs);
959	>	int i = 0;
960	>	unsigned int flags = 0;
961
962	<	/*
963	<	* If you change allocate_topic you MUST change this as well
964	<	*/
965	<	ptr = chptr->topic;
966	<	BlockHeapFree(topic_heap, ptr);
967	<	chptr->topic      = NULL;
968	<	chptr->topic_info = NULL;
962	>	key_list = parv[2];
963	>	chan_list = channel_find_last0(source_p, parv[1]);
964	>
965	>	for (chan = strtoken(&p, chan_list, ","); chan;
966	>	chan = strtoken(&p,      NULL, ","))
967	>	{
968	>	const char *key = NULL;
969	>
970	>	/* If we have any more keys, take the first for this channel. */
971	>	if (!EmptyString(key_list) && (key_list = strchr(key = key_list, ',')))
972	>	*key_list++ = '\0';
973	>
974	>	/* Empty keys are the same as no keys. */
975	>	if (key && *key == '\0')
976	>	key = NULL;
977	>
978	>	if (!check_channel_name(chan, 1))
979	>	{
980	>	sendto_one_numeric(source_p, &me, ERR_BADCHANNAME, chan);
981	>	continue;
982	>	}
983	>
984	>	if (!IsExemptResv(source_p) &&
985	>	!(HasUMode(source_p, UMODE_OPER) && ConfigFileEntry.oper_pass_resv) &&
986	>	((conf = match_find_resv(chan)) && !resv_find_exempt(source_p, conf)))
987	>	{
988	>	++conf->count;
989	>	sendto_one_numeric(source_p, &me, ERR_CHANBANREASON,
990	>	chan, conf->reason ? conf->reason : "Reserved channel");
991	>	sendto_realops_flags(UMODE_SPY, L_ALL, SEND_NOTICE,
992	>	"Forbidding reserved channel %s from user %s",
993	>	chan, get_client_name(source_p, HIDE_IP));
994	>	continue;
995	>	}
996	>
997	>	if (dlink_list_length(&source_p->channel) >=
998	>	((class->max_channels) ? class->max_channels : ConfigChannel.max_channels))
999	>	{
1000	>	sendto_one_numeric(source_p, &me, ERR_TOOMANYCHANNELS, chan);
1001	>	break;
1002	>	}
1003	>
1004	>	if ((chptr = hash_find_channel(chan)))
1005	>	{
1006	>	if (IsMember(source_p, chptr))
1007	>	continue;
1008	>
1009	>	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1010	>	ConfigChannel.no_join_on_split)
1011	>	{
1012	>	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1013	>	continue;
1014	>	}
1015	>
1016	>	/*
1017	>	* can_join checks for +i key, bans.
1018	>	*/
1019	>	if ((i = can_join(source_p, chptr, key)))
1020	>	{
1021	>	sendto_one_numeric(source_p, &me, i, chptr->chname);
1022	>	continue;
1023	>	}
1024	>
1025	>	/*
1026	>	* This should never be the case unless there is some sort of
1027	>	* persistant channels.
1028	>	*/
1029	>	if (dlink_list_length(&chptr->members) == 0)
1030	>	flags = CHFL_CHANOP;
1031	>	else
1032	>	flags = 0;
1033	>	}
1034	>	else
1035	>	{
1036	>	if (splitmode && !HasUMode(source_p, UMODE_OPER) &&
1037	>	(ConfigChannel.no_create_on_split || ConfigChannel.no_join_on_split))
1038	>	{
1039	>	sendto_one_numeric(source_p, &me, ERR_UNAVAILRESOURCE, chan);
1040	>	continue;
1041	>	}
1042	>
1043	>	flags = CHFL_CHANOP;
1044	>	chptr = make_channel(chan);
1045	>	}
1046	>
1047	>	if (!HasUMode(source_p, UMODE_OPER))
1048	>	check_spambot_warning(source_p, chptr->chname);
1049	>
1050	>	add_user_to_channel(chptr, source_p, flags, 1);
1051	>
1052	>	/*
1053	>	*  Set timestamp if appropriate, and propagate
1054	>	*/
1055	>	if (flags == CHFL_CHANOP)
1056	>	{
1057	>	chptr->channelts = CurrentTime;
1058	>	chptr->mode.mode |= MODE_TOPICLIMIT;
1059	>	chptr->mode.mode |= MODE_NOPRIVMSGS;
1060	>
1061	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s SJOIN %lu %s +nt :@%s",
1062	>	me.id, (unsigned long)chptr->channelts,
1063	>	chptr->chname, source_p->id);
1064	>
1065	>	/*
1066	>	* Notify all other users on the new channel
1067	>	*/
1068	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1069	>	source_p->name, source_p->username,
1070	>	source_p->host, chptr->chname);
1071	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s MODE %s +nt",
1072	>	me.name, chptr->chname);
1073	>
1074	>	if (source_p->away[0])
1075	>	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
1076	>	":%s!%s@%s AWAY :%s",
1077	>	source_p->name, source_p->username,
1078	>	source_p->host, source_p->away);
1079	>	}
1080	>	else
1081	>	{
1082	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s JOIN %lu %s +",
1083	>	source_p->id, (unsigned long)chptr->channelts,
1084	>	chptr->chname);
1085	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s JOIN :%s",
1086	>	source_p->name, source_p->username,
1087	>	source_p->host, chptr->chname);
1088	>
1089	>	if (source_p->away[0])
1090	>	sendto_channel_local_butone(source_p, 0, CAP_AWAY_NOTIFY, chptr,
1091	>	":%s!%s@%s AWAY :%s",
1092	>	source_p->name, source_p->username,
1093	>	source_p->host, source_p->away);
1094	>	}
1095	>
1096	>	del_invite(chptr, source_p);
1097	>
1098	>	if (chptr->topic[0])
1099	>	{
1100	>	sendto_one_numeric(source_p, &me, RPL_TOPIC, chptr->chname, chptr->topic);
1101	>	sendto_one_numeric(source_p, &me, RPL_TOPICWHOTIME, chptr->chname,
1102	>	chptr->topic_info, chptr->topic_time);
1103	>	}
1104	>
1105	>	channel_member_names(source_p, chptr, 1);
1106	>
1107	>	source_p->localClient->last_join_time = CurrentTime;
1108	>	}
1109		}
1110
1111	<	/*! \brief Sets the channel topic for chptr
1112	<	* \param chptr      Pointer to struct Channel
1113	<	* \param topic      The topic string
1114	<	* \param topic_info n!u\@h formatted string of the topic setter
912	<	* \param topicts    timestamp on the topic
1111	>	/*! \brief Removes a client from a specific channel
1112	>	* \param source_p Pointer to source client to remove
1113	>	* \param name     Name of channel to remove from
1114	>	* \param reason   Part reason to show
1115		*/
1116	<	void
1117	<	set_channel_topic(struct Channel *chptr, const char *topic,
916	<	const char *topic_info, time_t topicts)
1116	>	static void
1117	>	channel_part_one_client(struct Client *source_p, const char *name, const char *reason)
1118		{
1119	<	if (!EmptyString(topic))
1119	>	struct Channel *chptr = NULL;
1120	>	struct Membership *ms = NULL;
1121	>
1122	>	if ((chptr = hash_find_channel(name)) == NULL)
1123	>	{
1124	>	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, name);
1125	>	return;
1126	>	}
1127	>
1128	>	if ((ms = find_channel_link(source_p, chptr)) == NULL)
1129		{
1130	<	if (chptr->topic == NULL)
1131	<	allocate_topic(chptr);
1130	>	sendto_one_numeric(source_p, &me, ERR_NOTONCHANNEL, chptr->chname);
1131	>	return;
1132	>	}
1133
1134	<	strlcpy(chptr->topic, topic, TOPICLEN+1);
1135	<	strlcpy(chptr->topic_info, topic_info, USERHOST_REPLYLEN);
1136	<	chptr->topic_time = topicts;
1134	>	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
1135	>	check_spambot_warning(source_p, NULL);
1136	>
1137	>	/*
1138	>	* Remove user from the old channel (if any)
1139	>	* only allow /part reasons in -m chans
1140	>	*/
1141	>	if (*reason && (!MyConnect(source_p) ||
1142	>	((can_send(chptr, source_p, ms, reason) &&
1143	>	(source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time)
1144	>	< CurrentTime))))
1145	>	{
1146	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s :%s",
1147	>	source_p->id, chptr->chname, reason);
1148	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s :%s",
1149	>	source_p->name, source_p->username,
1150	>	source_p->host, chptr->chname, reason);
1151		}
1152		else
1153		{
1154	<	if (chptr->topic != NULL)
1155	<	free_topic(chptr);
1156	<
1157	<	chptr->topic_time = 0;
1154	>	sendto_server(source_p, NOCAPS, NOCAPS, ":%s PART %s",
1155	>	source_p->id, chptr->chname);
1156	>	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s!%s@%s PART %s",
1157	>	source_p->name, source_p->username,
1158	>	source_p->host, chptr->chname);
1159		}
1160	+
1161	+	remove_user_from_channel(ms);
1162		}
1163
1164	+	void
1165	+	channel_do_part(struct Client *source_p, char *parv[])
1166	+	{
1167	+	char *p = NULL, *name = NULL;
1168	+	char reason[KICKLEN + 1] = "";
1169	+
1170	+	if (!EmptyString(parv[2]))
1171	+	strlcpy(reason, parv[2], sizeof(reason));
1172	+
1173	+	for (name = strtoken(&p, parv[1], ","); name;
1174	+	name = strtoken(&p,    NULL, ","))
1175	+	channel_part_one_client(source_p, name, reason);
1176	+	}

Comparing:
ircd-hybrid/src/channel.c (property svn:keywords), Revision 32 by knight, Sun Oct 2 20:41:23 2005 UTC vs.
ircd-hybrid/trunk/src/channel.c (property svn:keywords), Revision 3933 by michael, Mon Jun 9 17:56:42 2014 UTC

#	Line 1 | Line 1
1	<	Revision
1	>	Id Revision

Diff Legend

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