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 2134 by michael, Wed May 29 18:59:39 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 5805 by michael, Tue Apr 21 21:49:58 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 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
55	–
51		static char umode_buffer[IRCD_BUFSIZE];
57	–
58	–	static void user_welcome(struct Client *);
59	–	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60	–	static int check_xline(struct Client *);
61	–	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		*/
57	<
68	<	struct Isupport
57	>	struct Isupport
58		{
59		dlink_node node;
60		char *name;
#	Line 73 | Line 62 | struct Isupport
62		int number;
63		};
64
65	<	static dlink_list support_list = { NULL, NULL, 0 };
66	<	MessageFile *isupportFile;
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	<	UMODE_CCONN_FULL,   /* 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	<	0,                  /* S */
95	<	0,                  /* T */
96	<	0,                  /* U */
97	<	0,                  /* V */
98	<	0,                  /* W */
99	<	0,                  /* X */
111	<	0,                  /* Y */
112	<	0,                  /* Z 0x5A */
113	<	0, 0, 0, 0, 0,      /* 0x5F   */
114	<	0,                  /* 0x60   */
115	<	UMODE_ADMIN,        /* a */
116	<	UMODE_BOTS,         /* b */
117	<	UMODE_CCONN,        /* c */
118	<	UMODE_DEBUG,        /* d */
119	<	UMODE_EXTERNAL,     /* e */
120	<	UMODE_FULL,         /* f */
121	<	UMODE_CALLERID,     /* g */
122	<	0,                  /* h */
123	<	UMODE_INVISIBLE,    /* i */
124	<	UMODE_REJ,          /* j */
125	<	UMODE_SKILL,        /* k */
126	<	UMODE_LOCOPS,       /* l */
127	<	0,                  /* m */
128	<	UMODE_NCHANGE,      /* n */
129	<	UMODE_OPER,         /* o */
130	<	0,                  /* p */
131	<	0,                  /* q */
132	<	UMODE_REGISTERED,   /* r */
133	<	UMODE_SERVNOTICE,   /* s */
134	<	0,                  /* t */
135	<	UMODE_UNAUTH,       /* u */
136	<	0,                  /* v */
137	<	UMODE_WALLOP,       /* w */
138	<	0,                  /* x */
139	<	UMODE_SPY,          /* y */
140	<	UMODE_OPERWALL,     /* z      0x7A */
141	<	0,0,0,0,0,          /* 0x7B - 0x7F */
142	<
143	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
144	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
145	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
146	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
147	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
148	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
149	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
150	<	/* 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		{
156	–	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 170 | Line 120 | assemble_umode_buffer(void)
120		* side effects - display to client user counts etc.
121		*/
122		void
123	<	show_lusers(struct Client *source_p)
123	>	show_lusers(struct Client *source_p)
124		{
175	–	const char *from, *to;
176	–
177	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
178	–	{
179	–	from = me.id;
180	–	to = source_p->id;
181	–	}
182	–	else
183	–	{
184	–	from = me.name;
185	–	to = source_p->name;
186	–	}
187	–
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),
191	<	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 > 0)
133	<	sendto_one(source_p, form_str(RPL_LUSEROP),
134	<	from, to, Count.oper);
135	<
136	<	if (dlink_list_length(&unknown_list) > 0)
137	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
138	<	from, to, dlink_list_length(&unknown_list));
139	<
204	<	if (dlink_list_length(&global_channel_list) > 0)
205	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
206	<	from, to, dlink_list_length(&global_channel_list));
132	>	if (Count.oper)
133	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
134	>
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);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	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);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	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),
224	<	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;
160
161		if ((Count.local + Count.myserver) > Count.max_loc_con)
162	<	Count.max_loc_con = Count.local + Count.myserver;
162	>	Count.max_loc_con = Count.local + Count.myserver;
163		}
164
165		/* show_isupport()
#	Line 241 | Line 169 | show_lusers(struct Client *source_p)
169		* side effects - display to client what we support (for them)
170		*/
171		void
172	<	show_isupport(struct Client *source_p)
172	>	show_isupport(struct Client *source_p)
173		{
174	<	send_message_file(source_p, isupportFile);
174	>	const dlink_node *node = NULL;
175	>
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	>	if (IsConfExemptResv(conf))
204	>	{
205	>	SetExemptResv(source_p);
206	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
207	>	}
208	>
209	>	/* If this user is exempt from user limits set it "F lined" */
210	>	if (IsConfExemptLimits(conf))
211	>	{
212	>	SetExemptLimits(source_p);
213	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
214	>	}
215	>
216	>	if (IsConfCanFlood(conf))
217	>	{
218	>	SetCanFlood(source_p);
219	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
220	>	"protection, aren't you fearsome.");
221	>	}
222	>	}
223	>
224	>	/* introduce_client()
225	>	*
226	>	* inputs       - source_p
227	>	* output       - NONE
228	>	* side effects - This common function introduces a client to the rest
229	>	*                of the net, either from a local client connect or
230	>	*                from a remote connect.
231	>	*/
232	>	static void
233	>	introduce_client(struct Client *source_p)
234	>	{
235	>	dlink_node *node = NULL;
236	>	char ubuf[IRCD_BUFSIZE] = "";
237	>
238	>	if (MyClient(source_p))
239	>	send_umode(source_p, source_p, 0, ubuf);
240	>	else
241	>	send_umode(NULL, source_p, 0, ubuf);
242	>
243	>	watch_check_hash(source_p, RPL_LOGON);
244	>
245	>	if (ubuf[0] == '\0')
246	>	{
247	>	ubuf[0] = '+';
248	>	ubuf[1] = '\0';
249	>	}
250	>
251	>	DLINK_FOREACH(node, local_server_list.head)
252	>	{
253	>	struct Client *server = node->data;
254	>
255	>	if (server == source_p->from)
256	>	continue;
257	>
258	>	if (IsCapable(server, CAP_SVS))
259	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
260	>	source_p->servptr->id,
261	>	source_p->name, source_p->hopcount+1,
262	>	(unsigned long)source_p->tsinfo,
263	>	ubuf, source_p->username, source_p->host,
264	>	source_p->sockhost, source_p->id,
265	>	source_p->account,
266	>	source_p->info);
267	>	else
268	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
269	>	source_p->servptr->id,
270	>	source_p->name, source_p->hopcount+1,
271	>	(unsigned long)source_p->tsinfo,
272	>	ubuf, source_p->username, source_p->host,
273	>	source_p->sockhost, source_p->id, source_p->info);
274	>
275	>	if (!EmptyString(source_p->certfp))
276	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
277	>	}
278	>	}
279	>
280	>	/* user_welcome()
281	>	*
282	>	* inputs       - client pointer to client to welcome
283	>	* output       - NONE
284	>	* side effects -
285	>	*/
286	>	static void
287	>	user_welcome(struct Client *source_p)
288	>	{
289	>	#if defined(__TIME__) && defined(__DATE__)
290	>	static const char built_date[] = __DATE__ " at " __TIME__;
291	>	#else
292	>	static const char built_date[] = "unknown";
293	>	#endif
294	>
295	>	#ifdef HAVE_LIBCRYPTO
296	>	if (HasFlag(source_p, FLAGS_SSL))
297	>	{
298	>	AddUMode(source_p, UMODE_SSL);
299	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
300	>	ssl_get_cipher(source_p->connection->fd.ssl));
301	>	}
302	>	#endif
303	>
304	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
305	>	source_p->name);
306	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
307	>	get_listener_name(source_p->connection->listener), ircd_version);
308	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
309	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
310	>	show_isupport(source_p);
311	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
312	>
313	>	show_lusers(source_p);
314	>	motd_signon(source_p);
315	>	}
316	>
317	>	/* check_xline()
318	>	*
319	>	* inputs       - pointer to client to test
320	>	* outupt       - 1 if exiting 0 if ok
321	>	* side effects -
322	>	*/
323	>	static int
324	>	check_xline(struct Client *source_p)
325	>	{
326	>	struct MaskItem *conf = NULL;
327	>
328	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
329	>	{
330	>	++conf->count;
331	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
332	>	"X-line Rejecting [%s] [%s], user %s [%s]",
333	>	source_p->info, conf->reason,
334	>	get_client_name(source_p, HIDE_IP),
335	>	source_p->sockhost);
336	>
337	>	++ServerStats.is_ref;
338	>	exit_client(source_p, "Bad user info");
339	>	return 1;
340	>	}
341	>
342	>	return 0;
343	>	}
344	>
345	>	/*! \brief This function is called when both NICK and USER messages
346	>	*      have been accepted for the client, in whatever order. Only
347	>	*      after this, is the UID message propagated.
348	>	* \param source_p Pointer to given client to introduce
349	>	*/
350		void
351		register_local_user(struct Client *source_p)
352		{
353		const char *id = NULL;
354		const struct MaskItem *conf = NULL;
355
278	–	assert(source_p != NULL);
356		assert(source_p == source_p->from);
357		assert(MyConnect(source_p));
358	<	assert(!source_p->localClient->registration);
358	>	assert(IsUnknown(source_p));
359	>	assert(!source_p->connection->registration);
360
361	<	ClearCap(source_p, CAP_TS6);
284	<
285	<	if (ConfigFileEntry.ping_cookie)
361	>	if (ConfigGeneral.ping_cookie)
362		{
363	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
363	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
364		{
365		do
366	<	source_p->localClient->random_ping = genrand_int32();
367	<	while (!source_p->localClient->random_ping);
366	>	source_p->connection->random_ping = genrand_int32();
367	>	while (!source_p->connection->random_ping);
368
369	<	sendto_one(source_p, "PING :%u",
294	<	source_p->localClient->random_ping);
369	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
370		SetPingSent(source_p);
371		return;
372		}
#	Line 300 | Line 375 | register_local_user(struct Client *sourc
375		return;
376		}
377
378	<	source_p->localClient->last_privmsg = CurrentTime;
378	>	source_p->connection->last_privmsg = CurrentTime;
379		/* Straight up the maximum rate of flooding... */
380	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
380	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
381
382		if (!check_client(source_p))
383		return;
384
385	<	if (valid_hostname(source_p->host) == 0)
385	>	if (!valid_hostname(source_p->host))
386		{
387	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
388	<	"character in your hostname", me.name, source_p->name);
389	<	strlcpy(source_p->host, source_p->sockhost,
315	<	sizeof(source_p->host));
387	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
388	>	"character in your hostname");
389	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
390		}
391
392	<	conf = source_p->localClient->confs.head->data;
392	>	conf = source_p->connection->confs.head->data;
393
394		if (!IsGotId(source_p))
395		{
396	<	char username[USERLEN + 1];
396	>	char username[USERLEN + 1] = "";
397		const char *p = username;
398		unsigned int i = 0;
399
400		if (IsNeedIdentd(conf))
401		{
402		++ServerStats.is_ref;
403	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
404	<	"identd to use this server", me.name, source_p->name);
405	<	exit_client(source_p, &me, "Install identd");
403	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
404	>	"identd to use this server");
405	>	exit_client(source_p, "Install identd");
406		return;
407		}
408
#	Line 338 | Line 412 | register_local_user(struct Client *sourc
412		source_p->username[i++] = '~';
413
414		for (; *p && i < USERLEN; ++p)
415	<	if (*p != '[')
342	<	source_p->username[i++] = *p;
415	>	source_p->username[i++] = *p;
416
417		source_p->username[i] = '\0';
418		}
419
420	<	/* password check */
420	>	/* Password check */
421		if (!EmptyString(conf->passwd))
422		{
423	<	const char *pass = source_p->localClient->passwd;
351	<
352	<	if (!match_conf_password(pass, conf))
423	>	if (!match_conf_password(source_p->connection->password, conf))
424		{
425		++ServerStats.is_ref;
426	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
427	<	me.name, source_p->name);
428	<	exit_client(source_p, &me, "Bad Password");
426	>
427	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
428	>	exit_client(source_p, "Bad Password");
429		return;
430		}
431		}
432
433	<	/* don't free source_p->localClient->passwd here - it can be required
434	<	* by masked /stats I if there are auth{} blocks with need_password = no;
433	>	/*
434	>	* Don't free source_p->connection->password here - it can be required
435	>	* by masked /stats I if there are auth {} blocks with need_password = no;
436		* --adx
437		*/
438
439	<	/* report if user has &^>= etc. and set flags as needed in source_p */
439	>	/*
440	>	* Report if user has &^>= etc. and set flags as needed in source_p
441	>	*/
442		report_and_set_user_flags(source_p, conf);
443
444		if (IsDead(source_p))
445		return;
446
447	<	/* Limit clients -
447	>	/*
448	>	* Limit clients -
449		* We want to be able to have servers and F-line clients
450		* connect, so save room for "buffer" connections.
451		* Smaller servers may want to decrease this, and it should
452		* probably be just a percentage of the MAXCLIENTS...
453		*   -Taner
454		*/
455	<	/* Except "F:" clients */
456	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
455	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
456	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
457		{
458		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
459		"Too many clients, rejecting %s[%s].",
460		source_p->name, source_p->host);
461		++ServerStats.is_ref;
462	<	exit_client(source_p, &me, "Sorry, server is full - try later");
462	>	exit_client(source_p, "Sorry, server is full - try later");
463		return;
464		}
465
466	<	/* valid user name check */
393	<	if (valid_username(source_p->username, 1) == 0)
466	>	if (!valid_username(source_p->username, 1))
467		{
468	<	char tmpstr2[IRCD_BUFSIZE];
468	>	char buf[IRCD_BUFSIZE] = "";
469
470		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
471		"Invalid username: %s (%s@%s)",
472		source_p->name, source_p->username, source_p->host);
473		++ServerStats.is_ref;
474	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
475	<	source_p->username);
403	<	exit_client(source_p, &me, tmpstr2);
474	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
475	>	exit_client(source_p, buf);
476		return;
477		}
478
479		if (check_xline(source_p))
480		return;
481
482	<	while (hash_find_id((id = uid_get())) != NULL)
482	>	while (hash_find_id((id = uid_get())))
483		;
484
485		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 416 | Line 488 | register_local_user(struct Client *sourc
488		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
489		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
490		source_p->name, source_p->username, source_p->host,
491	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
492	<	"255.255.255.255" : source_p->sockhost,
421	<	get_client_class(&source_p->localClient->confs),
491	>	source_p->sockhost,
492	>	get_client_class(&source_p->connection->confs),
493		source_p->info, source_p->id);
494
495	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
425	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
426	<	source_p->name, source_p->username, source_p->host,
427	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
428	<	"255.255.255.255" : source_p->sockhost,
429	<	get_client_class(&source_p->localClient->confs),
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"<hidden>" : source_p->localClient->client_host,
432	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
433	<	"<hidden>" : source_p->localClient->client_server,
434	<	source_p->info);
435	<
436	<
437	<	if (ConfigFileEntry.invisible_on_connect)
495	>	if (ConfigGeneral.invisible_on_connect)
496		{
497		AddUMode(source_p, UMODE_INVISIBLE);
498		++Count.invisi;
499		}
500
501	<	if ((++Count.local) > Count.max_loc)
501	>	if (++Count.local > Count.max_loc)
502		{
503		Count.max_loc = Count.local;
504
505		if (!(Count.max_loc % 10))
506		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
507	<	"New Max Local Clients: %d",
507	>	"New maximum local client connections: %u",
508		Count.max_loc);
509		}
510
453	–	/* Increment our total user count here */
511		if (++Count.total > Count.max_tot)
512		Count.max_tot = Count.total;
513		++Count.totalrestartcount;
#	Line 458 | Line 515 | register_local_user(struct Client *sourc
515		assert(source_p->servptr == &me);
516		SetClient(source_p);
517		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
518	<
462	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
518	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
519
520		assert(dlinkFind(&unknown_list, source_p));
521
522	<	dlink_move_node(&source_p->localClient->lclient_node,
522	>	dlink_move_node(&source_p->connection->lclient_node,
523		&unknown_list, &local_client_list);
524
525		user_welcome(source_p);
#	Line 479 | Line 535 | register_local_user(struct Client *sourc
535		*              - username to register as
536		*              - host name to register as
537		*              - server name
482	–	*              - realname (gecos)
538		* output       - NONE
539		* side effects - This function is called when a remote client
540		*                is introduced by a server.
541		*/
542		void
543	<	register_remote_user(struct Client *source_p,
489	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
543	>	register_remote_user(struct Client *source_p)
544		{
545	<	struct Client *target_p = NULL;
493	<
494	<	assert(source_p != NULL);
495	<	assert(source_p->username != username);
496	<
497	<	strlcpy(source_p->host, host, sizeof(source_p->host));
498	<	strlcpy(source_p->username, username, sizeof(source_p->username));
499	<
500	<	/*
501	<	* coming from another server, take the servers word for it
502	<	*/
503	<	source_p->servptr = hash_find_server(server);
504	<
505	<	/*
506	<	* Super GhostDetect:
507	<	* If we can't find the server the user is supposed to be on,
508	<	* then simply blow the user away.        -Taner
509	<	*/
510	<	if (source_p->servptr == NULL)
511	<	{
512	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
513	<	"No server %s for user %s[%s@%s] from %s",
514	<	server, source_p->name, source_p->username,
515	<	source_p->host, source_p->from->name);
516	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
517	<
518	<	AddFlag(source_p, FLAGS_KILLED);
519	<	exit_client(source_p, &me, "Ghosted Client");
520	<	return;
521	<	}
545	>	const struct Client *target_p = NULL;
546
547		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
548		{
#	Line 527 | Line 551 | register_remote_user(struct Client *sour
551		source_p->from->name, source_p->name, source_p->username,
552		source_p->host, source_p->servptr->name,
553		target_p->name, target_p->from->name);
554	<	kill_client(source_p->from, source_p,
555	<	"%s (NICK from wrong direction (%s != %s))",
556	<	me.name, source_p->servptr->name, target_p->from->name);
554	>	sendto_one(source_p->from,
555	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
556	>	me.id, source_p->id, me.name, source_p->servptr->name,
557	>	target_p->from->name);
558	>
559		AddFlag(source_p, FLAGS_KILLED);
560	<	exit_client(source_p, &me, "USER server wrong direction");
560	>	exit_client(source_p, "UID server wrong direction");
561		return;
562		}
563
#	Line 542 | Line 568 | register_remote_user(struct Client *sour
568		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
569		AddFlag(source_p, FLAGS_SERVICE);
570
545	–	/* Increment our total user count here */
571		if (++Count.total > Count.max_tot)
572		Count.max_tot = Count.total;
573
574		SetClient(source_p);
575		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
576	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
577		add_user_host(source_p->username, source_p->host, 1);
578		SetUserHost(source_p);
579
580		if (HasFlag(source_p->servptr, FLAGS_EOB))
581		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
582	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
582	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
583		source_p->servptr->name,
584		source_p->name, source_p->username, source_p->host,
585	<	source_p->info, source_p->id);
585	>	source_p->sockhost, source_p->info, source_p->id);
586
587		introduce_client(source_p);
588		}
589
564	–	/* introduce_client()
565	–	*
566	–	* inputs       - source_p
567	–	* output       - NONE
568	–	* side effects - This common function introduces a client to the rest
569	–	*                of the net, either from a local client connect or
570	–	*                from a remote connect.
571	–	*/
572	–	static void
573	–	introduce_client(struct Client *source_p)
574	–	{
575	–	dlink_node *server_node = NULL;
576	–	static char ubuf[12];
577	–
578	–	if (MyClient(source_p))
579	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
580	–	else
581	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
582	–
583	–	watch_check_hash(source_p, RPL_LOGON);
584	–
585	–	if (*ubuf == '\0')
586	–	{
587	–	ubuf[0] = '+';
588	–	ubuf[1] = '\0';
589	–	}
590	–
591	–	DLINK_FOREACH(server_node, serv_list.head)
592	–	{
593	–	struct Client *server = server_node->data;
594	–
595	–	if (server == source_p->from)
596	–	continue;
597	–
598	–	if (IsCapable(server, CAP_SVS))
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 :%s",
602	–	source_p->servptr->id,
603	–	source_p->name, source_p->hopcount+1,
604	–	(unsigned long)source_p->tsinfo,
605	–	ubuf, source_p->username, source_p->host,
606	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
607	–	"0" : source_p->sockhost, source_p->id,
608	–	source_p->svid,
609	–	source_p->info);
610	–	else
611	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
612	–	source_p->name, source_p->hopcount+1,
613	–	(unsigned long)source_p->tsinfo,
614	–	ubuf, source_p->username, source_p->host,
615	–	source_p->servptr->name, source_p->svid,
616	–	source_p->info);
617	–
618	–	}
619	–	else
620	–	{
621	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
622	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
623	–	source_p->servptr->id,
624	–	source_p->name, source_p->hopcount+1,
625	–	(unsigned long)source_p->tsinfo,
626	–	ubuf, source_p->username, source_p->host,
627	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
628	–	"0" : source_p->sockhost, source_p->id, source_p->info);
629	–	else
630	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
631	–	source_p->name, source_p->hopcount+1,
632	–	(unsigned long)source_p->tsinfo,
633	–	ubuf, source_p->username, source_p->host,
634	–	source_p->servptr->name, source_p->info);
635	–	}
636	–	}
637	–	}
638	–
590		/* valid_hostname()
591		*
592		* Inputs       - pointer to hostname
#	Line 650 | Line 601 | valid_hostname(const char *hostname)
601		{
602		const char *p = hostname;
603
604	<	assert(p != NULL);
604	>	assert(p);
605
606	<	if (*p == '.' || *p == ':')
606	>	if (EmptyString(p) || *p == '.' || *p == ':')
607		return 0;
608
609		for (; *p; ++p)
#	Line 676 | Line 627 | valid_hostname(const char *hostname)
627		int
628		valid_username(const char *username, const int local)
629		{
630	<	int dots      = 0;
630	>	unsigned int dots = 0;
631		const char *p = username;
632
633	<	assert(p != NULL);
633	>	assert(p);
634
635		if (*p == '~')
636		++p;
#	Line 696 | Line 647 | valid_username(const char *username, con
647		{
648		while (*++p)
649		{
650	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
650	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
651		{
652	<	if (++dots > ConfigFileEntry.dots_in_ident)
652	>	if (++dots > ConfigGeneral.dots_in_ident)
653		return 0;
654		if (!IsUserChar(*(p + 1)))
655		return 0;
#	Line 714 | Line 665 | valid_username(const char *username, con
665		return 0;
666		}
667
668	<	return  p - username <= USERLEN;;
668	>	return p - username <= USERLEN;
669		}
670
671		/* clean_nick_name()
#	Line 728 | Line 679 | int
679		valid_nickname(const char *nickname, const int local)
680		{
681		const char *p = nickname;
731	–	assert(nickname && *nickname);
682
683	<	/* nicks can't start with a digit or - or be 0 length */
684	<	/* This closer duplicates behaviour of hybrid-6 */
685	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
683	>	assert(p);
684	>
685	>	/*
686	>	* Nicks can't start with a digit or - or be 0 length.
687	>	*/
688	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
689		return 0;
690
691		for (; *p; ++p)
#	Line 742 | Line 695 | valid_nickname(const char *nickname, con
695		return p - nickname <= NICKLEN;
696		}
697
745	–	/* report_and_set_user_flags()
746	–	*
747	–	* inputs       - pointer to source_p
748	–	*              - pointer to conf for this user
749	–	* output       - NONE
750	–	* side effects - Report to user any special flags
751	–	*                they are getting, and set them.
752	–	*/
753	–	static void
754	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
755	–	{
756	–	/* If this user is being spoofed, tell them so */
757	–	if (IsConfDoSpoofIp(conf))
758	–	sendto_one(source_p,
759	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
760	–	me.name, source_p->name);
761	–
762	–	/* If this user is in the exception class, Set it "E lined" */
763	–	if (IsConfExemptKline(conf))
764	–	{
765	–	SetExemptKline(source_p);
766	–	sendto_one(source_p,
767	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
768	–	me.name, source_p->name);
769	–	}
770	–
771	–	/* The else here is to make sure that G line exempt users
772	–	* do not get noticed twice.
773	–	*/
774	–	else if (IsConfExemptGline(conf))
775	–	{
776	–	SetExemptGline(source_p);
777	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
778	–	me.name, source_p->name);
779	–	}
780	–
781	–	if (IsConfExemptResv(conf))
782	–	{
783	–	SetExemptResv(source_p);
784	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
785	–	me.name, source_p->name);
786	–	}
787	–
788	–	/* If this user is exempt from user limits set it "F lined" */
789	–	if (IsConfExemptLimits(conf))
790	–	{
791	–	SetExemptLimits(source_p);
792	–	sendto_one(source_p,
793	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
794	–	me.name,source_p->name);
795	–	}
796	–
797	–	if (IsConfCanFlood(conf))
798	–	{
799	–	SetCanFlood(source_p);
800	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
801	–	"protection, aren't you fearsome.",
802	–	me.name, source_p->name);
803	–	}
804	–	}
805	–
806	–	/* set_user_mode()
807	–	*
808	–	* added 15/10/91 By Darren Reed.
809	–	* parv[0] - sender
810	–	* parv[1] - username to change mode for
811	–	* parv[2] - modes to change
812	–	*/
813	–	void
814	–	set_user_mode(struct Client *client_p, struct Client *source_p,
815	–	const int parc, char *parv[])
816	–	{
817	–	unsigned int flag, setflags;
818	–	char **p, *m, buf[IRCD_BUFSIZE];
819	–	struct Client *target_p;
820	–	int what = MODE_ADD, badflag = 0, i;
821	–
822	–	assert(!(parc < 2));
823	–
824	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
825	–	{
826	–	if (MyConnect(source_p))
827	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
828	–	me.name, source_p->name, parv[1]);
829	–	return;
830	–	}
831	–
832	–	if (source_p != target_p)
833	–	{
834	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
835	–	me.name, source_p->name);
836	–	return;
837	–	}
838	–
839	–	if (parc < 3)
840	–	{
841	–	m = buf;
842	–	*m++ = '+';
843	–
844	–	for (i = 0; i < 128; i++)
845	–	if (HasUMode(source_p, user_modes[i]))
846	–	*m++ = (char)i;
847	–	*m = '\0';
848	–
849	–	sendto_one(source_p, form_str(RPL_UMODEIS),
850	–	me.name, source_p->name, buf);
851	–	return;
852	–	}
853	–
854	–	/* find flags already set for user */
855	–	setflags = source_p->umodes;
856	–
857	–	/* parse mode change string(s) */
858	–	for (p = &parv[2]; p && *p; p++)
859	–	{
860	–	for (m = *p; *m; m++)
861	–	{
862	–	switch (*m)
863	–	{
864	–	case '+':
865	–	what = MODE_ADD;
866	–	break;
867	–	case '-':
868	–	what = MODE_DEL;
869	–	break;
870	–	case 'o':
871	–	if (what == MODE_ADD)
872	–	{
873	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
874	–	{
875	–	++Count.oper;
876	–	SetOper(source_p);
877	–	}
878	–	}
879	–	else
880	–	{
881	–	/* Only decrement the oper counts if an oper to begin with
882	–	* found by Pat Szuta, Perly , perly@xnet.com
883	–	*/
884	–	if (!HasUMode(source_p, UMODE_OPER))
885	–	break;
886	–
887	–	ClearOper(source_p);
888	–	Count.oper--;
889	–
890	–	if (MyConnect(source_p))
891	–	{
892	–	dlink_node *dm;
893	–
894	–	detach_conf(source_p, CONF_OPER);
895	–	ClrOFlag(source_p);
896	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
897	–
898	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
899	–	free_dlink_node(dm);
900	–	}
901	–	}
902	–
903	–	break;
904	–
905	–	case 'r':  /* Only services may set +r */
906	–	break;
907	–
908	–	default:
909	–	if ((flag = user_modes[(unsigned char)*m]))
910	–	{
911	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
912	–	(ConfigFileEntry.oper_only_umodes & flag))
913	–	badflag = 1;
914	–	else
915	–	{
916	–	if (what == MODE_ADD)
917	–	AddUMode(source_p, flag);
918	–	else
919	–	DelUMode(source_p, flag);
920	–	}
921	–	}
922	–	else
923	–	{
924	–	if (MyConnect(source_p))
925	–	badflag = 1;
926	–	}
927	–
928	–	break;
929	–	}
930	–	}
931	–	}
932	–
933	–	if (badflag)
934	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
935	–	me.name, source_p->name);
936	–
937	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
938	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
939	–	{
940	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
941	–	me.name, source_p->name);
942	–	DelUMode(source_p, UMODE_ADMIN);
943	–	}
944	–
945	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
946	–	++Count.invisi;
947	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
948	–	--Count.invisi;
949	–
950	–	/*
951	–	* compare new flags with old flags and send string which
952	–	* will cause servers to update correctly.
953	–	*/
954	–	send_umode_out(client_p, source_p, setflags);
955	–	}
956	–
698		/* send_umode()
699		* send the MODE string for user (user) to connection client_p
700		* -avalon
#	Line 967 | Line 708 | set_user_mode(struct Client *client_p, s
708		*/
709		void
710		send_umode(struct Client *client_p, struct Client *source_p,
711	<	unsigned int old, unsigned int sendmask, char *umode_buf)
711	>	unsigned int old, char *umode_buf)
712		{
713		char *m = umode_buf;
714		int what = 0;
974	–	unsigned int i;
975	–	unsigned int flag;
715
716		/*
717	<	* build a string in umode_buf to represent the change in the user's
717	>	* Build a string in umode_buf to represent the change in the user's
718		* mode between the new (source_p->umodes) and 'old'.
719		*/
720	<	for (i = 0; i < 128; i++)
720	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
721		{
722	<	flag = user_modes[i];
984	<	if (!flag)
985	<	continue;
986	<
987	<	if (MyClient(source_p) && !(flag & sendmask))
988	<	continue;
989	<
990	<	if ((flag & old) && !HasUMode(source_p, flag))
722	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
723		{
724		if (what == MODE_DEL)
725	<	*m++ = (char)i;
725	>	*m++ = tab->c;
726		else
727		{
728		what = MODE_DEL;
729		*m++ = '-';
730	<	*m++ = (char)i;
730	>	*m++ = tab->c;
731		}
732		}
733	<	else if (!(flag & old) && HasUMode(source_p, flag))
733	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
734		{
735		if (what == MODE_ADD)
736	<	*m++ = (char)i;
736	>	*m++ = tab->c;
737		else
738		{
739		what = MODE_ADD;
740		*m++ = '+';
741	<	*m++ = (char)i;
741	>	*m++ = tab->c;
742		}
743		}
744		}
#	Line 1015 | Line 747 | send_umode(struct Client *client_p, stru
747
748		if (*umode_buf && client_p)
749		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
750	<	source_p->name, source_p->username,
751	<	source_p->host, source_p->name, umode_buf);
750	>	client_p->name, client_p->username,
751	>	client_p->host, client_p->name, umode_buf);
752		}
753
754		/* send_umode_out()
#	Line 1026 | Line 758 | send_umode(struct Client *client_p, stru
758		* side effects - Only send ubuf out to servers that know about this client
759		*/
760		void
761	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1030	<	unsigned int old)
761	>	send_umode_out(struct Client *source_p, unsigned int old)
762		{
763	<	char buf[IRCD_BUFSIZE] = { '\0' };
1033	<	dlink_node *ptr = NULL;
763	>	char buf[IRCD_BUFSIZE] = "";
764
765	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
765	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
766
767		if (buf[0])
768	<	{
769	<	DLINK_FOREACH(ptr, serv_list.head)
1040	<	{
1041	<	struct Client *target_p = ptr->data;
1042	<
1043	<	if ((target_p != client_p) && (target_p != source_p))
1044	<	sendto_one(target_p, ":%s MODE %s :%s",
1045	<	ID_or_name(source_p, target_p),
1046	<	ID_or_name(source_p, target_p), buf);
1047	<	}
1048	<	}
1049	<
1050	<	if (client_p && MyClient(client_p))
1051	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
768	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
769	>	source_p->id, source_p->id, buf);
770		}
771
772		void
773	<	user_set_hostmask(struct Client *target_p, const char *hostname)
773	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
774		{
775	<	if (!valid_hostname(hostname))
775	>	dlink_node *node = NULL;
776	>
777	>	if (!strcmp(target_p->host, hostname))
778		return;
779
780	+	switch (what)
781	+	{
782	+	case MODE_ADD:
783	+	AddUMode(target_p, UMODE_HIDDENHOST);
784	+	break;
785	+	case MODE_DEL:
786	+	DelUMode(target_p, UMODE_HIDDENHOST);
787	+	break;
788	+	default: return;
789	+	}
790	+
791	+	if (ConfigGeneral.cycle_on_host_change)
792	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
793	+	target_p->name, target_p->username, target_p->host);
794	+
795		if (IsUserHostIp(target_p))
796		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
797
798		strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	–	SetIPSpoof(target_p);
799
800		add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
801		SetUserHost(target_p);
802
803		if (MyClient(target_p))
804	+	{
805	+	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
806		clear_ban_cache_client(target_p);
807	<	}
1072	<
1073	<	/* user_welcome()
1074	<	*
1075	<	* inputs       - client pointer to client to welcome
1076	<	* output       - NONE
1077	<	* side effects -
1078	<	*/
1079	<	static void
1080	<	user_welcome(struct Client *source_p)
1081	<	{
1082	<	#if defined(__TIME__) && defined(__DATE__)
1083	<	static const char built_date[] = __DATE__ " at " __TIME__;
1084	<	#else
1085	<	static const char built_date[] = "unknown";
1086	<	#endif
1087	<
1088	<	#ifdef HAVE_LIBCRYPTO
1089	<	if (source_p->localClient->fd.ssl != NULL)
1090	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1091	<	me.name, source_p->name,
1092	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1093	<	#endif
807	>	}
808
809	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
810	<	ServerInfo.network_name, source_p->name);
1097	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1098	<	get_listener_name(source_p->localClient->listener), ircd_version);
1099	<	sendto_one(source_p, form_str(RPL_CREATED),
1100	<	me.name, source_p->name, built_date);
1101	<	sendto_one(source_p, form_str(RPL_MYINFO),
1102	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1103	<	show_isupport(source_p);
809	>	if (!ConfigGeneral.cycle_on_host_change)
810	>	return;
811
812	<	if (source_p->id[0] != '\0')
813	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
814	<	source_p->name, source_p->id);
812	>	DLINK_FOREACH(node, target_p->channel.head)
813	>	{
814	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
815	>	char *p = modebuf;
816	>	int len = 0;
817	>	const struct Membership *member = node->data;
818
819	<	show_lusers(source_p);
819	>	if (has_member_flags(member, CHFL_CHANOP))
820	>	{
821	>	*p++ = 'o';
822	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
823	>	}
824
825	<	if (ConfigFileEntry.short_motd)
826	<	{
827	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
828	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
829	<	sendto_one(source_p,
1116	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1117	<	"read it", me.name, source_p->name);
1118	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1119	<	me.name, source_p->name, me.name);
1120	<	sendto_one(source_p, form_str(RPL_MOTD),
1121	<	me.name, source_p->name,
1122	<	"*** This is the short motd ***");
1123	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1124	<	me.name, source_p->name);
1125	<	}
1126	<	else
1127	<	send_message_file(source_p, &ConfigFileEntry.motd);
1128	<	}
825	>	if (has_member_flags(member, CHFL_HALFOP))
826	>	{
827	>	*p++ = 'h';
828	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
829	>	}
830
831	<	/* check_xline()
832	<	*
833	<	* inputs       - pointer to client to test
834	<	* outupt       - 1 if exiting 0 if ok
835	<	* side effects -
1135	<	*/
1136	<	static int
1137	<	check_xline(struct Client *source_p)
1138	<	{
1139	<	struct MaskItem *conf = NULL;
1140	<	const char *reason = NULL;
831	>	if (has_member_flags(member, CHFL_VOICE))
832	>	{
833	>	*p++ = 'v';
834	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
835	>	}
836
837	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1143	<	{
1144	<	++conf->count;
837	>	*p = '\0';
838
1146	–	if (conf->reason != NULL)
1147	–	reason = conf->reason;
1148	–	else
1149	–	reason = "No Reason";
839
840	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
841	<	"X-line Rejecting [%s] [%s], user %s [%s]",
842	<	source_p->info, reason,
843	<	get_client_name(source_p, HIDE_IP),
844	<	source_p->sockhost);
840	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
841	>	target_p->name, target_p->username,
842	>	target_p->host, member->chptr->name,
843	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
844	>	target_p->info);
845	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
846	>	target_p->name, target_p->username,
847	>	target_p->host, member->chptr->name);
848	>
849	>	if (nickbuf[0])
850	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
851	>	target_p->servptr->name, member->chptr->name,
852	>	modebuf, nickbuf);
853
1157	–	++ServerStats.is_ref;
1158	–	exit_client(source_p, &me, "Bad user info");
1159	–	return 1;
854		}
855
856	<	return 0;
857	<	}
858	<
859	<	/* oper_up()
860	<	*
861	<	* inputs       - pointer to given client to oper
862	<	* output       - NONE
863	<	* side effects - Blindly opers up given source_p, using conf info
864	<	*                all checks on passwords have already been done.
865	<	*                This could also be used by rsa oper routines.
856	>	if (target_p->away[0])
857	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
858	>	":%s!%s@%s AWAY :%s",
859	>	target_p->name, target_p->username,
860	>	target_p->host, target_p->away);
861	>	}
862	>
863	>	/*! \brief Blindly opers up given source_p, using conf info.
864	>	*         All checks on passwords have already been done.
865	>	* \param source_p Pointer to given client to oper
866		*/
867		void
868		oper_up(struct Client *source_p)
869		{
870		const unsigned int old = source_p->umodes;
871	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
871	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
872
873	<	assert(source_p->localClient->confs.head);
873	>	assert(source_p->connection->confs.head);
874
875		++Count.oper;
876		SetOper(source_p);
877
878		if (conf->modes)
879		AddUMode(source_p, conf->modes);
880	<	else if (ConfigFileEntry.oper_umodes)
881	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
880	>	else if (ConfigGeneral.oper_umodes)
881	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
882
883		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
884		++Count.invisi;
#	Line 1199 | Line 893 | oper_up(struct Client *source_p)
893		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
894		AddUMode(source_p, UMODE_ADMIN);
895
896	+	if (!EmptyString(conf->whois))
897	+	{
898	+	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
899	+	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
900	+	me.id, source_p->id, (unsigned long)source_p->tsinfo,
901	+	RPL_WHOISOPERATOR, conf->whois);
902	+	}
903	+
904		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
905		get_oper_name(source_p));
906	<	send_umode_out(source_p, source_p, old);
907	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
906	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
907	>	me.id, get_oper_name(source_p));
908	>	send_umode_out(source_p, old);
909	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
910		}
911
912	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
912	>	static char new_uid[TOTALSIDUID + 1];  /* Allow for \0 */
913
914		int
915		valid_sid(const char *sid)
#	Line 1220 | Line 924 | valid_sid(const char *sid)
924
925		/*
926		* init_uid()
927	<	*
927	>	*
928		* inputs       - NONE
929		* output       - NONE
930		* side effects - new_uid is filled in with server id portion (sid)
931	<	*                (first 3 bytes) or defaulted to 'A'.
932	<	*                Rest is filled in with 'A'
931	>	*                (first 3 bytes). Rest is filled in with '9'.
932	>	*
933	>	* NOTE: this function assumes that 'ConfigServerInfo.sid' has been set to a proper value
934		*/
935		void
936		init_uid(void)
937		{
938	<	unsigned int i;
1234	<
1235	<	memset(new_uid, 0, sizeof(new_uid));
1236	<
1237	<	if (!EmptyString(ServerInfo.sid))
1238	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1239	<
1240	<	for (i = 0; i < IRC_MAXSID; ++i)
1241	<	if (new_uid[i] == '\0')
1242	<	new_uid[i] = 'A';
1243	<
1244	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1245	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1246	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1247	<	* -Dianora
1248	<	*/
1249	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
938	>	snprintf(new_uid, sizeof(new_uid), "%s999999", ConfigServerInfo.sid);
939		}
940
941		/*
#	Line 1258 | Line 947 | init_uid(void)
947		*                note this is a recursive function
948		*/
949		static void
950	<	add_one_to_uid(int i)
950	>	add_one_to_uid(unsigned int i)
951		{
952	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
952	>	if (i < IRC_MAXSID)
953	>	return;
954	>
955	>	if (new_uid[i] == 'Z')
956	>	new_uid[i] = '0';
957	>	else if (new_uid[i] == '9')
958		{
959	<	if (new_uid[i] == 'Z')
960	<	new_uid[i] = '0';
1267	<	else if (new_uid[i] == '9')
1268	<	{
1269	<	new_uid[i] = 'A';
1270	<	add_one_to_uid(i-1);
1271	<	}
1272	<	else
1273	<	++new_uid[i];
959	>	new_uid[i] = 'A';
960	>	add_one_to_uid(i - 1);
961		}
962		else
963	<	{
1277	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1278	<	if (new_uid[i] == 'Z')
1279	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1280	<	else
1281	<	++new_uid[i];
1282	<	}
963	>	++new_uid[i];
964		}
965
966		/*
#	Line 1292 | Line 973 | add_one_to_uid(int i)
973		static const char *
974		uid_get(void)
975		{
976	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
976	>	add_one_to_uid(TOTALSIDUID - 1);  /* Index from 0 */
977		return new_uid;
978		}
979
#	Line 1306 | Line 987 | uid_get(void)
987		void
988		init_isupport(void)
989		{
1309	–	isupportFile = init_MessageLine();
1310	–
990		add_isupport("CALLERID", NULL, -1);
991	<	add_isupport("CASEMAPPING", CASEMAP, -1);
991	>	add_isupport("CASEMAPPING", "rfc1459", -1);
992		add_isupport("DEAF", "D", -1);
993		add_isupport("KICKLEN", NULL, KICKLEN);
994		add_isupport("MODES", NULL, MAXMODEPARAMS);
1316	–	#ifdef HALFOPS
995		add_isupport("PREFIX", "(ohv)@%+", -1);
996		add_isupport("STATUSMSG", "@%+", -1);
997	<	#else
998	<	add_isupport("PREFIX", "(ov)@+", -1);
1321	<	add_isupport("STATUSMSG", "@+", -1);
1322	<	#endif
997	>	add_isupport("EXCEPTS", NULL, -1);
998	>	add_isupport("INVEX", NULL, -1);
999		}
1000
1001		/*
#	Line 1334 | Line 1010 | init_isupport(void)
1010		void
1011		add_isupport(const char *name, const char *options, int n)
1012		{
1013	<	dlink_node *ptr;
1014	<	struct Isupport *support;
1013	>	dlink_node *node = NULL;
1014	>	struct Isupport *support = NULL;
1015
1016	<	DLINK_FOREACH(ptr, support_list.head)
1016	>	DLINK_FOREACH(node, support_list.head)
1017		{
1018	<	support = ptr->data;
1018	>	support = node->data;
1019		if (irccmp(support->name, name) == 0)
1020		{
1021		MyFree(support->name);
#	Line 1348 | Line 1024 | add_isupport(const char *name, const cha
1024		}
1025		}
1026
1027	<	if (ptr == NULL)
1027	>	if (node == NULL)
1028		{
1029	<	support = MyMalloc(sizeof(*support));
1029	>	support = MyCalloc(sizeof(*support));
1030		dlinkAddTail(support, &support->node, &support_list);
1031		}
1032
1033		support->name = xstrdup(name);
1034	<	if (options != NULL)
1034	>	if (options)
1035		support->options = xstrdup(options);
1036		support->number = n;
1037
#	Line 1372 | Line 1048 | add_isupport(const char *name, const cha
1048		void
1049		delete_isupport(const char *name)
1050		{
1051	<	dlink_node *ptr;
1376	<	struct Isupport *support;
1051	>	dlink_node *node = NULL;
1052
1053	<	DLINK_FOREACH(ptr, support_list.head)
1053	>	DLINK_FOREACH(node, support_list.head)
1054		{
1055	<	support = ptr->data;
1055	>	struct Isupport *support = node->data;
1056	>
1057		if (irccmp(support->name, name) == 0)
1058		{
1059	<	dlinkDelete(ptr, &support_list);
1059	>	dlinkDelete(node, &support_list);
1060		MyFree(support->name);
1061		MyFree(support->options);
1062		MyFree(support);
#	Line 1403 | Line 1079 | rebuild_isupport_message_line(void)
1079		{
1080		char isupportbuffer[IRCD_BUFSIZE];
1081		char *p = isupportbuffer;
1082	<	dlink_node *ptr = NULL;
1082	>	dlink_node *node = NULL, *node_next = NULL;
1083		int n = 0;
1084		int tokens = 0;
1085		size_t len = 0;
1086	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1086	>	size_t reserve = strlen(me.name) + HOSTLEN + strlen(numeric_form(RPL_ISUPPORT));
1087
1088	<	destroy_MessageLine(isupportFile);
1088	>	DLINK_FOREACH_SAFE(node, node_next, support_list_lines.head)
1089	>	{
1090	>	dlinkDelete(node, &support_list_lines);
1091	>	MyFree(node->data);
1092	>	free_dlink_node(node);
1093	>	}
1094
1095	<	DLINK_FOREACH(ptr, support_list.head)
1095	>	DLINK_FOREACH(node, support_list.head)
1096		{
1097	<	struct Isupport *support = ptr->data;
1097	>	struct Isupport *support = node->data;
1098
1099		p += (n = sprintf(p, "%s", support->name));
1100		len += n;
1101
1102	<	if (support->options != NULL)
1102	>	if (support->options)
1103		{
1104		p += (n = sprintf(p, "=%s", support->options));
1105		len += n;
#	Line 1439 | Line 1120 | rebuild_isupport_message_line(void)
1120		if (*--p == ' ')
1121		*p = '\0';
1122
1123	<	addto_MessageLine(isupportFile, isupportbuffer);
1123	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1124		p = isupportbuffer;
1125		len = 0;
1126		n = tokens = 0;
1127		}
1128		}
1129
1130	<	if (len != 0)
1130	>	if (len)
1131		{
1132		if (*--p == ' ')
1133		*p = '\0';
1134	<	addto_MessageLine(isupportFile, isupportbuffer);
1134	>	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1135		}
1136		}

Diff Legend

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