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 3573 by michael, Fri May 16 17:09:50 2014 UTC vs.
Revision 4298 by michael, Sun Jul 20 13:51:16 2014 UTC

# Line 72 | 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
76                                /* Must be a power of 2, and
77                                 * larger than 26 [a-z]|[A-Z]
78                                 * its used to allocate the set
79                                 * of pointers at each node of the tree
80                                 * There are MAXPTRLEN pointers at each node.
81                                 * Obviously, there have to be more pointers
82                                 * Than ASCII letters. 32 is a nice number
83                                 * since there is then no need to shift
84                                 * 'A'/'a' to base 0 index, at the expense
85                                 * of a few never used pointers. For a small
86                                 * parser like this, this is a good compromise
87                                 * and does make it somewhat faster.
88                                 *
89                                 * - Dianora
90                                 */
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  
101 static struct MessageTree msg_tree;
97  
98 < static char *para[MAXPARA + 2]; /* <command> + <params> + NULL */
98 > /* remove_unknown()
99 > *
100 > * inputs       -
101 > * output       -
102 > * side effects -
103 > */
104 > static void
105 > parse_remove_unknown(struct Client *client_p, 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 < static int cancel_clients(struct Client *, struct Client *, char *);
134 < static void remove_unknown(struct Client *, char *, char *);
135 < static void handle_numeric(unsigned int, struct Client *, int, char *[]);
136 < static void handle_command(struct Message *, struct Client *, unsigned int, char *[]);
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 +  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 + *
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->chname, 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 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 +  ++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 118 | 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    unsigned int numeric = 0;
# Line 130 | Line 288 | parse(struct Client *client_p, char *pbu
288    assert(client_p->localClient->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 160 | 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 190 | 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 - '0') * 100 + (*(ch + 1) - '0') * 10 + (*(ch + 2) - '0');
356 <    paramcount = 2;  /* destination, and the rest of it */
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    {
# Line 279 | Line 437 | parse(struct Client *client_p, char *pbu
437    para[++parc] = NULL;
438  
439    if (msg_ptr)
440 <    handle_command(msg_ptr, from, parc, para);
440 >    parse_handle_command(msg_ptr, from, parc, para);
441    else
442 <    handle_numeric(numeric, from, parc, para);
285 < }
286 <
287 < /* handle_command()
288 < *
289 < * inputs       - pointer to message block
290 < *              - pointer to client
291 < *              - pointer to client message is from
292 < *              - count of number of args
293 < *              - pointer to argv[] array
294 < * output       - -1 if error from server
295 < * side effects -
296 < */
297 < static void
298 < handle_command(struct Message *mptr, struct Client *source_p,
299 <               unsigned int i, char *hpara[])
300 < {
301 <  if (IsServer(source_p->from))
302 <    ++mptr->rcount;
303 <
304 <  ++mptr->count;
305 <
306 <  /* Check right amount of params is passed... --is */
307 <  if (i < mptr->args_min)
308 <    sendto_one_numeric(source_p, &me, ERR_NEEDMOREPARAMS, mptr->cmd);
309 <  else
310 <    mptr->handlers[source_p->from->handler](source_p, i, hpara);
442 >    parse_handle_numeric(numeric, from, parc, para);
443   }
444  
445   /* add_msg_element()
# Line 334 | Line 466 | static void
466   add_msg_element(struct MessageTree *mtree_p, struct Message *msg_p,
467                  const char *cmd)
468   {
469 <  struct MessageTree *ntree_p;
469 >  struct MessageTree *ntree_p = NULL;
470  
471    if (*cmd == '\0')
472    {
# Line 379 | Line 511 | add_msg_element(struct MessageTree *mtre
511   *
512   * Then it pops up the recurse stack. As it comes back up the recurse
513   * The code checks to see if the child now has no pointers or msg
514 < * i.e. the links count has gone to zero. If its no longer used, the
514 > * i.e. the links count has gone to zero. If it's no longer used, the
515   * child struct MessageTree can be deleted. The parent reference
516   * to this child is then removed and the parents link count goes down.
517   * Thus, we continue to go back up removing all unused MessageTree(s)
# Line 387 | Line 519 | add_msg_element(struct MessageTree *mtre
519   static void
520   del_msg_element(struct MessageTree *mtree_p, const char *cmd)
521   {
522 <  struct MessageTree *ntree_p;
522 >  struct MessageTree *ntree_p = NULL;
523  
524    /*
525     * In case this is called for a nonexistent command
# Line 441 | Line 573 | msg_tree_parse(const char *cmd)
573   * inputs       - pointer to struct Message
574   * output       - none
575   * side effects - load this one command name
444 *                msg->count msg->bytes is modified in place, in
445 *                modules address space. Might not want to do that...
576   */
577   void
578   mod_add_cmd(struct Message *msg)
# Line 454 | Line 584 | mod_add_cmd(struct Message *msg)
584      return;
585  
586    add_msg_element(&msg_tree, msg, msg->cmd);
457  msg->count = msg->rcount = msg->bytes = 0;
587   }
588  
589   /* mod_del_cmd()
# Line 468 | Line 597 | mod_del_cmd(struct Message *msg)
597   {
598    assert(msg && msg->cmd);
599  
600 +  if (!msg_tree_parse(msg->cmd))
601 +    return;
602 +
603    del_msg_element(&msg_tree, msg->cmd);
604   }
605  
# Line 513 | Line 645 | report_messages(struct Client *source_p)
645        recurse_report_messages(source_p, mtree->pointers[i]);
646   }
647  
516 /* cancel_clients()
517 *
518 * inputs       -
519 * output       -
520 * side effects -
521 */
522 static int
523 cancel_clients(struct Client *client_p, struct Client *source_p, char *cmd)
524 {
525  /*
526   * Kill all possible points that are causing confusion here,
527   * I'm not sure I've got this all right...
528   * - avalon
529   *
530   * Knowing avalon, probably not.
531   */
532
533  /*
534   * With TS, fake prefixes are a common thing, during the
535   * connect burst when there's a nick collision, and they
536   * must be ignored rather than killed because one of the
537   * two is surviving.. so we don't bother sending them to
538   * all ops everytime, as this could send 'private' stuff
539   * from lagged clients. we do send the ones that cause
540   * servers to be dropped though, as well as the ones from
541   * non-TS servers -orabidoo
542   */
543  /*
544   * Incorrect prefix for a server from some connection. If it is a
545   * client trying to be annoying, just QUIT them, if it is a server
546   * then the same deal.
547   */
548  if (IsServer(source_p) || IsMe(source_p))
549  {
550    sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
551                         "Message for %s[%s] from %s",
552                         source_p->name, source_p->from->name,
553                         get_client_name(client_p, SHOW_IP));
554    sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
555                         "Message for %s[%s] from %s",
556                         source_p->name, source_p->from->name,
557                         get_client_name(client_p, MASK_IP));
558    sendto_realops_flags(UMODE_DEBUG, L_ALL, SEND_NOTICE,
559                         "Not dropping server %s (%s) for Fake Direction",
560                         client_p->name, source_p->name);
561    return -1;
562    /* return exit_client(client_p, client_p, &me, "Fake Direction");*/
563  }
564
565  /*
566   * Ok, someone is trying to impose as a client and things are
567   * confused. If we got the wrong prefix from a server, send out a
568   * kill, else just exit the lame client.
569   */
570  /*
571   * If the fake prefix is coming from a TS server, discard it
572   * silently -orabidoo
573   *
574   * all servers must be TS these days --is
575   */
576  sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
577                       "Message for %s[%s@%s!%s] from %s (TS, ignored)",
578                       source_p->name, source_p->username, source_p->host,
579                       source_p->from->name, get_client_name(client_p, SHOW_IP));
580  sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
581                       "Message for %s[%s@%s!%s] from %s (TS, ignored)",
582                       source_p->name, source_p->username, source_p->host,
583                       source_p->from->name, get_client_name(client_p, MASK_IP));
584  return 0;
585 }
586
587 /* remove_unknown()
588 *
589 * inputs       -
590 * output       -
591 * side effects -
592 */
593 static void
594 remove_unknown(struct Client *client_p, char *lsender, char *lbuffer)
595 {
596  /*
597   * Do kill if it came from a server because it means there is a ghost
598   * user on the other server which needs to be removed. -avalon
599   * Tell opers about this. -Taner
600   */
601  /*
602   * '[0-9]something'  is an ID      (KILL/SQUIT depending on its length)
603   * 'nodots'          is a nickname (KILL)
604   * 'no.dot.at.start' is a server   (SQUIT)
605   */
606  if ((IsDigit(*lsender) && strlen(lsender) <= IRC_MAXSID) || strchr(lsender, '.'))
607  {
608    sendto_realops_flags(UMODE_DEBUG, L_ADMIN, SEND_NOTICE,
609                         "Unknown prefix (%s) from %s, Squitting %s",
610                         lbuffer, get_client_name(client_p, SHOW_IP), lsender);
611    sendto_realops_flags(UMODE_DEBUG, L_OPER, SEND_NOTICE,
612                         "Unknown prefix (%s) from %s, Squitting %s",
613                         lbuffer, client_p->name, lsender);
614    sendto_one(client_p, ":%s SQUIT %s :(Unknown prefix (%s) from %s)",
615               me.name, lsender, lbuffer, client_p->name);
616  }
617  else
618    sendto_one(client_p, ":%s KILL %s :%s (Unknown Client)",
619               me.name, lsender, me.name);
620 }
621
622 /*
623 *
624 *      parc    number of arguments ('sender' counted as one!)
625 *      parv[0] pointer to 'sender' (may point to empty string) (not used)
626 *      parv[1]..parv[parc-1]
627 *              pointers to additional parameters, this is a NULL
628 *              terminated list (parv[parc] == NULL).
629 *
630 * *WARNING*
631 *      Numerics are mostly error reports. If there is something
632 *      wrong with the message, just *DROP* it! Don't even think of
633 *      sending back a neat error message -- big danger of creating
634 *      a ping pong error message...
635 *
636 * Rewritten by Nemesi, Jan 1999, to support numeric nicks in parv[1]
637 *
638 * Called when we get a numeric message from a remote _server_ and we are
639 * supposed to forward it somewhere. Note that we always ignore numerics sent
640 * to 'me' and simply drop the message if we can't handle with this properly:
641 * the savvy approach is NEVER generate an error in response to an... error :)
642 */
643 static void
644 handle_numeric(unsigned int numeric, struct Client *source_p, int parc, char *parv[])
645 {
646  struct Client *target_p = NULL;
647  struct Channel *chptr = NULL;
648
649  /*
650   * Avoid trash, we need it to come from a server and have a target
651   */
652  if (parc < 2 || !IsServer(source_p))
653    return;
654
655  /*
656   * Who should receive this message ? Will we do something with it ?
657   * Note that we use findUser functions, so the target can't be neither
658   * a server, nor a channel (?) nor a list of targets (?) .. u2.10
659   * should never generate numeric replies to non-users anyway
660   * Ahem... it can be a channel actually, csc bots use it :\ --Nem
661   */
662  if (IsChanPrefix(*parv[1]))
663    chptr = hash_find_channel(parv[1]);
664  else
665    target_p = find_person(source_p, parv[1]);
666
667  if (((!target_p) || (target_p->from == source_p->from)) && !chptr)
668    return;
669
670  /*
671   * Remap low number numerics, not that I understand WHY.. --Nemesi
672   */
673  /*
674   * Numerics below 100 talk about the current 'connection', you're not
675   * connected to a remote server so it doesn't make sense to send them
676   * remotely - but the information they contain may be useful, so we
677   * remap them up. Weird, but true.  -- Isomer
678   */
679  if (numeric < 100)
680    numeric =+ 100;
681
682  if (target_p)
683  {
684    /* Fake it for server hiding, if its our client */
685    if (ConfigServerHide.hide_servers && MyClient(target_p) &&
686        !HasUMode(target_p, UMODE_OPER))
687      sendto_one_numeric(target_p, &me, numeric|SND_EXPLICIT, "%s", parv[2]);
688    else
689      sendto_one_numeric(target_p, source_p, numeric|SND_EXPLICIT, "%s", parv[2]);
690  }
691  else
692    sendto_channel_butone(source_p, source_p, chptr, 0, "%u %s %s",
693                          numeric, chptr->chname, parv[2]);
694 }
695
648   /* m_not_oper()
649   * inputs       -
650   * output       -

Diff Legend

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