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 3186 by michael, Thu Mar 20 18:09:34 2014 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6357 by michael, Mon Aug 17 16:38:13 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	>	/* 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	<	DLINK_FOREACH(ptr, support_list_lines.head)
187	<	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, ptr->data);
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	>	#if defined(__TIME__) && defined(__DATE__)
267	>	static const char built_date[] = __DATE__ " at " __TIME__;
268	>	#else
269	>	static const char built_date[] = "unknown";
270	>	#endif
271	>
272	>	#ifdef HAVE_LIBCRYPTO
273	>	if (HasFlag(source_p, FLAGS_SSL))
274	>	{
275	>	AddUMode(source_p, UMODE_SSL);
276	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
277	>	ssl_get_cipher(source_p->connection->fd.ssl));
278	>	}
279	>	#endif
280	>
281	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
282	>	source_p->name);
283	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
284	>	get_listener_name(source_p->connection->listener), ircd_version);
285	>	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);
291	>	}
292	>
293	>	/* check_xline()
294	>	*
295	>	* inputs       - pointer to client to test
296	>	* outupt       - 1 if exiting 0 if ok
297	>	* side effects -
298	>	*/
299	>	static int
300	>	check_xline(struct Client *source_p)
301	>	{
302	>	struct MaskItem *conf = NULL;
303	>
304	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
305	>	return 0;
306	>
307	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
308	>	{
309	>	++conf->count;
310	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
311	>	"X-line Rejecting [%s] [%s], user %s [%s]",
312	>	source_p->info, conf->reason,
313	>	get_client_name(source_p, HIDE_IP),
314	>	source_p->sockhost);
315	>
316	>	++ServerStats.is_ref;
317	>	exit_client(source_p, "Bad user info");
318	>	return 1;
319	>	}
320	>
321	>	return 0;
322	>	}
323	>
324	>	/*! \brief This function is called when both NICK and USER messages
325	>	*      have been accepted for the client, in whatever order. Only
326	>	*      after this, is the UID message propagated.
327	>	* \param source_p Pointer to given client to introduce
328	>	*/
329		void
330		register_local_user(struct Client *source_p)
331		{
332		const char *id = NULL;
333		const struct MaskItem *conf = NULL;
334
256	–	assert(source_p != NULL);
335		assert(source_p == source_p->from);
336		assert(MyConnect(source_p));
337	<	assert(!source_p->localClient->registration);
337	>	assert(IsUnknown(source_p));
338	>	assert(!source_p->connection->registration);
339
340	<	ClearCap(source_p, CAP_TS6);
262	<
263	<	if (ConfigFileEntry.ping_cookie)
340	>	if (ConfigGeneral.ping_cookie)
341		{
342	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
342	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
343		{
344		do
345	<	source_p->localClient->random_ping = genrand_int32();
346	<	while (!source_p->localClient->random_ping);
345	>	source_p->connection->random_ping = genrand_int32();
346	>	while (!source_p->connection->random_ping);
347
348	<	sendto_one(source_p, "PING :%u",
349	<	source_p->localClient->random_ping);
273	<	SetPingSent(source_p);
348	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
349	>	AddFlag(source_p, FLAGS_PINGSENT);
350		return;
351		}
352
353	<	if (!HasPingCookie(source_p))
353	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
354		return;
355		}
356
357	<	source_p->localClient->last_privmsg = CurrentTime;
357	>	source_p->connection->last_privmsg = CurrentTime;
358		/* Straight up the maximum rate of flooding... */
359	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
359	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
360
361		if (!check_client(source_p))
362		return;
#	Line 289 | Line 365 | register_local_user(struct Client *sourc
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,
293	<	sizeof(source_p->host));
368	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
369		}
370
371	<	conf = source_p->localClient->confs.head->data;
371	>	conf = source_p->connection->confs.head->data;
372
373	<	if (!IsGotId(source_p))
373	>	if (!HasFlag(source_p, FLAGS_GOTID))
374		{
375	<	char username[USERLEN + 1];
301	<	const char *p = username;
375	>	char username[USERLEN + 1] = "";
376		unsigned int i = 0;
377
378		if (IsNeedIdentd(conf))
#	Line 315 | Line 389 | register_local_user(struct Client *sourc
389		if (!IsNoTilde(conf))
390		source_p->username[i++] = '~';
391
392	<	for (; *p && i < USERLEN; ++p)
393	<	if (*p != '[')
320	<	source_p->username[i++] = *p;
392	>	for (const char *p = username; *p && i < USERLEN; ++p)
393	>	source_p->username[i++] = *p;
394
395		source_p->username[i] = '\0';
396		}
397
398	<	/* password check */
398	>	/* Password check */
399		if (!EmptyString(conf->passwd))
400		{
401	<	const char *pass = source_p->localClient->passwd;
329	<
330	<	if (!match_conf_password(pass, conf))
401	>	if (!match_conf_password(source_p->connection->password, conf))
402		{
403		++ServerStats.is_ref;
404
#	Line 337 | Line 408 | register_local_user(struct Client *sourc
408		}
409		}
410
411	<	/* don't free source_p->localClient->passwd here - it can be required
412	<	* by masked /stats I if there are auth{} blocks with need_password = no;
411	>	/*
412	>	* Don't free source_p->connection->password here - it can be required
413	>	* by masked /stats I if there are auth {} blocks with need_password = no;
414		* --adx
415		*/
416
417	<	/* report if user has &^>= etc. and set flags as needed in source_p */
417	>	/*
418	>	* Report if user has &^>= etc. and set flags as needed in source_p
419	>	*/
420		report_and_set_user_flags(source_p, conf);
421
422		if (IsDead(source_p))
423		return;
424
425	<	/* Limit clients -
425	>	/*
426	>	* Limit clients -
427		* We want to be able to have servers and F-line clients
428		* connect, so save room for "buffer" connections.
429		* Smaller servers may want to decrease this, and it should
430		* probably be just a percentage of the MAXCLIENTS...
431		*   -Taner
432		*/
433	<	/* Except "F:" clients */
434	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
360	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
433	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
434	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
435		{
436		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
437		"Too many clients, rejecting %s[%s].",
#	Line 367 | Line 441 | register_local_user(struct Client *sourc
441		return;
442		}
443
370	–	/* valid user name check */
444		if (!valid_username(source_p->username, 1))
445		{
446	<	char tmpstr2[IRCD_BUFSIZE];
446	>	char buf[IRCD_BUFSIZE] = "";
447
448		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
449		"Invalid username: %s (%s@%s)",
450		source_p->name, source_p->username, source_p->host);
451		++ServerStats.is_ref;
452	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
453	<	source_p->username);
381	<	exit_client(source_p, tmpstr2);
452	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
453	>	exit_client(source_p, buf);
454		return;
455		}
456
457		if (check_xline(source_p))
458		return;
459
460	<	while (hash_find_id((id = uid_get())) != NULL)
460	>	while (hash_find_id((id = uid_get())))
461		;
462
463		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 394 | Line 466 | register_local_user(struct Client *sourc
466		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
467		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
468		source_p->name, source_p->username, source_p->host,
469	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
470	<	"255.255.255.255" : source_p->sockhost,
399	<	get_client_class(&source_p->localClient->confs),
469	>	source_p->sockhost,
470	>	get_client_class(&source_p->connection->confs),
471		source_p->info, source_p->id);
472
473	<	if (ConfigFileEntry.invisible_on_connect)
473	>	if (ConfigGeneral.invisible_on_connect)
474		{
475		AddUMode(source_p, UMODE_INVISIBLE);
476		++Count.invisi;
#	Line 410 | Line 481 | register_local_user(struct Client *sourc
481		Count.max_loc = Count.local;
482
483		if (!(Count.max_loc % 10))
484	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
485	<	"New Max Local Clients: %d",
484	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
485	>	"New maximum local client connections: %u",
486		Count.max_loc);
487		}
488
418	–	/* Increment our total user count here */
489		if (++Count.total > Count.max_tot)
490		Count.max_tot = Count.total;
491		++Count.totalrestartcount;
#	Line 423 | Line 493 | register_local_user(struct Client *sourc
493		assert(source_p->servptr == &me);
494		SetClient(source_p);
495		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
496	<
427	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
496	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
497
498		assert(dlinkFind(&unknown_list, source_p));
499
500	<	dlink_move_node(&source_p->localClient->lclient_node,
500	>	dlink_move_node(&source_p->connection->lclient_node,
501		&unknown_list, &local_client_list);
502
503		user_welcome(source_p);
504		add_user_host(source_p->username, source_p->host, 0);
505	<	SetUserHost(source_p);
505	>	AddFlag(source_p, FLAGS_USERHOST);
506
507		introduce_client(source_p);
508		}
#	Line 449 | Line 518 | register_local_user(struct Client *sourc
518		*                is introduced by a server.
519		*/
520		void
521	<	register_remote_user(struct Client *source_p, const char *username,
453	<	const char *host, const char *server)
521	>	register_remote_user(struct Client *source_p)
522		{
523	<	struct Client *target_p = NULL;
456	<
457	<	assert(source_p != NULL);
458	<	assert(source_p->username != username);
459	<
460	<	strlcpy(source_p->host, host, sizeof(source_p->host));
461	<	strlcpy(source_p->username, username, sizeof(source_p->username));
462	<
463	<	/*
464	<	* coming from another server, take the servers word for it
465	<	*/
466	<	source_p->servptr = hash_find_server(server);
467	<
468	<	/*
469	<	* Super GhostDetect:
470	<	* If we can't find the server the user is supposed to be on,
471	<	* then simply blow the user away.        -Taner
472	<	*/
473	<	if (source_p->servptr == NULL)
474	<	{
475	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
476	<	"No server %s for user %s[%s@%s] from %s",
477	<	server, source_p->name, source_p->username,
478	<	source_p->host, source_p->from->name);
479	<	sendto_one(source_p->from,
480	<	":%s KILL %s :%s (Ghosted, server %s doesn't exist)",
481	<	me.id, source_p->id, me.name, server);
482	<
483	<	AddFlag(source_p, FLAGS_KILLED);
484	<	exit_client(source_p, "Ghosted Client");
485	<	return;
486	<	}
523	>	const struct Client *target_p = NULL;
524
525		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
526		{
#	Line 493 | Line 530 | register_remote_user(struct Client *sour
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 (NICK from wrong direction (%s != %s))",
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, "USER server wrong direction");
538	>	exit_client(source_p, "UID server wrong direction");
539		return;
540		}
541
#	Line 509 | Line 546 | register_remote_user(struct Client *sour
546		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
547		AddFlag(source_p, FLAGS_SERVICE);
548
512	–	/* Increment our total user count here */
549		if (++Count.total > Count.max_tot)
550		Count.max_tot = Count.total;
551
552		SetClient(source_p);
553		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	<	SetUserHost(source_p);
556	>	AddFlag(source_p, FLAGS_USERHOST);
557
558		if (HasFlag(source_p->servptr, FLAGS_EOB))
559		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
560	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
560	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
561		source_p->servptr->name,
562		source_p->name, source_p->username, source_p->host,
563	<	source_p->info, source_p->id);
563	>	source_p->sockhost, source_p->info, source_p->id);
564
565		introduce_client(source_p);
566		}
567
531	–	/* introduce_client()
532	–	*
533	–	* inputs       - source_p
534	–	* output       - NONE
535	–	* side effects - This common function introduces a client to the rest
536	–	*                of the net, either from a local client connect or
537	–	*                from a remote connect.
538	–	*/
539	–	static void
540	–	introduce_client(struct Client *source_p)
541	–	{
542	–	dlink_node *server_node = NULL;
543	–	char ubuf[IRCD_BUFSIZE];
544	–
545	–	if (MyClient(source_p))
546	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
547	–	else
548	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
549	–
550	–	watch_check_hash(source_p, RPL_LOGON);
551	–
552	–	if (ubuf[0] == '\0')
553	–	{
554	–	ubuf[0] = '+';
555	–	ubuf[1] = '\0';
556	–	}
557	–
558	–	DLINK_FOREACH(server_node, serv_list.head)
559	–	{
560	–	struct Client *server = server_node->data;
561	–
562	–	if (server == source_p->from)
563	–	continue;
564	–
565	–	if (IsCapable(server, CAP_SVS))
566	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
567	–	source_p->servptr->id,
568	–	source_p->name, source_p->hopcount+1,
569	–	(unsigned long)source_p->tsinfo,
570	–	ubuf, source_p->username, source_p->host,
571	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
572	–	"0" : source_p->sockhost, source_p->id,
573	–	source_p->svid,
574	–	source_p->info);
575	–	else
576	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
577	–	source_p->servptr->id,
578	–	source_p->name, source_p->hopcount+1,
579	–	(unsigned long)source_p->tsinfo,
580	–	ubuf, source_p->username, source_p->host,
581	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
582	–	"0" : source_p->sockhost, source_p->id, source_p->info);
583	–
584	–	if (!EmptyString(source_p->certfp))
585	–	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
586	–	}
587	–	}
588	–
568		/* valid_hostname()
569		*
570		* Inputs       - pointer to hostname
#	Line 600 | Line 579 | valid_hostname(const char *hostname)
579		{
580		const char *p = hostname;
581
582	<	assert(p != NULL);
582	>	assert(p);
583
584		if (EmptyString(p) || *p == '.' || *p == ':')
585		return 0;
#	Line 626 | Line 605 | valid_hostname(const char *hostname)
605		int
606		valid_username(const char *username, const int local)
607		{
608	<	int dots      = 0;
608	>	unsigned int dots = 0;
609		const char *p = username;
610
611	<	assert(p != NULL);
611	>	assert(p);
612
613		if (*p == '~')
614		++p;
#	Line 646 | Line 625 | valid_username(const char *username, con
625		{
626		while (*++p)
627		{
628	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
628	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
629		{
630	<	if (++dots > ConfigFileEntry.dots_in_ident)
630	>	if (++dots > ConfigGeneral.dots_in_ident)
631		return 0;
632		if (!IsUserChar(*(p + 1)))
633		return 0;
#	Line 664 | Line 643 | valid_username(const char *username, con
643		return 0;
644		}
645
646	<	return  p - username <= USERLEN;;
646	>	return p - username <= USERLEN;
647		}
648
649		/* clean_nick_name()
#	Line 678 | Line 657 | int
657		valid_nickname(const char *nickname, const int local)
658		{
659		const char *p = nickname;
681	–	assert(nickname && *nickname);
660
661	<	/* nicks can't start with a digit or - or be 0 length */
662	<	/* This closer duplicates behaviour of hybrid-6 */
663	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
661	>	assert(p);
662	>
663	>	/*
664	>	* Nicks can't start with a digit or - or be 0 length.
665	>	*/
666	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
667		return 0;
668
669		for (; *p; ++p)
#	Line 692 | Line 673 | valid_nickname(const char *nickname, con
673		return p - nickname <= NICKLEN;
674		}
675
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 *dm = NULL;
828	–
829	–	detach_conf(source_p, CONF_OPER);
830	–	ClrOFlag(source_p);
831	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
832	–
833	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
834	–	free_dlink_node(dm);
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	–
676		/* send_umode()
677		* send the MODE string for user (user) to connection client_p
678		* -avalon
#	Line 894 | Line 680 | set_user_mode(struct Client *source_p, c
680		* inputs       - client_p
681		*              - source_p
682		*              - int old
897	–	*              - sendmask mask of modes to send
683		*              - suplied umode_buf
684		* output       - NONE
685		*/
686		void
687		send_umode(struct Client *client_p, struct Client *source_p,
688	<	unsigned int old, unsigned int sendmask, char *umode_buf)
688	>	unsigned int old, char *umode_buf)
689		{
690		char *m = umode_buf;
691		int what = 0;
907	–	unsigned int i;
908	–	unsigned int flag;
692
693		/*
694	<	* build a string in umode_buf to represent the change in the user's
694	>	* Build a string in umode_buf to represent the change in the user's
695		* mode between the new (source_p->umodes) and 'old'.
696		*/
697	<	for (i = 0; i < 128; ++i)
697	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
698		{
699	<	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))
699	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
700		{
701		if (what == MODE_DEL)
702	<	*m++ = (char)i;
702	>	*m++ = tab->c;
703		else
704		{
705		what = MODE_DEL;
706		*m++ = '-';
707	<	*m++ = (char)i;
707	>	*m++ = tab->c;
708		}
709		}
710	<	else if (!(flag & old) && HasUMode(source_p, flag))
710	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
711		{
712		if (what == MODE_ADD)
713	<	*m++ = (char)i;
713	>	*m++ = tab->c;
714		else
715		{
716		what = MODE_ADD;
717		*m++ = '+';
718	<	*m++ = (char)i;
718	>	*m++ = tab->c;
719		}
720		}
721		}
#	Line 948 | Line 724 | send_umode(struct Client *client_p, stru
724
725		if (*umode_buf && client_p)
726		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
727	<	source_p->name, source_p->username,
728	<	source_p->host, source_p->name, umode_buf);
727	>	client_p->name, client_p->username,
728	>	client_p->host, client_p->name, umode_buf);
729		}
730
731		/* send_umode_out()
#	Line 959 | Line 735 | send_umode(struct Client *client_p, stru
735		* side effects - Only send ubuf out to servers that know about this client
736		*/
737		void
738	<	send_umode_out(struct Client *client_p, struct Client *source_p,
963	<	unsigned int old)
738	>	send_umode_out(struct Client *source_p, unsigned int old)
739		{
740	<	char buf[IRCD_BUFSIZE] = { '\0' };
966	<	dlink_node *ptr = NULL;
740	>	char buf[IRCD_BUFSIZE] = "";
741
742	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
742	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
743
744		if (buf[0])
745	<	sendto_server(source_p, NOCAPS, NOCAPS, ":%s MODE %s :%s",
745	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
746		source_p->id, source_p->id, buf);
973	–
974	–	if (client_p && MyClient(client_p))
975	–	send_umode(client_p, source_p, old, 0xffffffff, buf);
747		}
748
749		void
750		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
751		{
752	<	dlink_node *ptr = NULL;
752	>	dlink_node *node = NULL;
753
754		if (!strcmp(target_p->host, hostname))
755		return;
#	Line 987 | Line 758 | user_set_hostmask(struct Client *target_
758		{
759		case MODE_ADD:
760		AddUMode(target_p, UMODE_HIDDENHOST);
990	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
761		break;
762		case MODE_DEL:
763		DelUMode(target_p, UMODE_HIDDENHOST);
994	–
995	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
996	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
764		break;
765		default: return;
766		}
767
768	<	if (ConfigFileEntry.cycle_on_host_change)
768	>	if (ConfigGeneral.cycle_on_host_change)
769		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
770		target_p->name, target_p->username, target_p->host);
771
772	<	if (IsUserHostIp(target_p))
772	>	if (HasFlag(target_p, FLAGS_USERHOST))
773		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
774
775		strlcpy(target_p->host, hostname, sizeof(target_p->host));
776
777		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
778	<	SetUserHost(target_p);
778	>	AddFlag(target_p, FLAGS_USERHOST);
779
780		if (MyClient(target_p))
781		{
782	<	sendto_one_numeric(target_p, &me, RPL_NEWHOSTIS, target_p->host);
782	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
783		clear_ban_cache_client(target_p);
784		}
785
786	<	if (!ConfigFileEntry.cycle_on_host_change)
786	>	if (!ConfigGeneral.cycle_on_host_change)
787		return;
788
789	<	DLINK_FOREACH(ptr, target_p->channel.head)
789	>	DLINK_FOREACH(node, target_p->channel.head)
790		{
791	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
791	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
792		char *p = modebuf;
793		int len = 0;
794	<	const struct Membership *ms = ptr->data;
794	>	const struct Membership *member = node->data;
795
796	<	if (has_member_flags(ms, CHFL_CHANOP))
796	>	if (has_member_flags(member, CHFL_CHANOP))
797		{
798		*p++ = 'o';
799		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
800		}
801
802	<	if (has_member_flags(ms, CHFL_HALFOP))
802	>	if (has_member_flags(member, CHFL_HALFOP))
803		{
804		*p++ = 'h';
805		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
806		}
807
808	<	if (has_member_flags(ms, CHFL_VOICE))
808	>	if (has_member_flags(member, CHFL_VOICE))
809		{
810		*p++ = 'v';
811		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1046 | Line 813 | user_set_hostmask(struct Client *target_
813
814		*p = '\0';
815
816	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
817	<	target_p->name, target_p->username, target_p->host,
818	<	ms->chptr->chname);
816	>
817	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
818	>	target_p->name, target_p->username,
819	>	target_p->host, member->chptr->name,
820	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
821	>	target_p->info);
822	>	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);
825	>
826		if (nickbuf[0])
827	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
828	<	target_p->servptr->name, ms->chptr->chname,
827	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
828	>	target_p->servptr->name, member->chptr->name,
829		modebuf, nickbuf);
830
831		}
#	Line 1063 | Line 837 | user_set_hostmask(struct Client *target_
837		target_p->host, target_p->away);
838		}
839
840	<	/* user_welcome()
841	<	*
842	<	* inputs       - client pointer to client to welcome
1069	<	* output       - NONE
1070	<	* side effects -
1071	<	*/
1072	<	static void
1073	<	user_welcome(struct Client *source_p)
1074	<	{
1075	<	#if defined(__TIME__) && defined(__DATE__)
1076	<	static const char built_date[] = __DATE__ " at " __TIME__;
1077	<	#else
1078	<	static const char built_date[] = "unknown";
1079	<	#endif
1080	<
1081	<	#ifdef HAVE_LIBCRYPTO
1082	<	if (HasFlag(source_p, FLAGS_SSL))
1083	<	{
1084	<	AddUMode(source_p, UMODE_SSL);
1085	<	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
1086	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1087	<	}
1088	<	#endif
1089	<
1090	<	sendto_one_numeric(source_p, &me, RPL_WELCOME, ServerInfo.network_name,
1091	<	source_p->name);
1092	<	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
1093	<	get_listener_name(source_p->localClient->listener), ircd_version);
1094	<	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
1095	<	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
1096	<	show_isupport(source_p);
1097	<
1098	<	if (source_p->id[0] != '\0')
1099	<	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
1100	<
1101	<	show_lusers(source_p);
1102	<	motd_signon(source_p);
1103	<	}
1104	<
1105	<	/* check_xline()
1106	<	*
1107	<	* inputs       - pointer to client to test
1108	<	* outupt       - 1 if exiting 0 if ok
1109	<	* side effects -
1110	<	*/
1111	<	static int
1112	<	check_xline(struct Client *source_p)
1113	<	{
1114	<	struct MaskItem *conf = NULL;
1115	<	const char *reason = NULL;
1116	<
1117	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1118	<	{
1119	<	++conf->count;
1120	<
1121	<	if (conf->reason != NULL)
1122	<	reason = conf->reason;
1123	<	else
1124	<	reason = CONF_NOREASON;
1125	<
1126	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1127	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1128	<	source_p->info, reason,
1129	<	get_client_name(source_p, HIDE_IP),
1130	<	source_p->sockhost);
1131	<
1132	<	++ServerStats.is_ref;
1133	<	exit_client(source_p, "Bad user info");
1134	<	return 1;
1135	<	}
1136	<
1137	<	return 0;
1138	<	}
1139	<
1140	<	/* oper_up()
1141	<	*
1142	<	* inputs       - pointer to given client to oper
1143	<	* output       - NONE
1144	<	* side effects - Blindly opers up given source_p, using conf info
1145	<	*                all checks on passwords have already been done.
1146	<	*                This could also be used by rsa oper routines.
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	<	oper_up(struct Client *source_p)
845	>	user_oper_up(struct Client *source_p)
846		{
847		const unsigned int old = source_p->umodes;
848	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1153	<
1154	<	assert(source_p->localClient->confs.head);
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 (ConfigFileEntry.oper_umodes)
856	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
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;
#	Line 1174 | Line 868 | oper_up(struct Client *source_p)
868		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
869		AddUMode(source_p, UMODE_ADMIN);
870
871	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1178	<	get_oper_name(source_p));
1179	<	send_umode_out(source_p, source_p, old);
1180	<	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
1181	<	}
1182	<
1183	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1184	<
1185	<	int
1186	<	valid_sid(const char *sid)
1187	<	{
1188	<	if (strlen(sid) == IRC_MAXSID)
1189	<	if (IsDigit(*sid))
1190	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1191	<	return 1;
1192	<
1193	<	return 0;
1194	<	}
1195	<
1196	<	/*
1197	<	* init_uid()
1198	<	*
1199	<	* inputs       - NONE
1200	<	* output       - NONE
1201	<	* side effects - new_uid is filled in with server id portion (sid)
1202	<	*                (first 3 bytes) or defaulted to 'A'.
1203	<	*                Rest is filled in with 'A'
1204	<	*/
1205	<	void
1206	<	init_uid(void)
1207	<	{
1208	<	unsigned int i;
1209	<
1210	<	memset(new_uid, 0, sizeof(new_uid));
1211	<
1212	<	if (!EmptyString(ServerInfo.sid))
1213	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1214	<
1215	<	for (i = 0; i < IRC_MAXSID; ++i)
1216	<	if (new_uid[i] == '\0')
1217	<	new_uid[i] = 'A';
1218	<
1219	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1220	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1221	<	}
1222	<
1223	<	/*
1224	<	* add_one_to_uid
1225	<	*
1226	<	* inputs       - index number into new_uid
1227	<	* output       - NONE
1228	<	* side effects - new_uid is incremented by one
1229	<	*                note this is a recursive function
1230	<	*/
1231	<	static void
1232	<	add_one_to_uid(int i)
1233	<	{
1234	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
871	>	if (!EmptyString(conf->whois))
872		{
873	<	if (new_uid[i] == 'Z')
874	<	new_uid[i] = '0';
875	<	else if (new_uid[i] == '9')
876	<	{
1240	<	new_uid[i] = 'A';
1241	<	add_one_to_uid(i-1);
1242	<	}
1243	<	else
1244	<	++new_uid[i];
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		}
1246	–	else
1247	–	{
1248	–	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1249	–	if (new_uid[i] == 'Z')
1250	–	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1251	–	else
1252	–	++new_uid[i];
1253	–	}
1254	–	}
1255	–
1256	–	/*
1257	–	* uid_get
1258	–	*
1259	–	* inputs       - struct Client *
1260	–	* output       - new UID is returned to caller
1261	–	* side effects - new_uid is incremented by one.
1262	–	*/
1263	–	static const char *
1264	–	uid_get(void)
1265	–	{
1266	–	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1267	–	return new_uid;
1268	–	}
878
879	<	/*
880	<	* init_isupport()
881	<	*
882	<	* input        - NONE
883	<	* output       - NONE
884	<	* side effects - Must be called before isupport is enabled
1276	<	*/
1277	<	void
1278	<	init_isupport(void)
1279	<	{
1280	<	add_isupport("CALLERID", NULL, -1);
1281	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1282	<	add_isupport("DEAF", "D", -1);
1283	<	add_isupport("KICKLEN", NULL, KICKLEN);
1284	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1285	<	#ifdef HALFOPS
1286	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1287	<	add_isupport("STATUSMSG", "@%+", -1);
1288	<	#else
1289	<	add_isupport("PREFIX", "(ov)@+", -1);
1290	<	add_isupport("STATUSMSG", "@+", -1);
1291	<	#endif
1292	<	add_isupport("EXCEPTS", "e", -1);
1293	<	add_isupport("INVEX", "I", -1);
1294	<	}
1295	<
1296	<	/*
1297	<	* add_isupport()
1298	<	*
1299	<	* input        - name of supported function
1300	<	*              - options if any
1301	<	*              - number if any
1302	<	* output       - NONE
1303	<	* side effects - Each supported item must call this when activated
1304	<	*/
1305	<	void
1306	<	add_isupport(const char *name, const char *options, int n)
1307	<	{
1308	<	dlink_node *ptr;
1309	<	struct Isupport *support;
1310	<
1311	<	DLINK_FOREACH(ptr, support_list.head)
1312	<	{
1313	<	support = ptr->data;
1314	<	if (irccmp(support->name, name) == 0)
1315	<	{
1316	<	MyFree(support->name);
1317	<	MyFree(support->options);
1318	<	break;
1319	<	}
1320	<	}
1321	<
1322	<	if (ptr == NULL)
1323	<	{
1324	<	support = MyMalloc(sizeof(*support));
1325	<	dlinkAddTail(support, &support->node, &support_list);
1326	<	}
1327	<
1328	<	support->name = xstrdup(name);
1329	<	if (options != NULL)
1330	<	support->options = xstrdup(options);
1331	<	support->number = n;
1332	<
1333	<	rebuild_isupport_message_line();
1334	<	}
1335	<
1336	<	/*
1337	<	* delete_isupport()
1338	<	*
1339	<	* input        - name of supported function
1340	<	* output       - NONE
1341	<	* side effects - Each supported item must call this when deactivated
1342	<	*/
1343	<	void
1344	<	delete_isupport(const char *name)
1345	<	{
1346	<	dlink_node *ptr;
1347	<	struct Isupport *support;
1348	<
1349	<	DLINK_FOREACH(ptr, support_list.head)
1350	<	{
1351	<	support = ptr->data;
1352	<	if (irccmp(support->name, name) == 0)
1353	<	{
1354	<	dlinkDelete(ptr, &support_list);
1355	<	MyFree(support->name);
1356	<	MyFree(support->options);
1357	<	MyFree(support);
1358	<	break;
1359	<	}
1360	<	}
1361	<
1362	<	rebuild_isupport_message_line();
1363	<	}
1364	<
1365	<	/*
1366	<	* rebuild_isupport_message_line
1367	<	*
1368	<	* input        - NONE
1369	<	* output       - NONE
1370	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1371	<	*/
1372	<	void
1373	<	rebuild_isupport_message_line(void)
1374	<	{
1375	<	char isupportbuffer[IRCD_BUFSIZE];
1376	<	char *p = isupportbuffer;
1377	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1378	<	int n = 0;
1379	<	int tokens = 0;
1380	<	size_t len = 0;
1381	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1382	<
1383	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1384	<	{
1385	<	dlinkDelete(ptr, &support_list_lines);
1386	<	MyFree(ptr->data);
1387	<	free_dlink_node(ptr);
1388	<	}
1389	<
1390	<	DLINK_FOREACH(ptr, support_list.head)
1391	<	{
1392	<	struct Isupport *support = ptr->data;
1393	<
1394	<	p += (n = sprintf(p, "%s", support->name));
1395	<	len += n;
1396	<
1397	<	if (support->options != NULL)
1398	<	{
1399	<	p += (n = sprintf(p, "=%s", support->options));
1400	<	len += n;
1401	<	}
1402	<
1403	<	if (support->number > 0)
1404	<	{
1405	<	p += (n = sprintf(p, "=%d", support->number));
1406	<	len += n;
1407	<	}
1408	<
1409	<	*p++ = ' ';
1410	<	len++;
1411	<	*p = '\0';
1412	<
1413	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1414	<	{ /* arbritrary for now */
1415	<	if (*--p == ' ')
1416	<	*p = '\0';
1417	<
1418	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1419	<	p = isupportbuffer;
1420	<	len = 0;
1421	<	n = tokens = 0;
1422	<	}
1423	<	}
1424	<
1425	<	if (len != 0)
1426	<	{
1427	<	if (*--p == ' ')
1428	<	*p = '\0';
1429	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1430	<	}
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);
885		}

Diff Legend

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