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 2159 by michael, Sun Jun 2 18:22:01 2013 UTC vs.
ircd-hybrid/trunk/src/user.c (file contents), Revision 6189 by michael, Wed Jun 24 17:56:29 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	<	UMODE_CCONN_FULL,   /* C */
78	<	UMODE_DEAF,         /* D */
79	<	0,                  /* E */
80	<	UMODE_FARCONNECT,   /* F */
81	<	UMODE_SOFTCALLERID, /* G */
82	<	UMODE_HIDDEN,       /* H */
83	<	0,                  /* I */
84	<	0,                  /* J */
85	<	0,                  /* K */
86	<	0,                  /* L */
98	<	0,                  /* M */
99	<	0,                  /* N */
100	<	0,                  /* O */
101	<	0,                  /* P */
102	<	0,                  /* Q */
103	<	UMODE_REGONLY,      /* R */
104	<	0,                  /* S */
105	<	0,                  /* T */
106	<	0,                  /* U */
107	<	0,                  /* V */
108	<	0,                  /* 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 169 | 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),
144	<	Count.invisi, dlink_list_length(&global_serv_list));
145	<	else
146	<	sendto_one(source_p, form_str(RPL_LUSERCLIENT), from, to,
193	<	(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.local > Count.max_loc_cli)
146	>	Count.max_loc_cli = Count.local;
147
148	<	if (Count.oper > 0)
149	<	sendto_one(source_p, form_str(RPL_LUSEROP),
150	<	from, to, Count.oper);
198	<
199	<	if (dlink_list_length(&unknown_list) > 0)
200	<	sendto_one(source_p, form_str(RPL_LUSERUNKNOWN),
201	<	from, to, dlink_list_length(&unknown_list));
202	<
203	<	if (dlink_list_length(&global_channel_list) > 0)
204	<	sendto_one(source_p, form_str(RPL_LUSERCHANNELS),
205	<	from, to, dlink_list_length(&global_channel_list));
148	>	if ((Count.local + Count.myserver) > Count.max_loc_con)
149	>	Count.max_loc_con = Count.local + Count.myserver;
150	>	}
151
152	<	if (!ConfigServerHide.hide_servers || HasUMode(source_p, UMODE_OPER))
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	>	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	<	sendto_one(source_p, form_str(RPL_LUSERME),
196	<	from, to, Count.local, Count.myserver);
197	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
212	<	from, to, Count.local, Count.max_loc);
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);
218	<	sendto_one(source_p, form_str(RPL_LOCALUSERS),
219	<	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,
227	<	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	<	const dlink_node *ptr = NULL;
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	<	DLINK_FOREACH(ptr, support_list_lines.head)
273	<	sendto_one(source_p, form_str(RPL_ISUPPORT), me.name,
274	<	source_p->name, ptr->data);
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	>	isupport_show(source_p);
288	>	sendto_one_numeric(source_p, &me, RPL_YOURID, source_p->id);
289	>
290	>	show_lusers(source_p);
291	>	motd_signon(source_p);
292		}
293
294	<	/*
295	<	** register_local_user
296	<	**      This function is called when both NICK and USER messages
297	<	**      have been accepted for the client, in whatever order. Only
298	<	**      after this, is the USER message propagated.
299	<	**
300	<	**      NICK's must be propagated at once when received, although
301	<	**      it would be better to delay them too until full info is
302	<	**      available. Doing it is not so simple though, would have
303	<	**      to implement the following:
304	<	**
305	<	**      (actually it has been implemented already for a while) -orabidoo
306	<	**
307	<	**      1) user telnets in and gives only "NICK foobar" and waits
308	<	**      2) another user far away logs in normally with the nick
309	<	**         "foobar" (quite legal, as this server didn't propagate
310	<	**         it).
311	<	**      3) now this server gets nick "foobar" from outside, but
312	<	**         has alread the same defined locally. Current server
313	<	**         would just issue "KILL foobar" to clean out dups. But,
314	<	**         this is not fair. It should actually request another
315	<	**         nick from local user or kill him/her...
316	<	*/
294	>	/* check_xline()
295	>	*
296	>	* inputs       - pointer to client to test
297	>	* outupt       - 1 if exiting 0 if ok
298	>	* side effects -
299	>	*/
300	>	static int
301	>	check_xline(struct Client *source_p)
302	>	{
303	>	struct MaskItem *conf = NULL;
304	>
305	>	if (IsExemptXline(source_p))
306	>	return 0;
307	>
308	>	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
309	>	{
310	>	++conf->count;
311	>	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
312	>	"X-line Rejecting [%s] [%s], user %s [%s]",
313	>	source_p->info, conf->reason,
314	>	get_client_name(source_p, HIDE_IP),
315	>	source_p->sockhost);
316	>
317	>	++ServerStats.is_ref;
318	>	exit_client(source_p, "Bad user info");
319	>	return 1;
320	>	}
321	>
322	>	return 0;
323	>	}
324	>
325	>	/*! \brief This function is called when both NICK and USER messages
326	>	*      have been accepted for the client, in whatever order. Only
327	>	*      after this, is the UID message propagated.
328	>	* \param source_p Pointer to given client to introduce
329	>	*/
330		void
331		register_local_user(struct Client *source_p)
332		{
333		const char *id = NULL;
334		const struct MaskItem *conf = NULL;
335
281	–	assert(source_p != NULL);
336		assert(source_p == source_p->from);
337		assert(MyConnect(source_p));
338	<	assert(!source_p->localClient->registration);
339	<
286	<	ClearCap(source_p, CAP_TS6);
338	>	assert(IsUnknown(source_p));
339	>	assert(!source_p->connection->registration);
340
341	<	if (ConfigFileEntry.ping_cookie)
341	>	if (ConfigGeneral.ping_cookie)
342		{
343	<	if (!IsPingSent(source_p) && source_p->localClient->random_ping == 0)
343	>	if (!IsPingSent(source_p) && !source_p->connection->random_ping)
344		{
345		do
346	<	source_p->localClient->random_ping = genrand_int32();
347	<	while (!source_p->localClient->random_ping);
346	>	source_p->connection->random_ping = genrand_int32();
347	>	while (!source_p->connection->random_ping);
348
349	<	sendto_one(source_p, "PING :%u",
297	<	source_p->localClient->random_ping);
349	>	sendto_one(source_p, "PING :%u", source_p->connection->random_ping);
350		SetPingSent(source_p);
351		return;
352		}
#	Line 303 | Line 355 | register_local_user(struct Client *sourc
355		return;
356		}
357
358	<	source_p->localClient->last_privmsg = CurrentTime;
358	>	source_p->connection->last_privmsg = CurrentTime;
359		/* Straight up the maximum rate of flooding... */
360	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
360	>	source_p->connection->allow_read = MAX_FLOOD_BURST;
361
362		if (!check_client(source_p))
363		return;
364
365	<	if (valid_hostname(source_p->host) == 0)
365	>	if (!valid_hostname(source_p->host))
366		{
367	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You have an illegal "
368	<	"character in your hostname", me.name, source_p->name);
369	<	strlcpy(source_p->host, source_p->sockhost,
318	<	sizeof(source_p->host));
367	>	sendto_one_notice(source_p, &me, ":*** Notice -- You have an illegal "
368	>	"character in your hostname");
369	>	strlcpy(source_p->host, source_p->sockhost, sizeof(source_p->host));
370		}
371
372	<	conf = source_p->localClient->confs.head->data;
372	>	conf = source_p->connection->confs.head->data;
373
374		if (!IsGotId(source_p))
375		{
376	<	char username[USERLEN + 1];
376	>	char username[USERLEN + 1] = "";
377		const char *p = username;
378		unsigned int i = 0;
379
380		if (IsNeedIdentd(conf))
381		{
382		++ServerStats.is_ref;
383	<	sendto_one(source_p, ":%s NOTICE %s :*** Notice -- You need to install "
384	<	"identd to use this server", me.name, source_p->name);
385	<	exit_client(source_p, &me, "Install identd");
383	>	sendto_one_notice(source_p, &me, ":*** Notice -- You need to install "
384	>	"identd to use this server");
385	>	exit_client(source_p, "Install identd");
386		return;
387		}
388
#	Line 341 | Line 392 | register_local_user(struct Client *sourc
392		source_p->username[i++] = '~';
393
394		for (; *p && i < USERLEN; ++p)
395	<	if (*p != '[')
345	<	source_p->username[i++] = *p;
395	>	source_p->username[i++] = *p;
396
397		source_p->username[i] = '\0';
398		}
399
400	<	/* password check */
400	>	/* Password check */
401		if (!EmptyString(conf->passwd))
402		{
403	<	const char *pass = source_p->localClient->passwd;
354	<
355	<	if (!match_conf_password(pass, conf))
403	>	if (!match_conf_password(source_p->connection->password, conf))
404		{
405		++ServerStats.is_ref;
406	<	sendto_one(source_p, form_str(ERR_PASSWDMISMATCH),
407	<	me.name, source_p->name);
408	<	exit_client(source_p, &me, "Bad Password");
406	>
407	>	sendto_one_numeric(source_p, &me, ERR_PASSWDMISMATCH);
408	>	exit_client(source_p, "Bad Password");
409		return;
410		}
411		}
412
413	<	/* don't free source_p->localClient->passwd here - it can be required
414	<	* by masked /stats I if there are auth{} blocks with need_password = no;
413	>	/*
414	>	* Don't free source_p->connection->password here - it can be required
415	>	* by masked /stats I if there are auth {} blocks with need_password = no;
416		* --adx
417		*/
418
419	<	/* report if user has &^>= etc. and set flags as needed in source_p */
419	>	/*
420	>	* Report if user has &^>= etc. and set flags as needed in source_p
421	>	*/
422		report_and_set_user_flags(source_p, conf);
423
424		if (IsDead(source_p))
425		return;
426
427	<	/* Limit clients -
427	>	/*
428	>	* Limit clients -
429		* We want to be able to have servers and F-line clients
430		* connect, so save room for "buffer" connections.
431		* Smaller servers may want to decrease this, and it should
432		* probably be just a percentage of the MAXCLIENTS...
433		*   -Taner
434		*/
435	<	/* Except "F:" clients */
436	<	if ((Count.local >= ServerInfo.max_clients + MAX_BUFFER) ||
385	<	(Count.local >= ServerInfo.max_clients && !IsExemptLimits(source_p)))
435	>	if ((Count.local >= GlobalSetOptions.maxclients + MAX_BUFFER) ||
436	>	(Count.local >= GlobalSetOptions.maxclients && !IsExemptLimits(source_p)))
437		{
438		sendto_realops_flags(UMODE_FULL, L_ALL, SEND_NOTICE,
439		"Too many clients, rejecting %s[%s].",
440		source_p->name, source_p->host);
441		++ServerStats.is_ref;
442	<	exit_client(source_p, &me, "Sorry, server is full - try later");
442	>	exit_client(source_p, "Sorry, server is full - try later");
443		return;
444		}
445
446	<	/* valid user name check */
396	<	if (valid_username(source_p->username, 1) == 0)
446	>	if (!valid_username(source_p->username, 1))
447		{
448	<	char tmpstr2[IRCD_BUFSIZE];
448	>	char buf[IRCD_BUFSIZE] = "";
449
450		sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
451		"Invalid username: %s (%s@%s)",
452		source_p->name, source_p->username, source_p->host);
453		++ServerStats.is_ref;
454	<	snprintf(tmpstr2, sizeof(tmpstr2), "Invalid username [%s]",
455	<	source_p->username);
406	<	exit_client(source_p, &me, tmpstr2);
454	>	snprintf(buf, sizeof(buf), "Invalid username [%s]", source_p->username);
455	>	exit_client(source_p, buf);
456		return;
457		}
458
459		if (check_xline(source_p))
460		return;
461
462	<	while (hash_find_id((id = uid_get())) != NULL)
462	>	while (hash_find_id((id = uid_get())))
463		;
464
465		strlcpy(source_p->id, id, sizeof(source_p->id));
#	Line 419 | Line 468 | register_local_user(struct Client *sourc
468		sendto_realops_flags(UMODE_CCONN, L_ALL, SEND_NOTICE,
469		"Client connecting: %s (%s@%s) [%s] {%s} [%s] <%s>",
470		source_p->name, source_p->username, source_p->host,
471	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
472	<	"255.255.255.255" : source_p->sockhost,
424	<	get_client_class(&source_p->localClient->confs),
471	>	source_p->sockhost,
472	>	get_client_class(&source_p->connection->confs),
473		source_p->info, source_p->id);
474
475	<	sendto_realops_flags(UMODE_CCONN_FULL, L_ALL, SEND_NOTICE,
428	<	"CLICONN %s %s %s %s %s %s %s 0 %s",
429	<	source_p->name, source_p->username, source_p->host,
430	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
431	<	"255.255.255.255" : source_p->sockhost,
432	<	get_client_class(&source_p->localClient->confs),
433	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
434	<	"<hidden>" : source_p->localClient->client_host,
435	<	ConfigFileEntry.hide_spoof_ips && IsIPSpoof(source_p) ?
436	<	"<hidden>" : source_p->localClient->client_server,
437	<	source_p->info);
438	<
439	<
440	<	if (ConfigFileEntry.invisible_on_connect)
475	>	if (ConfigGeneral.invisible_on_connect)
476		{
477		AddUMode(source_p, UMODE_INVISIBLE);
478		++Count.invisi;
479		}
480
481	<	if ((++Count.local) > Count.max_loc)
481	>	if (++Count.local > Count.max_loc)
482		{
483		Count.max_loc = Count.local;
484
485		if (!(Count.max_loc % 10))
486		sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
487	<	"New Max Local Clients: %d",
487	>	"New maximum local client connections: %u",
488		Count.max_loc);
489		}
490
456	–	/* Increment our total user count here */
491		if (++Count.total > Count.max_tot)
492		Count.max_tot = Count.total;
493		++Count.totalrestartcount;
#	Line 461 | Line 495 | register_local_user(struct Client *sourc
495		assert(source_p->servptr == &me);
496		SetClient(source_p);
497		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
498	<
465	<	source_p->localClient->allow_read = MAX_FLOOD_BURST;
498	>	dlinkAdd(source_p, &source_p->node, &global_client_list);
499
500		assert(dlinkFind(&unknown_list, source_p));
501
502	<	dlink_move_node(&source_p->localClient->lclient_node,
502	>	dlink_move_node(&source_p->connection->lclient_node,
503		&unknown_list, &local_client_list);
504
505		user_welcome(source_p);
#	Line 482 | Line 515 | register_local_user(struct Client *sourc
515		*              - username to register as
516		*              - host name to register as
517		*              - server name
485	–	*              - realname (gecos)
518		* output       - NONE
519		* side effects - This function is called when a remote client
520		*                is introduced by a server.
521		*/
522		void
523	<	register_remote_user(struct Client *source_p,
492	<	const char *username, const char *host, const char *server,
493	<	const char *realname)
523	>	register_remote_user(struct Client *source_p)
524		{
525	<	struct Client *target_p = NULL;
496	<
497	<	assert(source_p != NULL);
498	<	assert(source_p->username != username);
499	<
500	<	strlcpy(source_p->host, host, sizeof(source_p->host));
501	<	strlcpy(source_p->username, username, sizeof(source_p->username));
502	<
503	<	/*
504	<	* coming from another server, take the servers word for it
505	<	*/
506	<	source_p->servptr = hash_find_server(server);
507	<
508	<	/*
509	<	* Super GhostDetect:
510	<	* If we can't find the server the user is supposed to be on,
511	<	* then simply blow the user away.        -Taner
512	<	*/
513	<	if (source_p->servptr == NULL)
514	<	{
515	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
516	<	"No server %s for user %s[%s@%s] from %s",
517	<	server, source_p->name, source_p->username,
518	<	source_p->host, source_p->from->name);
519	<	kill_client(source_p->from, source_p, "%s (Server doesn't exist)", me.name);
520	<
521	<	AddFlag(source_p, FLAGS_KILLED);
522	<	exit_client(source_p, &me, "Ghosted Client");
523	<	return;
524	<	}
525	>	const struct Client *target_p = NULL;
526
527		if ((target_p = source_p->servptr) && target_p->from != source_p->from)
528		{
#	Line 530 | Line 531 | register_remote_user(struct Client *sour
531		source_p->from->name, source_p->name, source_p->username,
532		source_p->host, source_p->servptr->name,
533		target_p->name, target_p->from->name);
534	<	kill_client(source_p->from, source_p,
535	<	"%s (NICK from wrong direction (%s != %s))",
536	<	me.name, source_p->servptr->name, target_p->from->name);
534	>	sendto_one(source_p->from,
535	>	":%s KILL %s :%s (UID from wrong direction (%s != %s))",
536	>	me.id, source_p->id, me.name, source_p->servptr->name,
537	>	target_p->from->name);
538	>
539		AddFlag(source_p, FLAGS_KILLED);
540	<	exit_client(source_p, &me, "USER server wrong direction");
540	>	exit_client(source_p, "UID server wrong direction");
541		return;
542		}
543
#	Line 545 | Line 548 | register_remote_user(struct Client *sour
548		if (HasFlag(source_p->servptr, FLAGS_SERVICE))
549		AddFlag(source_p, FLAGS_SERVICE);
550
548	–	/* Increment our total user count here */
551		if (++Count.total > Count.max_tot)
552		Count.max_tot = Count.total;
553
554		SetClient(source_p);
555		dlinkAdd(source_p, &source_p->lnode, &source_p->servptr->serv->client_list);
556	+	dlinkAdd(source_p, &source_p->node, &global_client_list);
557		add_user_host(source_p->username, source_p->host, 1);
558		SetUserHost(source_p);
559
560		if (HasFlag(source_p->servptr, FLAGS_EOB))
561		sendto_realops_flags(UMODE_FARCONNECT, L_ALL, SEND_NOTICE,
562	<	"Client connecting at %s: %s (%s@%s) [%s] <%s>",
562	>	"Client connecting at %s: %s (%s@%s) [%s] [%s] <%s>",
563		source_p->servptr->name,
564		source_p->name, source_p->username, source_p->host,
565	<	source_p->info, source_p->id);
565	>	source_p->sockhost, source_p->info, source_p->id);
566
567		introduce_client(source_p);
568		}
569
567	–	/* introduce_client()
568	–	*
569	–	* inputs       - source_p
570	–	* output       - NONE
571	–	* side effects - This common function introduces a client to the rest
572	–	*                of the net, either from a local client connect or
573	–	*                from a remote connect.
574	–	*/
575	–	static void
576	–	introduce_client(struct Client *source_p)
577	–	{
578	–	dlink_node *server_node = NULL;
579	–	static char ubuf[12];
580	–
581	–	if (MyClient(source_p))
582	–	send_umode(source_p, source_p, 0, SEND_UMODES, ubuf);
583	–	else
584	–	send_umode(NULL, source_p, 0, SEND_UMODES, ubuf);
585	–
586	–	watch_check_hash(source_p, RPL_LOGON);
587	–
588	–	if (*ubuf == '\0')
589	–	{
590	–	ubuf[0] = '+';
591	–	ubuf[1] = '\0';
592	–	}
593	–
594	–	DLINK_FOREACH(server_node, serv_list.head)
595	–	{
596	–	struct Client *server = server_node->data;
597	–
598	–	if (server == source_p->from)
599	–	continue;
600	–
601	–	if (IsCapable(server, CAP_SVS))
602	–	{
603	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
604	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s %s :%s",
605	–	source_p->servptr->id,
606	–	source_p->name, source_p->hopcount+1,
607	–	(unsigned long)source_p->tsinfo,
608	–	ubuf, source_p->username, source_p->host,
609	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
610	–	"0" : source_p->sockhost, source_p->id,
611	–	source_p->svid,
612	–	source_p->info);
613	–	else
614	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s %s :%s",
615	–	source_p->name, source_p->hopcount+1,
616	–	(unsigned long)source_p->tsinfo,
617	–	ubuf, source_p->username, source_p->host,
618	–	source_p->servptr->name, source_p->svid,
619	–	source_p->info);
620	–
621	–	}
622	–	else
623	–	{
624	–	if (IsCapable(server, CAP_TS6) && HasID(source_p))
625	–	sendto_one(server, ":%s UID %s %d %lu %s %s %s %s %s :%s",
626	–	source_p->servptr->id,
627	–	source_p->name, source_p->hopcount+1,
628	–	(unsigned long)source_p->tsinfo,
629	–	ubuf, source_p->username, source_p->host,
630	–	(MyClient(source_p) && IsIPSpoof(source_p)) ?
631	–	"0" : source_p->sockhost, source_p->id, source_p->info);
632	–	else
633	–	sendto_one(server, "NICK %s %d %lu %s %s %s %s :%s",
634	–	source_p->name, source_p->hopcount+1,
635	–	(unsigned long)source_p->tsinfo,
636	–	ubuf, source_p->username, source_p->host,
637	–	source_p->servptr->name, source_p->info);
638	–	}
639	–	}
640	–	}
641	–
570		/* valid_hostname()
571		*
572		* Inputs       - pointer to hostname
#	Line 653 | Line 581 | valid_hostname(const char *hostname)
581		{
582		const char *p = hostname;
583
584	<	assert(p != NULL);
584	>	assert(p);
585
586	<	if (*p == '.' || *p == ':')
586	>	if (EmptyString(p) || *p == '.' || *p == ':')
587		return 0;
588
589		for (; *p; ++p)
#	Line 679 | Line 607 | valid_hostname(const char *hostname)
607		int
608		valid_username(const char *username, const int local)
609		{
610	<	int dots      = 0;
610	>	unsigned int dots = 0;
611		const char *p = username;
612
613	<	assert(p != NULL);
613	>	assert(p);
614
615		if (*p == '~')
616		++p;
#	Line 699 | Line 627 | valid_username(const char *username, con
627		{
628		while (*++p)
629		{
630	<	if ((*p == '.') && ConfigFileEntry.dots_in_ident)
630	>	if (*p == '.' && ConfigGeneral.dots_in_ident)
631		{
632	<	if (++dots > ConfigFileEntry.dots_in_ident)
632	>	if (++dots > ConfigGeneral.dots_in_ident)
633		return 0;
634		if (!IsUserChar(*(p + 1)))
635		return 0;
#	Line 717 | Line 645 | valid_username(const char *username, con
645		return 0;
646		}
647
648	<	return  p - username <= USERLEN;;
648	>	return p - username <= USERLEN;
649		}
650
651		/* clean_nick_name()
#	Line 731 | Line 659 | int
659		valid_nickname(const char *nickname, const int local)
660		{
661		const char *p = nickname;
734	–	assert(nickname && *nickname);
662
663	<	/* nicks can't start with a digit or - or be 0 length */
664	<	/* This closer duplicates behaviour of hybrid-6 */
665	<	if (*p == '-' || (IsDigit(*p) && local) || *p == '\0')
663	>	assert(p);
664	>
665	>	/*
666	>	* Nicks can't start with a digit or - or be 0 length.
667	>	*/
668	>	if (EmptyString(p) || *p == '-' || (IsDigit(*p) && local))
669		return 0;
670
671		for (; *p; ++p)
#	Line 745 | Line 675 | valid_nickname(const char *nickname, con
675		return p - nickname <= NICKLEN;
676		}
677
748	–	/* report_and_set_user_flags()
749	–	*
750	–	* inputs       - pointer to source_p
751	–	*              - pointer to conf for this user
752	–	* output       - NONE
753	–	* side effects - Report to user any special flags
754	–	*                they are getting, and set them.
755	–	*/
756	–	static void
757	–	report_and_set_user_flags(struct Client *source_p, const struct MaskItem *conf)
758	–	{
759	–	/* If this user is being spoofed, tell them so */
760	–	if (IsConfDoSpoofIp(conf))
761	–	sendto_one(source_p,
762	–	":%s NOTICE %s :*** Spoofing your IP. Congrats.",
763	–	me.name, source_p->name);
764	–
765	–	/* If this user is in the exception class, Set it "E lined" */
766	–	if (IsConfExemptKline(conf))
767	–	{
768	–	SetExemptKline(source_p);
769	–	sendto_one(source_p,
770	–	":%s NOTICE %s :*** You are exempt from K/D/G lines. Congrats.",
771	–	me.name, source_p->name);
772	–	}
773	–
774	–	/* The else here is to make sure that G line exempt users
775	–	* do not get noticed twice.
776	–	*/
777	–	else if (IsConfExemptGline(conf))
778	–	{
779	–	SetExemptGline(source_p);
780	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from G lines. Congrats.",
781	–	me.name, source_p->name);
782	–	}
783	–
784	–	if (IsConfExemptResv(conf))
785	–	{
786	–	SetExemptResv(source_p);
787	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from resvs. Congrats.",
788	–	me.name, source_p->name);
789	–	}
790	–
791	–	/* If this user is exempt from user limits set it "F lined" */
792	–	if (IsConfExemptLimits(conf))
793	–	{
794	–	SetExemptLimits(source_p);
795	–	sendto_one(source_p,
796	–	":%s NOTICE %s :*** You are exempt from user limits. Congrats.",
797	–	me.name,source_p->name);
798	–	}
799	–
800	–	if (IsConfCanFlood(conf))
801	–	{
802	–	SetCanFlood(source_p);
803	–	sendto_one(source_p, ":%s NOTICE %s :*** You are exempt from flood "
804	–	"protection, aren't you fearsome.",
805	–	me.name, source_p->name);
806	–	}
807	–	}
808	–
809	–	/* set_user_mode()
810	–	*
811	–	* added 15/10/91 By Darren Reed.
812	–	* parv[0] - sender
813	–	* parv[1] - username to change mode for
814	–	* parv[2] - modes to change
815	–	*/
816	–	void
817	–	set_user_mode(struct Client *client_p, struct Client *source_p,
818	–	const int parc, char *parv[])
819	–	{
820	–	unsigned int flag, setflags;
821	–	char **p, *m, buf[IRCD_BUFSIZE];
822	–	struct Client *target_p;
823	–	int what = MODE_ADD, badflag = 0, i;
824	–
825	–	assert(!(parc < 2));
826	–
827	–	if ((target_p = find_person(client_p, parv[1])) == NULL)
828	–	{
829	–	if (MyConnect(source_p))
830	–	sendto_one(source_p, form_str(ERR_NOSUCHCHANNEL),
831	–	me.name, source_p->name, parv[1]);
832	–	return;
833	–	}
834	–
835	–	if (source_p != target_p)
836	–	{
837	–	sendto_one(source_p, form_str(ERR_USERSDONTMATCH),
838	–	me.name, source_p->name);
839	–	return;
840	–	}
841	–
842	–	if (parc < 3)
843	–	{
844	–	m = buf;
845	–	*m++ = '+';
846	–
847	–	for (i = 0; i < 128; i++)
848	–	if (HasUMode(source_p, user_modes[i]))
849	–	*m++ = (char)i;
850	–	*m = '\0';
851	–
852	–	sendto_one(source_p, form_str(RPL_UMODEIS),
853	–	me.name, source_p->name, buf);
854	–	return;
855	–	}
856	–
857	–	/* find flags already set for user */
858	–	setflags = source_p->umodes;
859	–
860	–	/* parse mode change string(s) */
861	–	for (p = &parv[2]; p && *p; p++)
862	–	{
863	–	for (m = *p; *m; m++)
864	–	{
865	–	switch (*m)
866	–	{
867	–	case '+':
868	–	what = MODE_ADD;
869	–	break;
870	–	case '-':
871	–	what = MODE_DEL;
872	–	break;
873	–	case 'o':
874	–	if (what == MODE_ADD)
875	–	{
876	–	if (IsServer(client_p) && !HasUMode(source_p, UMODE_OPER))
877	–	{
878	–	++Count.oper;
879	–	SetOper(source_p);
880	–	}
881	–	}
882	–	else
883	–	{
884	–	/* Only decrement the oper counts if an oper to begin with
885	–	* found by Pat Szuta, Perly , perly@xnet.com
886	–	*/
887	–	if (!HasUMode(source_p, UMODE_OPER))
888	–	break;
889	–
890	–	ClearOper(source_p);
891	–	Count.oper--;
892	–
893	–	if (MyConnect(source_p))
894	–	{
895	–	dlink_node *dm;
896	–
897	–	detach_conf(source_p, CONF_OPER);
898	–	ClrOFlag(source_p);
899	–	DelUMode(source_p, ConfigFileEntry.oper_only_umodes);
900	–
901	–	if ((dm = dlinkFindDelete(&oper_list, source_p)) != NULL)
902	–	free_dlink_node(dm);
903	–	}
904	–	}
905	–
906	–	break;
907	–
908	–	case 'r':  /* Only services may set +r */
909	–	case 'x':  /* Only services may set +x */
910	–	break;
911	–
912	–	default:
913	–	if ((flag = user_modes[(unsigned char)*m]))
914	–	{
915	–	if (MyConnect(source_p) && !HasUMode(source_p, UMODE_OPER) &&
916	–	(ConfigFileEntry.oper_only_umodes & flag))
917	–	badflag = 1;
918	–	else
919	–	{
920	–	if (what == MODE_ADD)
921	–	AddUMode(source_p, flag);
922	–	else
923	–	DelUMode(source_p, flag);
924	–	}
925	–	}
926	–	else
927	–	{
928	–	if (MyConnect(source_p))
929	–	badflag = 1;
930	–	}
931	–
932	–	break;
933	–	}
934	–	}
935	–	}
936	–
937	–	if (badflag)
938	–	sendto_one(source_p, form_str(ERR_UMODEUNKNOWNFLAG),
939	–	me.name, source_p->name);
940	–
941	–	if (MyConnect(source_p) && HasUMode(source_p, UMODE_ADMIN) &&
942	–	!HasOFlag(source_p, OPER_FLAG_ADMIN))
943	–	{
944	–	sendto_one(source_p, ":%s NOTICE %s :*** You have no admin flag;",
945	–	me.name, source_p->name);
946	–	DelUMode(source_p, UMODE_ADMIN);
947	–	}
948	–
949	–	if (!(setflags & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
950	–	++Count.invisi;
951	–	if ((setflags & UMODE_INVISIBLE) && !HasUMode(source_p, UMODE_INVISIBLE))
952	–	--Count.invisi;
953	–
954	–	/*
955	–	* compare new flags with old flags and send string which
956	–	* will cause servers to update correctly.
957	–	*/
958	–	send_umode_out(client_p, source_p, setflags);
959	–	}
960	–
678		/* send_umode()
679		* send the MODE string for user (user) to connection client_p
680		* -avalon
#	Line 971 | Line 688 | set_user_mode(struct Client *client_p, s
688		*/
689		void
690		send_umode(struct Client *client_p, struct Client *source_p,
691	<	unsigned int old, unsigned int sendmask, char *umode_buf)
691	>	unsigned int old, char *umode_buf)
692		{
693		char *m = umode_buf;
694		int what = 0;
978	–	unsigned int i;
979	–	unsigned int flag;
695
696		/*
697	<	* build a string in umode_buf to represent the change in the user's
697	>	* Build a string in umode_buf to represent the change in the user's
698		* mode between the new (source_p->umodes) and 'old'.
699		*/
700	<	for (i = 0; i < 128; i++)
700	>	for (const struct user_modes *tab = umode_tab; tab->c; ++tab)
701		{
702	<	flag = user_modes[i];
988	<	if (!flag)
989	<	continue;
990	<
991	<	if (MyClient(source_p) && !(flag & sendmask))
992	<	continue;
993	<
994	<	if ((flag & old) && !HasUMode(source_p, flag))
702	>	if ((tab->flag & old) && !HasUMode(source_p, tab->flag))
703		{
704		if (what == MODE_DEL)
705	<	*m++ = (char)i;
705	>	*m++ = tab->c;
706		else
707		{
708		what = MODE_DEL;
709		*m++ = '-';
710	<	*m++ = (char)i;
710	>	*m++ = tab->c;
711		}
712		}
713	<	else if (!(flag & old) && HasUMode(source_p, flag))
713	>	else if (!(tab->flag & old) && HasUMode(source_p, tab->flag))
714		{
715		if (what == MODE_ADD)
716	<	*m++ = (char)i;
716	>	*m++ = tab->c;
717		else
718		{
719		what = MODE_ADD;
720		*m++ = '+';
721	<	*m++ = (char)i;
721	>	*m++ = tab->c;
722		}
723		}
724		}
#	Line 1019 | Line 727 | send_umode(struct Client *client_p, stru
727
728		if (*umode_buf && client_p)
729		sendto_one(client_p, ":%s!%s@%s MODE %s :%s",
730	<	source_p->name, source_p->username,
731	<	source_p->host, source_p->name, umode_buf);
730	>	client_p->name, client_p->username,
731	>	client_p->host, client_p->name, umode_buf);
732		}
733
734		/* send_umode_out()
#	Line 1030 | Line 738 | send_umode(struct Client *client_p, stru
738		* side effects - Only send ubuf out to servers that know about this client
739		*/
740		void
741	<	send_umode_out(struct Client *client_p, struct Client *source_p,
1034	<	unsigned int old)
741	>	send_umode_out(struct Client *source_p, unsigned int old)
742		{
743	<	char buf[IRCD_BUFSIZE] = { '\0' };
1037	<	dlink_node *ptr = NULL;
743	>	char buf[IRCD_BUFSIZE] = "";
744
745	<	send_umode(NULL, source_p, old, SEND_UMODES, buf);
745	>	send_umode(MyClient(source_p) ? source_p : NULL, source_p, old, buf);
746
747		if (buf[0])
748	<	{
749	<	DLINK_FOREACH(ptr, serv_list.head)
1044	<	{
1045	<	struct Client *target_p = ptr->data;
1046	<
1047	<	if ((target_p != client_p) && (target_p != source_p))
1048	<	sendto_one(target_p, ":%s MODE %s :%s",
1049	<	ID_or_name(source_p, target_p),
1050	<	ID_or_name(source_p, target_p), buf);
1051	<	}
1052	<	}
1053	<
1054	<	if (client_p && MyClient(client_p))
1055	<	send_umode(client_p, source_p, old, 0xffffffff, buf);
748	>	sendto_server(source_p, 0, 0, ":%s MODE %s :%s",
749	>	source_p->id, source_p->id, buf);
750		}
751
752		void
753		user_set_hostmask(struct Client *target_p, const char *hostname, const int what)
754		{
755	<	dlink_node *ptr = NULL;
755	>	dlink_node *node = NULL;
756
757		if (!strcmp(target_p->host, hostname))
758		return;
#	Line 1067 | Line 761 | user_set_hostmask(struct Client *target_
761		{
762		case MODE_ADD:
763		AddUMode(target_p, UMODE_HIDDENHOST);
1070	–	AddFlag(target_p, FLAGS_IP_SPOOFING);
764		break;
765		case MODE_DEL:
766		DelUMode(target_p, UMODE_HIDDENHOST);
1074	–
1075	–	if (!HasFlag(target_p, FLAGS_AUTH_SPOOF))
1076	–	DelFlag(target_p, FLAGS_IP_SPOOFING);
767		break;
768		default: return;
769		}
770
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);
771	>	if (ConfigGeneral.cycle_on_host_change)
772	>	sendto_common_channels_local(target_p, 0, 0, ":%s!%s@%s QUIT :Changing hostname",
773	>	target_p->name, target_p->username, target_p->host);
774
775		if (IsUserHostIp(target_p))
776		delete_user_host(target_p->username, target_p->host, !MyConnect(target_p));
#	Line 1091 | Line 782 | user_set_hostmask(struct Client *target_
782
783		if (MyClient(target_p))
784		{
785	<	sendto_one(target_p, form_str(RPL_NEWHOSTIS), me.name,
1095	<	target_p->name, target_p->host);
785	>	sendto_one_numeric(target_p, &me, RPL_VISIBLEHOST, target_p->host);
786		clear_ban_cache_client(target_p);
787		}
788
789	<	DLINK_FOREACH(ptr, target_p->channel.head)
789	>	if (!ConfigGeneral.cycle_on_host_change)
790	>	return;
791	>
792	>	DLINK_FOREACH(node, target_p->channel.head)
793		{
794	<	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = { '\0' };
794	>	char modebuf[4], nickbuf[NICKLEN * 3 + 3] = "";
795		char *p = modebuf;
796		int len = 0;
797	<	const struct Membership *ms = ptr->data;
797	>	const struct Membership *member = node->data;
798
799	<	if (has_member_flags(ms, CHFL_CHANOP)) {
799	>	if (has_member_flags(member, CHFL_CHANOP))
800	>	{
801		*p++ = 'o';
802		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
803		}
804
805	<	if (has_member_flags(ms, CHFL_HALFOP)) {
805	>	if (has_member_flags(member, CHFL_HALFOP))
806	>	{
807		*p++ = 'h';
808		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
809		}
810
811	<	if (has_member_flags(ms, CHFL_VOICE)) {
811	>	if (has_member_flags(member, CHFL_VOICE))
812	>	{
813		*p++ = 'v';
814		len += snprintf(nickbuf + len, sizeof(nickbuf) - len, len ? " %s" : "%s", target_p->name);
815		}
816
817		*p = '\0';
818
819	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s!%s@%s JOIN :%s",
820	<	target_p->name, target_p->username, target_p->host,
821	<	ms->chptr->chname);
819	>
820	>	sendto_channel_local_butone(target_p, CAP_EXTENDED_JOIN, 0, member->chptr, ":%s!%s@%s JOIN %s %s :%s",
821	>	target_p->name, target_p->username,
822	>	target_p->host, member->chptr->name,
823	>	(!IsDigit(target_p->account[0]) && target_p->account[0] != '*') ? target_p->account : "*",
824	>	target_p->info);
825	>	sendto_channel_local_butone(target_p, 0, CAP_EXTENDED_JOIN, member->chptr, ":%s!%s@%s JOIN :%s",
826	>	target_p->name, target_p->username,
827	>	target_p->host, member->chptr->name);
828	>
829		if (nickbuf[0])
830	<	sendto_channel_local_butone(target_p, 0, 0, ms->chptr, ":%s MODE %s +%s %s",
831	<	target_p->servptr->name, ms->chptr->chname,
830	>	sendto_channel_local_butone(target_p, 0, 0, member->chptr, ":%s MODE %s +%s %s",
831	>	target_p->servptr->name, member->chptr->name,
832		modebuf, nickbuf);
833
834		}
#	Line 1137 | Line 840 | user_set_hostmask(struct Client *target_
840		target_p->host, target_p->away);
841		}
842
843	<	/* user_welcome()
844	<	*
845	<	* inputs       - client pointer to client to welcome
1143	<	* output       - NONE
1144	<	* side effects -
1145	<	*/
1146	<	static void
1147	<	user_welcome(struct Client *source_p)
1148	<	{
1149	<	#if defined(__TIME__) && defined(__DATE__)
1150	<	static const char built_date[] = __DATE__ " at " __TIME__;
1151	<	#else
1152	<	static const char built_date[] = "unknown";
1153	<	#endif
1154	<
1155	<	#ifdef HAVE_LIBCRYPTO
1156	<	if (source_p->localClient->fd.ssl != NULL)
1157	<	sendto_one(source_p, ":%s NOTICE %s :*** Connected securely via %s",
1158	<	me.name, source_p->name,
1159	<	ssl_get_cipher(source_p->localClient->fd.ssl));
1160	<	#endif
1161	<
1162	<	sendto_one(source_p, form_str(RPL_WELCOME), me.name, source_p->name,
1163	<	ServerInfo.network_name, source_p->name);
1164	<	sendto_one(source_p, form_str(RPL_YOURHOST), me.name, source_p->name,
1165	<	get_listener_name(source_p->localClient->listener), ircd_version);
1166	<	sendto_one(source_p, form_str(RPL_CREATED),
1167	<	me.name, source_p->name, built_date);
1168	<	sendto_one(source_p, form_str(RPL_MYINFO),
1169	<	me.name, source_p->name, me.name, ircd_version, umode_buffer);
1170	<	show_isupport(source_p);
1171	<
1172	<	if (source_p->id[0] != '\0')
1173	<	sendto_one(source_p, form_str(RPL_YOURID), me.name,
1174	<	source_p->name, source_p->id);
1175	<
1176	<	show_lusers(source_p);
1177	<	motd_signon(source_p);
1178	<	}
1179	<
1180	<	/* check_xline()
1181	<	*
1182	<	* inputs       - pointer to client to test
1183	<	* outupt       - 1 if exiting 0 if ok
1184	<	* side effects -
1185	<	*/
1186	<	static int
1187	<	check_xline(struct Client *source_p)
1188	<	{
1189	<	struct MaskItem *conf = NULL;
1190	<	const char *reason = NULL;
1191	<
1192	<	if ((conf = find_matching_name_conf(CONF_XLINE, source_p->info, NULL, NULL, 0)))
1193	<	{
1194	<	++conf->count;
1195	<
1196	<	if (conf->reason != NULL)
1197	<	reason = conf->reason;
1198	<	else
1199	<	reason = "No Reason";
1200	<
1201	<	sendto_realops_flags(UMODE_REJ, L_ALL, SEND_NOTICE,
1202	<	"X-line Rejecting [%s] [%s], user %s [%s]",
1203	<	source_p->info, reason,
1204	<	get_client_name(source_p, HIDE_IP),
1205	<	source_p->sockhost);
1206	<
1207	<	++ServerStats.is_ref;
1208	<	exit_client(source_p, &me, "Bad user info");
1209	<	return 1;
1210	<	}
1211	<
1212	<	return 0;
1213	<	}
1214	<
1215	<	/* oper_up()
1216	<	*
1217	<	* inputs       - pointer to given client to oper
1218	<	* output       - NONE
1219	<	* side effects - Blindly opers up given source_p, using conf info
1220	<	*                all checks on passwords have already been done.
1221	<	*                This could also be used by rsa oper routines.
843	>	/*! \brief Blindly opers up given source_p, using conf info.
844	>	*         All checks on passwords have already been done.
845	>	* \param source_p Pointer to given client to oper
846		*/
847		void
848		oper_up(struct Client *source_p)
849		{
850		const unsigned int old = source_p->umodes;
851	<	const struct MaskItem *conf = source_p->localClient->confs.head->data;
851	>	const struct MaskItem *const conf = source_p->connection->confs.head->data;
852
853	<	assert(source_p->localClient->confs.head);
853	>	assert(source_p->connection->confs.head);
854
855		++Count.oper;
856		SetOper(source_p);
857
858		if (conf->modes)
859		AddUMode(source_p, conf->modes);
860	<	else if (ConfigFileEntry.oper_umodes)
861	<	AddUMode(source_p, ConfigFileEntry.oper_umodes);
860	>	else if (ConfigGeneral.oper_umodes)
861	>	AddUMode(source_p, ConfigGeneral.oper_umodes);
862
863		if (!(old & UMODE_INVISIBLE) && HasUMode(source_p, UMODE_INVISIBLE))
864		++Count.invisi;
#	Line 1249 | Line 873 | oper_up(struct Client *source_p)
873		if (HasOFlag(source_p, OPER_FLAG_ADMIN))
874		AddUMode(source_p, UMODE_ADMIN);
875
876	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
1253	<	get_oper_name(source_p));
1254	<	send_umode_out(source_p, source_p, old);
1255	<	sendto_one(source_p, form_str(RPL_YOUREOPER), me.name, source_p->name);
1256	<	}
1257	<
1258	<	static char new_uid[TOTALSIDUID + 1];     /* allow for \0 */
1259	<
1260	<	int
1261	<	valid_sid(const char *sid)
1262	<	{
1263	<	if (strlen(sid) == IRC_MAXSID)
1264	<	if (IsDigit(*sid))
1265	<	if (IsAlNum(*(sid + 1)) && IsAlNum(*(sid + 2)))
1266	<	return 1;
1267	<
1268	<	return 0;
1269	<	}
1270	<
1271	<	/*
1272	<	* init_uid()
1273	<	*
1274	<	* inputs       - NONE
1275	<	* output       - NONE
1276	<	* side effects - new_uid is filled in with server id portion (sid)
1277	<	*                (first 3 bytes) or defaulted to 'A'.
1278	<	*                Rest is filled in with 'A'
1279	<	*/
1280	<	void
1281	<	init_uid(void)
1282	<	{
1283	<	unsigned int i;
1284	<
1285	<	memset(new_uid, 0, sizeof(new_uid));
1286	<
1287	<	if (!EmptyString(ServerInfo.sid))
1288	<	strlcpy(new_uid, ServerInfo.sid, sizeof(new_uid));
1289	<
1290	<	for (i = 0; i < IRC_MAXSID; ++i)
1291	<	if (new_uid[i] == '\0')
1292	<	new_uid[i] = 'A';
1293	<
1294	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1295	<	/* Yes nenolod, I have known it was off by one ever since I wrote it
1296	<	* But *JUST* for you, though, it really doesn't look as *pretty*
1297	<	* -Dianora
1298	<	*/
1299	<	memcpy(new_uid + IRC_MAXSID, "AAAAA@", IRC_MAXUID);
1300	<	}
1301	<
1302	<	/*
1303	<	* add_one_to_uid
1304	<	*
1305	<	* inputs       - index number into new_uid
1306	<	* output       - NONE
1307	<	* side effects - new_uid is incremented by one
1308	<	*                note this is a recursive function
1309	<	*/
1310	<	static void
1311	<	add_one_to_uid(int i)
1312	<	{
1313	<	if (i != IRC_MAXSID)    /* Not reached server SID portion yet? */
876	>	if (!EmptyString(conf->whois))
877		{
878	<	if (new_uid[i] == 'Z')
879	<	new_uid[i] = '0';
880	<	else if (new_uid[i] == '9')
881	<	{
1319	<	new_uid[i] = 'A';
1320	<	add_one_to_uid(i-1);
1321	<	}
1322	<	else
1323	<	++new_uid[i];
1324	<	}
1325	<	else
1326	<	{
1327	<	/* NOTE: if IRC_MAXUID != 6, this will have to be rewritten */
1328	<	if (new_uid[i] == 'Z')
1329	<	memcpy(new_uid + IRC_MAXSID, "AAAAAA", IRC_MAXUID);
1330	<	else
1331	<	++new_uid[i];
878	>	client_attach_svstag(source_p, RPL_WHOISOPERATOR, "+", conf->whois);
879	>	sendto_server(source_p, 0, 0, ":%s SVSTAG %s %lu %u + :%s",
880	>	me.id, source_p->id, (unsigned long)source_p->tsinfo,
881	>	RPL_WHOISOPERATOR, conf->whois);
882		}
1333	–	}
883
884	<	/*
885	<	* uid_get
886	<	*
887	<	* inputs       - struct Client *
888	<	* output       - new UID is returned to caller
889	<	* side effects - new_uid is incremented by one.
1341	<	*/
1342	<	static const char *
1343	<	uid_get(void)
1344	<	{
1345	<	add_one_to_uid(TOTALSIDUID - 1);    /* index from 0 */
1346	<	return new_uid;
1347	<	}
1348	<
1349	<	/*
1350	<	* init_isupport()
1351	<	*
1352	<	* input        - NONE
1353	<	* output       - NONE
1354	<	* side effects - Must be called before isupport is enabled
1355	<	*/
1356	<	void
1357	<	init_isupport(void)
1358	<	{
1359	<	add_isupport("CALLERID", NULL, -1);
1360	<	add_isupport("CASEMAPPING", CASEMAP, -1);
1361	<	add_isupport("DEAF", "D", -1);
1362	<	add_isupport("KICKLEN", NULL, KICKLEN);
1363	<	add_isupport("MODES", NULL, MAXMODEPARAMS);
1364	<	#ifdef HALFOPS
1365	<	add_isupport("PREFIX", "(ohv)@%+", -1);
1366	<	add_isupport("STATUSMSG", "@%+", -1);
1367	<	#else
1368	<	add_isupport("PREFIX", "(ov)@+", -1);
1369	<	add_isupport("STATUSMSG", "@+", -1);
1370	<	#endif
1371	<	}
1372	<
1373	<	/*
1374	<	* add_isupport()
1375	<	*
1376	<	* input        - name of supported function
1377	<	*              - options if any
1378	<	*              - number if any
1379	<	* output       - NONE
1380	<	* side effects - Each supported item must call this when activated
1381	<	*/
1382	<	void
1383	<	add_isupport(const char *name, const char *options, int n)
1384	<	{
1385	<	dlink_node *ptr;
1386	<	struct Isupport *support;
1387	<
1388	<	DLINK_FOREACH(ptr, support_list.head)
1389	<	{
1390	<	support = ptr->data;
1391	<	if (irccmp(support->name, name) == 0)
1392	<	{
1393	<	MyFree(support->name);
1394	<	MyFree(support->options);
1395	<	break;
1396	<	}
1397	<	}
1398	<
1399	<	if (ptr == NULL)
1400	<	{
1401	<	support = MyMalloc(sizeof(*support));
1402	<	dlinkAddTail(support, &support->node, &support_list);
1403	<	}
1404	<
1405	<	support->name = xstrdup(name);
1406	<	if (options != NULL)
1407	<	support->options = xstrdup(options);
1408	<	support->number = n;
1409	<
1410	<	rebuild_isupport_message_line();
1411	<	}
1412	<
1413	<	/*
1414	<	* delete_isupport()
1415	<	*
1416	<	* input        - name of supported function
1417	<	* output       - NONE
1418	<	* side effects - Each supported item must call this when deactivated
1419	<	*/
1420	<	void
1421	<	delete_isupport(const char *name)
1422	<	{
1423	<	dlink_node *ptr;
1424	<	struct Isupport *support;
1425	<
1426	<	DLINK_FOREACH(ptr, support_list.head)
1427	<	{
1428	<	support = ptr->data;
1429	<	if (irccmp(support->name, name) == 0)
1430	<	{
1431	<	dlinkDelete(ptr, &support_list);
1432	<	MyFree(support->name);
1433	<	MyFree(support->options);
1434	<	MyFree(support);
1435	<	break;
1436	<	}
1437	<	}
1438	<
1439	<	rebuild_isupport_message_line();
1440	<	}
1441	<
1442	<	/*
1443	<	* rebuild_isupport_message_line
1444	<	*
1445	<	* input        - NONE
1446	<	* output       - NONE
1447	<	* side effects - Destroy the isupport MessageFile lines, and rebuild.
1448	<	*/
1449	<	void
1450	<	rebuild_isupport_message_line(void)
1451	<	{
1452	<	char isupportbuffer[IRCD_BUFSIZE];
1453	<	char *p = isupportbuffer;
1454	<	dlink_node *ptr = NULL, *ptr_next = NULL;
1455	<	int n = 0;
1456	<	int tokens = 0;
1457	<	size_t len = 0;
1458	<	size_t reserve = strlen(me.name) + HOSTLEN + strlen(form_str(RPL_ISUPPORT));
1459	<
1460	<	DLINK_FOREACH_SAFE(ptr, ptr_next, support_list_lines.head)
1461	<	{
1462	<	dlinkDelete(ptr, &support_list_lines);
1463	<	MyFree(ptr->data);
1464	<	free_dlink_node(ptr);
1465	<	}
1466	<
1467	<	DLINK_FOREACH(ptr, support_list.head)
1468	<	{
1469	<	struct Isupport *support = ptr->data;
1470	<
1471	<	p += (n = sprintf(p, "%s", support->name));
1472	<	len += n;
1473	<
1474	<	if (support->options != NULL)
1475	<	{
1476	<	p += (n = sprintf(p, "=%s", support->options));
1477	<	len += n;
1478	<	}
1479	<
1480	<	if (support->number > 0)
1481	<	{
1482	<	p += (n = sprintf(p, "=%d", support->number));
1483	<	len += n;
1484	<	}
1485	<
1486	<	*p++ = ' ';
1487	<	len++;
1488	<	*p = '\0';
1489	<
1490	<	if (++tokens == (MAXPARA-2) || len >= (sizeof(isupportbuffer)-reserve))
1491	<	{ /* arbritrary for now */
1492	<	if (*--p == ' ')
1493	<	*p = '\0';
1494	<
1495	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1496	<	p = isupportbuffer;
1497	<	len = 0;
1498	<	n = tokens = 0;
1499	<	}
1500	<	}
1501	<
1502	<	if (len != 0)
1503	<	{
1504	<	if (*--p == ' ')
1505	<	*p = '\0';
1506	<	dlinkAddTail(xstrdup(isupportbuffer), make_dlink_node(), &support_list_lines);
1507	<	}
884	>	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE, "%s is now an operator",
885	>	get_oper_name(source_p));
886	>	sendto_server(NULL, 0, 0, ":%s GLOBOPS :%s is now an operator",
887	>	me.id, get_oper_name(source_p));
888	>	send_umode_out(source_p, old);
889	>	sendto_one_numeric(source_p, &me, RPL_YOUREOPER);
890		}

Diff Legend

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