Fixed setsockopt() calling the underlying method in the wrong manner

anyio/_networking.py

@@ -219,8 +219,8 @@ async def close(self):
     def getsockopt(self, level, optname, *args):
         return self._socket.getsockopt(level, optname, *args)
 
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
-        self._socket.setsockopt(level, optname, value, optlen)
+    def setsockopt(self, level, optname, value, *args) -> None:
+        self._socket.setsockopt(level, optname, value, *args)
 
     @property
     def buffered_data(self) -> bytes:
@@ -371,8 +371,8 @@ async def close(self) -> None:
     def getsockopt(self, level, optname, *args):
         return self._socket.getsockopt(level, optname, *args)
 
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
-        self._socket.setsockopt(level, optname, value, optlen)
+    def setsockopt(self, level, optname, value, *args) -> None:
+        self._socket.setsockopt(level, optname, value, *args)
 
     @property
     def address(self) -> Union[Tuple[str, int], Tuple[str, int, int, int], str]:
@@ -427,8 +427,8 @@ def port(self) -> int:
     def getsockopt(self, level, optname, *args):
         return self._socket.getsockopt(level, optname, *args)
 
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
-        self._socket.setsockopt(level, optname, value, optlen)
+    def setsockopt(self, level, optname, value, *args) -> None:
+        self._socket.setsockopt(level, optname, value, *args)
 
     async def receive(self, max_bytes: int) -> Tuple[bytes, str]:
         return await self._socket.recvfrom(max_bytes)

anyio/abc.py

@@ -377,7 +377,7 @@ def getsockopt(self, level, optname, *args):
         """
 
     @abstractmethod
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
+    def setsockopt(self, level, optname, value, *args) -> None:
         """
         Set a socket option.
 
@@ -507,7 +507,7 @@ def getsockopt(self, level, optname, *args):
         """
 
     @abstractmethod
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
+    def setsockopt(self, level, optname, value, *args) -> None:
         """
         Set a socket option.
 
@@ -580,7 +580,7 @@ def getsockopt(self, level, optname, *args):
         """
 
     @abstractmethod
-    def setsockopt(self, level, optname, value, optlen: Optional[int] = None) -> None:
+    def setsockopt(self, level, optname, value, *args) -> None:
         """
         Set a socket option.
 

docs/versionhistory.rst

@@ -3,6 +3,10 @@ Version history
 
 This library adheres to `Semantic Versioning <http://semver.org/>`_.
 
+**UNRELEASED**
+
+- Fixed ``setsockopt()`` passing options to the underlying method in the wrong manner
+
 **1.0.0b2**
 
 - Added introspection of running tasks via ``anyio.get_running_tasks()``

tests/test_networking.py

@@ -199,6 +199,15 @@ async def server():
 
         assert lines == {b'client1', b'client2'}
 
+    @pytest.mark.anyio
+    async def test_socket_options(self):
+        async with await create_tcp_server(interface='localhost') as stream_server:
+            stream_server.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 80000)
+            assert stream_server.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF) in (80000, 160000)
+            async with await connect_tcp('localhost', stream_server.port) as client:
+                client.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 80000)
+                assert client.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF) in (80000, 160000)
+
 
 class TestUNIXStream:
     @pytest.mark.skipif(sys.platform == 'win32',
@@ -421,3 +430,9 @@ async def serve():
                     await client.send(b'123456')
                     assert await client.receive(100) == (b'654321', ('127.0.0.1', server.port))
                     await tg.cancel_scope.cancel()
+
+    @pytest.mark.anyio
+    async def test_socket_options(self):
+        async with await create_udp_socket(interface='127.0.0.1') as udp:
+            udp.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 80000)
+            assert udp.getsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF) in (80000, 160000)