use trans

1 files changed, 9 insertions, 99 deletions

diff --git a/libxrdp/xrdp_tcp.c b/libxrdp/xrdp_tcp.c
index 67ba1f68..86a79ea7 100644
--- a/libxrdp/xrdp_tcp.c
+++ b/libxrdp/xrdp_tcp.c
@@ -14,7 +14,7 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
    xrdp: A Remote Desktop Protocol server.
-   Copyright (C) Jay Sorg 2004-2009
+   Copyright (C) Jay Sorg 2004-2010
 
    tcp layer
 
@@ -24,14 +24,14 @@
 
 /*****************************************************************************/
 struct xrdp_tcp* APP_CC
-xrdp_tcp_create(struct xrdp_iso* owner, int sck)
+xrdp_tcp_create(struct xrdp_iso* owner, struct trans* trans)
 {
   struct xrdp_tcp* self;
 
   DEBUG(("    in xrdp_tcp_create"));
   self = (struct xrdp_tcp*)g_malloc(sizeof(struct xrdp_tcp), 1);
   self->iso_layer = owner;
-  self->sck = sck;
+  self->trans = trans;
   DEBUG(("    out xrdp_tcp_create"));
   return self;
 }
@@ -58,54 +58,12 @@ xrdp_tcp_init(struct xrdp_tcp* self, struct stream* s)
 int APP_CC
 xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len)
 {
-  int rcvd;
-  struct xrdp_session* session;
-
-  if (self->sck_closed)
-  {
-    DEBUG(("    in xrdp_tcp_recv, sck closed"));
-    return 1;
-  }
   DEBUG(("    in xrdp_tcp_recv, gota get %d bytes", len));
-  session = self->iso_layer->mcs_layer->sec_layer->rdp_layer->session;
   init_stream(s, len);
-  while (len > 0)
+  if (trans_force_read_s(self->trans, s, len) != 0)
   {
-    rcvd = g_tcp_recv(self->sck, s->end, len, 0);
-    if (rcvd == -1)
-    {
-      if (g_tcp_last_error_would_block(self->sck))
-      {
-        if (!g_tcp_can_recv(self->sck, 10))
-        {
-          if (session->is_term != 0)
-          {
-            if (session->is_term())
-            {
-              DEBUG(("    out xrdp_tcp_recv, terminated"));
-              return 1;
-            }
-          }
-        }
-      }
-      else
-      {
-        self->sck_closed = 1;
-        DEBUG(("    error = -1 in xrdp_tcp_recv socket %d", self->sck));
-        return 1;
-      }
-    }
-    else if (rcvd == 0)
-    {
-      self->sck_closed = 1;
-      DEBUG(("    error = 0 in xrdp_tcp_recv socket %d", self->sck));
-      return 1;
-    }
-    else
-    {
-      s->end += rcvd;
-      len -= rcvd;
-    }
+    DEBUG(("    error in trans_force_read_s"));
+    return 1;
   }
   DEBUG(("    out xrdp_tcp_recv"));
   return 0;
@@ -116,59 +74,11 @@ xrdp_tcp_recv(struct xrdp_tcp* self, struct stream* s, int len)
 int APP_CC
 xrdp_tcp_send(struct xrdp_tcp* self, struct stream* s)
 {
-  int len;
-  int total;
-  int sent;
-  struct xrdp_session* session;
-
-  if (self->sck_closed)
-  {
-    DEBUG(("    in xrdp_tcp_send, sck closed"));
-    return 1;
-  }
-  len = s->end - s->data;
   DEBUG(("    in xrdp_tcp_send, gota send %d bytes", len));
-  session = self->iso_layer->mcs_layer->sec_layer->rdp_layer->session;
-  total = 0;
-  while (total < len)
+  if (trans_force_write_s(self->trans, s) != 0)
   {
-    sent = g_tcp_send(self->sck, s->data + total, len - total, 0);
-    if (sent == -1)
-    {
-      if (g_tcp_last_error_would_block(self->sck))
-      {
-        if (!g_tcp_can_send(self->sck, 10))
-        {
-          if (session->is_term != 0)
-          {
-            if (session->is_term())
-            {
-              DEBUG(("    out xrdp_tcp_send, terminated"));
-              return 1;
-            }
-          }
-        }
-      }
-      else
-      {
-        self->sck_closed = 1;
-        DEBUG(("    error = -1 in xrdp_tcp_send socket %d", self->sck));
-        return 1;
-      }
-    }
-    else if (sent == 0)
-    {
-      self->sck_closed = 1;
-      DEBUG(("    error = 0 in xrdp_tcp_send socket %d", self->sck));
-      return 1;
-    }
-    else
-    {
-#if defined(XRDP_DEBUG)
-      g_hexdump(s->data + total, sent);
-#endif
-      total = total + sent;
-    }
+    DEBUG(("    error in trans_force_write_s"));
+    return 1;
   }
   DEBUG(("    out xrdp_tcp_send, sent %d bytes ok", len));
   return 0;