ViewVC Help

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

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

Comparing:
ircd-hybrid-7.3/src/parse.c (file contents), Revision 1118 by michael, Thu Jan 6 13:39:10 2011 UTC vs.
ircd-hybrid/trunk/src/parse.c (file contents), Revision 6350 by michael, Tue Aug 11 17:53:44 2015 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-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 parse.c
23	>	* \brief The message parser.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
26	–	#include "parse.h"
28		#include "client.h"
29	+	#include "parse.h"
30		#include "channel.h"
29	–	#include "handlers.h"
30	–	#include "common.h"
31		#include "hash.h"
32	+	#include "id.h"
33		#include "irc_string.h"
33	–	#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 "ircd_handler.h"
39	<	#include "msg.h"
40	<	#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 56 | 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 69 | 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
95	<	{
96	<	int links; /* Count of all pointers (including msg) at this node
97	<	* used as reference count for deletion of _this_ node.
98	<	*/
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
103	–	static struct MessageTree msg_tree;
98
99	<	/*
100	<	* NOTE: parse() should not be called recursively by other functions!
99	>	/* remove_unknown()
100	>	*
101	>	* inputs       -
102	>	* output       -
103	>	* side effects -
104		*/
105	<	static char *sender;
106	<	static char *para[MAXPARA + 1];
107	<	static char buffer[1024];
108	<
109	<	static int cancel_clients(struct Client *, struct Client *, char *);
110	<	static void remove_unknown(struct Client *, char *, char *);
111	<	static void do_numeric(char[], struct Client *, struct Client *, int, char **);
112	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char **);
113	<	static void recurse_report_messages(struct Client *, const struct MessageTree *);
114	<	static void add_msg_element(struct MessageTree *, struct Message *, const char *);
115	<	static void del_msg_element(struct MessageTree *, const char *);
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, get_client_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_p->name, 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	<	/* turn a string into a parc/parv pair */
135	<	static inline int
136	<	string_to_array(char *string, char *parv[MAXPARA])
134	>	/*
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 void
156	>	parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
157		{
158	<	char *p;
159	<	char *buf = string;
126	<	int x = 1;
158	>	struct Client *target_p = NULL;
159	>	struct Channel *chptr = NULL;
160
161	<	parv[x] = NULL;
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	<	while (*buf == ' ') /* skip leading spaces */
168	<	buf++;
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 (*buf == '\0') /* ignore all-space args */
180	<	return(x);
179	>	if ((!target_p || target_p->from == source_p->from) && !chptr)
180	>	return;
181
182	<	do
183	<	{
184	<	if (*buf == ':') /* Last parameter */
185	<	{
186	<	buf++;
187	<	parv[x++] = buf;
188	<	parv[x]   = NULL;
189	<	return(x);
190	<	}
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	<	{
202	<	parv[x++] = buf;
203	<	parv[x]   = NULL;
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	<	if ((p = strchr(buf, ' ')) != NULL)
209	<	{
210	<	*p++ = '\0';
211	<	buf  = p;
212	<	}
213	<	else
214	<	return(x);
215	<	}
216	<
217	<	while (*buf == ' ')
218	<	buf++;
219	<
220	<	if (*buf == '\0')
221	<	return(x);
222	<	} while (x < MAXPARA - 1);
223	<
224	<	if (*p == ':')
225	<	p++;
226	<
227	<	parv[x++] = p;
228	<	parv[x]   = NULL;
229	<	return(x);
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		/*
#	Line 180 | Line 240 | void
240		parse(struct Client *client_p, char *pbuffer, char *bufend)
241		{
242		struct Client *from = client_p;
243	<	char *ch;
244	<	char *s;
245	<	char *numeric = 0;
246	<	unsigned int i = 0;
247	<	int paramcount;
248	<	int mpara = 0;
249	<	struct Message *mptr = NULL;
243	>	struct Message *message = NULL;
244	>	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
245	>	char *ch = NULL;
246	>	char *s = 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 */ ;
199	<
200	<	para[0] = from->name;
257	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
258	>	;
259
260		if (*ch == ':')
261		{
262	<	ch++;
263	<
206	<	/* Copy the prefix to 'sender' assuming it terminates
262	>	/*
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	<	s++;
215	<	ch = s;
271	>	ch = ++s;
272		}
273
274		if (*sender && IsServer(client_p))
275		{
276	<	/*
277	<	* XXX it could be useful to know which of these occurs most frequently.
222	<	* the ID check should always come first, though, since it is so easy.
223	<	*/
224	<	if ((from = find_person(client_p, sender)) == NULL)
225	<	from = 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
231	<	* 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
240	–	para[0] = from->name;
241	–
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	>	get_client_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	>	get_client_name(client_p, MASK_IP));
302		return;
303		}
304		}
305
306		while (*ch == ' ')
307	<	ch++;
307	>	++ch;
308		}
309
310		if (*ch == '\0')
#	Line 257 | 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	<	mptr = NULL;
329	<	numeric = ch;
273	<	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;
335	>	{
336	>	unsigned int length = 0;
337
338	<	if ((s = strchr(ch, ' ')) != NULL)
338	>	if ((s = strchr(ch, ' ')))
339		*s++ = '\0';
340
341	<	if ((mptr = find_command(ch)) == NULL)
341	>	if ((message = find_command(ch)) == NULL)
342		{
343	<	/* Note: Give error message *only* to recognized
343	>	/*
344	>	* Note: Give error message *only* to recognized
345		* persons. It's a nightmare situation to have
346		* two programs sending "Unknown command"'s or
347		* equivalent to each other at full blast....
#	Line 294 | Line 351 | parse(struct Client *client_p, char *pbu
351		* Hm, when is the buffer empty -- if a command
352		* code has been found ?? -Armin
353		*/
354	<	if (pbuffer[0] != '\0')
298	<	{
354	>	if (*pbuffer)
355		if (IsClient(from))
356	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
301	<	me.name, from->name, ch);
302	<	}
356	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
357
358		++ServerStats.is_unco;
359		return;
360		}
361
362	<	assert(mptr->cmd != NULL);
309	<
310	<	paramcount = mptr->parameters;
311	<	mpara      = mptr->maxpara;
362	>	assert(message->cmd);
363
364	<	ii = bufend - ((s) ? s : ch);
365	<	mptr->bytes += ii;
364	>	paramcount = message->args_max;
365	>	length = bufend - ((s) ? s : ch);
366	>	message->bytes += length;
367		}
368
369	<	if (s != NULL)
370	<	i = string_to_array(s, para);
371	<	else
372	<	{
373	<	i = 0;
374	<	para[1] = NULL;
323	<	}
324	<
325	<	if (mptr == NULL)
326	<	do_numeric(numeric, client_p, from, i, para);
327	<	else
328	<	handle_command(mptr, client_p, from, i, para);
329	<	}
330	<
331	<	/* handle_command()
332	<	*
333	<	* inputs       - pointer to message block
334	<	*              - pointer to client
335	<	*              - pointer to client message is from
336	<	*              - count of number of args
337	<	*              - pointer to argv[] array
338	<	* output       - -1 if error from server
339	<	* side effects -
340	<	*/
341	<	static void
342	<	handle_command(struct Message *mptr, struct Client *client_p,
343	<	struct Client *from, unsigned int i, char *hpara[MAXPARA])
344	<	{
345	<	MessageHandler handler = 0;
369	>	/*
370	>	* Must the following loop really be so devious? On surface it
371	>	* splits the message to parameters from blank spaces. But, if
372	>	* paramcount has been reached, the rest of the message goes into
373	>	* this last parameter (about same effect as ":" has...) --msa
374	>	*/
375
376	<	if (IsServer(client_p))
348	<	mptr->rcount++;
376	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
377
378	<	mptr->count++;
378	>	para[parc] = ch;
379
380	<	/* New patch to avoid server flooding from unregistered connects
353	<	* - Pie-Man 07/27/2000 */
354	<	if (!IsRegistered(client_p))
380	>	if (message && (message->flags & MFLG_EXTRA))
381		{
382	<	/* if its from a possible server connection
383	<	* ignore it.. more than likely its a header thats sneaked through
382	>	/*
383	>	* XXX: This will have to go away after the command handler rewrite
384		*/
385	<	if ((IsHandshake(client_p) || IsConnecting(client_p) ||
360	<	IsServer(client_p)) && !(mptr->flags & MFLG_UNREG))
361	<	return;
385	>	para[++parc] = message->extra;
386		}
387
388	<	handler = mptr->handlers[client_p->handler];
365	<
366	<	/* check right amount of params is passed... --is */
367	<	if (i < mptr->parameters)
388	>	if (s)
389		{
390	<	if (!IsServer(client_p))
391	<	{
392	<	sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
393	<	me.name, EmptyString(hpara[0]) ? "*" : hpara[0], mptr->cmd);
373	<	}
374	<	else
390	>	if (paramcount > MAXPARA)
391	>	paramcount = MAXPARA;
392	>
393	>	while (1)
394		{
395	<	sendto_realops_flags(UMODE_ALL, L_ALL,
396	<	"Dropping server %s due to (invalid) command '%s' "
397	<	"with only %d arguments (expecting %d).",
398	<	client_p->name, mptr->cmd, i, mptr->parameters);
399	<	ilog(L_CRIT, "Insufficient parameters (%d) for command '%s' from %s.",
400	<	i, mptr->cmd, client_p->name);
401	<	exit_client(client_p, client_p,
402	<	"Not enough arguments to server command.");
395	>	while (*s == ' ')
396	>	*s++ = '\0';
397	>
398	>	if (*s == '\0')
399	>	break;
400	>
401	>	if (*s == ':')
402	>	{
403	>	/* The rest is single parameter--can include blanks also. */
404	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
405	>	break;
406	>	}
407	>
408	>	para[++parc] = s;
409	>
410	>	if (parc >= paramcount)
411	>	break;
412	>
413	>	while (*s && *s != ' ')
414	>	++s;
415		}
416		}
386	–	else
387	–	(*handler)(client_p, from, i, hpara);
388	–	}
417
418	<	/* clear_tree_parse()
419	<	*
420	<	* inputs       - NONE
421	<	* output       - NONE
422	<	* side effects - MUST MUST be called at startup ONCE before
423	<	*                any other keyword routine is used.
396	<	*/
397	<	void
398	<	clear_tree_parse(void)
399	<	{
400	<	memset(&msg_tree, 0, sizeof(msg_tree));
418	>	para[++parc] = NULL;
419	>
420	>	if (message)
421	>	parse_handle_command(message, from, parc, para);
422	>	else
423	>	parse_handle_numeric(numeric, from, parc, para);
424		}
425
426		/* add_msg_element()
#	Line 421 | Line 444 | clear_tree_parse(void)
444		* in the parent.
445		*/
446		static void
447	<	add_msg_element(struct MessageTree *mtree_p,
448	<	struct Message *msg_p, const char *cmd)
447	>	add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
448	>	const char *cmd)
449		{
450	<	struct MessageTree *ntree_p;
450	>	struct MessageTree *ntree_p = NULL;
451
452		if (*cmd == '\0')
453		{
454		mtree_p->msg = msg_p;
455	<	mtree_p->links++;           /* Have msg pointer, so up ref count */
455	>	mtree_p->links++;  /* Have msg pointer, so up ref count */
456		}
457		else
458		{
459	<	/* *cmd & (MAXPTRLEN-1)
459	>	/*
460	>	* *cmd & (MAXPTRLEN-1)
461		* convert the char pointed to at *cmd from ASCII to an integer
462		* between 0 and MAXPTRLEN.
463		* Thus 'A' -> 0x1 'B' -> 0x2 'c' -> 0x3 etc.
464		*/
441	–
465		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
466		{
467	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
467	>	ntree_p = MyCalloc(sizeof(struct MessageTree));
468		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
469
470	<	mtree_p->links++;         /* Have new pointer, so up ref count */
470	>	mtree_p->links++;  /* Have new pointer, so up ref count */
471		}
472
473		add_msg_element(ntree_p, msg_p, cmd + 1);
#	Line 469 | Line 492 | add_msg_element(struct MessageTree *mtre
492		*
493		* Then it pops up the recurse stack. As it comes back up the recurse
494		* The code checks to see if the child now has no pointers or msg
495	<	* i.e. the links count has gone to zero. If its no longer used, the
495	>	* i.e. the links count has gone to zero. If it's no longer used, the
496		* child struct MessageTree can be deleted. The parent reference
497		* to this child is then removed and the parents link count goes down.
498		* Thus, we continue to go back up removing all unused MessageTree(s)
#	Line 477 | Line 500 | add_msg_element(struct MessageTree *mtre
500		static void
501		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
502		{
503	<	struct MessageTree *ntree_p;
503	>	struct MessageTree *ntree_p = NULL;
504
505	<	/* In case this is called for a nonexistent command
505	>	/*
506	>	* In case this is called for a nonexistent command
507		* check that there is a msg pointer here, else links-- goes -ve
508		* -db
509		*/
510	<
487	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
510	>	if (*cmd == '\0' && mtree_p->msg)
511		{
512		mtree_p->msg = NULL;
513		mtree_p->links--;
514		}
515		else
516		{
517	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
517	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
518		{
519		del_msg_element(ntree_p, cmd + 1);
520
521		if (ntree_p->links == 0)
522		{
523	<	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
524	<	mtree_p->links--;
525	<	MyFree(ntree_p);
523	>	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
524	>	mtree_p->links--;
525	>	MyFree(ntree_p);
526		}
527		}
528		}
#	Line 513 | Line 536 | del_msg_element(struct MessageTree *mtre
536		* side effects - none
537		*/
538		static struct Message *
539	<	msg_tree_parse(const char *cmd, struct MessageTree *root)
539	>	msg_tree_parse(const char *cmd)
540		{
541	<	struct MessageTree *mtree = root;
542	<	assert(cmd && *cmd);
541	>	struct MessageTree *mtree = &msg_tree;
542	>
543	>	assert(!EmptyString(cmd));
544
545		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
546		if (*++cmd == '\0')
#	Line 530 | Line 554 | msg_tree_parse(const char *cmd, struct M
554		* inputs       - pointer to struct Message
555		* output       - none
556		* side effects - load this one command name
533	–	*                msg->count msg->bytes is modified in place, in
534	–	*                modules address space. Might not want to do that...
557		*/
558		void
559		mod_add_cmd(struct Message *msg)
560		{
561	<	struct Message *found_msg;
561	>	assert(msg && msg->cmd);
562
563	<	if (msg == NULL)
564	<	return;
543	<
544	<	/* someone loaded a module with a bad messagetab */
545	<	assert(msg->cmd != NULL);
546	<
547	<	/* command already added? */
548	<	if ((found_msg = msg_tree_parse(msg->cmd, &msg_tree)) != NULL)
563	>	/* Command already added? */
564	>	if (msg_tree_parse(msg->cmd))
565		return;
566
567		add_msg_element(&msg_tree, msg, msg->cmd);
552	–	msg->count = msg->rcount = msg->bytes = 0;
568		}
569
570		/* mod_del_cmd()
#	Line 561 | Line 576 | mod_add_cmd(struct Message *msg)
576		void
577		mod_del_cmd(struct Message *msg)
578		{
579	<	assert(msg != NULL);
579	>	assert(msg && msg->cmd);
580
581	<	if (msg == NULL)
581	>	if (!msg_tree_parse(msg->cmd))
582		return;
583
584		del_msg_element(&msg_tree, msg->cmd);
#	Line 578 | Line 593 | mod_del_cmd(struct Message *msg)
593		struct Message *
594		find_command(const char *cmd)
595		{
596	<	return msg_tree_parse(cmd, &msg_tree);
582	<	}
583	<
584	<	/* report_messages()
585	<	*
586	<	* inputs       - pointer to client to report to
587	<	* output       - NONE
588	<	* side effects - client is shown list of commands
589	<	*/
590	<	void
591	<	report_messages(struct Client *source_p)
592	<	{
593	<	const struct MessageTree *mtree = &msg_tree;
594	<	unsigned int i;
595	<
596	<	for (i = 0; i < MAXPTRLEN; i++)
597	<	if (mtree->pointers[i] != NULL)
598	<	recurse_report_messages(source_p, mtree->pointers[i]);
596	>	return msg_tree_parse(cmd);
597		}
598
599		static void
600		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
601		{
602	<	unsigned int i;
602	>	if (mtree->msg)
603	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
604	>	mtree->msg->cmd,
605	>	mtree->msg->count, mtree->msg->bytes,
606	>	mtree->msg->rcount);
607
608	<	if (mtree->msg != NULL)
609	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
608	<	me.name, source_p->name, mtree->msg->cmd,
609	<	mtree->msg->count, mtree->msg->bytes,
610	<	mtree->msg->rcount);
611	<
612	<	for (i = 0; i < MAXPTRLEN; i++)
613	<	if (mtree->pointers[i] != NULL)
608	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
609	>	if (mtree->pointers[i])
610		recurse_report_messages(source_p, mtree->pointers[i]);
611		}
612
613	<	/* cancel_clients()
618	<	*
619	<	* inputs       -
620	<	* output       -
621	<	* side effects -
622	<	*/
623	<	static int
624	<	cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
625	<	{
626	<	/* kill all possible points that are causing confusion here,
627	<	* I'm not sure I've got this all right...
628	<	* - avalon
629	<	*
630	<	* knowing avalon, probably not.
631	<	*/
632	<
633	<	/* with TS, fake prefixes are a common thing, during the
634	<	* connect burst when there's a nick collision, and they
635	<	* must be ignored rather than killed because one of the
636	<	* two is surviving.. so we don't bother sending them to
637	<	* all ops everytime, as this could send 'private' stuff
638	<	* from lagged clients. we do send the ones that cause
639	<	* servers to be dropped though, as well as the ones from
640	<	* non-TS servers -orabidoo
641	<	*/
642	<	/* Incorrect prefix for a server from some connection.  If it is a
643	<	* client trying to be annoying, just QUIT them, if it is a server
644	<	* then the same deal.
645	<	*/
646	<	if (IsServer(source_p) || IsMe(source_p))
647	<	{
648	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, "Message for %s[%s] from %s",
649	<	source_p->name, source_p->from->name,
650	<	get_client_name(client_p, SHOW_IP));
651	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,  "Message for %s[%s] from %s",
652	<	source_p->name, source_p->from->name,
653	<	get_client_name(client_p, MASK_IP));
654	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
655	<	"Not dropping server %s (%s) for Fake Direction",
656	<	client_p->name, source_p->name);
657	<	return -1;
658	<	/* return exit_client(client_p, client_p, &me, "Fake Direction");*/
659	<	}
660	<
661	<	/* Ok, someone is trying to impose as a client and things are
662	<	* confused.  If we got the wrong prefix from a server, send out a
663	<	* kill, else just exit the lame client.
664	<	*/
665	<	/* If the fake prefix is coming from a TS server, discard it
666	<	* silently -orabidoo
667	<	*
668	<	* all servers must be TS these days --is
669	<	*/
670	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
671	<	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
672	<	source_p->name, source_p->username, source_p->host,
673	<	source_p->from->name, get_client_name(client_p, SHOW_IP));
674	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,
675	<	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
676	<	source_p->name, source_p->username, source_p->host,
677	<	source_p->from->name, get_client_name(client_p, MASK_IP));
678	<
679	<	return 0;
680	<	}
681	<
682	<	/* remove_unknown()
683	<	*
684	<	* inputs       -
685	<	* output       -
686	<	* side effects -
687	<	*/
688	<	static void
689	<	remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
690	<	{
691	<	/* Do kill if it came from a server because it means there is a ghost
692	<	* user on the other server which needs to be removed. -avalon
693	<	* Tell opers about this. -Taner
694	<	*/
695	<	/* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
696	<	* 'nodots'          is a nickname (KILL)
697	<	* 'no.dot.at.start' is a server   (SQUIT)
698	<	*/
699	<	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) ||
700	<	strchr(lsender, '.') != NULL)
701	<	{
702	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
703	<	"Unknown prefix (%s) from %s, Squitting %s",
704	<	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
705	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,
706	<	"Unknown prefix (%s) from %s, Squitting %s",
707	<	lbuffer, client_p->name, lsender);
708	<	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
709	<	me.name, lsender, lbuffer, client_p->name);
710	<	}
711	<	else
712	<	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
713	<	me.name, lsender, me.name);
714	<	}
715	<
716	<	/*
717	<	*
718	<	*      parc    number of arguments ('sender' counted as one!)
719	<	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
720	<	*      parv[1]..parv[parc-1]
721	<	*              pointers to additional parameters, this is a NULL
722	<	*              terminated list (parv[parc] == NULL).
613	>	/* report_messages()
614		*
615	<	* *WARNING*
616	<	*      Numerics are mostly error reports. If there is something
617	<	*      wrong with the message, just *DROP* it! Don't even think of
727	<	*      sending back a neat error message -- big danger of creating
728	<	*      a ping pong error message...
615	>	* inputs       - pointer to client to report to
616	>	* output       - NONE
617	>	* side effects - client is shown list of commands
618		*/
619	<	static void
620	<	do_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
732	<	int parc, char *parv[])
619	>	void
620	>	report_messages(struct Client *source_p)
621		{
622	<	struct Client *target_p;
735	<	struct Channel *chptr;
736	<	char *t;    /* current position within the buffer */
737	<	int i, tl;  /* current length of presently being built string in t */
738	<
739	<	if (parc < 2 || !IsServer(source_p))
740	<	return;
741	<
742	<	/* Remap low number numerics. */
743	<	if (numeric[0] == '0')
744	<	numeric[0] = '1';
745	<
746	<	/* Prepare the parameter portion of the message into 'buffer'.
747	<	* (Because the buffer is twice as large as the message buffer
748	<	* for the socket, no overflow can occur here... ...on current
749	<	* assumptions--bets are off, if these are changed --msa)
750	<	*/
751	<	t = buffer;
752	<	for (i = 2; i < (parc - 1); i++)
753	<	{
754	<	tl = ircsprintf(t, " %s", parv[i]);
755	<	t += tl;
756	<	}
757	<
758	<	ircsprintf(t," :%s", parv[parc-1]);
759	<
760	<	if (((target_p = find_person(client_p, parv[1])) != NULL) ||
761	<	((target_p = find_server(parv[1])) != NULL))
762	<	{
763	<	if (IsMe(target_p))
764	<	{
765	<	int num;
766	<
767	<	/*
768	<	* We shouldn't get numerics sent to us,
769	<	* any numerics we do get indicate a bug somewhere..
770	<	*/
771	<	/* ugh.  this is here because of nick collisions.  when two servers
772	<	* relink, they burst each other their nicks, then perform collides.
773	<	* if there is a nick collision, BOTH servers will kill their own
774	<	* nicks, and BOTH will kill the other servers nick, which wont exist,
775	<	* because it will have been already killed by the local server.
776	<	*
777	<	* unfortunately, as we cant guarantee other servers will do the
778	<	* "right thing" on a nick collision, we have to keep both kills.
779	<	* ergo we need to ignore ERR_NOSUCHNICK. --fl_
780	<	*/
781	<	/* quick comment. This _was_ tried. i.e. assume the other servers
782	<	* will do the "right thing" and kill a nick that is colliding.
783	<	* unfortunately, it did not work. --Dianora
784	<	*/
785	<
786	<	/* Yes, a good compiler would have optimised this, but
787	<	* this is probably easier to read. -db
788	<	*/
789	<	num = atoi(numeric);
790	<
791	<	if ((num != ERR_NOSUCHNICK))
792	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
793	<	"*** %s(via %s) sent a %s numeric to me: %s",
794	<	source_p->name, client_p->name, numeric, buffer);
795	<	return;
796	<	}
797	<	else if (target_p->from == client_p)
798	<	{
799	<	/* This message changed direction (nick collision?)
800	<	* ignore it.
801	<	*/
802	<	return;
803	<	}
622	>	const struct MessageTree *const mtree = &msg_tree;
623
624	<	/* csircd will send out unknown umode flag for +a (admin), drop it here. */
625	<	if ((atoi(numeric) == ERR_UMODEUNKNOWNFLAG) && MyClient(target_p))
626	<	return;
808	<
809	<	/* Fake it for server hiding, if its our client */
810	<	if (ConfigServerHide.hide_servers &&
811	<	MyClient(target_p) && !IsOper(target_p))
812	<	sendto_one(target_p, ":%s %s %s%s", me.name, numeric, target_p->name, buffer);
813	<	else
814	<	sendto_one(target_p, ":%s %s %s%s", ID_or_name(source_p, target_p->from),
815	<	numeric, ID_or_name(target_p, target_p->from), buffer);
816	<	return;
817	<	}
818	<	else if ((chptr = hash_find_channel(parv[1])) != NULL)
819	<	sendto_channel_local(ALL_MEMBERS, NO, chptr,
820	<	":%s %s %s %s",
821	<	source_p->name,
822	<	numeric, chptr->chname, buffer);
624	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
625	>	if (mtree->pointers[i])
626	>	recurse_report_messages(source_p, mtree->pointers[i]);
627		}
628
629		/* m_not_oper()
630	<	* inputs       -
630	>	* inputs       -
631		* output       -
632		* side effects - just returns a nastyogram to given user
633		*/
634	<	void
635	<	m_not_oper(struct Client *client_p, struct Client *source_p,
832	<	int parc, char *parv[])
634	>	int
635	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
636		{
637	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
638	<	me.name, source_p->name);
836	<	}
837	<
838	<	void
839	<	m_unregistered(struct Client *client_p, struct Client *source_p,
840	<	int parc, char *parv[])
841	<	{
842	<	/* bit of a hack.
843	<	* I don't =really= want to waste a bit in a flag
844	<	* number_of_nick_changes is only really valid after the client
845	<	* is fully registered..
846	<	*/
847	<	if (client_p->localClient->number_of_nick_changes == 0)
848	<	{
849	<	sendto_one(client_p, ":%s %d * %s :Register first.",
850	<	me.name, ERR_NOTREGISTERED, parv[0]);
851	<	client_p->localClient->number_of_nick_changes++;
852	<	}
637	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
638	>	return 0;
639		}
640
641	<	void
642	<	m_registered(struct Client *client_p, struct Client *source_p,
857	<	int parc, char *parv[])
641	>	int
642	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
643		{
644	<	sendto_one(client_p, form_str(ERR_ALREADYREGISTRED),
645	<	me.name, source_p->name);
644	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
645	>	return 0;
646		}
647
648	<	void
649	<	m_ignore(struct Client *client_p, struct Client *source_p,
865	<	int parc, char *parv[])
648	>	int
649	>	m_registered(struct Client *source_p, int parc, char *parv[])
650		{
651	<	return;
651	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
652	>	return 0;
653		}
654
655	<	void
656	<	rfc1459_command_send_error(struct Client *client_p, struct Client *source_p,
872	<	int parc, char *parv[])
655	>	int
656	>	m_ignore(struct Client *source_p, int parc, char *parv[])
657		{
658	<	const char *in_para;
875	<
876	<	in_para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
877	<
878	<	ilog(L_ERROR, "Received ERROR message from %s: %s",
879	<	source_p->name, in_para);
880	<
881	<	if (client_p == source_p)
882	<	{
883	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s -- %s",
884	<	get_client_name(client_p, HIDE_IP), in_para);
885	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "ERROR :from %s -- %s",
886	<	get_client_name(client_p, MASK_IP), in_para);
887	<	}
888	<	else
889	<	{
890	<	sendto_realops_flags(UMODE_ALL, L_OPER, "ERROR :from %s via %s -- %s",
891	<	source_p->name, get_client_name(client_p, MASK_IP), in_para);
892	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s via %s -- %s",
893	<	source_p->name, get_client_name(client_p, HIDE_IP), in_para);
894	<	}
895	<
896	<	if (MyClient(source_p))
897	<	exit_client(source_p, source_p, "ERROR");
658	>	return 0;
659		}

Diff Legend

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