mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-23 08:47:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix listen_on with IPv6 address

Browse Source
This commit is contained in:
Kovid Goyal
2024-08-27 18:42:51 +05:30
parent fdc3c3d7c1
commit d363513884
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
kitty/boss.py
View File

@@ -173,10 +173,9 @@ def listen_on(spec: str) -> tuple[int, str]:
atexit.register(remove_socket_file, s, socket_path) atexit.register(remove_socket_file, s, socket_path)
s.bind(address) s.bind(address)
s.listen() s.listen()
if isinstance(address, tuple): if isinstance(address, tuple): # tcp socket
h, resolved_port = s.getsockname() h, resolved_port = s.getsockname()[:2]
sfamily, host, port = spec.split(':', 2) spec = spec.rpartition(':')[0] + f':{resolved_port}'
spec = f'{sfamily}:{host}:{resolved_port}'
return s.fileno(), spec return s.fileno(), spec

9
kitty/utils.py
View File

@@ -492,7 +492,14 @@ def parse_address_spec(spec: str) -> tuple[AddressFamily, Union[tuple[str, int],
socket_path = address socket_path = address
elif protocol in ('tcp', 'tcp6'): elif protocol in ('tcp', 'tcp6'):
family = socket.AF_INET if protocol == 'tcp' else socket.AF_INET6 family = socket.AF_INET if protocol == 'tcp' else socket.AF_INET6
host, port = rest.rsplit(':', 1) if rest.startswith('['): # ]
host = rest[1:]
host, sep, leftover = host.rpartition(']')
_, port = leftover.rsplit(':', 1)
if ':' in host and protocol == 'tcp':
family = socket.AF_INET6
else:
host, port = rest.rsplit(':', 1)
address = host, int(port) address = host, int(port)
else: else:
raise ValueError(f'Unknown protocol in listen-on value: {spec}') raise ValueError(f'Unknown protocol in listen-on value: {spec}')