Fix for nasty race condition in accepting sockets.

Author: sptramer

demos/KitchenSink/Resources/examples/socket_connect.js

@@ -6,7 +6,7 @@ function pumpCallback(e) {
 	if (e.bytesProcessed == -1) { // EOF
 		statusArea.value = "<EOF> - Can't perform any more operations on connected socket";
 	}
-	if (e.errorDescription == null || e.errorDescription == "") {
+	else if (e.errorDescription == null || e.errorDescription == "") {
 		statusArea.value = "DATA: "+e.buffer.toString();
 	}
 	else {

iphone/Classes/AsyncSocket.h

@@ -67,6 +67,11 @@ typedef enum AsyncSocketError AsyncSocketError;
 **/
 - (NSRunLoop *)onSocket:(AsyncSocket *)sock wantsRunLoopForNewSocket:(AsyncSocket *)newSocket;
 
+/**
+ * Called when the socket has been attached to run loop, etc. and is ready to hit the big time.
+ */
+-(void)onSocketReadyInRunLoop:(AsyncSocket *)sock;
+
 /**
  * Called when a socket is about to connect. This method should return YES to continue, or NO to abort.
  * If aborted, will result in AsyncSocketCanceledError.

iphone/Classes/AsyncSocket.m

@@ -1821,6 +1821,10 @@ - (AsyncSocket*)doAcceptFromSocket:(CFSocketRef)parentSocket withNewNativeSocket
 		if(![newSocket attachStreamsToRunLoop:runLoop error:nil]) goto Failed;
 		if(![newSocket configureStreamsAndReturnError:nil])       goto Failed;
 		if(![newSocket openStreamsAndReturnError:nil])            goto Failed;
+        
+        if ([theDelegate respondsToSelector:@selector(onSocketReadyInRunLoop:)]) {
+            [theDelegate onSocketReadyInRunLoop:newSocket];
+        }
 
 		return newSocket;
 

iphone/Classes/TiNetworkSocketTCPProxy.h

@@ -41,6 +41,7 @@ typedef enum {
     NSRunLoop* acceptRunLoop;
     NSCondition* acceptCondition;
     BOOL accepting;
+    BOOL acceptedReady;
 
     // Information used to hash callbacks and asynch ops to tags.
     int asynchTagCount;

iphone/Classes/TiNetworkSocketTCPProxy.m

@@ -233,7 +233,16 @@ -(void)startAcceptedSocket:(NSDictionary*)info
         NSDictionary* event = [NSDictionary dictionaryWithObjectsAndKeys:self,@"socket",proxy,@"inbound",nil];
         [self _fireEventToListener:@"accepted" withObject:event listener:accepted thisObject:self];
     }
-
+    
+    tempConditionRef = [acceptCondition retain];
+    [tempConditionRef lock];
+    if (!acceptedReady) {
+        [tempConditionRef wait];
+    }
+    acceptedReady = NO;
+    [tempConditionRef unlock];
+    [tempConditionRef release];
+    
     [proxy socketRunLoop];
     [proxy forgetSelf];
 
@@ -572,14 +581,25 @@ -(void)onSocket:(AsyncSocket *)sock didConnectToHost:(NSString *)host port:(UInt
     if (sock != socket) {
         return;
     }
-
+    
     internalState = SOCKET_CONNECTED;
 
     if (connected != nil) {
         NSDictionary* event = [NSDictionary dictionaryWithObjectsAndKeys:self,@"socket",nil];
         [self _fireEventToListener:@"connected" withObject:event listener:connected thisObject:self];        
     }
- }
+}
+
+// Prevent that goofy race conditon where a socket isn't attached to a run loop before beginning the accepted socket run loop.
+-(void)onSocketReadyInRunLoop:(AsyncSocket *)sock
+{
+    NSCondition* tempConditionRef = [acceptCondition retain];
+    [tempConditionRef lock];
+    acceptedReady = YES;
+    [tempConditionRef signal];
+    [tempConditionRef unlock];
+    [tempConditionRef release];
+}
 
 -(void)onSocketDidDisconnect:(AsyncSocket *)sock
 {