Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
9dd747df
by Philipp Hörist at 2018-09-05T00:14:51Z
2 changed files:
Changes:
| ... | ... | @@ -27,6 +27,7 @@ import struct |
| 27 | 27 |
import hashlib
|
| 28 | 28 |
import os
|
| 29 | 29 |
import time
|
| 30 |
+import platform
|
|
| 30 | 31 |
from errno import EWOULDBLOCK
|
| 31 | 32 |
from errno import ENOBUFS
|
| 32 | 33 |
from errno import EINTR
|
| ... | ... | @@ -1424,8 +1425,7 @@ class Socks5Listener(IdleObject): |
| 1424 | 1425 |
# Under windows Vista, we need that to listen on ipv6 AND ipv4
|
| 1425 | 1426 |
# Doesn't work under windows XP
|
| 1426 | 1427 |
if os.name == 'nt':
|
| 1427 |
- ver = os.sys.getwindowsversion()
|
|
| 1428 |
- if (ver[3], ver[0]) == (2, 6): # Win Vista +
|
|
| 1428 |
+ if int(platform.win32_ver()[0]) >= 6: # Win Vista +
|
|
| 1429 | 1429 |
# 47 is socket.IPPROTO_IPV6
|
| 1430 | 1430 |
# 27 is socket.IPV6_V6ONLY under windows, but not defined ...
|
| 1431 | 1431 |
self._serv.setsockopt(41, 27, 0)
|
| ... | ... | @@ -27,6 +27,7 @@ from gajim.common.zeroconf import zeroconf |
| 27 | 27 |
|
| 28 | 28 |
from nbxmpp.protocol import *
|
| 29 | 29 |
import socket
|
| 30 |
+import platform
|
|
| 30 | 31 |
import ssl
|
| 31 | 32 |
import errno
|
| 32 | 33 |
import sys
|
| ... | ... | @@ -73,8 +74,7 @@ class ZeroconfListener(IdleObject): |
| 73 | 74 |
self._serv.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1)
|
| 74 | 75 |
self._serv.setsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)
|
| 75 | 76 |
if os.name == 'nt':
|
| 76 |
- ver = os.sys.getwindowsversion()
|
|
| 77 |
- if (ver[3], ver[0]) == (2, 6): # Win Vista +
|
|
| 77 |
+ if int(platform.win32_ver()[0]) >= 6: # Win Vista +
|
|
| 78 | 78 |
# 47 is socket.IPPROTO_IPV6
|
| 79 | 79 |
# 27 is socket.IPV6_V6ONLY under windows, but not defined ...
|
| 80 | 80 |
self._serv.setsockopt(41, 27, 0)
|