ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/parse.c (file contents), Revision 1247 by michael, Sat Oct 1 07:54:24 2011 UTC vs.
ircd-hybrid/trunk/src/parse.c (file contents), Revision 4554 by michael, Fri Aug 22 23:10:31 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  parse.c: The message parser.
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-2014 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 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file parse.c
23	>	* \brief The message parser.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 28 | Line 30
30		#include "channel.h"
31		#include "hash.h"
32		#include "irc_string.h"
31	–	#include "sprintf_irc.h"
33		#include "ircd.h"
34		#include "numeric.h"
35	<	#include "s_log.h"
35	>	#include "log.h"
36		#include "send.h"
37	<	#include "s_conf.h"
37	>	#include "conf.h"
38		#include "memory.h"
39	<	#include "s_user.h"
40	<	#include "s_serv.h"
39	>	#include "user.h"
40	>	#include "server.h"
41	>
42
43		/*
44		* (based on orabidoo's parser code)
#	Line 52 | Line 54
54		* 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
55		*   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
56		*
57	<	*                               'i' -> [MessageTree *] -> 'e' and matches
57	>	*                               'i' -> [MessageTree *] -> 'e' and matches
58		*
59		* BUGS (Limitations!)
60	<	*
60	>	*
61		* I designed this trie to parse ircd commands. Hence it currently
62		* casefolds. This is trivial to fix by increasing MAXPTRLEN.
63		* This trie also "folds" '{' etc. down. This means, the input to this
#	Line 65 | Line 67
67		* MAXPTRLEN 128.
68		*
69		* This is also not a patricia trie. On short ircd tokens, this is
70	<	* not likely going to matter.
70	>	* not likely going to matter.
71		*
72		* Diane Bruce (Dianora), June 6 2003
73		*/
74
75	<	#define MAXPTRLEN       32
76	<	/* Must be a power of 2, and
77	<	* larger than 26 [a-z]|[A-Z]
78	<	* its used to allocate the set
79	<	* of pointers at each node of the tree
80	<	* There are MAXPTRLEN pointers at each node.
81	<	* Obviously, there have to be more pointers
82	<	* Than ASCII letters. 32 is a nice number
83	<	* since there is then no need to shift
84	<	* 'A'/'a' to base 0 index, at the expense
85	<	* of a few never used pointers. For a small
86	<	* parser like this, this is a good compromise
87	<	* and does make it somewhat faster.
88	<	*
89	<	* - Dianora
90	<	*/
91	<
92	<	struct MessageTree
91	<	{
92	<	int links; /* Count of all pointers (including msg) at this node
93	<	* used as reference count for deletion of _this_ node.
94	<	*/
75	>	/*
76	>	* Must be a power of 2, and larger than 26 [a-z]|[A-Z]. It's used to allocate
77	>	* the set of pointers at each node of the tree.
78	>	* There are MAXPTRLEN pointers at each node. Obviously, there have to be more
79	>	* pointers than ASCII letters. 32 is a nice number since there is then no need
80	>	* to shift 'A'/'a' to base 0 index, at the expense of a few never used
81	>	* pointers.
82	>	* For a small parser like this, this is a good compromise and does
83	>	* make it somewhat faster. - Dianora
84	>	*/
85	>	#define MAXPTRLEN 32
86	>
87	>
88	>	static struct MessageTree
89	>	{
90	>	int links; /* Count of all pointers (including msg) at this node
91	>	* used as reference count for deletion of _this_ node.
92	>	*/
93		struct Message *msg;
94		struct MessageTree *pointers[MAXPTRLEN];
95	<	};
95	>	} msg_tree;
96	>
97
98	<	static struct MessageTree msg_tree;
98	>	/* remove_unknown()
99	>	*
100	>	* inputs       -
101	>	* output       -
102	>	* side effects -
103	>	*/
104	>	static void
105	>	parse_remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
106	>	{
107	>	/*
108	>	* Do kill if it came from a server because it means there is a ghost
109	>	* user on the other server which needs to be removed. -avalon
110	>	* Tell opers about this. -Taner
111	>	*/
112	>	/*
113	>	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
114	>	* 'nodots'          is a nickname (KILL)
115	>	* 'no.dot.at.start' is a server   (SQUIT)
116	>	*/
117	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
118	>	{
119	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
120	>	"Unknown prefix (%s) from %s, Squitting %s",
121	>	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
122	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
123	>	"Unknown prefix (%s) from %s, Squitting %s",
124	>	lbuffer, client_p->name, lsender);
125	>	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
126	>	me.id, lsender, lbuffer, client_p->name);
127	>	}
128	>	else
129	>	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
130	>	me.id, lsender, me.name);
131	>	}
132	>
133	>	/* cancel_clients()
134	>	*
135	>	* inputs       -
136	>	* output       -
137	>	* side effects -
138	>	*/
139	>	static void
140	>	parse_cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
141	>	{
142	>	if (IsServer(source_p) || IsMe(source_p))
143	>	{
144	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
145	>	"Message for %s[%s] from %s",
146	>	source_p->name, source_p->from->name,
147	>	get_client_name(client_p, SHOW_IP));
148	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
149	>	"Message for %s[%s] from %s",
150	>	source_p->name, source_p->from->name,
151	>	get_client_name(client_p, MASK_IP));
152	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
153	>	"Not dropping server %s (%s) for Fake Direction",
154	>	client_p->name, source_p->name);
155	>	return;
156	>	}
157	>
158	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
159	>	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
160	>	source_p->name, source_p->username, source_p->host,
161	>	source_p->from->name, get_client_name(client_p, SHOW_IP));
162	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
163	>	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
164	>	source_p->name, source_p->username, source_p->host,
165	>	source_p->from->name, get_client_name(client_p, MASK_IP));
166	>	}
167
168		/*
169	<	* NOTE: parse() should not be called recursively by other functions!
169	>	*
170	>	*      parc    number of arguments ('sender' counted as one!)
171	>	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
172	>	*      parv[1]..parv[parc-1]
173	>	*              pointers to additional parameters, this is a NULL
174	>	*              terminated list (parv[parc] == NULL).
175	>	*
176	>	* *WARNING*
177	>	*      Numerics are mostly error reports. If there is something
178	>	*      wrong with the message, just *DROP* it! Don't even think of
179	>	*      sending back a neat error message -- big danger of creating
180	>	*      a ping pong error message...
181	>	*
182	>	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
183	>	*
184	>	* Called when we get a numeric message from a remote _server_ and we are
185	>	* supposed to forward it somewhere. Note that we always ignore numerics sent
186	>	* to 'me' and simply drop the message if we can't handle with this properly:
187	>	* the savvy approach is NEVER generate an error in response to an... error :)
188		*/
189	<	static char *sender;
190	<	static char *para[MAXPARA + 1];
191	<	static char buffer[1024];
192	<
193	<	static int cancel_clients(struct Client *, struct Client *, char *);
109	<	static void remove_unknown(struct Client *, char *, char *);
110	<	static void handle_numeric(char[], struct Client *, struct Client *, int, char *[]);
111	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char *[]);
112	<	static void add_msg_element(struct MessageTree *, struct Message *, const char *);
113	<	static void del_msg_element(struct MessageTree *, const char *);
189	>	static void
190	>	parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
191	>	{
192	>	struct Client *target_p = NULL;
193	>	struct Channel *chptr = NULL;
194
195	+	/*
196	+	* Avoid trash, we need it to come from a server and have a target
197	+	*/
198	+	if (parc < 2 || !IsServer(source_p))
199	+	return;
200	+
201	+	/*
202	+	* Who should receive this message ? Will we do something with it ?
203	+	* Note that we use findUser functions, so the target can't be neither
204	+	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
205	+	* should never generate numeric replies to non-users anyway
206	+	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
207	+	*/
208	+	if (IsChanPrefix(*parv[1]))
209	+	chptr = hash_find_channel(parv[1]);
210	+	else
211	+	target_p = find_person(source_p, parv[1]);
212	+
213	+	if (((!target_p) || (target_p->from == source_p->from)) && !chptr)
214	+	return;
215	+
216	+	/*
217	+	* Remap low number numerics, not that I understand WHY.. --Nemesi
218	+	*/
219	+	/*
220	+	* Numerics below 100 talk about the current 'connection', you're not
221	+	* connected to a remote server so it doesn't make sense to send them
222	+	* remotely - but the information they contain may be useful, so we
223	+	* remap them up. Weird, but true.  -- Isomer
224	+	*/
225	+	if (numeric < 100)
226	+	numeric += 100;
227	+
228	+	if (target_p)
229	+	{
230	+	/* Fake it for server hiding, if it's our client */
231	+	if ((ConfigServerHide.hide_servers || IsHidden(source_p)) && MyConnect(target_p) &&
232	+	!HasUMode(target_p, UMODE_OPER))
233	+	sendto_one_numeric(target_p, &me, numeric|SND_EXPLICIT, "%s", parv[2]);
234	+	else
235	+	sendto_one_numeric(target_p, source_p, numeric|SND_EXPLICIT, "%s", parv[2]);
236	+	}
237	+	else
238	+	sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
239	+	numeric, chptr->chname, parv[2]);
240	+	}
241	+
242	+	/* handle_command()
243	+	*
244	+	* inputs       - pointer to message block
245	+	*              - pointer to client
246	+	*              - pointer to client message is from
247	+	*              - count of number of args
248	+	*              - pointer to argv[] array
249	+	* output       - -1 if error from server
250	+	* side effects -
251	+	*/
252	+	static void
253	+	parse_handle_command(struct Message *mptr, struct Client *source_p,
254	+	unsigned int i, char *para[])
255	+	{
256	+	if (IsServer(source_p->from))
257	+	++mptr->rcount;
258	+
259	+	++mptr->count;
260	+
261	+	/* Check right amount of parameters is passed... --is */
262	+	if (i < mptr->args_min)
263	+	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, mptr->cmd);
264	+	else
265	+	mptr->handlers[source_p->from->handler](source_p, i, para);
266	+	}
267
268		/*
269		* parse a buffer.
#	Line 123 | Line 275 | parse(struct Client *client_p, char *pbu
275		{
276		struct Client *from = client_p;
277		struct Message *msg_ptr = NULL;
278	+	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
279		char *ch = NULL;
280		char *s = NULL;
281	<	char *numeric = NULL;
281	>	unsigned int numeric = 0;
282		unsigned int parc = 0;
283		unsigned int paramcount;
284
#	Line 133 | Line 286 | parse(struct Client *client_p, char *pbu
286		return;
287
288		assert(client_p->localClient->fd.flags.open);
289	<	assert((bufend - pbuffer) < 512);
289	>	assert((bufend - pbuffer) < IRCD_BUFSIZE);
290
291	<	for (ch = pbuffer; *ch == ' '; ++ch) /* skip spaces */
292	<	/* null statement */ ;
291	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
292	>	;
293
294		if (*ch == ':')
295		{
#	Line 144 | Line 297 | parse(struct Client *client_p, char *pbu
297		* Copy the prefix to 'sender' assuming it terminates
298		* with SPACE (or NULL, which is an error, though).
299		*/
300	<	sender = ++ch;
300	>	const char *sender = ++ch;
301
302	<	if ((s = strchr(ch, ' ')) != NULL)
302	>	if ((s = strchr(ch, ' ')))
303		{
304		*s = '\0';
305		ch = ++s;
#	Line 154 | Line 307 | parse(struct Client *client_p, char *pbu
307
308		if (*sender && IsServer(client_p))
309		{
310	<	if ((from = find_person(client_p, sender)) == NULL)
311	<	from = hash_find_server(sender);
310	>	if ((from = hash_find_id(sender)) == NULL)
311	>	from = hash_find_client(sender);
312
313	<	/* Hmm! If the client corresponding to the
314	<	* prefix is not found--what is the correct
315	<	* action??? Now, I will ignore the message
316	<	* (old IRC just let it through as if the
164	<	* prefix just wasn't there...) --msa
313	>	/*
314	>	* Hmm! If the client corresponding to the prefix is not found--what is
315	>	* the correct action??? Now, I will ignore the message (old IRC just
316	>	* let it through as if the prefix just wasn't there...) --msa
317		*/
318		if (from == NULL)
319		{
320		++ServerStats.is_unpf;
321	<	remove_unknown(client_p, sender, pbuffer);
321	>	parse_remove_unknown(client_p, sender, pbuffer);
322		return;
323		}
324
325		if (from->from != client_p)
326		{
327		++ServerStats.is_wrdi;
328	<	cancel_clients(client_p, from, pbuffer);
328	>	parse_cancel_clients(client_p, from, pbuffer);
329		return;
330		}
331		}
#	Line 188 | Line 340 | parse(struct Client *client_p, char *pbu
340		return;
341		}
342
343	<	/* Extract the command code from the packet.  Point s to the end
343	>	/*
344	>	* Extract the command code from the packet. Point s to the end
345		* of the command code and calculate the length using pointer
346	<	* arithmetic.  Note: only need length for numerics and *all*
346	>	* arithmetic. Note: only need length for numerics and *all*
347		* numerics must have parameters and thus a space after the command
348		* code. -avalon
349		*/
350
351	<	/* EOB is 3 chars long but is not a numeric */
352	<	if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
351	>	/* EOB is 3 characters long but is not a numeric */
352	>	if (*(ch + 3) == ' ' &&  /* Ok, let's see if it's a possible numeric */
353		IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
354		{
355	<	numeric = ch;
356	<	paramcount = MAXPARA;
355	>	numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
356	>	paramcount = 2;  /* Destination, and the rest of it */
357		++ServerStats.is_num;
358	<	s = ch + 3;  /* I know this is ' ' from above if            */
359	<	*s++ = '\0'; /* blow away the ' ', and point s to next part */
358	>	s = ch + 3;  /* I know this is ' ' from above if */
359	>	*s++ = '\0';  /* Blow away the ' ', and point s to next part */
360		}
361		else
362	<	{
362	>	{
363		unsigned int ii = 0;
364
365	<	if ((s = strchr(ch, ' ')) != NULL)
365	>	if ((s = strchr(ch, ' ')))
366		*s++ = '\0';
367
368		if ((msg_ptr = find_command(ch)) == NULL)
369		{
370	<	/* Note: Give error message *only* to recognized
370	>	/*
371	>	* Note: Give error message *only* to recognized
372		* persons. It's a nightmare situation to have
373		* two programs sending "Unknown command"'s or
374		* equivalent to each other at full blast....
#	Line 224 | Line 378 | parse(struct Client *client_p, char *pbu
378		* Hm, when is the buffer empty -- if a command
379		* code has been found ?? -Armin
380		*/
381	<	if (*pbuffer != '\0')
228	<	{
381	>	if (*pbuffer)
382		if (IsClient(from))
383	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
231	<	me.name, from->name, ch);
232	<	}
383	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
384
385		++ServerStats.is_unco;
386		return;
387		}
388
389	<	assert(msg_ptr->cmd != NULL);
389	>	assert(msg_ptr->cmd);
390
391		paramcount = msg_ptr->args_max;
392		ii = bufend - ((s) ? s : ch);
#	Line 249 | Line 400 | parse(struct Client *client_p, char *pbu
400		* this last parameter (about same effect as ":" has...) --msa
401		*/
402
403	<	/* Note initially true: s==NULL || *(s-1) == '\0' !! */
403	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
404
405	<	para[parc] = from->name;
405	>	para[parc] = ch;
406	>
407	>	if (msg_ptr->flags & MFLG_EXTRA)
408	>	{
409	>	/*
410	>	* XXX: This will have to go away after the command handler rewrite
411	>	*/
412	>	para[++parc] = msg_ptr->extra;
413	>	}
414
415		if (s)
416		{
#	Line 269 | Line 428 | parse(struct Client *client_p, char *pbu
428		if (*s == ':')
429		{
430		/* The rest is a single parameter */
431	<	para[++parc] = s + 1;
431	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
432		break;
433		}
434
#	Line 285 | Line 444 | parse(struct Client *client_p, char *pbu
444
445		para[++parc] = NULL;
446
447	<	if (msg_ptr != NULL)
448	<	handle_command(msg_ptr, client_p, from, parc, para);
290	<	else
291	<	handle_numeric(numeric, client_p, from, parc, para);
292	<	}
293	<
294	<	/* handle_command()
295	<	*
296	<	* inputs       - pointer to message block
297	<	*              - pointer to client
298	<	*              - pointer to client message is from
299	<	*              - count of number of args
300	<	*              - pointer to argv[] array
301	<	* output       - -1 if error from server
302	<	* side effects -
303	<	*/
304	<	static void
305	<	handle_command(struct Message *mptr, struct Client *client_p,
306	<	struct Client *from, unsigned int i, char *hpara[MAXPARA])
307	<	{
308	<	MessageHandler handler = 0;
309	<
310	<	if (IsServer(client_p))
311	<	mptr->rcount++;
312	<
313	<	mptr->count++;
314	<
315	<	/* New patch to avoid server flooding from unregistered connects
316	<	* - Pie-Man 07/27/2000 */
317	<	if (!IsRegistered(client_p))
318	<	{
319	<	/* if its from a possible server connection
320	<	* ignore it.. more than likely its a header thats sneaked through
321	<	*/
322	<	if ((IsHandshake(client_p) || IsConnecting(client_p) ||
323	<	IsServer(client_p)) && !(mptr->flags & MFLG_UNREG))
324	<	return;
325	<	}
326	<
327	<	handler = mptr->handlers[client_p->handler];
328	<
329	<	/* check right amount of params is passed... --is */
330	<	if (i < mptr->args_min)
331	<	{
332	<	if (!IsServer(client_p))
333	<	{
334	<	sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
335	<	me.name, EmptyString(hpara[0]) ? "*" : hpara[0], mptr->cmd);
336	<	}
337	<	else
338	<	{
339	<	sendto_realops_flags(UMODE_ALL, L_ALL,
340	<	"Dropping server %s due to (invalid) command '%s' "
341	<	"with only %d arguments (expecting %d).",
342	<	client_p->name, mptr->cmd, i, mptr->args_min);
343	<	ilog(LOG_TYPE_IRCD, "Insufficient parameters (%d) for command '%s' from %s.",
344	<	i, mptr->cmd, client_p->name);
345	<	exit_client(client_p, client_p,
346	<	"Not enough arguments to server command.");
347	<	}
348	<	}
447	>	if (msg_ptr)
448	>	parse_handle_command(msg_ptr, from, parc, para);
449		else
450	<	(*handler)(client_p, from, i, hpara);
351	<	}
352	<
353	<	/* clear_tree_parse()
354	<	*
355	<	* inputs       - NONE
356	<	* output       - NONE
357	<	* side effects - MUST MUST be called at startup ONCE before
358	<	*                any other keyword routine is used.
359	<	*/
360	<	void
361	<	clear_tree_parse(void)
362	<	{
363	<	memset(&msg_tree, 0, sizeof(msg_tree));
450	>	parse_handle_numeric(numeric, from, parc, para);
451		}
452
453		/* add_msg_element()
#	Line 384 | Line 471 | clear_tree_parse(void)
471		* in the parent.
472		*/
473		static void
474	<	add_msg_element(struct MessageTree *mtree_p,
475	<	struct Message *msg_p, const char *cmd)
474	>	add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
475	>	const char *cmd)
476		{
477	<	struct MessageTree *ntree_p;
477	>	struct MessageTree *ntree_p = NULL;
478
479		if (*cmd == '\0')
480		{
481		mtree_p->msg = msg_p;
482	<	mtree_p->links++;           /* Have msg pointer, so up ref count */
482	>	mtree_p->links++;  /* Have msg pointer, so up ref count */
483		}
484		else
485		{
486	<	/* *cmd & (MAXPTRLEN-1)
486	>	/*
487	>	* *cmd & (MAXPTRLEN-1)
488		* convert the char pointed to at *cmd from ASCII to an integer
489		* between 0 and MAXPTRLEN.
490		* Thus 'A' -> 0x1 'B' -> 0x2 'c' -> 0x3 etc.
491		*/
404	–
492		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
493		{
494	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
494	>	ntree_p = MyCalloc(sizeof(struct MessageTree));
495		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
496
497	<	mtree_p->links++;         /* Have new pointer, so up ref count */
497	>	mtree_p->links++;  /* Have new pointer, so up ref count */
498		}
499
500		add_msg_element(ntree_p, msg_p, cmd + 1);
#	Line 432 | Line 519 | add_msg_element(struct MessageTree *mtre
519		*
520		* Then it pops up the recurse stack. As it comes back up the recurse
521		* The code checks to see if the child now has no pointers or msg
522	<	* i.e. the links count has gone to zero. If its no longer used, the
522	>	* i.e. the links count has gone to zero. If it's no longer used, the
523		* child struct MessageTree can be deleted. The parent reference
524		* to this child is then removed and the parents link count goes down.
525		* Thus, we continue to go back up removing all unused MessageTree(s)
#	Line 440 | Line 527 | add_msg_element(struct MessageTree *mtre
527		static void
528		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
529		{
530	<	struct MessageTree *ntree_p;
530	>	struct MessageTree *ntree_p = NULL;
531
532		/*
533		* In case this is called for a nonexistent command
534		* check that there is a msg pointer here, else links-- goes -ve
535		* -db
536		*/
537	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
537	>	if (*cmd == '\0' && mtree_p->msg)
538		{
539		mtree_p->msg = NULL;
540		mtree_p->links--;
541		}
542		else
543		{
544	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
544	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
545		{
546		del_msg_element(ntree_p, cmd + 1);
547
548		if (ntree_p->links == 0)
549		{
550	<	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
551	<	mtree_p->links--;
552	<	MyFree(ntree_p);
550	>	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
551	>	mtree_p->links--;
552	>	MyFree(ntree_p);
553		}
554		}
555		}
#	Line 476 | Line 563 | del_msg_element(struct MessageTree *mtre
563		* side effects - none
564		*/
565		static struct Message *
566	<	msg_tree_parse(const char *cmd, struct MessageTree *root)
566	>	msg_tree_parse(const char *cmd)
567		{
568	<	struct MessageTree *mtree = root;
568	>	struct MessageTree *mtree = &msg_tree;
569	>
570		assert(cmd && *cmd);
571
572		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
#	Line 493 | Line 581 | msg_tree_parse(const char *cmd, struct M
581		* inputs       - pointer to struct Message
582		* output       - none
583		* side effects - load this one command name
496	–	*                msg->count msg->bytes is modified in place, in
497	–	*                modules address space. Might not want to do that...
584		*/
585		void
586		mod_add_cmd(struct Message *msg)
587		{
588		assert(msg && msg->cmd);
589
590	<	/* command already added? */
591	<	if (msg_tree_parse(msg->cmd, &msg_tree))
590	>	/* Command already added? */
591	>	if (msg_tree_parse(msg->cmd))
592		return;
593
594		add_msg_element(&msg_tree, msg, msg->cmd);
509	–	msg->count = msg->rcount = msg->bytes = 0;
595		}
596
597		/* mod_del_cmd()
#	Line 520 | Line 605 | mod_del_cmd(struct Message *msg)
605		{
606		assert(msg && msg->cmd);
607
608	+	if (!msg_tree_parse(msg->cmd))
609	+	return;
610	+
611		del_msg_element(&msg_tree, msg->cmd);
612		}
613
#	Line 532 | Line 620 | mod_del_cmd(struct Message *msg)
620		struct Message *
621		find_command(const char *cmd)
622		{
623	<	return msg_tree_parse(cmd, &msg_tree);
623	>	return msg_tree_parse(cmd);
624		}
625
626		static void
627		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
628		{
629	<	unsigned int i;
629	>	if (mtree->msg)
630	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
631	>	mtree->msg->cmd,
632	>	mtree->msg->count, mtree->msg->bytes,
633	>	mtree->msg->rcount);
634
635	<	if (mtree->msg != NULL)
636	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
545	<	me.name, source_p->name, mtree->msg->cmd,
546	<	mtree->msg->count, mtree->msg->bytes,
547	<	mtree->msg->rcount);
548	<
549	<	for (i = 0; i < MAXPTRLEN; ++i)
550	<	if (mtree->pointers[i] != NULL)
635	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
636	>	if (mtree->pointers[i])
637		recurse_report_messages(source_p, mtree->pointers[i]);
638		}
639
#	Line 561 | Line 647 | void
647		report_messages(struct Client *source_p)
648		{
649		const struct MessageTree *mtree = &msg_tree;
564	–	unsigned int i;
650
651	<	for (i = 0; i < MAXPTRLEN; ++i)
652	<	if (mtree->pointers[i] != NULL)
651	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
652	>	if (mtree->pointers[i])
653		recurse_report_messages(source_p, mtree->pointers[i]);
654		}
655
571	–	/* cancel_clients()
572	–	*
573	–	* inputs       -
574	–	* output       -
575	–	* side effects -
576	–	*/
577	–	static int
578	–	cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
579	–	{
580	–	/* kill all possible points that are causing confusion here,
581	–	* I'm not sure I've got this all right...
582	–	* - avalon
583	–	*
584	–	* knowing avalon, probably not.
585	–	*/
586	–
587	–	/* with TS, fake prefixes are a common thing, during the
588	–	* connect burst when there's a nick collision, and they
589	–	* must be ignored rather than killed because one of the
590	–	* two is surviving.. so we don't bother sending them to
591	–	* all ops everytime, as this could send 'private' stuff
592	–	* from lagged clients. we do send the ones that cause
593	–	* servers to be dropped though, as well as the ones from
594	–	* non-TS servers -orabidoo
595	–	*/
596	–	/* Incorrect prefix for a server from some connection.  If it is a
597	–	* client trying to be annoying, just QUIT them, if it is a server
598	–	* then the same deal.
599	–	*/
600	–	if (IsServer(source_p) || IsMe(source_p))
601	–	{
602	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, "Message for %s[%s] from %s",
603	–	source_p->name, source_p->from->name,
604	–	get_client_name(client_p, SHOW_IP));
605	–	sendto_realops_flags(UMODE_DEBUG, L_OPER,  "Message for %s[%s] from %s",
606	–	source_p->name, source_p->from->name,
607	–	get_client_name(client_p, MASK_IP));
608	–	sendto_realops_flags(UMODE_DEBUG, L_ALL,
609	–	"Not dropping server %s (%s) for Fake Direction",
610	–	client_p->name, source_p->name);
611	–	return -1;
612	–	/* return exit_client(client_p, client_p, &me, "Fake Direction");*/
613	–	}
614	–
615	–	/* Ok, someone is trying to impose as a client and things are
616	–	* confused.  If we got the wrong prefix from a server, send out a
617	–	* kill, else just exit the lame client.
618	–	*/
619	–	/* If the fake prefix is coming from a TS server, discard it
620	–	* silently -orabidoo
621	–	*
622	–	* all servers must be TS these days --is
623	–	*/
624	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
625	–	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
626	–	source_p->name, source_p->username, source_p->host,
627	–	source_p->from->name, get_client_name(client_p, SHOW_IP));
628	–	sendto_realops_flags(UMODE_DEBUG, L_OPER,
629	–	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
630	–	source_p->name, source_p->username, source_p->host,
631	–	source_p->from->name, get_client_name(client_p, MASK_IP));
632	–
633	–	return 0;
634	–	}
635	–
636	–	/* remove_unknown()
637	–	*
638	–	* inputs       -
639	–	* output       -
640	–	* side effects -
641	–	*/
642	–	static void
643	–	remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
644	–	{
645	–	/* Do kill if it came from a server because it means there is a ghost
646	–	* user on the other server which needs to be removed. -avalon
647	–	* Tell opers about this. -Taner
648	–	*/
649	–	/* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
650	–	* 'nodots'          is a nickname (KILL)
651	–	* 'no.dot.at.start' is a server   (SQUIT)
652	–	*/
653	–	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) ||
654	–	strchr(lsender, '.') != NULL)
655	–	{
656	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
657	–	"Unknown prefix (%s) from %s, Squitting %s",
658	–	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
659	–	sendto_realops_flags(UMODE_DEBUG, L_OPER,
660	–	"Unknown prefix (%s) from %s, Squitting %s",
661	–	lbuffer, client_p->name, lsender);
662	–	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
663	–	me.name, lsender, lbuffer, client_p->name);
664	–	}
665	–	else
666	–	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
667	–	me.name, lsender, me.name);
668	–	}
669	–
670	–	/*
671	–	*
672	–	*      parc    number of arguments ('sender' counted as one!)
673	–	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
674	–	*      parv[1]..parv[parc-1]
675	–	*              pointers to additional parameters, this is a NULL
676	–	*              terminated list (parv[parc] == NULL).
677	–	*
678	–	* *WARNING*
679	–	*      Numerics are mostly error reports. If there is something
680	–	*      wrong with the message, just *DROP* it! Don't even think of
681	–	*      sending back a neat error message -- big danger of creating
682	–	*      a ping pong error message...
683	–	*/
684	–	static void
685	–	handle_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
686	–	int parc, char *parv[])
687	–	{
688	–	struct Client *target_p;
689	–	struct Channel *chptr;
690	–	char *t;    /* current position within the buffer */
691	–	int i, tl;  /* current length of presently being built string in t */
692	–
693	–	if (parc < 2 || !IsServer(source_p))
694	–	return;
695	–
696	–	/* Remap low number numerics. */
697	–	if (numeric[0] == '0')
698	–	numeric[0] = '1';
699	–
700	–	/* Prepare the parameter portion of the message into 'buffer'.
701	–	* (Because the buffer is twice as large as the message buffer
702	–	* for the socket, no overflow can occur here... ...on current
703	–	* assumptions--bets are off, if these are changed --msa)
704	–	*/
705	–	t = buffer;
706	–	for (i = 2; i < (parc - 1); i++)
707	–	{
708	–	tl = ircsprintf(t, " %s", parv[i]);
709	–	t += tl;
710	–	}
711	–
712	–	ircsprintf(t," :%s", parv[parc-1]);
713	–
714	–	if (((target_p = find_person(client_p, parv[1])) != NULL) ||
715	–	((target_p = hash_find_server(parv[1])) != NULL))
716	–	{
717	–	if (IsMe(target_p))
718	–	{
719	–	int num;
720	–
721	–	/*
722	–	* We shouldn't get numerics sent to us,
723	–	* any numerics we do get indicate a bug somewhere..
724	–	*/
725	–	/* ugh.  this is here because of nick collisions.  when two servers
726	–	* relink, they burst each other their nicks, then perform collides.
727	–	* if there is a nick collision, BOTH servers will kill their own
728	–	* nicks, and BOTH will kill the other servers nick, which wont exist,
729	–	* because it will have been already killed by the local server.
730	–	*
731	–	* unfortunately, as we cant guarantee other servers will do the
732	–	* "right thing" on a nick collision, we have to keep both kills.
733	–	* ergo we need to ignore ERR_NOSUCHNICK. --fl_
734	–	*/
735	–	/* quick comment. This _was_ tried. i.e. assume the other servers
736	–	* will do the "right thing" and kill a nick that is colliding.
737	–	* unfortunately, it did not work. --Dianora
738	–	*/
739	–
740	–	/* Yes, a good compiler would have optimised this, but
741	–	* this is probably easier to read. -db
742	–	*/
743	–	num = atoi(numeric);
744	–
745	–	if ((num != ERR_NOSUCHNICK))
746	–	sendto_realops_flags(UMODE_ALL, L_ADMIN,
747	–	"*** %s(via %s) sent a %s numeric to me: %s",
748	–	source_p->name, client_p->name, numeric, buffer);
749	–	return;
750	–	}
751	–	else if (target_p->from == client_p)
752	–	{
753	–	/* This message changed direction (nick collision?)
754	–	* ignore it.
755	–	*/
756	–	return;
757	–	}
758	–
759	–	/* csircd will send out unknown umode flag for +a (admin), drop it here. */
760	–	if ((atoi(numeric) == ERR_UMODEUNKNOWNFLAG) && MyClient(target_p))
761	–	return;
762	–
763	–	/* Fake it for server hiding, if its our client */
764	–	if (ConfigServerHide.hide_servers &&
765	–	MyClient(target_p) && !HasUMode(target_p, UMODE_OPER))
766	–	sendto_one(target_p, ":%s %s %s%s", me.name, numeric, target_p->name, buffer);
767	–	else
768	–	sendto_one(target_p, ":%s %s %s%s", ID_or_name(source_p, target_p->from),
769	–	numeric, ID_or_name(target_p, target_p->from), buffer);
770	–	return;
771	–	}
772	–	else if ((chptr = hash_find_channel(parv[1])) != NULL)
773	–	sendto_channel_local(ALL_MEMBERS, 0, chptr,
774	–	":%s %s %s %s",
775	–	source_p->name,
776	–	numeric, chptr->chname, buffer);
777	–	}
778	–
656		/* m_not_oper()
657	<	* inputs       -
657	>	* inputs       -
658		* output       -
659		* side effects - just returns a nastyogram to given user
660		*/
661	<	void
662	<	m_not_oper(struct Client *client_p, struct Client *source_p,
786	<	int parc, char *parv[])
787	<	{
788	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
789	<	me.name, source_p->name);
790	<	}
791	<
792	<	void
793	<	m_unregistered(struct Client *client_p, struct Client *source_p,
794	<	int parc, char *parv[])
661	>	int
662	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
663		{
664	<	sendto_one(source_p, form_str(ERR_NOTREGISTERED), me.name,
665	<	source_p->name[0] ? source_p->name : "*");
664	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
665	>	return 0;
666		}
667
668	<	void
669	<	m_registered(struct Client *client_p, struct Client *source_p,
802	<	int parc, char *parv[])
668	>	int
669	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
670		{
671	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
672	<	me.name, source_p->name);
671	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
672	>	return 0;
673		}
674
675	<	void
676	<	m_ignore(struct Client *client_p, struct Client *source_p,
810	<	int parc, char *parv[])
675	>	int
676	>	m_registered(struct Client *source_p, int parc, char *parv[])
677		{
678	<	return;
678	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
679	>	return 0;
680		}
681
682	<	void
683	<	rfc1459_command_send_error(struct Client *client_p, struct Client *source_p,
817	<	int parc, char *parv[])
682	>	int
683	>	m_ignore(struct Client *source_p, int parc, char *parv[])
684		{
685	<	const char *in_para;
820	<
821	<	in_para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
822	<
823	<	ilog(LOG_TYPE_IRCD, "Received ERROR message from %s: %s",
824	<	source_p->name, in_para);
825	<
826	<	if (client_p == source_p)
827	<	{
828	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s -- %s",
829	<	get_client_name(client_p, HIDE_IP), in_para);
830	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "ERROR :from %s -- %s",
831	<	get_client_name(client_p, MASK_IP), in_para);
832	<	}
833	<	else
834	<	{
835	<	sendto_realops_flags(UMODE_ALL, L_OPER, "ERROR :from %s via %s -- %s",
836	<	source_p->name, get_client_name(client_p, MASK_IP), in_para);
837	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s via %s -- %s",
838	<	source_p->name, get_client_name(client_p, HIDE_IP), in_para);
839	<	}
840	<
841	<	if (MyClient(source_p))
842	<	exit_client(source_p, source_p, "ERROR");
685	>	return 0;
686		}

Diff Legend

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