Philipp Hörist pushed to branch master at gajim / gajim

Commits: 9dd747df by Philipp Hörist at 2018-09-05T00:14:51Z Windows: Fix IPV6 for Windows 10+

Fixes #9326

- - - - -

2 changed files:

- gajim/common/socks5.py - gajim/common/zeroconf/client_zeroconf.py

Changes:

===================================== gajim/common/socks5.py ===================================== --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -27,6 +27,7 @@ import struct import hashlib import os import time +import platform from errno import EWOULDBLOCK from errno import ENOBUFS from errno import EINTR @@ -1424,8 +1425,7 @@ class Socks5Listener(IdleObject): # Under windows Vista, we need that to listen on ipv6 AND ipv4 # Doesn't work under windows XP if os.name == 'nt': - ver = os.sys.getwindowsversion() - if (ver[3], ver[0]) == (2, 6): # Win Vista + + if int(platform.win32_ver()[0]) >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0)

===================================== gajim/common/zeroconf/client_zeroconf.py ===================================== --- a/gajim/common/zeroconf/client_zeroconf.py +++ b/gajim/common/zeroconf/client_zeroconf.py @@ -27,6 +27,7 @@ from gajim.common.zeroconf import zeroconf

from nbxmpp.protocol import * import socket +import platform import ssl import errno import sys @@ -73,8 +74,7 @@ class ZeroconfListener(IdleObject): self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1) if os.name == 'nt': - ver = os.sys.getwindowsversion() - if (ver[3], ver[0]) == (2, 6): # Win Vista + + if int(platform.win32_ver()[0]) >= 6: # Win Vista + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... self._serv.setsockopt(41, 27, 0)

View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/9dd747dfe52aa3967c437597c1018d4d5dd...