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 2786 by michael, Mon Jan 6 22:33:53 2014 UTC vs.
Revision 4760 by michael, Sun Oct 19 11:09:15 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 16 | Line 15
15		*
16		*  You should have received a copy of the GNU General Public License
17		*  along with this program; if not, write to the Free Software
18	<	*  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18	>	*  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19		*  USA
20	<	*
21	<	*  $Id$
20	>	*/
21	>
22	>	/*! \file parse.c
23	>	* \brief The message parser.
24	>	* \version $Id$
25		*/
26
27		#include "stdinc.h"
#	Line 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 69 | Line 72
72		* Diane Bruce (Dianora), June 6 2003
73		*/
74
75	+	/*
76	+	* Must be a power of 2, and larger than 26 [a-z]|[A-Z]. It's used to allocate
77	+	* the set of pointers at each node of the tree.
78	+	* There are MAXPTRLEN pointers at each node. Obviously, there have to be more
79	+	* pointers than ASCII letters. 32 is a nice number since there is then no need
80	+	* to shift 'A'/'a' to base 0 index, at the expense of a few never used
81	+	* pointers.
82	+	* For a small parser like this, this is a good compromise and does
83	+	* make it somewhat faster. - Dianora
84	+	*/
85		#define MAXPTRLEN 32
73	–	/* Must be a power of 2, and
74	–	* larger than 26 [a-z]|[A-Z]
75	–	* its used to allocate the set
76	–	* of pointers at each node of the tree
77	–	* There are MAXPTRLEN pointers at each node.
78	–	* Obviously, there have to be more pointers
79	–	* Than ASCII letters. 32 is a nice number
80	–	* since there is then no need to shift
81	–	* 'A'/'a' to base 0 index, at the expense
82	–	* of a few never used pointers. For a small
83	–	* parser like this, this is a good compromise
84	–	* and does make it somewhat faster.
85	–	*
86	–	* - Dianora
87	–	*/
86
87	<	struct MessageTree
87	>
88	>	static struct MessageTree
89		{
90		int links; /* Count of all pointers (including msg) at this node
91		* used as reference count for deletion of _this_ node.
92		*/
93		struct Message *msg;
94		struct MessageTree *pointers[MAXPTRLEN];
95	<	};
95	>	} msg_tree;
96	>
97	>
98	>	/* remove_unknown()
99	>	*
100	>	* inputs       -
101	>	* output       -
102	>	* side effects -
103	>	*/
104	>	static void
105	>	parse_remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
106	>	{
107	>	/*
108	>	* Do kill if it came from a server because it means there is a ghost
109	>	* user on the other server which needs to be removed. -avalon
110	>	* Tell opers about this. -Taner
111	>	*/
112	>	/*
113	>	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
114	>	* 'nodots'          is a nickname (KILL)
115	>	* 'no.dot.at.start' is a server   (SQUIT)
116	>	*/
117	>	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
118	>	{
119	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
120	>	"Unknown prefix (%s) from %s, Squitting %s",
121	>	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
122	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
123	>	"Unknown prefix (%s) from %s, Squitting %s",
124	>	lbuffer, client_p->name, lsender);
125	>	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
126	>	me.id, lsender, lbuffer, client_p->name);
127	>	}
128	>	else
129	>	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
130	>	me.id, lsender, me.name);
131	>	}
132	>
133	>	/* cancel_clients()
134	>	*
135	>	* inputs       -
136	>	* output       -
137	>	* side effects -
138	>	*/
139	>	static void
140	>	parse_cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
141	>	{
142	>	if (IsServer(source_p) || IsMe(source_p))
143	>	{
144	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
145	>	"Message for %s[%s] from %s",
146	>	source_p->name, source_p->from->name,
147	>	get_client_name(client_p, SHOW_IP));
148	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
149	>	"Message for %s[%s] from %s",
150	>	source_p->name, source_p->from->name,
151	>	get_client_name(client_p, MASK_IP));
152	>	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
153	>	"Not dropping server %s (%s) for Fake Direction",
154	>	client_p->name, source_p->name);
155	>	return;
156	>	}
157
158	<	static struct MessageTree msg_tree;
158	>	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
159	>	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
160	>	source_p->name, source_p->username, source_p->host,
161	>	source_p->from->name, get_client_name(client_p, SHOW_IP));
162	>	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
163	>	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
164	>	source_p->name, source_p->username, source_p->host,
165	>	source_p->from->name, get_client_name(client_p, MASK_IP));
166	>	}
167
168		/*
169	<	* NOTE: parse() should not be called recursively by other functions!
169	>	*
170	>	*      parc    number of arguments ('sender' counted as one!)
171	>	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
172	>	*      parv[1]..parv[parc-1]
173	>	*              pointers to additional parameters, this is a NULL
174	>	*              terminated list (parv[parc] == NULL).
175	>	*
176	>	* *WARNING*
177	>	*      Numerics are mostly error reports. If there is something
178	>	*      wrong with the message, just *DROP* it! Don't even think of
179	>	*      sending back a neat error message -- big danger of creating
180	>	*      a ping pong error message...
181	>	*
182	>	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
183	>	*
184	>	* Called when we get a numeric message from a remote _server_ and we are
185	>	* supposed to forward it somewhere. Note that we always ignore numerics sent
186	>	* to 'me' and simply drop the message if we can't handle with this properly:
187	>	* the savvy approach is NEVER generate an error in response to an... error :)
188	>	*/
189	>	static void
190	>	parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
191	>	{
192	>	struct Client *target_p = NULL;
193	>	struct Channel *chptr = NULL;
194	>
195	>	/*
196	>	* Avoid trash, we need it to come from a server and have a target
197	>	*/
198	>	if (parc < 2 || !IsServer(source_p))
199	>	return;
200	>
201	>	/*
202	>	* Who should receive this message ? Will we do something with it ?
203	>	* Note that we use findUser functions, so the target can't be neither
204	>	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
205	>	* should never generate numeric replies to non-users anyway
206	>	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
207	>	*/
208	>	if (IsChanPrefix(*parv[1]))
209	>	chptr = hash_find_channel(parv[1]);
210	>	else
211	>	target_p = find_person(source_p, parv[1]);
212	>
213	>	if (((!target_p) || (target_p->from == source_p->from)) && !chptr)
214	>	return;
215	>
216	>	/*
217	>	* Remap low number numerics, not that I understand WHY.. --Nemesi
218	>	*/
219	>	/*
220	>	* Numerics below 100 talk about the current 'connection', you're not
221	>	* connected to a remote server so it doesn't make sense to send them
222	>	* remotely - but the information they contain may be useful, so we
223	>	* remap them up. Weird, but true.  -- Isomer
224	>	*/
225	>	if (numeric < 100)
226	>	numeric += 100;
227	>
228	>	if (target_p)
229	>	{
230	>	/* Fake it for server hiding, if it's our client */
231	>	if ((ConfigServerHide.hide_servers || IsHidden(source_p)) && MyConnect(target_p) &&
232	>	!HasUMode(target_p, UMODE_OPER))
233	>	sendto_one_numeric(target_p, &me, numeric|SND_EXPLICIT, "%s", parv[2]);
234	>	else
235	>	sendto_one_numeric(target_p, source_p, numeric|SND_EXPLICIT, "%s", parv[2]);
236	>	}
237	>	else
238	>	sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
239	>	numeric, chptr->name, parv[2]);
240	>	}
241	>
242	>	/* handle_command()
243	>	*
244	>	* inputs       - pointer to message block
245	>	*              - pointer to client
246	>	*              - pointer to client message is from
247	>	*              - count of number of args
248	>	*              - pointer to argv[] array
249	>	* output       - -1 if error from server
250	>	* side effects -
251		*/
252	<	static char *sender;
253	<	static char *para[MAXPARA + 2]; /* <prefix> + <params> + NULL */
252	>	static void
253	>	parse_handle_command(struct Message *mptr, struct Client *source_p,
254	>	unsigned int i, char *para[])
255	>	{
256	>	if (IsServer(source_p->from))
257	>	++mptr->rcount;
258
259	<	static int cancel_clients(struct Client *, struct Client *, char *);
107	<	static void remove_unknown(struct Client *, char *, char *);
108	<	static void handle_numeric(char[], struct Client *, struct Client *, int, char *[]);
109	<	static void handle_command(struct Message *, struct Client *, struct Client *, unsigned int, char *[]);
259	>	++mptr->count;
260
261	+	/* Check right amount of parameters is passed... --is */
262	+	if (i < mptr->args_min)
263	+	sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, mptr->cmd);
264	+	else
265	+	mptr->handlers[source_p->from->handler](source_p, i, para);
266	+	}
267
268		/*
269		* parse a buffer.
#	Line 119 | Line 275 | parse(struct Client *client_p, char *pbu
275		{
276		struct Client *from = client_p;
277		struct Message *msg_ptr = NULL;
278	+	char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
279		char *ch = NULL;
280		char *s = NULL;
281	<	char *numeric = NULL;
281	>	unsigned int numeric = 0;
282		unsigned int parc = 0;
283		unsigned int paramcount;
284
285		if (IsDefunct(client_p))
286		return;
287
288	<	assert(client_p->localClient->fd.flags.open);
288	>	assert(client_p->connection->fd.flags.open);
289		assert((bufend - pbuffer) < IRCD_BUFSIZE);
290
291	<	for (ch = pbuffer; *ch == ' '; ++ch)  /* skip spaces */
292	<	/* null statement */  ;
291	>	for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
292	>	;
293
294		if (*ch == ':')
295		{
#	Line 140 | Line 297 | parse(struct Client *client_p, char *pbu
297		* Copy the prefix to 'sender' assuming it terminates
298		* with SPACE (or NULL, which is an error, though).
299		*/
300	<	sender = ++ch;
300	>	const char *sender = ++ch;
301
302	<	if ((s = strchr(ch, ' ')) != NULL)
302	>	if ((s = strchr(ch, ' ')))
303		{
304		*s = '\0';
305		ch = ++s;
#	Line 150 | Line 307 | parse(struct Client *client_p, char *pbu
307
308		if (*sender && IsServer(client_p))
309		{
310	<	if ((from = find_person(client_p, sender)) == NULL)
311	<	from = hash_find_server(sender);
310	>	if ((from = hash_find_id(sender)) == NULL)
311	>	from = hash_find_client(sender);
312
313		/*
314		* Hmm! If the client corresponding to the prefix is not found--what is
#	Line 161 | Line 318 | parse(struct Client *client_p, char *pbu
318		if (from == NULL)
319		{
320		++ServerStats.is_unpf;
321	<	remove_unknown(client_p, sender, pbuffer);
321	>	parse_remove_unknown(client_p, sender, pbuffer);
322		return;
323		}
324
325		if (from->from != client_p)
326		{
327		++ServerStats.is_wrdi;
328	<	cancel_clients(client_p, from, pbuffer);
328	>	parse_cancel_clients(client_p, from, pbuffer);
329		return;
330		}
331		}
#	Line 191 | Line 348 | parse(struct Client *client_p, char *pbu
348		* code. -avalon
349		*/
350
351	<	/* EOB is 3 chars long but is not a numeric */
352	<	if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
351	>	/* EOB is 3 characters long but is not a numeric */
352	>	if (*(ch + 3) == ' ' &&  /* Ok, let's see if it's a possible numeric */
353		IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
354		{
355	<	numeric = ch;
356	<	paramcount = 2;  /* destination, and the rest of it */
355	>	numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
356	>	paramcount = 2;  /* Destination, and the rest of it */
357		++ServerStats.is_num;
358	<	s = ch + 3;  /* I know this is ' ' from above if            */
359	<	*s++ = '\0';  /* blow away the ' ', and point s to next part */
358	>	s = ch + 3;  /* I know this is ' ' from above if */
359	>	*s++ = '\0';  /* Blow away the ' ', and point s to next part */
360		}
361		else
362		{
363	<	unsigned int ii = 0;
363	>	unsigned int length = 0;
364
365	<	if ((s = strchr(ch, ' ')) != NULL)
365	>	if ((s = strchr(ch, ' ')))
366		*s++ = '\0';
367
368		if ((msg_ptr = find_command(ch)) == NULL)
369		{
370	<	/*
370	>	/*
371		* Note: Give error message *only* to recognized
372		* persons. It's a nightmare situation to have
373		* two programs sending "Unknown command"'s or
#	Line 221 | Line 378 | parse(struct Client *client_p, char *pbu
378		* Hm, when is the buffer empty -- if a command
379		* code has been found ?? -Armin
380		*/
381	<	if (*pbuffer != '\0')
225	<	{
381	>	if (*pbuffer)
382		if (IsClient(from))
383	<	sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
228	<	me.name, from->name, ch);
229	<	}
383	>	sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
384
385		++ServerStats.is_unco;
386		return;
387		}
388
389	<	assert(msg_ptr->cmd != NULL);
389	>	assert(msg_ptr->cmd);
390
391		paramcount = msg_ptr->args_max;
392	<	ii = bufend - ((s) ? s : ch);
393	<	msg_ptr->bytes += ii;
392	>	length = bufend - ((s) ? s : ch);
393	>	msg_ptr->bytes += length;
394		}
395
396		/*
#	Line 246 | Line 400 | parse(struct Client *client_p, char *pbu
400		* this last parameter (about same effect as ":" has...) --msa
401		*/
402
403	<	/* Note initially true: s==NULL || *(s-1) == '\0' !! */
403	>	/* Note initially true: s == NULL || *(s - 1) == '\0' !! */
404	>
405	>	para[parc] = ch;
406
407	<	para[parc] = from->name;
407	>	if (msg_ptr && (msg_ptr->flags & MFLG_EXTRA))
408	>	{
409	>	/*
410	>	* XXX: This will have to go away after the command handler rewrite
411	>	*/
412	>	para[++parc] = msg_ptr->extra;
413	>	}
414
415		if (s)
416		{
#	Line 265 | Line 427 | parse(struct Client *client_p, char *pbu
427
428		if (*s == ':')
429		{
430	<	/* The rest is a single parameter */
431	<	para[++parc] = s + (!numeric);  /* keep the colon if it's a numeric */
430	>	/* The rest is single parameter--can include blanks also. */
431	>	para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
432		break;
433		}
434
#	Line 282 | Line 444 | parse(struct Client *client_p, char *pbu
444
445		para[++parc] = NULL;
446
447	<	if (msg_ptr != NULL)
448	<	handle_command(msg_ptr, client_p, from, parc, para);
287	<	else
288	<	handle_numeric(numeric, client_p, from, parc, para);
289	<	}
290	<
291	<	/* handle_command()
292	<	*
293	<	* inputs       - pointer to message block
294	<	*              - pointer to client
295	<	*              - pointer to client message is from
296	<	*              - count of number of args
297	<	*              - pointer to argv[] array
298	<	* output       - -1 if error from server
299	<	* side effects -
300	<	*/
301	<	static void
302	<	handle_command(struct Message *mptr, struct Client *client_p,
303	<	struct Client *from, unsigned int i, char *hpara[])
304	<	{
305	<	MessageHandler handler = 0;
306	<
307	<	if (IsServer(client_p))
308	<	mptr->rcount++;
309	<
310	<	mptr->count++;
311	<
312	<	handler = mptr->handlers[client_p->handler];
313	<
314	<	/* check right amount of params is passed... --is */
315	<	if (i < mptr->args_min)
316	<	{
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	<	}
447	>	if (msg_ptr)
448	>	parse_handle_command(msg_ptr, from, parc, para);
449		else
450	<	(*handler)(client_p, from, i, hpara);
450	>	parse_handle_numeric(numeric, from, parc, para);
451		}
452
453		/* add_msg_element()
#	Line 359 | Line 474 | static void
474		add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
475		const char *cmd)
476		{
477	<	struct MessageTree *ntree_p;
477	>	struct MessageTree *ntree_p = NULL;
478
479		if (*cmd == '\0')
480		{
#	Line 376 | Line 491 | add_msg_element(struct MessageTree *mtre
491		*/
492		if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
493		{
494	<	ntree_p = MyMalloc(sizeof(struct MessageTree));
494	>	ntree_p = MyCalloc(sizeof(struct MessageTree));
495		mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
496
497		mtree_p->links++;  /* Have new pointer, so up ref count */
#	Line 404 | Line 519 | add_msg_element(struct MessageTree *mtre
519		*
520		* Then it pops up the recurse stack. As it comes back up the recurse
521		* The code checks to see if the child now has no pointers or msg
522	<	* i.e. the links count has gone to zero. If its no longer used, the
522	>	* i.e. the links count has gone to zero. If it's no longer used, the
523		* child struct MessageTree can be deleted. The parent reference
524		* to this child is then removed and the parents link count goes down.
525		* Thus, we continue to go back up removing all unused MessageTree(s)
#	Line 412 | Line 527 | add_msg_element(struct MessageTree *mtre
527		static void
528		del_msg_element(struct MessageTree *mtree_p, const char *cmd)
529		{
530	<	struct MessageTree *ntree_p;
530	>	struct MessageTree *ntree_p = NULL;
531
532		/*
533		* In case this is called for a nonexistent command
534		* check that there is a msg pointer here, else links-- goes -ve
535		* -db
536		*/
537	<	if ((*cmd == '\0') && (mtree_p->msg != NULL))
537	>	if (*cmd == '\0' && mtree_p->msg)
538		{
539		mtree_p->msg = NULL;
540		mtree_p->links--;
541		}
542		else
543		{
544	<	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
544	>	if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
545		{
546		del_msg_element(ntree_p, cmd + 1);
547
#	Line 451 | Line 566 | static struct Message *
566		msg_tree_parse(const char *cmd)
567		{
568		struct MessageTree *mtree = &msg_tree;
569	+
570		assert(cmd && *cmd);
571
572		while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
#	Line 465 | Line 581 | msg_tree_parse(const char *cmd)
581		* inputs       - pointer to struct Message
582		* output       - none
583		* side effects - load this one command name
468	–	*                msg->count msg->bytes is modified in place, in
469	–	*                modules address space. Might not want to do that...
584		*/
585		void
586		mod_add_cmd(struct Message *msg)
587		{
588		assert(msg && msg->cmd);
589
590	<	/* command already added? */
590	>	/* Command already added? */
591		if (msg_tree_parse(msg->cmd))
592		return;
593
594		add_msg_element(&msg_tree, msg, msg->cmd);
481	–	msg->count = msg->rcount = msg->bytes = 0;
595		}
596
597		/* mod_del_cmd()
#	Line 492 | Line 605 | mod_del_cmd(struct Message *msg)
605		{
606		assert(msg && msg->cmd);
607
608	+	if (!msg_tree_parse(msg->cmd))
609	+	return;
610	+
611		del_msg_element(&msg_tree, msg->cmd);
612		}
613
#	Line 510 | Line 626 | find_command(const char *cmd)
626		static void
627		recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
628		{
629	<	unsigned int i;
629	>	if (mtree->msg)
630	>	sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
631	>	mtree->msg->cmd,
632	>	mtree->msg->count, mtree->msg->bytes,
633	>	mtree->msg->rcount);
634
635	<	if (mtree->msg != NULL)
636	<	sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
517	<	me.name, source_p->name, mtree->msg->cmd,
518	<	mtree->msg->count, mtree->msg->bytes,
519	<	mtree->msg->rcount);
520	<
521	<	for (i = 0; i < MAXPTRLEN; ++i)
522	<	if (mtree->pointers[i] != NULL)
635	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
636	>	if (mtree->pointers[i])
637		recurse_report_messages(source_p, mtree->pointers[i]);
638		}
639
#	Line 533 | Line 647 | void
647		report_messages(struct Client *source_p)
648		{
649		const struct MessageTree *mtree = &msg_tree;
536	–	unsigned int i;
650
651	<	for (i = 0; i < MAXPTRLEN; ++i)
652	<	if (mtree->pointers[i] != NULL)
651	>	for (unsigned int i = 0; i < MAXPTRLEN; ++i)
652	>	if (mtree->pointers[i])
653		recurse_report_messages(source_p, mtree->pointers[i]);
654		}
655
543	–	/* cancel_clients()
544	–	*
545	–	* inputs       -
546	–	* output       -
547	–	* side effects -
548	–	*/
549	–	static int
550	–	cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
551	–	{
552	–	/*
553	–	* Kill all possible points that are causing confusion here,
554	–	* I'm not sure I've got this all right...
555	–	* - avalon
556	–	*
557	–	* Knowing avalon, probably not.
558	–	*/
559	–
560	–	/*
561	–	* With TS, fake prefixes are a common thing, during the
562	–	* connect burst when there's a nick collision, and they
563	–	* must be ignored rather than killed because one of the
564	–	* two is surviving.. so we don't bother sending them to
565	–	* all ops everytime, as this could send 'private' stuff
566	–	* from lagged clients. we do send the ones that cause
567	–	* servers to be dropped though, as well as the ones from
568	–	* non-TS servers -orabidoo
569	–	*/
570	–	/*
571	–	* Incorrect prefix for a server from some connection. If it is a
572	–	* client trying to be annoying, just QUIT them, if it is a server
573	–	* then the same deal.
574	–	*/
575	–	if (IsServer(source_p) || IsMe(source_p))
576	–	{
577	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
578	–	"Message for %s[%s] from %s",
579	–	source_p->name, source_p->from->name,
580	–	get_client_name(client_p, SHOW_IP));
581	–	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
582	–	"Message for %s[%s] from %s",
583	–	source_p->name, source_p->from->name,
584	–	get_client_name(client_p, MASK_IP));
585	–	sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
586	–	"Not dropping server %s (%s) for Fake Direction",
587	–	client_p->name, source_p->name);
588	–	return -1;
589	–	/* return exit_client(client_p, client_p, &me, "Fake Direction");*/
590	–	}
591	–
592	–	/*
593	–	* Ok, someone is trying to impose as a client and things are
594	–	* confused. If we got the wrong prefix from a server, send out a
595	–	* kill, else just exit the lame client.
596	–	*/
597	–	/*
598	–	* If the fake prefix is coming from a TS server, discard it
599	–	* silently -orabidoo
600	–	*
601	–	* all servers must be TS these days --is
602	–	*/
603	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
604	–	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
605	–	source_p->name, source_p->username, source_p->host,
606	–	source_p->from->name, get_client_name(client_p, SHOW_IP));
607	–	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
608	–	"Message for %s[%s@%s!%s] from %s (TS, ignored)",
609	–	source_p->name, source_p->username, source_p->host,
610	–	source_p->from->name, get_client_name(client_p, MASK_IP));
611	–
612	–	return 0;
613	–	}
614	–
615	–	/* remove_unknown()
616	–	*
617	–	* inputs       -
618	–	* output       -
619	–	* side effects -
620	–	*/
621	–	static void
622	–	remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
623	–	{
624	–	/*
625	–	* Do kill if it came from a server because it means there is a ghost
626	–	* user on the other server which needs to be removed. -avalon
627	–	* Tell opers about this. -Taner
628	–	*/
629	–	/*
630	–	* '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
631	–	* 'nodots'          is a nickname (KILL)
632	–	* 'no.dot.at.start' is a server   (SQUIT)
633	–	*/
634	–	if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) ||
635	–	strchr(lsender, '.') != NULL)
636	–	{
637	–	sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
638	–	"Unknown prefix (%s) from %s, Squitting %s",
639	–	lbuffer, get_client_name(client_p, SHOW_IP), lsender);
640	–	sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
641	–	"Unknown prefix (%s) from %s, Squitting %s",
642	–	lbuffer, client_p->name, lsender);
643	–	sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
644	–	me.name, lsender, lbuffer, client_p->name);
645	–	}
646	–	else
647	–	sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
648	–	me.name, lsender, me.name);
649	–	}
650	–
651	–	/*
652	–	*
653	–	*      parc    number of arguments ('sender' counted as one!)
654	–	*      parv[0] pointer to 'sender' (may point to empty string) (not used)
655	–	*      parv[1]..parv[parc-1]
656	–	*              pointers to additional parameters, this is a NULL
657	–	*              terminated list (parv[parc] == NULL).
658	–	*
659	–	* *WARNING*
660	–	*      Numerics are mostly error reports. If there is something
661	–	*      wrong with the message, just *DROP* it! Don't even think of
662	–	*      sending back a neat error message -- big danger of creating
663	–	*      a ping pong error message...
664	–	*
665	–	* Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
666	–	*
667	–	* Called when we get a numeric message from a remote _server_ and we are
668	–	* supposed to forward it somewhere. Note that we always ignore numerics sent
669	–	* to 'me' and simply drop the message if we can't handle with this properly:
670	–	* the savvy approach is NEVER generate an error in response to an... error :)
671	–	*/
672	–	static void
673	–	handle_numeric(char numeric[], struct Client *client_p, struct Client *source_p,
674	–	int parc, char *parv[])
675	–	{
676	–	struct Client *target_p = NULL;
677	–	struct Channel *chptr = NULL;
678	–
679	–	/*
680	–	* Avoid trash, we need it to come from a server and have a target
681	–	*/
682	–	if (parc < 2 || !IsServer(source_p))
683	–	return;
684	–
685	–	/*
686	–	* Who should receive this message ? Will we do something with it ?
687	–	* Note that we use findUser functions, so the target can't be neither
688	–	* a server, nor a channel (?) nor a list of targets (?) .. u2.10
689	–	* should never generate numeric replies to non-users anyway
690	–	* Ahem... it can be a channel actually, csc bots use it :\ --Nem
691	–	*/
692	–	if (IsChanPrefix(*parv[1]))
693	–	chptr = hash_find_channel(parv[1]);
694	–	else
695	–	target_p = find_person(client_p, parv[1]);
696	–
697	–	if (((!target_p) || (target_p->from == client_p)) && !chptr)
698	–	return;
699	–
700	–	/*
701	–	* Remap low number numerics, not that I understand WHY.. --Nemesi
702	–	*/
703	–	/*
704	–	* Numerics below 100 talk about the current 'connection', you're not
705	–	* connected to a remote server so it doesn't make sense to send them
706	–	* remotely - but the information they contain may be useful, so we
707	–	* remap them up. Weird, but true.  -- Isomer
708	–	*/
709	–	if (numeric[0] == '0')
710	–	numeric[0] = '1';
711	–
712	–	if (target_p)
713	–	{
714	–	/* Fake it for server hiding, if its our client */
715	–	if (ConfigServerHide.hide_servers && MyClient(target_p) &&
716	–	!HasUMode(target_p, UMODE_OPER))
717	–	sendto_one(target_p, ":%s %s %s %s", me.name, numeric, target_p->name, parv[2]);
718	–	else
719	–	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]);
721	–	}
722	–	else
723	–	sendto_channel_local(ALL_MEMBERS, 0, chptr, ":%s %s %s %s",
724	–	source_p->name, numeric, chptr->chname, parv[2]);
725	–	}
726	–
656		/* m_not_oper()
657		* inputs       -
658		* output       -
659		* side effects - just returns a nastyogram to given user
660		*/
661	<	void
662	<	m_not_oper(struct Client *client_p, struct Client *source_p,
734	<	int parc, char *parv[])
661	>	int
662	>	m_not_oper(struct Client *source_p, int parc, char *parv[])
663		{
664	<	sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
665	<	me.name, source_p->name);
664	>	sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
665	>	return 0;
666		}
667
668	<	void
669	<	m_unregistered(struct Client *client_p, struct Client *source_p,
742	<	int parc, char *parv[])
668	>	int
669	>	m_unregistered(struct Client *source_p, int parc, char *parv[])
670		{
671	<	sendto_one(source_p, form_str(ERR_NOTREGISTERED), me.name,
672	<	source_p->name[0] ? source_p->name : "*");
671	>	sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
672	>	return 0;
673		}
674
675	<	void
676	<	m_registered(struct Client *client_p, struct Client *source_p,
750	<	int parc, char *parv[])
675	>	int
676	>	m_registered(struct Client *source_p, int parc, char *parv[])
677		{
678	<	sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
679	<	me.name, source_p->name);
678	>	sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
679	>	return 0;
680		}
681
682	<	void
683	<	m_ignore(struct Client *client_p, struct Client *source_p,
758	<	int parc, char *parv[])
682	>	int
683	>	m_ignore(struct Client *source_p, int parc, char *parv[])
684		{
685	<	return;
685	>	return 0;
686		}

Diff Legend

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