diff --git a/iguana/iguana_peers.c b/iguana/iguana_peers.c
index 367cf3bd3..3b2f887fb 100755
--- a/iguana/iguana_peers.c
+++ b/iguana/iguana_peers.c
@@ -311,14 +311,15 @@ int32_t iguana_socket(int32_t bindflag,char *hostname,uint16_t port)
             printf("socket() failed: %s errno.%d", strerror(errno),errno);
         return(-1);
     }
-    if ( 0 && bindflag != 0 )
+    opt = 1;
+    if ( bindflag != 0 )
     {
-        timeout.tv_sec = 0;
-        timeout.tv_usec = 1000;
-        setsockopt(sock,SOL_SOCKET,SO_RCVTIMEO,(char *)&timeout,sizeof(timeout));
+        //timeout.tv_sec = 0;
+        //timeout.tv_usec = 1000;
+        //setsockopt(sock,SOL_SOCKET,SO_RCVTIMEO,(char *)&timeout,sizeof(timeout));
+        setsockopt(sock,SOL_SOCKET,SO_KEEPALIVE,(void *)&opt,sizeof(opt));
     }
-    opt = 1;
-    setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(void*)&opt,sizeof(opt));
+    setsockopt(sock,SOL_SOCKET,SO_REUSEADDR,(void *)&opt,sizeof(opt));
 #ifdef __APPLE__
     setsockopt(sock,SOL_SOCKET,SO_NOSIGPIPE,&opt,sizeof(opt));
 #endif