--- deliantra/server/socket/lowlevel.C 2006/12/14 00:01:37 1.12 +++ deliantra/server/socket/lowlevel.C 2006/12/14 05:09:32 1.18 @@ -53,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 @@ -82,47 +82,57 @@ /*********************************************************************** * - * SockList functions/utilities + * packet functions/utilities * **********************************************************************/ -SockList &SockList::operator <<(const data &v) +packet &packet::operator <<(const data &v) { - if (v.len) + if (room () < v.len) + reset (); + else { - memcpy (buf + len, v.ptr, v.len); - len += v.len; + if (v.len) + { + memcpy (cur, v.ptr, v.len); + cur += v.len; + } } return *this; } -SockList &SockList::operator <<(const data8 &v) +packet &packet::operator <<(const data8 &v) { unsigned int len = min (v.len, 0x00FF); return *this << uint8 (len) << data (v.ptr, len); } -SockList &SockList::operator <<(const data16 &v) +packet &packet::operator <<(const data16 &v) { unsigned int len = min (v.len, 0xFFFF); return *this << uint16 (len) << data (v.ptr, len); } -SockList &SockList::operator <<(const char *v) +packet &packet::operator <<(const char *v) { return *this << data (v, strlen (v ? v : 0)); } void -SockList::printf (const char *format, ...) +packet::printf (const char *format, ...) { + int size = room (); + va_list ap; va_start (ap, format); + int len = vsnprintf ((char *)cur, size, format, ap); + va_end (ap); - len += vsprintf ((char *)buf + len, format, ap); + if (len >= size) + return reset (); - va_end (ap); + cur += len; } /****************************************************************************** @@ -132,7 +142,7 @@ ******************************************************************************/ int -NewSocket::read_packet () +client_socket::read_packet () { for (;;) { @@ -178,7 +188,7 @@ } void -NewSocket::skip_packet (int len) +client_socket::skip_packet (int len) { inbuf_len -= len; memmove (inbuf, inbuf + len, inbuf_len); @@ -198,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; @@ -242,7 +252,7 @@ * is called to write it out. */ void -write_socket_buffer (NewSocket * ns) +write_socket_buffer (client_socket * ns) { int amt, max; @@ -301,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)); @@ -335,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; } } @@ -350,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 @@ -362,66 +372,63 @@ } } - /** * Takes a string of data, and writes it out to the socket. A very handy * shortcut function. */ + +void +client_socket::send_packet (packet &sl) +{ + Send_With_Handling (this, &sl); +} + void -cs_write_string (NewSocket *ns, const 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)); +} /** * Calls Write_To_Socket to send data to the client. * - * The only difference in this function is that we take a SockList + * The only difference in this function is that we take a packet *, and we prepend the length information. */ void -Send_With_Handling (NewSocket *ns, SockList *msg) +Send_With_Handling (client_socket *ns, packet *msg) { unsigned char sbuf[4]; if (ns->status == Ns_Dead || !msg) return; - if (msg->len >= MAXSOCKBUF) + if (msg->length () >= MAXSOCKBUF) { - LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->len); + LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ()); /* Almost certainly we've overflowed a buffer, so quite 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); -} -/** - * 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) -{ - SockList sl; + sbuf[0] = ((uint32) (msg->length ()) >> 8); + sbuf[1] = ((uint32) (msg->length ()) ); - sl.len = len; - sl.buf = (unsigned char *) buf; - Send_With_Handling (ns, &sl); + //TODO: single write, or writev + ns->send (sbuf, 2); + ns->send (msg->buf, msg->length ()); } - /****************************************************************************** * * statistics logging functions. @@ -453,7 +460,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