* along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
+/** @file
+ * @brief Input packet handling functions.
+ * @version $Id$
+ */
+#include "config.h"
-#include "sys.h"
-#include "h.h"
-#include "struct.h"
-#include "s_misc.h"
-#include "s_bsd.h"
+#include "packet.h"
+#include "client.h"
#include "ircd.h"
-#include "msg.h"
+#include "ircd_chattr.h"
+#include "ircd_log.h"
#include "parse.h"
+#include "s_bsd.h"
+#include "s_misc.h"
#include "send.h"
-#include "packet.h"
-#include "s_serv.h"
-#include <assert.h>
+/* #include <assert.h> -- Now using assert in ircd_log.h */
-RCSTAG_CC("$Id$");
+/** 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)
+{
+ cli_receiveB(&me) += length; /* Update bytes received */
+ cli_receiveB(cptr) += length;
+}
-/*
- * 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..)
+/** Add one message to a client's received statistics.
+ * @param[in,out] cptr Client to update.
*/
-int dopacket(aClient *cptr, char *buffer, int length)
+static void update_messages_received(struct Client* cptr)
{
- Reg1 char *ch1;
- Reg2 char *ch2;
- register char *cptrbuf;
- aClient *acpt = cptr->acpt;
-
- cptrbuf = cptr->buffer;
- 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 (acpt != &me)
- {
- acpt->receiveB += length;
- if (acpt->receiveB > 1023)
- {
- acpt->receiveK += (acpt->receiveB >> 10);
- acpt->receiveB &= 0x03ff;
- }
- }
- else if (me.receiveB > 1023)
- {
- me.receiveK += (me.receiveB >> 10);
- me.receiveB &= 0x03ff;
- }
- ch1 = cptrbuf + cptr->count;
- ch2 = buffer;
- while (--length >= 0)
- {
- register char g;
- g = (*ch1 = *ch2++);
+ ++(cli_receiveM(&me));
+ ++(cli_receiveM(cptr));
+}
+
+/** 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 = 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
* of messages, backward compatibility is lost and major
* problems will arise. - Avalon
*/
- if (g < '\16' && (g == '\n' || g == '\r'))
- {
- if (ch1 == cptrbuf)
- continue; /* Skip extra LF/CR's */
- *ch1 = '\0';
- me.receiveM += 1; /* Update messages received */
- cptr->receiveM += 1;
- if (cptr->acpt != &me)
- cptr->acpt->receiveM += 1;
- if (IsServer(cptr))
- {
- if (parse_server(cptr, cptr->buffer, ch1) == CPTR_KILLED)
- return CPTR_KILLED;
- }
- else if (parse_client(cptr, cptr->buffer, ch1) == CPTR_KILLED)
- return CPTR_KILLED;
+ if (IsEol(*endp)) {
+ if (endp == client_buffer)
+ continue; /* Skip extra LF/CR's */
+ *endp = '\0';
+
+ update_messages_received(cptr);
+
+ 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, LastDeadComment(cptr));
- ch1 = cptrbuf;
+ return exit_client(cptr, cptr, &me, cli_info(cptr));
+ endp = client_buffer;
}
- else if (ch1 < cptrbuf + (sizeof(cptr->buffer) - 1))
- ch1++; /* There is always room for the null */
+ else if (endp < client_buffer + BUFSIZE)
+ ++endp; /* There is always room for the null */
}
- cptr->count = ch1 - cptr->buffer;
- return 0;
+ 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 client_dopacket(aClient *cptr, size_t length)
+int connect_dopacket(struct Client *cptr, const char *buffer, int length)
{
+ const char* src;
+ char* endp;
+ char* client_buffer;
+
assert(0 != cptr);
- me.receiveB += length; /* Update bytes received */
- cptr->receiveB += length;
+ update_bytes_received(cptr, length);
- if (cptr->receiveB > 1023)
- {
- cptr->receiveK += (cptr->receiveB >> 10);
- cptr->receiveB &= 0x03ff; /* 2^10 = 1024, 3ff = 1023 */
- }
- if (me.receiveB > 1023)
+ client_buffer = cli_buffer(cptr);
+ endp = client_buffer + cli_count(cptr);
+ src = buffer;
+
+ while (length-- > 0)
{
- me.receiveK += (me.receiveB >> 10);
- me.receiveB &= 0x03ff;
+ *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;
}
- cptr->count = 0;
+ cli_count(cptr) = endp - cli_buffer(cptr);
+ return 1;
+}
- ++me.receiveM; /* Update messages received */
- ++cptr->receiveM;
+/** 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)
+{
+ assert(0 != cptr);
- if (CPTR_KILLED == parse_client(cptr, cptr->buffer, cptr->buffer + length))
+ update_bytes_received(cptr, length);
+ update_messages_received(cptr);
+
+ 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, LastDeadComment(cptr));
+ return exit_client(cptr, cptr, &me, cli_info(cptr));
- return 0;
+ return 1;
}
+
+
projects / ircu2.10.12-pk.git / blobdiff