- Thu Dec 14 03:39:34 UTC 2000

[libfaim.git] / aim_rxqueue.c

diff --git a/aim_rxqueue.c b/aim_rxqueue.c
index 8a1a50d9e99d1fec44ea95a808a327812ba0ca52..bbdb2078b72b5492f62c98d582fb27be6ff3202a 100644 (file)
--- a/aim_rxqueue.c
+++ b/aim_rxqueue.c
@@ -7,7 +7,10 @@
  */
 
 #include <faim/aim.h> 
+
+#ifndef _WIN32
 #include <sys/socket.h>
+#endif
 
 /*
  * Since not all implementations support MSG_WAITALL, define
@@ -18,7 +21,7 @@
  * take more for a badly fragmented packet.
  *
  */
-static int aim_recv(int fd, void *buf, size_t count)
+faim_internal int aim_recv(int fd, void *buf, size_t count)
 {
 #ifdef MSG_WAITALL
   return recv(fd, buf, count, MSG_WAITALL);
@@ -28,7 +31,7 @@ static int aim_recv(int fd, void *buf, size_t count)
   left = count;
 
   while (left) {
-    ret = read(fd, ((unsigned char *)buf)+cur, left);
+    ret = recv(fd, ((unsigned char *)buf)+cur, left, 0);
     if (ret == -1)
       return -1;
     if (ret == 0)
@@ -54,9 +57,15 @@ faim_export int aim_get_command(struct aim_session_t *sess, struct aim_conn_t *c
   if (!sess || !conn)
     return 0;
 
+  if (conn->fd == -1)
+    return -1; /* its a aim_conn_close()'d connection */
+
   if (conn->fd < 3)  /* can happen when people abuse the interface */
     return 0;
 
+  if (conn->status & AIM_CONN_STATUS_INPROGRESS)
+    return aim_conn_completeconnect(sess, conn);
+
   /*
    * Rendezvous (client-client) connections do not speak
    * FLAP, so this function will break on them.