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 3238 by michael, Sun Mar 30 13:44:07 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6759 by michael, Fri Nov 13 18:23:37 2015 UTC

#	Line 1 | Line 1
1		/*
2		*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (c) 1997-2014 ircd-hybrid development team
4	>	*  Copyright (c) 1997-2015 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 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
22	<	/*! \file s_user.c
22	>	/*! \file user.c
23		* \brief User related functions.
24		* \version $Id$
25		*/
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"
33		#include "hash.h"
34	+	#include "id.h"
35		#include "irc_string.h"
36		#include "ircd.h"
37		#include "listener.h"
#	Line 39 | Line 39
39		#include "numeric.h"
40		#include "conf.h"
41		#include "log.h"
42	<	#include "s_serv.h"
42	>	#include "server.h"
43		#include "send.h"
44	–	#include "supported.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	+	#include "isupport.h"
52
53		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 *);
59	<	static const char *uid_get(void);
60	<
61	<	/* Used for building up the isupport string,
62	<	* used with init_isupport, add_isupport, delete_isupport
63	<	*/
64	<
65	<	struct Isupport
66	<	{
67	<	dlink_node node;
68	<	char *name;
69	<	char *options;
70	<	int number;
71	<	};
72	<
73	<	static dlink_list support_list;
74	<	static dlink_list support_list_lines;
75	<
76	<	/* memory is cheap. map 0-255 to equivalent mode */
77	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	0,                  /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	UMODE_SSL,          /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	UMODE_WEBIRC,       /* W */
86	<	0,                  /* X */
108	<	0,                  /* Y */
109	<	0,                  /* Z 0x5A */
110	<	0, 0, 0, 0, 0,      /* 0x5F   */
111	<	0,                  /* 0x60   */
112	<	UMODE_ADMIN,        /* a */
113	<	UMODE_BOTS,         /* b */
114	<	UMODE_CCONN,        /* c */
115	<	UMODE_DEBUG,        /* d */
116	<	UMODE_EXTERNAL,     /* e */
117	<	UMODE_FULL,         /* f */
118	<	UMODE_CALLERID,     /* g */
119	<	0,                  /* h */
120	<	UMODE_INVISIBLE,    /* i */
121	<	UMODE_REJ,          /* j */
122	<	UMODE_SKILL,        /* k */
123	<	UMODE_LOCOPS,       /* l */
124	<	0,                  /* m */
125	<	UMODE_NCHANGE,      /* n */
126	<	UMODE_OPER,         /* o */
127	<	0,                  /* p */
128	<	0,                  /* q */
129	<	UMODE_REGISTERED,   /* r */
130	<	UMODE_SERVNOTICE,   /* s */
131	<	0,                  /* t */
132	<	UMODE_UNAUTH,       /* u */
133	<	0,                  /* v */
134	<	UMODE_WALLOP,       /* w */
135	<	UMODE_HIDDENHOST,   /* x */
136	<	UMODE_SPY,          /* y */
137	<	UMODE_OPERWALL,     /* z      0x7A */
138	<	0,0,0,0,0,          /* 0x7B - 0x7F */
139	<
140	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
141	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
142	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
143	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
144	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
145	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
146	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
147	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
153	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 170 | Line 110 | void
110		show_lusers(struct Client *source_p)
111		{
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total-Count.invisi),
114	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT,
117	<	(Count.total-Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119	<	if (Count.oper > 0)
119	>	if (Count.oper)
120		sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121
122	<	if (dlink_list_length(&unknown_list) > 0)
122	>	if (dlink_list_length(&unknown_list))
123		sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124
125	<	if (dlink_list_length(&global_channel_list) > 0)
126	<	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&global_channel_list));
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
#	Line 209 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
152	<	/* show_isupport()
152	>	/* report_and_set_user_flags()
153		*
154	<	* inputs       - pointer to client
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156		* output       - NONE
157	<	* side effects - display to client what we support (for them)
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159		*/
160	<	void
161	<	show_isupport(struct Client *source_p)
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162		{
163	<	const dlink_node *ptr = NULL;
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166
167	<	DLINK_FOREACH(ptr, support_list_lines.head)
168	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172	>	}
173	>
174	>	if (IsConfExemptXline(conf))
175	>	{
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178	>	}
179	>
180	>	if (IsConfExemptResv(conf))
181	>	{
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	>	}
185	>
186	>	/* If this user is exempt from user limits set it "F lined" */
187	>	if (IsConfExemptLimits(conf))
188	>	{
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	>	}
192	>
193	>	if (IsConfCanFlood(conf))
194	>	{
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	>	"protection, aren't you fearsome.");
198	>	}
199		}
200
201	<	/*
202	<	** register_local_user
203	<	**      This function is called when both NICK and USER messages
204	<	**      have been accepted for the client, in whatever order. Only
205	<	**      after this, is the USER message propagated.
206	<	**
207	<	**      NICK's must be propagated at once when received, although
208	<	**      it would be better to delay them too until full info is
209	<	**      available. Doing it is not so simple though, would have
210	<	**      to implement the following:
211	<	**
212	<	**      (actually it has been implemented already for a while) -orabidoo
213	<	**
214	<	**      1) user telnets in and gives only "NICK foobar" and waits
215	<	**      2) another user far away logs in normally with the nick
216	<	**         "foobar" (quite legal, as this server didn't propagate
217	<	**         it).
218	<	**      3) now this server gets nick "foobar" from outside, but
219	<	**         has alread the same defined locally. Current server
220	<	**         would just issue "KILL foobar" to clean out dups. But,
221	<	**         this is not fair. It should actually request another
222	<	**         nick from local user or kill him/her...
223	<	*/
201	>	/* introduce_client()
202	>	*
203	>	* inputs       - source_p
204	>	* output       - NONE
205	>	* side effects - This common function introduces a client to the rest
206	>	*                of the net, either from a local client connect or
207	>	*                from a remote connect.
208	>	*/
209	>	static void
210	>	introduce_client(struct Client *source_p)
211	>	{
212	>	dlink_node *node = NULL;
213	>	char ubuf[IRCD_BUFSIZE] = "";
214	>
215	>	if (MyClient(source_p))
216	>	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);
221	>
222	>	if (ubuf[0] == '\0')
223	>	{
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226	>	}
227	>
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231	>
232	>	if (server == source_p->from)
233	>	continue;
234	>
235	>	if (IsCapable(server, CAPAB_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	(unsigned long)source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244	>	else
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246	>	source_p->servptr->id,
247	>	source_p->name, source_p->hopcount+1,
248	>	(unsigned long)source_p->tsinfo,
249	>	ubuf, source_p->username, source_p->host,
250	>	source_p->sockhost, source_p->id, source_p->info);
251	>
252	>	if (!EmptyString(source_p->certfp))
253	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
254	>	}
255	>	}
256	>
257	>	/* user_welcome()
258	>	*
259	>	* inputs       - client pointer to client to welcome
260	>	* output       - NONE
261	>	* side effects -
262	>	*/
263	>	static void
264	>	user_welcome(struct Client *source_p)
265	>	{
266	>	static const char built_date[] = __DATE__ " at " __TIME__;
267	>
268	>	#ifdef HAVE_LIBCRYPTO
269	>	if (HasFlag(source_p, FLAGS_SSL))
270	>	{
271	>	AddUMode(source_p, UMODE_SSL);
272	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
273	>	ssl_get_cipher(source_p->connection->fd.ssl));
274	>	}
275	>	#endif
276	>
277	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
278	>	source_p->name);
279	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
280	>	listener_get_name(source_p->connection->listener), ircd_version);
281	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
282	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
283	>
284	>	isupport_show(source_p);
285	>	show_lusers(source_p);
286	>	motd_signon(source_p);
287	>	}
288	>
289	>	/* check_xline()
290	>	*
291	>	* inputs       - pointer to client to test
292	>	* outupt       - 1 if exiting 0 if ok
293	>	* side effects -
294	>	*/
295	>	static int
296	>	check_xline(struct Client *source_p)
297	>	{
298	>	struct MaskItem *conf = NULL;
299	>
300	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
301	>	return 0;
302	>
303	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
304	>	{
305	>	++conf->count;
306	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
307	>	"X-line Rejecting [%s] [%s], user %s [%s]",
308	>	source_p->info, conf->reason,
309	>	get_client_name(source_p, HIDE_IP),
310	>	source_p->sockhost);
311	>
312	>	++ServerStats.is_ref;
313	>	exit_client(source_p, "Bad user info");
314	>	return 1;
315	>	}
316	>
317	>	return 0;
318	>	}
319	>
320	>	/*! \brief This function is called when both NICK and USER messages
321	>	*      have been accepted for the client, in whatever order. Only
322	>	*      after this, is the UID message propagated.
323	>	* \param source_p Pointer to given client to introduce
324	>	*/
325		void
326		register_local_user(struct Client *source_p)
327		{
#	Line 255 | Line 330 | register_local_user(struct Client *sourc
330
331		assert(source_p == source_p->from);
332		assert(MyConnect(source_p));
333	<	assert(!source_p->localClient->registration);
334	<
260	<	ClearCap(source_p, CAP_TS6);
333	>	assert(IsUnknown(source_p));
334	>	assert(!source_p->connection->registration);
335
336	<	if (ConfigFileEntry.ping_cookie)
336	>	if (ConfigGeneral.ping_cookie)
337		{
338	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
338	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
339		{
340		do
341	<	source_p->localClient->random_ping = genrand_int32();
342	<	while (!source_p->localClient->random_ping);
341	>	source_p->connection->random_ping = genrand_int32();
342	>	while (!source_p->connection->random_ping);
343
344	<	sendto_one(source_p, "PING :%u",
345	<	source_p->localClient->random_ping);
272	<	SetPingSent(source_p);
344	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
345	>	AddFlag(source_p, FLAGS_PINGSENT);
346		return;
347		}
348
349	<	if (!HasPingCookie(source_p))
349	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
350		return;
351		}
352
353	<	source_p->localClient->last_privmsg = CurrentTime;
353	>	source_p->connection->last_privmsg = CurrentTime;
354		/* Straight up the maximum rate of flooding... */
355	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
355	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
356
357		if (!check_client(source_p))
358		return;
#	Line 288 | Line 361 | register_local_user(struct Client *sourc
361		{
362		sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
363		"character in your hostname");
364	<	strlcpy(source_p->host, source_p->sockhost,
292	<	sizeof(source_p->host));
364	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
365		}
366
367	<	conf = source_p->localClient->confs.head->data;
367	>	conf = source_p->connection->confs.head->data;
368
369	<	if (!IsGotId(source_p))
369	>	if (!HasFlag(source_p, FLAGS_GOTID))
370		{
371		char username[USERLEN + 1] = "";
300	–	const char *p = username;
372		unsigned int i = 0;
373
374		if (IsNeedIdentd(conf))
#	Line 314 | Line 385 | register_local_user(struct Client *sourc
385		if (!IsNoTilde(conf))
386		source_p->username[i++] = '~';
387
388	<	for (; *p && i < USERLEN; ++p)
389	<	if (*p != '[')
319	<	source_p->username[i++] = *p;
388	>	for (const char *p = username; *p && i < USERLEN; ++p)
389	>	source_p->username[i++] = *p;
390
391		source_p->username[i] = '\0';
392		}
393
394	<	/* password check */
394	>	/* Password check */
395		if (!EmptyString(conf->passwd))
396		{
397	<	const char *pass = source_p->localClient->passwd;
328	<
329	<	if (!match_conf_password(pass, conf))
397	>	if (!match_conf_password(source_p->connection->password, conf))
398		{
399		++ServerStats.is_ref;
400
#	Line 336 | Line 404 | register_local_user(struct Client *sourc
404		}
405		}
406
407	<	/* don't free source_p->localClient->passwd here - it can be required
408	<	* by masked /stats I if there are auth{} blocks with need_password = no;
407	>	/*
408	>	* Don't free source_p->connection->password here - it can be required
409	>	* by masked /stats I if there are auth {} blocks with need_password = no;
410		* --adx
411		*/
412
413	<	/* report if user has &^>= etc. and set flags as needed in source_p */
413	>	/*
414	>	* Report if user has &^>= etc. and set flags as needed in source_p
415	>	*/
416		report_and_set_user_flags(source_p, conf);
417
418		if (IsDead(source_p))
419		return;
420
421	<	/* Limit clients -
421	>	/*
422	>	* Limit clients -
423		* We want to be able to have servers and F-line clients
424		* connect, so save room for "buffer" connections.
425		* Smaller servers may want to decrease this, and it should
426		* probably be just a percentage of the MAXCLIENTS...
427		*   -Taner
428		*/
429	<	/* Except "F:" clients */
430	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
359	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
429	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
430	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
431		{
432		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
433		"Too many clients, rejecting %s[%s].",
#	Line 366 | Line 437 | register_local_user(struct Client *sourc
437		return;
438		}
439
369	–	/* valid user name check */
440		if (!valid_username(source_p->username, 1))
441		{
442	<	char tmpstr2[IRCD_BUFSIZE] = "";
442	>	char buf[IRCD_BUFSIZE] = "";
443
444		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
445		"Invalid username: %s (%s@%s)",
446		source_p->name, source_p->username, source_p->host);
447		++ServerStats.is_ref;
448	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
449	<	source_p->username);
380	<	exit_client(source_p, tmpstr2);
448	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
449	>	exit_client(source_p, buf);
450		return;
451		}
452
#	Line 393 | Line 462 | register_local_user(struct Client *sourc
462		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
463		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
464		source_p->name, source_p->username, source_p->host,
465	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
466	<	"255.255.255.255" : source_p->sockhost,
398	<	get_client_class(&source_p->localClient->confs),
465	>	source_p->sockhost,
466	>	get_client_class(&source_p->connection->confs),
467		source_p->info, source_p->id);
468
469	<	if (ConfigFileEntry.invisible_on_connect)
469	>	if (ConfigGeneral.invisible_on_connect)
470		{
471		AddUMode(source_p, UMODE_INVISIBLE);
472		++Count.invisi;
#	Line 409 | Line 477 | register_local_user(struct Client *sourc
477		Count.max_loc = Count.local;
478
479		if (!(Count.max_loc % 10))
480	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
481	<	"New Max Local Clients: %d",
480	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
481	>	"New maximum local client connections: %u",
482		Count.max_loc);
483		}
484
417	–	/* Increment our total user count here */
485		if (++Count.total > Count.max_tot)
486		Count.max_tot = Count.total;
487		++Count.totalrestartcount;
#	Line 422 | Line 489 | register_local_user(struct Client *sourc
489		assert(source_p->servptr == &me);
490		SetClient(source_p);
491		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
492	<
426	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
492	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
493
494		assert(dlinkFind(&unknown_list, source_p));
495
496	<	dlink_move_node(&source_p->localClient->lclient_node,
496	>	dlink_move_node(&source_p->connection->lclient_node,
497		&unknown_list, &local_client_list);
498
499		user_welcome(source_p);
500	<	add_user_host(source_p->username, source_p->host, 0);
501	<	SetUserHost(source_p);
500	>	userhost_add(source_p->username, source_p->host, 0);
501	>	AddFlag(source_p, FLAGS_USERHOST);
502
503		introduce_client(source_p);
504		}
#	Line 448 | Line 514 | register_local_user(struct Client *sourc
514		*                is introduced by a server.
515		*/
516		void
517	<	register_remote_user(struct Client *source_p, const char *username,
452	<	const char *host, const char *server)
517	>	register_remote_user(struct Client *source_p)
518		{
519	<	struct Client *target_p = NULL;
455	<
456	<	assert(source_p->username != username);
457	<
458	<	strlcpy(source_p->host, host, sizeof(source_p->host));
459	<	strlcpy(source_p->username, username, sizeof(source_p->username));
460	<
461	<	/*
462	<	* coming from another server, take the servers word for it
463	<	*/
464	<	source_p->servptr = hash_find_server(server);
465	<
466	<	/*
467	<	* Super GhostDetect:
468	<	* If we can't find the server the user is supposed to be on,
469	<	* then simply blow the user away.        -Taner
470	<	*/
471	<	if (source_p->servptr == NULL)
472	<	{
473	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
474	<	"No server %s for user %s[%s@%s] from %s",
475	<	server, source_p->name, source_p->username,
476	<	source_p->host, source_p->from->name);
477	<	sendto_one(source_p->from,
478	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
479	<	me.id, source_p->id, me.name, server);
480	<
481	<	AddFlag(source_p, FLAGS_KILLED);
482	<	exit_client(source_p, "Ghosted Client");
483	<	return;
484	<	}
519	>	const struct Client *target_p = NULL;
520
521		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
522		{
#	Line 491 | Line 526 | register_remote_user(struct Client *sour
526		source_p->host, source_p->servptr->name,
527		target_p->name, target_p->from->name);
528		sendto_one(source_p->from,
529	<	":%s KILL %s :%s (NICK from wrong direction (%s != %s))",
529	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
530		me.id, source_p->id, me.name, source_p->servptr->name,
531		target_p->from->name);
532
533		AddFlag(source_p, FLAGS_KILLED);
534	<	exit_client(source_p, "USER server wrong direction");
534	>	exit_client(source_p, "UID server wrong direction");
535		return;
536		}
537
#	Line 507 | Line 542 | register_remote_user(struct Client *sour
542		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
543		AddFlag(source_p, FLAGS_SERVICE);
544
510	–	/* Increment our total user count here */
545		if (++Count.total > Count.max_tot)
546		Count.max_tot = Count.total;
547
548		SetClient(source_p);
549		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
550	<	add_user_host(source_p->username, source_p->host, 1);
551	<	SetUserHost(source_p);
550	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
551	>	userhost_add(source_p->username, source_p->host, 1);
552	>	AddFlag(source_p, FLAGS_USERHOST);
553
554		if (HasFlag(source_p->servptr, FLAGS_EOB))
555		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
556	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
557		source_p->servptr->name,
558		source_p->name, source_p->username, source_p->host,
559	<	source_p->info, source_p->id);
559	>	source_p->sockhost, source_p->info, source_p->id);
560
561		introduce_client(source_p);
562		}
563
529	–	/* introduce_client()
530	–	*
531	–	* inputs       - source_p
532	–	* output       - NONE
533	–	* side effects - This common function introduces a client to the rest
534	–	*                of the net, either from a local client connect or
535	–	*                from a remote connect.
536	–	*/
537	–	static void
538	–	introduce_client(struct Client *source_p)
539	–	{
540	–	dlink_node *ptr = NULL;
541	–	char ubuf[IRCD_BUFSIZE] = "";
542	–
543	–	if (MyClient(source_p))
544	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
545	–	else
546	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
547	–
548	–	watch_check_hash(source_p, RPL_LOGON);
549	–
550	–	if (ubuf[0] == '\0')
551	–	{
552	–	ubuf[0] = '+';
553	–	ubuf[1] = '\0';
554	–	}
555	–
556	–	DLINK_FOREACH(ptr, serv_list.head)
557	–	{
558	–	struct Client *server = ptr->data;
559	–
560	–	if (server == source_p->from)
561	–	continue;
562	–
563	–	if (IsCapable(server, CAP_SVS))
564	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
565	–	source_p->servptr->id,
566	–	source_p->name, source_p->hopcount+1,
567	–	(unsigned long)source_p->tsinfo,
568	–	ubuf, source_p->username, source_p->host,
569	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
570	–	"0" : source_p->sockhost, source_p->id,
571	–	source_p->svid,
572	–	source_p->info);
573	–	else
574	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
575	–	source_p->servptr->id,
576	–	source_p->name, source_p->hopcount+1,
577	–	(unsigned long)source_p->tsinfo,
578	–	ubuf, source_p->username, source_p->host,
579	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
580	–	"0" : source_p->sockhost, source_p->id, source_p->info);
581	–
582	–	if (!EmptyString(source_p->certfp))
583	–	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
584	–	}
585	–	}
586	–
564		/* valid_hostname()
565		*
566		* Inputs       - pointer to hostname
#	Line 624 | Line 601 | valid_hostname(const char *hostname)
601		int
602		valid_username(const char *username, const int local)
603		{
627	–	int dots      = 0;
604		const char *p = username;
605
606		assert(p);
#	Line 642 | Line 618 | valid_username(const char *username, con
618
619		if (local)
620		{
621	+	unsigned int dots = 0;
622	+
623		while (*++p)
624		{
625	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
625	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
626		{
627	<	if (++dots > ConfigFileEntry.dots_in_ident)
627	>	if (++dots > ConfigGeneral.dots_in_ident)
628		return 0;
629		if (!IsUserChar(*(p + 1)))
630		return 0;
#	Line 662 | Line 640 | valid_username(const char *username, con
640		return 0;
641		}
642
643	<	return  p - username <= USERLEN;;
643	>	return p - username <= USERLEN;
644		}
645
646		/* clean_nick_name()
#	Line 676 | Line 654 | int
654		valid_nickname(const char *nickname, const int local)
655		{
656		const char *p = nickname;
679	–	assert(nickname && *nickname);
657
658		assert(p);
659
660	<	/* nicks can't start with a digit or - or be 0 length */
661	<	/* This closer duplicates behaviour of hybrid-6 */
662	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
660	>	/*
661	>	* Nicks can't start with a digit or - or be 0 length.
662	>	*/
663	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
664		return 0;
665
666		for (; *p; ++p)
#	Line 692 | Line 670 | valid_nickname(const char *nickname, con
670		return p - nickname <= NICKLEN;
671		}
672
695	–	/* report_and_set_user_flags()
696	–	*
697	–	* inputs       - pointer to source_p
698	–	*              - pointer to conf for this user
699	–	* output       - NONE
700	–	* side effects - Report to user any special flags
701	–	*                they are getting, and set them.
702	–	*/
703	–	static void
704	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
705	–	{
706	–	/* If this user is being spoofed, tell them so */
707	–	if (IsConfDoSpoofIp(conf))
708	–	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
709	–
710	–	/* If this user is in the exception class, Set it "E lined" */
711	–	if (IsConfExemptKline(conf))
712	–	{
713	–	SetExemptKline(source_p);
714	–	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
715	–	}
716	–
717	–	/*
718	–	* The else here is to make sure that G line exempt users
719	–	* do not get noticed twice.
720	–	*/
721	–	else if (IsConfExemptGline(conf))
722	–	{
723	–	SetExemptGline(source_p);
724	–	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
725	–	}
726	–
727	–	if (IsConfExemptResv(conf))
728	–	{
729	–	SetExemptResv(source_p);
730	–	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
731	–	}
732	–
733	–	/* If this user is exempt from user limits set it "F lined" */
734	–	if (IsConfExemptLimits(conf))
735	–	{
736	–	SetExemptLimits(source_p);
737	–	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
738	–	}
739	–
740	–	if (IsConfCanFlood(conf))
741	–	{
742	–	SetCanFlood(source_p);
743	–	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
744	–	"protection, aren't you fearsome.");
745	–	}
746	–	}
747	–
748	–	/* set_user_mode()
749	–	*
750	–	* added 15/10/91 By Darren Reed.
751	–	* parv[0] - command
752	–	* parv[1] - username to change mode for
753	–	* parv[2] - modes to change
754	–	*/
755	–	void
756	–	set_user_mode(struct Client *source_p, const int parc, char *parv[])
757	–	{
758	–	unsigned int flag, setflags;
759	–	char **p, *m, buf[IRCD_BUFSIZE] = "";
760	–	struct Client *target_p;
761	–	int what = MODE_ADD, badflag = 0, i;
762	–
763	–	assert(!(parc < 2));
764	–
765	–	if ((target_p = find_person(source_p, parv[1])) == NULL)
766	–	{
767	–	if (MyConnect(source_p))
768	–	sendto_one_numeric(source_p, &me, ERR_NOSUCHCHANNEL, parv[1]);
769	–	return;
770	–	}
771	–
772	–	if (source_p != target_p)
773	–	{
774	–	sendto_one_numeric(source_p, &me, ERR_USERSDONTMATCH);
775	–	return;
776	–	}
777	–
778	–	if (parc < 3)
779	–	{
780	–	m = buf;
781	–	*m++ = '+';
782	–
783	–	for (i = 0; i < 128; ++i)
784	–	if (HasUMode(source_p, user_modes[i]))
785	–	*m++ = (char)i;
786	–	*m = '\0';
787	–
788	–	sendto_one_numeric(source_p, &me, RPL_UMODEIS, buf);
789	–	return;
790	–	}
791	–
792	–	/* find flags already set for user */
793	–	setflags = source_p->umodes;
794	–
795	–	/* parse mode change string(s) */
796	–	for (p = &parv[2]; p && *p; ++p)
797	–	{
798	–	for (m = *p; *m; ++m)
799	–	{
800	–	switch (*m)
801	–	{
802	–	case '+':
803	–	what = MODE_ADD;
804	–	break;
805	–	case '-':
806	–	what = MODE_DEL;
807	–	break;
808	–	case 'o':
809	–	if (what == MODE_ADD)
810	–	{
811	–	if (!MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER))
812	–	{
813	–	++Count.oper;
814	–	SetOper(source_p);
815	–	}
816	–	}
817	–	else
818	–	{
819	–	if (!HasUMode(source_p, UMODE_OPER))
820	–	break;
821	–
822	–	ClearOper(source_p);
823	–	Count.oper--;
824	–
825	–	if (MyConnect(source_p))
826	–	{
827	–	dlink_node *ptr = NULL;
828	–
829	–	detach_conf(source_p, CONF_OPER);
830	–	ClrOFlag(source_p);
831	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832	–
833	–	if ((ptr = dlinkFindDelete(&oper_list, source_p)))
834	–	free_dlink_node(ptr);
835	–	}
836	–	}
837	–
838	–	break;
839	–
840	–	case 'S':  /* Only servers may set +S in a burst */
841	–	case 'W':  /* Only servers may set +W in a burst */
842	–	case 'r':  /* Only services may set +r */
843	–	case 'x':  /* Only services may set +x */
844	–	break;
845	–
846	–	default:
847	–	if ((flag = user_modes[(unsigned char)*m]))
848	–	{
849	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
850	–	(ConfigFileEntry.oper_only_umodes & flag))
851	–	badflag = 1;
852	–	else
853	–	{
854	–	if (what == MODE_ADD)
855	–	AddUMode(source_p, flag);
856	–	else
857	–	DelUMode(source_p, flag);
858	–	}
859	–	}
860	–	else if (MyConnect(source_p))
861	–	badflag = 1;
862	–
863	–	break;
864	–	}
865	–	}
866	–	}
867	–
868	–	if (badflag)
869	–	sendto_one_numeric(source_p, &me, ERR_UMODEUNKNOWNFLAG);
870	–
871	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
872	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
873	–	{
874	–	sendto_one_notice(source_p, &me, ":*** You have no admin flag;");
875	–	DelUMode(source_p, UMODE_ADMIN);
876	–	}
877	–
878	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
879	–	++Count.invisi;
880	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
881	–	--Count.invisi;
882	–
883	–	/*
884	–	* compare new flags with old flags and send string which
885	–	* will cause servers to update correctly.
886	–	*/
887	–	send_umode_out(source_p, source_p, setflags);
888	–	}
889	–
673		/* send_umode()
674		* send the MODE string for user (user) to connection client_p
675		* -avalon
#	Line 894 | Line 677 | set_user_mode(struct Client *source_p, c
677		* inputs       - client_p
678		*              - source_p
679		*              - int old
897	–	*              - sendmask mask of modes to send
680		*              - suplied umode_buf
681		* output       - NONE
682		*/
683		void
684		send_umode(struct Client *client_p, struct Client *source_p,
685	<	unsigned int old, unsigned int sendmask, char *umode_buf)
685	>	unsigned int old, char *umode_buf)
686		{
687		char *m = umode_buf;
688		int what = 0;
907	–	unsigned int i;
908	–	unsigned int flag;
689
690		/*
691	<	* build a string in umode_buf to represent the change in the user's
691	>	* Build a string in umode_buf to represent the change in the user's
692		* mode between the new (source_p->umodes) and 'old'.
693		*/
694	<	for (i = 0; i < 128; ++i)
694	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
695		{
696	<	flag = user_modes[i];
917	<	if (!flag)
918	<	continue;
919	<
920	<	if (MyClient(source_p) && !(flag & sendmask))
921	<	continue;
922	<
923	<	if ((flag & old) && !HasUMode(source_p, flag))
696	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
697		{
698		if (what == MODE_DEL)
699	<	*m++ = (char)i;
699	>	*m++ = tab->c;
700		else
701		{
702		what = MODE_DEL;
703		*m++ = '-';
704	<	*m++ = (char)i;
704	>	*m++ = tab->c;
705		}
706		}
707	<	else if (!(flag & old) && HasUMode(source_p, flag))
707	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
708		{
709		if (what == MODE_ADD)
710	<	*m++ = (char)i;
710	>	*m++ = tab->c;
711		else
712		{
713		what = MODE_ADD;
714		*m++ = '+';
715	<	*m++ = (char)i;
715	>	*m++ = tab->c;
716		}
717		}
718		}
#	Line 948 | Line 721 | send_umode(struct Client *client_p, stru
721
722		if (*umode_buf && client_p)
723		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
724	<	source_p->name, source_p->username,
725	<	source_p->host, source_p->name, umode_buf);
724	>	client_p->name, client_p->username,
725	>	client_p->host, client_p->name, umode_buf);
726		}
727
728		/* send_umode_out()
#	Line 959 | Line 732 | send_umode(struct Client *client_p, stru
732		* side effects - Only send ubuf out to servers that know about this client
733		*/
734		void
735	<	send_umode_out(struct Client *client_p, struct Client *source_p,
963	<	unsigned int old)
735	>	send_umode_out(struct Client *source_p, unsigned int old)
736		{
737		char buf[IRCD_BUFSIZE] = "";
738
739	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
739	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
740
741		if (buf[0])
742	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
742	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
743		source_p->id, source_p->id, buf);
972	–
973	–	if (client_p && MyClient(client_p))
974	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
744		}
745
746		void
747		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
748		{
749	<	dlink_node *ptr = NULL;
749	>	dlink_node *node = NULL;
750
751		if (!strcmp(target_p->host, hostname))
752		return;
#	Line 986 | Line 755 | user_set_hostmask(struct Client *target_
755		{
756		case MODE_ADD:
757		AddUMode(target_p, UMODE_HIDDENHOST);
989	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
758		break;
759		case MODE_DEL:
760		DelUMode(target_p, UMODE_HIDDENHOST);
993	–
994	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
995	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
761		break;
762		default: return;
763		}
764
765	<	if (ConfigFileEntry.cycle_on_host_change)
765	>	if (ConfigGeneral.cycle_on_host_change)
766		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
767		target_p->name, target_p->username, target_p->host);
768
769	<	if (IsUserHostIp(target_p))
770	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
769	>	if (HasFlag(target_p, FLAGS_USERHOST))
770	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
771
772		strlcpy(target_p->host, hostname, sizeof(target_p->host));
773
774	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
775	<	SetUserHost(target_p);
774	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
775	>	AddFlag(target_p, FLAGS_USERHOST);
776
777	<	if (MyClient(target_p))
777	>	if (MyConnect(target_p))
778		{
779	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
779	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
780		clear_ban_cache_client(target_p);
781		}
782
783	<	if (!ConfigFileEntry.cycle_on_host_change)
783	>	if (!ConfigGeneral.cycle_on_host_change)
784		return;
785
786	<	DLINK_FOREACH(ptr, target_p->channel.head)
786	>	DLINK_FOREACH(node, target_p->channel.head)
787		{
788		char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
789		char *p = modebuf;
790		int len = 0;
791	<	const struct Membership *ms = ptr->data;
791	>	const struct Membership *member = node->data;
792
793	<	if (has_member_flags(ms, CHFL_CHANOP))
793	>	if (has_member_flags(member, CHFL_CHANOP))
794		{
795		*p++ = 'o';
796		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
797		}
798
799	<	if (has_member_flags(ms, CHFL_HALFOP))
799	>	if (has_member_flags(member, CHFL_HALFOP))
800		{
801		*p++ = 'h';
802		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
803		}
804
805	<	if (has_member_flags(ms, CHFL_VOICE))
805	>	if (has_member_flags(member, CHFL_VOICE))
806		{
807		*p++ = 'v';
808		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1045 | Line 810 | user_set_hostmask(struct Client *target_
810
811		*p = '\0';
812
813	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
814	<	target_p->name, target_p->username, target_p->host,
815	<	ms->chptr->chname);
813	>
814	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, 0, ":%s!%s@%s JOIN %s %s :%s",
815	>	target_p->name, target_p->username,
816	>	target_p->host, member->chptr->name,
817	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
818	>	target_p->info);
819	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN, ":%s!%s@%s JOIN :%s",
820	>	target_p->name, target_p->username,
821	>	target_p->host, member->chptr->name);
822	>
823		if (nickbuf[0])
824	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
825	<	target_p->servptr->name, ms->chptr->chname,
826	<	modebuf, nickbuf);
824	>	sendto_channel_local(target_p, member->chptr, 0, 0, 0, ":%s MODE %s +%s %s",
825	>	target_p->servptr->name, member->chptr->name,
826	>	modebuf, nickbuf);
827
828		}
829
#	Line 1061 | Line 833 | user_set_hostmask(struct Client *target_
833		target_p->name, target_p->username,
834		target_p->host, target_p->away);
835		}
1064	–
1065	–	/* user_welcome()
1066	–	*
1067	–	* inputs       - client pointer to client to welcome
1068	–	* output       - NONE
1069	–	* side effects -
1070	–	*/
1071	–	static void
1072	–	user_welcome(struct Client *source_p)
1073	–	{
1074	–	#if defined(__TIME__) && defined(__DATE__)
1075	–	static const char built_date[] = __DATE__ " at " __TIME__;
1076	–	#else
1077	–	static const char built_date[] = "unknown";
1078	–	#endif
1079	–
1080	–	#ifdef HAVE_LIBCRYPTO
1081	–	if (HasFlag(source_p, FLAGS_SSL))
1082	–	{
1083	–	AddUMode(source_p, UMODE_SSL);
1084	–	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1085	–	ssl_get_cipher(source_p->localClient->fd.ssl));
1086	–	}
1087	–	#endif
1088	–
1089	–	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1090	–	source_p->name);
1091	–	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1092	–	get_listener_name(source_p->localClient->listener), ircd_version);
1093	–	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1094	–	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1095	–	show_isupport(source_p);
1096	–
1097	–	if (source_p->id[0])
1098	–	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1099	–
1100	–	show_lusers(source_p);
1101	–	motd_signon(source_p);
1102	–	}
1103	–
1104	–	/* check_xline()
1105	–	*
1106	–	* inputs       - pointer to client to test
1107	–	* outupt       - 1 if exiting 0 if ok
1108	–	* side effects -
1109	–	*/
1110	–	static int
1111	–	check_xline(struct Client *source_p)
1112	–	{
1113	–	struct MaskItem *conf = NULL;
1114	–	const char *reason = NULL;
1115	–
1116	–	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1117	–	{
1118	–	++conf->count;
1119	–
1120	–	if (conf->reason)
1121	–	reason = conf->reason;
1122	–	else
1123	–	reason = CONF_NOREASON;
1124	–
1125	–	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1126	–	"X-line Rejecting [%s] [%s], user %s [%s]",
1127	–	source_p->info, reason,
1128	–	get_client_name(source_p, HIDE_IP),
1129	–	source_p->sockhost);
1130	–
1131	–	++ServerStats.is_ref;
1132	–	exit_client(source_p, "Bad user info");
1133	–	return 1;
1134	–	}
1135	–
1136	–	return 0;
1137	–	}
1138	–
1139	–	/* oper_up()
1140	–	*
1141	–	* inputs       - pointer to given client to oper
1142	–	* output       - NONE
1143	–	* side effects - Blindly opers up given source_p, using conf info
1144	–	*                all checks on passwords have already been done.
1145	–	*                This could also be used by rsa oper routines.
1146	–	*/
1147	–	void
1148	–	oper_up(struct Client *source_p)
1149	–	{
1150	–	const unsigned int old = source_p->umodes;
1151	–	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1152	–
1153	–	assert(source_p->localClient->confs.head);
1154	–
1155	–	++Count.oper;
1156	–	SetOper(source_p);
1157	–
1158	–	if (conf->modes)
1159	–	AddUMode(source_p, conf->modes);
1160	–	else if (ConfigFileEntry.oper_umodes)
1161	–	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1162	–
1163	–	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1164	–	++Count.invisi;
1165	–	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1166	–	--Count.invisi;
1167	–
1168	–	assert(dlinkFind(&oper_list, source_p) == NULL);
1169	–	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1170	–
1171	–	AddOFlag(source_p, conf->port);
1172	–
1173	–	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1174	–	AddUMode(source_p, UMODE_ADMIN);
1175	–
1176	–	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1177	–	get_oper_name(source_p));
1178	–	send_umode_out(source_p, source_p, old);
1179	–	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1180	–	}
1181	–
1182	–	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1183	–
1184	–	int
1185	–	valid_sid(const char *sid)
1186	–	{
1187	–	if (strlen(sid) == IRC_MAXSID)
1188	–	if (IsDigit(*sid))
1189	–	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1190	–	return 1;
1191	–
1192	–	return 0;
1193	–	}
1194	–
1195	–	/*
1196	–	* init_uid()
1197	–	*
1198	–	* inputs       - NONE
1199	–	* output       - NONE
1200	–	* side effects - new_uid is filled in with server id portion (sid)
1201	–	*                (first 3 bytes) or defaulted to 'A'.
1202	–	*                Rest is filled in with 'A'
1203	–	*/
1204	–	void
1205	–	init_uid(void)
1206	–	{
1207	–	memset(new_uid, 0, sizeof(new_uid));
1208	–
1209	–	if (!EmptyString(ServerInfo.sid))
1210	–	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1211	–
1212	–	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
1213	–	if (new_uid[i] == '\0')
1214	–	new_uid[i] = 'A';
1215	–
1216	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1217	–	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1218	–	}
1219	–
1220	–	/*
1221	–	* add_one_to_uid
1222	–	*
1223	–	* inputs       - index number into new_uid
1224	–	* output       - NONE
1225	–	* side effects - new_uid is incremented by one
1226	–	*                note this is a recursive function
1227	–	*/
1228	–	static void
1229	–	add_one_to_uid(int i)
1230	–	{
1231	–	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1232	–	{
1233	–	if (new_uid[i] == 'Z')
1234	–	new_uid[i] = '0';
1235	–	else if (new_uid[i] == '9')
1236	–	{
1237	–	new_uid[i] = 'A';
1238	–	add_one_to_uid(i-1);
1239	–	}
1240	–	else
1241	–	++new_uid[i];
1242	–	}
1243	–	else
1244	–	{
1245	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1246	–	if (new_uid[i] == 'Z')
1247	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1248	–	else
1249	–	++new_uid[i];
1250	–	}
1251	–	}
1252	–
1253	–	/*
1254	–	* uid_get
1255	–	*
1256	–	* inputs       - struct Client *
1257	–	* output       - new UID is returned to caller
1258	–	* side effects - new_uid is incremented by one.
1259	–	*/
1260	–	static const char *
1261	–	uid_get(void)
1262	–	{
1263	–	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1264	–	return new_uid;
1265	–	}
1266	–
1267	–	/*
1268	–	* init_isupport()
1269	–	*
1270	–	* input        - NONE
1271	–	* output       - NONE
1272	–	* side effects - Must be called before isupport is enabled
1273	–	*/
1274	–	void
1275	–	init_isupport(void)
1276	–	{
1277	–	add_isupport("CALLERID", NULL, -1);
1278	–	add_isupport("CASEMAPPING", CASEMAP, -1);
1279	–	add_isupport("DEAF", "D", -1);
1280	–	add_isupport("KICKLEN", NULL, KICKLEN);
1281	–	add_isupport("MODES", NULL, MAXMODEPARAMS);
1282	–	#ifdef HALFOPS
1283	–	add_isupport("PREFIX", "(ohv)@%+", -1);
1284	–	add_isupport("STATUSMSG", "@%+", -1);
1285	–	#else
1286	–	add_isupport("PREFIX", "(ov)@+", -1);
1287	–	add_isupport("STATUSMSG", "@+", -1);
1288	–	#endif
1289	–	add_isupport("EXCEPTS", "e", -1);
1290	–	add_isupport("INVEX", "I", -1);
1291	–	}
1292	–
1293	–	/*
1294	–	* add_isupport()
1295	–	*
1296	–	* input        - name of supported function
1297	–	*              - options if any
1298	–	*              - number if any
1299	–	* output       - NONE
1300	–	* side effects - Each supported item must call this when activated
1301	–	*/
1302	–	void
1303	–	add_isupport(const char *name, const char *options, int n)
1304	–	{
1305	–	dlink_node *ptr;
1306	–	struct Isupport *support;
1307	–
1308	–	DLINK_FOREACH(ptr, support_list.head)
1309	–	{
1310	–	support = ptr->data;
1311	–	if (irccmp(support->name, name) == 0)
1312	–	{
1313	–	MyFree(support->name);
1314	–	MyFree(support->options);
1315	–	break;
1316	–	}
1317	–	}
1318	–
1319	–	if (ptr == NULL)
1320	–	{
1321	–	support = MyMalloc(sizeof(*support));
1322	–	dlinkAddTail(support, &support->node, &support_list);
1323	–	}
1324	–
1325	–	support->name = xstrdup(name);
1326	–	if (options != NULL)
1327	–	support->options = xstrdup(options);
1328	–	support->number = n;
1329	–
1330	–	rebuild_isupport_message_line();
1331	–	}
1332	–
1333	–	/*
1334	–	* delete_isupport()
1335	–	*
1336	–	* input        - name of supported function
1337	–	* output       - NONE
1338	–	* side effects - Each supported item must call this when deactivated
1339	–	*/
1340	–	void
1341	–	delete_isupport(const char *name)
1342	–	{
1343	–	dlink_node *ptr;
1344	–	struct Isupport *support;
1345	–
1346	–	DLINK_FOREACH(ptr, support_list.head)
1347	–	{
1348	–	support = ptr->data;
1349	–	if (irccmp(support->name, name) == 0)
1350	–	{
1351	–	dlinkDelete(ptr, &support_list);
1352	–	MyFree(support->name);
1353	–	MyFree(support->options);
1354	–	MyFree(support);
1355	–	break;
1356	–	}
1357	–	}
1358	–
1359	–	rebuild_isupport_message_line();
1360	–	}
1361	–
1362	–	/*
1363	–	* rebuild_isupport_message_line
1364	–	*
1365	–	* input        - NONE
1366	–	* output       - NONE
1367	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1368	–	*/
1369	–	void
1370	–	rebuild_isupport_message_line(void)
1371	–	{
1372	–	char isupportbuffer[IRCD_BUFSIZE];
1373	–	char *p = isupportbuffer;
1374	–	dlink_node *ptr = NULL, *ptr_next = NULL;
1375	–	int n = 0;
1376	–	int tokens = 0;
1377	–	size_t len = 0;
1378	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1379	–
1380	–	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1381	–	{
1382	–	dlinkDelete(ptr, &support_list_lines);
1383	–	MyFree(ptr->data);
1384	–	free_dlink_node(ptr);
1385	–	}
1386	–
1387	–	DLINK_FOREACH(ptr, support_list.head)
1388	–	{
1389	–	struct Isupport *support = ptr->data;
1390	–
1391	–	p += (n = sprintf(p, "%s", support->name));
1392	–	len += n;
1393	–
1394	–	if (support->options != NULL)
1395	–	{
1396	–	p += (n = sprintf(p, "=%s", support->options));
1397	–	len += n;
1398	–	}
1399	–
1400	–	if (support->number > 0)
1401	–	{
1402	–	p += (n = sprintf(p, "=%d", support->number));
1403	–	len += n;
1404	–	}
1405	–
1406	–	*p++ = ' ';
1407	–	len++;
1408	–	*p = '\0';
1409	–
1410	–	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1411	–	{ /* arbritrary for now */
1412	–	if (*--p == ' ')
1413	–	*p = '\0';
1414	–
1415	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1416	–	p = isupportbuffer;
1417	–	len = 0;
1418	–	n = tokens = 0;
1419	–	}
1420	–	}
1421	–
1422	–	if (len != 0)
1423	–	{
1424	–	if (*--p == ' ')
1425	–	*p = '\0';
1426	–	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1427	–	}
1428	–	}

Diff Legend

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