ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/ircd-hybrid/branches/8.2.x/src/user.c

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2143 by michael, Thu May 30 01:12:38 2013 UTC vs.
ircd-hybrid/branches/8.2.x/src/user.c (file contents), Revision 6253 by michael, Fri Jul 10 15:32:36 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
69	<	{
70	<	dlink_node node;
71	<	char *name;
72	<	char *options;
73	<	int number;
74	<	};
75	<
76	<	static dlink_list support_list = { NULL, NULL, 0 };
77	<	MessageFile *isupportFile;
78	<
79	<	/* memory is cheap. map 0-255 to equivalent mode */
80	<	const unsigned int user_modes[256] =
55	>	const struct user_modes *umode_map[256];
56	>	const struct user_modes  umode_tab[] =
57		{
58	<	/* 0x00 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x0F */
59	<	/* 0x10 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x1F */
60	<	/* 0x20 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x2F */
61	<	/* 0x30 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x3F */
62	<	0,                  /* @ */
63	<	0,                  /* A */
64	<	0,                  /* B */
65	<	UMODE_CCONN_FULL,   /* C */
66	<	UMODE_DEAF,         /* D */
67	<	0,                  /* E */
68	<	UMODE_FARCONNECT,   /* F */
69	<	UMODE_SOFTCALLERID, /* G */
70	<	UMODE_HIDDEN,       /* H */
71	<	0,                  /* I */
72	<	0,                  /* J */
73	<	0,                  /* K */
74	<	0,                  /* L */
75	<	0,                  /* M */
76	<	0,                  /* N */
77	<	0,                  /* O */
78	<	0,                  /* P */
79	<	0,                  /* Q */
80	<	UMODE_REGONLY,      /* R */
81	<	0,                  /* S */
82	<	0,                  /* T */
83	<	0,                  /* U */
84	<	0,                  /* V */
85	<	0,                  /* W */
86	<	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	<	UMODE_HIDDENHOST,   /* 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 (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
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 (!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. Congrats.");
166	>
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	SetExemptKline(source_p);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172	>	}
173	>
174	>	if (IsConfExemptXline(conf))
175		{
176	<	sendto_one(source_p, form_str(RPL_LUSERME),
177	<	from, to, Count.local, Count.myserver);
212	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
213	<	from, to, Count.local, Count.max_loc);
176	>	SetExemptXline(source_p);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178		}
179	+
180	+	if (IsConfExemptResv(conf))
181	+	{
182	+	SetExemptResv(source_p);
183	+	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	+	}
185	+
186	+	/* If this user is exempt from user limits set it "F lined" */
187	+	if (IsConfExemptLimits(conf))
188	+	{
189	+	SetExemptLimits(source_p);
190	+	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	+	}
192	+
193	+	if (IsConfCanFlood(conf))
194	+	{
195	+	SetCanFlood(source_p);
196	+	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	+	"protection, aren't you fearsome.");
198	+	}
199	+	}
200	+
201	+	/* introduce_client()
202	+	*
203	+	* inputs       - source_p
204	+	* output       - NONE
205	+	* side effects - This common function introduces a client to the rest
206	+	*                of the net, either from a local client connect or
207	+	*                from a remote connect.
208	+	*/
209	+	static void
210	+	introduce_client(struct Client *source_p)
211	+	{
212	+	dlink_node *node = NULL;
213	+	char ubuf[IRCD_BUFSIZE] = "";
214	+
215	+	if (MyClient(source_p))
216	+	send_umode(source_p, source_p, 0, ubuf);
217		else
218	+	send_umode(NULL, source_p, 0, ubuf);
219	+
220	+	watch_check_hash(source_p, RPL_LOGON);
221	+
222	+	if (ubuf[0] == '\0')
223		{
224	<	sendto_one(source_p, form_str(RPL_LUSERME),
225	<	from, to, Count.total, 0);
219	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
220	<	from, to, Count.total, Count.max_tot);
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226		}
227
228	<	sendto_one(source_p, form_str(RPL_GLOBALUSERS),
229	<	from, to, Count.total, Count.max_tot);
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231
232	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
233	<	sendto_one(source_p, form_str(RPL_STATSCONN), from, to,
228	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
232	>	if (server == source_p->from)
233	>	continue;
234
235	<	if (Count.local > Count.max_loc_cli)
236	<	Count.max_loc_cli = Count.local;
235	>	if (IsCapable(server, CAP_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	(unsigned long)source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244	>	else
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246	>	source_p->servptr->id,
247	>	source_p->name, source_p->hopcount+1,
248	>	(unsigned long)source_p->tsinfo,
249	>	ubuf, source_p->username, source_p->host,
250	>	source_p->sockhost, source_p->id, source_p->info);
251
252	<	if ((Count.local + Count.myserver) > Count.max_loc_con)
253	<	Count.max_loc_con = Count.local + Count.myserver;
252	>	if (!EmptyString(source_p->certfp))
253	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
254	>	}
255		}
256
257	<	/* show_isupport()
257	>	/* user_welcome()
258		*
259	<	* inputs       - pointer to client
259	>	* inputs       - client pointer to client to welcome
260		* output       - NONE
261	<	* side effects - display to client what we support (for them)
261	>	* side effects -
262		*/
263	<	void
264	<	show_isupport(struct Client *source_p)
263	>	static void
264	>	user_welcome(struct Client *source_p)
265		{
266	<	send_message_file(source_p, isupportFile);
266	>	#if defined(__TIME__) && defined(__DATE__)
267	>	static const char built_date[] = __DATE__ " at " __TIME__;
268	>	#else
269	>	static const char built_date[] = "unknown";
270	>	#endif
271	>
272	>	#ifdef HAVE_LIBCRYPTO
273	>	if (HasFlag(source_p, FLAGS_SSL))
274	>	{
275	>	AddUMode(source_p, UMODE_SSL);
276	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
277	>	ssl_get_cipher(source_p->connection->fd.ssl));
278	>	}
279	>	#endif
280	>
281	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
282	>	source_p->name);
283	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
284	>	get_listener_name(source_p->connection->listener), ircd_version);
285	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
286	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
287	>
288	>	isupport_show(source_p);
289	>	show_lusers(source_p);
290	>	motd_signon(source_p);
291		}
292
293	<	/*
294	<	** register_local_user
295	<	**      This function is called when both NICK and USER messages
296	<	**      have been accepted for the client, in whatever order. Only
297	<	**      after this, is the USER message propagated.
298	<	**
299	<	**      NICK's must be propagated at once when received, although
300	<	**      it would be better to delay them too until full info is
301	<	**      available. Doing it is not so simple though, would have
302	<	**      to implement the following:
303	<	**
304	<	**      (actually it has been implemented already for a while) -orabidoo
305	<	**
306	<	**      1) user telnets in and gives only "NICK foobar" and waits
307	<	**      2) another user far away logs in normally with the nick
308	<	**         "foobar" (quite legal, as this server didn't propagate
309	<	**         it).
310	<	**      3) now this server gets nick "foobar" from outside, but
311	<	**         has alread the same defined locally. Current server
312	<	**         would just issue "KILL foobar" to clean out dups. But,
313	<	**         this is not fair. It should actually request another
314	<	**         nick from local user or kill him/her...
315	<	*/
293	>	/* check_xline()
294	>	*
295	>	* inputs       - pointer to client to test
296	>	* outupt       - 1 if exiting 0 if ok
297	>	* side effects -
298	>	*/
299	>	static int
300	>	check_xline(struct Client *source_p)
301	>	{
302	>	struct MaskItem *conf = NULL;
303	>
304	>	if (IsExemptXline(source_p))
305	>	return 0;
306	>
307	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
308	>	{
309	>	++conf->count;
310	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
311	>	"X-line Rejecting [%s] [%s], user %s [%s]",
312	>	source_p->info, conf->reason,
313	>	get_client_name(source_p, HIDE_IP),
314	>	source_p->sockhost);
315	>
316	>	++ServerStats.is_ref;
317	>	exit_client(source_p, "Bad user info");
318	>	return 1;
319	>	}
320	>
321	>	return 0;
322	>	}
323	>
324	>	/*! \brief This function is called when both NICK and USER messages
325	>	*      have been accepted for the client, in whatever order. Only
326	>	*      after this, is the UID message propagated.
327	>	* \param source_p Pointer to given client to introduce
328	>	*/
329		void
330		register_local_user(struct Client *source_p)
331		{
332		const char *id = NULL;
333		const struct MaskItem *conf = NULL;
334
278	–	assert(source_p != NULL);
335		assert(source_p == source_p->from);
336		assert(MyConnect(source_p));
337	<	assert(!source_p->localClient->registration);
337	>	assert(IsUnknown(source_p));
338	>	assert(!source_p->connection->registration);
339
340	<	ClearCap(source_p, CAP_TS6);
284	<
285	<	if (ConfigFileEntry.ping_cookie)
340	>	if (ConfigGeneral.ping_cookie)
341		{
342	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
342	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
343		{
344		do
345	<	source_p->localClient->random_ping = genrand_int32();
346	<	while (!source_p->localClient->random_ping);
345	>	source_p->connection->random_ping = genrand_int32();
346	>	while (!source_p->connection->random_ping);
347
348	<	sendto_one(source_p, "PING :%u",
294	<	source_p->localClient->random_ping);
348	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
349		SetPingSent(source_p);
350		return;
351		}
#	Line 300 | Line 354 | register_local_user(struct Client *sourc
354		return;
355		}
356
357	<	source_p->localClient->last_privmsg = CurrentTime;
357	>	source_p->connection->last_privmsg = CurrentTime;
358		/* Straight up the maximum rate of flooding... */
359	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
359	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
360
361		if (!check_client(source_p))
362		return;
363
364	<	if (valid_hostname(source_p->host) == 0)
364	>	if (!valid_hostname(source_p->host))
365		{
366	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
367	<	"character in your hostname", me.name, source_p->name);
368	<	strlcpy(source_p->host, source_p->sockhost,
315	<	sizeof(source_p->host));
366	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
367	>	"character in your hostname");
368	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
369		}
370
371	<	conf = source_p->localClient->confs.head->data;
371	>	conf = source_p->connection->confs.head->data;
372
373		if (!IsGotId(source_p))
374		{
375	<	char username[USERLEN + 1];
375	>	char username[USERLEN + 1] = "";
376		const char *p = username;
377		unsigned int i = 0;
378
379		if (IsNeedIdentd(conf))
380		{
381		++ServerStats.is_ref;
382	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
383	<	"identd to use this server", me.name, source_p->name);
384	<	exit_client(source_p, &me, "Install identd");
382	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
383	>	"identd to use this server");
384	>	exit_client(source_p, "Install identd");
385		return;
386		}
387
#	Line 338 | Line 391 | register_local_user(struct Client *sourc
391		source_p->username[i++] = '~';
392
393		for (; *p && i < USERLEN; ++p)
394	<	if (*p != '[')
342	<	source_p->username[i++] = *p;
394	>	source_p->username[i++] = *p;
395
396		source_p->username[i] = '\0';
397		}
398
399	<	/* password check */
399	>	/* Password check */
400		if (!EmptyString(conf->passwd))
401		{
402	<	const char *pass = source_p->localClient->passwd;
351	<
352	<	if (!match_conf_password(pass, conf))
402	>	if (!match_conf_password(source_p->connection->password, conf))
403		{
404		++ServerStats.is_ref;
405	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
406	<	me.name, source_p->name);
407	<	exit_client(source_p, &me, "Bad Password");
405	>
406	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
407	>	exit_client(source_p, "Bad Password");
408		return;
409		}
410		}
411
412	<	/* don't free source_p->localClient->passwd here - it can be required
413	<	* by masked /stats I if there are auth{} blocks with need_password = no;
412	>	/*
413	>	* Don't free source_p->connection->password here - it can be required
414	>	* by masked /stats I if there are auth {} blocks with need_password = no;
415		* --adx
416		*/
417
418	<	/* report if user has &^>= etc. and set flags as needed in source_p */
418	>	/*
419	>	* Report if user has &^>= etc. and set flags as needed in source_p
420	>	*/
421		report_and_set_user_flags(source_p, conf);
422
423		if (IsDead(source_p))
424		return;
425
426	<	/* Limit clients -
426	>	/*
427	>	* Limit clients -
428		* We want to be able to have servers and F-line clients
429		* connect, so save room for "buffer" connections.
430		* Smaller servers may want to decrease this, and it should
431		* probably be just a percentage of the MAXCLIENTS...
432		*   -Taner
433		*/
434	<	/* Except "F:" clients */
435	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
382	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
434	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
435	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
436		{
437		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
438		"Too many clients, rejecting %s[%s].",
439		source_p->name, source_p->host);
440		++ServerStats.is_ref;
441	<	exit_client(source_p, &me, "Sorry, server is full - try later");
441	>	exit_client(source_p, "Sorry, server is full - try later");
442		return;
443		}
444
445	<	/* valid user name check */
393	<	if (valid_username(source_p->username, 1) == 0)
445	>	if (!valid_username(source_p->username, 1))
446		{
447	<	char tmpstr2[IRCD_BUFSIZE];
447	>	char buf[IRCD_BUFSIZE] = "";
448
449		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
450		"Invalid username: %s (%s@%s)",
451		source_p->name, source_p->username, source_p->host);
452		++ServerStats.is_ref;
453	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
454	<	source_p->username);
403	<	exit_client(source_p, &me, tmpstr2);
453	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
454	>	exit_client(source_p, buf);
455		return;
456		}
457
458		if (check_xline(source_p))
459		return;
460
461	<	while (hash_find_id((id = uid_get())) != NULL)
461	>	while (hash_find_id((id = uid_get())))
462		;
463
464		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 416 | Line 467 | register_local_user(struct Client *sourc
467		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
468		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
469		source_p->name, source_p->username, source_p->host,
470	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
471	<	"255.255.255.255" : source_p->sockhost,
421	<	get_client_class(&source_p->localClient->confs),
470	>	source_p->sockhost,
471	>	get_client_class(&source_p->connection->confs),
472		source_p->info, source_p->id);
473
474	<	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)
474	>	if (ConfigGeneral.invisible_on_connect)
475		{
476		AddUMode(source_p, UMODE_INVISIBLE);
477		++Count.invisi;
478		}
479
480	<	if ((++Count.local) > Count.max_loc)
480	>	if (++Count.local > Count.max_loc)
481		{
482		Count.max_loc = Count.local;
483
484		if (!(Count.max_loc % 10))
485		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
486	<	"New Max Local Clients: %d",
486	>	"New maximum local client connections: %u",
487		Count.max_loc);
488		}
489
453	–	/* Increment our total user count here */
490		if (++Count.total > Count.max_tot)
491		Count.max_tot = Count.total;
492		++Count.totalrestartcount;
#	Line 458 | Line 494 | register_local_user(struct Client *sourc
494		assert(source_p->servptr == &me);
495		SetClient(source_p);
496		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
497	<
462	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
497	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
498
499		assert(dlinkFind(&unknown_list, source_p));
500
501	<	dlink_move_node(&source_p->localClient->lclient_node,
501	>	dlink_move_node(&source_p->connection->lclient_node,
502		&unknown_list, &local_client_list);
503
504		user_welcome(source_p);
#	Line 479 | Line 514 | register_local_user(struct Client *sourc
514		*              - username to register as
515		*              - host name to register as
516		*              - server name
482	–	*              - realname (gecos)
517		* output       - NONE
518		* side effects - This function is called when a remote client
519		*                is introduced by a server.
520		*/
521		void
522	<	register_remote_user(struct Client *source_p,
489	<	const char *username, const char *host, const char *server,
490	<	const char *realname)
522	>	register_remote_user(struct Client *source_p)
523		{
524	<	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	<	}
524	>	const struct Client *target_p = NULL;
525
526		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
527		{
#	Line 527 | Line 530 | register_remote_user(struct Client *sour
530		source_p->from->name, source_p->name, source_p->username,
531		source_p->host, source_p->servptr->name,
532		target_p->name, target_p->from->name);
533	<	kill_client(source_p->from, source_p,
534	<	"%s (NICK from wrong direction (%s != %s))",
535	<	me.name, source_p->servptr->name, target_p->from->name);
533	>	sendto_one(source_p->from,
534	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
535	>	me.id, source_p->id, me.name, source_p->servptr->name,
536	>	target_p->from->name);
537	>
538		AddFlag(source_p, FLAGS_KILLED);
539	<	exit_client(source_p, &me, "USER server wrong direction");
539	>	exit_client(source_p, "UID server wrong direction");
540		return;
541		}
542
#	Line 542 | Line 547 | register_remote_user(struct Client *sour
547		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
548		AddFlag(source_p, FLAGS_SERVICE);
549
545	–	/* Increment our total user count here */
550		if (++Count.total > Count.max_tot)
551		Count.max_tot = Count.total;
552
553		SetClient(source_p);
554		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
555	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
556		add_user_host(source_p->username, source_p->host, 1);
557		SetUserHost(source_p);
558
559		if (HasFlag(source_p->servptr, FLAGS_EOB))
560		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
561	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
561	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
562		source_p->servptr->name,
563		source_p->name, source_p->username, source_p->host,
564	<	source_p->info, source_p->id);
564	>	source_p->sockhost, source_p->info, source_p->id);
565
566		introduce_client(source_p);
567		}
568
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	–
569		/* valid_hostname()
570		*
571		* Inputs       - pointer to hostname
#	Line 650 | Line 580 | valid_hostname(const char *hostname)
580		{
581		const char *p = hostname;
582
583	<	assert(p != NULL);
583	>	assert(p);
584
585	<	if (*p == '.' || *p == ':')
585	>	if (EmptyString(p) || *p == '.' || *p == ':')
586		return 0;
587
588		for (; *p; ++p)
#	Line 676 | Line 606 | valid_hostname(const char *hostname)
606		int
607		valid_username(const char *username, const int local)
608		{
609	<	int dots      = 0;
609	>	unsigned int dots = 0;
610		const char *p = username;
611
612	<	assert(p != NULL);
612	>	assert(p);
613
614		if (*p == '~')
615		++p;
#	Line 696 | Line 626 | valid_username(const char *username, con
626		{
627		while (*++p)
628		{
629	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
629	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
630		{
631	<	if (++dots > ConfigFileEntry.dots_in_ident)
631	>	if (++dots > ConfigGeneral.dots_in_ident)
632		return 0;
633		if (!IsUserChar(*(p + 1)))
634		return 0;
#	Line 714 | Line 644 | valid_username(const char *username, con
644		return 0;
645		}
646
647	<	return  p - username <= USERLEN;;
647	>	return p - username <= USERLEN;
648		}
649
650		/* clean_nick_name()
#	Line 728 | Line 658 | int
658		valid_nickname(const char *nickname, const int local)
659		{
660		const char *p = nickname;
731	–	assert(nickname && *nickname);
661
662	<	/* nicks can't start with a digit or - or be 0 length */
663	<	/* This closer duplicates behaviour of hybrid-6 */
664	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
662	>	assert(p);
663	>
664	>	/*
665	>	* Nicks can't start with a digit or - or be 0 length.
666	>	*/
667	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
668		return 0;
669
670		for (; *p; ++p)
#	Line 742 | Line 674 | valid_nickname(const char *nickname, con
674		return p - nickname <= NICKLEN;
675		}
676
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	–	case 'x':  /* Only services may set +x */
907	–	break;
908	–
909	–	default:
910	–	if ((flag = user_modes[(unsigned char)*m]))
911	–	{
912	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
913	–	(ConfigFileEntry.oper_only_umodes & flag))
914	–	badflag = 1;
915	–	else
916	–	{
917	–	if (what == MODE_ADD)
918	–	AddUMode(source_p, flag);
919	–	else
920	–	DelUMode(source_p, flag);
921	–	}
922	–	}
923	–	else
924	–	{
925	–	if (MyConnect(source_p))
926	–	badflag = 1;
927	–	}
928	–
929	–	break;
930	–	}
931	–	}
932	–	}
933	–
934	–	if (badflag)
935	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
936	–	me.name, source_p->name);
937	–
938	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
939	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
940	–	{
941	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
942	–	me.name, source_p->name);
943	–	DelUMode(source_p, UMODE_ADMIN);
944	–	}
945	–
946	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
947	–	++Count.invisi;
948	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
949	–	--Count.invisi;
950	–
951	–	/*
952	–	* compare new flags with old flags and send string which
953	–	* will cause servers to update correctly.
954	–	*/
955	–	send_umode_out(client_p, source_p, setflags);
956	–	}
957	–
677		/* send_umode()
678		* send the MODE string for user (user) to connection client_p
679		* -avalon
#	Line 968 | Line 687 | set_user_mode(struct Client *client_p, s
687		*/
688		void
689		send_umode(struct Client *client_p, struct Client *source_p,
690	<	unsigned int old, unsigned int sendmask, char *umode_buf)
690	>	unsigned int old, char *umode_buf)
691		{
692		char *m = umode_buf;
693		int what = 0;
975	–	unsigned int i;
976	–	unsigned int flag;
694
695		/*
696	<	* build a string in umode_buf to represent the change in the user's
696	>	* Build a string in umode_buf to represent the change in the user's
697		* mode between the new (source_p->umodes) and 'old'.
698		*/
699	<	for (i = 0; i < 128; i++)
699	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
700		{
701	<	flag = user_modes[i];
985	<	if (!flag)
986	<	continue;
987	<
988	<	if (MyClient(source_p) && !(flag & sendmask))
989	<	continue;
990	<
991	<	if ((flag & old) && !HasUMode(source_p, flag))
701	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
702		{
703		if (what == MODE_DEL)
704	<	*m++ = (char)i;
704	>	*m++ = tab->c;
705		else
706		{
707		what = MODE_DEL;
708		*m++ = '-';
709	<	*m++ = (char)i;
709	>	*m++ = tab->c;
710		}
711		}
712	<	else if (!(flag & old) && HasUMode(source_p, flag))
712	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
713		{
714		if (what == MODE_ADD)
715	<	*m++ = (char)i;
715	>	*m++ = tab->c;
716		else
717		{
718		what = MODE_ADD;
719		*m++ = '+';
720	<	*m++ = (char)i;
720	>	*m++ = tab->c;
721		}
722		}
723		}
#	Line 1016 | Line 726 | send_umode(struct Client *client_p, stru
726
727		if (*umode_buf && client_p)
728		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
729	<	source_p->name, source_p->username,
730	<	source_p->host, source_p->name, umode_buf);
729	>	client_p->name, client_p->username,
730	>	client_p->host, client_p->name, umode_buf);
731		}
732
733		/* send_umode_out()
#	Line 1027 | Line 737 | send_umode(struct Client *client_p, stru
737		* side effects - Only send ubuf out to servers that know about this client
738		*/
739		void
740	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1031	<	unsigned int old)
740	>	send_umode_out(struct Client *source_p, unsigned int old)
741		{
742	<	char buf[IRCD_BUFSIZE] = { '\0' };
1034	<	dlink_node *ptr = NULL;
742	>	char buf[IRCD_BUFSIZE] = "";
743
744	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
744	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
745
746		if (buf[0])
747	<	{
748	<	DLINK_FOREACH(ptr, serv_list.head)
1041	<	{
1042	<	struct Client *target_p = ptr->data;
1043	<
1044	<	if ((target_p != client_p) && (target_p != source_p))
1045	<	sendto_one(target_p, ":%s MODE %s :%s",
1046	<	ID_or_name(source_p, target_p),
1047	<	ID_or_name(source_p, target_p), buf);
1048	<	}
1049	<	}
1050	<
1051	<	if (client_p && MyClient(client_p))
1052	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
747	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
748	>	source_p->id, source_p->id, buf);
749		}
750
751		void
752		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
753		{
754	<	dlink_node *ptr = NULL;
1059	<
1060	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
1061	<	target_p->name, target_p->username, target_p->host);
1062	<
1063	<	if (IsUserHostIp(target_p))
1064	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
1065	<
1066	<	strlcpy(target_p->host, hostname, sizeof(target_p->host));
754	>	dlink_node *node = NULL;
755
756	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
757	<	SetUserHost(target_p);
756	>	if (!strcmp(target_p->host, hostname))
757	>	return;
758
759		switch (what)
760		{
761		case MODE_ADD:
762		AddUMode(target_p, UMODE_HIDDENHOST);
1075	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
763		break;
764		case MODE_DEL:
765		DelUMode(target_p, UMODE_HIDDENHOST);
1079	–
1080	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1081	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
766		break;
767	<	default: break;
767	>	default: return;
768		}
769
770	+	if (ConfigGeneral.cycle_on_host_change)
771	+	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
772	+	target_p->name, target_p->username, target_p->host);
773	+
774	+	if (IsUserHostIp(target_p))
775	+	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
776	+
777	+	strlcpy(target_p->host, hostname, sizeof(target_p->host));
778	+
779	+	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
780	+	SetUserHost(target_p);
781	+
782		if (MyClient(target_p))
783		{
784	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1089	<	target_p->name, target_p->username,
1090	<	target_p->host);
784	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
785		clear_ban_cache_client(target_p);
786		}
787
788	<	DLINK_FOREACH(ptr, target_p->channel.head)
788	>	if (!ConfigGeneral.cycle_on_host_change)
789	>	return;
790	>
791	>	DLINK_FOREACH(node, target_p->channel.head)
792		{
793	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
793	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
794		char *p = modebuf;
795		int len = 0;
796	<	const struct Membership *ms = ptr->data;
796	>	const struct Membership *member = node->data;
797
798	<	if (has_member_flags(ms, CHFL_CHANOP)) {
798	>	if (has_member_flags(member, CHFL_CHANOP))
799	>	{
800		*p++ = 'o';
801		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
802		}
803
804	<	if (has_member_flags(ms, CHFL_HALFOP)) {
804	>	if (has_member_flags(member, CHFL_HALFOP))
805	>	{
806		*p++ = 'h';
807		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
808		}
809
810	<	if (has_member_flags(ms, CHFL_VOICE)) {
810	>	if (has_member_flags(member, CHFL_VOICE))
811	>	{
812		*p++ = 'v';
813		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
814		}
815
816		*p = '\0';
817
818	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
819	<	target_p->name, target_p->username, target_p->host,
820	<	ms->chptr->chname);
818	>
819	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
820	>	target_p->name, target_p->username,
821	>	target_p->host, member->chptr->name,
822	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
823	>	target_p->info);
824	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
825	>	target_p->name, target_p->username,
826	>	target_p->host, member->chptr->name);
827	>
828		if (nickbuf[0])
829	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
830	<	target_p->servptr->name, ms->chptr->chname,
829	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
830	>	target_p->servptr->name, member->chptr->name,
831		modebuf, nickbuf);
832
833		}
#	Line 1132 | Line 839 | user_set_hostmask(struct Client *target_
839		target_p->host, target_p->away);
840		}
841
842	<	/* user_welcome()
843	<	*
844	<	* inputs       - client pointer to client to welcome
1138	<	* output       - NONE
1139	<	* side effects -
1140	<	*/
1141	<	static void
1142	<	user_welcome(struct Client *source_p)
1143	<	{
1144	<	#if defined(__TIME__) && defined(__DATE__)
1145	<	static const char built_date[] = __DATE__ " at " __TIME__;
1146	<	#else
1147	<	static const char built_date[] = "unknown";
1148	<	#endif
1149	<
1150	<	#ifdef HAVE_LIBCRYPTO
1151	<	if (source_p->localClient->fd.ssl != NULL)
1152	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1153	<	me.name, source_p->name,
1154	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1155	<	#endif
1156	<
1157	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1158	<	ServerInfo.network_name, source_p->name);
1159	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1160	<	get_listener_name(source_p->localClient->listener), ircd_version);
1161	<	sendto_one(source_p, form_str(RPL_CREATED),
1162	<	me.name, source_p->name, built_date);
1163	<	sendto_one(source_p, form_str(RPL_MYINFO),
1164	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1165	<	show_isupport(source_p);
1166	<
1167	<	if (source_p->id[0] != '\0')
1168	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1169	<	source_p->name, source_p->id);
1170	<
1171	<	show_lusers(source_p);
1172	<
1173	<	if (ConfigFileEntry.short_motd)
1174	<	{
1175	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- motd was last changed at %s",
1176	<	me.name, source_p->name, ConfigFileEntry.motd.lastChangedDate);
1177	<	sendto_one(source_p,
1178	<	":%s NOTICE %s :*** Notice -- Please read the motd if you haven't "
1179	<	"read it", me.name, source_p->name);
1180	<	sendto_one(source_p, form_str(RPL_MOTDSTART),
1181	<	me.name, source_p->name, me.name);
1182	<	sendto_one(source_p, form_str(RPL_MOTD),
1183	<	me.name, source_p->name,
1184	<	"*** This is the short motd ***");
1185	<	sendto_one(source_p, form_str(RPL_ENDOFMOTD),
1186	<	me.name, source_p->name);
1187	<	}
1188	<	else
1189	<	send_message_file(source_p, &ConfigFileEntry.motd);
1190	<	}
1191	<
1192	<	/* check_xline()
1193	<	*
1194	<	* inputs       - pointer to client to test
1195	<	* outupt       - 1 if exiting 0 if ok
1196	<	* side effects -
1197	<	*/
1198	<	static int
1199	<	check_xline(struct Client *source_p)
1200	<	{
1201	<	struct MaskItem *conf = NULL;
1202	<	const char *reason = NULL;
1203	<
1204	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1205	<	{
1206	<	++conf->count;
1207	<
1208	<	if (conf->reason != NULL)
1209	<	reason = conf->reason;
1210	<	else
1211	<	reason = "No Reason";
1212	<
1213	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1214	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1215	<	source_p->info, reason,
1216	<	get_client_name(source_p, HIDE_IP),
1217	<	source_p->sockhost);
1218	<
1219	<	++ServerStats.is_ref;
1220	<	exit_client(source_p, &me, "Bad user info");
1221	<	return 1;
1222	<	}
1223	<
1224	<	return 0;
1225	<	}
1226	<
1227	<	/* oper_up()
1228	<	*
1229	<	* inputs       - pointer to given client to oper
1230	<	* output       - NONE
1231	<	* side effects - Blindly opers up given source_p, using conf info
1232	<	*                all checks on passwords have already been done.
1233	<	*                This could also be used by rsa oper routines.
842	>	/*! \brief Blindly opers up given source_p, using conf info.
843	>	*         All checks on passwords have already been done.
844	>	* \param source_p Pointer to given client to oper
845		*/
846		void
847	<	oper_up(struct Client *source_p)
847	>	user_oper_up(struct Client *source_p)
848		{
849		const unsigned int old = source_p->umodes;
850	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
850	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
851
852	<	assert(source_p->localClient->confs.head);
852	>	assert(source_p->connection->confs.head);
853
854		++Count.oper;
855		SetOper(source_p);
856
857		if (conf->modes)
858		AddUMode(source_p, conf->modes);
859	<	else if (ConfigFileEntry.oper_umodes)
860	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
859	>	else if (ConfigGeneral.oper_umodes)
860	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
861
862		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
863		++Count.invisi;
#	Line 1261 | Line 872 | oper_up(struct Client *source_p)
872		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
873		AddUMode(source_p, UMODE_ADMIN);
874
875	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1265	<	get_oper_name(source_p));
1266	<	send_umode_out(source_p, source_p, old);
1267	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1268	<	}
1269	<
1270	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1271	<
1272	<	int
1273	<	valid_sid(const char *sid)
1274	<	{
1275	<	if (strlen(sid) == IRC_MAXSID)
1276	<	if (IsDigit(*sid))
1277	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1278	<	return 1;
1279	<
1280	<	return 0;
1281	<	}
1282	<
1283	<	/*
1284	<	* init_uid()
1285	<	*
1286	<	* inputs       - NONE
1287	<	* output       - NONE
1288	<	* side effects - new_uid is filled in with server id portion (sid)
1289	<	*                (first 3 bytes) or defaulted to 'A'.
1290	<	*                Rest is filled in with 'A'
1291	<	*/
1292	<	void
1293	<	init_uid(void)
1294	<	{
1295	<	unsigned int i;
1296	<
1297	<	memset(new_uid, 0, sizeof(new_uid));
1298	<
1299	<	if (!EmptyString(ServerInfo.sid))
1300	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1301	<
1302	<	for (i = 0; i < IRC_MAXSID; ++i)
1303	<	if (new_uid[i] == '\0')
1304	<	new_uid[i] = 'A';
1305	<
1306	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1307	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1308	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1309	<	* -Dianora
1310	<	*/
1311	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1312	<	}
1313	<
1314	<	/*
1315	<	* add_one_to_uid
1316	<	*
1317	<	* inputs       - index number into new_uid
1318	<	* output       - NONE
1319	<	* side effects - new_uid is incremented by one
1320	<	*                note this is a recursive function
1321	<	*/
1322	<	static void
1323	<	add_one_to_uid(int i)
1324	<	{
1325	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1326	<	{
1327	<	if (new_uid[i] == 'Z')
1328	<	new_uid[i] = '0';
1329	<	else if (new_uid[i] == '9')
1330	<	{
1331	<	new_uid[i] = 'A';
1332	<	add_one_to_uid(i-1);
1333	<	}
1334	<	else
1335	<	++new_uid[i];
1336	<	}
1337	<	else
1338	<	{
1339	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1340	<	if (new_uid[i] == 'Z')
1341	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1342	<	else
1343	<	++new_uid[i];
1344	<	}
1345	<	}
1346	<
1347	<	/*
1348	<	* uid_get
1349	<	*
1350	<	* inputs       - struct Client *
1351	<	* output       - new UID is returned to caller
1352	<	* side effects - new_uid is incremented by one.
1353	<	*/
1354	<	static const char *
1355	<	uid_get(void)
1356	<	{
1357	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1358	<	return new_uid;
1359	<	}
1360	<
1361	<	/*
1362	<	* init_isupport()
1363	<	*
1364	<	* input        - NONE
1365	<	* output       - NONE
1366	<	* side effects - Must be called before isupport is enabled
1367	<	*/
1368	<	void
1369	<	init_isupport(void)
1370	<	{
1371	<	isupportFile = init_MessageLine();
1372	<
1373	<	add_isupport("CALLERID", NULL, -1);
1374	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1375	<	add_isupport("DEAF", "D", -1);
1376	<	add_isupport("KICKLEN", NULL, KICKLEN);
1377	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1378	<	#ifdef HALFOPS
1379	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1380	<	add_isupport("STATUSMSG", "@%+", -1);
1381	<	#else
1382	<	add_isupport("PREFIX", "(ov)@+", -1);
1383	<	add_isupport("STATUSMSG", "@+", -1);
1384	<	#endif
1385	<	}
1386	<
1387	<	/*
1388	<	* add_isupport()
1389	<	*
1390	<	* input        - name of supported function
1391	<	*              - options if any
1392	<	*              - number if any
1393	<	* output       - NONE
1394	<	* side effects - Each supported item must call this when activated
1395	<	*/
1396	<	void
1397	<	add_isupport(const char *name, const char *options, int n)
1398	<	{
1399	<	dlink_node *ptr;
1400	<	struct Isupport *support;
1401	<
1402	<	DLINK_FOREACH(ptr, support_list.head)
1403	<	{
1404	<	support = ptr->data;
1405	<	if (irccmp(support->name, name) == 0)
1406	<	{
1407	<	MyFree(support->name);
1408	<	MyFree(support->options);
1409	<	break;
1410	<	}
1411	<	}
1412	<
1413	<	if (ptr == NULL)
1414	<	{
1415	<	support = MyMalloc(sizeof(*support));
1416	<	dlinkAddTail(support, &support->node, &support_list);
1417	<	}
1418	<
1419	<	support->name = xstrdup(name);
1420	<	if (options != NULL)
1421	<	support->options = xstrdup(options);
1422	<	support->number = n;
1423	<
1424	<	rebuild_isupport_message_line();
1425	<	}
1426	<
1427	<	/*
1428	<	* delete_isupport()
1429	<	*
1430	<	* input        - name of supported function
1431	<	* output       - NONE
1432	<	* side effects - Each supported item must call this when deactivated
1433	<	*/
1434	<	void
1435	<	delete_isupport(const char *name)
1436	<	{
1437	<	dlink_node *ptr;
1438	<	struct Isupport *support;
1439	<
1440	<	DLINK_FOREACH(ptr, support_list.head)
1441	<	{
1442	<	support = ptr->data;
1443	<	if (irccmp(support->name, name) == 0)
1444	<	{
1445	<	dlinkDelete(ptr, &support_list);
1446	<	MyFree(support->name);
1447	<	MyFree(support->options);
1448	<	MyFree(support);
1449	<	break;
1450	<	}
1451	<	}
1452	<
1453	<	rebuild_isupport_message_line();
1454	<	}
1455	<
1456	<	/*
1457	<	* rebuild_isupport_message_line
1458	<	*
1459	<	* input        - NONE
1460	<	* output       - NONE
1461	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1462	<	*/
1463	<	void
1464	<	rebuild_isupport_message_line(void)
1465	<	{
1466	<	char isupportbuffer[IRCD_BUFSIZE];
1467	<	char *p = isupportbuffer;
1468	<	dlink_node *ptr = NULL;
1469	<	int n = 0;
1470	<	int tokens = 0;
1471	<	size_t len = 0;
1472	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1473	<
1474	<	destroy_MessageLine(isupportFile);
1475	<
1476	<	DLINK_FOREACH(ptr, support_list.head)
875	>	if (!EmptyString(conf->whois))
876		{
877	<	struct Isupport *support = ptr->data;
878	<
879	<	p += (n = sprintf(p, "%s", support->name));
880	<	len += n;
1482	<
1483	<	if (support->options != NULL)
1484	<	{
1485	<	p += (n = sprintf(p, "=%s", support->options));
1486	<	len += n;
1487	<	}
1488	<
1489	<	if (support->number > 0)
1490	<	{
1491	<	p += (n = sprintf(p, "=%d", support->number));
1492	<	len += n;
1493	<	}
1494	<
1495	<	*p++ = ' ';
1496	<	len++;
1497	<	*p = '\0';
1498	<
1499	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1500	<	{ /* arbritrary for now */
1501	<	if (*--p == ' ')
1502	<	*p = '\0';
1503	<
1504	<	addto_MessageLine(isupportFile, isupportbuffer);
1505	<	p = isupportbuffer;
1506	<	len = 0;
1507	<	n = tokens = 0;
1508	<	}
877	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
878	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
879	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
880	>	RPL_WHOISOPERATOR, conf->whois);
881		}
882
883	<	if (len != 0)
884	<	{
885	<	if (*--p == ' ')
886	<	*p = '\0';
887	<	addto_MessageLine(isupportFile, isupportbuffer);
888	<	}
883	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
884	>	get_oper_name(source_p));
885	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
886	>	me.id, get_oper_name(source_p));
887	>	send_umode_out(source_p, old);
888	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
889		}

Diff Legend

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