Ticket #2587: peekable-v2.patch

xpra/net/socket_util.py

@@ -13 +13 @@
     EXIT_SSL_FAILURE, EXIT_SSL_CERTIFICATE_VERIFY_FAILURE,
     EXIT_SERVER_ALREADY_EXISTS, EXIT_SOCKET_CREATION_ERROR,
     )
+from xpra.net.bytestreams import PeekableSocketConnection
 from xpra.os_util import (
     getuid, get_username_for_uid, get_groups, get_group_id,
     path_permission_info, monotonic_time, umask_context, WIN32, OSX, POSIX,
@@ -174 +175 @@
         peername = address
     sock.settimeout(timeout)
     sockname = sock.getsockname()
-    from xpra.net.bytestreams import SocketConnection
-    conn = SocketConnection(sock, sockname, address, peername, socktype, None, socket_options)
+    conn = PeekableSocketConnection(sock, sockname, address, peername, socktype, None, socket_options)
     log("accept_connection(%s, %s, %s)=%s", listener, socktype, timeout, conn)
     return conn
 
@@ -198 +198 @@
         sleep(timeout/4000.0)
         elapsed = int(1000*(monotonic_time()-start))
         log("peek: elapsed=%s, timeout=%s", elapsed, timeout)
-    log("socket %s peek: got %i bytes", conn, len(peek_data))
+    if not peek_data and isinstance(conn, PeekableSocketConnection):
+        conn.enable_peek()
+        try:
+            peek_data = conn.peek(size)
+        except Exception:
+            log("peek_connection(%s, %i) failed", conn, timeout, exc_info=True)
+    log.info("socket %s peek: got %i bytes (%s)", conn, len(peek_data), type(conn))
     return peek_data