[ViewVC] Diff of: cvs/deliantra/server/socket/lowlevel.C

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.15 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.19 by root, Thu Dec 14 20:39:54 2006 UTC

 // easily die in 20 seconds...
 #define SOCKET_TIMEOUT1 10
 #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
   struct tcp_info tcpi;
   socklen_t len = sizeof (tcpi);
  * Start of read routines.
  *
  ******************************************************************************/
 int
-NewSocket::read_packet ()
+client_socket::read_packet ()
 {
   for (;;)
     {
       if (inbuf_len >= 2)
         {
       cst_lst.ibytes += amount;
     }
 }
 void
-NewSocket::skip_packet (int len)
+client_socket::skip_packet (int len)
 {
   inbuf_len -= len;
   memmove (inbuf, inbuf + len, inbuf_len);
 }
  * ns is the socket we are adding the data to, buf is the start of the
  * data, and len is the number of bytes to add.
  */
 static void
-add_to_buffer (NewSocket *ns, char *buf, int len)
+add_to_buffer (client_socket *ns, char *buf, int len)
 {
   int avail, end;
   if ((len + ns->outputbuffer.len) > SOCKETBUFSIZE)
     {
  *
  * When the socket is clear to write, and we have backlogged data, this
  * is called to write it out.
  */
 void
-write_socket_buffer (NewSocket * ns)
+write_socket_buffer (client_socket * ns)
 {
   int amt, max;
   if (ns->outputbuffer.len == 0)
     {
  * provided (ns).  buf is the data to write, len is the number
  * of bytes to write.  IT doesn't return anything - rather, it
  * updates the ns structure if we get an  error.
  */
 void
-NewSocket::send (void *buf_, int len)
+client_socket::send (void *buf_, int len)
 {
   char *buf = (char *)buf_;
   char *pos = buf;
   int amt = 0;
       cst_lst.obytes += amt;
 #endif
     }
 }
+void
+client_socket::socket_cb (iow &w, int got)
+{
+  //printf ("iow got %x\n", got);
+  w.stop ();
+}
 /**
  * Takes a string of data, and writes it out to the socket. A very handy
  * shortcut function.
  */
 void
-NewSocket::send_packet (packet &sl)
+client_socket::send_packet (packet &sl)
 {
-  Send_With_Handling (this, &sl);
-}
-void
-NewSocket::send_packet (const char *buf, int len)
-{
-  packet sl;
-  sl << data (buf, len);
-  send_packet (sl);
-}
-void
-NewSocket::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 packet
- *, and we prepend the length information.
- */
-void
-Send_With_Handling (NewSocket *ns, packet *msg)
-{
-  unsigned char sbuf[4];
-  if (ns->status == Ns_Dead || !msg)
+  if (status == Ns_Dead)
     return;
-  if (msg->length () >= MAXSOCKBUF)
+  if (sl.length () >= MAXSOCKBUF)
     {
-      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", msg->length ());
+      LOG (llevError, "Trying to send a buffer beyond properly size, len =%d\n", sl.length ());
-      /* Almost certainly we've overflowed a buffer, so quite now to make
+      /* Almost certainly we've overflowed a buffer, so quit now to make
        * it easier to debug.
        */
       abort ();
     }
-  sbuf[0] = ((uint32) (msg->length ()) >> 8);
+  if (!sl.length ())
-  sbuf[1] = ((uint32) (msg->length ())     );
+    return;
-  if (ns->status != Ns_Old)
+  assert (sl.hdrlen == 2);
-    ns->send (sbuf, 2);
-  ns->send (msg->buf, msg->length ());
+  sl.buf_ [0] = sl.length () >> 8;
+  sl.buf_ [1] = sl.length ()     ;
+  send (sl.buf_, sl.length () + sl.hdrlen);
+}
+void
+client_socket::send_packet (const char *buf, int len)
+{
+  packet sl;
+  sl << data (buf, len);
+  send_packet (sl);
+}
+void
+client_socket::send_packet (const char *buf)
+{
+  send_packet (buf, strlen (buf));
 }
 /******************************************************************************
  *
  * statistics logging functions.
   LOG (llevInfo, "CSSTAT: %.16s tot %d %d %d %d inc %d %d %d %d\n",
        ctime (&now), cst_tot.ibytes, cst_tot.obytes, cst_tot.max_conn,
        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

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/socket/lowlevel.C (file contents): Revision 1.15 by root, Thu Dec 14 01:59:10 2006 UTC vs. Revision 1.19 by root, Thu Dec 14 20:39:54 2006 UTC

Diff Legend

Comparing deliantra/server/socket/lowlevel.C (file contents):
Revision 1.15 by root, Thu Dec 14 01:59:10 2006 UTC vs.
Revision 1.19 by root, Thu Dec 14 20:39:54 2006 UTC