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 1298 by michael, Tue Feb 28 18:51:13 2012 UTC vs.
ircd-hybrid/trunk/src/parse.c (file contents), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 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-2017 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 parse.c
23	>	* \brief The message parser.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 27 | Line 29
29		#include "parse.h"
30		#include "channel.h"
31		#include "hash.h"
32	+	#include "id.h"
33		#include "irc_string.h"
31	–	#include "sprintf_irc.h"
34		#include "ircd.h"
35		#include "numeric.h"
36	<	#include "s_log.h"
36	>	#include "log.h"
37		#include "send.h"
38	<	#include "s_conf.h"
38	>	#include "conf.h"
39		#include "memory.h"
40	<	#include "s_user.h"
41	<	#include "s_serv.h"
40	>	#include "user.h"
41	>	#include "server.h"
42	>
43
44		/*
45		* (based on orabidoo's parser code)
#	Line 52 | Line 55
55		* 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
56		*   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
57		*
58	<	*                               'i' -> [MessageTree *] -> 'e' and matches
58	>	*                               'i' -> [MessageTree *] -> 'e' and matches
59		*
60		* BUGS (Limitations!)
61	<	*
61	>	*
62		* I designed this trie to parse ircd commands. Hence it currently
63		* casefolds. This is trivial to fix by increasing MAXPTRLEN.
64		* This trie also "folds" '{' etc. down. This means, the input to this
#	Line 65 | Line 68
68		* MAXPTRLEN 128.
69		*
70		* This is also not a patricia trie. On short ircd tokens, this is
71	<	* not likely going to matter.
71	>	* not likely going to matter.
72		*
73		* Diane Bruce (Dianora), June 6 2003
74		*/
75
76	<	#define MAXPTRLEN       32
77	<	/* Must be a power of 2, and
78	<	* larger than 26 [a-z]|[A-Z]
79	<	* its used to allocate the set
80	<	* of pointers at each node of the tree
81	<	* There are MAXPTRLEN pointers at each node.
82	<	* Obviously, there have to be more pointers
83	<	* Than ASCII letters. 32 is a nice number
84	<	* since there is then no need to shift
85	<	* 'A'/'a' to base 0 index, at the expense
86	<	* of a few never used pointers. For a small
87	<	* parser like this, this is a good compromise
88	<	* and does make it somewhat faster.
89	<	*
90	<	* - Dianora
91	<	*/
92	<
93	<	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	<	*/
76	>	/*
77	>	* Must be a power of 2, and larger than 26 [a-z]|[A-Z]. It's used to allocate
78	>	* the set of pointers at each node of the tree.
79	>	* There are MAXPTRLEN pointers at each node. Obviously, there have to be more
80	>	* pointers than ASCII letters. 32 is a nice number since there is then no need
81	>	* to shift 'A'/'a' to base 0 index, at the expense of a few never used
82	>	* pointers.
83	>	* For a small parser like this, this is a good compromise and does
84	>	* make it somewhat faster. - Dianora
85	>	*/
86	>	enum { MAXPTRLEN = 32 };
87	>
88	>
89	>	static struct MessageTree
90	>	{
91	>	int links; /* Count of all pointers (including msg) at this node
92	>	* used as reference count for deletion of _this_ node.
93	>	*/
94		struct Message *msg;
95		struct MessageTree *pointers[MAXPTRLEN];
96	<	};
96	>	} msg_tree;
97	>
98
99	<	static struct MessageTree msg_tree;
99	>	/* remove_unknown()
100	>	*
101	>	* inputs       -
102	>	* output       -
103	>	* side effects -
104	>	*/
105	>	static void
106	>	parse_remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
107	>	{
108	>	/*
109	>	* Do kill if it came from a server because it means there is a ghost
110	>	* user on the other server which needs to be removed. -avalon
111	>	* Tell opers about this. -Taner
112	>	*/
113	>	/*
114	>	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
115	>	* 'nodots'          is a nickname (KILL)
116	>	* 'no.dot.at.start' is a server   (SQUIT)
117	>	*/
118	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
119	>	{
120	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
121	>	"Unknown prefix (%s) from %s, Squitting %s",
122	>	lbuffer, client_get_name(client_p, SHOW_IP), lsender);
123	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
124	>	"Unknown prefix (%s) from %s, Squitting %s",
125	>	lbuffer, client_get_name(client_p, MASK_IP), lsender);
126	>	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
127	>	me.id, lsender, lbuffer, client_p->name);
128	>	}
129	>	else
130	>	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
131	>	me.id, lsender, me.name);
132	>	}
133
134		/*
135	<	* NOTE: parse() should not be called recursively by other functions!
135	>	*
136	>	*      parc    number of arguments ('sender' counted as one!)
137	>	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
138	>	*      parv[1]..parv[parc-1]
139	>	*              pointers to additional parameters, this is a NULL
140	>	*              terminated list (parv[parc] == NULL).
141	>	*
142	>	* *WARNING*
143	>	*      Numerics are mostly error reports. If there is something
144	>	*      wrong with the message, just *DROP* it! Don't even think of
145	>	*      sending back a neat error message -- big danger of creating
146	>	*      a ping pong error message...
147	>	*
148	>	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
149	>	*
150	>	* Called when we get a numeric message from a remote _server_ and we are
151	>	* supposed to forward it somewhere. Note that we always ignore numerics sent
152	>	* to 'me' and simply drop the message if we can't handle with this properly:
153	>	* the savvy approach is NEVER generate an error in response to an... error :)
154		*/
155	<	static char *sender;
156	<	static char *para[MAXPARA + 1];
157	<	static char buffer[1024];
158	<
159	<	static int cancel_clients(struct Client *, struct Client *, char *);
160	<	static void remove_unknown(struct Client *, char *, char *);
161	<	static void handle_numeric(char[], struct Client *, struct Client *, int, char *[]);
162	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char *[]);
163	<	static void add_msg_element(struct MessageTree *, struct Message *, const char *);
164	<	static void del_msg_element(struct MessageTree *, const char *);
155	>	static void
156	>	parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
157	>	{
158	>	struct Client *target_p = NULL;
159	>	struct Channel *chptr = NULL;
160	>
161	>	/*
162	>	* Avoid trash, we need it to come from a server and have a target
163	>	*/
164	>	if (parc < 2 || !IsServer(source_p))
165	>	return;
166
167	+	/*
168	+	* Who should receive this message ? Will we do something with it ?
169	+	* Note that we use findUser functions, so the target can't be neither
170	+	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
171	+	* should never generate numeric replies to non-users anyway
172	+	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
173	+	*/
174	+	if (IsChanPrefix(*parv[1]))
175	+	chptr = hash_find_channel(parv[1]);
176	+	else
177	+	target_p = find_person(source_p, parv[1]);
178	+
179	+	if ((!target_p || target_p->from == source_p->from) && !chptr)
180	+	return;
181	+
182	+	/*
183	+	* Remap low number numerics, not that I understand WHY.. --Nemesi
184	+	*/
185	+	/*
186	+	* Numerics below 100 talk about the current 'connection', you're not
187	+	* connected to a remote server so it doesn't make sense to send them
188	+	* remotely - but the information they contain may be useful, so we
189	+	* remap them up. Weird, but true.  -- Isomer
190	+	*/
191	+	if (numeric < 100)
192	+	numeric += 100;
193	+
194	+	if (target_p)
195	+	{
196	+	/* Fake it for server hiding, if it's our client */
197	+	if ((ConfigServerHide.hide_servers || IsHidden(source_p)) && MyConnect(target_p) &&
198	+	!HasUMode(target_p, UMODE_OPER))
199	+	sendto_one_numeric(target_p, &me, numeric | SND_EXPLICIT, "%s", parv[2]);
200	+	else
201	+	sendto_one_numeric(target_p, source_p, numeric | SND_EXPLICIT, "%s", parv[2]);
202	+	}
203	+	else
204	+	sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
205	+	numeric, chptr->name, parv[2]);
206	+	}
207	+
208	+	/* handle_command()
209	+	*
210	+	* inputs       - pointer to message block
211	+	*              - pointer to client
212	+	*              - pointer to client message is from
213	+	*              - count of number of args
214	+	*              - pointer to argv[] array
215	+	* output       - -1 if error from server
216	+	* side effects -
217	+	*/
218	+	static void
219	+	parse_handle_command(struct Message *message, struct Client *source_p,
220	+	unsigned int i, char *para[])
221	+	{
222	+	if (IsServer(source_p->from))
223	+	++message->rcount;
224	+
225	+	++message->count;
226	+
227	+	/* Check right amount of parameters is passed... --is */
228	+	if (i < message->args_min)
229	+	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, message->cmd);
230	+	else
231	+	message->handlers[source_p->from->handler](source_p, i, para);
232	+	}
233
234		/*
235		* parse a buffer.
#	Line 122 | Line 240 | void
240		parse(struct Client *client_p, char *pbuffer, char *bufend)
241		{
242		struct Client *from = client_p;
243	<	struct Message *msg_ptr = NULL;
243	>	struct Message *message = NULL;
244	>	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
245		char *ch = NULL;
246		char *s = NULL;
247	<	char *numeric = NULL;
247	>	unsigned int numeric = 0;
248		unsigned int parc = 0;
249		unsigned int paramcount;
250
251		if (IsDefunct(client_p))
252		return;
253
254	<	assert(client_p->localClient->fd.flags.open);
255	<	assert((bufend - pbuffer) < 512);
254	>	assert(client_p->connection->fd.flags.open);
255	>	assert((bufend - pbuffer) < IRCD_BUFSIZE);
256
257	<	for (ch = pbuffer; *ch == ' '; ++ch) /* skip spaces */
258	<	/* null statement */ ;
257	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
258	>	;
259
260		if (*ch == ':')
261		{
#	Line 144 | Line 263 | parse(struct Client *client_p, char *pbu
263		* Copy the prefix to 'sender' assuming it terminates
264		* with SPACE (or NULL, which is an error, though).
265		*/
266	<	sender = ++ch;
266	>	const char *const sender = ++ch;
267
268	<	if ((s = strchr(ch, ' ')) != NULL)
268	>	if ((s = strchr(ch, ' ')))
269		{
270		*s = '\0';
271		ch = ++s;
#	Line 154 | Line 273 | parse(struct Client *client_p, char *pbu
273
274		if (*sender && IsServer(client_p))
275		{
276	<	if ((from = find_person(client_p, sender)) == NULL)
277	<	from = hash_find_server(sender);
276	>	if ((from = hash_find_id(sender)) == NULL)
277	>	from = hash_find_client(sender);
278
279	<	/* Hmm! If the client corresponding to the
280	<	* prefix is not found--what is the correct
281	<	* action??? Now, I will ignore the message
282	<	* (old IRC just let it through as if the
164	<	* prefix just wasn't there...) --msa
279	>	/*
280	>	* Hmm! If the client corresponding to the prefix is not found--what is
281	>	* the correct action??? Now, I will ignore the message (old IRC just
282	>	* let it through as if the prefix just wasn't there...) --msa
283		*/
284		if (from == NULL)
285		{
286		++ServerStats.is_unpf;
287	<	remove_unknown(client_p, sender, pbuffer);
287	>	parse_remove_unknown(client_p, sender, pbuffer);
288		return;
289		}
290
291		if (from->from != client_p)
292		{
293		++ServerStats.is_wrdi;
294	<	cancel_clients(client_p, from, pbuffer);
294	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
295	>	"Fake direction: dropped message from %s[%s] via %s",
296	>	from->name, from->from->name,
297	>	client_get_name(client_p, SHOW_IP));
298	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
299	>	"Fake direction: dropped message from %s[%s] via %s",
300	>	from->name, from->from->name,
301	>	client_get_name(client_p, MASK_IP));
302		return;
303		}
304		}
#	Line 188 | Line 313 | parse(struct Client *client_p, char *pbu
313		return;
314		}
315
316	<	/* Extract the command code from the packet.  Point s to the end
316	>	/*
317	>	* Extract the command code from the packet. Point s to the end
318		* of the command code and calculate the length using pointer
319	<	* arithmetic.  Note: only need length for numerics and *all*
319	>	* arithmetic. Note: only need length for numerics and *all*
320		* numerics must have parameters and thus a space after the command
321		* code. -avalon
322		*/
323
324	<	/* EOB is 3 chars long but is not a numeric */
325	<	if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
324	>	/* EOB is 3 characters long but is not a numeric */
325	>	if (*(ch + 3) == ' ' &&  /* Ok, let's see if it's a possible numeric */
326		IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
327		{
328	<	numeric = ch;
329	<	paramcount = MAXPARA;
328	>	numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
329	>	paramcount = 2;  /* Destination, and the rest of it */
330		++ServerStats.is_num;
331	<	s = ch + 3;  /* I know this is ' ' from above if            */
332	<	*s++ = '\0'; /* blow away the ' ', and point s to next part */
331	>	s = ch + 3;  /* I know this is ' ' from above if */
332	>	*s++ = '\0';  /* Blow away the ' ', and point s to next part */
333		}
334		else
335	<	{
336	<	unsigned int ii = 0;
211	<
212	<	if ((s = strchr(ch, ' ')) != NULL)
335	>	{
336	>	if ((s = strchr(ch, ' ')))
337		*s++ = '\0';
338
339	<	if ((msg_ptr = find_command(ch)) == NULL)
339	>	if ((message = find_command(ch)) == NULL)
340		{
341	<	/* Note: Give error message *only* to recognized
341	>	/*
342	>	* Note: Give error message *only* to recognized
343		* persons. It's a nightmare situation to have
344		* two programs sending "Unknown command"'s or
345		* equivalent to each other at full blast....
#	Line 224 | Line 349 | parse(struct Client *client_p, char *pbu
349		* Hm, when is the buffer empty -- if a command
350		* code has been found ?? -Armin
351		*/
352	<	if (*pbuffer != '\0')
228	<	{
352	>	if (*pbuffer)
353		if (IsClient(from))
354	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
231	<	me.name, from->name, ch);
232	<	}
354	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
355
356		++ServerStats.is_unco;
357		return;
358		}
359
360	<	assert(msg_ptr->cmd != NULL);
360	>	assert(message->cmd);
361
362	<	paramcount = msg_ptr->args_max;
363	<	ii = bufend - ((s) ? s : ch);
364	<	msg_ptr->bytes += ii;
362	>	paramcount = message->args_max;
363	>
364	>	size_t length = bufend - ((s) ? s : ch);
365	>	message->bytes += length;
366		}
367
368		/*
#	Line 249 | Line 372 | parse(struct Client *client_p, char *pbu
372		* this last parameter (about same effect as ":" has...) --msa
373		*/
374
375	<	/* Note initially true: s==NULL || *(s-1) == '\0' !! */
375	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
376
377	<	para[parc] = from->name;
377	>	para[parc] = ch;
378	>
379	>	if (message && (message->flags & MFLG_EXTRA))
380	>	{
381	>	/*
382	>	* XXX: This will have to go away after the command handler rewrite
383	>	*/
384	>	para[++parc] = message->extra;
385	>	}
386
387		if (s)
388		{
#	Line 268 | Line 399 | parse(struct Client *client_p, char *pbu
399
400		if (*s == ':')
401		{
402	<	/* The rest is a single parameter */
403	<	para[++parc] = s + 1;
402	>	/* The rest is single parameter--can include blanks also. */
403	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
404		break;
405		}
406
#	Line 285 | Line 416 | parse(struct Client *client_p, char *pbu
416
417		para[++parc] = NULL;
418
419	<	if (msg_ptr != NULL)
420	<	handle_command(msg_ptr, client_p, from, parc, para);
419	>	if (message)
420	>	parse_handle_command(message, from, parc, para);
421		else
422	<	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	<	}
349	<	else
350	<	(*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));
422	>	parse_handle_numeric(numeric, from, parc, para);
423		}
424
425		/* add_msg_element()
#	Line 384 | Line 443 | clear_tree_parse(void)
443		* in the parent.
444		*/
445		static void
446	<	add_msg_element(struct MessageTree *mtree_p,
447	<	struct Message *msg_p, const char *cmd)
446	>	add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
447	>	const char *cmd)
448		{
449	<	struct MessageTree *ntree_p;
449	>	struct MessageTree *ntree_p = NULL;
450
451		if (*cmd == '\0')
452		{
453		mtree_p->msg = msg_p;
454	<	mtree_p->links++;           /* Have msg pointer, so up ref count */
454	>	mtree_p->links++;  /* Have msg pointer, so up ref count */
455		}
456		else
457		{
458	<	/* *cmd & (MAXPTRLEN-1)
458	>	/*
459	>	* *cmd & (MAXPTRLEN-1)
460		* convert the char pointed to at *cmd from ASCII to an integer
461		* between 0 and MAXPTRLEN.
462		* Thus 'A' -> 0x1 'B' -> 0x2 'c' -> 0x3 etc.
463		*/
404	–
464		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
465		{
466	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
466	>	ntree_p = xcalloc(sizeof(struct MessageTree));
467		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
468
469	<	mtree_p->links++;         /* Have new pointer, so up ref count */
469	>	mtree_p->links++;  /* Have new pointer, so up ref count */
470		}
471
472		add_msg_element(ntree_p, msg_p, cmd + 1);
#	Line 432 | Line 491 | add_msg_element(struct MessageTree *mtre
491		*
492		* Then it pops up the recurse stack. As it comes back up the recurse
493		* The code checks to see if the child now has no pointers or msg
494	<	* i.e. the links count has gone to zero. If its no longer used, the
494	>	* i.e. the links count has gone to zero. If it's no longer used, the
495		* child struct MessageTree can be deleted. The parent reference
496		* to this child is then removed and the parents link count goes down.
497		* Thus, we continue to go back up removing all unused MessageTree(s)
#	Line 440 | Line 499 | add_msg_element(struct MessageTree *mtre
499		static void
500		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
501		{
502	<	struct MessageTree *ntree_p;
502	>	struct MessageTree *ntree_p = NULL;
503
504		/*
505		* In case this is called for a nonexistent command
506		* check that there is a msg pointer here, else links-- goes -ve
507		* -db
508		*/
509	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
509	>	if (*cmd == '\0' && mtree_p->msg)
510		{
511		mtree_p->msg = NULL;
512		mtree_p->links--;
513		}
514		else
515		{
516	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
516	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
517		{
518		del_msg_element(ntree_p, cmd + 1);
519
520		if (ntree_p->links == 0)
521		{
522	<	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
523	<	mtree_p->links--;
524	<	MyFree(ntree_p);
522	>	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
523	>	mtree_p->links--;
524	>	xfree(ntree_p);
525		}
526		}
527		}
#	Line 476 | Line 535 | del_msg_element(struct MessageTree *mtre
535		* side effects - none
536		*/
537		static struct Message *
538	<	msg_tree_parse(const char *cmd, struct MessageTree *root)
538	>	msg_tree_parse(const char *cmd)
539		{
540	<	struct MessageTree *mtree = root;
541	<	assert(cmd && *cmd);
540	>	struct MessageTree *mtree = &msg_tree;
541	>
542	>	assert(!EmptyString(cmd));
543
544		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
545		if (*++cmd == '\0')
#	Line 493 | Line 553 | msg_tree_parse(const char *cmd, struct M
553		* inputs       - pointer to struct Message
554		* output       - none
555		* 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...
556		*/
557		void
558		mod_add_cmd(struct Message *msg)
559		{
560	<	assert(msg && msg->cmd);
560	>	assert(msg);
561	>	assert(msg->cmd);
562
563	<	/* command already added? */
564	<	if (msg_tree_parse(msg->cmd, &msg_tree))
563	>	/* Command already added? */
564	>	if (msg_tree_parse(msg->cmd))
565		return;
566
567		add_msg_element(&msg_tree, msg, msg->cmd);
509	–	msg->count = msg->rcount = msg->bytes = 0;
568		}
569
570		/* mod_del_cmd()
#	Line 518 | Line 576 | mod_add_cmd(struct Message *msg)
576		void
577		mod_del_cmd(struct Message *msg)
578		{
579	<	assert(msg && msg->cmd);
579	>	assert(msg);
580	>	assert(msg->cmd);
581	>
582	>	if (!msg_tree_parse(msg->cmd))
583	>	return;
584
585		del_msg_element(&msg_tree, msg->cmd);
586		}
#	Line 532 | Line 594 | mod_del_cmd(struct Message *msg)
594		struct Message *
595		find_command(const char *cmd)
596		{
597	<	return msg_tree_parse(cmd, &msg_tree);
597	>	return msg_tree_parse(cmd);
598		}
599
600		static void
601		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
602		{
603	<	unsigned int i;
603	>	if (mtree->msg)
604	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
605	>	mtree->msg->cmd,
606	>	mtree->msg->count, mtree->msg->bytes,
607	>	mtree->msg->rcount);
608
609	<	if (mtree->msg != NULL)
610	<	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)
609	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
610	>	if (mtree->pointers[i])
611		recurse_report_messages(source_p, mtree->pointers[i]);
612		}
613
#	Line 560 | Line 620 | recurse_report_messages(struct Client *s
620		void
621		report_messages(struct Client *source_p)
622		{
623	<	const struct MessageTree *mtree = &msg_tree;
564	<	unsigned int i;
623	>	const struct MessageTree *const mtree = &msg_tree;
624
625	<	for (i = 0; i < MAXPTRLEN; ++i)
626	<	if (mtree->pointers[i] != NULL)
625	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
626	>	if (mtree->pointers[i])
627		recurse_report_messages(source_p, mtree->pointers[i]);
628		}
629
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	–
630		/* m_not_oper()
631	<	* inputs       -
631	>	* inputs       -
632		* output       -
633		* side effects - just returns a nastyogram to given user
634		*/
635	<	void
636	<	m_not_oper(struct Client *client_p, struct Client *source_p,
786	<	int parc, char *parv[])
635	>	int
636	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
637		{
638	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
639	<	me.name, source_p->name);
638	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
639	>	return 0;
640		}
641
642	<	void
643	<	m_unregistered(struct Client *client_p, struct Client *source_p,
794	<	int parc, char *parv[])
642	>	int
643	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
644		{
645	<	sendto_one(source_p, form_str(ERR_NOTREGISTERED), me.name,
646	<	source_p->name[0] ? source_p->name : "*");
645	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
646	>	return 0;
647		}
648
649	<	void
650	<	m_registered(struct Client *client_p, struct Client *source_p,
802	<	int parc, char *parv[])
649	>	int
650	>	m_registered(struct Client *source_p, int parc, char *parv[])
651		{
652	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
653	<	me.name, source_p->name);
806	<	}
807	<
808	<	void
809	<	m_ignore(struct Client *client_p, struct Client *source_p,
810	<	int parc, char *parv[])
811	<	{
812	<	return;
652	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
653	>	return 0;
654		}
655
656	<	void
657	<	rfc1459_command_send_error(struct Client *client_p, struct Client *source_p,
817	<	int parc, char *parv[])
656	>	int
657	>	m_ignore(struct Client *source_p, int parc, char *parv[])
658		{
659	<	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");
659	>	return 0;
660		}

Comparing:
ircd-hybrid-8/src/parse.c (property svn:keywords), Revision 1298 by michael, Tue Feb 28 18:51:13 2012 UTC vs.
ircd-hybrid/trunk/src/parse.c (property svn:keywords), Revision 7997 by michael, Tue Mar 14 13:17:52 2017 UTC

#	Line 1 | Line 1
1	<	Id Revision
1	>	Id

Diff Legend

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