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

link-local: adjust Windows/Bonjour support to new data format. Fixes #8025

This commit is contained in:
Fabian Pietsch 2015-04-06 19:14:33 +02:00
parent 81154aea3e
commit a5ec0f4f2a
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/zeroconf/zeroconf_bonjour.py
View File

@ -133,7 +133,8 @@ class Zeroconf:
# we don't want to see ourselves in the list # we don't want to see ourselves in the list
if name != self.name: if name != self.name:
self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) resolved_info = [(interfaceIndex, protocol, hosttarget, -1, port)]
self.contacts[name] = (name, domain, resolved_info, bare_name, txtRecord)
self.new_serviceCB(name) self.new_serviceCB(name)
else: else:
@ -141,7 +142,7 @@ class Zeroconf:
# In case this is not our own record but of another # In case this is not our own record but of another
# gajim instance on the same machine, # gajim instance on the same machine,
# it will be used when we get a new name. # it will be used when we get a new name.
self.invalid_self_contact[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) self.invalid_self_contact[name] = (name, domain, (interfaceIndex, protocol, hosttarget, -1, port), bare_name, txtRecord)
# count services # count services
self.resolved.append(True) self.resolved.append(True)
@ -168,7 +169,9 @@ class Zeroconf:
# we don't want to see ourselves in the list # we don't want to see ourselves in the list
if name != self.name: if name != self.name:
self.contacts[name] = (name, domain, interfaceIndex, protocol, hosttarget, hosttarget, port, bare_name, txtRecord) # update TXT data only, as intended according to resolve_all comment
old_contact = self.contacts[name]
self.contacts[name] = old_contact[0:C_TXT] + (txt,) + old_contact[C_TXT+1:]
def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain): def service_added_callback(self, sdRef, flags, errorCode, name, regtype, domain):