[Ayttm-commits] CVS: ayttm/modules/msn2/libmsn2 msn_bittybits.C,1.6,1.7 msn_core.C,1.42,1.43

[Colin Leroy <address@hidden>]

Update of /cvsroot/ayttm/ayttm/modules/msn2/libmsn2
In directory subversions:/tmp/cvs-serv11905/modules/msn2/libmsn2

Modified Files:
        msn_bittybits.C msn_core.C 
Log Message:
async connect


Index: msn_bittybits.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn_bittybits.C,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- msn_bittybits.C     28 Feb 2003 11:22:13 -0000      1.6
+++ msn_bittybits.C     23 Mar 2003 10:35:32 -0000      1.7
@@ -9,6 +9,8 @@
 #include "msn_core.h"
 #include "msn_interface.h"
 #include "msn_bittybits.h"
+#include <errno.h>
+#include <time.h>
 
 char ** msn_read_line(int sock, int * numargs)
 {
@@ -16,13 +18,20 @@
   char ** retval;
   char c;
   int pos=0, numspaces=0;
-
+  struct timespec delay;
+  delay.tv_sec = 0;
+  delay.tv_nsec = 10000000;
   while(1)
   {
     if(read(sock, &c, 1)<1)
     {
-      printf("What the.. (%d)?!\n", sock); //DEBUG
-      return NULL;
+      if (errno == EAGAIN) {
+       nanosleep(&delay, NULL);
+       continue;
+      } else {
+        printf("What the.. (%d) (%s)?!\n", sock, buf); //DEBUG
+       return NULL;      
+      }        
     }
 
     if(pos == 1249) {buf[pos]='\0'; continue; }

Index: msn_core.C
===================================================================
RCS file: /cvsroot/ayttm/ayttm/modules/msn2/libmsn2/msn_core.C,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- msn_core.C  22 Mar 2003 19:03:20 -0000      1.42
+++ msn_core.C  23 Mar 2003 10:35:32 -0000      1.43
@@ -1924,15 +1924,15 @@
 
   if(conn->type==CONN_SB)
   {
-    //ext_async_socket(server, port, msn_connect_cb, conn);
-    conn->sock = ext_connect_socket(server,port);
-    msn_connect_cb(conn->sock,0,conn);
+    ext_async_socket(server, port, msn_connect_cb, conn);
+    //conn->sock = ext_connect_socket(server,port);
+    //msn_connect_cb(conn->sock,0,conn);
     return;
   }
   conn->ready = 0;
-  //ext_async_socket(server, port, msn_connect_cb2, conn);
-  conn->sock = ext_connect_socket(server,port);
-  msn_connect_cb2(conn->sock,0,conn);
+  ext_async_socket(server, port, msn_connect_cb2, conn);
+  //conn->sock = ext_connect_socket(server,port);
+  //msn_connect_cb2(conn->sock,0,conn);
   
 }