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 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5392 by michael, Tue Jan 20 13:40:41 2015 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  s_user.c: User related functions.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
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 16 | 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	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file s_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"
28	<	#include "s_misc.h"
29	>	#include "user.h"
30		#include "channel.h"
31		#include "channel_mode.h"
32		#include "client.h"
32	–	#include "fdlist.h"
33		#include "hash.h"
34		#include "irc_string.h"
35	–	#include "s_bsd.h"
35		#include "ircd.h"
36		#include "listener.h"
37		#include "motd.h"
38		#include "numeric.h"
39		#include "conf.h"
40		#include "log.h"
41	<	#include "s_serv.h"
41	>	#include "server.h"
42		#include "send.h"
44	–	#include "supported.h"
45	–	#include "whowas.h"
43		#include "memory.h"
44		#include "packet.h"
45		#include "rng_mt.h"
46		#include "userhost.h"
47	<	#include "hook.h"
51	<	#include "s_misc.h"
47	>	#include "misc.h"
48		#include "parse.h"
49		#include "watch.h"
50
51		static char umode_buffer[IRCD_BUFSIZE];
56	–
57	–	static void user_welcome(struct Client *);
58	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
59	–	static int check_xline(struct Client *);
60	–	static void introduce_client(struct Client *);
52		static const char *uid_get(void);
53
54		/* Used for building up the isupport string,
55		* used with init_isupport, add_isupport, delete_isupport
56		*/
66	–
57		struct Isupport
58		{
59		dlink_node node;
#	Line 75 | Line 65 | struct Isupport
65		static dlink_list support_list;
66		static dlink_list support_list_lines;
67
68	<	/* memory is cheap. map 0-255 to equivalent mode */
69	<	const unsigned int user_modes[256] =
68	>	const struct user_modes *umode_map[256];
69	>	const struct user_modes  umode_tab[] =
70		{
71	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
72	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
73	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
74	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
75	<	0,                  /* @ */
76	<	0,                  /* A */
77	<	0,                  /* B */
78	<	0,                  /* C */
79	<	UMODE_DEAF,         /* D */
80	<	0,                  /* E */
81	<	UMODE_FARCONNECT,   /* F */
82	<	UMODE_SOFTCALLERID, /* G */
83	<	UMODE_HIDDEN,       /* H */
84	<	0,                  /* I */
85	<	0,                  /* J */
86	<	0,                  /* K */
87	<	0,                  /* L */
88	<	0,                  /* M */
89	<	0,                  /* N */
90	<	0,                  /* O */
91	<	0,                  /* P */
92	<	0,                  /* Q */
93	<	UMODE_REGONLY,      /* R */
94	<	UMODE_SSL,          /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	UMODE_WEBIRC,       /* W */
99	<	0,                  /* X */
110	<	0,                  /* Y */
111	<	0,                  /* Z 0x5A */
112	<	0, 0, 0, 0, 0,      /* 0x5F   */
113	<	0,                  /* 0x60   */
114	<	UMODE_ADMIN,        /* a */
115	<	UMODE_BOTS,         /* b */
116	<	UMODE_CCONN,        /* c */
117	<	UMODE_DEBUG,        /* d */
118	<	UMODE_EXTERNAL,     /* e */
119	<	UMODE_FULL,         /* f */
120	<	UMODE_CALLERID,     /* g */
121	<	0,                  /* h */
122	<	UMODE_INVISIBLE,    /* i */
123	<	UMODE_REJ,          /* j */
124	<	UMODE_SKILL,        /* k */
125	<	UMODE_LOCOPS,       /* l */
126	<	0,                  /* m */
127	<	UMODE_NCHANGE,      /* n */
128	<	UMODE_OPER,         /* o */
129	<	0,                  /* p */
130	<	0,                  /* q */
131	<	UMODE_REGISTERED,   /* r */
132	<	UMODE_SERVNOTICE,   /* s */
133	<	0,                  /* t */
134	<	UMODE_UNAUTH,       /* u */
135	<	0,                  /* v */
136	<	UMODE_WALLOP,       /* w */
137	<	UMODE_HIDDENHOST,   /* x */
138	<	UMODE_SPY,          /* y */
139	<	UMODE_OPERWALL,     /* z      0x7A */
140	<	0,0,0,0,0,          /* 0x7B - 0x7F */
141	<
142	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
143	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
144	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
145	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
146	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
147	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
148	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
149	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
71	>	{ 'D', UMODE_DEAF         },
72	>	{ 'F', UMODE_FARCONNECT   },
73	>	{ 'G', UMODE_SOFTCALLERID },
74	>	{ 'H', UMODE_HIDDEN       },
75	>	{ 'R', UMODE_REGONLY      },
76	>	{ 'S', UMODE_SSL          },
77	>	{ 'W', UMODE_WEBIRC       },
78	>	{ 'a', UMODE_ADMIN        },
79	>	{ 'b', UMODE_BOTS         },
80	>	{ 'c', UMODE_CCONN        },
81	>	{ 'd', UMODE_DEBUG        },
82	>	{ 'e', UMODE_EXTERNAL     },
83	>	{ 'f', UMODE_FULL         },
84	>	{ 'g', UMODE_CALLERID     },
85	>	{ 'i', UMODE_INVISIBLE    },
86	>	{ 'j', UMODE_REJ          },
87	>	{ 'k', UMODE_SKILL        },
88	>	{ 'l', UMODE_LOCOPS       },
89	>	{ 'n', UMODE_NCHANGE      },
90	>	{ 'o', UMODE_OPER         },
91	>	{ 'p', UMODE_HIDECHANS    },
92	>	{ 'q', UMODE_HIDEIDLE     },
93	>	{ 'r', UMODE_REGISTERED   },
94	>	{ 's', UMODE_SERVNOTICE   },
95	>	{ 'u', UMODE_UNAUTH       },
96	>	{ 'w', UMODE_WALLOP       },
97	>	{ 'x', UMODE_HIDDENHOST   },
98	>	{ 'y', UMODE_SPY          },
99	>	{ '\0', 0 }
100		};
101
102		void
103	<	assemble_umode_buffer(void)
103	>	user_usermodes_init(void)
104		{
155	–	unsigned int idx = 0;
105		char *umode_buffer_ptr = umode_buffer;
106
107	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
108	<	if (user_modes[idx])
109	<	*umode_buffer_ptr++ = idx;
107	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
108	>	{
109	>	umode_map[tab->c] = tab;
110	>	*umode_buffer_ptr++ = tab->c;
111	>	}
112
113		*umode_buffer_ptr = '\0';
114		}
#	Line 171 | Line 122 | assemble_umode_buffer(void)
122		void
123		show_lusers(struct Client *source_p)
124		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
125		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
126	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
127	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
127	>	Count.invisi, dlink_list_length(&global_server_list));
128		else
129	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
130	<	(Count.total-Count.invisi), Count.invisi, 1);
129	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
130	>	Count.invisi, 1);
131	>
132	>	if (Count.oper)
133	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134
135	<	if (Count.oper > 0)
136	<	sendto_one(source_p, form_str(RPL_LUSEROP),
137	<	from, to, Count.oper);
138	<
139	<	if (dlink_list_length(&unknown_list) > 0)
200	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
201	<	from, to, dlink_list_length(&unknown_list));
202	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
135	>	if (dlink_list_length(&unknown_list))
136	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
137	>
138	>	if (dlink_list_length(&channel_list))
139	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
140
141		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142		{
143	<	sendto_one(source_p, form_str(RPL_LUSERME),
144	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
143	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
144	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
145		}
146		else
147		{
148	<	sendto_one(source_p, form_str(RPL_LUSERME),
149	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
148	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
149	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
150		}
151
152	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
152	>	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
153
154		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
155	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
156	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
155	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
156	>	Count.max_loc_cli, Count.totalrestartcount);
157
158		if (Count.local > Count.max_loc_cli)
159		Count.max_loc_cli = Count.local;
#	Line 242 | Line 171 | show_lusers(struct Client *source_p)
171		void
172		show_isupport(struct Client *source_p)
173		{
174	<	const dlink_node *ptr = NULL;
174	>	const dlink_node *node = NULL;
175
176	<	DLINK_FOREACH(ptr, support_list_lines.head)
177	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
249	<	source_p->name, ptr->data);
176	>	DLINK_FOREACH(node, support_list_lines.head)
177	>	sendto_one_numeric(source_p, &me, RPL_ISUPPORT, node->data);
178		}
179
180	<	/*
181	<	** register_local_user
182	<	**      This function is called when both NICK and USER messages
183	<	**      have been accepted for the client, in whatever order. Only
184	<	**      after this, is the USER message propagated.
185	<	**
186	<	**      NICK's must be propagated at once when received, although
187	<	**      it would be better to delay them too until full info is
188	<	**      available. Doing it is not so simple though, would have
189	<	**      to implement the following:
190	<	**
191	<	**      (actually it has been implemented already for a while) -orabidoo
192	<	**
193	<	**      1) user telnets in and gives only "NICK foobar" and waits
194	<	**      2) another user far away logs in normally with the nick
195	<	**         "foobar" (quite legal, as this server didn't propagate
196	<	**         it).
197	<	**      3) now this server gets nick "foobar" from outside, but
198	<	**         has alread the same defined locally. Current server
199	<	**         would just issue "KILL foobar" to clean out dups. But,
200	<	**         this is not fair. It should actually request another
201	<	**         nick from local user or kill him/her...
202	<	*/
180	>
181	>	/* report_and_set_user_flags()
182	>	*
183	>	* inputs       - pointer to source_p
184	>	*              - pointer to conf for this user
185	>	* output       - NONE
186	>	* side effects - Report to user any special flags
187	>	*                they are getting, and set them.
188	>	*/
189	>	static void
190	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
191	>	{
192	>	/* If this user is being spoofed, tell them so */
193	>	if (IsConfDoSpoofIp(conf))
194	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
195	>
196	>	/* If this user is in the exception class, set it "E lined" */
197	>	if (IsConfExemptKline(conf))
198	>	{
199	>	SetExemptKline(source_p);
200	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D/G lines. Congrats.");
201	>	}
202	>
203	>	/*
204	>	* The else here is to make sure that G line exempt users
205	>	* do not get noticed twice.
206	>	*/
207	>	else if (IsConfExemptGline(conf))
208	>	{
209	>	SetExemptGline(source_p);
210	>	sendto_one_notice(source_p, &me, ":*** You are exempt from G lines. Congrats.");
211	>	}
212	>
213	>	if (IsConfExemptResv(conf))
214	>	{
215	>	SetExemptResv(source_p);
216	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
217	>	}
218	>
219	>	/* If this user is exempt from user limits set it "F lined" */
220	>	if (IsConfExemptLimits(conf))
221	>	{
222	>	SetExemptLimits(source_p);
223	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
224	>	}
225	>
226	>	if (IsConfCanFlood(conf))
227	>	{
228	>	SetCanFlood(source_p);
229	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
230	>	"protection, aren't you fearsome.");
231	>	}
232	>	}
233	>
234	>	/* introduce_client()
235	>	*
236	>	* inputs       - source_p
237	>	* output       - NONE
238	>	* side effects - This common function introduces a client to the rest
239	>	*                of the net, either from a local client connect or
240	>	*                from a remote connect.
241	>	*/
242	>	static void
243	>	introduce_client(struct Client *source_p)
244	>	{
245	>	dlink_node *node = NULL;
246	>	char ubuf[IRCD_BUFSIZE] = "";
247	>
248	>	if (MyClient(source_p))
249	>	send_umode(source_p, source_p, 0, ubuf);
250	>	else
251	>	send_umode(NULL, source_p, 0, ubuf);
252	>
253	>	watch_check_hash(source_p, RPL_LOGON);
254	>
255	>	if (ubuf[0] == '\0')
256	>	{
257	>	ubuf[0] = '+';
258	>	ubuf[1] = '\0';
259	>	}
260	>
261	>	DLINK_FOREACH(node, local_server_list.head)
262	>	{
263	>	struct Client *server = node->data;
264	>
265	>	if (server == source_p->from)
266	>	continue;
267	>
268	>	if (IsCapable(server, CAP_SVS))
269	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
270	>	source_p->servptr->id,
271	>	source_p->name, source_p->hopcount+1,
272	>	(unsigned long)source_p->tsinfo,
273	>	ubuf, source_p->username, source_p->host,
274	>	source_p->sockhost, source_p->id,
275	>	source_p->account,
276	>	source_p->info);
277	>	else
278	>	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
279	>	source_p->servptr->id,
280	>	source_p->name, source_p->hopcount+1,
281	>	(unsigned long)source_p->tsinfo,
282	>	ubuf, source_p->username, source_p->host,
283	>	source_p->sockhost, source_p->id, source_p->info);
284	>
285	>	if (!EmptyString(source_p->certfp))
286	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
287	>	}
288	>	}
289	>
290	>	/* user_welcome()
291	>	*
292	>	* inputs       - client pointer to client to welcome
293	>	* output       - NONE
294	>	* side effects -
295	>	*/
296	>	static void
297	>	user_welcome(struct Client *source_p)
298	>	{
299	>	#if defined(__TIME__) && defined(__DATE__)
300	>	static const char built_date[] = __DATE__ " at " __TIME__;
301	>	#else
302	>	static const char built_date[] = "unknown";
303	>	#endif
304	>
305	>	#ifdef HAVE_LIBCRYPTO
306	>	if (HasFlag(source_p, FLAGS_SSL))
307	>	{
308	>	AddUMode(source_p, UMODE_SSL);
309	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
310	>	ssl_get_cipher(source_p->connection->fd.ssl));
311	>	}
312	>	#endif
313	>
314	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
315	>	source_p->name);
316	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
317	>	get_listener_name(source_p->connection->listener), ircd_version);
318	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
319	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
320	>	show_isupport(source_p);
321	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
322	>
323	>	show_lusers(source_p);
324	>	motd_signon(source_p);
325	>	}
326	>
327	>	/* check_xline()
328	>	*
329	>	* inputs       - pointer to client to test
330	>	* outupt       - 1 if exiting 0 if ok
331	>	* side effects -
332	>	*/
333	>	static int
334	>	check_xline(struct Client *source_p)
335	>	{
336	>	struct MaskItem *conf = NULL;
337	>
338	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
339	>	{
340	>	++conf->count;
341	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
342	>	"X-line Rejecting [%s] [%s], user %s [%s]",
343	>	source_p->info, conf->reason,
344	>	get_client_name(source_p, HIDE_IP),
345	>	source_p->sockhost);
346	>
347	>	++ServerStats.is_ref;
348	>	exit_client(source_p, "Bad user info");
349	>	return 1;
350	>	}
351	>
352	>	return 0;
353	>	}
354	>
355	>	/*! \brief This function is called when both NICK and USER messages
356	>	*      have been accepted for the client, in whatever order. Only
357	>	*      after this, is the UID message propagated.
358	>	* \param source_p Pointer to given client to introduce
359	>	*/
360		void
361		register_local_user(struct Client *source_p)
362		{
363		const char *id = NULL;
364		const struct MaskItem *conf = NULL;
365
281	–	assert(source_p != NULL);
366		assert(source_p == source_p->from);
367		assert(MyConnect(source_p));
368	<	assert(!source_p->localClient->registration);
368	>	assert(!source_p->connection->registration);
369
370		ClearCap(source_p, CAP_TS6);
371
372	<	if (ConfigFileEntry.ping_cookie)
372	>	if (ConfigGeneral.ping_cookie)
373		{
374	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
374	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
375		{
376		do
377	<	source_p->localClient->random_ping = genrand_int32();
378	<	while (!source_p->localClient->random_ping);
377	>	source_p->connection->random_ping = genrand_int32();
378	>	while (!source_p->connection->random_ping);
379
380	<	sendto_one(source_p, "PING :%u",
297	<	source_p->localClient->random_ping);
380	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
381		SetPingSent(source_p);
382		return;
383		}
#	Line 303 | Line 386 | register_local_user(struct Client *sourc
386		return;
387		}
388
389	<	source_p->localClient->last_privmsg = CurrentTime;
389	>	source_p->connection->last_privmsg = CurrentTime;
390		/* Straight up the maximum rate of flooding... */
391	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
391	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
392
393		if (!check_client(source_p))
394		return;
395
396		if (!valid_hostname(source_p->host))
397		{
398	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
399	<	"character in your hostname", me.name, source_p->name);
400	<	strlcpy(source_p->host, source_p->sockhost,
318	<	sizeof(source_p->host));
398	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
399	>	"character in your hostname");
400	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
401		}
402
403	<	conf = source_p->localClient->confs.head->data;
403	>	conf = source_p->connection->confs.head->data;
404
405		if (!IsGotId(source_p))
406		{
407	<	char username[USERLEN + 1];
407	>	char username[USERLEN + 1] = "";
408		const char *p = username;
409		unsigned int i = 0;
410
411		if (IsNeedIdentd(conf))
412		{
413		++ServerStats.is_ref;
414	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
415	<	"identd to use this server", me.name, source_p->name);
416	<	exit_client(source_p, &me, "Install identd");
414	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
415	>	"identd to use this server");
416	>	exit_client(source_p, "Install identd");
417		return;
418		}
419
#	Line 341 | Line 423 | register_local_user(struct Client *sourc
423		source_p->username[i++] = '~';
424
425		for (; *p && i < USERLEN; ++p)
426	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
426	>	source_p->username[i++] = *p;
427
428		source_p->username[i] = '\0';
429		}
430
431	<	/* password check */
431	>	/* Password check */
432		if (!EmptyString(conf->passwd))
433		{
434	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
434	>	if (!match_conf_password(source_p->connection->password, conf))
435		{
436		++ServerStats.is_ref;
437	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
438	<	me.name, source_p->name);
439	<	exit_client(source_p, &me, "Bad Password");
437	>
438	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
439	>	exit_client(source_p, "Bad Password");
440		return;
441		}
442		}
443
444	<	/* don't free source_p->localClient->passwd here - it can be required
445	<	* by masked /stats I if there are auth{} blocks with need_password = no;
444	>	/*
445	>	* Don't free source_p->connection->password here - it can be required
446	>	* by masked /stats I if there are auth {} blocks with need_password = no;
447		* --adx
448		*/
449
450	<	/* report if user has &^>= etc. and set flags as needed in source_p */
450	>	/*
451	>	* Report if user has &^>= etc. and set flags as needed in source_p
452	>	*/
453		report_and_set_user_flags(source_p, conf);
454
455		if (IsDead(source_p))
456		return;
457
458	<	/* Limit clients -
458	>	/*
459	>	* Limit clients -
460		* We want to be able to have servers and F-line clients
461		* connect, so save room for "buffer" connections.
462		* Smaller servers may want to decrease this, and it should
463		* probably be just a percentage of the MAXCLIENTS...
464		*   -Taner
465		*/
466	<	/* Except "F:" clients */
467	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
466	>	if ((Count.local >= ConfigServerInfo.max_clients + MAX_BUFFER) ||
467	>	(Count.local >= ConfigServerInfo.max_clients && !IsExemptLimits(source_p)))
468		{
469		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
470		"Too many clients, rejecting %s[%s].",
471		source_p->name, source_p->host);
472		++ServerStats.is_ref;
473	<	exit_client(source_p, &me, "Sorry, server is full - try later");
473	>	exit_client(source_p, "Sorry, server is full - try later");
474		return;
475		}
476
395	–	/* valid user name check */
477		if (!valid_username(source_p->username, 1))
478		{
479	<	char tmpstr2[IRCD_BUFSIZE];
479	>	char buf[IRCD_BUFSIZE] = "";
480
481		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
482		"Invalid username: %s (%s@%s)",
483		source_p->name, source_p->username, source_p->host);
484		++ServerStats.is_ref;
485	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
486	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
485	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
486	>	exit_client(source_p, buf);
487		return;
488		}
489
490		if (check_xline(source_p))
491		return;
492
493	<	while (hash_find_id((id = uid_get())) != NULL)
493	>	while (hash_find_id((id = uid_get())))
494		;
495
496		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 499 | register_local_user(struct Client *sourc
499		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
500		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
501		source_p->name, source_p->username, source_p->host,
502	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
503	<	"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(&source_p->localClient->confs),
502	>	source_p->sockhost,
503	>	get_client_class(&source_p->connection->confs),
504		source_p->info, source_p->id);
505
506	<	if (ConfigFileEntry.invisible_on_connect)
506	>	if (ConfigGeneral.invisible_on_connect)
507		{
508		AddUMode(source_p, UMODE_INVISIBLE);
509		++Count.invisi;
#	Line 436 | Line 515 | register_local_user(struct Client *sourc
515
516		if (!(Count.max_loc % 10))
517		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
518	<	"New Max Local Clients: %d",
518	>	"New maximum local client connections: %u",
519		Count.max_loc);
520		}
521
443	–	/* Increment our total user count here */
522		if (++Count.total > Count.max_tot)
523		Count.max_tot = Count.total;
524		++Count.totalrestartcount;
#	Line 448 | Line 526 | register_local_user(struct Client *sourc
526		assert(source_p->servptr == &me);
527		SetClient(source_p);
528		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
529	<
452	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
529	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
530
531		assert(dlinkFind(&unknown_list, source_p));
532
533	<	dlink_move_node(&source_p->localClient->lclient_node,
533	>	dlink_move_node(&source_p->connection->lclient_node,
534		&unknown_list, &local_client_list);
535
536		user_welcome(source_p);
#	Line 469 | Line 546 | register_local_user(struct Client *sourc
546		*              - username to register as
547		*              - host name to register as
548		*              - server name
472	–	*              - realname (gecos)
549		* output       - NONE
550		* side effects - This function is called when a remote client
551		*                is introduced by a server.
552		*/
553		void
554	<	register_remote_user(struct Client *source_p,
479	<	const char *username, const char *host, const char *server,
480	<	const char *realname)
554	>	register_remote_user(struct Client *source_p)
555		{
556	<	struct Client *target_p = NULL;
483	<
484	<	assert(source_p != NULL);
485	<	assert(source_p->username != username);
486	<
487	<	strlcpy(source_p->host, host, sizeof(source_p->host));
488	<	strlcpy(source_p->username, username, sizeof(source_p->username));
489	<
490	<	/*
491	<	* coming from another server, take the servers word for it
492	<	*/
493	<	source_p->servptr = hash_find_server(server);
494	<
495	<	/*
496	<	* Super GhostDetect:
497	<	* If we can't find the server the user is supposed to be on,
498	<	* then simply blow the user away.        -Taner
499	<	*/
500	<	if (source_p->servptr == NULL)
501	<	{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503	<	"No server %s for user %s[%s@%s] from %s",
504	<	server, source_p->name, source_p->username,
505	<	source_p->host, source_p->from->name);
506	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507	<
508	<	AddFlag(source_p, FLAGS_KILLED);
509	<	exit_client(source_p, &me, "Ghosted Client");
510	<	return;
511	<	}
556	>	const struct Client *target_p = NULL;
557
558		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
559		{
#	Line 517 | Line 562 | register_remote_user(struct Client *sour
562		source_p->from->name, source_p->name, source_p->username,
563		source_p->host, source_p->servptr->name,
564		target_p->name, target_p->from->name);
565	<	kill_client(source_p->from, source_p,
566	<	"%s (NICK from wrong direction (%s != %s))",
567	<	me.name, source_p->servptr->name, target_p->from->name);
565	>	sendto_one(source_p->from,
566	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
567	>	me.id, source_p->id, me.name, source_p->servptr->name,
568	>	target_p->from->name);
569	>
570		AddFlag(source_p, FLAGS_KILLED);
571	<	exit_client(source_p, &me, "USER server wrong direction");
571	>	exit_client(source_p, "UID server wrong direction");
572		return;
573		}
574
#	Line 532 | Line 579 | register_remote_user(struct Client *sour
579		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
580		AddFlag(source_p, FLAGS_SERVICE);
581
535	–	/* Increment our total user count here */
582		if (++Count.total > Count.max_tot)
583		Count.max_tot = Count.total;
584
585		SetClient(source_p);
586		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
587	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
588		add_user_host(source_p->username, source_p->host, 1);
589		SetUserHost(source_p);
590
591		if (HasFlag(source_p->servptr, FLAGS_EOB))
592	<	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
593	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
594	<	source_p->servptr->name,
595	<	source_p->name, source_p->username, source_p->host,
596	<	source_p->info, source_p->id);
597	<
551	<	introduce_client(source_p);
552	<	}
553	<
554	<	/* introduce_client()
555	<	*
556	<	* inputs       - source_p
557	<	* output       - NONE
558	<	* side effects - This common function introduces a client to the rest
559	<	*                of the net, either from a local client connect or
560	<	*                from a remote connect.
561	<	*/
562	<	static void
563	<	introduce_client(struct Client *source_p)
564	<	{
565	<	dlink_node *server_node = NULL;
566	<	char ubuf[IRCD_BUFSIZE];
567	<
568	<	if (MyClient(source_p))
569	<	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
570	<	else
571	<	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
572	<
573	<	watch_check_hash(source_p, RPL_LOGON);
574	<
575	<	if (ubuf[0] == '\0')
576	<	{
577	<	ubuf[0] = '+';
578	<	ubuf[1] = '\0';
579	<	}
580	<
581	<	DLINK_FOREACH(server_node, serv_list.head)
582	<	{
583	<	struct Client *server = server_node->data;
584	<
585	<	if (server == source_p->from)
586	<	continue;
587	<
588	<	if (IsCapable(server, CAP_SVS))
589	<	{
590	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	<	source_p->servptr->id,
593	<	source_p->name, source_p->hopcount+1,
594	<	(unsigned long)source_p->tsinfo,
595	<	ubuf, source_p->username, source_p->host,
596	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	<	"0" : source_p->sockhost, source_p->id,
598	<	source_p->svid,
599	<	source_p->info);
600	<	else
601	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	<	source_p->name, source_p->hopcount+1,
603	<	(unsigned long)source_p->tsinfo,
604	<	ubuf, source_p->username, source_p->host,
605	<	source_p->servptr->name, source_p->svid,
606	<	source_p->info);
607	<
608	<	}
592	>	if (strcmp(source_p->sockhost, "0")) /* XXX: TBR */
593	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
594	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
595	>	source_p->servptr->name,
596	>	source_p->name, source_p->username, source_p->host,
597	>	source_p->sockhost, source_p->info, source_p->id);
598		else
599	<	{
600	<	if (IsCapable(server, CAP_TS6) && HasID(source_p))
601	<	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
602	<	source_p->servptr->id,
603	<	source_p->name, source_p->hopcount+1,
615	<	(unsigned long)source_p->tsinfo,
616	<	ubuf, source_p->username, source_p->host,
617	<	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	<	"0" : source_p->sockhost, source_p->id, source_p->info);
619	<	else
620	<	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	<	source_p->name, source_p->hopcount+1,
622	<	(unsigned long)source_p->tsinfo,
623	<	ubuf, source_p->username, source_p->host,
624	<	source_p->servptr->name, source_p->info);
625	<	}
599	>	sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
600	>	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
601	>	source_p->servptr->name,
602	>	source_p->name, source_p->username, source_p->host,
603	>	source_p->info, source_p->id);
604
605	<	if (!EmptyString(source_p->certfp))
628	<	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629	<	}
605	>	introduce_client(source_p);
606		}
607
608		/* valid_hostname()
#	Line 643 | Line 619 | valid_hostname(const char *hostname)
619		{
620		const char *p = hostname;
621
622	<	assert(p != NULL);
622	>	assert(p);
623
624		if (EmptyString(p) || *p == '.' || *p == ':')
625		return 0;
#	Line 669 | Line 645 | valid_hostname(const char *hostname)
645		int
646		valid_username(const char *username, const int local)
647		{
648	<	int dots      = 0;
648	>	unsigned int dots = 0;
649		const char *p = username;
650
651	<	assert(p != NULL);
651	>	assert(p);
652
653		if (*p == '~')
654		++p;
#	Line 689 | Line 665 | valid_username(const char *username, con
665		{
666		while (*++p)
667		{
668	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
668	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
669		{
670	<	if (++dots > ConfigFileEntry.dots_in_ident)
670	>	if (++dots > ConfigGeneral.dots_in_ident)
671		return 0;
672		if (!IsUserChar(*(p + 1)))
673		return 0;
#	Line 707 | Line 683 | valid_username(const char *username, con
683		return 0;
684		}
685
686	<	return  p - username <= USERLEN;;
686	>	return p - username <= USERLEN;
687		}
688
689		/* clean_nick_name()
#	Line 721 | Line 697 | int
697		valid_nickname(const char *nickname, const int local)
698		{
699		const char *p = nickname;
724	–	assert(nickname && *nickname);
700
701	<	/* nicks can't start with a digit or - or be 0 length */
702	<	/* This closer duplicates behaviour of hybrid-6 */
703	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
701	>	assert(p);
702	>
703	>	/*
704	>	* Nicks can't start with a digit or - or be 0 length.
705	>	*/
706	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
707		return 0;
708
709		for (; *p; ++p)
#	Line 735 | Line 713 | valid_nickname(const char *nickname, con
713		return p - nickname <= NICKLEN;
714		}
715
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753	–	me.name, source_p->name);
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(conf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/*
765	–	* The else here is to make sure that G line exempt users
766	–	* do not get noticed twice.
767	–	*/
768	–	else if (IsConfExemptGline(conf))
769	–	{
770	–	SetExemptGline(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
772	–	me.name, source_p->name);
773	–	}
774	–
775	–	if (IsConfExemptResv(conf))
776	–	{
777	–	SetExemptResv(source_p);
778	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
779	–	me.name, source_p->name);
780	–	}
781	–
782	–	/* If this user is exempt from user limits set it "F lined" */
783	–	if (IsConfExemptLimits(conf))
784	–	{
785	–	SetExemptLimits(source_p);
786	–	sendto_one(source_p,
787	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
788	–	me.name,source_p->name);
789	–	}
790	–
791	–	if (IsConfCanFlood(conf))
792	–	{
793	–	SetCanFlood(source_p);
794	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
795	–	"protection, aren't you fearsome.",
796	–	me.name, source_p->name);
797	–	}
798	–	}
799	–
800	–	/* set_user_mode()
801	–	*
802	–	* added 15/10/91 By Darren Reed.
803	–	* parv[0] - sender
804	–	* parv[1] - username to change mode for
805	–	* parv[2] - modes to change
806	–	*/
807	–	void
808	–	set_user_mode(struct Client *client_p, struct Client *source_p,
809	–	const int parc, char *parv[])
810	–	{
811	–	unsigned int flag, setflags;
812	–	char **p, *m, buf[IRCD_BUFSIZE];
813	–	struct Client *target_p;
814	–	int what = MODE_ADD, badflag = 0, i;
815	–
816	–	assert(!(parc < 2));
817	–
818	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
819	–	{
820	–	if (MyConnect(source_p))
821	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	–	me.name, source_p->name, parv[1]);
823	–	return;
824	–	}
825	–
826	–	if (source_p != target_p)
827	–	{
828	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
829	–	me.name, source_p->name);
830	–	return;
831	–	}
832	–
833	–	if (parc < 3)
834	–	{
835	–	m = buf;
836	–	*m++ = '+';
837	–
838	–	for (i = 0; i < 128; ++i)
839	–	if (HasUMode(source_p, user_modes[i]))
840	–	*m++ = (char)i;
841	–	*m = '\0';
842	–
843	–	sendto_one(source_p, form_str(RPL_UMODEIS),
844	–	me.name, source_p->name, buf);
845	–	return;
846	–	}
847	–
848	–	/* find flags already set for user */
849	–	setflags = source_p->umodes;
850	–
851	–	/* parse mode change string(s) */
852	–	for (p = &parv[2]; p && *p; ++p)
853	–	{
854	–	for (m = *p; *m; ++m)
855	–	{
856	–	switch (*m)
857	–	{
858	–	case '+':
859	–	what = MODE_ADD;
860	–	break;
861	–	case '-':
862	–	what = MODE_DEL;
863	–	break;
864	–	case 'o':
865	–	if (what == MODE_ADD)
866	–	{
867	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
868	–	{
869	–	++Count.oper;
870	–	SetOper(source_p);
871	–	}
872	–	}
873	–	else
874	–	{
875	–	if (!HasUMode(source_p, UMODE_OPER))
876	–	break;
877	–
878	–	ClearOper(source_p);
879	–	Count.oper--;
880	–
881	–	if (MyConnect(source_p))
882	–	{
883	–	dlink_node *dm = NULL;
884	–
885	–	detach_conf(source_p, CONF_OPER);
886	–	ClrOFlag(source_p);
887	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
888	–
889	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
890	–	free_dlink_node(dm);
891	–	}
892	–	}
893	–
894	–	break;
895	–
896	–	case 'S':  /* Only servers may set +S in a burst */
897	–	case 'W':  /* Only servers may set +W in a burst */
898	–	case 'r':  /* Only services may set +r */
899	–	case 'x':  /* Only services may set +x */
900	–	break;
901	–
902	–	default:
903	–	if ((flag = user_modes[(unsigned char)*m]))
904	–	{
905	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
906	–	(ConfigFileEntry.oper_only_umodes & flag))
907	–	badflag = 1;
908	–	else
909	–	{
910	–	if (what == MODE_ADD)
911	–	AddUMode(source_p, flag);
912	–	else
913	–	DelUMode(source_p, flag);
914	–	}
915	–	}
916	–	else if (MyConnect(source_p))
917	–	badflag = 1;
918	–
919	–	break;
920	–	}
921	–	}
922	–	}
923	–
924	–	if (badflag)
925	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926	–	me.name, source_p->name);
927	–
928	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
930	–	{
931	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
932	–	me.name, source_p->name);
933	–	DelUMode(source_p, UMODE_ADMIN);
934	–	}
935	–
936	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
937	–	++Count.invisi;
938	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
939	–	--Count.invisi;
940	–
941	–	/*
942	–	* compare new flags with old flags and send string which
943	–	* will cause servers to update correctly.
944	–	*/
945	–	send_umode_out(client_p, source_p, setflags);
946	–	}
947	–
716		/* send_umode()
717		* send the MODE string for user (user) to connection client_p
718		* -avalon
#	Line 958 | Line 726 | set_user_mode(struct Client *client_p, s
726		*/
727		void
728		send_umode(struct Client *client_p, struct Client *source_p,
729	<	unsigned int old, unsigned int sendmask, char *umode_buf)
729	>	unsigned int old, char *umode_buf)
730		{
731		char *m = umode_buf;
732		int what = 0;
965	–	unsigned int i;
966	–	unsigned int flag;
733
734		/*
735	<	* build a string in umode_buf to represent the change in the user's
735	>	* Build a string in umode_buf to represent the change in the user's
736		* mode between the new (source_p->umodes) and 'old'.
737		*/
738	<	for (i = 0; i < 128; ++i)
738	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
739		{
740	<	flag = user_modes[i];
975	<	if (!flag)
976	<	continue;
977	<
978	<	if (MyClient(source_p) && !(flag & sendmask))
979	<	continue;
980	<
981	<	if ((flag & old) && !HasUMode(source_p, flag))
740	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
741		{
742		if (what == MODE_DEL)
743	<	*m++ = (char)i;
743	>	*m++ = tab->c;
744		else
745		{
746		what = MODE_DEL;
747		*m++ = '-';
748	<	*m++ = (char)i;
748	>	*m++ = tab->c;
749		}
750		}
751	<	else if (!(flag & old) && HasUMode(source_p, flag))
751	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
752		{
753		if (what == MODE_ADD)
754	<	*m++ = (char)i;
754	>	*m++ = tab->c;
755		else
756		{
757		what = MODE_ADD;
758		*m++ = '+';
759	<	*m++ = (char)i;
759	>	*m++ = tab->c;
760		}
761		}
762		}
#	Line 1006 | Line 765 | send_umode(struct Client *client_p, stru
765
766		if (*umode_buf && client_p)
767		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
768	<	source_p->name, source_p->username,
769	<	source_p->host, source_p->name, umode_buf);
768	>	client_p->name, client_p->username,
769	>	client_p->host, client_p->name, umode_buf);
770		}
771
772		/* send_umode_out()
#	Line 1017 | Line 776 | send_umode(struct Client *client_p, stru
776		* side effects - Only send ubuf out to servers that know about this client
777		*/
778		void
779	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1021	<	unsigned int old)
779	>	send_umode_out(struct Client *source_p, unsigned int old)
780		{
781	<	char buf[IRCD_BUFSIZE] = { '\0' };
1024	<	dlink_node *ptr = NULL;
781	>	char buf[IRCD_BUFSIZE] = "";
782
783	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
783	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
784
785		if (buf[0])
786	<	{
787	<	DLINK_FOREACH(ptr, serv_list.head)
1031	<	{
1032	<	struct Client *target_p = ptr->data;
1033	<
1034	<	if ((target_p != client_p) && (target_p != source_p))
1035	<	sendto_one(target_p, ":%s MODE %s :%s",
1036	<	ID_or_name(source_p, target_p),
1037	<	ID_or_name(source_p, target_p), buf);
1038	<	}
1039	<	}
1040	<
1041	<	if (client_p && MyClient(client_p))
1042	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
786	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
787	>	source_p->id, source_p->id, buf);
788		}
789
790		void
791		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
792		{
793	<	dlink_node *ptr = NULL;
793	>	dlink_node *node = NULL;
794
795		if (!strcmp(target_p->host, hostname))
796		return;
#	Line 1054 | Line 799 | user_set_hostmask(struct Client *target_
799		{
800		case MODE_ADD:
801		AddUMode(target_p, UMODE_HIDDENHOST);
1057	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
802		break;
803		case MODE_DEL:
804		DelUMode(target_p, UMODE_HIDDENHOST);
1061	–
1062	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1063	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
805		break;
806		default: return;
807		}
808
809	<	if (ConfigFileEntry.cycle_on_host_change)
809	>	if (ConfigGeneral.cycle_on_host_change)
810		sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
811		target_p->name, target_p->username, target_p->host);
812
#	Line 1079 | Line 820 | user_set_hostmask(struct Client *target_
820
821		if (MyClient(target_p))
822		{
823	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	<	target_p->name, target_p->host);
823	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
824		clear_ban_cache_client(target_p);
825		}
826
827	<	if (!ConfigFileEntry.cycle_on_host_change)
827	>	if (!ConfigGeneral.cycle_on_host_change)
828		return;
829
830	<	DLINK_FOREACH(ptr, target_p->channel.head)
830	>	DLINK_FOREACH(node, target_p->channel.head)
831		{
832	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
832	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
833		char *p = modebuf;
834		int len = 0;
835	<	const struct Membership *ms = ptr->data;
835	>	const struct Membership *member = node->data;
836
837	<	if (has_member_flags(ms, CHFL_CHANOP))
837	>	if (has_member_flags(member, CHFL_CHANOP))
838		{
839		*p++ = 'o';
840		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
841		}
842
843	<	if (has_member_flags(ms, CHFL_HALFOP))
843	>	if (has_member_flags(member, CHFL_HALFOP))
844		{
845		*p++ = 'h';
846		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
847		}
848
849	<	if (has_member_flags(ms, CHFL_VOICE))
849	>	if (has_member_flags(member, CHFL_VOICE))
850		{
851		*p++ = 'v';
852		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1114 | Line 854 | user_set_hostmask(struct Client *target_
854
855		*p = '\0';
856
857	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
858	<	target_p->name, target_p->username, target_p->host,
859	<	ms->chptr->chname);
857	>
858	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
859	>	target_p->name, target_p->username,
860	>	target_p->host, member->chptr->name,
861	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
862	>	target_p->info);
863	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
864	>	target_p->name, target_p->username,
865	>	target_p->host, member->chptr->name);
866	>
867		if (nickbuf[0])
868	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
869	<	target_p->servptr->name, ms->chptr->chname,
868	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
869	>	target_p->servptr->name, member->chptr->name,
870		modebuf, nickbuf);
871
872		}
#	Line 1131 | Line 878 | user_set_hostmask(struct Client *target_
878		target_p->host, target_p->away);
879		}
880
881	<	/* user_welcome()
882	<	*
883	<	* inputs       - client pointer to client to welcome
1137	<	* output       - NONE
1138	<	* side effects -
1139	<	*/
1140	<	static void
1141	<	user_welcome(struct Client *source_p)
1142	<	{
1143	<	#if defined(__TIME__) && defined(__DATE__)
1144	<	static const char built_date[] = __DATE__ " at " __TIME__;
1145	<	#else
1146	<	static const char built_date[] = "unknown";
1147	<	#endif
1148	<
1149	<	#ifdef HAVE_LIBCRYPTO
1150	<	if (HasFlag(source_p, FLAGS_SSL))
1151	<	{
1152	<	AddUMode(source_p, UMODE_SSL);
1153	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1154	<	me.name, source_p->name,
1155	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1156	<	}
1157	<	#endif
1158	<
1159	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1160	<	ServerInfo.network_name, source_p->name);
1161	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1162	<	get_listener_name(source_p->localClient->listener), ircd_version);
1163	<	sendto_one(source_p, form_str(RPL_CREATED),
1164	<	me.name, source_p->name, built_date);
1165	<	sendto_one(source_p, form_str(RPL_MYINFO),
1166	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1167	<	show_isupport(source_p);
1168	<
1169	<	if (source_p->id[0] != '\0')
1170	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1171	<	source_p->name, source_p->id);
1172	<
1173	<	show_lusers(source_p);
1174	<	motd_signon(source_p);
1175	<	}
1176	<
1177	<	/* check_xline()
1178	<	*
1179	<	* inputs       - pointer to client to test
1180	<	* outupt       - 1 if exiting 0 if ok
1181	<	* side effects -
1182	<	*/
1183	<	static int
1184	<	check_xline(struct Client *source_p)
1185	<	{
1186	<	struct MaskItem *conf = NULL;
1187	<	const char *reason = NULL;
1188	<
1189	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1190	<	{
1191	<	++conf->count;
1192	<
1193	<	if (conf->reason != NULL)
1194	<	reason = conf->reason;
1195	<	else
1196	<	reason = "No Reason";
1197	<
1198	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1199	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1200	<	source_p->info, reason,
1201	<	get_client_name(source_p, HIDE_IP),
1202	<	source_p->sockhost);
1203	<
1204	<	++ServerStats.is_ref;
1205	<	exit_client(source_p, &me, "Bad user info");
1206	<	return 1;
1207	<	}
1208	<
1209	<	return 0;
1210	<	}
1211	<
1212	<	/* oper_up()
1213	<	*
1214	<	* inputs       - pointer to given client to oper
1215	<	* output       - NONE
1216	<	* side effects - Blindly opers up given source_p, using conf info
1217	<	*                all checks on passwords have already been done.
1218	<	*                This could also be used by rsa oper routines.
881	>	/*! \brief Blindly opers up given source_p, using conf info.
882	>	*         All checks on passwords have already been done.
883	>	* \param source_p Pointer to given client to oper
884		*/
885		void
886		oper_up(struct Client *source_p)
887		{
888		const unsigned int old = source_p->umodes;
889	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
889	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
890
891	<	assert(source_p->localClient->confs.head);
891	>	assert(source_p->connection->confs.head);
892
893		++Count.oper;
894		SetOper(source_p);
895
896		if (conf->modes)
897		AddUMode(source_p, conf->modes);
898	<	else if (ConfigFileEntry.oper_umodes)
899	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
898	>	else if (ConfigGeneral.oper_umodes)
899	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
900
901		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
902		++Count.invisi;
#	Line 1248 | Line 913 | oper_up(struct Client *source_p)
913
914		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
915		get_oper_name(source_p));
916	<	send_umode_out(source_p, source_p, old);
917	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
916	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
917	>	me.id, get_oper_name(source_p));
918	>	send_umode_out(source_p, old);
919	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
920		}
921
922	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
922	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
923
924		int
925		valid_sid(const char *sid)
#	Line 1277 | Line 944 | valid_sid(const char *sid)
944		void
945		init_uid(void)
946		{
1280	–	unsigned int i;
1281	–
947		memset(new_uid, 0, sizeof(new_uid));
948
949	<	if (!EmptyString(ServerInfo.sid))
950	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
949	>	if (!EmptyString(ConfigServerInfo.sid))
950	>	strlcpy(new_uid, ConfigServerInfo.sid, sizeof(new_uid));
951
952	<	for (i = 0; i < IRC_MAXSID; ++i)
952	>	for (unsigned int i = 0; i < IRC_MAXSID; ++i)
953		if (new_uid[i] == '\0')
954		new_uid[i] = 'A';
955
#	Line 1301 | Line 966 | init_uid(void)
966		*                note this is a recursive function
967		*/
968		static void
969	<	add_one_to_uid(int i)
969	>	add_one_to_uid(unsigned int i)
970		{
971	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
971	>	if (i != IRC_MAXSID)  /* Not reached server SID portion yet? */
972		{
973		if (new_uid[i] == 'Z')
974		new_uid[i] = '0';
975		else if (new_uid[i] == '9')
976		{
977		new_uid[i] = 'A';
978	<	add_one_to_uid(i-1);
978	>	add_one_to_uid(i - 1);
979		}
980		else
981		++new_uid[i];
#	Line 1335 | Line 1000 | add_one_to_uid(int i)
1000		static const char *
1001		uid_get(void)
1002		{
1003	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1003	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
1004		return new_uid;
1005		}
1006
#	Line 1350 | Line 1015 | void
1015		init_isupport(void)
1016		{
1017		add_isupport("CALLERID", NULL, -1);
1018	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1018	>	add_isupport("CASEMAPPING", "rfc1459", -1);
1019		add_isupport("DEAF", "D", -1);
1020		add_isupport("KICKLEN", NULL, KICKLEN);
1021		add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	–	#ifdef HALFOPS
1022		add_isupport("PREFIX", "(ohv)@%+", -1);
1023		add_isupport("STATUSMSG", "@%+", -1);
1024	<	#else
1025	<	add_isupport("PREFIX", "(ov)@+", -1);
1362	<	add_isupport("STATUSMSG", "@+", -1);
1363	<	#endif
1364	<	add_isupport("EXCEPTS", "e", -1);
1365	<	add_isupport("INVEX", "I", -1);
1024	>	add_isupport("EXCEPTS", NULL, -1);
1025	>	add_isupport("INVEX", NULL, -1);
1026		}
1027
1028		/*
#	Line 1377 | Line 1037 | init_isupport(void)
1037		void
1038		add_isupport(const char *name, const char *options, int n)
1039		{
1040	<	dlink_node *ptr;
1041	<	struct Isupport *support;
1040	>	dlink_node *node = NULL;
1041	>	struct Isupport *support = NULL;
1042
1043	<	DLINK_FOREACH(ptr, support_list.head)
1043	>	DLINK_FOREACH(node, support_list.head)
1044		{
1045	<	support = ptr->data;
1045	>	support = node->data;
1046		if (irccmp(support->name, name) == 0)
1047		{
1048		MyFree(support->name);
#	Line 1391 | Line 1051 | add_isupport(const char *name, const cha
1051		}
1052		}
1053
1054	<	if (ptr == NULL)
1054	>	if (node == NULL)
1055		{
1056	<	support = MyMalloc(sizeof(*support));
1056	>	support = MyCalloc(sizeof(*support));
1057		dlinkAddTail(support, &support->node, &support_list);
1058		}
1059
1060		support->name = xstrdup(name);
1061	<	if (options != NULL)
1061	>	if (options)
1062		support->options = xstrdup(options);
1063		support->number = n;
1064
#	Line 1415 | Line 1075 | add_isupport(const char *name, const cha
1075		void
1076		delete_isupport(const char *name)
1077		{
1078	<	dlink_node *ptr;
1419	<	struct Isupport *support;
1078	>	dlink_node *node = NULL;
1079
1080	<	DLINK_FOREACH(ptr, support_list.head)
1080	>	DLINK_FOREACH(node, support_list.head)
1081		{
1082	<	support = ptr->data;
1082	>	struct Isupport *support = node->data;
1083	>
1084		if (irccmp(support->name, name) == 0)
1085		{
1086	<	dlinkDelete(ptr, &support_list);
1086	>	dlinkDelete(node, &support_list);
1087		MyFree(support->name);
1088		MyFree(support->options);
1089		MyFree(support);
#	Line 1446 | Line 1106 | rebuild_isupport_message_line(void)
1106		{
1107		char isupportbuffer[IRCD_BUFSIZE];
1108		char *p = isupportbuffer;
1109	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1109	>	dlink_node *node = NULL, *node_next = NULL;
1110		int n = 0;
1111		int tokens = 0;
1112		size_t len = 0;
1113	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1113	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1114
1115	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1115	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1116		{
1117	<	dlinkDelete(ptr, &support_list_lines);
1118	<	MyFree(ptr->data);
1119	<	free_dlink_node(ptr);
1117	>	dlinkDelete(node, &support_list_lines);
1118	>	MyFree(node->data);
1119	>	free_dlink_node(node);
1120		}
1121
1122	<	DLINK_FOREACH(ptr, support_list.head)
1122	>	DLINK_FOREACH(node, support_list.head)
1123		{
1124	<	struct Isupport *support = ptr->data;
1124	>	struct Isupport *support = node->data;
1125
1126		p += (n = sprintf(p, "%s", support->name));
1127		len += n;
1128
1129	<	if (support->options != NULL)
1129	>	if (support->options)
1130		{
1131		p += (n = sprintf(p, "=%s", support->options));
1132		len += n;
#	Line 1494 | Line 1154 | rebuild_isupport_message_line(void)
1154		}
1155		}
1156
1157	<	if (len != 0)
1157	>	if (len)
1158		{
1159		if (*--p == ' ')
1160		*p = '\0';

Diff Legend

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