Skip to content
This repository was archived by the owner on Nov 23, 2017. It is now read-only.

Check to see if SO_REUSEPORT is usable and not just defined. #418

Closed
sethmlarson wants to merge 13 commits into from
Closed

Check to see if SO_REUSEPORT is usable and not just defined. #418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c90305a
Add usable-test for SO_REUSEPORT
SethMichaelLarson Sep 12, 2016
142bfbc
Delete temporary socket after use
SethMichaelLarson Sep 12, 2016
12d2565
Add _HAS_SO_REUSEPORT check to Datagram
SethMichaelLarson Sep 12, 2016
147eee8
Add SO_REUSEPORT to socket mock.
SethMichaelLarson Sep 12, 2016
8faa5f4
Update with additional check for Tests
SethMichaelLarson Sep 12, 2016
708e6d3
Fix grammar and structure
SethMichaelLarson Sep 12, 2016
d884e0c
Crop lines to 80 characters.
SethMichaelLarson Sep 12, 2016
d9cb721
Add check for SO_REUSEPORT in tests
SethMichaelLarson Sep 12, 2016
783ec36
Switch order of check, conform to PEP8
SethMichaelLarson Sep 12, 2016
c11b017
Move check to inline
sethmlarson Sep 12, 2016
0d02526
Add test for this specific case
sethmlarson Sep 12, 2016
e45e6ea
Remove SO_REUSEPORT from patching
sethmlarson Sep 12, 2016
1f40127
Clean up nits.
gvanrossum Sep 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 14 additions & 4 deletions asyncio/base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,8 +818,13 @@ def create_datagram_endpoint(self, protocol_factory,
raise ValueError(
'reuse_port not supported by socket module')
else:
sock.setsockopt(
socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
try:
sock.setsockopt(
socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
except OSError:
raise ValueError((
'reuse_port not supported by socket module, '
'SO_REUSEPORT defined but not implemented.'))
if allow_broadcast:
sock.setsockopt(
socket.SOL_SOCKET, socket.SO_BROADCAST, 1)
Expand Down Expand Up @@ -946,8 +951,13 @@ def create_server(self, protocol_factory, host=None, port=None,
raise ValueError(
'reuse_port not supported by socket module')
else:
sock.setsockopt(
socket.SOL_SOCKET, socket.SO_REUSEPORT, True)
try:
sock.setsockopt(
socket.SOL_SOCKET, socket.SO_REUSEPORT, 1)
except OSError:
raise ValueError((
'reuse_port not supported by socket module, '
'SO_REUSEPORT defined but not implemented.'))
# Disable IPv4/IPv6 dual stack support (enabled by
# default on Linux) which makes a single socket
# listen on both address families.
Expand Down
11 changes: 11 additions & 0 deletions tests/test_base_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,6 +1370,17 @@ def test_create_server_nosoreuseport(self, m_socket):

self.assertRaises(ValueError, self.loop.run_until_complete, f)

@patch_socket
def test_create_server_soreuseport_only_defined(self, m_socket):
m_socket.getaddrinfo = socket.getaddrinfo
m_socket.socket.return_value = mock.Mock()
m_socket.SO_REUSEPORT = -1

f = self.loop.create_server(
MyProto, '0.0.0.0', 0, reuse_port=True)

self.assertRaises(ValueError, self.loop.run_until_complete, f)

@patch_socket
def test_create_server_cant_bind(self, m_socket):

Expand Down