[commit-gajim] r11238 - trunk/src/common/zeroconf
asterix at gajim.org
asterix at gajim.org
Sat Apr 25 18:29:49 CEST 2009
Author: asterix
Date: 2009-04-25 18:29:49 +0200 (Sat, 25 Apr 2009)
New Revision: 11238
Modified:
trunk/src/common/zeroconf/client_zeroconf.py
Log:
don't overwrite stanza ID in zeroconf so that we reply with correct ID to requests. Thanks Mattj
Modified: trunk/src/common/zeroconf/client_zeroconf.py
===================================================================
--- trunk/src/common/zeroconf/client_zeroconf.py 2009-04-25 10:10:20 UTC (rev 11237)
+++ trunk/src/common/zeroconf/client_zeroconf.py 2009-04-25 16:29:49 UTC (rev 11238)
@@ -689,8 +689,9 @@
# look for hashed connections
if to in self.recipient_to_hash:
conn = self.connections[self.recipient_to_hash[to]]
- id_ = conn.Dispatcher.getAnID()
- stanza.setID(id_)
+ if not stanza.getID():
+ id_ = conn.Dispatcher.getAnID()
+ stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
on_ok(id_)
@@ -699,14 +700,16 @@
hash_ = self.ip_to_hash[item['address']]
if self.hash_to_port[hash_] == item['port']:
conn = self.connections[hash_]
- id_ = conn.Dispatcher.getAnID()
- stanza.setID(id_)
+ if not stanza.getID():
+ id_ = conn.Dispatcher.getAnID()
+ stanza.setID(id_)
if conn.add_stanza(stanza, is_message):
if on_ok:
on_ok(id_)
# otherwise open new connection
- stanza.setID('zero')
+ if not stanza.getID():
+ stanza.setID('zero')
P2PClient(None, item['address'], item['port'], self,
[(stanza, is_message)], to, on_ok=on_ok, on_not_ok=on_not_ok)
More information about the Commits
mailing list