--- deliantra/server/socket/lowlevel.C 2006/12/13 18:08:02 1.9 +++ deliantra/server/socket/lowlevel.C 2006/12/14 00:01:37 1.12 @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef __linux__ # include @@ -85,39 +86,43 @@ * **********************************************************************/ -SockList &SockList::operator <<(const data8 &v) +SockList &SockList::operator <<(const data &v) { - *this << uint8 (v.len); - - memcpy (buf + len, v.data, v.len); - len += v.len; + if (v.len) + { + memcpy (buf + len, v.ptr, v.len); + len += v.len; + } return *this; } -SockList &SockList::operator <<(const data16 &v) +SockList &SockList::operator <<(const data8 &v) { - *this << uint16 (v.len); - - memcpy (buf + len, v.data, v.len); - len += v.len; + unsigned int len = min (v.len, 0x00FF); + return *this << uint8 (len) << data (v.ptr, len); +} - return *this; +SockList &SockList::operator <<(const data16 &v) +{ + 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) +SockList &SockList::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 +SockList::printf (const char *format, ...) { - return ((data[0] << 8) + data[1]); + va_list ap; + va_start (ap, format); + + len += vsprintf ((char *)buf + len, format, ap); + + va_end (ap); } /****************************************************************************** @@ -126,104 +131,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) +NewSocket::read_packet () { - int stat, toread; - - /* Sanity check - shouldn't happen */ - if (sl->len < 0) + for (;;) { - abort (); - } - /* We already have a partial packet */ - if (sl->len < 2) - { - 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 +NewSocket::skip_packet (int len) +{ + inbuf_len -= len; + memmove (inbuf, inbuf + len, inbuf_len); } /******************************************************************************* @@ -240,7 +198,7 @@ */ static void -add_to_buffer (NewSocket * ns, char *buf, int len) +add_to_buffer (NewSocket *ns, char *buf, int len) { int avail, end; @@ -410,7 +368,7 @@ * shortcut function. */ void -cs_write_string (NewSocket * ns, const char *buf, int len) +cs_write_string (NewSocket *ns, const char *buf, int len) { SockList sl; @@ -427,7 +385,7 @@ *, and we prepend the length information. */ void -Send_With_Handling (NewSocket * ns, SockList * msg) +Send_With_Handling (NewSocket *ns, SockList *msg) { unsigned char sbuf[4]; @@ -454,7 +412,7 @@ * shortcut function. */ void -Write_String_To_Socket (NewSocket * ns, char *buf, int len) +Write_String_To_Socket (NewSocket *ns, char *buf, int len) { SockList sl;