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

Comparing ircd-hybrid/trunk/src/parse.c (property svn:keywords):
Revision 2786 by michael, Mon Jan 6 22:33:53 2014 UTC vs.
Revision 9101 by michael, Wed Jan 1 09:58:45 2020 UTC

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

Diff Legend

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