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 8752 by michael, Tue Jan 1 11:07:01 2019 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-2019 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	>	#include "packet.h"
43	>
44
45		/*
46		* (based on orabidoo's parser code)
#	Line 56 | Line 56
56		* 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
57		*   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
58		*
59	<	*                               'i' -> [MessageTree *] -> 'e' and matches
59	>	*                               'i' -> [MessageTree *] -> 'e' and matches
60		*
61		* BUGS (Limitations!)
62	<	*
62	>	*
63		* I designed this trie to parse ircd commands. Hence it currently
64		* casefolds. This is trivial to fix by increasing MAXPTRLEN.
65		* This trie also "folds" '{' etc. down. This means, the input to this
#	Line 69 | Line 69
69		* MAXPTRLEN 128.
70		*
71		* This is also not a patricia trie. On short ircd tokens, this is
72	<	* not likely going to matter.
72	>	* not likely going to matter.
73		*
74		* Diane Bruce (Dianora), June 6 2003
75		*/
76
77	<	#define MAXPTRLEN       32
78	<	/* Must be a power of 2, and
79	<	* larger than 26 [a-z]|[A-Z]
80	<	* its used to allocate the set
81	<	* of pointers at each node of the tree
82	<	* There are MAXPTRLEN pointers at each node.
83	<	* Obviously, there have to be more pointers
84	<	* Than ASCII letters. 32 is a nice number
85	<	* since there is then no need to shift
86	<	* 'A'/'a' to base 0 index, at the expense
87	<	* of a few never used pointers. For a small
88	<	* parser like this, this is a good compromise
89	<	* and does make it somewhat faster.
90	<	*
91	<	* - Dianora
92	<	*/
93	<
94	<	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	<	*/
77	>	/*
78	>	* Must be a power of 2, and larger than 26 [a-z]|[A-Z]. It's used to allocate
79	>	* the set of pointers at each node of the tree.
80	>	* There are MAXPTRLEN pointers at each node. Obviously, there have to be more
81	>	* pointers than ASCII letters. 32 is a nice number since there is then no need
82	>	* to shift 'A'/'a' to base 0 index, at the expense of a few never used
83	>	* pointers.
84	>	* For a small parser like this, this is a good compromise and does
85	>	* make it somewhat faster. - Dianora
86	>	*/
87	>	enum { MAXPTRLEN = 32 };
88	>
89	>
90	>	static 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	>	*/
95		struct Message *msg;
96		struct MessageTree *pointers[MAXPTRLEN];
97	<	};
97	>	} msg_tree;
98
103	–	static struct MessageTree msg_tree;
99
100	<	/*
101	<	* NOTE: parse() should not be called recursively by other functions!
100	>	/* remove_unknown()
101	>	*
102	>	* inputs       -
103	>	* output       -
104	>	* side effects -
105		*/
106	<	static char *sender;
107	<	static char *para[MAXPARA + 1];
108	<	static char buffer[1024];
109	<
110	<	static int cancel_clients(struct Client *, struct Client *, char *);
111	<	static void remove_unknown(struct Client *, char *, char *);
112	<	static void do_numeric(char[], struct Client *, struct Client *, int, char **);
113	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char **);
114	<	static void recurse_report_messages(struct Client *, const struct MessageTree *);
115	<	static void add_msg_element(struct MessageTree *, struct Message *, const char *);
116	<	static void del_msg_element(struct MessageTree *, const char *);
106	>	static void
107	>	parse_remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
108	>	{
109	>	/*
110	>	* Do kill if it came from a server because it means there is a ghost
111	>	* user on the other server which needs to be removed. -avalon
112	>	* Tell opers about this. -Taner
113	>	*/
114	>	/*
115	>	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
116	>	* 'nodots'          is a nickname (KILL)
117	>	* 'no.dot.at.start' is a server   (SQUIT)
118	>	*/
119	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
120	>	{
121	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
122	>	"Unknown prefix (%s) from %s, Squitting %s",
123	>	lbuffer, client_get_name(client_p, SHOW_IP), lsender);
124	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
125	>	"Unknown prefix (%s) from %s, Squitting %s",
126	>	lbuffer, client_get_name(client_p, MASK_IP), lsender);
127	>	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
128	>	me.id, lsender, lbuffer, client_p->name);
129	>	}
130	>	else
131	>	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
132	>	me.id, lsender, me.name);
133	>	}
134
135	<	/* turn a string into a parc/parv pair */
136	<	static inline int
137	<	string_to_array(char *string, char *parv[MAXPARA])
135	>	/*
136	>	*
137	>	*      parc    number of arguments ('sender' counted as one!)
138	>	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
139	>	*      parv[1]..parv[parc-1]
140	>	*              pointers to additional parameters, this is a NULL
141	>	*              terminated list (parv[parc] == NULL).
142	>	*
143	>	* *WARNING*
144	>	*      Numerics are mostly error reports. If there is something
145	>	*      wrong with the message, just *DROP* it! Don't even think of
146	>	*      sending back a neat error message -- big danger of creating
147	>	*      a ping pong error message...
148	>	*
149	>	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
150	>	*
151	>	* Called when we get a numeric message from a remote _server_ and we are
152	>	* supposed to forward it somewhere. Note that we always ignore numerics sent
153	>	* to 'me' and simply drop the message if we can't handle with this properly:
154	>	* the savvy approach is NEVER generate an error in response to an... error :)
155	>	*/
156	>	static void
157	>	parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
158		{
159	<	char *p;
160	<	char *buf = string;
126	<	int x = 1;
159	>	struct Client *target_p = NULL;
160	>	struct Channel *chptr = NULL;
161
162	<	parv[x] = NULL;
162	>	/*
163	>	* Avoid trash, we need it to come from a server and have a target
164	>	*/
165	>	if (parc < 2 || !IsServer(source_p))
166	>	return;
167
168	<	while (*buf == ' ') /* skip leading spaces */
169	<	buf++;
168	>	/*
169	>	* Who should receive this message ? Will we do something with it ?
170	>	* Note that we use findUser functions, so the target can't be neither
171	>	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
172	>	* should never generate numeric replies to non-users anyway
173	>	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
174	>	*/
175	>	if (IsChanPrefix(*parv[1]))
176	>	chptr = hash_find_channel(parv[1]);
177	>	else
178	>	target_p = find_person(source_p, parv[1]);
179
180	<	if (*buf == '\0') /* ignore all-space args */
181	<	return(x);
180	>	if ((target_p == NULL || target_p->from == source_p->from) && chptr == NULL)
181	>	return;
182
183	<	do
184	<	{
185	<	if (*buf == ':') /* Last parameter */
186	<	{
187	<	buf++;
188	<	parv[x++] = buf;
189	<	parv[x]   = NULL;
190	<	return(x);
191	<	}
183	>	/*
184	>	* Remap low number numerics, not that I understand WHY.. --Nemesi
185	>	*/
186	>	/*
187	>	* Numerics below 100 talk about the current 'connection', you're not
188	>	* connected to a remote server so it doesn't make sense to send them
189	>	* remotely - but the information they contain may be useful, so we
190	>	* remap them up. Weird, but true.  -- Isomer
191	>	*/
192	>	if (numeric < 100)
193	>	numeric += 100;
194	>
195	>	if (target_p)
196	>	{
197	>	/* Fake it for server hiding, if it's our client */
198	>	if ((ConfigServerHide.hide_servers || IsHidden(source_p)) && MyConnect(target_p) &&
199	>	!HasUMode(target_p, UMODE_OPER))
200	>	sendto_one_numeric(target_p, &me, numeric | SND_EXPLICIT, "%s", parv[2]);
201		else
202	<	{
203	<	parv[x++] = buf;
204	<	parv[x]   = NULL;
202	>	sendto_one_numeric(target_p, source_p, numeric | SND_EXPLICIT, "%s", parv[2]);
203	>	}
204	>	else
205	>	sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
206	>	numeric, chptr->name, parv[2]);
207	>	}
208
209	<	if ((p = strchr(buf, ' ')) != NULL)
210	<	{
211	<	*p++ = '\0';
212	<	buf  = p;
213	<	}
214	<	else
215	<	return(x);
216	<	}
217	<
218	<	while (*buf == ' ')
219	<	buf++;
220	<
221	<	if (*buf == '\0')
222	<	return(x);
223	<	} while (x < MAXPARA - 1);
224	<
225	<	if (*p == ':')
226	<	p++;
227	<
228	<	parv[x++] = p;
229	<	parv[x]   = NULL;
230	<	return(x);
209	>	/* handle_command()
210	>	*
211	>	* inputs       - pointer to message block
212	>	*              - pointer to client
213	>	*              - pointer to client message is from
214	>	*              - count of number of args
215	>	*              - pointer to argv[] array
216	>	* output       - -1 if error from server
217	>	* side effects -
218	>	*/
219	>	static void
220	>	parse_handle_command(struct Message *message, struct Client *source_p,
221	>	unsigned int i, char *para[])
222	>	{
223	>	if (IsServer(source_p->from))
224	>	++message->rcount;
225	>	++message->count;
226	>
227	>	if (MyClient(source_p) && (message->flags & MFLG_ENDGRACE))
228	>	flood_endgrace(source_p);
229	>
230	>	/* Check right amount of parameters is passed... --is */
231	>	if (i < message->args_min)
232	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, message->cmd);
233	>	else
234	>	message->handlers[source_p->from->handler](source_p, i, para);
235		}
236
237		/*
#	Line 180 | Line 243 | void
243		parse(struct Client *client_p, char *pbuffer, char *bufend)
244		{
245		struct Client *from = client_p;
246	<	char *ch;
247	<	char *s;
248	<	char *numeric = 0;
249	<	unsigned int i = 0;
250	<	int paramcount;
251	<	int mpara = 0;
252	<	struct Message *mptr = NULL;
246	>	struct Message *message = NULL;
247	>	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
248	>	char *ch = NULL;
249	>	char *s = NULL;
250	>	unsigned int numeric = 0;
251	>	unsigned int parc = 0;
252	>	unsigned int paramcount;
253
254		if (IsDefunct(client_p))
255		return;
256
257	<	assert(client_p->localClient->fd.flags.open);
258	<	assert((bufend - pbuffer) < 512);
257	>	assert(client_p->connection);
258	>	assert(client_p->connection->fd);
259	>	assert(client_p->connection->fd->flags.open);
260	>
261
262	<	for (ch = pbuffer; *ch == ' '; ch++) /* skip spaces */
198	<	/* null statement */ ;
262	>	assert((bufend - pbuffer) < IRCD_BUFSIZE);
263
264	<	para[0] = from->name;
264	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
265	>	;
266
267		if (*ch == ':')
268		{
269	<	ch++;
270	<
206	<	/* Copy the prefix to 'sender' assuming it terminates
269	>	/*
270	>	* Copy the prefix to 'sender' assuming it terminates
271		* with SPACE (or NULL, which is an error, though).
272		*/
273	<	sender = ch;
273	>	const char *const sender = ++ch;
274
275	<	if ((s = strchr(ch, ' ')) != NULL)
275	>	if ((s = strchr(ch, ' ')))
276		{
277		*s = '\0';
278	<	s++;
215	<	ch = s;
278	>	ch = ++s;
279		}
280
281		if (*sender && IsServer(client_p))
282		{
283	<	/*
284	<	* 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);
283	>	if ((from = hash_find_id(sender)) == NULL)
284	>	from = hash_find_client(sender);
285
286	<	/* Hmm! If the client corresponding to the
287	<	* prefix is not found--what is the correct
288	<	* action??? Now, I will ignore the message
289	<	* (old IRC just let it through as if the
231	<	* prefix just wasn't there...) --msa
286	>	/*
287	>	* Hmm! If the client corresponding to the prefix is not found--what is
288	>	* the correct action??? Now, I will ignore the message (old IRC just
289	>	* let it through as if the prefix just wasn't there...) --msa
290		*/
291		if (from == NULL)
292		{
293		++ServerStats.is_unpf;
294	<	remove_unknown(client_p, sender, pbuffer);
294	>	parse_remove_unknown(client_p, sender, pbuffer);
295		return;
296		}
297
240	–	para[0] = from->name;
241	–
298		if (from->from != client_p)
299		{
300		++ServerStats.is_wrdi;
301	<	cancel_clients(client_p, from, pbuffer);
301	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
302	>	"Fake direction: dropped message from %s[%s] via %s",
303	>	from->name, from->from->name,
304	>	client_get_name(client_p, SHOW_IP));
305	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
306	>	"Fake direction: dropped message from %s[%s] via %s",
307	>	from->name, from->from->name,
308	>	client_get_name(client_p, MASK_IP));
309		return;
310		}
311		}
312
313		while (*ch == ' ')
314	<	ch++;
314	>	++ch;
315		}
316
317		if (*ch == '\0')
#	Line 257 | Line 320 | parse(struct Client *client_p, char *pbu
320		return;
321		}
322
323	<	/* Extract the command code from the packet.  Point s to the end
323	>	/*
324	>	* Extract the command code from the packet. Point s to the end
325		* of the command code and calculate the length using pointer
326	<	* arithmetic.  Note: only need length for numerics and *all*
326	>	* arithmetic. Note: only need length for numerics and *all*
327		* numerics must have parameters and thus a space after the command
328		* code. -avalon
329		*/
330
331	<	/* EOB is 3 chars long but is not a numeric */
332	<	if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
331	>	/* EOB is 3 characters long but is not a numeric */
332	>	if (*(ch + 3) == ' ' &&  /* Ok, let's see if it's a possible numeric */
333		IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
334		{
335	<	mptr = NULL;
336	<	numeric = ch;
273	<	paramcount = MAXPARA;
335	>	numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
336	>	paramcount = 2;  /* Destination, and the rest of it */
337		++ServerStats.is_num;
338	<	s = ch + 3;  /* I know this is ' ' from above if            */
339	<	*s++ = '\0'; /* blow away the ' ', and point s to next part */
338	>	s = ch + 3;  /* I know this is ' ' from above if */
339	>	*s++ = '\0';  /* Blow away the ' ', and point s to next part */
340		}
341		else
342	<	{
343	<	unsigned int ii = 0;
281	<
282	<	if ((s = strchr(ch, ' ')) != NULL)
342	>	{
343	>	if ((s = strchr(ch, ' ')))
344		*s++ = '\0';
345
346	<	if ((mptr = find_command(ch)) == NULL)
346	>	if ((message = find_command(ch)) == NULL)
347		{
348	<	/* Note: Give error message *only* to recognized
348	>	/*
349	>	* Note: Give error message *only* to recognized
350		* persons. It's a nightmare situation to have
351		* two programs sending "Unknown command"'s or
352		* equivalent to each other at full blast....
#	Line 294 | Line 356 | parse(struct Client *client_p, char *pbu
356		* Hm, when is the buffer empty -- if a command
357		* code has been found ?? -Armin
358		*/
359	<	if (pbuffer[0] != '\0')
298	<	{
359	>	if (*pbuffer)
360		if (IsClient(from))
361	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
301	<	me.name, from->name, ch);
302	<	}
361	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
362
363		++ServerStats.is_unco;
364		return;
365		}
366
367	<	assert(mptr->cmd != NULL);
309	<
310	<	paramcount = mptr->parameters;
311	<	mpara      = mptr->maxpara;
367	>	assert(message->cmd);
368
369	<	ii = bufend - ((s) ? s : ch);
314	<	mptr->bytes += ii;
315	<	}
369	>	paramcount = message->args_max;
370
371	<	if (s != NULL)
372	<	i = string_to_array(s, para);
319	<	else
320	<	{
321	<	i = 0;
322	<	para[1] = NULL;
371	>	size_t length = bufend - ((s) ? s : ch);
372	>	message->bytes += length;
373		}
374
375	<	if (mptr == NULL)
376	<	do_numeric(numeric, client_p, from, i, para);
377	<	else
378	<	handle_command(mptr, client_p, from, i, para);
379	<	}
380	<
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;
375	>	/*
376	>	* Must the following loop really be so devious? On surface it
377	>	* splits the message to parameters from blank spaces. But, if
378	>	* paramcount has been reached, the rest of the message goes into
379	>	* this last parameter (about same effect as ":" has...) --msa
380	>	*/
381
382	<	if (IsServer(client_p))
348	<	mptr->rcount++;
382	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
383
384	<	mptr->count++;
384	>	para[parc] = ch;
385
386	<	/* New patch to avoid server flooding from unregistered connects
353	<	* - Pie-Man 07/27/2000 */
354	<	if (!IsRegistered(client_p))
386	>	if (message && (message->flags & MFLG_EXTRA))
387		{
388	<	/* if its from a possible server connection
389	<	* ignore it.. more than likely its a header thats sneaked through
388	>	/*
389	>	* XXX: This will have to go away after the command handler rewrite
390		*/
391	<	if ((IsHandshake(client_p) || IsConnecting(client_p) ||
360	<	IsServer(client_p)) && !(mptr->flags & MFLG_UNREG))
361	<	return;
391	>	para[++parc] = message->extra;
392		}
393
394	<	handler = mptr->handlers[client_p->handler];
365	<
366	<	/* check right amount of params is passed... --is */
367	<	if (i < mptr->parameters)
394	>	if (s)
395		{
396	<	if (!IsServer(client_p))
397	<	{
398	<	sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
399	<	me.name, EmptyString(hpara[0]) ? "*" : hpara[0], mptr->cmd);
373	<	}
374	<	else
396	>	if (paramcount > MAXPARA)
397	>	paramcount = MAXPARA;
398	>
399	>	while (true)
400		{
401	<	sendto_realops_flags(UMODE_ALL, L_ALL,
402	<	"Dropping server %s due to (invalid) command '%s' "
403	<	"with only %d arguments (expecting %d).",
404	<	client_p->name, mptr->cmd, i, mptr->parameters);
405	<	ilog(L_CRIT, "Insufficient parameters (%d) for command '%s' from %s.",
406	<	i, mptr->cmd, client_p->name);
407	<	exit_client(client_p, client_p,
408	<	"Not enough arguments to server command.");
401	>	while (*s == ' ')
402	>	*s++ = '\0';
403	>
404	>	if (*s == '\0')
405	>	break;
406	>
407	>	if (*s == ':')
408	>	{
409	>	/* The rest is single parameter--can include blanks also. */
410	>	para[++parc] = s + (numeric == 0);  /* Keep the colon if it's a numeric */
411	>	break;
412	>	}
413	>
414	>	para[++parc] = s;
415	>
416	>	if (parc >= paramcount)
417	>	break;
418	>
419	>	while (*s && *s != ' ')
420	>	++s;
421		}
422		}
386	–	else
387	–	(*handler)(client_p, from, i, hpara);
388	–	}
423
424	<	/* clear_tree_parse()
425	<	*
426	<	* inputs       - NONE
427	<	* output       - NONE
428	<	* side effects - MUST MUST be called at startup ONCE before
429	<	*                any other keyword routine is used.
396	<	*/
397	<	void
398	<	clear_tree_parse(void)
399	<	{
400	<	memset(&msg_tree, 0, sizeof(msg_tree));
424	>	para[++parc] = NULL;
425	>
426	>	if (message)
427	>	parse_handle_command(message, from, parc, para);
428	>	else
429	>	parse_handle_numeric(numeric, from, parc, para);
430		}
431
432		/* add_msg_element()
#	Line 421 | Line 450 | clear_tree_parse(void)
450		* in the parent.
451		*/
452		static void
453	<	add_msg_element(struct MessageTree *mtree_p,
454	<	struct Message *msg_p, const char *cmd)
453	>	add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
454	>	const char *cmd)
455		{
456	<	struct MessageTree *ntree_p;
456	>	struct MessageTree *ntree_p = NULL;
457
458		if (*cmd == '\0')
459		{
460		mtree_p->msg = msg_p;
461	<	mtree_p->links++;           /* Have msg pointer, so up ref count */
461	>	mtree_p->links++;  /* Have msg pointer, so up ref count */
462		}
463		else
464		{
465	<	/* *cmd & (MAXPTRLEN-1)
465	>	/*
466	>	* *cmd & (MAXPTRLEN-1)
467		* convert the char pointed to at *cmd from ASCII to an integer
468		* between 0 and MAXPTRLEN.
469		* Thus 'A' -> 0x1 'B' -> 0x2 'c' -> 0x3 etc.
470		*/
441	–
471		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
472		{
473	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
473	>	ntree_p = xcalloc(sizeof(*ntree_p));
474		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
475
476	<	mtree_p->links++;         /* Have new pointer, so up ref count */
476	>	mtree_p->links++;  /* Have new pointer, so up ref count */
477		}
478
479		add_msg_element(ntree_p, msg_p, cmd + 1);
#	Line 469 | Line 498 | add_msg_element(struct MessageTree *mtre
498		*
499		* Then it pops up the recurse stack. As it comes back up the recurse
500		* The code checks to see if the child now has no pointers or msg
501	<	* i.e. the links count has gone to zero. If its no longer used, the
501	>	* i.e. the links count has gone to zero. If it's no longer used, the
502		* child struct MessageTree can be deleted. The parent reference
503		* to this child is then removed and the parents link count goes down.
504		* Thus, we continue to go back up removing all unused MessageTree(s)
#	Line 477 | Line 506 | add_msg_element(struct MessageTree *mtre
506		static void
507		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
508		{
509	<	struct MessageTree *ntree_p;
509	>	struct MessageTree *ntree_p = NULL;
510
511	<	/* In case this is called for a nonexistent command
511	>	/*
512	>	* In case this is called for a nonexistent command
513		* check that there is a msg pointer here, else links-- goes -ve
514		* -db
515		*/
516	<
487	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
516	>	if (*cmd == '\0' && mtree_p->msg)
517		{
518		mtree_p->msg = NULL;
519		mtree_p->links--;
520		}
521		else
522		{
523	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
523	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
524		{
525		del_msg_element(ntree_p, cmd + 1);
526
527		if (ntree_p->links == 0)
528		{
529	<	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
530	<	mtree_p->links--;
531	<	MyFree(ntree_p);
529	>	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
530	>	mtree_p->links--;
531	>	xfree(ntree_p);
532		}
533		}
534		}
#	Line 513 | Line 542 | del_msg_element(struct MessageTree *mtre
542		* side effects - none
543		*/
544		static struct Message *
545	<	msg_tree_parse(const char *cmd, struct MessageTree *root)
545	>	msg_tree_parse(const char *cmd)
546		{
547	<	struct MessageTree *mtree = root;
548	<	assert(cmd && *cmd);
547	>	struct MessageTree *mtree = &msg_tree;
548	>
549	>	assert(!EmptyString(cmd));
550
551		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
552		if (*++cmd == '\0')
#	Line 530 | Line 560 | msg_tree_parse(const char *cmd, struct M
560		* inputs       - pointer to struct Message
561		* output       - none
562		* 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...
563		*/
564		void
565		mod_add_cmd(struct Message *msg)
566		{
567	<	struct Message *found_msg;
567	>	assert(msg);
568	>	assert(msg->cmd);
569
570	<	if (msg == NULL)
571	<	return;
572	<
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)
549	<	return;
550	<
551	<	add_msg_element(&msg_tree, msg, msg->cmd);
552	<	msg->count = msg->rcount = msg->bytes = 0;
570	>	/* Command already added? */
571	>	if (msg_tree_parse(msg->cmd) == NULL)
572	>	add_msg_element(&msg_tree, msg, msg->cmd);
573		}
574
575		/* mod_del_cmd()
#	Line 561 | Line 581 | mod_add_cmd(struct Message *msg)
581		void
582		mod_del_cmd(struct Message *msg)
583		{
584	<	assert(msg != NULL);
585	<
566	<	if (msg == NULL)
567	<	return;
584	>	assert(msg);
585	>	assert(msg->cmd);
586
587	<	del_msg_element(&msg_tree, msg->cmd);
587	>	if (msg_tree_parse(msg->cmd))
588	>	del_msg_element(&msg_tree, msg->cmd);
589		}
590
591		/* find_command()
#	Line 578 | Line 597 | mod_del_cmd(struct Message *msg)
597		struct Message *
598		find_command(const char *cmd)
599		{
600	<	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]);
600	>	return msg_tree_parse(cmd);
601		}
602
603		static void
604		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
605		{
606	<	unsigned int i;
607	<
608	<	if (mtree->msg != NULL)
609	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
610	<	me.name, source_p->name, mtree->msg->cmd,
609	<	mtree->msg->count, mtree->msg->bytes,
610	<	mtree->msg->rcount);
606	>	if (mtree->msg)
607	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
608	>	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)
612	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
613	>	if (mtree->pointers[i])
614		recurse_report_messages(source_p, mtree->pointers[i]);
615		}
616
617	<	/* 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).
617	>	/* report_messages()
618		*
619	<	* *WARNING*
620	<	*      Numerics are mostly error reports. If there is something
621	<	*      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...
619	>	* inputs       - pointer to client to report to
620	>	* output       - NONE
621	>	* side effects - client is shown list of commands
622		*/
623	<	static void
624	<	do_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
732	<	int parc, char *parv[])
623	>	void
624	>	report_messages(struct Client *source_p)
625		{
626	<	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	<	}
626	>	const struct MessageTree *const mtree = &msg_tree;
627
628	<	/* csircd will send out unknown umode flag for +a (admin), drop it here. */
629	<	if ((atoi(numeric) == ERR_UMODEUNKNOWNFLAG) && MyClient(target_p))
630	<	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);
628	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
629	>	if (mtree->pointers[i])
630	>	recurse_report_messages(source_p, mtree->pointers[i]);
631		}
632
633		/* m_not_oper()
634	<	* inputs       -
634	>	* inputs       -
635		* output       -
636		* side effects - just returns a nastyogram to given user
637		*/
638	<	void
639	<	m_not_oper(struct Client *client_p, struct Client *source_p,
832	<	int parc, char *parv[])
638	>	int
639	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
640		{
641	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
642	<	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	<	}
641	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
642	>	return 0;
643		}
644
645	<	void
646	<	m_registered(struct Client *client_p, struct Client *source_p,
857	<	int parc, char *parv[])
645	>	int
646	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
647		{
648	<	sendto_one(client_p, form_str(ERR_ALREADYREGISTRED),
649	<	me.name, source_p->name);
648	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
649	>	return 0;
650		}
651
652	<	void
653	<	m_ignore(struct Client *client_p, struct Client *source_p,
865	<	int parc, char *parv[])
652	>	int
653	>	m_registered(struct Client *source_p, int parc, char *parv[])
654		{
655	<	return;
655	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
656	>	return 0;
657		}
658
659	<	void
660	<	rfc1459_command_send_error(struct Client *client_p, struct Client *source_p,
872	<	int parc, char *parv[])
659	>	int
660	>	m_ignore(struct Client *source_p, int parc, char *parv[])
661		{
662	<	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");
662	>	return 0;
663		}

Comparing:
ircd-hybrid-7.3/src/parse.c (property svn:keywords), Revision 1118 by michael, Thu Jan 6 13:39:10 2011 UTC vs.
ircd-hybrid/trunk/src/parse.c (property svn:keywords), Revision 8752 by michael, Tue Jan 1 11:07:01 2019 UTC

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

Diff Legend

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