changeset fb414656cbf0 in /home/hg/repos/gajim
branches: gtk3 details:http://hg.gajim.org/gajim?cmd=changeset;node=fb414656cbf0 description: fix IPv6 issues under window 7 for file transfer. Fixes #4452, #7240
diffstat:
src/common/proxy65_manager.py | 1 + src/common/socks5.py | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
diffs (27 lines):
diff -r b1285ff63abd -r fb414656cbf0 src/common/proxy65_manager.py --- a/src/common/proxy65_manager.py Fri Jul 05 17:02:07 2013 +0200 +++ b/src/common/proxy65_manager.py Fri Jul 05 21:10:16 2013 +0200 @@ -166,6 +166,7 @@ self.state = S_FINISHED
def _on_connect_failure(self): + print 'connection failed: ' + self.host self.state = S_FINISHED self.host = None self.port = 0 diff -r b1285ff63abd -r fb414656cbf0 src/common/socks5.py --- a/src/common/socks5.py Fri Jul 05 17:02:07 2013 +0200 +++ b/src/common/socks5.py Fri Jul 05 21:10:16 2013 +0200 @@ -1373,9 +1373,10 @@ # Doesn't work under windows XP if os.name == 'nt': ver = os.sys.getwindowsversion() - if (ver[3], ver[0], ver[1]) == (2, 6, 0): + if (ver[3], ver[0]) == (2, 6): # Win Vista + + # 47 is socket.IPPROTO_IPV6 # 27 is socket.IPV6_V6ONLY under windows, but not defined ... - self._serv.setsockopt(socket.IPPROTO_IPV6, 27, 1) + self._serv.setsockopt(41, 27, 0) # will fail when port as busy, or we don't have rights to bind try: self._serv.bind(ai[4])