X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ircd%2Fpacket.c;h=763440864ab2e84ef722f1656d45a25427c7d87e;hb=refs%2Fheads%2Fupstream;hp=2d2f873982a9c0f20df12ddfa4bebcd31d84b896;hpb=19cd4740e84080d52a5231c4714ba3dae375bff1;p=ircu2.10.12-pk.git diff --git a/ircd/packet.c b/ircd/packet.c index 2d2f873..7634408 100644 --- a/ircd/packet.c +++ b/ircd/packet.c @@ -16,66 +16,62 @@ * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - * - * $Id$ */ +/** @file + * @brief Input packet handling functions. + * @version $Id$ + */ +#include "config.h" + #include "packet.h" #include "client.h" #include "ircd.h" #include "ircd_chattr.h" +#include "ircd_log.h" #include "parse.h" #include "s_bsd.h" #include "s_misc.h" #include "send.h" -#include +/* #include -- Now using assert in ircd_log.h */ +/** Add a certain number of bytes to a client's received statistics. + * @param[in,out] cptr Client to update. + * @param[in] length Number of newly received bytes to add. + */ static void update_bytes_received(struct Client* cptr, unsigned int length) { - me.receiveB += length; /* Update bytes received */ - cptr->receiveB += length; - - if (cptr->receiveB > 1023) { - cptr->receiveK += (cptr->receiveB >> 10); - cptr->receiveB &= 0x03ff; /* 2^10 = 1024, 3ff = 1023 */ - } - if (me.receiveB > 1023) { - me.receiveK += (me.receiveB >> 10); - me.receiveB &= 0x03ff; - } + cli_receiveB(&me) += length; /* Update bytes received */ + cli_receiveB(cptr) += length; } +/** Add one message to a client's received statistics. + * @param[in,out] cptr Client to update. + */ static void update_messages_received(struct Client* cptr) { - ++me.receiveM; - ++cptr->receiveM; + ++(cli_receiveM(&me)); + ++(cli_receiveM(cptr)); } -/* - * dopacket - * - * cptr - pointer to client structure for which the buffer data - * applies. - * buffer - pointer to the buffer containing the newly read data - * length - number of valid bytes of data in the buffer - * - * Note: - * It is implicitly assumed that dopacket is called only - * with cptr of "local" variation, which contains all the - * necessary fields (buffer etc..) +/** Handle received data from a directly connected server. + * @param[in] cptr Peer server that sent us data. + * @param[in] buffer Input buffer. + * @param[in] length Number of bytes in input buffer. + * @return 1 on success or CPTR_KILLED if the client is squit. */ int server_dopacket(struct Client* cptr, const char* buffer, int length) { const char* src; char* endp; char* client_buffer; - + assert(0 != cptr); update_bytes_received(cptr, length); - client_buffer = cptr->buffer; - endp = client_buffer + cptr->count; + client_buffer = cli_buffer(cptr); + endp = client_buffer + cli_count(cptr); src = buffer; while (length-- > 0) { @@ -94,24 +90,85 @@ int server_dopacket(struct Client* cptr, const char* buffer, int length) update_messages_received(cptr); - if (parse_server(cptr, cptr->buffer, endp) == CPTR_KILLED) + if (parse_server(cptr, cli_buffer(cptr), endp) == CPTR_KILLED) return CPTR_KILLED; /* * Socket is dead so exit */ if (IsDead(cptr)) - return exit_client(cptr, cptr, &me, cptr->info); + return exit_client(cptr, cptr, &me, cli_info(cptr)); endp = client_buffer; } else if (endp < client_buffer + BUFSIZE) ++endp; /* There is always room for the null */ } - cptr->count = endp - cptr->buffer; + cli_count(cptr) = endp - cli_buffer(cptr); return 1; } -/* - * client_dopacket - handle client messages +/** Handle received data from a new (unregistered) connection. + * @param[in] cptr Unregistered connection that sent us data. + * @param[in] buffer Input buffer. + * @param[in] length Number of bytes in input buffer. + * @return 1 on success or CPTR_KILLED if the client is squit. + */ +int connect_dopacket(struct Client *cptr, const char *buffer, int length) +{ + const char* src; + char* endp; + char* client_buffer; + + assert(0 != cptr); + + update_bytes_received(cptr, length); + + client_buffer = cli_buffer(cptr); + endp = client_buffer + cli_count(cptr); + src = buffer; + + while (length-- > 0) + { + *endp = *src++; + /* + * Yuck. Stuck. To make sure we stay backward compatible, + * we must assume that either CR or LF terminates the message + * and not CR-LF. By allowing CR or LF (alone) into the body + * of messages, backward compatibility is lost and major + * problems will arise. - Avalon + */ + if (IsEol(*endp)) + { + /* Skip extra LF/CR's */ + if (endp == client_buffer) + continue; + *endp = '\0'; + + update_messages_received(cptr); + + if (parse_client(cptr, cli_buffer(cptr), endp) == CPTR_KILLED) + return CPTR_KILLED; + /* Socket is dead so exit */ + if (IsDead(cptr)) + return exit_client(cptr, cptr, &me, cli_info(cptr)); + else if (IsServer(cptr)) + { + cli_count(cptr) = 0; + return server_dopacket(cptr, src, length); + } + endp = client_buffer; + } + else if (endp < client_buffer + BUFSIZE) + /* There is always room for the null */ + ++endp; + } + cli_count(cptr) = endp - cli_buffer(cptr); + return 1; +} + +/** Handle received data from a local client. + * @param[in] cptr Local client that sent us data. + * @param[in] length Total number of bytes in client's input buffer. + * @return 1 on success or CPTR_KILLED if the client is squit. */ int client_dopacket(struct Client *cptr, unsigned int length) { @@ -120,10 +177,10 @@ int client_dopacket(struct Client *cptr, unsigned int length) update_bytes_received(cptr, length); update_messages_received(cptr); - if (CPTR_KILLED == parse_client(cptr, cptr->buffer, cptr->buffer + length)) + if (CPTR_KILLED == parse_client(cptr, cli_buffer(cptr), cli_buffer(cptr) + length)) return CPTR_KILLED; else if (IsDead(cptr)) - return exit_client(cptr, cptr, &me, cptr->info); + return exit_client(cptr, cptr, &me, cli_info(cptr)); return 1; }