- Thu Feb 8 20:12:39 UTC 2001

[libfaim.git] / aim_rxqueue.c

diff --git a/aim_rxqueue.c b/aim_rxqueue.c
index 021fe955c8fb38f707131bd672f440a933ddbb61..6cc1806f53b1f5c34a66335359dc66f891f3f792 100644 (file)
--- a/aim_rxqueue.c
+++ b/aim_rxqueue.c
@@ -6,8 +6,12 @@
  * aim_rxhandlers.c.
  */
 
+#define FAIM_INTERNAL
 #include <faim/aim.h> 
+
+#ifndef _WIN32
 #include <sys/socket.h>
+#endif
 
 /*
  * Since not all implementations support MSG_WAITALL, define
@@ -54,17 +58,25 @@ 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.
    */
   if (conn->type == AIM_CONN_TYPE_RENDEZVOUS) 
     return aim_get_command_rendezvous(sess, conn);
-  if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) 
+  if (conn->type == AIM_CONN_TYPE_RENDEZVOUS_OUT) {
+    printf("out on fd %d\n", conn->fd);
     return 0; 
+  }
 
   /*
    * Read FLAP header.  Six bytes: