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

Fix zeroconf connection and prevent invalid stanzas from being sent.

Browse source
This commit is contained in:
Emmanuel Gil Peyrot 2016-04-02 15:29:26 +01:00
parent e80b0ba9b3
commit 1bf8a35b64
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/common/zeroconf/client_zeroconf.py
View file

@ -753,9 +753,12 @@ class ClientZeroconf:
def send(self, stanza, is_message=False, now=False, on_ok=None, def send(self, stanza, is_message=False, now=False, on_ok=None,
on_not_ok=None): on_not_ok=None):
stanza.setFrom(self.roster.zeroconf.name)
to = stanza.getTo() to = stanza.getTo()
if to is None:
# Can’t send undirected stanza over Zeroconf.
return -1
to = gajim.get_jid_without_resource(to) to = gajim.get_jid_without_resource(to)
stanza.setFrom(self.roster.zeroconf.name)
try: try:
item = self.roster[to] item = self.roster[to]

2
src/common/zeroconf/zeroconf_avahi.py
View file

@ -144,7 +144,7 @@ class Zeroconf:
val += c val += c
if val is None: # missing '=' if val is None: # missing '='
val = '' val = ''
txt_dict[key] = val.decode('utf-8', 'ignore') txt_dict[key] = val
return txt_dict return txt_dict
def service_resolved_callback(self, interface, protocol, name, stype, domain, def service_resolved_callback(self, interface, protocol, name, stype, domain,