copyleftie/gajim-plural
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

use netifaces to get local IPs if available. Fixes #8666

Browse source
This commit is contained in:
Yann Leboulanger 2017-08-14 18:37:11 +02:00
parent d994845212
commit 9ce6299e1a
1 changed files with 44 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
gajim/common/jingle_transport.py
View file

@ -181,7 +181,7 @@ class JingleTransportSocks5(JingleTransport):
def _add_local_ips_as_candidates(self): def _add_local_ips_as_candidates(self):
if not gajim.config.get_per('accounts', self.connection.name, if not gajim.config.get_per('accounts', self.connection.name,
'ft_send_local_ips'): 'ft_send_local_ips'):
return return
if not self.connection: if not self.connection:
return return
@ -224,6 +224,49 @@ class JingleTransportSocks5(JingleTransport):
except socket.gaierror: except socket.gaierror:
pass # ignore address-related errors for getaddrinfo pass # ignore address-related errors for getaddrinfo
try:
from netifaces import interfaces, ifaddresses, AF_INET, AF_INET6
for ifaceName in interfaces():
addresses = ifaddresses(ifaceName)
if AF_INET in addresses:
for address in addresses[AF_INET]:
addr = address['addr']
if addr in hosts or addr.startswith('127.'):
continue
candidate = {
'host': addr,
'candidate_id': self.connection.connection.getAnID(),
'port': port,
'type': 'direct',
'jid': self.ourjid,
'priority': priority,
'initiator': self.file_props.sender,
'target': self.file_props.receiver
}
hosts.add(addr)
local_ip_cand.append(candidate)
if AF_INET6 in addresses:
for address in addresses[AF_INET6]:
addr = address['addr']
if addr in hosts or addr.startswith('::1') or \
addr.count(':') != 7:
continue
candidate = {
'host': addr,
'candidate_id': self.connection.connection.getAnID(),
'port': port,
'type': 'direct',
'jid': self.ourjid,
'priority': priority,
'initiator': self.file_props.sender,
'target': self.file_props.receiver
}
hosts.add(addr)
local_ip_cand.append(candidate)
except ImportError:
pass
self._add_candidates(local_ip_cand) self._add_candidates(local_ip_cand)
def _add_additional_candidates(self): def _add_additional_candidates(self):