ViewVC Help

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

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

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 3135 by michael, Mon Mar 10 21:11:25 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 4965 by michael, Mon Dec 1 13:59:44 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 26 | Line 26
26
27		#include "stdinc.h"
28		#include "list.h"
29	<	#include "s_user.h"
30	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
#	Line 39 | Line 38
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
54	–
55	–	static void user_welcome(struct Client *);
56	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
57	–	static int check_xline(struct Client *);
58	–	static void introduce_client(struct Client *);
52		static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
64	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 124 | Line 116 | const unsigned int user_modes[256] =
116		0,                  /* m */
117		UMODE_NCHANGE,      /* n */
118		UMODE_OPER,         /* o */
119	<	0,                  /* p */
120	<	0,                  /* q */
119	>	UMODE_HIDECHANS,    /* p */
120	>	UMODE_HIDEIDLE,     /* q */
121		UMODE_REGISTERED,   /* r */
122		UMODE_SERVNOTICE,   /* s */
123		0,                  /* t */
#	Line 134 | Line 126 | const unsigned int user_modes[256] =
126		UMODE_WALLOP,       /* w */
127		UMODE_HIDDENHOST,   /* x */
128		UMODE_SPY,          /* y */
129	<	UMODE_OPERWALL,     /* z      0x7A */
129	>	0,                  /* z      0x7A */
130		0,0,0,0,0,          /* 0x7B - 0x7F */
131
132		/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
#	Line 170 | Line 162 | void
162		show_lusers(struct Client *source_p)
163		{
164		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
165	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
166	<	Count.invisi, dlink_list_length(&global_serv_list));
165	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
166	>	Count.invisi, dlink_list_length(&global_server_list));
167		else
168	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
169	<	(Count.total-Count.invisi), Count.invisi, 1);
168	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
169	>	Count.invisi, 1);
170
171	<	if (Count.oper > 0)
171	>	if (Count.oper)
172		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
173
174	<	if (dlink_list_length(&unknown_list) > 0)
174	>	if (dlink_list_length(&unknown_list))
175		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
176
177	<	if (dlink_list_length(&global_channel_list) > 0)
178	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
177	>	if (dlink_list_length(&channel_list))
178	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
179
180		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
181		{
#	Line 218 | Line 210 | show_lusers(struct Client *source_p)
210		void
211		show_isupport(struct Client *source_p)
212		{
213	<	const dlink_node *ptr = NULL;
213	>	const dlink_node *node = NULL;
214
215	<	DLINK_FOREACH(ptr, support_list_lines.head)
216	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
215	>	DLINK_FOREACH(node, support_list_lines.head)
216	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
217		}
218
219	<	/*
220	<	** register_local_user
221	<	**      This function is called when both NICK and USER messages
222	<	**      have been accepted for the client, in whatever order. Only
223	<	**      after this, is the USER message propagated.
224	<	**
225	<	**      NICK's must be propagated at once when received, although
226	<	**      it would be better to delay them too until full info is
227	<	**      available. Doing it is not so simple though, would have
228	<	**      to implement the following:
229	<	**
230	<	**      (actually it has been implemented already for a while) -orabidoo
231	<	**
232	<	**      1) user telnets in and gives only "NICK foobar" and waits
233	<	**      2) another user far away logs in normally with the nick
234	<	**         "foobar" (quite legal, as this server didn't propagate
235	<	**         it).
236	<	**      3) now this server gets nick "foobar" from outside, but
237	<	**         has alread the same defined locally. Current server
238	<	**         would just issue "KILL foobar" to clean out dups. But,
239	<	**         this is not fair. It should actually request another
240	<	**         nick from local user or kill him/her...
241	<	*/
219	>
220	>	/* report_and_set_user_flags()
221	>	*
222	>	* inputs       - pointer to source_p
223	>	*              - pointer to conf for this user
224	>	* output       - NONE
225	>	* side effects - Report to user any special flags
226	>	*                they are getting, and set them.
227	>	*/
228	>	static void
229	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
230	>	{
231	>	/* If this user is being spoofed, tell them so */
232	>	if (IsConfDoSpoofIp(conf))
233	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
234	>
235	>	/* If this user is in the exception class, set it "E lined" */
236	>	if (IsConfExemptKline(conf))
237	>	{
238	>	SetExemptKline(source_p);
239	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
240	>	}
241	>
242	>	/*
243	>	* The else here is to make sure that G line exempt users
244	>	* do not get noticed twice.
245	>	*/
246	>	else if (IsConfExemptGline(conf))
247	>	{
248	>	SetExemptGline(source_p);
249	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
250	>	}
251	>
252	>	if (IsConfExemptResv(conf))
253	>	{
254	>	SetExemptResv(source_p);
255	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
256	>	}
257	>
258	>	/* If this user is exempt from user limits set it "F lined" */
259	>	if (IsConfExemptLimits(conf))
260	>	{
261	>	SetExemptLimits(source_p);
262	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
263	>	}
264	>
265	>	if (IsConfCanFlood(conf))
266	>	{
267	>	SetCanFlood(source_p);
268	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
269	>	"protection, aren't you fearsome.");
270	>	}
271	>	}
272	>
273	>	/* introduce_client()
274	>	*
275	>	* inputs       - source_p
276	>	* output       - NONE
277	>	* side effects - This common function introduces a client to the rest
278	>	*                of the net, either from a local client connect or
279	>	*                from a remote connect.
280	>	*/
281	>	static void
282	>	introduce_client(struct Client *source_p)
283	>	{
284	>	dlink_node *node = NULL;
285	>	char ubuf[IRCD_BUFSIZE] = "";
286	>
287	>	if (MyClient(source_p))
288	>	send_umode(source_p, source_p, 0, ubuf);
289	>	else
290	>	send_umode(NULL, source_p, 0, ubuf);
291	>
292	>	watch_check_hash(source_p, RPL_LOGON);
293	>
294	>	if (ubuf[0] == '\0')
295	>	{
296	>	ubuf[0] = '+';
297	>	ubuf[1] = '\0';
298	>	}
299	>
300	>	DLINK_FOREACH(node, local_server_list.head)
301	>	{
302	>	struct Client *server = node->data;
303	>
304	>	if (server == source_p->from)
305	>	continue;
306	>
307	>	if (IsCapable(server, CAP_SVS))
308	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
309	>	source_p->servptr->id,
310	>	source_p->name, source_p->hopcount+1,
311	>	(unsigned long)source_p->tsinfo,
312	>	ubuf, source_p->username, source_p->host,
313	>	source_p->sockhost, source_p->id,
314	>	source_p->account,
315	>	source_p->info);
316	>	else
317	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
318	>	source_p->servptr->id,
319	>	source_p->name, source_p->hopcount+1,
320	>	(unsigned long)source_p->tsinfo,
321	>	ubuf, source_p->username, source_p->host,
322	>	source_p->sockhost, source_p->id, source_p->info);
323	>
324	>	if (!EmptyString(source_p->certfp))
325	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
326	>	}
327	>	}
328	>
329	>	/* user_welcome()
330	>	*
331	>	* inputs       - client pointer to client to welcome
332	>	* output       - NONE
333	>	* side effects -
334	>	*/
335	>	static void
336	>	user_welcome(struct Client *source_p)
337	>	{
338	>	#if defined(__TIME__) && defined(__DATE__)
339	>	static const char built_date[] = __DATE__ " at " __TIME__;
340	>	#else
341	>	static const char built_date[] = "unknown";
342	>	#endif
343	>
344	>	#ifdef HAVE_LIBCRYPTO
345	>	if (HasFlag(source_p, FLAGS_SSL))
346	>	{
347	>	AddUMode(source_p, UMODE_SSL);
348	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
349	>	ssl_get_cipher(source_p->connection->fd.ssl));
350	>	}
351	>	#endif
352	>
353	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
354	>	source_p->name);
355	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
356	>	get_listener_name(source_p->connection->listener), ircd_version);
357	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
358	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
359	>	show_isupport(source_p);
360	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
361	>
362	>	show_lusers(source_p);
363	>	motd_signon(source_p);
364	>	}
365	>
366	>	/* check_xline()
367	>	*
368	>	* inputs       - pointer to client to test
369	>	* outupt       - 1 if exiting 0 if ok
370	>	* side effects -
371	>	*/
372	>	static int
373	>	check_xline(struct Client *source_p)
374	>	{
375	>	struct MaskItem *conf = NULL;
376	>
377	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
378	>	{
379	>	++conf->count;
380	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
381	>	"X-line Rejecting [%s] [%s], user %s [%s]",
382	>	source_p->info, conf->reason,
383	>	get_client_name(source_p, HIDE_IP),
384	>	source_p->sockhost);
385	>
386	>	++ServerStats.is_ref;
387	>	exit_client(source_p, "Bad user info");
388	>	return 1;
389	>	}
390	>
391	>	return 0;
392	>	}
393	>
394	>	/*! \brief This function is called when both NICK and USER messages
395	>	*      have been accepted for the client, in whatever order. Only
396	>	*      after this, is the UID message propagated.
397	>	* \param source_p Pointer to given client to introduce
398	>	*/
399		void
400		register_local_user(struct Client *source_p)
401		{
402		const char *id = NULL;
403		const struct MaskItem *conf = NULL;
404
256	–	assert(source_p != NULL);
405		assert(source_p == source_p->from);
406		assert(MyConnect(source_p));
407	<	assert(!source_p->localClient->registration);
407	>	assert(!source_p->connection->registration);
408
409		ClearCap(source_p, CAP_TS6);
410
411	<	if (ConfigFileEntry.ping_cookie)
411	>	if (ConfigGeneral.ping_cookie)
412		{
413	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
413	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
414		{
415		do
416	<	source_p->localClient->random_ping = genrand_int32();
417	<	while (!source_p->localClient->random_ping);
416	>	source_p->connection->random_ping = genrand_int32();
417	>	while (!source_p->connection->random_ping);
418
419	<	sendto_one(source_p, "PING :%u",
272	<	source_p->localClient->random_ping);
419	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
420		SetPingSent(source_p);
421		return;
422		}
#	Line 278 | Line 425 | register_local_user(struct Client *sourc
425		return;
426		}
427
428	<	source_p->localClient->last_privmsg = CurrentTime;
428	>	source_p->connection->last_privmsg = CurrentTime;
429		/* Straight up the maximum rate of flooding... */
430	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
430	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
431
432		if (!check_client(source_p))
433		return;
#	Line 289 | Line 436 | register_local_user(struct Client *sourc
436		{
437		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
438		"character in your hostname");
439	<	strlcpy(source_p->host, source_p->sockhost,
293	<	sizeof(source_p->host));
439	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
440		}
441
442	<	conf = source_p->localClient->confs.head->data;
442	>	conf = source_p->connection->confs.head->data;
443
444		if (!IsGotId(source_p))
445		{
446	<	char username[USERLEN + 1];
446	>	char username[USERLEN + 1] = "";
447		const char *p = username;
448		unsigned int i = 0;
449
#	Line 306 | Line 452 | register_local_user(struct Client *sourc
452		++ServerStats.is_ref;
453		sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
454		"identd to use this server");
455	<	exit_client(source_p, &me, "Install identd");
455	>	exit_client(source_p, "Install identd");
456		return;
457		}
458
#	Line 316 | Line 462 | register_local_user(struct Client *sourc
462		source_p->username[i++] = '~';
463
464		for (; *p && i < USERLEN; ++p)
465	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
465	>	source_p->username[i++] = *p;
466
467		source_p->username[i] = '\0';
468		}
469
470	<	/* password check */
470	>	/* Password check */
471		if (!EmptyString(conf->passwd))
472		{
473	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
473	>	if (!match_conf_password(source_p->connection->password, conf))
474		{
475		++ServerStats.is_ref;
476
477		sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
478	<	exit_client(source_p, &me, "Bad Password");
478	>	exit_client(source_p, "Bad Password");
479		return;
480		}
481		}
482
483	<	/* don't free source_p->localClient->passwd here - it can be required
484	<	* by masked /stats I if there are auth{} blocks with need_password = no;
483	>	/*
484	>	* Don't free source_p->connection->password here - it can be required
485	>	* by masked /stats I if there are auth {} blocks with need_password = no;
486		* --adx
487		*/
488
489	<	/* report if user has &^>= etc. and set flags as needed in source_p */
489	>	/*
490	>	* Report if user has &^>= etc. and set flags as needed in source_p
491	>	*/
492		report_and_set_user_flags(source_p, conf);
493
494		if (IsDead(source_p))
495		return;
496
497	<	/* Limit clients -
497	>	/*
498	>	* Limit clients -
499		* We want to be able to have servers and F-line clients
500		* connect, so save room for "buffer" connections.
501		* Smaller servers may want to decrease this, and it should
502		* probably be just a percentage of the MAXCLIENTS...
503		*   -Taner
504		*/
505	<	/* Except "F:" clients */
506	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
505	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
506	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
507		{
508		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
509		"Too many clients, rejecting %s[%s].",
510		source_p->name, source_p->host);
511		++ServerStats.is_ref;
512	<	exit_client(source_p, &me, "Sorry, server is full - try later");
512	>	exit_client(source_p, "Sorry, server is full - try later");
513		return;
514		}
515
370	–	/* valid user name check */
516		if (!valid_username(source_p->username, 1))
517		{
518	<	char tmpstr2[IRCD_BUFSIZE];
518	>	char buf[IRCD_BUFSIZE] = "";
519
520		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
521		"Invalid username: %s (%s@%s)",
522		source_p->name, source_p->username, source_p->host);
523		++ServerStats.is_ref;
524	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
525	<	source_p->username);
381	<	exit_client(source_p, &me, tmpstr2);
524	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
525	>	exit_client(source_p, buf);
526		return;
527		}
528
529		if (check_xline(source_p))
530		return;
531
532	<	while (hash_find_id((id = uid_get())) != NULL)
532	>	while (hash_find_id((id = uid_get())))
533		;
534
535		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 394 | Line 538 | register_local_user(struct Client *sourc
538		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
539		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
540		source_p->name, source_p->username, source_p->host,
541	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
541	>	ConfigGeneral.hide_spoof_ips && IsIPSpoof(source_p) ?
542		"255.255.255.255" : source_p->sockhost,
543	<	get_client_class(&source_p->localClient->confs),
543	>	get_client_class(&source_p->connection->confs),
544		source_p->info, source_p->id);
545
546	<	if (ConfigFileEntry.invisible_on_connect)
546	>	if (ConfigGeneral.invisible_on_connect)
547		{
548		AddUMode(source_p, UMODE_INVISIBLE);
549		++Count.invisi;
#	Line 411 | Line 555 | register_local_user(struct Client *sourc
555
556		if (!(Count.max_loc % 10))
557		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
558	<	"New Max Local Clients: %d",
558	>	"New maximum local client connections: %u",
559		Count.max_loc);
560		}
561
418	–	/* Increment our total user count here */
562		if (++Count.total > Count.max_tot)
563		Count.max_tot = Count.total;
564		++Count.totalrestartcount;
#	Line 423 | Line 566 | register_local_user(struct Client *sourc
566		assert(source_p->servptr == &me);
567		SetClient(source_p);
568		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
569	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
569	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
570
571		assert(dlinkFind(&unknown_list, source_p));
572
573	<	dlink_move_node(&source_p->localClient->lclient_node,
573	>	dlink_move_node(&source_p->connection->lclient_node,
574		&unknown_list, &local_client_list);
575
576		user_welcome(source_p);
#	Line 449 | Line 591 | register_local_user(struct Client *sourc
591		*                is introduced by a server.
592		*/
593		void
594	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
594	>	register_remote_user(struct Client *source_p)
595		{
596	<	struct Client *target_p = NULL;
456	<
457	<	assert(source_p != NULL);
458	<	assert(source_p->username != username);
459	<
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
461	<	strlcpy(source_p->username, username, sizeof(source_p->username));
462	<
463	<	/*
464	<	* coming from another server, take the servers word for it
465	<	*/
466	<	source_p->servptr = hash_find_server(server);
467	<
468	<	/*
469	<	* Super GhostDetect:
470	<	* If we can't find the server the user is supposed to be on,
471	<	* then simply blow the user away.        -Taner
472	<	*/
473	<	if (source_p->servptr == NULL)
474	<	{
475	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476	<	"No server %s for user %s[%s@%s] from %s",
477	<	server, source_p->name, source_p->username,
478	<	source_p->host, source_p->from->name);
479	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
480	<
481	<	AddFlag(source_p, FLAGS_KILLED);
482	<	exit_client(source_p, &me, "Ghosted Client");
483	<	return;
484	<	}
596	>	const struct Client *target_p = NULL;
597
598		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
599		{
#	Line 490 | Line 602 | register_remote_user(struct Client *sour
602		source_p->from->name, source_p->name, source_p->username,
603		source_p->host, source_p->servptr->name,
604		target_p->name, target_p->from->name);
605	<	kill_client(source_p->from, source_p,
606	<	"%s (NICK from wrong direction (%s != %s))",
607	<	me.name, source_p->servptr->name, target_p->from->name);
605	>	sendto_one(source_p->from,
606	>	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
607	>	me.id, source_p->id, me.name, source_p->servptr->name,
608	>	target_p->from->name);
609	>
610		AddFlag(source_p, FLAGS_KILLED);
611	<	exit_client(source_p, &me, "USER server wrong direction");
611	>	exit_client(source_p, "USER server wrong direction");
612		return;
613		}
614
#	Line 505 | Line 619 | register_remote_user(struct Client *sour
619		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
620		AddFlag(source_p, FLAGS_SERVICE);
621
508	–	/* Increment our total user count here */
622		if (++Count.total > Count.max_tot)
623		Count.max_tot = Count.total;
624
625		SetClient(source_p);
626		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
627	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
628		add_user_host(source_p->username, source_p->host, 1);
629		SetUserHost(source_p);
630
#	Line 524 | Line 638 | register_remote_user(struct Client *sour
638		introduce_client(source_p);
639		}
640
527	–	/* introduce_client()
528	–	*
529	–	* inputs       - source_p
530	–	* output       - NONE
531	–	* side effects - This common function introduces a client to the rest
532	–	*                of the net, either from a local client connect or
533	–	*                from a remote connect.
534	–	*/
535	–	static void
536	–	introduce_client(struct Client *source_p)
537	–	{
538	–	dlink_node *server_node = NULL;
539	–	char ubuf[IRCD_BUFSIZE];
540	–
541	–	if (MyClient(source_p))
542	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
543	–	else
544	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
545	–
546	–	watch_check_hash(source_p, RPL_LOGON);
547	–
548	–	if (ubuf[0] == '\0')
549	–	{
550	–	ubuf[0] = '+';
551	–	ubuf[1] = '\0';
552	–	}
553	–
554	–	DLINK_FOREACH(server_node, serv_list.head)
555	–	{
556	–	struct Client *server = server_node->data;
557	–
558	–	if (server == source_p->from)
559	–	continue;
560	–
561	–	if (IsCapable(server, CAP_SVS))
562	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
563	–	source_p->servptr->id,
564	–	source_p->name, source_p->hopcount+1,
565	–	(unsigned long)source_p->tsinfo,
566	–	ubuf, source_p->username, source_p->host,
567	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
568	–	"0" : source_p->sockhost, source_p->id,
569	–	source_p->svid,
570	–	source_p->info);
571	–	else
572	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
573	–	source_p->servptr->id,
574	–	source_p->name, source_p->hopcount+1,
575	–	(unsigned long)source_p->tsinfo,
576	–	ubuf, source_p->username, source_p->host,
577	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
578	–	"0" : source_p->sockhost, source_p->id, source_p->info);
579	–
580	–	if (!EmptyString(source_p->certfp))
581	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
582	–	}
583	–	}
584	–
641		/* valid_hostname()
642		*
643		* Inputs       - pointer to hostname
#	Line 596 | Line 652 | valid_hostname(const char *hostname)
652		{
653		const char *p = hostname;
654
655	<	assert(p != NULL);
655	>	assert(p);
656
657		if (EmptyString(p) || *p == '.' || *p == ':')
658		return 0;
#	Line 622 | Line 678 | valid_hostname(const char *hostname)
678		int
679		valid_username(const char *username, const int local)
680		{
681	<	int dots      = 0;
681	>	unsigned int dots = 0;
682		const char *p = username;
683
684	<	assert(p != NULL);
684	>	assert(p);
685
686		if (*p == '~')
687		++p;
#	Line 642 | Line 698 | valid_username(const char *username, con
698		{
699		while (*++p)
700		{
701	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
701	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
702		{
703	<	if (++dots > ConfigFileEntry.dots_in_ident)
703	>	if (++dots > ConfigGeneral.dots_in_ident)
704		return 0;
705		if (!IsUserChar(*(p + 1)))
706		return 0;
#	Line 660 | Line 716 | valid_username(const char *username, con
716		return 0;
717		}
718
719	<	return  p - username <= USERLEN;;
719	>	return p - username <= USERLEN;
720		}
721
722		/* clean_nick_name()
#	Line 674 | Line 730 | int
730		valid_nickname(const char *nickname, const int local)
731		{
732		const char *p = nickname;
733	+
734		assert(nickname && *nickname);
735
736	<	/* nicks can't start with a digit or - or be 0 length */
737	<	/* This closer duplicates behaviour of hybrid-6 */
738	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
736	>	/*
737	>	* Nicks can't start with a digit or - or be 0 length.
738	>	*/
739	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
740		return 0;
741
742		for (; *p; ++p)
#	Line 688 | Line 746 | valid_nickname(const char *nickname, con
746		return p - nickname <= NICKLEN;
747		}
748
691	–	/* report_and_set_user_flags()
692	–	*
693	–	* inputs       - pointer to source_p
694	–	*              - pointer to conf for this user
695	–	* output       - NONE
696	–	* side effects - Report to user any special flags
697	–	*                they are getting, and set them.
698	–	*/
699	–	static void
700	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
701	–	{
702	–	/* If this user is being spoofed, tell them so */
703	–	if (IsConfDoSpoofIp(conf))
704	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
705	–
706	–	/* If this user is in the exception class, Set it "E lined" */
707	–	if (IsConfExemptKline(conf))
708	–	{
709	–	SetExemptKline(source_p);
710	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
711	–	}
712	–
713	–	/*
714	–	* The else here is to make sure that G line exempt users
715	–	* do not get noticed twice.
716	–	*/
717	–	else if (IsConfExemptGline(conf))
718	–	{
719	–	SetExemptGline(source_p);
720	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
721	–	}
722	–
723	–	if (IsConfExemptResv(conf))
724	–	{
725	–	SetExemptResv(source_p);
726	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
727	–	}
728	–
729	–	/* If this user is exempt from user limits set it "F lined" */
730	–	if (IsConfExemptLimits(conf))
731	–	{
732	–	SetExemptLimits(source_p);
733	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
734	–	}
735	–
736	–	if (IsConfCanFlood(conf))
737	–	{
738	–	SetCanFlood(source_p);
739	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
740	–	"protection, aren't you fearsome.");
741	–	}
742	–	}
743	–
744	–	/* set_user_mode()
745	–	*
746	–	* added 15/10/91 By Darren Reed.
747	–	* parv[0] - sender
748	–	* parv[1] - username to change mode for
749	–	* parv[2] - modes to change
750	–	*/
751	–	void
752	–	set_user_mode(struct Client *client_p, struct Client *source_p,
753	–	const int parc, char *parv[])
754	–	{
755	–	unsigned int flag, setflags;
756	–	char **p, *m, buf[IRCD_BUFSIZE];
757	–	struct Client *target_p;
758	–	int what = MODE_ADD, badflag = 0, i;
759	–
760	–	assert(!(parc < 2));
761	–
762	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
763	–	{
764	–	if (MyConnect(source_p))
765	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
766	–	return;
767	–	}
768	–
769	–	if (source_p != target_p)
770	–	{
771	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
772	–	return;
773	–	}
774	–
775	–	if (parc < 3)
776	–	{
777	–	m = buf;
778	–	*m++ = '+';
779	–
780	–	for (i = 0; i < 128; ++i)
781	–	if (HasUMode(source_p, user_modes[i]))
782	–	*m++ = (char)i;
783	–	*m = '\0';
784	–
785	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
786	–	return;
787	–	}
788	–
789	–	/* find flags already set for user */
790	–	setflags = source_p->umodes;
791	–
792	–	/* parse mode change string(s) */
793	–	for (p = &parv[2]; p && *p; ++p)
794	–	{
795	–	for (m = *p; *m; ++m)
796	–	{
797	–	switch (*m)
798	–	{
799	–	case '+':
800	–	what = MODE_ADD;
801	–	break;
802	–	case '-':
803	–	what = MODE_DEL;
804	–	break;
805	–	case 'o':
806	–	if (what == MODE_ADD)
807	–	{
808	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
809	–	{
810	–	++Count.oper;
811	–	SetOper(source_p);
812	–	}
813	–	}
814	–	else
815	–	{
816	–	if (!HasUMode(source_p, UMODE_OPER))
817	–	break;
818	–
819	–	ClearOper(source_p);
820	–	Count.oper--;
821	–
822	–	if (MyConnect(source_p))
823	–	{
824	–	dlink_node *dm = NULL;
825	–
826	–	detach_conf(source_p, CONF_OPER);
827	–	ClrOFlag(source_p);
828	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
829	–
830	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
831	–	free_dlink_node(dm);
832	–	}
833	–	}
834	–
835	–	break;
836	–
837	–	case 'S':  /* Only servers may set +S in a burst */
838	–	case 'W':  /* Only servers may set +W in a burst */
839	–	case 'r':  /* Only services may set +r */
840	–	case 'x':  /* Only services may set +x */
841	–	break;
842	–
843	–	default:
844	–	if ((flag = user_modes[(unsigned char)*m]))
845	–	{
846	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
847	–	(ConfigFileEntry.oper_only_umodes & flag))
848	–	badflag = 1;
849	–	else
850	–	{
851	–	if (what == MODE_ADD)
852	–	AddUMode(source_p, flag);
853	–	else
854	–	DelUMode(source_p, flag);
855	–	}
856	–	}
857	–	else if (MyConnect(source_p))
858	–	badflag = 1;
859	–
860	–	break;
861	–	}
862	–	}
863	–	}
864	–
865	–	if (badflag)
866	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
867	–
868	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
869	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
870	–	{
871	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
872	–	DelUMode(source_p, UMODE_ADMIN);
873	–	}
874	–
875	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
876	–	++Count.invisi;
877	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
878	–	--Count.invisi;
879	–
880	–	/*
881	–	* compare new flags with old flags and send string which
882	–	* will cause servers to update correctly.
883	–	*/
884	–	send_umode_out(client_p, source_p, setflags);
885	–	}
886	–
749		/* send_umode()
750		* send the MODE string for user (user) to connection client_p
751		* -avalon
#	Line 897 | Line 759 | set_user_mode(struct Client *client_p, s
759		*/
760		void
761		send_umode(struct Client *client_p, struct Client *source_p,
762	<	unsigned int old, unsigned int sendmask, char *umode_buf)
762	>	unsigned int old, char *umode_buf)
763		{
764		char *m = umode_buf;
765		int what = 0;
904	–	unsigned int i;
905	–	unsigned int flag;
766
767		/*
768	<	* build a string in umode_buf to represent the change in the user's
768	>	* Build a string in umode_buf to represent the change in the user's
769		* mode between the new (source_p->umodes) and 'old'.
770		*/
771	<	for (i = 0; i < 128; ++i)
771	>	for (unsigned int i = 0; i < 128; ++i)
772		{
773	<	flag = user_modes[i];
914	<	if (!flag)
915	<	continue;
773	>	unsigned int flag = user_modes[i];
774
775	<	if (MyClient(source_p) && !(flag & sendmask))
775	>	if (!flag)
776		continue;
777
778		if ((flag & old) && !HasUMode(source_p, flag))
#	Line 945 | Line 803 | send_umode(struct Client *client_p, stru
803
804		if (*umode_buf && client_p)
805		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
806	<	source_p->name, source_p->username,
807	<	source_p->host, source_p->name, umode_buf);
806	>	client_p->name, client_p->username,
807	>	client_p->host, client_p->name, umode_buf);
808		}
809
810		/* send_umode_out()
#	Line 956 | Line 814 | send_umode(struct Client *client_p, stru
814		* side effects - Only send ubuf out to servers that know about this client
815		*/
816		void
817	<	send_umode_out(struct Client *client_p, struct Client *source_p,
960	<	unsigned int old)
817	>	send_umode_out(struct Client *source_p, unsigned int old)
818		{
819	<	char buf[IRCD_BUFSIZE] = { '\0' };
963	<	dlink_node *ptr = NULL;
819	>	char buf[IRCD_BUFSIZE] = "";
820
821	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
821	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
822
823		if (buf[0])
824	<	{
825	<	DLINK_FOREACH(ptr, serv_list.head)
970	<	{
971	<	struct Client *target_p = ptr->data;
972	<
973	<	if ((target_p != client_p) && (target_p != source_p))
974	<	sendto_one(target_p, ":%s MODE %s :%s",
975	<	ID_or_name(source_p, target_p),
976	<	ID_or_name(source_p, target_p), buf);
977	<	}
978	<	}
979	<
980	<	if (client_p && MyClient(client_p))
981	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
824	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
825	>	source_p->id, source_p->id, buf);
826		}
827
828		void
829		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
830		{
831	<	dlink_node *ptr = NULL;
831	>	dlink_node *node = NULL;
832
833		if (!strcmp(target_p->host, hostname))
834		return;
#	Line 1004 | Line 848 | user_set_hostmask(struct Client *target_
848		default: return;
849		}
850
851	<	if (ConfigFileEntry.cycle_on_host_change)
851	>	if (ConfigGeneral.cycle_on_host_change)
852		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
853		target_p->name, target_p->username, target_p->host);
854
#	Line 1018 | Line 862 | user_set_hostmask(struct Client *target_
862
863		if (MyClient(target_p))
864		{
865	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
865	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
866		clear_ban_cache_client(target_p);
867		}
868
869	<	if (!ConfigFileEntry.cycle_on_host_change)
869	>	if (!ConfigGeneral.cycle_on_host_change)
870		return;
871
872	<	DLINK_FOREACH(ptr, target_p->channel.head)
872	>	DLINK_FOREACH(node, target_p->channel.head)
873		{
874	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
874	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
875		char *p = modebuf;
876		int len = 0;
877	<	const struct Membership *ms = ptr->data;
877	>	const struct Membership *member = node->data;
878
879	<	if (has_member_flags(ms, CHFL_CHANOP))
879	>	if (has_member_flags(member, CHFL_CHANOP))
880		{
881		*p++ = 'o';
882		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
883		}
884
885	<	if (has_member_flags(ms, CHFL_HALFOP))
885	>	if (has_member_flags(member, CHFL_HALFOP))
886		{
887		*p++ = 'h';
888		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
889		}
890
891	<	if (has_member_flags(ms, CHFL_VOICE))
891	>	if (has_member_flags(member, CHFL_VOICE))
892		{
893		*p++ = 'v';
894		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1052 | Line 896 | user_set_hostmask(struct Client *target_
896
897		*p = '\0';
898
899	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
900	<	target_p->name, target_p->username, target_p->host,
901	<	ms->chptr->chname);
899	>
900	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
901	>	target_p->name, target_p->username,
902	>	target_p->host, member->chptr->name,
903	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
904	>	target_p->info);
905	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
906	>	target_p->name, target_p->username,
907	>	target_p->host, member->chptr->name);
908	>
909		if (nickbuf[0])
910	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
911	<	target_p->servptr->name, ms->chptr->chname,
910	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
911	>	target_p->servptr->name, member->chptr->name,
912		modebuf, nickbuf);
913
914		}
#	Line 1069 | Line 920 | user_set_hostmask(struct Client *target_
920		target_p->host, target_p->away);
921		}
922
923	<	/* user_welcome()
924	<	*
925	<	* inputs       - client pointer to client to welcome
1075	<	* output       - NONE
1076	<	* side effects -
1077	<	*/
1078	<	static void
1079	<	user_welcome(struct Client *source_p)
1080	<	{
1081	<	#if defined(__TIME__) && defined(__DATE__)
1082	<	static const char built_date[] = __DATE__ " at " __TIME__;
1083	<	#else
1084	<	static const char built_date[] = "unknown";
1085	<	#endif
1086	<
1087	<	#ifdef HAVE_LIBCRYPTO
1088	<	if (HasFlag(source_p, FLAGS_SSL))
1089	<	{
1090	<	AddUMode(source_p, UMODE_SSL);
1091	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1092	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	<	}
1094	<	#endif
1095	<
1096	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1097	<	source_p->name);
1098	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1099	<	get_listener_name(source_p->localClient->listener), ircd_version);
1100	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1101	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1102	<	show_isupport(source_p);
1103	<
1104	<	if (source_p->id[0] != '\0')
1105	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1106	<
1107	<	show_lusers(source_p);
1108	<	motd_signon(source_p);
1109	<	}
1110	<
1111	<	/* check_xline()
1112	<	*
1113	<	* inputs       - pointer to client to test
1114	<	* outupt       - 1 if exiting 0 if ok
1115	<	* side effects -
1116	<	*/
1117	<	static int
1118	<	check_xline(struct Client *source_p)
1119	<	{
1120	<	struct MaskItem *conf = NULL;
1121	<	const char *reason = NULL;
1122	<
1123	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1124	<	{
1125	<	++conf->count;
1126	<
1127	<	if (conf->reason != NULL)
1128	<	reason = conf->reason;
1129	<	else
1130	<	reason = "No Reason";
1131	<
1132	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1133	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1134	<	source_p->info, reason,
1135	<	get_client_name(source_p, HIDE_IP),
1136	<	source_p->sockhost);
1137	<
1138	<	++ServerStats.is_ref;
1139	<	exit_client(source_p, &me, "Bad user info");
1140	<	return 1;
1141	<	}
1142	<
1143	<	return 0;
1144	<	}
1145	<
1146	<	/* oper_up()
1147	<	*
1148	<	* inputs       - pointer to given client to oper
1149	<	* output       - NONE
1150	<	* side effects - Blindly opers up given source_p, using conf info
1151	<	*                all checks on passwords have already been done.
1152	<	*                This could also be used by rsa oper routines.
923	>	/*! \brief Blindly opers up given source_p, using conf info.
924	>	*         All checks on passwords have already been done.
925	>	* \param source_p Pointer to given client to oper
926		*/
927		void
928		oper_up(struct Client *source_p)
929		{
930		const unsigned int old = source_p->umodes;
931	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
931	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
932
933	<	assert(source_p->localClient->confs.head);
933	>	assert(source_p->connection->confs.head);
934
935		++Count.oper;
936		SetOper(source_p);
937
938		if (conf->modes)
939		AddUMode(source_p, conf->modes);
940	<	else if (ConfigFileEntry.oper_umodes)
941	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
940	>	else if (ConfigGeneral.oper_umodes)
941	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
942
943		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
944		++Count.invisi;
#	Line 1182 | Line 955 | oper_up(struct Client *source_p)
955
956		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
957		get_oper_name(source_p));
958	<	send_umode_out(source_p, source_p, old);
958	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
959	>	me.id, get_oper_name(source_p));
960	>	send_umode_out(source_p, old);
961		sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
962		}
963
964	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
964	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
965
966		int
967		valid_sid(const char *sid)
#	Line 1211 | Line 986 | valid_sid(const char *sid)
986		void
987		init_uid(void)
988		{
1214	–	unsigned int i;
1215	–
989		memset(new_uid, 0, sizeof(new_uid));
990
991	<	if (!EmptyString(ServerInfo.sid))
992	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
991	>	if (!EmptyString(ConfigServerInfo.sid))
992	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
993
994	<	for (i = 0; i < IRC_MAXSID; ++i)
994	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
995		if (new_uid[i] == '\0')
996		new_uid[i] = 'A';
997
#	Line 1235 | Line 1008 | init_uid(void)
1008		*                note this is a recursive function
1009		*/
1010		static void
1011	<	add_one_to_uid(int i)
1011	>	add_one_to_uid(unsigned int i)
1012		{
1013	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1013	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
1014		{
1015		if (new_uid[i] == 'Z')
1016		new_uid[i] = '0';
1017		else if (new_uid[i] == '9')
1018		{
1019		new_uid[i] = 'A';
1020	<	add_one_to_uid(i-1);
1020	>	add_one_to_uid(i - 1);
1021		}
1022		else
1023		++new_uid[i];
#	Line 1269 | Line 1042 | add_one_to_uid(int i)
1042		static const char *
1043		uid_get(void)
1044		{
1045	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1045	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1046		return new_uid;
1047		}
1048
#	Line 1284 | Line 1057 | void
1057		init_isupport(void)
1058		{
1059		add_isupport("CALLERID", NULL, -1);
1060	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1060	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1061		add_isupport("DEAF", "D", -1);
1062		add_isupport("KICKLEN", NULL, KICKLEN);
1063		add_isupport("MODES", NULL, MAXMODEPARAMS);
1291	–	#ifdef HALFOPS
1064		add_isupport("PREFIX", "(ohv)@%+", -1);
1065		add_isupport("STATUSMSG", "@%+", -1);
1066	<	#else
1067	<	add_isupport("PREFIX", "(ov)@+", -1);
1296	<	add_isupport("STATUSMSG", "@+", -1);
1297	<	#endif
1298	<	add_isupport("EXCEPTS", "e", -1);
1299	<	add_isupport("INVEX", "I", -1);
1066	>	add_isupport("EXCEPTS", NULL, -1);
1067	>	add_isupport("INVEX", NULL, -1);
1068		}
1069
1070		/*
#	Line 1311 | Line 1079 | init_isupport(void)
1079		void
1080		add_isupport(const char *name, const char *options, int n)
1081		{
1082	<	dlink_node *ptr;
1083	<	struct Isupport *support;
1082	>	dlink_node *node = NULL;
1083	>	struct Isupport *support = NULL;
1084
1085	<	DLINK_FOREACH(ptr, support_list.head)
1085	>	DLINK_FOREACH(node, support_list.head)
1086		{
1087	<	support = ptr->data;
1087	>	support = node->data;
1088		if (irccmp(support->name, name) == 0)
1089		{
1090		MyFree(support->name);
#	Line 1325 | Line 1093 | add_isupport(const char *name, const cha
1093		}
1094		}
1095
1096	<	if (ptr == NULL)
1096	>	if (node == NULL)
1097		{
1098	<	support = MyMalloc(sizeof(*support));
1098	>	support = MyCalloc(sizeof(*support));
1099		dlinkAddTail(support, &support->node, &support_list);
1100		}
1101
1102		support->name = xstrdup(name);
1103	<	if (options != NULL)
1103	>	if (options)
1104		support->options = xstrdup(options);
1105		support->number = n;
1106
#	Line 1349 | Line 1117 | add_isupport(const char *name, const cha
1117		void
1118		delete_isupport(const char *name)
1119		{
1120	<	dlink_node *ptr;
1353	<	struct Isupport *support;
1120	>	dlink_node *node = NULL;
1121
1122	<	DLINK_FOREACH(ptr, support_list.head)
1122	>	DLINK_FOREACH(node, support_list.head)
1123		{
1124	<	support = ptr->data;
1124	>	struct Isupport *support = node->data;
1125	>
1126		if (irccmp(support->name, name) == 0)
1127		{
1128	<	dlinkDelete(ptr, &support_list);
1128	>	dlinkDelete(node, &support_list);
1129		MyFree(support->name);
1130		MyFree(support->options);
1131		MyFree(support);
#	Line 1380 | Line 1148 | rebuild_isupport_message_line(void)
1148		{
1149		char isupportbuffer[IRCD_BUFSIZE];
1150		char *p = isupportbuffer;
1151	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1151	>	dlink_node *node = NULL, *node_next = NULL;
1152		int n = 0;
1153		int tokens = 0;
1154		size_t len = 0;
1155		size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1156
1157	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1157	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1158		{
1159	<	dlinkDelete(ptr, &support_list_lines);
1160	<	MyFree(ptr->data);
1161	<	free_dlink_node(ptr);
1159	>	dlinkDelete(node, &support_list_lines);
1160	>	MyFree(node->data);
1161	>	free_dlink_node(node);
1162		}
1163
1164	<	DLINK_FOREACH(ptr, support_list.head)
1164	>	DLINK_FOREACH(node, support_list.head)
1165		{
1166	<	struct Isupport *support = ptr->data;
1166	>	struct Isupport *support = node->data;
1167
1168		p += (n = sprintf(p, "%s", support->name));
1169		len += n;
1170
1171	<	if (support->options != NULL)
1171	>	if (support->options)
1172		{
1173		p += (n = sprintf(p, "=%s", support->options));
1174		len += n;
#	Line 1428 | Line 1196 | rebuild_isupport_message_line(void)
1196		}
1197		}
1198
1199	<	if (len != 0)
1199	>	if (len)
1200		{
1201		if (*--p == ' ')
1202		*p = '\0';

Diff Legend

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