ViewVC Help

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

root/svn/ircd-hybrid/branches/8.2.x/src/user.c

Comparing ircd-hybrid/branches/8.2.x/src/user.c (file contents):
Revision 6812 by michael, Wed Nov 18 17:43:52 2015 UTC vs.
Revision 7964 by michael, Mon Mar 13 18:58:59 2017 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2015 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2017 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 38 | Line 38
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41	+	#include "conf_gecos.h"
42		#include "log.h"
43		#include "server.h"
44		#include "send.h"
#	Line 49 | Line 50
50		#include "parse.h"
51		#include "watch.h"
52		#include "isupport.h"
53	+	#include "tls.h"
54
55		static char umode_buffer[IRCD_BUFSIZE];
56
#	Line 107 | Line 109 | user_modes_init(void)
109		* side effects - display to client user counts etc.
110		*/
111		void
112	<	show_lusers(struct Client *source_p)
112	>	show_lusers(struct Client *client_p)
113		{
114	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
115	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
115	>	sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
116		Count.invisi, dlink_list_length(&global_server_list));
117		else
118	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
118	>	sendto_one_numeric(client_p, &me, RPL_LUSERCLIENT, (dlink_list_length(&global_client_list) - Count.invisi),
119		Count.invisi, 1);
120
121		if (Count.oper)
122	<	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
122	>	sendto_one_numeric(client_p, &me, RPL_LUSEROP, Count.oper);
123
124		if (dlink_list_length(&unknown_list))
125	<	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
125	>	sendto_one_numeric(client_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
126
127		if (dlink_list_length(&channel_list))
128	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
128	>	sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
129
130	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
130	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
131		{
132	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
133	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
132	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, Count.local, Count.myserver);
133	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
134		}
135		else
136		{
137	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
138	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
137	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
138	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
139		}
140
141	<	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
141	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
142
143	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
144	<	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	>	if (!ConfigServerHide.hide_servers || HasUMode(client_p, UMODE_OPER))
144	>	sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con,
145		Count.max_loc_cli, Count.totalrestartcount);
146
147		if (Count.local > Count.max_loc_cli)
#	Line 151 | Line 153 | show_lusers(struct Client *source_p)
153
154		/* report_and_set_user_flags()
155		*
156	<	* inputs       - pointer to source_p
156	>	* inputs       - pointer to client_p
157		*              - pointer to conf for this user
158		* output       - NONE
159		* side effects - Report to user any special flags
160		*                they are getting, and set them.
161		*/
162		static void
163	<	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
163	>	report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
164		{
165		/* If this user is being spoofed, tell them so */
166		if (IsConfDoSpoofIp(conf))
167	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
167	>	sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
168
169		/* If this user is in the exception class, set it "E lined" */
170		if (IsConfExemptKline(conf))
171		{
172	<	AddFlag(source_p, FLAGS_EXEMPTKLINE);
173	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172	>	AddFlag(client_p, FLAGS_EXEMPTKLINE);
173	>	sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
174		}
175
176		if (IsConfExemptXline(conf))
177		{
178	<	AddFlag(source_p, FLAGS_EXEMPTXLINE);
179	<	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
178	>	AddFlag(client_p, FLAGS_EXEMPTXLINE);
179	>	sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
180		}
181
182		if (IsConfExemptResv(conf))
183		{
184	<	AddFlag(source_p, FLAGS_EXEMPTRESV);
185	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
184	>	AddFlag(client_p, FLAGS_EXEMPTRESV);
185	>	sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
186		}
187
188		/* If this user is exempt from user limits set it "F lined" */
189		if (IsConfExemptLimits(conf))
190		{
191	<	AddFlag(source_p, FLAGS_NOLIMIT);
192	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191	>	AddFlag(client_p, FLAGS_NOLIMIT);
192	>	sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
193		}
194
195		if (IsConfCanFlood(conf))
196		{
197	<	AddFlag(source_p, FLAGS_CANFLOOD);
198	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197	>	AddFlag(client_p, FLAGS_CANFLOOD);
198	>	sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
199		}
200		}
201
202		/* introduce_client()
203		*
204	<	* inputs       - source_p
204	>	* inputs       - client_p
205		* output       - NONE
206		* side effects - This common function introduces a client to the rest
207		*                of the net, either from a local client connect or
208		*                from a remote connect.
209		*/
210		static void
211	<	introduce_client(struct Client *source_p)
211	>	introduce_client(struct Client *client_p)
212		{
213		dlink_node *node = NULL;
214		char ubuf[IRCD_BUFSIZE] = "";
215
216	<	if (MyClient(source_p))
217	<	send_umode(source_p, source_p, 0, ubuf);
216	<	else
217	<	send_umode(NULL, source_p, 0, ubuf);
218	<
219	<	watch_check_hash(source_p, RPL_LOGON);
216	>	send_umode(client_p, MyConnect(client_p), 0, ubuf);
217	>	watch_check_hash(client_p, RPL_LOGON);
218
219		if (ubuf[0] == '\0')
220		{
#	Line 226 | Line 224 | introduce_client(struct Client *source_p
224
225		DLINK_FOREACH(node, local_server_list.head)
226		{
227	<	struct Client *server = node->data;
227	>	struct Client *server_p = node->data;
228
229	<	if (server == source_p->from)
229	>	if (server_p == client_p->from)
230		continue;
231
232	<	if (IsCapable(server, CAPAB_SVS))
233	<	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
234	<	source_p->servptr->id,
235	<	source_p->name, source_p->hopcount+1,
236	<	source_p->tsinfo,
237	<	ubuf, source_p->username, source_p->host,
238	<	source_p->sockhost, source_p->id,
239	<	source_p->account,
242	<	source_p->info);
243	<	else
244	<	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s :%s",
245	<	source_p->servptr->id,
246	<	source_p->name, source_p->hopcount+1,
247	<	source_p->tsinfo,
248	<	ubuf, source_p->username, source_p->host,
249	<	source_p->sockhost, source_p->id, source_p->info);
232	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
233	>	client_p->servptr->id,
234	>	client_p->name, client_p->hopcount+1,
235	>	client_p->tsinfo,
236	>	ubuf, client_p->username, client_p->host,
237	>	client_p->sockhost, client_p->id,
238	>	client_p->account,
239	>	client_p->info);
240
241	<	if (!EmptyString(source_p->certfp))
242	<	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
241	>	if (!EmptyString(client_p->certfp))
242	>	sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
243		}
244		}
245
#	Line 260 | Line 250 | introduce_client(struct Client *source_p
250		* side effects -
251		*/
252		static void
253	<	user_welcome(struct Client *source_p)
253	>	user_welcome(struct Client *client_p)
254		{
255		static const char built_date[] = __DATE__ " at " __TIME__;
256
257	<	#ifdef HAVE_LIBCRYPTO
268	<	if (HasFlag(source_p, FLAGS_SSL))
257	>	if (HasFlag(client_p, FLAGS_SSL))
258		{
259	<	AddUMode(source_p, UMODE_SSL);
260	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
261	<	ssl_get_cipher(source_p->connection->fd.ssl));
262	<	}
263	<	#endif
264	<
265	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
266	<	source_p->name);
267	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
268	<	listener_get_name(source_p->connection->listener), ircd_version);
269	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
270	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
271	<
272	<	isupport_show(source_p);
273	<	show_lusers(source_p);
285	<	motd_signon(source_p);
259	>	AddUMode(client_p, UMODE_SSL);
260	>	sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
261	>	tls_get_cipher(&client_p->connection->fd.ssl));
262	>	}
263	>
264	>	sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
265	>	client_p->name);
266	>	sendto_one_numeric(client_p, &me, RPL_YOURHOST,
267	>	listener_get_name(client_p->connection->listener), ircd_version);
268	>	sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
269	>	sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
270	>
271	>	isupport_show(client_p);
272	>	show_lusers(client_p);
273	>	motd_signon(client_p);
274		}
275
276		/* check_xline()
#	Line 292 | Line 280 | user_welcome(struct Client *source_p)
280		* side effects -
281		*/
282		static int
283	<	check_xline(struct Client *source_p)
283	>	check_xline(struct Client *client_p)
284		{
285	<	struct MaskItem *conf = NULL;
285	>	const struct GecosItem *gecos = NULL;
286
287	<	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
287	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
288		return 0;
289
290	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
290	>	if ((gecos = gecos_find(client_p->info, match)))
291		{
304	–	++conf->count;
292		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
293		"X-line Rejecting [%s] [%s], user %s [%s]",
294	<	source_p->info, conf->reason,
295	<	get_client_name(source_p, HIDE_IP),
296	<	source_p->sockhost);
294	>	client_p->info, gecos->reason,
295	>	get_client_name(client_p, HIDE_IP),
296	>	client_p->sockhost);
297
298		++ServerStats.is_ref;
299	<	exit_client(source_p, "Bad user info");
299	>	exit_client(client_p, "Bad user info");
300		return 1;
301		}
302
#	Line 319 | Line 306 | check_xline(struct Client *source_p)
306		/*! \brief This function is called when both NICK and USER messages
307		*      have been accepted for the client, in whatever order. Only
308		*      after this, is the UID message propagated.
309	<	* \param source_p Pointer to given client to introduce
309	>	* \param client_p Pointer to given client to introduce
310		*/
311		void
312	<	register_local_user(struct Client *source_p)
312	>	register_local_user(struct Client *client_p)
313		{
327	–	const char *id = NULL;
314		const struct MaskItem *conf = NULL;
315
316	<	assert(source_p == source_p->from);
317	<	assert(MyConnect(source_p));
318	<	assert(IsUnknown(source_p));
319	<	assert(!source_p->connection->registration);
316	>	assert(client_p == client_p->from);
317	>	assert(MyConnect(client_p));
318	>	assert(IsUnknown(client_p));
319	>	assert(!client_p->connection->registration);
320
321		if (ConfigGeneral.ping_cookie)
322		{
323	<	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
323	>	if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
324		{
325		do
326	<	source_p->connection->random_ping = genrand_int32();
327	<	while (!source_p->connection->random_ping);
326	>	client_p->connection->random_ping = genrand_int32();
327	>	while (!client_p->connection->random_ping);
328
329	<	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
330	<	AddFlag(source_p, FLAGS_PINGSENT);
329	>	sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
330	>	AddFlag(client_p, FLAGS_PINGSENT);
331		return;
332		}
333
334	<	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
334	>	if (!HasFlag(client_p, FLAGS_PING_COOKIE))
335		return;
336		}
337
338	<	source_p->connection->last_privmsg = CurrentTime;
338	>	client_p->connection->last_privmsg = CurrentTime;
339		/* Straight up the maximum rate of flooding... */
340	<	source_p->connection->allow_read = MAX_FLOOD_BURST;
340	>	client_p->connection->allow_read = MAX_FLOOD_BURST;
341
342	<	if (!check_client(source_p))
342	>	if (!check_client(client_p))
343		return;
344
345	<	if (!valid_hostname(source_p->host))
345	>	if (!valid_hostname(client_p->host))
346		{
347	<	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
347	>	sendto_one_notice(client_p, &me, ":*** Notice -- You have an illegal "
348		"character in your hostname");
349	<	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
349	>	strlcpy(client_p->host, client_p->sockhost, sizeof(client_p->host));
350		}
351
352	<	conf = source_p->connection->confs.head->data;
352	>	conf = client_p->connection->confs.head->data;
353
354	<	if (!HasFlag(source_p, FLAGS_GOTID))
354	>	if (!HasFlag(client_p, FLAGS_GOTID))
355		{
356		char username[USERLEN + 1] = "";
357		unsigned int i = 0;
#	Line 373 | Line 359 | register_local_user(struct Client *sourc
359		if (IsNeedIdentd(conf))
360		{
361		++ServerStats.is_ref;
362	<	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
362	>	sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
363		"identd to use this server");
364	<	exit_client(source_p, "Install identd");
364	>	exit_client(client_p, "Install identd");
365		return;
366		}
367
368	<	strlcpy(username, source_p->username, sizeof(username));
368	>	strlcpy(username, client_p->username, sizeof(username));
369
370		if (!IsNoTilde(conf))
371	<	source_p->username[i++] = '~';
371	>	client_p->username[i++] = '~';
372
373		for (const char *p = username; *p && i < USERLEN; ++p)
374	<	source_p->username[i++] = *p;
374	>	client_p->username[i++] = *p;
375
376	<	source_p->username[i] = '\0';
376	>	client_p->username[i] = '\0';
377		}
378
379		/* Password check */
380		if (!EmptyString(conf->passwd))
381		{
382	<	if (!match_conf_password(source_p->connection->password, conf))
382	>	if (!match_conf_password(client_p->connection->password, conf))
383		{
384		++ServerStats.is_ref;
385
386	<	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
387	<	exit_client(source_p, "Bad Password");
386	>	sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
387	>	exit_client(client_p, "Bad Password");
388		return;
389		}
390		}
391
392		/*
393	<	* Don't free source_p->connection->password here - it can be required
393	>	* Don't free client_p->connection->password here - it can be required
394		* by masked /stats I if there are auth {} blocks with need_password = no;
395		* --adx
396		*/
397
398		/*
399	<	* Report if user has &^>= etc. and set flags as needed in source_p
399	>	* Report if user has &^>= etc. and set flags as needed in client_p
400		*/
401	<	report_and_set_user_flags(source_p, conf);
401	>	report_and_set_user_flags(client_p, conf);
402
403	<	if (IsDead(source_p))
403	>	if (IsDead(client_p))
404		return;
405
406		/*
#	Line 426 | Line 412 | register_local_user(struct Client *sourc
412		*   -Taner
413		*/
414		if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
415	<	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
415	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
416		{
417		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
418		"Too many clients, rejecting %s[%s].",
419	<	source_p->name, source_p->host);
419	>	client_p->name, client_p->host);
420		++ServerStats.is_ref;
421	<	exit_client(source_p, "Sorry, server is full - try later");
421	>	exit_client(client_p, "Sorry, server is full - try later");
422		return;
423		}
424
425	<	if (!valid_username(source_p->username, 1))
425	>	if (!valid_username(client_p->username, 1))
426		{
427		char buf[IRCD_BUFSIZE] = "";
428
429		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
430		"Invalid username: %s (%s@%s)",
431	<	source_p->name, source_p->username, source_p->host);
431	>	client_p->name, client_p->username, client_p->host);
432		++ServerStats.is_ref;
433	<	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
434	<	exit_client(source_p, buf);
433	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
434	>	exit_client(client_p, buf);
435		return;
436		}
437
438	<	if (check_xline(source_p))
438	>	if (check_xline(client_p))
439		return;
440
441	+	const char *id;
442		while (hash_find_id((id = uid_get())))
443		;
444
445	<	strlcpy(source_p->id, id, sizeof(source_p->id));
446	<	hash_add_id(source_p);
445	>	strlcpy(client_p->id, id, sizeof(client_p->id));
446	>	hash_add_id(client_p);
447
448		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
449		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
450	<	source_p->name, source_p->username, source_p->host,
451	<	source_p->sockhost,
452	<	get_client_class(&source_p->connection->confs),
453	<	source_p->info, source_p->id);
450	>	client_p->name, client_p->username, client_p->host,
451	>	client_p->sockhost,
452	>	get_client_class(&client_p->connection->confs),
453	>	client_p->info, client_p->id);
454
455		if (ConfigGeneral.invisible_on_connect)
456		{
457	<	AddUMode(source_p, UMODE_INVISIBLE);
457	>	AddUMode(client_p, UMODE_INVISIBLE);
458		++Count.invisi;
459		}
460
#	Line 481 | Line 468 | register_local_user(struct Client *sourc
468		Count.max_loc);
469		}
470
471	<	if (++Count.total > Count.max_tot)
472	<	Count.max_tot = Count.total;
473	<	++Count.totalrestartcount;
474	<
488	<	assert(source_p->servptr == &me);
489	<	SetClient(source_p);
490	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
491	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
471	>	assert(client_p->servptr == &me);
472	>	SetClient(client_p);
473	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
474	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
475
476	<	assert(dlinkFind(&unknown_list, source_p));
476	>	assert(dlinkFind(&unknown_list, client_p));
477
478	<	dlink_move_node(&source_p->connection->lclient_node,
478	>	dlink_move_node(&client_p->connection->lclient_node,
479		&unknown_list, &local_client_list);
480
481	<	user_welcome(source_p);
482	<	userhost_add(source_p->username, source_p->host, 0);
483	<	AddFlag(source_p, FLAGS_USERHOST);
481	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
482	>	Count.max_tot = dlink_list_length(&global_client_list);
483	>	++Count.totalrestartcount;
484	>
485	>	user_welcome(client_p);
486	>	userhost_add(client_p->sockhost, 0);
487	>	AddFlag(client_p, FLAGS_USERHOST);
488
489	<	introduce_client(source_p);
489	>	introduce_client(client_p);
490		}
491
492		/* register_remote_user()
493		*
494	<	* inputs       - source_p remote or directly connected client
494	>	* inputs       - client_p remote or directly connected client
495		*              - username to register as
496		*              - host name to register as
497		*              - server name
#	Line 513 | Line 500 | register_local_user(struct Client *sourc
500		*                is introduced by a server.
501		*/
502		void
503	<	register_remote_user(struct Client *source_p)
503	>	register_remote_user(struct Client *client_p)
504		{
505	<	const struct Client *target_p = NULL;
519	<
520	<	if ((target_p = source_p->servptr) && target_p->from != source_p->from)
521	<	{
522	<	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
523	<	"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
524	<	source_p->from->name, source_p->name, source_p->username,
525	<	source_p->host, source_p->servptr->name,
526	<	target_p->name, target_p->from->name);
527	<	sendto_one(source_p->from,
528	<	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
529	<	me.id, source_p->id, me.name, source_p->servptr->name,
530	<	target_p->from->name);
531	<
532	<	AddFlag(source_p, FLAGS_KILLED);
533	<	exit_client(source_p, "UID server wrong direction");
534	<	return;
535	<	}
505	>	assert(client_p->servptr->from == client_p->from);
506
507		/*
508		* If the nick has been introduced by a services server,
509		* make it a service as well.
510		*/
511	<	if (HasFlag(source_p->servptr, FLAGS_SERVICE))
512	<	AddFlag(source_p, FLAGS_SERVICE);
511	>	if (HasFlag(client_p->servptr, FLAGS_SERVICE))
512	>	AddFlag(client_p, FLAGS_SERVICE);
513	>
514	>	SetClient(client_p);
515	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
516	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
517
518	<	if (++Count.total > Count.max_tot)
519	<	Count.max_tot = Count.total;
518	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
519	>	Count.max_tot = dlink_list_length(&global_client_list);
520
521	<	SetClient(source_p);
522	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
549	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
550	<	userhost_add(source_p->username, source_p->host, 1);
551	<	AddFlag(source_p, FLAGS_USERHOST);
521	>	userhost_add(client_p->sockhost, 1);
522	>	AddFlag(client_p, FLAGS_USERHOST);
523
524	<	if (HasFlag(source_p->servptr, FLAGS_EOB))
524	>	if (HasFlag(client_p->servptr, FLAGS_EOB))
525		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
526		"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
527	<	source_p->servptr->name,
528	<	source_p->name, source_p->username, source_p->host,
529	<	source_p->sockhost, source_p->info, source_p->id);
527	>	client_p->servptr->name,
528	>	client_p->name, client_p->username, client_p->host,
529	>	client_p->sockhost, client_p->info, client_p->id);
530
531	<	introduce_client(source_p);
531	>	introduce_client(client_p);
532		}
533
534		/* valid_hostname()
#	Line 669 | Line 640 | valid_nickname(const char *nickname, con
640		return p - nickname <= NICKLEN;
641		}
642
643	<	/* send_umode()
644	<	* send the MODE string for user (user) to connection client_p
645	<	* -avalon
646	<	*
647	<	* inputs       - client_p
677	<	*              - source_p
678	<	*              - int old
679	<	*              - suplied umode_buf
680	<	* output       - NONE
643	>	/*! \brief Builds a mode change string to buffer pointed by \a buf
644	>	* \param client_p  Pointer to client
645	>	* \param dispatch  Whether to send a MODE message to client_p
646	>	* \param old       Old user mode to compare against when building new mode buffer
647	>	* \param buf       Pointer to buffer to build string in
648		*/
649		void
650	<	send_umode(struct Client *client_p, struct Client *source_p,
651	<	unsigned int old, char *umode_buf)
650	>	send_umode(struct Client *client_p, unsigned int dispatch,
651	>	unsigned int old, char *buf)
652		{
653	<	char *m = umode_buf;
653	>	char *m = buf;
654		int what = 0;
655
656		/*
657		* Build a string in umode_buf to represent the change in the user's
658	<	* mode between the new (source_p->umodes) and 'old'.
658	>	* mode between the new (client_p->umodes) and 'old'.
659		*/
660		for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
661		{
662	<	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
662	>	if ((tab->flag & old) && !HasUMode(client_p, tab->flag))
663		{
664		if (what == MODE_DEL)
665		*m++ = tab->c;
#	Line 703 | Line 670 | send_umode(struct Client *client_p, stru
670		*m++ = tab->c;
671		}
672		}
673	<	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
673	>	else if (!(tab->flag & old) && HasUMode(client_p, tab->flag))
674		{
675		if (what == MODE_ADD)
676		*m++ = tab->c;
#	Line 718 | Line 685 | send_umode(struct Client *client_p, stru
685
686		*m = '\0';
687
688	<	if (*umode_buf && client_p)
688	>	if (dispatch && *buf)
689		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
690		client_p->name, client_p->username,
691	<	client_p->host, client_p->name, umode_buf);
691	>	client_p->host, client_p->name, buf);
692		}
693
694		/* send_umode_out()
#	Line 731 | Line 698 | send_umode(struct Client *client_p, stru
698		* side effects - Only send ubuf out to servers that know about this client
699		*/
700		void
701	<	send_umode_out(struct Client *source_p, unsigned int old)
701	>	send_umode_out(struct Client *client_p, unsigned int old)
702		{
703		char buf[IRCD_BUFSIZE] = "";
704
705	<	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
705	>	send_umode(client_p, MyConnect(client_p), old, buf);
706
707		if (buf[0])
708	<	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
709	<	source_p->id, source_p->id, buf);
708	>	sendto_server(client_p, 0, 0, ":%s MODE %s :%s",
709	>	client_p->id, client_p->id, buf);
710		}
711
712		void
713	<	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
713	>	user_set_hostmask(struct Client *client_p, const char *hostname, const int what)
714		{
715		dlink_node *node = NULL;
716
717	<	if (!strcmp(target_p->host, hostname))
717	>	if (!strcmp(client_p->host, hostname))
718		return;
719
720		switch (what)
721		{
722		case MODE_ADD:
723	<	AddUMode(target_p, UMODE_HIDDENHOST);
723	>	AddUMode(client_p, UMODE_HIDDENHOST);
724		break;
725		case MODE_DEL:
726	<	DelUMode(target_p, UMODE_HIDDENHOST);
726	>	DelUMode(client_p, UMODE_HIDDENHOST);
727		break;
728		default: return;
729		}
730
731		if (ConfigGeneral.cycle_on_host_change)
732	<	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
733	<	target_p->name, target_p->username, target_p->host);
767	<
768	<	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
769	<	target_p->name, target_p->username,
770	<	target_p->host, target_p->username, hostname);
771	<
772	<	if (HasFlag(target_p, FLAGS_USERHOST))
773	<	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
732	>	sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
733	>	client_p->name, client_p->username, client_p->host);
734
735	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
735	>	sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
736	>	client_p->name, client_p->username,
737	>	client_p->host, client_p->username, hostname);
738
739	<	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
778	<	AddFlag(target_p, FLAGS_USERHOST);
739	>	strlcpy(client_p->host, hostname, sizeof(client_p->host));
740
741	<	if (MyConnect(target_p))
741	>	if (MyConnect(client_p))
742		{
743	<	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
744	<	clear_ban_cache_client(target_p);
743	>	sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
744	>	clear_ban_cache_list(&client_p->channel);
745		}
746
747		if (!ConfigGeneral.cycle_on_host_change)
748		return;
749
750	<	DLINK_FOREACH(node, target_p->channel.head)
750	>	DLINK_FOREACH(node, client_p->channel.head)
751		{
752	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
752	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
753	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
754		char *p = modebuf;
755		int len = 0;
756		const struct Membership *member = node->data;
#	Line 796 | Line 758 | user_set_hostmask(struct Client *target_
758		if (has_member_flags(member, CHFL_CHANOP))
759		{
760		*p++ = 'o';
761	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
761	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
762		}
763
764		if (has_member_flags(member, CHFL_HALFOP))
765		{
766		*p++ = 'h';
767	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
767	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
768		}
769
770		if (has_member_flags(member, CHFL_VOICE))
771		{
772		*p++ = 'v';
773	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
773	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
774		}
775
776		*p = '\0';
777
778	<	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
779	<	target_p->name, target_p->username,
780	<	target_p->host, member->chptr->name,
781	<	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
782	<	target_p->info);
783	<	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
784	<	target_p->name, target_p->username,
823	<	target_p->host, member->chptr->name);
778	>	sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
779	>	client_p->name, client_p->username,
780	>	client_p->host, member->chptr->name,
781	>	client_p->account, client_p->info);
782	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
783	>	client_p->name, client_p->username,
784	>	client_p->host, member->chptr->name);
785
786		if (nickbuf[0])
787	<	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
788	<	target_p->servptr->name, member->chptr->name,
787	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
788	>	client_p->servptr->name, member->chptr->name,
789		modebuf, nickbuf);
790		}
791
792	<	if (target_p->away[0])
793	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
792	>	if (client_p->away[0])
793	>	sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
794		":%s!%s@%s AWAY :%s",
795	<	target_p->name, target_p->username,
796	<	target_p->host, target_p->away);
795	>	client_p->name, client_p->username,
796	>	client_p->host, client_p->away);
797		}

Comparing ircd-hybrid/branches/8.2.x/src/user.c (property svn:keywords):
Revision 6812 by michael, Wed Nov 18 17:43:52 2015 UTC vs.
Revision 7964 by michael, Mon Mar 13 18:58:59 2017 UTC

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

Diff Legend

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