Fixing error when window socket receives OOB

pharo-project · Mar 14, 2022 · 8267368 · 8267368
1 parent e238f9c
commit 8267368
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 25 deletions.
diff --git a/extracted/plugins/SocketPlugin/src/common/SocketPluginImpl.c b/extracted/plugins/SocketPlugin/src/common/SocketPluginImpl.c
@@ -599,12 +599,17 @@ static void dataHandler(int fd, void *data, int flags)
   if (flags & AIO_R)
     {
       int n= socketReadable(fd, pss->socketType);
-      if (n == 0)
-	{
-	  logTrace("dataHandler: selected socket fd=%d flags=0x%x would block (why?)\n", fd, flags);
-	}
-      if (n != 1)
-	{
+      if (n == 0){
+    	  //Maybe getting OOB data
+          char buf[1];
+          int n= recv(fd, (void *)buf, 1, MSG_OOB);
+          if (n == 1) logTrace("socket: received OOB data: %02x\n", buf[0]);
+
+    	  //If the socket is not readable, we need to continue waiting.
+    	  aioHandle(fd, dataHandler, AIO_RX);
+    	  return;
+      }
+      if (n != 1){
 	  pss->sockError= socketError(fd);
 	  pss->sockState= OtherEndClosed;
 	}
@@ -2465,4 +2470,4 @@ sqInt sqSocketReceiveUDPDataBufCount(SocketPtr s, char *buf, sqInt bufSize)
     }
   success(false);
   return 0;
-}
+}
diff --git a/extracted/vm/src/win/aioWin.c b/extracted/vm/src/win/aioWin.c
@@ -114,6 +114,20 @@ long aioFileDescriptor_numberOfHandles(){
 	return count;
 }
 
+EXPORT(void) aioFileDescriptor_printHandlers(){
+	AioFileDescriptor* element = fileDescriptorList;
+	long count = 0;
+
+	printf("List of registered aioHandlers\n");
+	printf("==============================\n\n");
+
+	while(element){
+		printf("FD: %d Mask: %d Flags: %d ClientData %p handlerFn %p\n", element->fd, element->mask, element->flags, element->clientData, element->handlerFn);
+		element = element->next;
+	}
+
+}
+
 void aioFileDescriptor_fillHandles(HANDLE* handles){
 	AioFileDescriptor* element = fileDescriptorList;
 	long index = 0;
@@ -144,15 +158,10 @@ void aioFileDescriptor_signal_withHandle(HANDLE event){
 			/**
 			 * The event should be reset once it has been processed.
 			 */
-			if((element->flags & AIO_EXT) == 0){
-				WSAResetEvent(element->readEvent);
-
-				if(element->mask == 0) {
-					return;
-				}
-				//We set the event to 0 so it is not recalled after
-				WSAEventSelect(element->fd, element->readEvent, 0);
-			}
+			WSAResetEvent(element->readEvent);
+
+			//We set the event to 0 so it is not recalled after
+			WSAEventSelect(element->fd, element->readEvent, 0);
 
 			element->handlerFn(element->fd, element->clientData, AIO_R);
 			return;
@@ -163,15 +172,10 @@ void aioFileDescriptor_signal_withHandle(HANDLE event){
 			/**
 			 * The event should be reset once it has been processed.
 			 */
-			if((element->flags & AIO_EXT) == 0){
-				WSAResetEvent(element->writeEvent);
-
-				if(element->mask == 0) {
-					return;
-				}
-				//We set the event to 0 so it is not recalled after
-				WSAEventSelect(element->fd, element->writeEvent, 0);
-			}
+			WSAResetEvent(element->writeEvent);
+
+			//We set the event to 0 so it is not recalled after
+			WSAEventSelect(element->fd, element->writeEvent, 0);
 
 			element->handlerFn(element->fd, element->clientData, AIO_W);
 			return;