Fix StreamSocket on windows

secdev · Feb 18, 2024 · ca56748 · ca56748
1 parent 9a91d0e
commit ca56748
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/scapy/automaton.py b/scapy/automaton.py
@@ -99,6 +99,9 @@ def select_objects(inputs, remain):
             events.append(i)
     if natives:
         results = results.union(set(select.select(natives, [], [], remain)[0]))
+        if results:
+            # We have native results, poll.
+            remain = 0
     if events:
         # 0xFFFFFFFF = INFINITE
         remainms = int(remain * 1000 if remain is not None else 0xFFFFFFFF)

diff --git a/scapy/supersocket.py b/scapy/supersocket.py
@@ -412,6 +412,13 @@ def recv_raw(self, x=MTU):
         # type: (int) -> Tuple[Optional[Type[Packet]], Optional[bytes], Optional[float]]
         return self.basecls, self.ins.recv(x), None
 
+    if WINDOWS:
+        @staticmethod
+        def select(sockets, remain=None):
+            # type: (List[SuperSocket], Optional[float]) -> List[SuperSocket]
+            from scapy.automaton import select_objects
+            return select_objects(sockets, remain)
+
 
 class StreamSocket(SimpleSocket):
     """