Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion src/remote_registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@
import prefs
import config

def get_ipv6_addr_tuple(addr, port):
if '%' in addr:
ip_part, scope_name = addr.split('%', 1)
scope_id = socket.if_nametoindex(scope_name)
else:
ip_part = addr
scope_id = 0
return (ip_part, port, 0, scope_id)

class RegRequest():
def __init__(self, ident, hostname, ip_info, port, auth_port, api_version):
self.api_version = api_version
Expand Down Expand Up @@ -182,7 +191,10 @@ def serve_cert_thread(self, ip_version):
try:
server_sock = socket.socket(ip_version, socket.SOCK_DGRAM)
server_sock.settimeout(1.0)
server_sock.bind((local_ip, self.port))
if ip_version == socket.AF_INET6:
server_sock.bind(get_ipv6_addr_tuple(local_ip, self.port))
else:
server_sock.bind((local_ip, self.port))
except socket.error as e:
logging.critical("Could not create udp socket for cert requests: %s" % str(e))
return
Expand Down
4 changes: 3 additions & 1 deletion src/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,9 @@ def as_binary_list(self):
pass
if self.ip6:
try:
blist.append(socket.inet_pton(GLib.SYSDEF_AF_INET6, self.ip6_address))
# Strip scope ID suffix if present (e.g., %eth0)
ip6_clean = self.ip6_address.split('%')[0] if '%' in self.ip6_address else self.ip6_address
blist.append(socket.inet_pton(GLib.SYSDEF_AF_INET6, ip6_clean))
except:
pass

Expand Down
Loading