ViewVC Help

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

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

Comparing ircd-hybrid/trunk/src/parse.c (file contents):
Revision 2433 by michael, Fri Aug 2 18:43:00 2013 UTC vs.
Revision 3726 by michael, Sat May 31 17:16:53 2014 UTC

#	Line 1 | Line 1
1		/*
2	<	*  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3	<	*  parse.c: The message parser.
2	>	*  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3		*
4	<	*  Copyright (C) 2002 by the past and present ircd coders, and others.
4	>	*  Copyright (c) 1997-2014 ircd-hybrid development team
5		*
6		*  This program is free software; you can redistribute it and/or modify
7		*  it under the terms of the GNU General Public License as published by
#	Line 18 | Line 17
17		*  along with this program; if not, write to the Free Software
18		*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file parse.c
23	>	* \brief The message parser.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 34 | Line 36
36		#include "send.h"
37		#include "conf.h"
38		#include "memory.h"
39	<	#include "s_user.h"
40	<	#include "s_serv.h"
39	>	#include "user.h"
40	>	#include "server.h"
41	>
42
43		/*
44		* (based on orabidoo's parser code)
#	Line 51 | Line 54
54		* 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
55		*   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
56		*
57	<	*                               'i' -> [MessageTree *] -> 'e' and matches
57	>	*                               'i' -> [MessageTree *] -> 'e' and matches
58		*
59		* BUGS (Limitations!)
60		*
#	Line 97 | Line 100 | struct MessageTree
100
101		static struct MessageTree msg_tree;
102
103	<	/*
101	<	* NOTE: parse() should not be called recursively by other functions!
102	<	*/
103	<	static char *sender;
104	<	static char *para[MAXPARA + 2]; /* <prefix> + <params> + NULL */
105	<
106	<	static int cancel_clients(struct Client *, struct Client *, char *);
103	>	static void cancel_clients(struct Client *, struct Client *, char *);
104		static void remove_unknown(struct Client *, char *, char *);
105	<	static void handle_numeric(char[], struct Client *, struct Client *, int, char *[]);
106	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char *[]);
105	>	static void handle_numeric(unsigned int, struct Client *, int, char *[]);
106	>	static void handle_command(struct Message *, struct Client *, unsigned int, char *[]);
107
108
109		/*
#	Line 119 | Line 116 | parse(struct Client *client_p, char *pbu
116		{
117		struct Client *from = client_p;
118		struct Message *msg_ptr = NULL;
119	+	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
120		char *ch = NULL;
121		char *s = NULL;
122	<	char *numeric = NULL;
122	>	unsigned int numeric = 0;
123		unsigned int parc = 0;
124		unsigned int paramcount;
125
#	Line 129 | Line 127 | parse(struct Client *client_p, char *pbu
127		return;
128
129		assert(client_p->localClient->fd.flags.open);
130	<	assert((bufend - pbuffer) < 512);
130	>	assert((bufend - pbuffer) < IRCD_BUFSIZE);
131
132	<	for (ch = pbuffer; *ch == ' '; ++ch)  /* skip spaces */
133	<	/* null statement */  ;
132	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
133	>	;
134
135		if (*ch == ':')
136		{
#	Line 140 | Line 138 | parse(struct Client *client_p, char *pbu
138		* Copy the prefix to 'sender' assuming it terminates
139		* with SPACE (or NULL, which is an error, though).
140		*/
141	<	sender = ++ch;
141	>	char *sender = ++ch;
142
143	<	if ((s = strchr(ch, ' ')) != NULL)
143	>	if ((s = strchr(ch, ' ')))
144		{
145		*s = '\0';
146		ch = ++s;
#	Line 191 | Line 189 | parse(struct Client *client_p, char *pbu
189		* code. -avalon
190		*/
191
192	<	/* EOB is 3 chars long but is not a numeric */
193	<	if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
192	>	/* EOB is 3 characters long but is not a numeric */
193	>	if (*(ch + 3) == ' ' &&  /* Ok, lets see if its a possible numeric.. */
194		IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
195		{
196	<	numeric = ch;
197	<	paramcount = 2;  /* destination, and the rest of it */
196	>	numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
197	>	paramcount = 2;  /* Destination, and the rest of it */
198		++ServerStats.is_num;
199	<	s = ch + 3;  /* I know this is ' ' from above if            */
200	<	*s++ = '\0';  /* blow away the ' ', and point s to next part */
199	>	s = ch + 3;  /* I know this is ' ' from above if */
200	>	*s++ = '\0';  /* Blow away the ' ', and point s to next part */
201		}
202		else
203		{
204		unsigned int ii = 0;
205
206	<	if ((s = strchr(ch, ' ')) != NULL)
206	>	if ((s = strchr(ch, ' ')))
207		*s++ = '\0';
208
209		if ((msg_ptr = find_command(ch)) == NULL)
210		{
211	<	/*
211	>	/*
212		* Note: Give error message *only* to recognized
213		* persons. It's a nightmare situation to have
214		* two programs sending "Unknown command"'s or
#	Line 221 | Line 219 | parse(struct Client *client_p, char *pbu
219		* Hm, when is the buffer empty -- if a command
220		* code has been found ?? -Armin
221		*/
222	<	if (*pbuffer != '\0')
225	<	{
222	>	if (*pbuffer)
223		if (IsClient(from))
224	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
228	<	me.name, from->name, ch);
229	<	}
224	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
225
226		++ServerStats.is_unco;
227		return;
228		}
229
230	<	assert(msg_ptr->cmd != NULL);
230	>	assert(msg_ptr->cmd);
231
232		paramcount = msg_ptr->args_max;
233		ii = bufend - ((s) ? s : ch);
#	Line 246 | Line 241 | parse(struct Client *client_p, char *pbu
241		* this last parameter (about same effect as ":" has...) --msa
242		*/
243
244	<	/* Note initially true: s==NULL || *(s-1) == '\0' !! */
244	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
245
246	<	para[parc] = from->name;
246	>	para[parc] = ch;
247
248		if (s)
249		{
#	Line 266 | Line 261 | parse(struct Client *client_p, char *pbu
261		if (*s == ':')
262		{
263		/* The rest is a single parameter */
264	<	para[++parc] = s + (!numeric);  /* keep the colon if it's a numeric */
264	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
265		break;
266		}
267
#	Line 282 | Line 277 | parse(struct Client *client_p, char *pbu
277
278		para[++parc] = NULL;
279
280	<	if (msg_ptr != NULL)
281	<	handle_command(msg_ptr, client_p, from, parc, para);
280	>	if (msg_ptr)
281	>	handle_command(msg_ptr, from, parc, para);
282		else
283	<	handle_numeric(numeric, client_p, from, parc, para);
283	>	handle_numeric(numeric, from, parc, para);
284		}
285
286		/* handle_command()
#	Line 299 | Line 294 | parse(struct Client *client_p, char *pbu
294		* side effects -
295		*/
296		static void
297	<	handle_command(struct Message *mptr, struct Client *client_p,
298	<	struct Client *from, unsigned int i, char *hpara[])
297	>	handle_command(struct Message *mptr, struct Client *source_p,
298	>	unsigned int i, char *para[])
299		{
300	<	MessageHandler handler = 0;
301	<
307	<	if (IsServer(client_p))
308	<	mptr->rcount++;
309	<
310	<	mptr->count++;
300	>	if (IsServer(source_p->from))
301	>	++mptr->rcount;
302
303	<	handler = mptr->handlers[client_p->handler];
303	>	++mptr->count;
304
305	<	/* check right amount of params is passed... --is */
305	>	/* Check right amount of parameters is passed... --is */
306		if (i < mptr->args_min)
307	<	{
317	<	if (!IsServer(client_p))
318	<	{
319	<	sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS), me.name,
320	<	EmptyString(hpara[0]) ? "*" : hpara[0], mptr->cmd);
321	<	}
322	<	else
323	<	{
324	<	sendto_realops_flags(UMODE_ALL, L_ALL, SEND_NOTICE,
325	<	"Dropping server %s due to (invalid) command '%s' "
326	<	"with only %d arguments (expecting %d).",
327	<	client_p->name, mptr->cmd, i, mptr->args_min);
328	<	ilog(LOG_TYPE_IRCD, "Insufficient parameters (%d) for command '%s' from %s.",
329	<	i, mptr->cmd, client_p->name);
330	<	exit_client(client_p, client_p,
331	<	"Not enough arguments to server command.");
332	<	}
333	<	}
307	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, mptr->cmd);
308		else
309	<	(*handler)(client_p, from, i, hpara);
309	>	mptr->handlers[source_p->from->handler](source_p, i, para);
310		}
311
312		/* add_msg_element()
#	Line 359 | Line 333 | static void
333		add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
334		const char *cmd)
335		{
336	<	struct MessageTree *ntree_p;
336	>	struct MessageTree *ntree_p = NULL;
337
338		if (*cmd == '\0')
339		{
#	Line 376 | Line 350 | add_msg_element(struct MessageTree *mtre
350		*/
351		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
352		{
353	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
353	>	ntree_p = MyCalloc(sizeof(struct MessageTree));
354		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
355
356		mtree_p->links++;  /* Have new pointer, so up ref count */
#	Line 412 | Line 386 | add_msg_element(struct MessageTree *mtre
386		static void
387		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
388		{
389	<	struct MessageTree *ntree_p;
389	>	struct MessageTree *ntree_p = NULL;
390
391		/*
392		* In case this is called for a nonexistent command
393		* check that there is a msg pointer here, else links-- goes -ve
394		* -db
395		*/
396	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
396	>	if (*cmd == '\0' && mtree_p->msg)
397		{
398		mtree_p->msg = NULL;
399		mtree_p->links--;
400		}
401		else
402		{
403	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
403	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
404		{
405		del_msg_element(ntree_p, cmd + 1);
406
#	Line 451 | Line 425 | static struct Message *
425		msg_tree_parse(const char *cmd)
426		{
427		struct MessageTree *mtree = &msg_tree;
428	+
429		assert(cmd && *cmd);
430
431		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
#	Line 473 | Line 448 | mod_add_cmd(struct Message *msg)
448		{
449		assert(msg && msg->cmd);
450
451	<	/* command already added? */
451	>	/* Command already added? */
452		if (msg_tree_parse(msg->cmd))
453		return;
454
#	Line 492 | Line 467 | mod_del_cmd(struct Message *msg)
467		{
468		assert(msg && msg->cmd);
469
470	+	if (!msg_tree_parse(msg->cmd))
471	+	return;
472	+
473		del_msg_element(&msg_tree, msg->cmd);
474		}
475
#	Line 510 | Line 488 | find_command(const char *cmd)
488		static void
489		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
490		{
491	<	unsigned int i;
492	<
493	<	if (mtree->msg != NULL)
494	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
495	<	me.name, source_p->name, mtree->msg->cmd,
518	<	mtree->msg->count, mtree->msg->bytes,
519	<	mtree->msg->rcount);
491	>	if (mtree->msg)
492	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
493	>	mtree->msg->cmd,
494	>	mtree->msg->count, mtree->msg->bytes,
495	>	mtree->msg->rcount);
496
497	<	for (i = 0; i < MAXPTRLEN; ++i)
498	<	if (mtree->pointers[i] != NULL)
497	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
498	>	if (mtree->pointers[i])
499		recurse_report_messages(source_p, mtree->pointers[i]);
500		}
501
#	Line 533 | Line 509 | void
509		report_messages(struct Client *source_p)
510		{
511		const struct MessageTree *mtree = &msg_tree;
536	–	unsigned int i;
512
513	<	for (i = 0; i < MAXPTRLEN; ++i)
514	<	if (mtree->pointers[i] != NULL)
513	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
514	>	if (mtree->pointers[i])
515		recurse_report_messages(source_p, mtree->pointers[i]);
516		}
517
#	Line 546 | Line 521 | report_messages(struct Client *source_p)
521		* output       -
522		* side effects -
523		*/
524	<	static int
524	>	static void
525		cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
526		{
527		/*
#	Line 585 | Line 560 | cancel_clients(struct Client *client_p,
560		sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
561		"Not dropping server %s (%s) for Fake Direction",
562		client_p->name, source_p->name);
563	<	return -1;
589	<	/* return exit_client(client_p, client_p, &me, "Fake Direction");*/
563	>	return;
564		}
565
566		/*
#	Line 608 | Line 582 | cancel_clients(struct Client *client_p,
582		"Message for %s[%s@%s!%s] from %s (TS, ignored)",
583		source_p->name, source_p->username, source_p->host,
584		source_p->from->name, get_client_name(client_p, MASK_IP));
611	–
612	–	return 0;
585		}
586
587		/* remove_unknown()
#	Line 631 | Line 603 | remove_unknown(struct Client *client_p,
603		* 'nodots'          is a nickname (KILL)
604		* 'no.dot.at.start' is a server   (SQUIT)
605		*/
606	<	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) ||
635	<	strchr(lsender, '.') != NULL)
606	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
607		{
608		sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
609		"Unknown prefix (%s) from %s, Squitting %s",
#	Line 641 | Line 612 | remove_unknown(struct Client *client_p,
612		"Unknown prefix (%s) from %s, Squitting %s",
613		lbuffer, client_p->name, lsender);
614		sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
615	<	me.name, lsender, lbuffer, client_p->name);
615	>	me.id, lsender, lbuffer, client_p->name);
616		}
617		else
618		sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
619	<	me.name, lsender, me.name);
619	>	me.id, lsender, me.name);
620		}
621
622		/*
#	Line 670 | Line 641 | remove_unknown(struct Client *client_p,
641		* the savvy approach is NEVER generate an error in response to an... error :)
642		*/
643		static void
644	<	handle_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
674	<	int parc, char *parv[])
644	>	handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
645		{
646		struct Client *target_p = NULL;
647		struct Channel *chptr = NULL;
#	Line 692 | Line 662 | handle_numeric(char numeric[], struct Cl
662		if (IsChanPrefix(*parv[1]))
663		chptr = hash_find_channel(parv[1]);
664		else
665	<	target_p = find_person(client_p, parv[1]);
665	>	target_p = find_person(source_p, parv[1]);
666
667	<	if (((!target_p) || (target_p->from == client_p)) && !chptr)
667	>	if (((!target_p) || (target_p->from == source_p->from)) && !chptr)
668		return;
669
670		/*
#	Line 706 | Line 676 | handle_numeric(char numeric[], struct Cl
676		* remotely - but the information they contain may be useful, so we
677		* remap them up. Weird, but true.  -- Isomer
678		*/
679	<	if (numeric[0] == '0')
680	<	numeric[0] = '1';
679	>	if (numeric < 100)
680	>	numeric += 100;
681
682		if (target_p)
683		{
684	<	/* Fake it for server hiding, if its our client */
685	<	if (ConfigServerHide.hide_servers && MyClient(target_p) &&
684	>	/* Fake it for server hiding, if it's our client */
685	>	if (ConfigServerHide.hide_servers && MyConnect(target_p) &&
686		!HasUMode(target_p, UMODE_OPER))
687	<	sendto_one(target_p, ":%s %s %s %s", me.name, numeric, target_p->name, parv[2]);
687	>	sendto_one_numeric(target_p, &me, numeric|SND_EXPLICIT, "%s", parv[2]);
688		else
689	<	sendto_one(target_p, ":%s %s %s %s", ID_or_name(source_p, target_p->from),
720	<	numeric, ID_or_name(target_p, target_p->from), parv[2]);
689	>	sendto_one_numeric(target_p, source_p, numeric|SND_EXPLICIT, "%s", parv[2]);
690		}
691		else
692	<	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s %s %s %s",
693	<	source_p->name, numeric, chptr->chname, parv[2]);
692	>	sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
693	>	numeric, chptr->chname, parv[2]);
694		}
695
696		/* m_not_oper()
#	Line 729 | Line 698 | handle_numeric(char numeric[], struct Cl
698		* output       -
699		* side effects - just returns a nastyogram to given user
700		*/
701	<	void
702	<	m_not_oper(struct Client *client_p, struct Client *source_p,
734	<	int parc, char *parv[])
701	>	int
702	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
703		{
704	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
705	<	me.name, source_p->name);
704	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
705	>	return 0;
706		}
707
708	<	void
709	<	m_unregistered(struct Client *client_p, struct Client *source_p,
742	<	int parc, char *parv[])
708	>	int
709	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
710		{
711	<	sendto_one(source_p, form_str(ERR_NOTREGISTERED), me.name,
712	<	source_p->name[0] ? source_p->name : "*");
711	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
712	>	return 0;
713		}
714
715	<	void
716	<	m_registered(struct Client *client_p, struct Client *source_p,
750	<	int parc, char *parv[])
715	>	int
716	>	m_registered(struct Client *source_p, int parc, char *parv[])
717		{
718	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
719	<	me.name, source_p->name);
718	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
719	>	return 0;
720		}
721
722	<	void
723	<	m_ignore(struct Client *client_p, struct Client *source_p,
758	<	int parc, char *parv[])
722	>	int
723	>	m_ignore(struct Client *source_p, int parc, char *parv[])
724		{
725	<	return;
725	>	return 0;
726		}

Diff Legend

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