--- deliantra/server/socket/lowlevel.C 2006/12/13 18:51:50 1.10 +++ deliantra/server/socket/lowlevel.C 2006/12/14 20:39:54 1.19 @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef __linux__ # include @@ -52,7 +53,7 @@ #define SOCKET_TIMEOUT2 20 void -Socket_Flush (NewSocket * ns) +Socket_Flush (client_socket * ns) { #ifdef __linux__ // check time of last ack, and, if too old, kill connection @@ -81,55 +82,57 @@ /*********************************************************************** * - * SockList functions/utilities + * packet functions/utilities * **********************************************************************/ -SockList &SockList::operator <<(const data8 &v) +packet &packet::operator <<(const data &v) { - *this << uint8 (v.len); - - memcpy (buf + len, v.data, v.len); - len += v.len; + if (room () < v.len) + reset (); + else + { + if (v.len) + { + memcpy (cur, v.ptr, v.len); + cur += v.len; + } + } return *this; } -SockList &SockList::operator <<(const data16 &v) +packet &packet::operator <<(const data8 &v) { - *this << uint16 (v.len); - - memcpy (buf + len, v.data, v.len); - len += v.len; - - return *this; + unsigned int len = min (v.len, 0x00FF); + return *this << uint8 (len) << data (v.ptr, len); } -SockList &SockList::operator <<(const char *v) +packet &packet::operator <<(const data16 &v) { - if (v) - { - int l = strlen (v); - memcpy (buf + len, v, l); - len += l; - } - - return *this; + unsigned int len = min (v.len, 0xFFFF); + return *this << uint16 (len) << data (v.ptr, len); } -/* Basically does the reverse of SockList_AddInt, but on - * strings instead. Same for the GetShort, but for 16 bits. - */ -int -GetInt_String (unsigned char *data) +packet &packet::operator <<(const char *v) { - return ((data[0] << 24) + (data[1] << 16) + (data[2] << 8) + data[3]); + return *this << data (v, strlen (v ? v : 0)); } -short -GetShort_String (unsigned char *data) +void +packet::printf (const char *format, ...) { - return ((data[0] << 8) + data[1]); + int size = room (); + + va_list ap; + va_start (ap, format); + int len = vsnprintf ((char *)cur, size, format, ap); + va_end (ap); + + if (len >= size) + return reset (); + + cur += len; } /****************************************************************************** @@ -138,104 +141,57 @@ * ******************************************************************************/ -/** - * This reads from fd and puts the data in sl. We return true if we think - * we have a full packet, 0 if we have a partial packet. The only processing - * we do is remove the intial size value. len (As passed) is the size of the - * buffer allocated in the socklist. We make the assumption the buffer is - * at least 2 bytes long. - */ - int -SockList_ReadPacket (int fd, SockList * sl, int len) +client_socket::read_packet () { - int stat, toread; - - /* Sanity check - shouldn't happen */ - if (sl->len < 0) - { - abort (); - } - /* We already have a partial packet */ - if (sl->len < 2) + for (;;) { - do + if (inbuf_len >= 2) { - stat = read (fd, sl->buf + sl->len, 2 - sl->len); + unsigned int pkt_len = (inbuf [0] << 8) | inbuf [1]; + + if (inbuf_len >= 2 + pkt_len) + return pkt_len + 2; } - while ((stat == -1) && (errno == EINTR)); - if (stat < 0) + int amount = sizeof (inbuf) - inbuf_len; + + if (amount <= 0) { - /* In non blocking mode, EAGAIN is set when there is no - * data available. - */ - if (errno != EAGAIN && errno != EWOULDBLOCK) - { - LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); - } - return 0; /*Error */ + LOG (llevError, "packet too large");//TODO + return -1; } - if (stat == 0) - return -1; - sl->len += stat; -#ifdef CS_LOGSTATS - cst_tot.ibytes += stat; - cst_lst.ibytes += stat; -#endif - if (stat < 2) - return 0; /* Still don't have a full packet */ - } - /* Figure out how much more data we need to read. Add 2 from the - * end of this - size header information is not included. - */ - toread = 2 + (sl->buf[0] << 8) + sl->buf[1] - sl->len; - if ((toread + sl->len) >= len) - { - LOG (llevError, "SockList_ReadPacket: Want to read more bytes than will fit in buffer (%d>=%d).\n", toread + sl->len, len); - /* Quick hack in case for 'oldsocketmode' input. If we are - * closing the socket anyways, then reading this extra 100 bytes - * shouldn't hurt. - */ - read (fd, sl->buf + 2, 100); - /* return error so the socket is closed */ - return -1; - } - do - { - do + amount = read (fd, inbuf + inbuf_len, amount); + + if (!amount) { - stat = read (fd, sl->buf + sl->len, toread); + status = Ns_Dead; + return -1; } - while ((stat < 0) && (errno == EINTR)); - if (stat < 0) + else if (amount < 0) { - - if (errno != EAGAIN && errno != EWOULDBLOCK) + if (errno != EAGAIN && errno != EINTR) { - LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); + LOG (llevError, "read error: %s", strerror (errno)); + return -1; } - return 0; /*Error */ - } - if (stat == 0) - return -1; - sl->len += stat; -#ifdef CS_LOGSTATS - cst_tot.ibytes += stat; - cst_lst.ibytes += stat; -#endif - toread -= stat; - if (toread == 0) - return 1; - if (toread < 0) - { - LOG (llevError, "SockList_ReadPacket: Read more bytes than desired.\n"); - return 1; + + return 0; } + + inbuf_len += amount; + + cst_tot.ibytes += amount; + cst_lst.ibytes += amount; } - while (toread > 0); - return 0; +} + +void +client_socket::skip_packet (int len) +{ + inbuf_len -= len; + memmove (inbuf, inbuf + len, inbuf_len); } /******************************************************************************* @@ -252,7 +208,7 @@ */ static void -add_to_buffer (NewSocket * ns, char *buf, int len) +add_to_buffer (client_socket *ns, char *buf, int len) { int avail, end; @@ -296,7 +252,7 @@ * is called to write it out. */ void -write_socket_buffer (NewSocket * ns) +write_socket_buffer (client_socket * ns) { int amt, max; @@ -355,31 +311,32 @@ * updates the ns structure if we get an error. */ void -Write_To_Socket (NewSocket * ns, char *buf, int len) +client_socket::send (void *buf_, int len) { - int amt = 0; + char *buf = (char *)buf_; char *pos = buf; + int amt = 0; - if (ns->status == Ns_Dead || !buf) + if (status == Ns_Dead || !buf) { LOG (llevDebug, "Write_To_Socket called with dead socket\n"); return; } #ifndef __GNU__ /* This caused problems on Hurd */ - if (!ns->can_write) + if (!can_write) { - add_to_buffer (ns, buf, len); + add_to_buffer (this, buf, len); return; } #endif + /* If we manage to write more than we wanted, take it as a bonus */ while (len > 0) { - do { - amt = write (ns->fd, pos, len); + amt = write (fd, pos, len); } while ((amt < 0) && (errno == EINTR)); @@ -389,14 +346,14 @@ { LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ errno, strerror (errno)); - ns->status = Ns_Dead; + status = Ns_Dead; return; } else { /* EWOULDBLOCK */ /* can't write it, so store it away. */ - add_to_buffer (ns, pos, len); - ns->can_write = 0; + add_to_buffer (this, pos, len); + can_write = 0; return; } } @@ -404,9 +361,8 @@ * an else if to make sure we don't reprocess it. */ else if (amt == 0) - { - LOG (llevError, "Write_To_Socket: No data written out.\n"); - } + LOG (llevError, "Write_To_Socket: No data written out.\n"); + len -= amt; pos += amt; #ifdef CS_LOGSTATS @@ -416,65 +372,57 @@ } } - -/** - * Takes a string of data, and writes it out to the socket. A very handy - * shortcut function. - */ void -cs_write_string (NewSocket * ns, const char *buf, int len) +client_socket::socket_cb (iow &w, int got) { - SockList sl; - - sl.len = len; - sl.buf = (unsigned char *) buf; - Send_With_Handling (ns, &sl); + //printf ("iow got %x\n", got); + w.stop (); } - /** - * Calls Write_To_Socket to send data to the client. - * - * The only difference in this function is that we take a SockList - *, and we prepend the length information. + * Takes a string of data, and writes it out to the socket. A very handy + * shortcut function. */ void -Send_With_Handling (NewSocket * ns, SockList * msg) +client_socket::send_packet (packet &sl) { - unsigned char sbuf[4]; - - if (ns->status == Ns_Dead || !msg) + if (status == Ns_Dead) return; - if (msg->len >= MAXSOCKBUF) + if (sl.length () >= MAXSOCKBUF) { - LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); - /* Almost certainly we've overflowed a buffer, so quite now to make + LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ()); + /* Almost certainly we've overflowed a buffer, so quit now to make * it easier to debug. */ abort (); } - sbuf[0] = ((uint32) (msg->len) >> 8) & 0xFF; - sbuf[1] = ((uint32) (msg->len)) & 0xFF; - if (ns->status != Ns_Old) - Write_To_Socket (ns, (char *) sbuf, 2); - Write_To_Socket (ns, (char *) msg->buf, msg->len); + + if (!sl.length ()) + return; + + assert (sl.hdrlen == 2); + + sl.buf_ [0] = sl.length () >> 8; + sl.buf_ [1] = sl.length () ; + + send (sl.buf_, sl.length () + sl.hdrlen); } -/** - * Takes a string of data, and writes it out to the socket. A very handy - * shortcut function. - */ void -Write_String_To_Socket (NewSocket * ns, char *buf, int len) +client_socket::send_packet (const char *buf, int len) { - SockList sl; + packet sl; - sl.len = len; - sl.buf = (unsigned char *) buf; - Send_With_Handling (ns, &sl); + sl << data (buf, len); + send_packet (sl); } +void +client_socket::send_packet (const char *buf) +{ + send_packet (buf, strlen (buf)); +} /****************************************************************************** * @@ -507,7 +455,6 @@ now - cst_tot.time_start, cst_lst.ibytes, cst_lst.obytes, cst_lst.max_conn, now - cst_lst.time_start); cst_lst.ibytes = 0; cst_lst.obytes = 0; - cst_lst.max_conn = socket_info.nconns; cst_lst.time_start = now; } #endif