ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/ircd-hybrid/trunk/src/parse.c
(Generate patch)

Comparing ircd-hybrid/trunk/src/parse.c (file contents):
Revision 2433 by michael, Fri Aug 2 18:43:00 2013 UTC vs.
Revision 6161 by michael, Thu Jun 18 10:55:29 2015 UTC

# Line 1 | Line 1
1   /*
2 < *  ircd-hybrid: an advanced Internet Relay Chat Daemon(ircd).
3 < *  parse.c: The message parser.
2 > *  ircd-hybrid: an advanced, lightweight Internet Relay Chat Daemon (ircd)
3   *
4 < *  Copyright (C) 2002 by the past and present ircd coders, and others.
4 > *  Copyright (c) 1997-2015 ircd-hybrid development team
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 16 | Line 15
15   *
16   *  You should have received a copy of the GNU General Public License
17   *  along with this program; if not, write to the Free Software
18 < *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307
18 > *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
19   *  USA
20 < *
21 < *  $Id$
20 > */
21 >
22 > /*! \file parse.c
23 > * \brief The message parser.
24 > * \version $Id$
25   */
26  
27   #include "stdinc.h"
# Line 27 | Line 29
29   #include "parse.h"
30   #include "channel.h"
31   #include "hash.h"
32 + #include "id.h"
33   #include "irc_string.h"
34   #include "ircd.h"
35   #include "numeric.h"
# Line 34 | Line 37
37   #include "send.h"
38   #include "conf.h"
39   #include "memory.h"
40 < #include "s_user.h"
41 < #include "s_serv.h"
40 > #include "user.h"
41 > #include "server.h"
42 >
43  
44   /*
45   * (based on orabidoo's parser code)
# Line 51 | Line 55
55   * 't' points -> [MessageTree *] 'r' -> [MessageTree *] -> 'i'
56   *   -> [MessageTree *] -> [MessageTree *] -> 'e' and matches
57   *
58 < *                               'i' -> [MessageTree *] -> 'e' and matches
58 > *                               'i' -> [MessageTree *] -> 'e' and matches
59   *
60   * BUGS (Limitations!)
61   *
# Line 69 | Line 73
73   * Diane Bruce (Dianora), June 6 2003
74   */
75  
76 + /*
77 + * Must be a power of 2, and larger than 26 [a-z]|[A-Z]. It's used to allocate
78 + * the set of pointers at each node of the tree.
79 + * There are MAXPTRLEN pointers at each node. Obviously, there have to be more
80 + * pointers than ASCII letters. 32 is a nice number since there is then no need
81 + * to shift 'A'/'a' to base 0 index, at the expense of a few never used
82 + * pointers.
83 + * For a small parser like this, this is a good compromise and does
84 + * make it somewhat faster. - Dianora
85 + */
86   #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 –                                 */
87  
88 < struct MessageTree
88 >
89 > static struct MessageTree
90   {
91    int links; /* Count of all pointers (including msg) at this node
92                * used as reference count for deletion of _this_ node.
93                */
94    struct Message *msg;
95    struct MessageTree *pointers[MAXPTRLEN];
96 < };
96 > } msg_tree;
97  
98 < static struct MessageTree msg_tree;
98 >
99 > /* remove_unknown()
100 > *
101 > * inputs       -
102 > * output       -
103 > * side effects -
104 > */
105 > static void
106 > parse_remove_unknown(struct Client *client_p, const char *lsender, char *lbuffer)
107 > {
108 >  /*
109 >   * Do kill if it came from a server because it means there is a ghost
110 >   * user on the other server which needs to be removed. -avalon
111 >   * Tell opers about this. -Taner
112 >   */
113 >  /*
114 >   * '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
115 >   * 'nodots'          is a nickname (KILL)
116 >   * 'no.dot.at.start' is a server   (SQUIT)
117 >   */
118 >  if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
119 >  {
120 >    sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
121 >                         "Unknown prefix (%s) from %s, Squitting %s",
122 >                         lbuffer, get_client_name(client_p, SHOW_IP), lsender);
123 >    sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
124 >                         "Unknown prefix (%s) from %s, Squitting %s",
125 >                         lbuffer, client_p->name, lsender);
126 >    sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
127 >               me.id, lsender, lbuffer, client_p->name);
128 >  }
129 >  else
130 >    sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
131 >               me.id, lsender, me.name);
132 > }
133  
134   /*
135 < * NOTE: parse() should not be called recursively by other functions!
135 > *
136 > *      parc    number of arguments ('sender' counted as one!)
137 > *      parv[0] pointer to 'sender' (may point to empty string) (not used)
138 > *      parv[1]..parv[parc-1]
139 > *              pointers to additional parameters, this is a NULL
140 > *              terminated list (parv[parc] == NULL).
141 > *
142 > * *WARNING*
143 > *      Numerics are mostly error reports. If there is something
144 > *      wrong with the message, just *DROP* it! Don't even think of
145 > *      sending back a neat error message -- big danger of creating
146 > *      a ping pong error message...
147 > *
148 > * Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
149 > *
150 > * Called when we get a numeric message from a remote _server_ and we are
151 > * supposed to forward it somewhere. Note that we always ignore numerics sent
152 > * to 'me' and simply drop the message if we can't handle with this properly:
153 > * the savvy approach is NEVER generate an error in response to an... error :)
154 > */
155 > static void
156 > parse_handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
157 > {
158 >  struct Client *target_p = NULL;
159 >  struct Channel *chptr = NULL;
160 >
161 >  /*
162 >   * Avoid trash, we need it to come from a server and have a target
163 >   */
164 >  if (parc < 2 || !IsServer(source_p))
165 >    return;
166 >
167 >  /*
168 >   * Who should receive this message ? Will we do something with it ?
169 >   * Note that we use findUser functions, so the target can't be neither
170 >   * a server, nor a channel (?) nor a list of targets (?) .. u2.10
171 >   * should never generate numeric replies to non-users anyway
172 >   * Ahem... it can be a channel actually, csc bots use it :\ --Nem
173 >   */
174 >  if (IsChanPrefix(*parv[1]))
175 >    chptr = hash_find_channel(parv[1]);
176 >  else
177 >    target_p = find_person(source_p, parv[1]);
178 >
179 >  if ((!target_p || target_p->from == source_p->from) && !chptr)
180 >    return;
181 >
182 >  /*
183 >   * Remap low number numerics, not that I understand WHY.. --Nemesi
184 >   */
185 >  /*
186 >   * Numerics below 100 talk about the current 'connection', you're not
187 >   * connected to a remote server so it doesn't make sense to send them
188 >   * remotely - but the information they contain may be useful, so we
189 >   * remap them up. Weird, but true.  -- Isomer
190 >   */
191 >  if (numeric < 100)
192 >    numeric += 100;
193 >
194 >  if (target_p)
195 >  {
196 >    /* Fake it for server hiding, if it's our client */
197 >    if ((ConfigServerHide.hide_servers || IsHidden(source_p)) && MyConnect(target_p) &&
198 >        !HasUMode(target_p, UMODE_OPER))
199 >      sendto_one_numeric(target_p, &me, numeric | SND_EXPLICIT, "%s", parv[2]);
200 >    else
201 >      sendto_one_numeric(target_p, source_p, numeric | SND_EXPLICIT, "%s", parv[2]);
202 >  }
203 >  else
204 >    sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
205 >                          numeric, chptr->name, parv[2]);
206 > }
207 >
208 > /* handle_command()
209 > *
210 > * inputs       - pointer to message block
211 > *              - pointer to client
212 > *              - pointer to client message is from
213 > *              - count of number of args
214 > *              - pointer to argv[] array
215 > * output       - -1 if error from server
216 > * side effects -
217   */
218 < static char *sender;
219 < static char *para[MAXPARA + 2]; /* <prefix> + <params> + NULL */
218 > static void
219 > parse_handle_command(struct Message *message, struct Client *source_p,
220 >                     unsigned int i, char *para[])
221 > {
222 >  if (IsServer(source_p->from))
223 >    ++message->rcount;
224  
225 < 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 *[]);
225 >  ++message->count;
226  
227 +  /* Check right amount of parameters is passed... --is */
228 +  if (i < message->args_min)
229 +    sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, message->cmd);
230 +  else
231 +    message->handlers[source_p->from->handler](source_p, i, para);
232 + }
233  
234   /*
235   * parse a buffer.
# Line 118 | Line 240 | void
240   parse(struct Client *client_p, char *pbuffer, char *bufend)
241   {
242    struct Client *from = client_p;
243 <  struct Message *msg_ptr = NULL;
243 >  struct Message *message = NULL;
244 >  char *para[MAXPARA + 2];  /* <command> + <parameters> + NULL */
245    char *ch = NULL;
246    char *s = NULL;
247 <  char *numeric = NULL;
247 >  unsigned int numeric = 0;
248    unsigned int parc = 0;
249    unsigned int paramcount;
250  
251    if (IsDefunct(client_p))
252      return;
253  
254 <  assert(client_p->localClient->fd.flags.open);
255 <  assert((bufend - pbuffer) < 512);
254 >  assert(client_p->connection->fd.flags.open);
255 >  assert((bufend - pbuffer) < IRCD_BUFSIZE);
256  
257 <  for (ch = pbuffer; *ch == ' '; ++ch)  /* skip spaces */
258 <    /* null statement */  ;
257 >  for (ch = pbuffer; *ch == ' '; ++ch)  /* Skip spaces */
258 >    ;
259  
260    if (*ch == ':')
261    {
# Line 140 | Line 263 | parse(struct Client *client_p, char *pbu
263       * Copy the prefix to 'sender' assuming it terminates
264       * with SPACE (or NULL, which is an error, though).
265       */
266 <    sender = ++ch;
266 >    const char *const sender = ++ch;
267  
268 <    if ((s = strchr(ch, ' ')) != NULL)
268 >    if ((s = strchr(ch, ' ')))
269      {
270        *s = '\0';
271        ch = ++s;
# Line 150 | Line 273 | parse(struct Client *client_p, char *pbu
273  
274      if (*sender && IsServer(client_p))
275      {
276 <      if ((from = find_person(client_p, sender)) == NULL)
277 <        from = hash_find_server(sender);
276 >      if ((from = hash_find_id(sender)) == NULL)
277 >        from = hash_find_client(sender);
278  
279        /*
280         * Hmm! If the client corresponding to the prefix is not found--what is
# Line 161 | Line 284 | parse(struct Client *client_p, char *pbu
284        if (from == NULL)
285        {
286          ++ServerStats.is_unpf;
287 <        remove_unknown(client_p, sender, pbuffer);
287 >        parse_remove_unknown(client_p, sender, pbuffer);
288          return;
289        }
290  
291        if (from->from != client_p)
292        {
293          ++ServerStats.is_wrdi;
294 <        cancel_clients(client_p, from, pbuffer);
294 >        sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
295 >                             "Fake direction: dropped message from %s[%s] via %s",
296 >                             from->name, from->from->name,
297 >                             get_client_name(client_p, SHOW_IP));
298 >        sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
299 >                             "Fake direction: dropped message from %s[%s] via %s",
300 >                             from->name, from->from->name,
301 >                             get_client_name(client_p, MASK_IP));
302          return;
303        }
304      }
# Line 191 | Line 321 | parse(struct Client *client_p, char *pbu
321     * code. -avalon
322     */
323  
324 <  /* EOB is 3 chars long but is not a numeric */
325 <  if (*(ch + 3) == ' ' && /* ok, lets see if its a possible numeric.. */
324 >  /* EOB is 3 characters long but is not a numeric */
325 >  if (*(ch + 3) == ' ' &&  /* Ok, let's see if it's a possible numeric */
326        IsDigit(*ch) && IsDigit(*(ch + 1)) && IsDigit(*(ch + 2)))
327    {
328 <    numeric = ch;
329 <    paramcount = 2;  /* destination, and the rest of it */
328 >    numeric = (*ch - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
329 >    paramcount = 2;  /* Destination, and the rest of it */
330      ++ServerStats.is_num;
331 <    s = ch + 3;  /* I know this is ' ' from above if            */
332 <    *s++ = '\0';  /* blow away the ' ', and point s to next part */
331 >    s = ch + 3;  /* I know this is ' ' from above if */
332 >    *s++ = '\0';  /* Blow away the ' ', and point s to next part */
333    }
334    else
335    {
336 <    unsigned int ii = 0;
336 >    unsigned int length = 0;
337  
338 <    if ((s = strchr(ch, ' ')) != NULL)
338 >    if ((s = strchr(ch, ' ')))
339        *s++ = '\0';
340  
341 <    if ((msg_ptr = find_command(ch)) == NULL)
341 >    if ((message = find_command(ch)) == NULL)
342      {
343 <      /*
343 >      /*
344         * Note: Give error message *only* to recognized
345         * persons. It's a nightmare situation to have
346         * two programs sending "Unknown command"'s or
# Line 221 | Line 351 | parse(struct Client *client_p, char *pbu
351         * Hm, when is the buffer empty -- if a command
352         * code has been found ?? -Armin
353         */
354 <      if (*pbuffer != '\0')
225 <      {
354 >      if (*pbuffer)
355          if (IsClient(from))
356 <          sendto_one(from, form_str(ERR_UNKNOWNCOMMAND),
228 <                     me.name, from->name, ch);
229 <      }
356 >          sendto_one_numeric(from, &me, ERR_UNKNOWNCOMMAND, ch);
357  
358        ++ServerStats.is_unco;
359        return;
360      }
361  
362 <    assert(msg_ptr->cmd != NULL);
362 >    assert(message->cmd);
363  
364 <    paramcount = msg_ptr->args_max;
365 <    ii = bufend - ((s) ? s : ch);
366 <    msg_ptr->bytes += ii;
364 >    paramcount = message->args_max;
365 >    length = bufend - ((s) ? s : ch);
366 >    message->bytes += length;
367    }
368  
369    /*
# Line 246 | Line 373 | parse(struct Client *client_p, char *pbu
373     * this last parameter (about same effect as ":" has...) --msa
374     */
375  
376 <  /* Note initially true: s==NULL || *(s-1) == '\0' !! */
376 >  /* Note initially true: s == NULL || *(s - 1) == '\0' !! */
377  
378 <  para[parc] = from->name;
378 >  para[parc] = ch;
379 >
380 >  if (message && (message->flags & MFLG_EXTRA))
381 >  {
382 >    /*
383 >     * XXX: This will have to go away after the command handler rewrite
384 >     */
385 >    para[++parc] = message->extra;
386 >  }
387  
388    if (s)
389    {
# Line 265 | Line 400 | parse(struct Client *client_p, char *pbu
400  
401         if (*s == ':')
402         {
403 <         /* The rest is a single parameter */
404 <         para[++parc] = s + (!numeric);  /* keep the colon if it's a numeric */
403 >         /* The rest is single parameter--can include blanks also. */
404 >         para[++parc] = s + (!numeric);  /* Keep the colon if it's a numeric */
405           break;
406         }
407  
# Line 282 | Line 417 | parse(struct Client *client_p, char *pbu
417  
418    para[++parc] = NULL;
419  
420 <  if (msg_ptr != NULL)
421 <    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 <  }
420 >  if (message)
421 >    parse_handle_command(message, from, parc, para);
422    else
423 <    (*handler)(client_p, from, i, hpara);
423 >    parse_handle_numeric(numeric, from, parc, para);
424   }
425  
426   /* add_msg_element()
# Line 359 | Line 447 | static void
447   add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
448                  const char *cmd)
449   {
450 <  struct MessageTree *ntree_p;
450 >  struct MessageTree *ntree_p = NULL;
451  
452    if (*cmd == '\0')
453    {
# Line 376 | Line 464 | add_msg_element(struct MessageTree *mtre
464       */
465      if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) == NULL)
466      {
467 <      ntree_p = MyMalloc(sizeof(struct MessageTree));
467 >      ntree_p = MyCalloc(sizeof(struct MessageTree));
468        mtree_p->pointers[*cmd & (MAXPTRLEN - 1)] = ntree_p;
469  
470        mtree_p->links++;  /* Have new pointer, so up ref count */
# Line 404 | Line 492 | add_msg_element(struct MessageTree *mtre
492   *
493   * Then it pops up the recurse stack. As it comes back up the recurse
494   * The code checks to see if the child now has no pointers or msg
495 < * i.e. the links count has gone to zero. If its no longer used, the
495 > * i.e. the links count has gone to zero. If it's no longer used, the
496   * child struct MessageTree can be deleted. The parent reference
497   * to this child is then removed and the parents link count goes down.
498   * Thus, we continue to go back up removing all unused MessageTree(s)
# Line 412 | Line 500 | add_msg_element(struct MessageTree *mtre
500   static void
501   del_msg_element(struct MessageTree *mtree_p, const char *cmd)
502   {
503 <  struct MessageTree *ntree_p;
503 >  struct MessageTree *ntree_p = NULL;
504  
505    /*
506     * In case this is called for a nonexistent command
507     * check that there is a msg pointer here, else links-- goes -ve
508     * -db
509     */
510 <  if ((*cmd == '\0') && (mtree_p->msg != NULL))
510 >  if (*cmd == '\0' && mtree_p->msg)
511    {
512      mtree_p->msg = NULL;
513      mtree_p->links--;
514    }
515    else
516    {
517 <    if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]) != NULL)
517 >    if ((ntree_p = mtree_p->pointers[*cmd & (MAXPTRLEN - 1)]))
518      {
519        del_msg_element(ntree_p, cmd + 1);
520  
# Line 451 | Line 539 | static struct Message *
539   msg_tree_parse(const char *cmd)
540   {
541    struct MessageTree *mtree = &msg_tree;
542 <  assert(cmd && *cmd);
542 >
543 >  assert(!EmptyString(cmd));
544  
545    while (IsAlpha(*cmd) && (mtree = mtree->pointers[*cmd & (MAXPTRLEN - 1)]))
546      if (*++cmd == '\0')
# Line 465 | Line 554 | msg_tree_parse(const char *cmd)
554   * inputs       - pointer to struct Message
555   * output       - none
556   * 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...
557   */
558   void
559   mod_add_cmd(struct Message *msg)
560   {
561    assert(msg && msg->cmd);
562  
563 <  /* command already added? */
563 >  /* Command already added? */
564    if (msg_tree_parse(msg->cmd))
565      return;
566  
567    add_msg_element(&msg_tree, msg, msg->cmd);
481 –  msg->count = msg->rcount = msg->bytes = 0;
568   }
569  
570   /* mod_del_cmd()
# Line 492 | Line 578 | mod_del_cmd(struct Message *msg)
578   {
579    assert(msg && msg->cmd);
580  
581 +  if (!msg_tree_parse(msg->cmd))
582 +    return;
583 +
584    del_msg_element(&msg_tree, msg->cmd);
585   }
586  
# Line 510 | Line 599 | find_command(const char *cmd)
599   static void
600   recurse_report_messages(struct Client *source_p, const struct MessageTree *mtree)
601   {
602 <  unsigned int i;
602 >  if (mtree->msg)
603 >    sendto_one_numeric(source_p, &me, RPL_STATSCOMMANDS,
604 >                       mtree->msg->cmd,
605 >                       mtree->msg->count, mtree->msg->bytes,
606 >                       mtree->msg->rcount);
607  
608 <  if (mtree->msg != NULL)
609 <    sendto_one(source_p, form_str(RPL_STATSCOMMANDS),
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)
608 >  for (unsigned int i = 0; i < MAXPTRLEN; ++i)
609 >    if (mtree->pointers[i])
610        recurse_report_messages(source_p, mtree->pointers[i]);
611   }
612  
# Line 532 | Line 619 | recurse_report_messages(struct Client *s
619   void
620   report_messages(struct Client *source_p)
621   {
622 <  const struct MessageTree *mtree = &msg_tree;
536 <  unsigned int i;
622 >  const struct MessageTree *const mtree = &msg_tree;
623  
624 <  for (i = 0; i < MAXPTRLEN; ++i)
625 <    if (mtree->pointers[i] != NULL)
624 >  for (unsigned int i = 0; i < MAXPTRLEN; ++i)
625 >    if (mtree->pointers[i])
626        recurse_report_messages(source_p, mtree->pointers[i]);
627   }
628  
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 –
629   /* m_not_oper()
630   * inputs       -
631   * output       -
632   * side effects - just returns a nastyogram to given user
633   */
634 < void
635 < m_not_oper(struct Client *client_p, struct Client *source_p,
734 <           int parc, char *parv[])
634 > int
635 > m_not_oper(struct Client *source_p, int parc, char *parv[])
636   {
637 <  sendto_one(source_p, form_str(ERR_NOPRIVILEGES),
638 <             me.name, source_p->name);
637 >  sendto_one_numeric(source_p, &me, ERR_NOPRIVILEGES);
638 >  return 0;
639   }
640  
641 < void
642 < m_unregistered(struct Client *client_p, struct Client *source_p,
742 <               int parc, char *parv[])
641 > int
642 > m_unregistered(struct Client *source_p, int parc, char *parv[])
643   {
644 <  sendto_one(source_p, form_str(ERR_NOTREGISTERED), me.name,
645 <             source_p->name[0] ? source_p->name : "*");
644 >  sendto_one_numeric(source_p, &me, ERR_NOTREGISTERED);
645 >  return 0;
646   }
647  
648 < void
649 < m_registered(struct Client *client_p, struct Client *source_p,
750 <             int parc, char *parv[])
648 > int
649 > m_registered(struct Client *source_p, int parc, char *parv[])
650   {
651 <  sendto_one(source_p, form_str(ERR_ALREADYREGISTRED),
652 <             me.name, source_p->name);
651 >  sendto_one_numeric(source_p, &me, ERR_ALREADYREGISTRED);
652 >  return 0;
653   }
654  
655 < void
656 < m_ignore(struct Client *client_p, struct Client *source_p,
758 <         int parc, char *parv[])
655 > int
656 > m_ignore(struct Client *source_p, int parc, char *parv[])
657   {
658 <  return;
658 >  return 0;
659   }

Diff Legend

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