- Fri Dec 15 21:51:32 UTC 2000

[libfaim.git] / aim_rxqueue.c

diff --git a/aim_rxqueue.c b/aim_rxqueue.c
index 021fe955c8fb38f707131bd672f440a933ddbb61..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
@@ -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.