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/user.c (file contents):
Revision 6357 by michael, Mon Aug 17 16:38:13 2015 UTC vs.
Revision 8439 by michael, Thu Mar 29 13:07:32 2018 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-2018 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 "server_capab.h" /* TBR: RHOST compatibility mode */
45		#include "send.h"
46		#include "memory.h"
47		#include "packet.h"
#	Line 49 | Line 51
51		#include "parse.h"
52		#include "watch.h"
53		#include "isupport.h"
54	+	#include "tls.h"
55
56	<	static char umode_buffer[IRCD_BUFSIZE];
56	>	static char umode_buffer[UMODE_MAX_STR];
57
58		const struct user_modes *umode_map[256];
59		const struct user_modes  umode_tab[] =
#	Line 81 | Line 84 | const struct user_modes  umode_tab[] =
84		{ 's', UMODE_SERVNOTICE   },
85		{ 'u', UMODE_UNAUTH       },
86		{ 'w', UMODE_WALLOP       },
84	–	{ 'x', UMODE_HIDDENHOST   },
87		{ 'y', UMODE_SPY          },
88		{ '\0', 0 }
89		};
#	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));
127	>	if (dlink_list_length(channel_get_list()))
128	>	sendto_one_numeric(client_p, &me, RPL_LUSERCHANNELS, dlink_list_length(channel_get_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, dlink_list_length(&local_client_list), dlink_list_length(&local_server_list));
133	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&local_client_list), Count.max_loc);
134	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
135	>	sendto_one_numeric(client_p, &me, RPL_STATSCONN, Count.max_loc_con, Count.max_loc, Count.totalrestartcount);
136		}
137		else
138		{
139	<	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
140	<	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
139	>	sendto_one_numeric(client_p, &me, RPL_LUSERME, dlink_list_length(&global_client_list), 0);
140	>	sendto_one_numeric(client_p, &me, RPL_LOCALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
141	>	sendto_one_numeric(client_p, &me, RPL_GLOBALUSERS, dlink_list_length(&global_client_list), Count.max_tot);
142		}
138	–
139	–	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
140	–
141	–	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142	–	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	–	Count.max_loc_cli, Count.totalrestartcount);
144	–
145	–	if (Count.local > Count.max_loc_cli)
146	–	Count.max_loc_cli = Count.local;
147	–
148	–	if ((Count.local + Count.myserver) > Count.max_loc_con)
149	–	Count.max_loc_con = Count.local + Count.myserver;
143		}
144
145		/* report_and_set_user_flags()
146		*
147	<	* inputs       - pointer to source_p
147	>	* inputs       - pointer to client_p
148		*              - pointer to conf for this user
149		* output       - NONE
150		* side effects - Report to user any special flags
151		*                they are getting, and set them.
152		*/
153		static void
154	<	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
154	>	report_and_set_user_flags(struct Client *client_p, const struct MaskItem *conf)
155		{
156		/* If this user is being spoofed, tell them so */
157		if (IsConfDoSpoofIp(conf))
158	<	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
158	>	sendto_one_notice(client_p, &me, ":*** Spoofing your IP");
159
160		/* If this user is in the exception class, set it "E lined" */
161		if (IsConfExemptKline(conf))
162		{
163	<	AddFlag(source_p, FLAGS_EXEMPTKLINE);
164	<	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
163	>	AddFlag(client_p, FLAGS_EXEMPTKLINE);
164	>	sendto_one_notice(client_p, &me, ":*** You are exempt from K/D lines");
165		}
166
167		if (IsConfExemptXline(conf))
168		{
169	<	AddFlag(source_p, FLAGS_EXEMPTXLINE);
170	<	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
169	>	AddFlag(client_p, FLAGS_EXEMPTXLINE);
170	>	sendto_one_notice(client_p, &me, ":*** You are exempt from X lines");
171		}
172
173		if (IsConfExemptResv(conf))
174		{
175	<	AddFlag(source_p, FLAGS_EXEMPTRESV);
176	<	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
175	>	AddFlag(client_p, FLAGS_EXEMPTRESV);
176	>	sendto_one_notice(client_p, &me, ":*** You are exempt from resvs");
177		}
178
179		/* If this user is exempt from user limits set it "F lined" */
180		if (IsConfExemptLimits(conf))
181		{
182	<	AddFlag(source_p, FLAGS_NOLIMIT);
183	<	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
182	>	AddFlag(client_p, FLAGS_NOLIMIT);
183	>	sendto_one_notice(client_p, &me, ":*** You are exempt from user limits");
184		}
185
186		if (IsConfCanFlood(conf))
187		{
188	<	AddFlag(source_p, FLAGS_CANFLOOD);
189	<	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	<	"protection, aren't you fearsome.");
188	>	AddFlag(client_p, FLAGS_CANFLOOD);
189	>	sendto_one_notice(client_p, &me, ":*** You are exempt from flood protection");
190		}
191		}
192
193		/* introduce_client()
194		*
195	<	* inputs       - source_p
195	>	* inputs       - client_p
196		* output       - NONE
197		* side effects - This common function introduces a client to the rest
198		*                of the net, either from a local client connect or
199		*                from a remote connect.
200		*/
201		static void
202	<	introduce_client(struct Client *source_p)
202	>	introduce_client(struct Client *client_p)
203		{
204	<	dlink_node *node = NULL;
205	<	char ubuf[IRCD_BUFSIZE] = "";
204	>	dlink_node *node;
205	>	char buf[UMODE_MAX_STR] = "";
206
207	<	if (MyClient(source_p))
208	<	send_umode(source_p, source_p, 0, ubuf);
217	<	else
218	<	send_umode(NULL, source_p, 0, ubuf);
219	<
220	<	watch_check_hash(source_p, RPL_LOGON);
207	>	send_umode(client_p, MyConnect(client_p), 0, buf);
208	>	watch_check_hash(client_p, RPL_LOGON);
209
210	<	if (ubuf[0] == '\0')
210	>	if (buf[0] == '\0')
211		{
212	<	ubuf[0] = '+';
213	<	ubuf[1] = '\0';
212	>	buf[0] = '+';
213	>	buf[1] = '\0';
214		}
215
216		DLINK_FOREACH(node, local_server_list.head)
217		{
218	<	struct Client *server = node->data;
218	>	struct Client *server_p = node->data;
219
220	<	if (server == source_p->from)
220	>	if (server_p == client_p->from)
221		continue;
222
223	<	if (IsCapable(server, CAPAB_SVS))
224	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
225	<	source_p->servptr->id,
226	<	source_p->name, source_p->hopcount+1,
227	<	(unsigned long)source_p->tsinfo,
228	<	ubuf, source_p->username, source_p->host,
229	<	source_p->sockhost, source_p->id,
230	<	source_p->account,
231	<	source_p->info);
223	>	/* TBR: compatibility mode */
224	>	if (IsCapable(server_p, CAPAB_RHOST))
225	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s %s :%s",
226	>	client_p->servptr->id,
227	>	client_p->name, client_p->hopcount+1,
228	>	client_p->tsinfo,
229	>	buf, client_p->username, client_p->host, client_p->realhost,
230	>	client_p->sockhost, client_p->id,
231	>	client_p->account,
232	>	client_p->info);
233		else
234	<	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
235	<	source_p->servptr->id,
236	<	source_p->name, source_p->hopcount+1,
237	<	(unsigned long)source_p->tsinfo,
238	<	ubuf, source_p->username, source_p->host,
239	<	source_p->sockhost, source_p->id, source_p->info);
234	>	sendto_one(server_p, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	client_p->servptr->id,
236	>	client_p->name, client_p->hopcount+1,
237	>	client_p->tsinfo,
238	>	buf, client_p->username, client_p->host,
239	>	client_p->sockhost, client_p->id,
240	>	client_p->account,
241	>	client_p->info);
242
243	<	if (!EmptyString(source_p->certfp))
244	<	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
243	>	if (!EmptyString(client_p->certfp))
244	>	sendto_one(server_p, ":%s CERTFP %s", client_p->id, client_p->certfp);
245		}
246		}
247
#	Line 261 | Line 252 | introduce_client(struct Client *source_p
252		* side effects -
253		*/
254		static void
255	<	user_welcome(struct Client *source_p)
255	>	user_welcome(struct Client *client_p)
256		{
266	–	#if defined(__TIME__) && defined(__DATE__)
257		static const char built_date[] = __DATE__ " at " __TIME__;
258	<	#else
259	<	static const char built_date[] = "unknown";
260	<	#endif
261	<
262	<	#ifdef HAVE_LIBCRYPTO
263	<	if (HasFlag(source_p, FLAGS_SSL))
264	<	{
265	<	AddUMode(source_p, UMODE_SSL);
266	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
267	<	ssl_get_cipher(source_p->connection->fd.ssl));
268	<	}
269	<	#endif
270	<
271	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
272	<	source_p->name);
273	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
274	<	get_listener_name(source_p->connection->listener), ircd_version);
275	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
286	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
287	<
288	<	isupport_show(source_p);
289	<	show_lusers(source_p);
290	<	motd_signon(source_p);
258	>
259	>	if (HasFlag(client_p, FLAGS_SSL))
260	>	{
261	>	AddUMode(client_p, UMODE_SSL);
262	>	sendto_one_notice(client_p, &me, ":*** Connected securely via %s",
263	>	tls_get_cipher(&client_p->connection->fd->ssl));
264	>	}
265	>
266	>	sendto_one_numeric(client_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
267	>	client_p->name, client_p->username, client_p->realhost);
268	>	sendto_one_numeric(client_p, &me, RPL_YOURHOST,
269	>	listener_get_name(client_p->connection->listener), ircd_version);
270	>	sendto_one_numeric(client_p, &me, RPL_CREATED, built_date);
271	>	sendto_one_numeric(client_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
272	>
273	>	isupport_show(client_p);
274	>	show_lusers(client_p);
275	>	motd_signon(client_p);
276		}
277
278		/* check_xline()
#	Line 297 | Line 282 | user_welcome(struct Client *source_p)
282		* side effects -
283		*/
284		static int
285	<	check_xline(struct Client *source_p)
285	>	check_xline(struct Client *client_p)
286		{
287	<	struct MaskItem *conf = NULL;
287	>	const struct GecosItem *gecos = NULL;
288
289	<	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
289	>	if (HasFlag(client_p, FLAGS_EXEMPTXLINE))
290		return 0;
291
292	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
292	>	if ((gecos = gecos_find(client_p->info, match)))
293		{
309	–	++conf->count;
294		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
295		"X-line Rejecting [%s] [%s], user %s [%s]",
296	<	source_p->info, conf->reason,
297	<	get_client_name(source_p, HIDE_IP),
298	<	source_p->sockhost);
296	>	client_p->info, gecos->reason,
297	>	client_get_name(client_p, HIDE_IP),
298	>	client_p->sockhost);
299
300		++ServerStats.is_ref;
301	<	exit_client(source_p, "Bad user info");
301	>	exit_client(client_p, "Bad user info");
302		return 1;
303		}
304
#	Line 324 | Line 308 | check_xline(struct Client *source_p)
308		/*! \brief This function is called when both NICK and USER messages
309		*      have been accepted for the client, in whatever order. Only
310		*      after this, is the UID message propagated.
311	<	* \param source_p Pointer to given client to introduce
311	>	* \param client_p Pointer to given client to introduce
312		*/
313		void
314	<	register_local_user(struct Client *source_p)
314	>	register_local_user(struct Client *client_p)
315		{
332	–	const char *id = NULL;
316		const struct MaskItem *conf = NULL;
317
318	<	assert(source_p == source_p->from);
319	<	assert(MyConnect(source_p));
320	<	assert(IsUnknown(source_p));
321	<	assert(!source_p->connection->registration);
318	>	assert(client_p == client_p->from);
319	>	assert(MyConnect(client_p));
320	>	assert(IsUnknown(client_p));
321	>	assert(!client_p->connection->registration);
322
323		if (ConfigGeneral.ping_cookie)
324		{
325	<	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
325	>	if (!HasFlag(client_p, FLAGS_PINGSENT) && !client_p->connection->random_ping)
326		{
327		do
328	<	source_p->connection->random_ping = genrand_int32();
329	<	while (!source_p->connection->random_ping);
328	>	client_p->connection->random_ping = genrand_int32();
329	>	while (client_p->connection->random_ping == 0);
330
331	<	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
332	<	AddFlag(source_p, FLAGS_PINGSENT);
331	>	sendto_one(client_p, "PING :%u", client_p->connection->random_ping);
332	>	AddFlag(client_p, FLAGS_PINGSENT);
333		return;
334		}
335
336	<	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
336	>	if (!HasFlag(client_p, FLAGS_PING_COOKIE))
337		return;
338		}
339
340	<	source_p->connection->last_privmsg = CurrentTime;
340	>	client_p->connection->last_privmsg = CurrentTime;
341		/* Straight up the maximum rate of flooding... */
342	<	source_p->connection->allow_read = MAX_FLOOD_BURST;
342	>	client_p->connection->allow_read = MAX_FLOOD_BURST;
343
344	<	if (!check_client(source_p))
344	>	if (!check_client(client_p))
345		return;
346
347	<	if (!valid_hostname(source_p->host))
365	<	{
366	<	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
367	<	"character in your hostname");
368	<	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
369	<	}
370	<
371	<	conf = source_p->connection->confs.head->data;
347	>	conf = client_p->connection->confs.head->data;
348
349	<	if (!HasFlag(source_p, FLAGS_GOTID))
349	>	if (!HasFlag(client_p, FLAGS_GOTID))
350		{
351		char username[USERLEN + 1] = "";
352		unsigned int i = 0;
#	Line 378 | Line 354 | register_local_user(struct Client *sourc
354		if (IsNeedIdentd(conf))
355		{
356		++ServerStats.is_ref;
357	<	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
357	>	sendto_one_notice(client_p, &me, ":*** Notice -- You need to install "
358		"identd to use this server");
359	<	exit_client(source_p, "Install identd");
359	>	exit_client(client_p, "Install identd");
360		return;
361		}
362
363	<	strlcpy(username, source_p->username, sizeof(username));
363	>	strlcpy(username, client_p->username, sizeof(username));
364
365		if (!IsNoTilde(conf))
366	<	source_p->username[i++] = '~';
366	>	client_p->username[i++] = '~';
367
368		for (const char *p = username; *p && i < USERLEN; ++p)
369	<	source_p->username[i++] = *p;
369	>	client_p->username[i++] = *p;
370
371	<	source_p->username[i] = '\0';
371	>	client_p->username[i] = '\0';
372		}
373
374		/* Password check */
375		if (!EmptyString(conf->passwd))
376		{
377	<	if (!match_conf_password(source_p->connection->password, conf))
377	>	if (!match_conf_password(client_p->connection->password, conf))
378		{
379		++ServerStats.is_ref;
380
381	<	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
382	<	exit_client(source_p, "Bad Password");
381	>	sendto_one_numeric(client_p, &me, ERR_PASSWDMISMATCH);
382	>	exit_client(client_p, "Bad Password");
383		return;
384		}
385		}
386
387		/*
388	<	* Don't free source_p->connection->password here - it can be required
388	>	* Don't free client_p->connection->password here - it can be required
389		* by masked /stats I if there are auth {} blocks with need_password = no;
390		* --adx
391		*/
392
393		/*
394	<	* Report if user has &^>= etc. and set flags as needed in source_p
394	>	* Report if user has &^>= etc. and set flags as needed in client_p
395		*/
396	<	report_and_set_user_flags(source_p, conf);
396	>	report_and_set_user_flags(client_p, conf);
397
398	<	if (IsDead(source_p))
398	>	if (IsDead(client_p))
399		return;
400
401		/*
#	Line 430 | Line 406 | register_local_user(struct Client *sourc
406		* probably be just a percentage of the MAXCLIENTS...
407		*   -Taner
408		*/
409	<	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
410	<	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
409	>	if ((dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
410	>	(dlink_list_length(&local_client_list) >= GlobalSetOptions.maxclients && !HasFlag(client_p, FLAGS_NOLIMIT)))
411		{
412		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
413		"Too many clients, rejecting %s[%s].",
414	<	source_p->name, source_p->host);
414	>	client_p->name, client_p->host);
415		++ServerStats.is_ref;
416	<	exit_client(source_p, "Sorry, server is full - try later");
416	>	exit_client(client_p, "Sorry, server is full - try later");
417		return;
418		}
419
420	<	if (!valid_username(source_p->username, 1))
420	>	if (!valid_username(client_p->username, 1))
421		{
422		char buf[IRCD_BUFSIZE] = "";
423
424		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
425		"Invalid username: %s (%s@%s)",
426	<	source_p->name, source_p->username, source_p->host);
426	>	client_p->name, client_p->username, client_p->host);
427		++ServerStats.is_ref;
428	<	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
429	<	exit_client(source_p, buf);
428	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", client_p->username);
429	>	exit_client(client_p, buf);
430		return;
431		}
432
433	<	if (check_xline(source_p))
433	>	if (check_xline(client_p))
434		return;
435
436	+	const char *id;
437		while (hash_find_id((id = uid_get())))
438		;
439
440	<	strlcpy(source_p->id, id, sizeof(source_p->id));
441	<	hash_add_id(source_p);
440	>	strlcpy(client_p->id, id, sizeof(client_p->id));
441	>	hash_add_id(client_p);
442
443		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
444		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
445	<	source_p->name, source_p->username, source_p->host,
446	<	source_p->sockhost,
447	<	get_client_class(&source_p->connection->confs),
448	<	source_p->info, source_p->id);
445	>	client_p->name, client_p->username, client_p->realhost,
446	>	client_p->sockhost,
447	>	get_client_class(&client_p->connection->confs),
448	>	client_p->info, client_p->id);
449
450		if (ConfigGeneral.invisible_on_connect)
451		{
452	<	AddUMode(source_p, UMODE_INVISIBLE);
452	>	AddUMode(client_p, UMODE_INVISIBLE);
453		++Count.invisi;
454		}
455
456	<	if (++Count.local > Count.max_loc)
456	>	assert(client_p->servptr == &me);
457	>	SetClient(client_p);
458	>	dlinkAdd(client_p, &client_p->lnode, &client_p->servptr->serv->client_list);
459	>	dlinkAdd(client_p, &client_p->node, &global_client_list);
460	>
461	>	assert(dlinkFind(&unknown_list, client_p));
462	>
463	>	dlink_move_node(&client_p->connection->lclient_node,
464	>	&unknown_list, &local_client_list);
465	>
466	>	if (dlink_list_length(&local_client_list) > Count.max_loc)
467		{
468	<	Count.max_loc = Count.local;
468	>	Count.max_loc = dlink_list_length(&local_client_list);
469
470		if (!(Count.max_loc % 10))
471		sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
#	Line 486 | Line 473 | register_local_user(struct Client *sourc
473		Count.max_loc);
474		}
475
476	<	if (++Count.total > Count.max_tot)
477	<	Count.max_tot = Count.total;
478	<	++Count.totalrestartcount;
479	<
493	<	assert(source_p->servptr == &me);
494	<	SetClient(source_p);
495	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
496	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
497	<
498	<	assert(dlinkFind(&unknown_list, source_p));
476	>	if ((dlink_list_length(&local_client_list) +
477	>	dlink_list_length(&local_server_list)) > Count.max_loc_con)
478	>	Count.max_loc_con = dlink_list_length(&local_client_list) +
479	>	dlink_list_length(&local_server_list);
480
481	<	dlink_move_node(&source_p->connection->lclient_node,
482	<	&unknown_list, &local_client_list);
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(source_p);
486	<	add_user_host(source_p->username, source_p->host, 0);
487	<	AddFlag(source_p, FLAGS_USERHOST);
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 518 | 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;
524	<
525	<	if ((target_p = source_p->servptr) && target_p->from != source_p->from)
526	<	{
527	<	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
528	<	"Bad User [%s] :%s USER %s@%s %s, != %s[%s]",
529	<	source_p->from->name, source_p->name, source_p->username,
530	<	source_p->host, source_p->servptr->name,
531	<	target_p->name, target_p->from->name);
532	<	sendto_one(source_p->from,
533	<	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
534	<	me.id, source_p->id, me.name, source_p->servptr->name,
535	<	target_p->from->name);
536	<
537	<	AddFlag(source_p, FLAGS_KILLED);
538	<	exit_client(source_p, "UID server wrong direction");
539	<	return;
540	<	}
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	<	if (++Count.total > Count.max_tot)
515	<	Count.max_tot = Count.total;
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	<	SetClient(source_p);
519	<	dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
554	<	dlinkAdd(source_p, &source_p->node, &global_client_list);
555	<	add_user_host(source_p->username, source_p->host, 1);
556	<	AddFlag(source_p, FLAGS_USERHOST);
518	>	if (dlink_list_length(&global_client_list) > Count.max_tot)
519	>	Count.max_tot = dlink_list_length(&global_client_list);
520
521	<	if (HasFlag(source_p->servptr, FLAGS_EOB))
521	>	userhost_add(client_p->sockhost, 1);
522	>	AddFlag(client_p, FLAGS_USERHOST);
523	>
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->realhost,
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 605 | Line 571 | valid_hostname(const char *hostname)
571		int
572		valid_username(const char *username, const int local)
573		{
608	–	unsigned int dots = 0;
574		const char *p = username;
575
576		assert(p);
#	Line 623 | Line 588 | valid_username(const char *username, con
588
589		if (local)
590		{
591	+	unsigned int dots = 0;
592	+
593		while (*++p)
594		{
595		if (*p == '.' && ConfigGeneral.dots_in_ident)
#	Line 673 | 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
681	<	*              - source_p
682	<	*              - int old
683	<	*              - suplied umode_buf
684	<	* 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 707 | 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 722 | 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 735 | 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] = "";
703	>	char buf[UMODE_MAX_STR] = "";
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)
714		{
715	<	dlink_node *node = NULL;
715	>	dlink_node *node;
716
717	<	if (!strcmp(target_p->host, hostname))
717	>	if (!strcmp(client_p->host, hostname))
718		return;
719
757	–	switch (what)
758	–	{
759	–	case MODE_ADD:
760	–	AddUMode(target_p, UMODE_HIDDENHOST);
761	–	break;
762	–	case MODE_DEL:
763	–	DelUMode(target_p, UMODE_HIDDENHOST);
764	–	break;
765	–	default: return;
766	–	}
767	–
720		if (ConfigGeneral.cycle_on_host_change)
721	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
722	<	target_p->name, target_p->username, target_p->host);
771	<
772	<	if (HasFlag(target_p, FLAGS_USERHOST))
773	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
721	>	sendto_common_channels_local(client_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
722	>	client_p->name, client_p->username, client_p->host);
723
724	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
724	>	sendto_common_channels_local(client_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
725	>	client_p->name, client_p->username,
726	>	client_p->host, client_p->username, hostname);
727
728	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
778	<	AddFlag(target_p, FLAGS_USERHOST);
728	>	strlcpy(client_p->host, hostname, sizeof(client_p->host));
729
730	<	if (MyClient(target_p))
730	>	if (MyConnect(client_p))
731		{
732	<	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
733	<	clear_ban_cache_client(target_p);
732	>	sendto_one_numeric(client_p, &me, RPL_VISIBLEHOST, client_p->host);
733	>	clear_ban_cache_list(&client_p->channel);
734		}
735
736		if (!ConfigGeneral.cycle_on_host_change)
737		return;
738
739	<	DLINK_FOREACH(node, target_p->channel.head)
739	>	DLINK_FOREACH(node, client_p->channel.head)
740		{
741	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
741	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
742	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
743		char *p = modebuf;
744		int len = 0;
745		const struct Membership *member = node->data;
#	Line 796 | Line 747 | user_set_hostmask(struct Client *target_
747		if (has_member_flags(member, CHFL_CHANOP))
748		{
749		*p++ = 'o';
750	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
750	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
751		}
752
753		if (has_member_flags(member, CHFL_HALFOP))
754		{
755		*p++ = 'h';
756	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
756	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
757		}
758
759		if (has_member_flags(member, CHFL_VOICE))
760		{
761		*p++ = 'v';
762	<	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
762	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", client_p->name);
763		}
764
765		*p = '\0';
766
767	<
768	<	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
769	<	target_p->name, target_p->username,
770	<	target_p->host, member->chptr->name,
771	<	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
772	<	target_p->info);
773	<	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
823	<	target_p->name, target_p->username,
824	<	target_p->host, member->chptr->name);
767	>	sendto_channel_local(client_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
768	>	client_p->name, client_p->username,
769	>	client_p->host, member->chptr->name,
770	>	client_p->account, client_p->info);
771	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
772	>	client_p->name, client_p->username,
773	>	client_p->host, member->chptr->name);
774
775		if (nickbuf[0])
776	<	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
777	<	target_p->servptr->name, member->chptr->name,
778	<	modebuf, nickbuf);
830	<
776	>	sendto_channel_local(client_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
777	>	client_p->servptr->name, member->chptr->name,
778	>	modebuf, nickbuf);
779		}
780
781	<	if (target_p->away[0])
782	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
781	>	if (client_p->away[0])
782	>	sendto_common_channels_local(client_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
783		":%s!%s@%s AWAY :%s",
784	<	target_p->name, target_p->username,
785	<	target_p->host, target_p->away);
838	<	}
839	<
840	<	/*! \brief Blindly opers up given source_p, using conf info.
841	<	*         All checks on passwords have already been done.
842	<	* \param source_p Pointer to given client to oper
843	<	*/
844	<	void
845	<	user_oper_up(struct Client *source_p)
846	<	{
847	<	const unsigned int old = source_p->umodes;
848	<	const struct MaskItem *const conf = source_p->connection->confs.head->data;
849	<
850	<	++Count.oper;
851	<	SetOper(source_p);
852	<
853	<	if (conf->modes)
854	<	AddUMode(source_p, conf->modes);
855	<	else if (ConfigGeneral.oper_umodes)
856	<	AddUMode(source_p, ConfigGeneral.oper_umodes);
857	<
858	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
859	<	++Count.invisi;
860	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
861	<	--Count.invisi;
862	<
863	<	assert(dlinkFind(&oper_list, source_p) == NULL);
864	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
865	<
866	<	AddOFlag(source_p, conf->port);
867	<
868	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
869	<	AddUMode(source_p, UMODE_ADMIN);
870	<
871	<	if (!EmptyString(conf->whois))
872	<	{
873	<	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
874	<	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
875	<	me.id, source_p->id, (unsigned long)source_p->tsinfo,
876	<	RPL_WHOISOPERATOR, conf->whois);
877	<	}
878	<
879	<	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE, "%s is now an operator",
880	<	get_oper_name(source_p));
881	<	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
882	<	me.id, get_oper_name(source_p));
883	<	send_umode_out(source_p, old);
884	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
784	>	client_p->name, client_p->username,
785	>	client_p->host, client_p->away);
786		}

Comparing ircd-hybrid/trunk/src/user.c (property svn:keywords):
Revision 6357 by michael, Mon Aug 17 16:38:13 2015 UTC vs.
Revision 8439 by michael, Thu Mar 29 13:07:32 2018 UTC

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

Diff Legend

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