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 6904 by michael, Mon Dec 7 17:48:05 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 "id.h"
35		#include "irc_string.h"
35	–	#include "s_bsd.h"
36		#include "ircd.h"
37		#include "listener.h"
38		#include "motd.h"
39		#include "numeric.h"
40		#include "conf.h"
41		#include "log.h"
42	<	#include "s_serv.h"
42	>	#include "server.h"
43		#include "send.h"
44	–	#include "supported.h"
45	–	#include "whowas.h"
44		#include "memory.h"
45		#include "packet.h"
46		#include "rng_mt.h"
47		#include "userhost.h"
48	<	#include "hook.h"
51	<	#include "s_misc.h"
48	>	#include "misc.h"
49		#include "parse.h"
50		#include "watch.h"
51	<
51	>	#include "isupport.h"
52
53		static char umode_buffer[IRCD_BUFSIZE];
54
55	<	static void user_welcome(struct Client *);
56	<	static void report_and_set_user_flags(struct Client *, const struct MaskItem *);
60	<	static int check_xline(struct Client *);
61	<	static void introduce_client(struct Client *);
62	<	static const char *uid_get(void);
63	<
64	<	/* Used for building up the isupport string,
65	<	* used with init_isupport, add_isupport, delete_isupport
66	<	*/
67	<
68	<	struct Isupport
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	dlink_node node;
59	<	char *name;
60	<	char *options;
61	<	int number;
62	<	};
63	<
64	<	static dlink_list support_list = { NULL, NULL, 0 };
65	<	MessageFile *isupportFile;
66	<
67	<	/* memory is cheap. map 0-255 to equivalent mode */
68	<	const unsigned int user_modes[256] =
69	<	{
70	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
71	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
72	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
73	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
74	<	0,                  /* @ */
75	<	0,                  /* A */
76	<	0,                  /* B */
77	<	UMODE_CCONN_FULL,   /* C */
78	<	UMODE_DEAF,         /* D */
79	<	0,                  /* E */
80	<	UMODE_FARCONNECT,   /* F */
81	<	UMODE_SOFTCALLERID, /* G */
82	<	UMODE_HIDDEN,       /* H */
83	<	0,                  /* I */
84	<	0,                  /* J */
85	<	0,                  /* K */
86	<	0,                  /* L */
99	<	0,                  /* M */
100	<	0,                  /* N */
101	<	0,                  /* O */
102	<	0,                  /* P */
103	<	0,                  /* Q */
104	<	UMODE_REGONLY,      /* R */
105	<	0,                  /* S */
106	<	0,                  /* T */
107	<	0,                  /* U */
108	<	0,                  /* V */
109	<	0,                  /* W */
110	<	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 */
58	>	{ 'D', UMODE_DEAF         },
59	>	{ 'F', UMODE_FARCONNECT   },
60	>	{ 'G', UMODE_SOFTCALLERID },
61	>	{ 'H', UMODE_HIDDEN       },
62	>	{ 'R', UMODE_REGONLY      },
63	>	{ 'S', UMODE_SSL          },
64	>	{ 'W', UMODE_WEBIRC       },
65	>	{ 'a', UMODE_ADMIN        },
66	>	{ 'b', UMODE_BOTS         },
67	>	{ 'c', UMODE_CCONN        },
68	>	{ 'd', UMODE_DEBUG        },
69	>	{ 'e', UMODE_EXTERNAL     },
70	>	{ 'f', UMODE_FULL         },
71	>	{ 'g', UMODE_CALLERID     },
72	>	{ 'i', UMODE_INVISIBLE    },
73	>	{ 'j', UMODE_REJ          },
74	>	{ 'k', UMODE_SKILL        },
75	>	{ 'l', UMODE_LOCOPS       },
76	>	{ 'n', UMODE_NCHANGE      },
77	>	{ 'o', UMODE_OPER         },
78	>	{ 'p', UMODE_HIDECHANS    },
79	>	{ 'q', UMODE_HIDEIDLE     },
80	>	{ 'r', UMODE_REGISTERED   },
81	>	{ 's', UMODE_SERVNOTICE   },
82	>	{ 'u', UMODE_UNAUTH       },
83	>	{ 'w', UMODE_WALLOP       },
84	>	{ 'x', UMODE_HIDDENHOST   },
85	>	{ 'y', UMODE_SPY          },
86	>	{ '\0', 0 }
87		};
88
89		void
90	<	assemble_umode_buffer(void)
90	>	user_modes_init(void)
91		{
156	–	unsigned int idx = 0;
92		char *umode_buffer_ptr = umode_buffer;
93
94	<	for (; idx < (sizeof(user_modes) / sizeof(user_modes[0])); ++idx)
95	<	if (user_modes[idx])
96	<	*umode_buffer_ptr++ = idx;
94	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
95	>	{
96	>	umode_map[tab->c] = tab;
97	>	*umode_buffer_ptr++ = tab->c;
98	>	}
99
100		*umode_buffer_ptr = '\0';
101		}
#	Line 170 | Line 107 | assemble_umode_buffer(void)
107		* side effects - display to client user counts etc.
108		*/
109		void
110	<	show_lusers(struct Client *source_p)
110	>	show_lusers(struct Client *source_p)
111		{
112	<	const char *from, *to;
112	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115	>	else
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118	>
119	>	if (Count.oper)
120	>	sendto_one_numeric(source_p, &me, RPL_LUSEROP, Count.oper);
121	>
122	>	if (dlink_list_length(&unknown_list))
123	>	sendto_one_numeric(source_p, &me, RPL_LUSERUNKNOWN, dlink_list_length(&unknown_list));
124	>
125	>	if (dlink_list_length(&channel_list))
126	>	sendto_one_numeric(source_p, &me, RPL_LUSERCHANNELS, dlink_list_length(&channel_list));
127
128	<	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
128	>	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
130	<	from = me.id;
131	<	to = source_p->id;
130	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.local, Count.myserver);
131	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.local, Count.max_loc);
132		}
133		else
134		{
135	<	from = me.name;
136	<	to = source_p->name;
135	>	sendto_one_numeric(source_p, &me, RPL_LUSERME, Count.total, 0);
136	>	sendto_one_numeric(source_p, &me, RPL_LOCALUSERS, Count.total, Count.max_tot);
137		}
138
139	+	sendto_one_numeric(source_p, &me, RPL_GLOBALUSERS, Count.total, Count.max_tot);
140	+
141		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
142	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
143	<	from, to, (Count.total-Count.invisi),
191	<	Count.invisi, dlink_list_length(&global_serv_list));
192	<	else
193	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
194	<	(Count.total-Count.invisi), Count.invisi, 1);
142	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	>	Count.max_loc_cli, Count.totalrestartcount);
144
145	<	if (Count.oper > 0)
146	<	sendto_one(source_p, form_str(RPL_LUSEROP),
198	<	from, to, Count.oper);
199	<
200	<	if (dlink_list_length(&unknown_list) > 0)
201	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
202	<	from, to, dlink_list_length(&unknown_list));
203	<
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));
145	>	if (Count.local > Count.max_loc_cli)
146	>	Count.max_loc_cli = Count.local;
147
148	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
148	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
149	>	Count.max_loc_con = Count.local + Count.myserver;
150	>	}
151	>
152	>	/* report_and_set_user_flags()
153	>	*
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156	>	* output       - NONE
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159	>	*/
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162	>	{
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP");
166	>
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines");
172	>	}
173	>
174	>	if (IsConfExemptXline(conf))
175	>	{
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines");
178	>	}
179	>
180	>	if (IsConfExemptResv(conf))
181	>	{
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs");
184	>	}
185	>
186	>	/* If this user is exempt from user limits set it "F lined" */
187	>	if (IsConfExemptLimits(conf))
188		{
189	<	sendto_one(source_p, form_str(RPL_LUSERME),
190	<	from, to, Count.local, Count.myserver);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc);
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits");
191		}
192	+
193	+	if (IsConfCanFlood(conf))
194	+	{
195	+	AddFlag(source_p, FLAGS_CANFLOOD);
196	+	sendto_one_notice(source_p, &me, ":*** You are exempt from flood protection");
197	+	}
198	+	}
199	+
200	+	/* introduce_client()
201	+	*
202	+	* inputs       - source_p
203	+	* output       - NONE
204	+	* side effects - This common function introduces a client to the rest
205	+	*                of the net, either from a local client connect or
206	+	*                from a remote connect.
207	+	*/
208	+	static void
209	+	introduce_client(struct Client *source_p)
210	+	{
211	+	dlink_node *node = NULL;
212	+	char ubuf[IRCD_BUFSIZE] = "";
213	+
214	+	if (MyClient(source_p))
215	+	send_umode(source_p, source_p, 0, ubuf);
216		else
217	+	send_umode(NULL, source_p, 0, ubuf);
218	+
219	+	watch_check_hash(source_p, RPL_LOGON);
220	+
221	+	if (ubuf[0] == '\0')
222		{
223	<	sendto_one(source_p, form_str(RPL_LUSERME),
224	<	from, to, Count.total, 0);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot);
223	>	ubuf[0] = '+';
224	>	ubuf[1] = '\0';
225		}
226
227	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
228	<	from, to, Count.total, Count.max_tot);
227	>	DLINK_FOREACH(node, local_server_list.head)
228	>	{
229	>	struct Client *server = node->data;
230
231	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
232	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
228	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
231	>	if (server == source_p->from)
232	>	continue;
233
234	<	if (Count.local > Count.max_loc_cli)
235	<	Count.max_loc_cli = Count.local;
234	>	sendto_one(server, ":%s UID %s %u %ju %s %s %s %s %s %s :%s",
235	>	source_p->servptr->id,
236	>	source_p->name, source_p->hopcount+1,
237	>	source_p->tsinfo,
238	>	ubuf, source_p->username, source_p->host,
239	>	source_p->sockhost, source_p->id,
240	>	source_p->account,
241	>	source_p->info);
242
243	<	if ((Count.local + Count.myserver) > Count.max_loc_con)
244	<	Count.max_loc_con = Count.local + Count.myserver;
243	>	if (!EmptyString(source_p->certfp))
244	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
245	>	}
246		}
247
248	<	/* show_isupport()
248	>	/* user_welcome()
249		*
250	<	* inputs       - pointer to client
250	>	* inputs       - client pointer to client to welcome
251		* output       - NONE
252	<	* side effects - display to client what we support (for them)
252	>	* side effects -
253		*/
254	<	void
255	<	show_isupport(struct Client *source_p)
254	>	static void
255	>	user_welcome(struct Client *source_p)
256		{
257	<	send_message_file(source_p, isupportFile);
257	>	static const char built_date[] = __DATE__ " at " __TIME__;
258	>
259	>	#ifdef HAVE_LIBCRYPTO
260	>	if (HasFlag(source_p, FLAGS_SSL))
261	>	{
262	>	AddUMode(source_p, UMODE_SSL);
263	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
264	>	ssl_get_cipher(source_p->connection->fd.ssl));
265	>	}
266	>	#endif
267	>
268	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
269	>	source_p->name);
270	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
271	>	listener_get_name(source_p->connection->listener), ircd_version);
272	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
273	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
274	>
275	>	isupport_show(source_p);
276	>	show_lusers(source_p);
277	>	motd_signon(source_p);
278		}
279
280	<	/*
281	<	** register_local_user
282	<	**      This function is called when both NICK and USER messages
283	<	**      have been accepted for the client, in whatever order. Only
284	<	**      after this, is the USER message propagated.
285	<	**
286	<	**      NICK's must be propagated at once when received, although
287	<	**      it would be better to delay them too until full info is
288	<	**      available. Doing it is not so simple though, would have
289	<	**      to implement the following:
290	<	**
291	<	**      (actually it has been implemented already for a while) -orabidoo
292	<	**
293	<	**      1) user telnets in and gives only "NICK foobar" and waits
294	<	**      2) another user far away logs in normally with the nick
295	<	**         "foobar" (quite legal, as this server didn't propagate
296	<	**         it).
297	<	**      3) now this server gets nick "foobar" from outside, but
298	<	**         has alread the same defined locally. Current server
299	<	**         would just issue "KILL foobar" to clean out dups. But,
300	<	**         this is not fair. It should actually request another
301	<	**         nick from local user or kill him/her...
302	<	*/
280	>	/* check_xline()
281	>	*
282	>	* inputs       - pointer to client to test
283	>	* outupt       - 1 if exiting 0 if ok
284	>	* side effects -
285	>	*/
286	>	static int
287	>	check_xline(struct Client *source_p)
288	>	{
289	>	struct MaskItem *conf = NULL;
290	>
291	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
292	>	return 0;
293	>
294	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
295	>	{
296	>	++conf->count;
297	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
298	>	"X-line Rejecting [%s] [%s], user %s [%s]",
299	>	source_p->info, conf->reason,
300	>	get_client_name(source_p, HIDE_IP),
301	>	source_p->sockhost);
302	>
303	>	++ServerStats.is_ref;
304	>	exit_client(source_p, "Bad user info");
305	>	return 1;
306	>	}
307	>
308	>	return 0;
309	>	}
310	>
311	>	/*! \brief This function is called when both NICK and USER messages
312	>	*      have been accepted for the client, in whatever order. Only
313	>	*      after this, is the UID message propagated.
314	>	* \param source_p Pointer to given client to introduce
315	>	*/
316		void
317		register_local_user(struct Client *source_p)
318		{
319		const char *id = NULL;
320		const struct MaskItem *conf = NULL;
321
278	–	assert(source_p != NULL);
322		assert(source_p == source_p->from);
323		assert(MyConnect(source_p));
324	<	assert(!source_p->localClient->registration);
325	<
283	<	ClearCap(source_p, CAP_TS6);
324	>	assert(IsUnknown(source_p));
325	>	assert(!source_p->connection->registration);
326
327	<	if (ConfigFileEntry.ping_cookie)
327	>	if (ConfigGeneral.ping_cookie)
328		{
329	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
329	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
330		{
331		do
332	<	source_p->localClient->random_ping = genrand_int32();
333	<	while (!source_p->localClient->random_ping);
332	>	source_p->connection->random_ping = genrand_int32();
333	>	while (!source_p->connection->random_ping);
334
335	<	sendto_one(source_p, "PING :%u",
336	<	source_p->localClient->random_ping);
295	<	SetPingSent(source_p);
335	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
336	>	AddFlag(source_p, FLAGS_PINGSENT);
337		return;
338		}
339
340	<	if (!HasPingCookie(source_p))
340	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
341		return;
342		}
343
344	<	source_p->localClient->last_privmsg = CurrentTime;
344	>	source_p->connection->last_privmsg = CurrentTime;
345		/* Straight up the maximum rate of flooding... */
346	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
346	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
347
348		if (!check_client(source_p))
349		return;
350
351	<	if (valid_hostname(source_p->host) == 0)
351	>	if (!valid_hostname(source_p->host))
352		{
353	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
354	<	"character in your hostname", me.name, source_p->name);
355	<	strlcpy(source_p->host, source_p->sockhost,
315	<	sizeof(source_p->host));
353	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
354	>	"character in your hostname");
355	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
356		}
357
358	<	conf = source_p->localClient->confs.head->data;
358	>	conf = source_p->connection->confs.head->data;
359
360	<	if (!IsGotId(source_p))
360	>	if (!HasFlag(source_p, FLAGS_GOTID))
361		{
362	<	char username[USERLEN + 1];
323	<	const char *p = username;
362	>	char username[USERLEN + 1] = "";
363		unsigned int i = 0;
364
365		if (IsNeedIdentd(conf))
366		{
367		++ServerStats.is_ref;
368	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
369	<	"identd to use this server", me.name, source_p->name);
370	<	exit_client(source_p, &me, "Install identd");
368	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
369	>	"identd to use this server");
370	>	exit_client(source_p, "Install identd");
371		return;
372		}
373
#	Line 337 | Line 376 | register_local_user(struct Client *sourc
376		if (!IsNoTilde(conf))
377		source_p->username[i++] = '~';
378
379	<	for (; *p && i < USERLEN; ++p)
380	<	if (*p != '[')
342	<	source_p->username[i++] = *p;
379	>	for (const char *p = username; *p && i < USERLEN; ++p)
380	>	source_p->username[i++] = *p;
381
382		source_p->username[i] = '\0';
383		}
384
385	<	/* password check */
385	>	/* Password check */
386		if (!EmptyString(conf->passwd))
387		{
388	<	const char *pass = source_p->localClient->passwd;
351	<
352	<	if (!match_conf_password(pass, conf))
388	>	if (!match_conf_password(source_p->connection->password, conf))
389		{
390		++ServerStats.is_ref;
391	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
392	<	me.name, source_p->name);
393	<	exit_client(source_p, &me, "Bad Password");
391	>
392	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
393	>	exit_client(source_p, "Bad Password");
394		return;
395		}
396		}
397
398	<	/* don't free source_p->localClient->passwd here - it can be required
399	<	* by masked /stats I if there are auth{} blocks with need_password = no;
398	>	/*
399	>	* Don't free source_p->connection->password here - it can be required
400	>	* by masked /stats I if there are auth {} blocks with need_password = no;
401		* --adx
402		*/
403
404	<	/* report if user has &^>= etc. and set flags as needed in source_p */
404	>	/*
405	>	* Report if user has &^>= etc. and set flags as needed in source_p
406	>	*/
407		report_and_set_user_flags(source_p, conf);
408
409		if (IsDead(source_p))
410		return;
411
412	<	/* Limit clients -
412	>	/*
413	>	* Limit clients -
414		* We want to be able to have servers and F-line clients
415		* connect, so save room for "buffer" connections.
416		* Smaller servers may want to decrease this, and it should
417		* probably be just a percentage of the MAXCLIENTS...
418		*   -Taner
419		*/
420	<	/* Except "F:" clients */
421	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
420	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
421	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
422		{
423		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
424		"Too many clients, rejecting %s[%s].",
425		source_p->name, source_p->host);
426		++ServerStats.is_ref;
427	<	exit_client(source_p, &me, "Sorry, server is full - try later");
427	>	exit_client(source_p, "Sorry, server is full - try later");
428		return;
429		}
430
431	<	/* valid user name check */
393	<	if (valid_username(source_p->username, 1) == 0)
431	>	if (!valid_username(source_p->username, 1))
432		{
433	<	char tmpstr2[IRCD_BUFSIZE];
433	>	char buf[IRCD_BUFSIZE] = "";
434
435		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
436		"Invalid username: %s (%s@%s)",
437		source_p->name, source_p->username, source_p->host);
438		++ServerStats.is_ref;
439	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
440	<	source_p->username);
403	<	exit_client(source_p, &me, tmpstr2);
439	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
440	>	exit_client(source_p, buf);
441		return;
442		}
443
444		if (check_xline(source_p))
445		return;
446
447	<	while (hash_find_id((id = uid_get())) != NULL)
447	>	while (hash_find_id((id = uid_get())))
448		;
449
450		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 416 | Line 453 | register_local_user(struct Client *sourc
453		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
454		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
455		source_p->name, source_p->username, source_p->host,
456	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
457	<	"255.255.255.255" : source_p->sockhost,
421	<	get_client_class(&source_p->localClient->confs),
456	>	source_p->sockhost,
457	>	get_client_class(&source_p->connection->confs),
458		source_p->info, source_p->id);
459
460	<	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)
460	>	if (ConfigGeneral.invisible_on_connect)
461		{
462		AddUMode(source_p, UMODE_INVISIBLE);
463		++Count.invisi;
464		}
465
466	<	if ((++Count.local) > Count.max_loc)
466	>	if (++Count.local > Count.max_loc)
467		{
468		Count.max_loc = Count.local;
469
470		if (!(Count.max_loc % 10))
471	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
472	<	"New Max Local Clients: %d",
471	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
472	>	"New maximum local client connections: %u",
473		Count.max_loc);
474		}
475
453	–	/* Increment our total user count here */
476		if (++Count.total > Count.max_tot)
477		Count.max_tot = Count.total;
478		++Count.totalrestartcount;
#	Line 458 | Line 480 | register_local_user(struct Client *sourc
480		assert(source_p->servptr == &me);
481		SetClient(source_p);
482		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
483	<
462	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
483	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
484
485		assert(dlinkFind(&unknown_list, source_p));
486
487	<	dlink_move_node(&source_p->localClient->lclient_node,
487	>	dlink_move_node(&source_p->connection->lclient_node,
488		&unknown_list, &local_client_list);
489
490		user_welcome(source_p);
491	<	add_user_host(source_p->username, source_p->host, 0);
492	<	SetUserHost(source_p);
491	>	userhost_add(source_p->username, source_p->host, 0);
492	>	AddFlag(source_p, FLAGS_USERHOST);
493
494		introduce_client(source_p);
495		}
#	Line 479 | Line 500 | register_local_user(struct Client *sourc
500		*              - username to register as
501		*              - host name to register as
502		*              - server name
482	–	*              - realname (gecos)
503		* output       - NONE
504		* side effects - This function is called when a remote client
505		*                is introduced by a server.
506		*/
507		void
508	<	register_remote_user(struct Client *source_p,
489	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
508	>	register_remote_user(struct Client *source_p)
509		{
510	<	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	<	}
510	>	const struct Client *target_p = NULL;
511
512		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
513		{
#	Line 527 | Line 516 | register_remote_user(struct Client *sour
516		source_p->from->name, source_p->name, source_p->username,
517		source_p->host, source_p->servptr->name,
518		target_p->name, target_p->from->name);
519	<	kill_client(source_p->from, source_p,
520	<	"%s (NICK from wrong direction (%s != %s))",
521	<	me.name, source_p->servptr->name, target_p->from->name);
519	>	sendto_one(source_p->from,
520	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
521	>	me.id, source_p->id, me.name, source_p->servptr->name,
522	>	target_p->from->name);
523	>
524		AddFlag(source_p, FLAGS_KILLED);
525	<	exit_client(source_p, &me, "USER server wrong direction");
525	>	exit_client(source_p, "UID server wrong direction");
526		return;
527		}
528
#	Line 542 | Line 533 | register_remote_user(struct Client *sour
533		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
534		AddFlag(source_p, FLAGS_SERVICE);
535
545	–	/* Increment our total user count here */
536		if (++Count.total > Count.max_tot)
537		Count.max_tot = Count.total;
538
539		SetClient(source_p);
540		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
541	<	add_user_host(source_p->username, source_p->host, 1);
542	<	SetUserHost(source_p);
541	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
542	>	userhost_add(source_p->username, source_p->host, 1);
543	>	AddFlag(source_p, FLAGS_USERHOST);
544
545		if (HasFlag(source_p->servptr, FLAGS_EOB))
546		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
547	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
547	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
548		source_p->servptr->name,
549		source_p->name, source_p->username, source_p->host,
550	<	source_p->info, source_p->id);
550	>	source_p->sockhost, source_p->info, source_p->id);
551
552		introduce_client(source_p);
553		}
554
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	–
555		/* valid_hostname()
556		*
557		* Inputs       - pointer to hostname
#	Line 650 | Line 566 | valid_hostname(const char *hostname)
566		{
567		const char *p = hostname;
568
569	<	assert(p != NULL);
569	>	assert(p);
570
571	<	if (*p == '.' || *p == ':')
571	>	if (EmptyString(p) || *p == '.' || *p == ':')
572		return 0;
573
574		for (; *p; ++p)
#	Line 676 | Line 592 | valid_hostname(const char *hostname)
592		int
593		valid_username(const char *username, const int local)
594		{
679	–	int dots      = 0;
595		const char *p = username;
596
597	<	assert(p != NULL);
597	>	assert(p);
598
599		if (*p == '~')
600		++p;
#	Line 694 | Line 609 | valid_username(const char *username, con
609
610		if (local)
611		{
612	+	unsigned int dots = 0;
613	+
614		while (*++p)
615		{
616	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
616	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
617		{
618	<	if (++dots > ConfigFileEntry.dots_in_ident)
618	>	if (++dots > ConfigGeneral.dots_in_ident)
619		return 0;
620		if (!IsUserChar(*(p + 1)))
621		return 0;
#	Line 714 | Line 631 | valid_username(const char *username, con
631		return 0;
632		}
633
634	<	return  p - username <= USERLEN;;
634	>	return p - username <= USERLEN;
635		}
636
637		/* clean_nick_name()
#	Line 728 | Line 645 | int
645		valid_nickname(const char *nickname, const int local)
646		{
647		const char *p = nickname;
731	–	assert(nickname && *nickname);
648
649	<	/* nicks can't start with a digit or - or be 0 length */
650	<	/* This closer duplicates behaviour of hybrid-6 */
651	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
649	>	assert(p);
650	>
651	>	/*
652	>	* Nicks can't start with a digit or - or be 0 length.
653	>	*/
654	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
655		return 0;
656
657		for (; *p; ++p)
#	Line 742 | Line 661 | valid_nickname(const char *nickname, con
661		return p - nickname <= NICKLEN;
662		}
663
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	–
664		/* send_umode()
665		* send the MODE string for user (user) to connection client_p
666		* -avalon
#	Line 961 | Line 668 | set_user_mode(struct Client *client_p, s
668		* inputs       - client_p
669		*              - source_p
670		*              - int old
964	–	*              - sendmask mask of modes to send
671		*              - suplied umode_buf
672		* output       - NONE
673		*/
674		void
675		send_umode(struct Client *client_p, struct Client *source_p,
676	<	unsigned int old, unsigned int sendmask, char *umode_buf)
676	>	unsigned int old, char *umode_buf)
677		{
678		char *m = umode_buf;
679		int what = 0;
974	–	unsigned int i;
975	–	unsigned int flag;
680
681		/*
682	<	* build a string in umode_buf to represent the change in the user's
682	>	* Build a string in umode_buf to represent the change in the user's
683		* mode between the new (source_p->umodes) and 'old'.
684		*/
685	<	for (i = 0; i < 128; i++)
685	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
686		{
687	<	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))
687	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
688		{
689		if (what == MODE_DEL)
690	<	*m++ = (char)i;
690	>	*m++ = tab->c;
691		else
692		{
693		what = MODE_DEL;
694		*m++ = '-';
695	<	*m++ = (char)i;
695	>	*m++ = tab->c;
696		}
697		}
698	<	else if (!(flag & old) && HasUMode(source_p, flag))
698	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
699		{
700		if (what == MODE_ADD)
701	<	*m++ = (char)i;
701	>	*m++ = tab->c;
702		else
703		{
704		what = MODE_ADD;
705		*m++ = '+';
706	<	*m++ = (char)i;
706	>	*m++ = tab->c;
707		}
708		}
709		}
#	Line 1015 | Line 712 | send_umode(struct Client *client_p, stru
712
713		if (*umode_buf && client_p)
714		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
715	<	source_p->name, source_p->username,
716	<	source_p->host, source_p->name, umode_buf);
715	>	client_p->name, client_p->username,
716	>	client_p->host, client_p->name, umode_buf);
717		}
718
719		/* send_umode_out()
#	Line 1026 | Line 723 | send_umode(struct Client *client_p, stru
723		* side effects - Only send ubuf out to servers that know about this client
724		*/
725		void
726	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1030	<	unsigned int old)
726	>	send_umode_out(struct Client *source_p, unsigned int old)
727		{
728	<	char buf[IRCD_BUFSIZE] = { '\0' };
1033	<	dlink_node *ptr = NULL;
728	>	char buf[IRCD_BUFSIZE] = "";
729
730	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
730	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
731
732		if (buf[0])
733	<	{
734	<	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);
733	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
734	>	source_p->id, source_p->id, buf);
735		}
736
737		void
738	<	user_set_hostmask(struct Client *target_p, const char *hostname)
738	>	user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
739		{
740	<	if (!valid_hostname(hostname))
1058	<	return;
1059	<
1060	<	if (IsUserHostIp(target_p))
1061	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1062	<
1063	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
1064	<	SetIPSpoof(target_p);
1065	<
1066	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1067	<	SetUserHost(target_p);
1068	<
1069	<	if (MyClient(target_p))
1070	<	clear_ban_cache_client(target_p);
1071	<	}
740	>	dlink_node *node = NULL;
741
742	<	/* user_welcome()
743	<	*
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
1094	<
1095	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1096	<	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);
1104	<
1105	<	if (source_p->id[0] != '\0')
1106	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1107	<	source_p->name, source_p->id);
1108	<
1109	<	show_lusers(source_p);
742	>	if (!strcmp(target_p->host, hostname))
743	>	return;
744
745	<	if (ConfigFileEntry.short_motd)
745	>	switch (what)
746		{
747	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
748	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
749	<	sendto_one(source_p,
750	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
751	<	"read it", me.name, source_p->name);
752	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
753	<	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);
747	>	case MODE_ADD:
748	>	AddUMode(target_p, UMODE_HIDDENHOST);
749	>	break;
750	>	case MODE_DEL:
751	>	DelUMode(target_p, UMODE_HIDDENHOST);
752	>	break;
753	>	default: return;
754		}
1126	–	else
1127	–	send_message_file(source_p, &ConfigFileEntry.motd);
1128	–	}
755
756	<	/* check_xline()
757	<	*
758	<	* inputs       - pointer to client to test
1133	<	* outupt       - 1 if exiting 0 if ok
1134	<	* side effects -
1135	<	*/
1136	<	static int
1137	<	check_xline(struct Client *source_p)
1138	<	{
1139	<	struct MaskItem *conf = NULL;
1140	<	const char *reason = NULL;
756	>	if (ConfigGeneral.cycle_on_host_change)
757	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
758	>	target_p->name, target_p->username, target_p->host);
759
760	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
761	<	{
762	<	++conf->count;
760	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
761	>	target_p->name, target_p->username,
762	>	target_p->host, target_p->username, hostname);
763
764	<	if (conf->reason != NULL)
765	<	reason = conf->reason;
1148	<	else
1149	<	reason = "No Reason";
764	>	if (HasFlag(target_p, FLAGS_USERHOST))
765	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
766
767	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1152	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1153	<	source_p->info, reason,
1154	<	get_client_name(source_p, HIDE_IP),
1155	<	source_p->sockhost);
1156	<
1157	<	++ServerStats.is_ref;
1158	<	exit_client(source_p, &me, "Bad user info");
1159	<	return 1;
1160	<	}
1161	<
1162	<	return 0;
1163	<	}
1164	<
1165	<	/* oper_up()
1166	<	*
1167	<	* inputs       - pointer to given client to oper
1168	<	* output       - NONE
1169	<	* side effects - Blindly opers up given source_p, using conf info
1170	<	*                all checks on passwords have already been done.
1171	<	*                This could also be used by rsa oper routines.
1172	<	*/
1173	<	void
1174	<	oper_up(struct Client *source_p)
1175	<	{
1176	<	const unsigned int old = source_p->umodes;
1177	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1178	<
1179	<	assert(source_p->localClient->confs.head);
1180	<
1181	<	++Count.oper;
1182	<	SetOper(source_p);
1183	<
1184	<	if (conf->modes)
1185	<	AddUMode(source_p, conf->modes);
1186	<	else if (ConfigFileEntry.oper_umodes)
1187	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1188	<
1189	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1190	<	++Count.invisi;
1191	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1192	<	--Count.invisi;
1193	<
1194	<	assert(dlinkFind(&oper_list, source_p) == NULL);
1195	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1196	<
1197	<	AddOFlag(source_p, conf->port);
1198	<
1199	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1200	<	AddUMode(source_p, UMODE_ADMIN);
1201	<
1202	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1203	<	get_oper_name(source_p));
1204	<	send_umode_out(source_p, source_p, old);
1205	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1206	<	}
1207	<
1208	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1209	<
1210	<	int
1211	<	valid_sid(const char *sid)
1212	<	{
1213	<	if (strlen(sid) == IRC_MAXSID)
1214	<	if (IsDigit(*sid))
1215	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1216	<	return 1;
1217	<
1218	<	return 0;
1219	<	}
1220	<
1221	<	/*
1222	<	* init_uid()
1223	<	*
1224	<	* inputs       - NONE
1225	<	* output       - NONE
1226	<	* side effects - new_uid is filled in with server id portion (sid)
1227	<	*                (first 3 bytes) or defaulted to 'A'.
1228	<	*                Rest is filled in with 'A'
1229	<	*/
1230	<	void
1231	<	init_uid(void)
1232	<	{
1233	<	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));
767	>	strlcpy(target_p->host, hostname, sizeof(target_p->host));
768
769	<	for (i = 0; i < IRC_MAXSID; ++i)
770	<	if (new_uid[i] == '\0')
1242	<	new_uid[i] = 'A';
769	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
770	>	AddFlag(target_p, FLAGS_USERHOST);
771
772	<	/* 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);
1250	<	}
1251	<
1252	<	/*
1253	<	* add_one_to_uid
1254	<	*
1255	<	* inputs       - index number into new_uid
1256	<	* output       - NONE
1257	<	* side effects - new_uid is incremented by one
1258	<	*                note this is a recursive function
1259	<	*/
1260	<	static void
1261	<	add_one_to_uid(int i)
1262	<	{
1263	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
772	>	if (MyConnect(target_p))
773		{
774	<	if (new_uid[i] == 'Z')
775	<	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];
1274	<	}
1275	<	else
1276	<	{
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];
774	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
775	>	clear_ban_cache_client(target_p);
776		}
1283	–	}
777
778	<	/*
779	<	* uid_get
1287	<	*
1288	<	* inputs       - struct Client *
1289	<	* output       - new UID is returned to caller
1290	<	* side effects - new_uid is incremented by one.
1291	<	*/
1292	<	static const char *
1293	<	uid_get(void)
1294	<	{
1295	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1296	<	return new_uid;
1297	<	}
1298	<
1299	<	/*
1300	<	* init_isupport()
1301	<	*
1302	<	* input        - NONE
1303	<	* output       - NONE
1304	<	* side effects - Must be called before isupport is enabled
1305	<	*/
1306	<	void
1307	<	init_isupport(void)
1308	<	{
1309	<	isupportFile = init_MessageLine();
1310	<
1311	<	add_isupport("CALLERID", NULL, -1);
1312	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1313	<	add_isupport("DEAF", "D", -1);
1314	<	add_isupport("KICKLEN", NULL, KICKLEN);
1315	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1316	<	#ifdef HALFOPS
1317	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1318	<	add_isupport("STATUSMSG", "@%+", -1);
1319	<	#else
1320	<	add_isupport("PREFIX", "(ov)@+", -1);
1321	<	add_isupport("STATUSMSG", "@+", -1);
1322	<	#endif
1323	<	}
1324	<
1325	<	/*
1326	<	* add_isupport()
1327	<	*
1328	<	* input        - name of supported function
1329	<	*              - options if any
1330	<	*              - number if any
1331	<	* output       - NONE
1332	<	* side effects - Each supported item must call this when activated
1333	<	*/
1334	<	void
1335	<	add_isupport(const char *name, const char *options, int n)
1336	<	{
1337	<	dlink_node *ptr;
1338	<	struct Isupport *support;
778	>	if (!ConfigGeneral.cycle_on_host_change)
779	>	return;
780
781	<	DLINK_FOREACH(ptr, support_list.head)
781	>	DLINK_FOREACH(node, target_p->channel.head)
782		{
783	<	support = ptr->data;
784	<	if (irccmp(support->name, name) == 0)
785	<	{
786	<	MyFree(support->name);
787	<	MyFree(support->options);
1347	<	break;
1348	<	}
1349	<	}
783	>	char modebuf[CMEMBER_STATUS_FLAGS_LEN + 1];
784	>	char nickbuf[CMEMBER_STATUS_FLAGS_LEN * NICKLEN + CMEMBER_STATUS_FLAGS_LEN] = "";
785	>	char *p = modebuf;
786	>	int len = 0;
787	>	const struct Membership *member = node->data;
788
789	<	if (ptr == NULL)
1352	<	{
1353	<	support = MyMalloc(sizeof(*support));
1354	<	dlinkAddTail(support, &support->node, &support_list);
1355	<	}
1356	<
1357	<	support->name = xstrdup(name);
1358	<	if (options != NULL)
1359	<	support->options = xstrdup(options);
1360	<	support->number = n;
1361	<
1362	<	rebuild_isupport_message_line();
1363	<	}
1364	<
1365	<	/*
1366	<	* delete_isupport()
1367	<	*
1368	<	* input        - name of supported function
1369	<	* output       - NONE
1370	<	* side effects - Each supported item must call this when deactivated
1371	<	*/
1372	<	void
1373	<	delete_isupport(const char *name)
1374	<	{
1375	<	dlink_node *ptr;
1376	<	struct Isupport *support;
1377	<
1378	<	DLINK_FOREACH(ptr, support_list.head)
1379	<	{
1380	<	support = ptr->data;
1381	<	if (irccmp(support->name, name) == 0)
789	>	if (has_member_flags(member, CHFL_CHANOP))
790		{
791	<	dlinkDelete(ptr, &support_list);
792	<	MyFree(support->name);
1385	<	MyFree(support->options);
1386	<	MyFree(support);
1387	<	break;
791	>	*p++ = 'o';
792	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
793		}
1389	–	}
1390	–
1391	–	rebuild_isupport_message_line();
1392	–	}
1393	–
1394	–	/*
1395	–	* rebuild_isupport_message_line
1396	–	*
1397	–	* input        - NONE
1398	–	* output       - NONE
1399	–	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1400	–	*/
1401	–	void
1402	–	rebuild_isupport_message_line(void)
1403	–	{
1404	–	char isupportbuffer[IRCD_BUFSIZE];
1405	–	char *p = isupportbuffer;
1406	–	dlink_node *ptr = NULL;
1407	–	int n = 0;
1408	–	int tokens = 0;
1409	–	size_t len = 0;
1410	–	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1411	–
1412	–	destroy_MessageLine(isupportFile);
1413	–
1414	–	DLINK_FOREACH(ptr, support_list.head)
1415	–	{
1416	–	struct Isupport *support = ptr->data;
794
795	<	p += (n = sprintf(p, "%s", support->name));
1419	<	len += n;
1420	<
1421	<	if (support->options != NULL)
795	>	if (has_member_flags(member, CHFL_HALFOP))
796		{
797	<	p += (n = sprintf(p, "=%s", support->options));
798	<	len += n;
797	>	*p++ = 'h';
798	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
799		}
800
801	<	if (support->number > 0)
801	>	if (has_member_flags(member, CHFL_VOICE))
802		{
803	<	p += (n = sprintf(p, "=%d", support->number));
804	<	len += n;
803	>	*p++ = 'v';
804	>	len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
805		}
806
1433	–	*p++ = ' ';
1434	–	len++;
807		*p = '\0';
808
809	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
810	<	{ /* arbritrary for now */
811	<	if (*--p == ' ')
812	<	*p = '\0';
813	<
814	<	addto_MessageLine(isupportFile, isupportbuffer);
815	<	p = isupportbuffer;
816	<	len = 0;
817	<	n = tokens = 0;
818	<	}
819	<	}
820	<
821	<	if (len != 0)
822	<	{
823	<	if (*--p == ' ')
824	<	*p = '\0';
825	<	addto_MessageLine(isupportFile, isupportbuffer);
826	<	}
809	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
810	>	target_p->name, target_p->username,
811	>	target_p->host, member->chptr->name,
812	>	target_p->account, target_p->info);
813	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
814	>	target_p->name, target_p->username,
815	>	target_p->host, member->chptr->name);
816	>
817	>	if (nickbuf[0])
818	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
819	>	target_p->servptr->name, member->chptr->name,
820	>	modebuf, nickbuf);
821	>	}
822	>
823	>	if (target_p->away[0])
824	>	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
825	>	":%s!%s@%s AWAY :%s",
826	>	target_p->name, target_p->username,
827	>	target_p->host, target_p->away);
828		}

Diff Legend

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