From b9c363e9cdf578b8421d2e2a4a12dee8701ff271 Mon Sep 17 00:00:00 2001 From: Yann Leboulanger Date: Mon, 14 Aug 2017 16:43:44 +0200 Subject: [PATCH] use netifaces to get local IPs if available. Fixes #8666 --- README | 1 + gajim/common/socks5.py | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/README b/README index ad18b3503..84da519b3 100644 --- a/README +++ b/README @@ -38,6 +38,7 @@
  • gir1.2-gupnpigd-1.0 for better NAT traversing
  • gir1.2-networkmanager-1.0 for network lose detection
  • python3-idna and python3-precis-i18n for correctly parsing JIDs
    • +
  • python3-netifaces to get local IPs to send files

    • Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.

    diff --git a/gajim/common/socks5.py b/gajim/common/socks5.py index afd27c106..0750e0866 100644 --- a/gajim/common/socks5.py +++ b/gajim/common/socks5.py @@ -205,6 +205,8 @@ class SocksQueue: connection failure cb. If there are some which are still not connected try to establish connection to one of them """ + print(client) + print(streamhost) self.idlequeue.remove_timeout(client.fd) self.idlequeue.unplug_idle(client.fd) file_props = client.file_props @@ -223,7 +225,7 @@ class SocksQueue: host['state'] = 0 # FIXME: make the sender reconnect also client = Socks5ReceiverClient(self.idlequeue, host, - host['sid'], file_props) + client.sid, file_props) self.add_sockobj(client.account, client) host['idx'] = client.queue_idx # we still have chances to connect @@ -1031,6 +1033,7 @@ class Socks5Receiver(IdleObject): self.connect_timeout = 0 self.connected = False self.pauses = 0 + self.sid = sid self.file_props = file_props self.file_props.disconnect_cb = self.disconnect self.file_props.error = 0