--- deliantra/server/socket/lowlevel.C 2006/11/26 19:48:50 1.7 +++ deliantra/server/socket/lowlevel.C 2006/12/13 21:27:09 1.11 @@ -37,6 +37,7 @@ #include #include #include +#include #ifdef __linux__ # include @@ -74,10 +75,8 @@ int val; - val = 0; - setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); - val = 1; - setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); + val = 0; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); + val = 1; setsockopt (ns->fd, IPPROTO_TCP, TCP_CORK, &val, sizeof (val)); #endif } @@ -87,34 +86,43 @@ * **********************************************************************/ -void -SockList_Init (SockList * sl) +SockList &SockList::operator <<(const data &v) +{ + if (v.len) + { + memcpy (buf + len, v.ptr, v.len); + len += v.len; + } + + return *this; +} + +SockList &SockList::operator <<(const data8 &v) { - sl->len = 0; - sl->buf = NULL; + unsigned int len = min (v.len, 0x00FF); + return *this << uint8 (len) << data (v.ptr, len); } -void -SockList_AddInt (SockList * sl, uint32 data) +SockList &SockList::operator <<(const data16 &v) { - sl->buf[sl->len++] = (data >> 24) & 0xff; - sl->buf[sl->len++] = (data >> 16) & 0xff; - sl->buf[sl->len++] = (data >> 8) & 0xff; - sl->buf[sl->len++] = data & 0xff; + unsigned int len = min (v.len, 0xFFFF); + return *this << uint16 (len) << data (v.ptr, len); +} + +SockList &SockList::operator <<(const char *v) +{ + return *this << data (v, strlen (v ? v : 0)); } void -SockList_AddInt64 (SockList * sl, uint64 data) +SockList::printf (const char *format, ...) { - sl->buf[sl->len++] = (char) ((data >> 56) & 0xff); - sl->buf[sl->len++] = (char) ((data >> 48) & 0xff); - sl->buf[sl->len++] = (char) ((data >> 40) & 0xff); - sl->buf[sl->len++] = (char) ((data >> 32) & 0xff); - - sl->buf[sl->len++] = (char) ((data >> 24) & 0xff); - sl->buf[sl->len++] = (char) ((data >> 16) & 0xff); - sl->buf[sl->len++] = (char) ((data >> 8) & 0xff); - sl->buf[sl->len++] = (char) (data & 0xff); + va_list ap; + va_start (ap, format); + + len += vsprintf ((char *)buf + len, format, ap); + + va_end (ap); } /* Basically does the reverse of SockList_AddInt, but on @@ -147,7 +155,7 @@ */ int -SockList_ReadPacket (int fd, SockList * sl, int len) +SockList_ReadPacket (int fd, SockList *sl, int len) { int stat, toread; @@ -159,39 +167,21 @@ /* We already have a partial packet */ if (sl->len < 2) { -#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: change read() to recv() */ - - stat = recv (fd, sl->buf + sl->len, 2 - sl->len, 0); - -#else do { stat = read (fd, sl->buf + sl->len, 2 - sl->len); } while ((stat == -1) && (errno == EINTR)); -#endif + if (stat < 0) { /* In non blocking mode, EAGAIN is set when there is no * data available. */ -#ifdef WIN32 /* ***WIN32 SockList_ReadPacket: error handling for win32 */ - if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK) - { - if (WSAGetLastError () == WSAECONNRESET) - LOG (llevDebug, "Connection closed by client\n"); - else - { - LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ()); - } - return -1; /* kick this user! */ - } -#else if (errno != EAGAIN && errno != EWOULDBLOCK) { LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); } -#endif return 0; /*Error */ } if (stat == 0) @@ -215,46 +205,25 @@ * closing the socket anyways, then reading this extra 100 bytes * shouldn't hurt. */ -#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */ - recv (fd, sl->buf + 2, 100, 0); -#else read (fd, sl->buf + 2, 100); -#endif /* end win32 */ /* return error so the socket is closed */ return -1; } do { -#ifdef WIN32 /* ***win32 SockList_ReadPacket: change read() to recv() */ - stat = recv (fd, sl->buf + sl->len, toread, 0); -#else do { stat = read (fd, sl->buf + sl->len, toread); } while ((stat < 0) && (errno == EINTR)); -#endif if (stat < 0) { -#ifdef WIN32 /* ***win32 SockList_ReadPacket: change error handling for win32 */ - if ((stat == -1) && WSAGetLastError () != WSAEWOULDBLOCK) - { - if (WSAGetLastError () == WSAECONNRESET) - LOG (llevDebug, "Connection closed by client\n"); - else - { - LOG (llevDebug, "ReadPacket got error %d, returning 0\n", WSAGetLastError ()); - } - return -1; /* kick this user! */ - } -#else if (errno != EAGAIN && errno != EWOULDBLOCK) { LOG (llevDebug, "ReadPacket got error %s, returning 0\n", strerror (errno)); } -#endif return 0; /*Error */ } if (stat == 0) @@ -351,28 +320,18 @@ if (ns->outputbuffer.len < max) max = ns->outputbuffer.len; -#ifdef WIN32 /* ***win32 write_socket_buffer: change write() to send() */ - amt = send (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max, 0); -#else do { amt = write (ns->fd, ns->outputbuffer.data + ns->outputbuffer.start, max); } while ((amt < 0) && (errno == EINTR)); -#endif if (amt < 0) { /* We got an error */ -#ifdef WIN32 /* ***win32 write_socket_buffer: change error handling */ - if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK) - { - LOG (llevError, "New socket write failed (wsb) (%d).\n", WSAGetLastError ()); -#else if (errno != EWOULDBLOCK) { LOG (llevError, "New socket write failed (wsb) (%d: %s).\n", errno, strerror (errno)); -#endif ns->status = Ns_Dead; return; } @@ -426,28 +385,18 @@ while (len > 0) { -#ifdef WIN32 /* ***win32 Write_To_Socket: change write() to send() */ - amt = send (ns->fd, pos, len, 0); -#else do { amt = write (ns->fd, pos, len); } while ((amt < 0) && (errno == EINTR)); -#endif if (amt < 0) { /* We got an error */ -#ifdef WIN32 /* ***win32 Write_To_Socket: change error handling */ - if (amt == -1 && WSAGetLastError () != WSAEWOULDBLOCK) - { - LOG (llevError, "New socket write failed WTS (%d).\n", WSAGetLastError ()); -#else if (errno != EWOULDBLOCK) { LOG (llevError, "New socket write failed WTS (%d: %s).\n", /* ---WIN32 */ errno, strerror (errno)); -#endif ns->status = Ns_Dead; return; } @@ -481,7 +430,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; @@ -498,7 +447,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]; @@ -525,7 +474,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; @@ -570,3 +519,4 @@ cst_lst.time_start = now; } #endif +