ViewVC Help

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

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

Comparing:
ircd-hybrid-8/src/parse.c (file contents), Revision 1247 by michael, Sat Oct 1 07:54:24 2011 UTC vs.
ircd-hybrid/trunk/src/parse.c (file contents), Revision 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 28 | Line 30
30		#include "channel.h"
31		#include "hash.h"
32		#include "irc_string.h"
31	–	#include "sprintf_irc.h"
33		#include "ircd.h"
34		#include "numeric.h"
35	<	#include "s_log.h"
35	>	#include "log.h"
36		#include "send.h"
37	<	#include "s_conf.h"
37	>	#include "conf.h"
38		#include "memory.h"
39	<	#include "s_user.h"
40	<	#include "s_serv.h"
39	>	#include "user.h"
40	>	#include "server.h"
41	>
42
43		/*
44		* (based on orabidoo's parser code)
#	Line 52 | Line 54
54		* 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
55		*   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
56		*
57	<	*                               'i' -> [MessageTree *] -> 'e' and matches
57	>	*                               'i' -> [MessageTree *] -> 'e' and matches
58		*
59		* BUGS (Limitations!)
60	<	*
60	>	*
61		* I designed this trie to parse ircd commands. Hence it currently
62		* casefolds. This is trivial to fix by increasing MAXPTRLEN.
63		* This trie also "folds" '{' etc. down. This means, the input to this
#	Line 65 | Line 67
67		* MAXPTRLEN 128.
68		*
69		* This is also not a patricia trie. On short ircd tokens, this is
70	<	* not likely going to matter.
70	>	* not likely going to matter.
71		*
72		* Diane Bruce (Dianora), June 6 2003
73		*/
74
75	<	#define MAXPTRLEN       32
75	>	#define MAXPTRLEN 32
76		/* Must be a power of 2, and
77		* larger than 26 [a-z]|[A-Z]
78		* its used to allocate the set
#	Line 89 | Line 91
91
92		struct MessageTree
93		{
94	<	int links; /* Count of all pointers (including msg) at this node
95	<	* used as reference count for deletion of _this_ node.
96	<	*/
94	>	int links; /* Count of all pointers (including msg) at this node
95	>	* used as reference count for deletion of _this_ node.
96	>	*/
97		struct Message *msg;
98		struct MessageTree *pointers[MAXPTRLEN];
99		};
100
101		static struct MessageTree msg_tree;
102
103	<	/*
102	<	* NOTE: parse() should not be called recursively by other functions!
103	<	*/
104	<	static char *sender;
105	<	static char *para[MAXPARA + 1];
106	<	static char buffer[1024];
107	<
108	<	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 *[]);
112	<	static void add_msg_element(struct MessageTree *, struct Message *, const char *);
113	<	static void del_msg_element(struct MessageTree *, const 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 123 | 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 133 | 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 144 | 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 157 | Line 151 | parse(struct Client *client_p, char *pbu
151		if ((from = find_person(client_p, sender)) == NULL)
152		from = hash_find_server(sender);
153
154	<	/* Hmm! If the client corresponding to the
155	<	* prefix is not found--what is the correct
156	<	* action??? Now, I will ignore the message
157	<	* (old IRC just let it through as if the
164	<	* prefix just wasn't there...) --msa
154	>	/*
155	>	* Hmm! If the client corresponding to the prefix is not found--what is
156	>	* the correct action??? Now, I will ignore the message (old IRC just
157	>	* let it through as if the prefix just wasn't there...) --msa
158		*/
159		if (from == NULL)
160		{
#	Line 188 | Line 181 | parse(struct Client *client_p, char *pbu
181		return;
182		}
183
184	<	/* Extract the command code from the packet.  Point s to the end
184	>	/*
185	>	* Extract the command code from the packet. Point s to the end
186		* of the command code and calculate the length using pointer
187	<	* arithmetic.  Note: only need length for numerics and *all*
187	>	* arithmetic. Note: only need length for numerics and *all*
188		* numerics must have parameters and thus a space after the command
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 = MAXPARA;
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	<	{
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	<	/* Note: Give error message *only* to recognized
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
215		* equivalent to each other at full blast....
#	Line 224 | 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')
228	<	{
222	>	if (*pbuffer)
223		if (IsClient(from))
224	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
231	<	me.name, from->name, ch);
232	<	}
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 249 | 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 269 | Line 261 | parse(struct Client *client_p, char *pbu
261		if (*s == ':')
262		{
263		/* The rest is a single parameter */
264	<	para[++parc] = s + 1;
264	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
265		break;
266		}
267
#	Line 285 | 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 302 | 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[MAXPARA])
297	>	handle_command(struct Message *mptr, struct Client *source_p,
298	>	unsigned int i, char *para[])
299		{
300	<	MessageHandler handler = 0;
300	>	if (IsServer(source_p->from))
301	>	++mptr->rcount;
302
303	<	if (IsServer(client_p))
311	<	mptr->rcount++;
303	>	++mptr->count;
304
305	<	mptr->count++;
314	<
315	<	/* New patch to avoid server flooding from unregistered connects
316	<	* - Pie-Man 07/27/2000 */
317	<	if (!IsRegistered(client_p))
318	<	{
319	<	/* if its from a possible server connection
320	<	* ignore it.. more than likely its a header thats sneaked through
321	<	*/
322	<	if ((IsHandshake(client_p) || IsConnecting(client_p) ||
323	<	IsServer(client_p)) && !(mptr->flags & MFLG_UNREG))
324	<	return;
325	<	}
326	<
327	<	handler = mptr->handlers[client_p->handler];
328	<
329	<	/* check right amount of params is passed... --is */
305	>	/* Check right amount of parameters is passed... --is */
306		if (i < mptr->args_min)
307	<	{
332	<	if (!IsServer(client_p))
333	<	{
334	<	sendto_one(client_p, form_str(ERR_NEEDMOREPARAMS),
335	<	me.name, EmptyString(hpara[0]) ? "*" : hpara[0], mptr->cmd);
336	<	}
337	<	else
338	<	{
339	<	sendto_realops_flags(UMODE_ALL, L_ALL,
340	<	"Dropping server %s due to (invalid) command '%s' "
341	<	"with only %d arguments (expecting %d).",
342	<	client_p->name, mptr->cmd, i, mptr->args_min);
343	<	ilog(LOG_TYPE_IRCD, "Insufficient parameters (%d) for command '%s' from %s.",
344	<	i, mptr->cmd, client_p->name);
345	<	exit_client(client_p, client_p,
346	<	"Not enough arguments to server command.");
347	<	}
348	<	}
307	>	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, mptr->cmd);
308		else
309	<	(*handler)(client_p, from, i, hpara);
351	<	}
352	<
353	<	/* clear_tree_parse()
354	<	*
355	<	* inputs       - NONE
356	<	* output       - NONE
357	<	* side effects - MUST MUST be called at startup ONCE before
358	<	*                any other keyword routine is used.
359	<	*/
360	<	void
361	<	clear_tree_parse(void)
362	<	{
363	<	memset(&msg_tree, 0, sizeof(msg_tree));
309	>	mptr->handlers[source_p->from->handler](source_p, i, para);
310		}
311
312		/* add_msg_element()
#	Line 384 | Line 330 | clear_tree_parse(void)
330		* in the parent.
331		*/
332		static void
333	<	add_msg_element(struct MessageTree *mtree_p,
334	<	struct Message *msg_p, const char *cmd)
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		{
340		mtree_p->msg = msg_p;
341	<	mtree_p->links++;           /* Have msg pointer, so up ref count */
341	>	mtree_p->links++;  /* Have msg pointer, so up ref count */
342		}
343		else
344		{
345	<	/* *cmd & (MAXPTRLEN-1)
345	>	/*
346	>	* *cmd & (MAXPTRLEN-1)
347		* convert the char pointed to at *cmd from ASCII to an integer
348		* between 0 and MAXPTRLEN.
349		* Thus 'A' -> 0x1 'B' -> 0x2 'c' -> 0x3 etc.
350		*/
404	–
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 */
356	>	mtree_p->links++;  /* Have new pointer, so up ref count */
357		}
358
359		add_msg_element(ntree_p, msg_p, cmd + 1);
#	Line 440 | 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
407		if (ntree_p->links == 0)
408		{
409	<	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
410	<	mtree_p->links--;
411	<	MyFree(ntree_p);
409	>	mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = NULL;
410	>	mtree_p->links--;
411	>	MyFree(ntree_p);
412		}
413		}
414		}
#	Line 476 | Line 422 | del_msg_element(struct MessageTree *mtre
422		* side effects - none
423		*/
424		static struct Message *
425	<	msg_tree_parse(const char *cmd, struct MessageTree *root)
425	>	msg_tree_parse(const char *cmd)
426		{
427	<	struct MessageTree *mtree = root;
427	>	struct MessageTree *mtree = &msg_tree;
428	>
429		assert(cmd && *cmd);
430
431		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
#	Line 501 | Line 448 | mod_add_cmd(struct Message *msg)
448		{
449		assert(msg && msg->cmd);
450
451	<	/* command already added? */
452	<	if (msg_tree_parse(msg->cmd, &msg_tree))
451	>	/* Command already added? */
452	>	if (msg_tree_parse(msg->cmd))
453		return;
454
455		add_msg_element(&msg_tree, msg, msg->cmd);
#	Line 520 | 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 532 | Line 482 | mod_del_cmd(struct Message *msg)
482		struct Message *
483		find_command(const char *cmd)
484		{
485	<	return msg_tree_parse(cmd, &msg_tree);
485	>	return msg_tree_parse(cmd);
486		}
487
488		static void
489		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
490		{
491	<	unsigned int i;
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	<	if (mtree->msg != NULL)
498	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
545	<	me.name, source_p->name, mtree->msg->cmd,
546	<	mtree->msg->count, mtree->msg->bytes,
547	<	mtree->msg->rcount);
548	<
549	<	for (i = 0; i < MAXPTRLEN; ++i)
550	<	if (mtree->pointers[i] != NULL)
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 561 | Line 509 | void
509		report_messages(struct Client *source_p)
510		{
511		const struct MessageTree *mtree = &msg_tree;
564	–	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
518		/* cancel_clients()
519		*
520	<	* inputs       -
521	<	* output       -
522	<	* side effects -
520	>	* inputs       -
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	<	/* kill all possible points that are causing confusion here,
527	>	/*
528	>	* Kill all possible points that are causing confusion here,
529		* I'm not sure I've got this all right...
530		* - avalon
531		*
532	<	* knowing avalon, probably not.
532	>	* Knowing avalon, probably not.
533		*/
534
535	<	/* with TS, fake prefixes are a common thing, during the
535	>	/*
536	>	* With TS, fake prefixes are a common thing, during the
537		* connect burst when there's a nick collision, and they
538		* must be ignored rather than killed because one of the
539		* two is surviving.. so we don't bother sending them to
#	Line 593 | Line 542 | cancel_clients(struct Client *client_p,
542		* servers to be dropped though, as well as the ones from
543		* non-TS servers -orabidoo
544		*/
545	<	/* Incorrect prefix for a server from some connection.  If it is a
545	>	/*
546	>	* Incorrect prefix for a server from some connection. If it is a
547		* client trying to be annoying, just QUIT them, if it is a server
548		* then the same deal.
549		*/
550		if (IsServer(source_p) || IsMe(source_p))
551		{
552	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, "Message for %s[%s] from %s",
552	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
553	>	"Message for %s[%s] from %s",
554		source_p->name, source_p->from->name,
555		get_client_name(client_p, SHOW_IP));
556	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,  "Message for %s[%s] from %s",
556	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
557	>	"Message for %s[%s] from %s",
558		source_p->name, source_p->from->name,
559		get_client_name(client_p, MASK_IP));
560	<	sendto_realops_flags(UMODE_DEBUG, L_ALL,
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;
612	<	/* return exit_client(client_p, client_p, &me, "Fake Direction");*/
563	>	return;
564		}
565
566	<	/* Ok, someone is trying to impose as a client and things are
567	<	* confused.  If we got the wrong prefix from a server, send out a
566	>	/*
567	>	* Ok, someone is trying to impose as a client and things are
568	>	* confused. If we got the wrong prefix from a server, send out a
569		* kill, else just exit the lame client.
570		*/
571	<	/* If the fake prefix is coming from a TS server, discard it
571	>	/*
572	>	* If the fake prefix is coming from a TS server, discard it
573		* silently -orabidoo
574		*
575		* all servers must be TS these days --is
576		*/
577	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
577	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
578		"Message for %s[%s@%s!%s] from %s (TS, ignored)",
579		source_p->name, source_p->username, source_p->host,
580		source_p->from->name, get_client_name(client_p, SHOW_IP));
581	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,
581	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
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));
632	–
633	–	return 0;
585		}
586
587		/* remove_unknown()
588		*
589	<	* inputs       -
590	<	* output       -
591	<	* side effects -
589	>	* inputs       -
590	>	* output       -
591	>	* side effects -
592		*/
593		static void
594		remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
595		{
596	<	/* Do kill if it came from a server because it means there is a ghost
596	>	/*
597	>	* Do kill if it came from a server because it means there is a ghost
598		* user on the other server which needs to be removed. -avalon
599		* Tell opers about this. -Taner
600		*/
601	<	/* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
601	>	/*
602	>	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
603		* 'nodots'          is a nickname (KILL)
604		* 'no.dot.at.start' is a server   (SQUIT)
605		*/
606	<	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) ||
654	<	strchr(lsender, '.') != NULL)
606	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
607		{
608	<	sendto_realops_flags(UMODE_DEBUG, L_ADMIN,
608	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
609		"Unknown prefix (%s) from %s, Squitting %s",
610		lbuffer, get_client_name(client_p, SHOW_IP), lsender);
611	<	sendto_realops_flags(UMODE_DEBUG, L_OPER,
611	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
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 680 | Line 632 | remove_unknown(struct Client *client_p,
632		*      wrong with the message, just *DROP* it! Don't even think of
633		*      sending back a neat error message -- big danger of creating
634		*      a ping pong error message...
635	+	*
636	+	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
637	+	*
638	+	* Called when we get a numeric message from a remote _server_ and we are
639	+	* supposed to forward it somewhere. Note that we always ignore numerics sent
640	+	* to 'me' and simply drop the message if we can't handle with this properly:
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,
686	<	int parc, char *parv[])
644	>	handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
645		{
646	<	struct Client *target_p;
647	<	struct Channel *chptr;
690	<	char *t;    /* current position within the buffer */
691	<	int i, tl;  /* current length of presently being built string in t */
646	>	struct Client *target_p = NULL;
647	>	struct Channel *chptr = NULL;
648
649	+	/*
650	+	* Avoid trash, we need it to come from a server and have a target
651	+	*/
652		if (parc < 2 || !IsServer(source_p))
653		return;
654
655	<	/* Remap low number numerics. */
656	<	if (numeric[0] == '0')
657	<	numeric[0] = '1';
658	<
659	<	/* Prepare the parameter portion of the message into 'buffer'.
660	<	* (Because the buffer is twice as large as the message buffer
702	<	* for the socket, no overflow can occur here... ...on current
703	<	* assumptions--bets are off, if these are changed --msa)
655	>	/*
656	>	* Who should receive this message ? Will we do something with it ?
657	>	* Note that we use findUser functions, so the target can't be neither
658	>	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
659	>	* should never generate numeric replies to non-users anyway
660	>	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
661		*/
662	<	t = buffer;
663	<	for (i = 2; i < (parc - 1); i++)
664	<	{
665	<	tl = ircsprintf(t, " %s", parv[i]);
709	<	t += tl;
710	<	}
711	<
712	<	ircsprintf(t," :%s", parv[parc-1]);
713	<
714	<	if (((target_p = find_person(client_p, parv[1])) != NULL) ||
715	<	((target_p = hash_find_server(parv[1])) != NULL))
716	<	{
717	<	if (IsMe(target_p))
718	<	{
719	<	int num;
720	<
721	<	/*
722	<	* We shouldn't get numerics sent to us,
723	<	* any numerics we do get indicate a bug somewhere..
724	<	*/
725	<	/* ugh.  this is here because of nick collisions.  when two servers
726	<	* relink, they burst each other their nicks, then perform collides.
727	<	* if there is a nick collision, BOTH servers will kill their own
728	<	* nicks, and BOTH will kill the other servers nick, which wont exist,
729	<	* because it will have been already killed by the local server.
730	<	*
731	<	* unfortunately, as we cant guarantee other servers will do the
732	<	* "right thing" on a nick collision, we have to keep both kills.
733	<	* ergo we need to ignore ERR_NOSUCHNICK. --fl_
734	<	*/
735	<	/* quick comment. This _was_ tried. i.e. assume the other servers
736	<	* will do the "right thing" and kill a nick that is colliding.
737	<	* unfortunately, it did not work. --Dianora
738	<	*/
739	<
740	<	/* Yes, a good compiler would have optimised this, but
741	<	* this is probably easier to read. -db
742	<	*/
743	<	num = atoi(numeric);
662	>	if (IsChanPrefix(*parv[1]))
663	>	chptr = hash_find_channel(parv[1]);
664	>	else
665	>	target_p = find_person(source_p, parv[1]);
666
667	<	if ((num != ERR_NOSUCHNICK))
668	<	sendto_realops_flags(UMODE_ALL, L_ADMIN,
747	<	"*** %s(via %s) sent a %s numeric to me: %s",
748	<	source_p->name, client_p->name, numeric, buffer);
749	<	return;
750	<	}
751	<	else if (target_p->from == client_p)
752	<	{
753	<	/* This message changed direction (nick collision?)
754	<	* ignore it.
755	<	*/
756	<	return;
757	<	}
667	>	if (((!target_p) || (target_p->from == source_p->from)) && !chptr)
668	>	return;
669
670	<	/* csircd will send out unknown umode flag for +a (admin), drop it here. */
671	<	if ((atoi(numeric) == ERR_UMODEUNKNOWNFLAG) && MyClient(target_p))
672	<	return;
673	<
674	<	/* Fake it for server hiding, if its our client */
675	<	if (ConfigServerHide.hide_servers &&
676	<	MyClient(target_p) && !HasUMode(target_p, UMODE_OPER))
677	<	sendto_one(target_p, ":%s %s %s%s", me.name, numeric, target_p->name, buffer);
670	>	/*
671	>	* Remap low number numerics, not that I understand WHY.. --Nemesi
672	>	*/
673	>	/*
674	>	* Numerics below 100 talk about the current 'connection', you're not
675	>	* connected to a remote server so it doesn't make sense to send them
676	>	* remotely - but the information they contain may be useful, so we
677	>	* remap them up. Weird, but true.  -- Isomer
678	>	*/
679	>	if (numeric < 100)
680	>	numeric += 100;
681	>
682	>	if (target_p)
683	>	{
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_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),
769	<	numeric, ID_or_name(target_p, target_p->from), buffer);
770	<	return;
689	>	sendto_one_numeric(target_p, source_p, numeric|SND_EXPLICIT, "%s", parv[2]);
690		}
691	<	else if ((chptr = hash_find_channel(parv[1])) != NULL)
692	<	sendto_channel_local(ALL_MEMBERS, 0, chptr,
693	<	":%s %s %s %s",
775	<	source_p->name,
776	<	numeric, chptr->chname, buffer);
691	>	else
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()
697	<	* inputs       -
697	>	* inputs       -
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,
786	<	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,
794	<	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,
802	<	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);
806	<	}
807	<
808	<	void
809	<	m_ignore(struct Client *client_p, struct Client *source_p,
810	<	int parc, char *parv[])
811	<	{
812	<	return;
718	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
719	>	return 0;
720		}
721
722	<	void
723	<	rfc1459_command_send_error(struct Client *client_p, struct Client *source_p,
817	<	int parc, char *parv[])
722	>	int
723	>	m_ignore(struct Client *source_p, int parc, char *parv[])
724		{
725	<	const char *in_para;
820	<
821	<	in_para = (parc > 1 && *parv[1] != '\0') ? parv[1] : "<>";
822	<
823	<	ilog(LOG_TYPE_IRCD, "Received ERROR message from %s: %s",
824	<	source_p->name, in_para);
825	<
826	<	if (client_p == source_p)
827	<	{
828	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s -- %s",
829	<	get_client_name(client_p, HIDE_IP), in_para);
830	<	sendto_realops_flags(UMODE_ALL, L_OPER,  "ERROR :from %s -- %s",
831	<	get_client_name(client_p, MASK_IP), in_para);
832	<	}
833	<	else
834	<	{
835	<	sendto_realops_flags(UMODE_ALL, L_OPER, "ERROR :from %s via %s -- %s",
836	<	source_p->name, get_client_name(client_p, MASK_IP), in_para);
837	<	sendto_realops_flags(UMODE_ALL, L_ADMIN, "ERROR :from %s via %s -- %s",
838	<	source_p->name, get_client_name(client_p, HIDE_IP), in_para);
839	<	}
840	<
841	<	if (MyClient(source_p))
842	<	exit_client(source_p, source_p, "ERROR");
725	>	return 0;
726		}

Diff Legend

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