ViewVC Help

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

root/svn/ircd-hybrid/trunk/src/user.c

Comparing:
ircd-hybrid/trunk/src/s_user.c (file contents), Revision 2691 by michael, Tue Dec 17 18:55:59 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6774 by michael, Fri Nov 13 20:20:48 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	+	#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 *);
59	<	static int check_xline(struct Client *);
60	<	static void introduce_client(struct Client *);
61	<	static const char *uid_get(void);
62	<
63	<	/* Used for building up the isupport string,
64	<	* used with init_isupport, add_isupport, delete_isupport
65	<	*/
66	<
67	<	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;
65	<	static dlink_list support_list_lines;
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	<	0,                  /* 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 */
98	<	0,                  /* M */
99	<	0,                  /* N */
100	<	0,                  /* O */
101	<	0,                  /* P */
102	<	0,                  /* Q */
103	<	UMODE_REGONLY,      /* R */
104	<	UMODE_SSL,          /* S */
105	<	0,                  /* T */
106	<	0,                  /* U */
107	<	0,                  /* V */
108	<	UMODE_WEBIRC,       /* W */
109	<	0,                  /* X */
110	<	0,                  /* Y */
111	<	0,                  /* Z 0x5A */
112	<	0, 0, 0, 0, 0,      /* 0x5F   */
113	<	0,                  /* 0x60   */
114	<	UMODE_ADMIN,        /* a */
115	<	UMODE_BOTS,         /* b */
116	<	UMODE_CCONN,        /* c */
117	<	UMODE_DEBUG,        /* d */
118	<	UMODE_EXTERNAL,     /* e */
119	<	UMODE_FULL,         /* f */
120	<	UMODE_CALLERID,     /* g */
121	<	0,                  /* h */
122	<	UMODE_INVISIBLE,    /* i */
123	<	UMODE_REJ,          /* j */
124	<	UMODE_SKILL,        /* k */
125	<	UMODE_LOCOPS,       /* l */
126	<	0,                  /* m */
127	<	UMODE_NCHANGE,      /* n */
128	<	UMODE_OPER,         /* o */
129	<	0,                  /* p */
130	<	0,                  /* q */
131	<	UMODE_REGISTERED,   /* r */
132	<	UMODE_SERVNOTICE,   /* s */
133	<	0,                  /* t */
134	<	UMODE_UNAUTH,       /* u */
135	<	0,                  /* v */
136	<	UMODE_WALLOP,       /* w */
137	<	UMODE_HIDDENHOST,   /* x */
138	<	UMODE_SPY,          /* y */
139	<	UMODE_OPERWALL,     /* z      0x7A */
140	<	0,0,0,0,0,          /* 0x7B - 0x7F */
141	<
142	<	/* 0x80 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x8F */
143	<	/* 0x90 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0x9F */
144	<	/* 0xA0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xAF */
145	<	/* 0xB0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xBF */
146	<	/* 0xC0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xCF */
147	<	/* 0xD0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xDF */
148	<	/* 0xE0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, /* 0xEF */
149	<	/* 0xF0 */ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0  /* 0xFF */
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		{
155	–	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 171 | Line 109 | assemble_umode_buffer(void)
109		void
110		show_lusers(struct Client *source_p)
111		{
174	–	const char *from, *to;
175	–
176	–	if (!MyConnect(source_p) && IsCapable(source_p->from, CAP_TS6) && HasID(source_p))
177	–	{
178	–	from = me.id;
179	–	to = source_p->id;
180	–	}
181	–	else
182	–	{
183	–	from = me.name;
184	–	to = source_p->name;
185	–	}
186	–
112		if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
113	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT),
114	<	from, to, (Count.total-Count.invisi),
190	<	Count.invisi, dlink_list_length(&global_serv_list));
113	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
114	>	Count.invisi, dlink_list_length(&global_server_list));
115		else
116	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
117	<	(Count.total-Count.invisi), Count.invisi, 1);
116	>	sendto_one_numeric(source_p, &me, RPL_LUSERCLIENT, (Count.total - Count.invisi),
117	>	Count.invisi, 1);
118
119	<	if (Count.oper > 0)
120	<	sendto_one(source_p, form_str(RPL_LUSEROP),
121	<	from, to, Count.oper);
122	<
123	<	if (dlink_list_length(&unknown_list) > 0)
124	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
125	<	from, to, dlink_list_length(&unknown_list));
126	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
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 (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
129		{
130	<	sendto_one(source_p, form_str(RPL_LUSERME),
131	<	from, to, Count.local, Count.myserver);
211	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
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	<	sendto_one(source_p, form_str(RPL_LUSERME),
136	<	from, to, Count.total, 0);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	from, to, Count.total, Count.max_tot);
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(source_p, form_str(RPL_GLOBALUSERS),
223	<	from, to, Count.total, Count.max_tot);
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_STATSCONN), from, to,
143	<	Count.max_loc_con, Count.max_loc_cli, Count.totalrestartcount);
142	>	sendto_one_numeric(source_p, &me, RPL_STATSCONN, Count.max_loc_con,
143	>	Count.max_loc_cli, Count.totalrestartcount);
144
145		if (Count.local > Count.max_loc_cli)
146		Count.max_loc_cli = Count.local;
#	Line 233 | Line 149 | show_lusers(struct Client *source_p)
149		Count.max_loc_con = Count.local + Count.myserver;
150		}
151
152	<	/* show_isupport()
152	>	/* report_and_set_user_flags()
153		*
154	<	* inputs       - pointer to client
154	>	* inputs       - pointer to source_p
155	>	*              - pointer to conf for this user
156		* output       - NONE
157	<	* side effects - display to client what we support (for them)
157	>	* side effects - Report to user any special flags
158	>	*                they are getting, and set them.
159		*/
160	<	void
161	<	show_isupport(struct Client *source_p)
160	>	static void
161	>	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
162		{
163	<	const dlink_node *ptr = NULL;
163	>	/* If this user is being spoofed, tell them so */
164	>	if (IsConfDoSpoofIp(conf))
165	>	sendto_one_notice(source_p, &me, ":*** Spoofing your IP. Congrats.");
166	>
167	>	/* If this user is in the exception class, set it "E lined" */
168	>	if (IsConfExemptKline(conf))
169	>	{
170	>	AddFlag(source_p, FLAGS_EXEMPTKLINE);
171	>	sendto_one_notice(source_p, &me, ":*** You are exempt from K/D lines. Congrats.");
172	>	}
173
174	<	DLINK_FOREACH(ptr, support_list_lines.head)
175	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
176	<	source_p->name, ptr->data);
174	>	if (IsConfExemptXline(conf))
175	>	{
176	>	AddFlag(source_p, FLAGS_EXEMPTXLINE);
177	>	sendto_one_notice(source_p, &me, ":*** You are exempt from X lines. Congrats.");
178	>	}
179	>
180	>	if (IsConfExemptResv(conf))
181	>	{
182	>	AddFlag(source_p, FLAGS_EXEMPTRESV);
183	>	sendto_one_notice(source_p, &me, ":*** You are exempt from resvs. Congrats.");
184	>	}
185	>
186	>	/* If this user is exempt from user limits set it "F lined" */
187	>	if (IsConfExemptLimits(conf))
188	>	{
189	>	AddFlag(source_p, FLAGS_NOLIMIT);
190	>	sendto_one_notice(source_p, &me, ":*** You are exempt from user limits. Congrats.");
191	>	}
192	>
193	>	if (IsConfCanFlood(conf))
194	>	{
195	>	AddFlag(source_p, FLAGS_CANFLOOD);
196	>	sendto_one_notice(source_p, &me, ":*** You are exempt from flood "
197	>	"protection, aren't you fearsome.");
198	>	}
199		}
200
201	<	/*
202	<	** register_local_user
203	<	**      This function is called when both NICK and USER messages
204	<	**      have been accepted for the client, in whatever order. Only
205	<	**      after this, is the USER message propagated.
206	<	**
207	<	**      NICK's must be propagated at once when received, although
208	<	**      it would be better to delay them too until full info is
209	<	**      available. Doing it is not so simple though, would have
210	<	**      to implement the following:
211	<	**
212	<	**      (actually it has been implemented already for a while) -orabidoo
213	<	**
214	<	**      1) user telnets in and gives only "NICK foobar" and waits
215	<	**      2) another user far away logs in normally with the nick
216	<	**         "foobar" (quite legal, as this server didn't propagate
217	<	**         it).
218	<	**      3) now this server gets nick "foobar" from outside, but
219	<	**         has alread the same defined locally. Current server
220	<	**         would just issue "KILL foobar" to clean out dups. But,
221	<	**         this is not fair. It should actually request another
222	<	**         nick from local user or kill him/her...
223	<	*/
201	>	/* introduce_client()
202	>	*
203	>	* inputs       - source_p
204	>	* output       - NONE
205	>	* side effects - This common function introduces a client to the rest
206	>	*                of the net, either from a local client connect or
207	>	*                from a remote connect.
208	>	*/
209	>	static void
210	>	introduce_client(struct Client *source_p)
211	>	{
212	>	dlink_node *node = NULL;
213	>	char ubuf[IRCD_BUFSIZE] = "";
214	>
215	>	if (MyClient(source_p))
216	>	send_umode(source_p, source_p, 0, ubuf);
217	>	else
218	>	send_umode(NULL, source_p, 0, ubuf);
219	>
220	>	watch_check_hash(source_p, RPL_LOGON);
221	>
222	>	if (ubuf[0] == '\0')
223	>	{
224	>	ubuf[0] = '+';
225	>	ubuf[1] = '\0';
226	>	}
227	>
228	>	DLINK_FOREACH(node, local_server_list.head)
229	>	{
230	>	struct Client *server = node->data;
231	>
232	>	if (server == source_p->from)
233	>	continue;
234	>
235	>	if (IsCapable(server, CAPAB_SVS))
236	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s %s :%s",
237	>	source_p->servptr->id,
238	>	source_p->name, source_p->hopcount+1,
239	>	(unsigned long)source_p->tsinfo,
240	>	ubuf, source_p->username, source_p->host,
241	>	source_p->sockhost, source_p->id,
242	>	source_p->account,
243	>	source_p->info);
244	>	else
245	>	sendto_one(server, ":%s UID %s %u %lu %s %s %s %s %s :%s",
246	>	source_p->servptr->id,
247	>	source_p->name, source_p->hopcount+1,
248	>	(unsigned long)source_p->tsinfo,
249	>	ubuf, source_p->username, source_p->host,
250	>	source_p->sockhost, source_p->id, source_p->info);
251	>
252	>	if (!EmptyString(source_p->certfp))
253	>	sendto_one(server, ":%s CERTFP %s", source_p->id, source_p->certfp);
254	>	}
255	>	}
256	>
257	>	/* user_welcome()
258	>	*
259	>	* inputs       - client pointer to client to welcome
260	>	* output       - NONE
261	>	* side effects -
262	>	*/
263	>	static void
264	>	user_welcome(struct Client *source_p)
265	>	{
266	>	static const char built_date[] = __DATE__ " at " __TIME__;
267	>
268	>	#ifdef HAVE_LIBCRYPTO
269	>	if (HasFlag(source_p, FLAGS_SSL))
270	>	{
271	>	AddUMode(source_p, UMODE_SSL);
272	>	sendto_one_notice(source_p, &me, ":*** Connected securely via %s",
273	>	ssl_get_cipher(source_p->connection->fd.ssl));
274	>	}
275	>	#endif
276	>
277	>	sendto_one_numeric(source_p, &me, RPL_WELCOME, ConfigServerInfo.network_name,
278	>	source_p->name);
279	>	sendto_one_numeric(source_p, &me, RPL_YOURHOST,
280	>	listener_get_name(source_p->connection->listener), ircd_version);
281	>	sendto_one_numeric(source_p, &me, RPL_CREATED, built_date);
282	>	sendto_one_numeric(source_p, &me, RPL_MYINFO, me.name, ircd_version, umode_buffer);
283	>
284	>	isupport_show(source_p);
285	>	show_lusers(source_p);
286	>	motd_signon(source_p);
287	>	}
288	>
289	>	/* check_xline()
290	>	*
291	>	* inputs       - pointer to client to test
292	>	* outupt       - 1 if exiting 0 if ok
293	>	* side effects -
294	>	*/
295	>	static int
296	>	check_xline(struct Client *source_p)
297	>	{
298	>	struct MaskItem *conf = NULL;
299	>
300	>	if (HasFlag(source_p, FLAGS_EXEMPTXLINE))
301	>	return 0;
302	>
303	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
304	>	{
305	>	++conf->count;
306	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
307	>	"X-line Rejecting [%s] [%s], user %s [%s]",
308	>	source_p->info, conf->reason,
309	>	get_client_name(source_p, HIDE_IP),
310	>	source_p->sockhost);
311	>
312	>	++ServerStats.is_ref;
313	>	exit_client(source_p, "Bad user info");
314	>	return 1;
315	>	}
316	>
317	>	return 0;
318	>	}
319	>
320	>	/*! \brief This function is called when both NICK and USER messages
321	>	*      have been accepted for the client, in whatever order. Only
322	>	*      after this, is the UID message propagated.
323	>	* \param source_p Pointer to given client to introduce
324	>	*/
325		void
326		register_local_user(struct Client *source_p)
327		{
328		const char *id = NULL;
329		const struct MaskItem *conf = NULL;
330
281	–	assert(source_p != NULL);
331		assert(source_p == source_p->from);
332		assert(MyConnect(source_p));
333	<	assert(!source_p->localClient->registration);
334	<
286	<	ClearCap(source_p, CAP_TS6);
333	>	assert(IsUnknown(source_p));
334	>	assert(!source_p->connection->registration);
335
336	<	if (ConfigFileEntry.ping_cookie)
336	>	if (ConfigGeneral.ping_cookie)
337		{
338	<	if (!IsPingSent(source_p) && !source_p->localClient->random_ping)
338	>	if (!HasFlag(source_p, FLAGS_PINGSENT) && !source_p->connection->random_ping)
339		{
340		do
341	<	source_p->localClient->random_ping = genrand_int32();
342	<	while (!source_p->localClient->random_ping);
341	>	source_p->connection->random_ping = genrand_int32();
342	>	while (!source_p->connection->random_ping);
343
344	<	sendto_one(source_p, "PING :%u",
345	<	source_p->localClient->random_ping);
298	<	SetPingSent(source_p);
344	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
345	>	AddFlag(source_p, FLAGS_PINGSENT);
346		return;
347		}
348
349	<	if (!HasPingCookie(source_p))
349	>	if (!HasFlag(source_p, FLAGS_PING_COOKIE))
350		return;
351		}
352
353	<	source_p->localClient->last_privmsg = CurrentTime;
353	>	source_p->connection->last_privmsg = CurrentTime;
354		/* Straight up the maximum rate of flooding... */
355	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
355	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
356
357		if (!check_client(source_p))
358		return;
359
360		if (!valid_hostname(source_p->host))
361		{
362	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
363	<	"character in your hostname", me.name, source_p->name);
364	<	strlcpy(source_p->host, source_p->sockhost,
318	<	sizeof(source_p->host));
362	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
363	>	"character in your hostname");
364	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
365		}
366
367	<	conf = source_p->localClient->confs.head->data;
367	>	conf = source_p->connection->confs.head->data;
368
369	<	if (!IsGotId(source_p))
369	>	if (!HasFlag(source_p, FLAGS_GOTID))
370		{
371	<	char username[USERLEN + 1];
326	<	const char *p = username;
371	>	char username[USERLEN + 1] = "";
372		unsigned int i = 0;
373
374		if (IsNeedIdentd(conf))
375		{
376		++ServerStats.is_ref;
377	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
378	<	"identd to use this server", me.name, source_p->name);
379	<	exit_client(source_p, &me, "Install identd");
377	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
378	>	"identd to use this server");
379	>	exit_client(source_p, "Install identd");
380		return;
381		}
382
#	Line 340 | Line 385 | register_local_user(struct Client *sourc
385		if (!IsNoTilde(conf))
386		source_p->username[i++] = '~';
387
388	<	for (; *p && i < USERLEN; ++p)
389	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
388	>	for (const char *p = username; *p && i < USERLEN; ++p)
389	>	source_p->username[i++] = *p;
390
391		source_p->username[i] = '\0';
392		}
393
394	<	/* password check */
394	>	/* Password check */
395		if (!EmptyString(conf->passwd))
396		{
397	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
397	>	if (!match_conf_password(source_p->connection->password, conf))
398		{
399		++ServerStats.is_ref;
400	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
401	<	me.name, source_p->name);
402	<	exit_client(source_p, &me, "Bad Password");
400	>
401	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
402	>	exit_client(source_p, "Bad Password");
403		return;
404		}
405		}
406
407	<	/* don't free source_p->localClient->passwd here - it can be required
408	<	* by masked /stats I if there are auth{} blocks with need_password = no;
407	>	/*
408	>	* Don't free source_p->connection->password here - it can be required
409	>	* by masked /stats I if there are auth {} blocks with need_password = no;
410		* --adx
411		*/
412
413	<	/* report if user has &^>= etc. and set flags as needed in source_p */
413	>	/*
414	>	* Report if user has &^>= etc. and set flags as needed in source_p
415	>	*/
416		report_and_set_user_flags(source_p, conf);
417
418		if (IsDead(source_p))
419		return;
420
421	<	/* Limit clients -
421	>	/*
422	>	* Limit clients -
423		* We want to be able to have servers and F-line clients
424		* connect, so save room for "buffer" connections.
425		* Smaller servers may want to decrease this, and it should
426		* probably be just a percentage of the MAXCLIENTS...
427		*   -Taner
428		*/
429	<	/* Except "F:" clients */
430	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
429	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
430	>	(Count.local >= GlobalSetOptions.maxclients && !HasFlag(source_p, FLAGS_NOLIMIT)))
431		{
432		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
433		"Too many clients, rejecting %s[%s].",
434		source_p->name, source_p->host);
435		++ServerStats.is_ref;
436	<	exit_client(source_p, &me, "Sorry, server is full - try later");
436	>	exit_client(source_p, "Sorry, server is full - try later");
437		return;
438		}
439
395	–	/* valid user name check */
440		if (!valid_username(source_p->username, 1))
441		{
442	<	char tmpstr2[IRCD_BUFSIZE];
442	>	char buf[IRCD_BUFSIZE] = "";
443
444		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
445		"Invalid username: %s (%s@%s)",
446		source_p->name, source_p->username, source_p->host);
447		++ServerStats.is_ref;
448	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
449	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
448	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
449	>	exit_client(source_p, buf);
450		return;
451		}
452
453		if (check_xline(source_p))
454		return;
455
456	<	while (hash_find_id((id = uid_get())) != NULL)
456	>	while (hash_find_id((id = uid_get())))
457		;
458
459		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 462 | register_local_user(struct Client *sourc
462		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
463		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
464		source_p->name, source_p->username, source_p->host,
465	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
466	<	"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(&source_p->localClient->confs),
465	>	source_p->sockhost,
466	>	get_client_class(&source_p->connection->confs),
467		source_p->info, source_p->id);
468
469	<	if (ConfigFileEntry.invisible_on_connect)
469	>	if (ConfigGeneral.invisible_on_connect)
470		{
471		AddUMode(source_p, UMODE_INVISIBLE);
472		++Count.invisi;
#	Line 435 | Line 477 | register_local_user(struct Client *sourc
477		Count.max_loc = Count.local;
478
479		if (!(Count.max_loc % 10))
480	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
481	<	"New Max Local Clients: %d",
480	>	sendto_realops_flags(UMODE_SERVNOTICE, L_ALL, SEND_NOTICE,
481	>	"New maximum local client connections: %u",
482		Count.max_loc);
483		}
484
443	–	/* Increment our total user count here */
485		if (++Count.total > Count.max_tot)
486		Count.max_tot = Count.total;
487		++Count.totalrestartcount;
#	Line 448 | Line 489 | register_local_user(struct Client *sourc
489		assert(source_p->servptr == &me);
490		SetClient(source_p);
491		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
492	<
452	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
492	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
493
494		assert(dlinkFind(&unknown_list, source_p));
495
496	<	dlink_move_node(&source_p->localClient->lclient_node,
496	>	dlink_move_node(&source_p->connection->lclient_node,
497		&unknown_list, &local_client_list);
498
499		user_welcome(source_p);
500	<	add_user_host(source_p->username, source_p->host, 0);
501	<	SetUserHost(source_p);
500	>	userhost_add(source_p->username, source_p->host, 0);
501	>	AddFlag(source_p, FLAGS_USERHOST);
502
503		introduce_client(source_p);
504		}
#	Line 469 | Line 509 | register_local_user(struct Client *sourc
509		*              - username to register as
510		*              - host name to register as
511		*              - server name
472	–	*              - realname (gecos)
512		* output       - NONE
513		* side effects - This function is called when a remote client
514		*                is introduced by a server.
515		*/
516		void
517	<	register_remote_user(struct Client *source_p,
479	<	const char *username, const char *host, const char *server,
480	<	const char *realname)
517	>	register_remote_user(struct Client *source_p)
518		{
519	<	struct Client *target_p = NULL;
483	<
484	<	assert(source_p != NULL);
485	<	assert(source_p->username != username);
486	<
487	<	strlcpy(source_p->host, host, sizeof(source_p->host));
488	<	strlcpy(source_p->username, username, sizeof(source_p->username));
489	<
490	<	/*
491	<	* coming from another server, take the servers word for it
492	<	*/
493	<	source_p->servptr = hash_find_server(server);
494	<
495	<	/*
496	<	* Super GhostDetect:
497	<	* If we can't find the server the user is supposed to be on,
498	<	* then simply blow the user away.        -Taner
499	<	*/
500	<	if (source_p->servptr == NULL)
501	<	{
502	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
503	<	"No server %s for user %s[%s@%s] from %s",
504	<	server, source_p->name, source_p->username,
505	<	source_p->host, source_p->from->name);
506	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
507	<
508	<	AddFlag(source_p, FLAGS_KILLED);
509	<	exit_client(source_p, &me, "Ghosted Client");
510	<	return;
511	<	}
519	>	const struct Client *target_p = NULL;
520
521		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
522		{
#	Line 517 | Line 525 | register_remote_user(struct Client *sour
525		source_p->from->name, source_p->name, source_p->username,
526		source_p->host, source_p->servptr->name,
527		target_p->name, target_p->from->name);
528	<	kill_client(source_p->from, source_p,
529	<	"%s (NICK from wrong direction (%s != %s))",
530	<	me.name, source_p->servptr->name, target_p->from->name);
528	>	sendto_one(source_p->from,
529	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
530	>	me.id, source_p->id, me.name, source_p->servptr->name,
531	>	target_p->from->name);
532	>
533		AddFlag(source_p, FLAGS_KILLED);
534	<	exit_client(source_p, &me, "USER server wrong direction");
534	>	exit_client(source_p, "UID server wrong direction");
535		return;
536		}
537
#	Line 532 | Line 542 | register_remote_user(struct Client *sour
542		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
543		AddFlag(source_p, FLAGS_SERVICE);
544
535	–	/* Increment our total user count here */
545		if (++Count.total > Count.max_tot)
546		Count.max_tot = Count.total;
547
548		SetClient(source_p);
549		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
550	<	add_user_host(source_p->username, source_p->host, 1);
551	<	SetUserHost(source_p);
550	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
551	>	userhost_add(source_p->username, source_p->host, 1);
552	>	AddFlag(source_p, FLAGS_USERHOST);
553
554		if (HasFlag(source_p->servptr, FLAGS_EOB))
555		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
556	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
556	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
557		source_p->servptr->name,
558		source_p->name, source_p->username, source_p->host,
559	<	source_p->info, source_p->id);
559	>	source_p->sockhost, source_p->info, source_p->id);
560
561		introduce_client(source_p);
562		}
563
554	–	/* introduce_client()
555	–	*
556	–	* inputs       - source_p
557	–	* output       - NONE
558	–	* side effects - This common function introduces a client to the rest
559	–	*                of the net, either from a local client connect or
560	–	*                from a remote connect.
561	–	*/
562	–	static void
563	–	introduce_client(struct Client *source_p)
564	–	{
565	–	dlink_node *server_node = NULL;
566	–	char ubuf[IRCD_BUFSIZE];
567	–
568	–	if (MyClient(source_p))
569	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
570	–	else
571	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
572	–
573	–	watch_check_hash(source_p, RPL_LOGON);
574	–
575	–	if (ubuf[0] == '\0')
576	–	{
577	–	ubuf[0] = '+';
578	–	ubuf[1] = '\0';
579	–	}
580	–
581	–	DLINK_FOREACH(server_node, serv_list.head)
582	–	{
583	–	struct Client *server = server_node->data;
584	–
585	–	if (server == source_p->from)
586	–	continue;
587	–
588	–	if (IsCapable(server, CAP_SVS))
589	–	{
590	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
591	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
592	–	source_p->servptr->id,
593	–	source_p->name, source_p->hopcount+1,
594	–	(unsigned long)source_p->tsinfo,
595	–	ubuf, source_p->username, source_p->host,
596	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
597	–	"0" : source_p->sockhost, source_p->id,
598	–	source_p->svid,
599	–	source_p->info);
600	–	else
601	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
602	–	source_p->name, source_p->hopcount+1,
603	–	(unsigned long)source_p->tsinfo,
604	–	ubuf, source_p->username, source_p->host,
605	–	source_p->servptr->name, source_p->svid,
606	–	source_p->info);
607	–
608	–	}
609	–	else
610	–	{
611	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
612	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
613	–	source_p->servptr->id,
614	–	source_p->name, source_p->hopcount+1,
615	–	(unsigned long)source_p->tsinfo,
616	–	ubuf, source_p->username, source_p->host,
617	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
618	–	"0" : source_p->sockhost, source_p->id, source_p->info);
619	–	else
620	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
621	–	source_p->name, source_p->hopcount+1,
622	–	(unsigned long)source_p->tsinfo,
623	–	ubuf, source_p->username, source_p->host,
624	–	source_p->servptr->name, source_p->info);
625	–	}
626	–
627	–	if (!EmptyString(source_p->certfp))
628	–	sendto_one(server, ":%s CERTFP %s", ID(source_p), source_p->certfp);
629	–	}
630	–	}
631	–
564		/* valid_hostname()
565		*
566		* Inputs       - pointer to hostname
#	Line 643 | Line 575 | valid_hostname(const char *hostname)
575		{
576		const char *p = hostname;
577
578	<	assert(p != NULL);
578	>	assert(p);
579
580		if (EmptyString(p) || *p == '.' || *p == ':')
581		return 0;
#	Line 669 | Line 601 | valid_hostname(const char *hostname)
601		int
602		valid_username(const char *username, const int local)
603		{
672	–	int dots      = 0;
604		const char *p = username;
605
606	<	assert(p != NULL);
606	>	assert(p);
607
608		if (*p == '~')
609		++p;
#	Line 687 | Line 618 | valid_username(const char *username, con
618
619		if (local)
620		{
621	+	unsigned int dots = 0;
622	+
623		while (*++p)
624		{
625	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
625	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
626		{
627	<	if (++dots > ConfigFileEntry.dots_in_ident)
627	>	if (++dots > ConfigGeneral.dots_in_ident)
628		return 0;
629		if (!IsUserChar(*(p + 1)))
630		return 0;
#	Line 707 | Line 640 | valid_username(const char *username, con
640		return 0;
641		}
642
643	<	return  p - username <= USERLEN;;
643	>	return p - username <= USERLEN;
644		}
645
646		/* clean_nick_name()
#	Line 721 | Line 654 | int
654		valid_nickname(const char *nickname, const int local)
655		{
656		const char *p = nickname;
724	–	assert(nickname && *nickname);
657
658	<	/* nicks can't start with a digit or - or be 0 length */
659	<	/* This closer duplicates behaviour of hybrid-6 */
660	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
658	>	assert(p);
659	>
660	>	/*
661	>	* Nicks can't start with a digit or - or be 0 length.
662	>	*/
663	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
664		return 0;
665
666		for (; *p; ++p)
#	Line 735 | Line 670 | valid_nickname(const char *nickname, con
670		return p - nickname <= NICKLEN;
671		}
672
738	–	/* report_and_set_user_flags()
739	–	*
740	–	* inputs       - pointer to source_p
741	–	*              - pointer to conf for this user
742	–	* output       - NONE
743	–	* side effects - Report to user any special flags
744	–	*                they are getting, and set them.
745	–	*/
746	–	static void
747	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
748	–	{
749	–	/* If this user is being spoofed, tell them so */
750	–	if (IsConfDoSpoofIp(conf))
751	–	sendto_one(source_p,
752	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
753	–	me.name, source_p->name);
754	–
755	–	/* If this user is in the exception class, Set it "E lined" */
756	–	if (IsConfExemptKline(conf))
757	–	{
758	–	SetExemptKline(source_p);
759	–	sendto_one(source_p,
760	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
761	–	me.name, source_p->name);
762	–	}
763	–
764	–	/*
765	–	* The else here is to make sure that G line exempt users
766	–	* do not get noticed twice.
767	–	*/
768	–	else if (IsConfExemptGline(conf))
769	–	{
770	–	SetExemptGline(source_p);
771	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
772	–	me.name, source_p->name);
773	–	}
774	–
775	–	if (IsConfExemptResv(conf))
776	–	{
777	–	SetExemptResv(source_p);
778	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
779	–	me.name, source_p->name);
780	–	}
781	–
782	–	/* If this user is exempt from user limits set it "F lined" */
783	–	if (IsConfExemptLimits(conf))
784	–	{
785	–	SetExemptLimits(source_p);
786	–	sendto_one(source_p,
787	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
788	–	me.name,source_p->name);
789	–	}
790	–
791	–	if (IsConfCanFlood(conf))
792	–	{
793	–	SetCanFlood(source_p);
794	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
795	–	"protection, aren't you fearsome.",
796	–	me.name, source_p->name);
797	–	}
798	–	}
799	–
800	–	/* set_user_mode()
801	–	*
802	–	* added 15/10/91 By Darren Reed.
803	–	* parv[0] - sender
804	–	* parv[1] - username to change mode for
805	–	* parv[2] - modes to change
806	–	*/
807	–	void
808	–	set_user_mode(struct Client *client_p, struct Client *source_p,
809	–	const int parc, char *parv[])
810	–	{
811	–	unsigned int flag, setflags;
812	–	char **p, *m, buf[IRCD_BUFSIZE];
813	–	struct Client *target_p;
814	–	int what = MODE_ADD, badflag = 0, i;
815	–
816	–	assert(!(parc < 2));
817	–
818	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
819	–	{
820	–	if (MyConnect(source_p))
821	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
822	–	me.name, source_p->name, parv[1]);
823	–	return;
824	–	}
825	–
826	–	if (source_p != target_p)
827	–	{
828	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
829	–	me.name, source_p->name);
830	–	return;
831	–	}
832	–
833	–	if (parc < 3)
834	–	{
835	–	m = buf;
836	–	*m++ = '+';
837	–
838	–	for (i = 0; i < 128; ++i)
839	–	if (HasUMode(source_p, user_modes[i]))
840	–	*m++ = (char)i;
841	–	*m = '\0';
842	–
843	–	sendto_one(source_p, form_str(RPL_UMODEIS),
844	–	me.name, source_p->name, buf);
845	–	return;
846	–	}
847	–
848	–	/* find flags already set for user */
849	–	setflags = source_p->umodes;
850	–
851	–	/* parse mode change string(s) */
852	–	for (p = &parv[2]; p && *p; ++p)
853	–	{
854	–	for (m = *p; *m; ++m)
855	–	{
856	–	switch (*m)
857	–	{
858	–	case '+':
859	–	what = MODE_ADD;
860	–	break;
861	–	case '-':
862	–	what = MODE_DEL;
863	–	break;
864	–	case 'o':
865	–	if (what == MODE_ADD)
866	–	{
867	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
868	–	{
869	–	++Count.oper;
870	–	SetOper(source_p);
871	–	}
872	–	}
873	–	else
874	–	{
875	–	if (!HasUMode(source_p, UMODE_OPER))
876	–	break;
877	–
878	–	ClearOper(source_p);
879	–	Count.oper--;
880	–
881	–	if (MyConnect(source_p))
882	–	{
883	–	dlink_node *dm = NULL;
884	–
885	–	detach_conf(source_p, CONF_OPER);
886	–	ClrOFlag(source_p);
887	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
888	–
889	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
890	–	free_dlink_node(dm);
891	–	}
892	–	}
893	–
894	–	break;
895	–
896	–	case 'S':  /* Only servers may set +S in a burst */
897	–	case 'W':  /* Only servers may set +W in a burst */
898	–	case 'r':  /* Only services may set +r */
899	–	case 'x':  /* Only services may set +x */
900	–	break;
901	–
902	–	default:
903	–	if ((flag = user_modes[(unsigned char)*m]))
904	–	{
905	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
906	–	(ConfigFileEntry.oper_only_umodes & flag))
907	–	badflag = 1;
908	–	else
909	–	{
910	–	if (what == MODE_ADD)
911	–	AddUMode(source_p, flag);
912	–	else
913	–	DelUMode(source_p, flag);
914	–	}
915	–	}
916	–	else if (MyConnect(source_p))
917	–	badflag = 1;
918	–
919	–	break;
920	–	}
921	–	}
922	–	}
923	–
924	–	if (badflag)
925	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
926	–	me.name, source_p->name);
927	–
928	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
929	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
930	–	{
931	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
932	–	me.name, source_p->name);
933	–	DelUMode(source_p, UMODE_ADMIN);
934	–	}
935	–
936	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
937	–	++Count.invisi;
938	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
939	–	--Count.invisi;
940	–
941	–	/*
942	–	* compare new flags with old flags and send string which
943	–	* will cause servers to update correctly.
944	–	*/
945	–	send_umode_out(client_p, source_p, setflags);
946	–	}
947	–
673		/* send_umode()
674		* send the MODE string for user (user) to connection client_p
675		* -avalon
#	Line 952 | Line 677 | set_user_mode(struct Client *client_p, s
677		* inputs       - client_p
678		*              - source_p
679		*              - int old
955	–	*              - sendmask mask of modes to send
680		*              - suplied umode_buf
681		* output       - NONE
682		*/
683		void
684		send_umode(struct Client *client_p, struct Client *source_p,
685	<	unsigned int old, unsigned int sendmask, char *umode_buf)
685	>	unsigned int old, char *umode_buf)
686		{
687		char *m = umode_buf;
688		int what = 0;
965	–	unsigned int i;
966	–	unsigned int flag;
689
690		/*
691	<	* build a string in umode_buf to represent the change in the user's
691	>	* Build a string in umode_buf to represent the change in the user's
692		* mode between the new (source_p->umodes) and 'old'.
693		*/
694	<	for (i = 0; i < 128; ++i)
694	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
695		{
696	<	flag = user_modes[i];
975	<	if (!flag)
976	<	continue;
977	<
978	<	if (MyClient(source_p) && !(flag & sendmask))
979	<	continue;
980	<
981	<	if ((flag & old) && !HasUMode(source_p, flag))
696	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
697		{
698		if (what == MODE_DEL)
699	<	*m++ = (char)i;
699	>	*m++ = tab->c;
700		else
701		{
702		what = MODE_DEL;
703		*m++ = '-';
704	<	*m++ = (char)i;
704	>	*m++ = tab->c;
705		}
706		}
707	<	else if (!(flag & old) && HasUMode(source_p, flag))
707	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
708		{
709		if (what == MODE_ADD)
710	<	*m++ = (char)i;
710	>	*m++ = tab->c;
711		else
712		{
713		what = MODE_ADD;
714		*m++ = '+';
715	<	*m++ = (char)i;
715	>	*m++ = tab->c;
716		}
717		}
718		}
#	Line 1006 | Line 721 | send_umode(struct Client *client_p, stru
721
722		if (*umode_buf && client_p)
723		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
724	<	source_p->name, source_p->username,
725	<	source_p->host, source_p->name, umode_buf);
724	>	client_p->name, client_p->username,
725	>	client_p->host, client_p->name, umode_buf);
726		}
727
728		/* send_umode_out()
#	Line 1017 | Line 732 | send_umode(struct Client *client_p, stru
732		* side effects - Only send ubuf out to servers that know about this client
733		*/
734		void
735	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1021	<	unsigned int old)
735	>	send_umode_out(struct Client *source_p, unsigned int old)
736		{
737	<	char buf[IRCD_BUFSIZE] = { '\0' };
1024	<	dlink_node *ptr = NULL;
737	>	char buf[IRCD_BUFSIZE] = "";
738
739	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
739	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
740
741		if (buf[0])
742	<	{
743	<	DLINK_FOREACH(ptr, serv_list.head)
1031	<	{
1032	<	struct Client *target_p = ptr->data;
1033	<
1034	<	if ((target_p != client_p) && (target_p != source_p))
1035	<	sendto_one(target_p, ":%s MODE %s :%s",
1036	<	ID_or_name(source_p, target_p),
1037	<	ID_or_name(source_p, target_p), buf);
1038	<	}
1039	<	}
1040	<
1041	<	if (client_p && MyClient(client_p))
1042	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
742	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
743	>	source_p->id, source_p->id, buf);
744		}
745
746		void
747		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
748		{
749	<	dlink_node *ptr = NULL;
749	>	dlink_node *node = NULL;
750
751		if (!strcmp(target_p->host, hostname))
752		return;
#	Line 1054 | Line 755 | user_set_hostmask(struct Client *target_
755		{
756		case MODE_ADD:
757		AddUMode(target_p, UMODE_HIDDENHOST);
1057	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
758		break;
759		case MODE_DEL:
760		DelUMode(target_p, UMODE_HIDDENHOST);
1061	–
1062	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1063	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
761		break;
762		default: return;
763		}
764
765	<	if (ConfigFileEntry.cycle_on_host_change)
766	<	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
765	>	if (ConfigGeneral.cycle_on_host_change)
766	>	sendto_common_channels_local(target_p, 0, 0, CAP_CHGHOST, ":%s!%s@%s QUIT :Changing hostname",
767		target_p->name, target_p->username, target_p->host);
768
769	<	if (IsUserHostIp(target_p))
770	<	delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
769	>	sendto_common_channels_local(target_p, 0, CAP_CHGHOST, 0, ":%s!%s@%s CHGHOST %s %s",
770	>	target_p->name, target_p->username,
771	>	target_p->host, target_p->username, hostname);
772	>
773	>	if (HasFlag(target_p, FLAGS_USERHOST))
774	>	userhost_del(target_p->username, target_p->host, !MyConnect(target_p));
775
776		strlcpy(target_p->host, hostname, sizeof(target_p->host));
777
778	<	add_user_host(target_p->username, target_p->host, !MyConnect(target_p));
779	<	SetUserHost(target_p);
778	>	userhost_add(target_p->username, target_p->host, !MyConnect(target_p));
779	>	AddFlag(target_p, FLAGS_USERHOST);
780
781	<	if (MyClient(target_p))
781	>	if (MyConnect(target_p))
782		{
783	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1083	<	target_p->name, target_p->host);
783	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
784		clear_ban_cache_client(target_p);
785		}
786
787	<	if (!ConfigFileEntry.cycle_on_host_change)
787	>	if (!ConfigGeneral.cycle_on_host_change)
788		return;
789
790	<	DLINK_FOREACH(ptr, target_p->channel.head)
790	>	DLINK_FOREACH(node, target_p->channel.head)
791		{
792	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
792	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
793		char *p = modebuf;
794		int len = 0;
795	<	const struct Membership *ms = ptr->data;
795	>	const struct Membership *member = node->data;
796
797	<	if (has_member_flags(ms, CHFL_CHANOP))
797	>	if (has_member_flags(member, CHFL_CHANOP))
798		{
799		*p++ = 'o';
800		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
801		}
802
803	<	if (has_member_flags(ms, CHFL_HALFOP))
803	>	if (has_member_flags(member, CHFL_HALFOP))
804		{
805		*p++ = 'h';
806		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
807		}
808
809	<	if (has_member_flags(ms, CHFL_VOICE))
809	>	if (has_member_flags(member, CHFL_VOICE))
810		{
811		*p++ = 'v';
812		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
#	Line 1114 | Line 814 | user_set_hostmask(struct Client *target_
814
815		*p = '\0';
816
817	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
818	<	target_p->name, target_p->username, target_p->host,
819	<	ms->chptr->chname);
820	<	if (nickbuf[0])
821	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
822	<	target_p->servptr->name, ms->chptr->chname,
823	<	modebuf, nickbuf);
824	<
1125	<	}
1126	<
1127	<	if (target_p->away[0])
1128	<	sendto_common_channels_local(target_p, 0, CAP_AWAY_NOTIFY,
1129	<	":%s!%s@%s AWAY :%s",
1130	<	target_p->name, target_p->username,
1131	<	target_p->host, target_p->away);
1132	<	}
1133	<
1134	<	/* user_welcome()
1135	<	*
1136	<	* inputs       - client pointer to client to welcome
1137	<	* output       - NONE
1138	<	* side effects -
1139	<	*/
1140	<	static void
1141	<	user_welcome(struct Client *source_p)
1142	<	{
1143	<	#if defined(__TIME__) && defined(__DATE__)
1144	<	static const char built_date[] = __DATE__ " at " __TIME__;
1145	<	#else
1146	<	static const char built_date[] = "unknown";
1147	<	#endif
1148	<
1149	<	#ifdef HAVE_LIBCRYPTO
1150	<	if (HasFlag(source_p, FLAGS_SSL))
1151	<	{
1152	<	AddUMode(source_p, UMODE_SSL);
1153	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1154	<	me.name, source_p->name,
1155	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1156	<	}
1157	<	#endif
1158	<
1159	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1160	<	ServerInfo.network_name, source_p->name);
1161	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1162	<	get_listener_name(source_p->localClient->listener), ircd_version);
1163	<	sendto_one(source_p, form_str(RPL_CREATED),
1164	<	me.name, source_p->name, built_date);
1165	<	sendto_one(source_p, form_str(RPL_MYINFO),
1166	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1167	<	show_isupport(source_p);
1168	<
1169	<	if (source_p->id[0] != '\0')
1170	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1171	<	source_p->name, source_p->id);
1172	<
1173	<	show_lusers(source_p);
1174	<	motd_signon(source_p);
1175	<	}
1176	<
1177	<	/* check_xline()
1178	<	*
1179	<	* inputs       - pointer to client to test
1180	<	* outupt       - 1 if exiting 0 if ok
1181	<	* side effects -
1182	<	*/
1183	<	static int
1184	<	check_xline(struct Client *source_p)
1185	<	{
1186	<	struct MaskItem *conf = NULL;
1187	<	const char *reason = NULL;
1188	<
1189	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1190	<	{
1191	<	++conf->count;
1192	<
1193	<	if (conf->reason != NULL)
1194	<	reason = conf->reason;
1195	<	else
1196	<	reason = "No Reason";
1197	<
1198	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1199	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1200	<	source_p->info, reason,
1201	<	get_client_name(source_p, HIDE_IP),
1202	<	source_p->sockhost);
1203	<
1204	<	++ServerStats.is_ref;
1205	<	exit_client(source_p, &me, "Bad user info");
1206	<	return 1;
1207	<	}
1208	<
1209	<	return 0;
1210	<	}
1211	<
1212	<	/* oper_up()
1213	<	*
1214	<	* inputs       - pointer to given client to oper
1215	<	* output       - NONE
1216	<	* side effects - Blindly opers up given source_p, using conf info
1217	<	*                all checks on passwords have already been done.
1218	<	*                This could also be used by rsa oper routines.
1219	<	*/
1220	<	void
1221	<	oper_up(struct Client *source_p)
1222	<	{
1223	<	const unsigned int old = source_p->umodes;
1224	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
1225	<
1226	<	assert(source_p->localClient->confs.head);
1227	<
1228	<	++Count.oper;
1229	<	SetOper(source_p);
1230	<
1231	<	if (conf->modes)
1232	<	AddUMode(source_p, conf->modes);
1233	<	else if (ConfigFileEntry.oper_umodes)
1234	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
1235	<
1236	<	if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
1237	<	++Count.invisi;
1238	<	if ((old & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
1239	<	--Count.invisi;
1240	<
1241	<	assert(dlinkFind(&oper_list, source_p) == NULL);
1242	<	dlinkAdd(source_p, make_dlink_node(), &oper_list);
1243	<
1244	<	AddOFlag(source_p, conf->port);
1245	<
1246	<	if (HasOFlag(source_p, OPER_FLAG_ADMIN))
1247	<	AddUMode(source_p, UMODE_ADMIN);
1248	<
1249	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1250	<	get_oper_name(source_p));
1251	<	send_umode_out(source_p, source_p, old);
1252	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1253	<	}
1254	<
1255	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1256	<
1257	<	int
1258	<	valid_sid(const char *sid)
1259	<	{
1260	<	if (strlen(sid) == IRC_MAXSID)
1261	<	if (IsDigit(*sid))
1262	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1263	<	return 1;
1264	<
1265	<	return 0;
1266	<	}
1267	<
1268	<	/*
1269	<	* init_uid()
1270	<	*
1271	<	* inputs       - NONE
1272	<	* output       - NONE
1273	<	* side effects - new_uid is filled in with server id portion (sid)
1274	<	*                (first 3 bytes) or defaulted to 'A'.
1275	<	*                Rest is filled in with 'A'
1276	<	*/
1277	<	void
1278	<	init_uid(void)
1279	<	{
1280	<	unsigned int i;
1281	<
1282	<	memset(new_uid, 0, sizeof(new_uid));
1283	<
1284	<	if (!EmptyString(ServerInfo.sid))
1285	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1286	<
1287	<	for (i = 0; i < IRC_MAXSID; ++i)
1288	<	if (new_uid[i] == '\0')
1289	<	new_uid[i] = 'A';
1290	<
1291	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1292	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1293	<	}
1294	<
1295	<	/*
1296	<	* add_one_to_uid
1297	<	*
1298	<	* inputs       - index number into new_uid
1299	<	* output       - NONE
1300	<	* side effects - new_uid is incremented by one
1301	<	*                note this is a recursive function
1302	<	*/
1303	<	static void
1304	<	add_one_to_uid(int i)
1305	<	{
1306	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
1307	<	{
1308	<	if (new_uid[i] == 'Z')
1309	<	new_uid[i] = '0';
1310	<	else if (new_uid[i] == '9')
1311	<	{
1312	<	new_uid[i] = 'A';
1313	<	add_one_to_uid(i-1);
1314	<	}
1315	<	else
1316	<	++new_uid[i];
1317	<	}
1318	<	else
1319	<	{
1320	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1321	<	if (new_uid[i] == 'Z')
1322	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1323	<	else
1324	<	++new_uid[i];
1325	<	}
1326	<	}
1327	<
1328	<	/*
1329	<	* uid_get
1330	<	*
1331	<	* inputs       - struct Client *
1332	<	* output       - new UID is returned to caller
1333	<	* side effects - new_uid is incremented by one.
1334	<	*/
1335	<	static const char *
1336	<	uid_get(void)
1337	<	{
1338	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1339	<	return new_uid;
1340	<	}
1341	<
1342	<	/*
1343	<	* init_isupport()
1344	<	*
1345	<	* input        - NONE
1346	<	* output       - NONE
1347	<	* side effects - Must be called before isupport is enabled
1348	<	*/
1349	<	void
1350	<	init_isupport(void)
1351	<	{
1352	<	add_isupport("CALLERID", NULL, -1);
1353	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1354	<	add_isupport("DEAF", "D", -1);
1355	<	add_isupport("KICKLEN", NULL, KICKLEN);
1356	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1357	<	#ifdef HALFOPS
1358	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1359	<	add_isupport("STATUSMSG", "@%+", -1);
1360	<	#else
1361	<	add_isupport("PREFIX", "(ov)@+", -1);
1362	<	add_isupport("STATUSMSG", "@+", -1);
1363	<	#endif
1364	<	add_isupport("EXCEPTS", "e", -1);
1365	<	add_isupport("INVEX", "I", -1);
1366	<	}
1367	<
1368	<	/*
1369	<	* add_isupport()
1370	<	*
1371	<	* input        - name of supported function
1372	<	*              - options if any
1373	<	*              - number if any
1374	<	* output       - NONE
1375	<	* side effects - Each supported item must call this when activated
1376	<	*/
1377	<	void
1378	<	add_isupport(const char *name, const char *options, int n)
1379	<	{
1380	<	dlink_node *ptr;
1381	<	struct Isupport *support;
1382	<
1383	<	DLINK_FOREACH(ptr, support_list.head)
1384	<	{
1385	<	support = ptr->data;
1386	<	if (irccmp(support->name, name) == 0)
1387	<	{
1388	<	MyFree(support->name);
1389	<	MyFree(support->options);
1390	<	break;
1391	<	}
1392	<	}
1393	<
1394	<	if (ptr == NULL)
1395	<	{
1396	<	support = MyMalloc(sizeof(*support));
1397	<	dlinkAddTail(support, &support->node, &support_list);
1398	<	}
1399	<
1400	<	support->name = xstrdup(name);
1401	<	if (options != NULL)
1402	<	support->options = xstrdup(options);
1403	<	support->number = n;
1404	<
1405	<	rebuild_isupport_message_line();
1406	<	}
1407	<
1408	<	/*
1409	<	* delete_isupport()
1410	<	*
1411	<	* input        - name of supported function
1412	<	* output       - NONE
1413	<	* side effects - Each supported item must call this when deactivated
1414	<	*/
1415	<	void
1416	<	delete_isupport(const char *name)
1417	<	{
1418	<	dlink_node *ptr;
1419	<	struct Isupport *support;
1420	<
1421	<	DLINK_FOREACH(ptr, support_list.head)
1422	<	{
1423	<	support = ptr->data;
1424	<	if (irccmp(support->name, name) == 0)
1425	<	{
1426	<	dlinkDelete(ptr, &support_list);
1427	<	MyFree(support->name);
1428	<	MyFree(support->options);
1429	<	MyFree(support);
1430	<	break;
1431	<	}
1432	<	}
1433	<
1434	<	rebuild_isupport_message_line();
1435	<	}
1436	<
1437	<	/*
1438	<	* rebuild_isupport_message_line
1439	<	*
1440	<	* input        - NONE
1441	<	* output       - NONE
1442	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1443	<	*/
1444	<	void
1445	<	rebuild_isupport_message_line(void)
1446	<	{
1447	<	char isupportbuffer[IRCD_BUFSIZE];
1448	<	char *p = isupportbuffer;
1449	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1450	<	int n = 0;
1451	<	int tokens = 0;
1452	<	size_t len = 0;
1453	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1454	<
1455	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1456	<	{
1457	<	dlinkDelete(ptr, &support_list_lines);
1458	<	MyFree(ptr->data);
1459	<	free_dlink_node(ptr);
1460	<	}
1461	<
1462	<	DLINK_FOREACH(ptr, support_list.head)
1463	<	{
1464	<	struct Isupport *support = ptr->data;
1465	<
1466	<	p += (n = sprintf(p, "%s", support->name));
1467	<	len += n;
1468	<
1469	<	if (support->options != NULL)
1470	<	{
1471	<	p += (n = sprintf(p, "=%s", support->options));
1472	<	len += n;
1473	<	}
1474	<
1475	<	if (support->number > 0)
1476	<	{
1477	<	p += (n = sprintf(p, "=%d", support->number));
1478	<	len += n;
1479	<	}
1480	<
1481	<	*p++ = ' ';
1482	<	len++;
1483	<	*p = '\0';
1484	<
1485	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1486	<	{ /* arbritrary for now */
1487	<	if (*--p == ' ')
1488	<	*p = '\0';
1489	<
1490	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1491	<	p = isupportbuffer;
1492	<	len = 0;
1493	<	n = tokens = 0;
1494	<	}
1495	<	}
817	>	sendto_channel_local(target_p, member->chptr, 0, CAP_EXTENDED_JOIN, CAP_CHGHOST, ":%s!%s@%s JOIN %s %s :%s",
818	>	target_p->name, target_p->username,
819	>	target_p->host, member->chptr->name,
820	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
821	>	target_p->info);
822	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_EXTENDED_JOIN | CAP_CHGHOST, ":%s!%s@%s JOIN :%s",
823	>	target_p->name, target_p->username,
824	>	target_p->host, member->chptr->name);
825
826	<	if (len != 0)
827	<	{
828	<	if (*--p == ' ')
829	<	*p = '\0';
830	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
826	>	if (nickbuf[0])
827	>	sendto_channel_local(target_p, member->chptr, 0, 0, CAP_CHGHOST, ":%s MODE %s +%s %s",
828	>	target_p->servptr->name, member->chptr->name,
829	>	modebuf, nickbuf);
830	>	if (target_p->away[0])
831	>	sendto_channel_local(target_p, member->chptr, 0, CAP_AWAY_NOTIFY, CAP_CHGHOST,
832	>	":%s!%s@%s AWAY :%s",
833	>	target_p->name, target_p->username,
834	>	target_p->host, target_p->away);
835		}
836		}

Diff Legend

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