don't try to add an id to all outgoing messages. It's useless. Fixes #5355

This commit is contained in:
Yann Leboulanger 2009-10-28 13:54:58 +01:00
parent 6f71efdc47
commit 7ae146e0e8
1 changed files with 3 additions and 7 deletions

View File

@ -563,7 +563,7 @@ class P2PConnection(IdleObject, PlugIn):
def _on_send_failure(self): def _on_send_failure(self):
log.error('Socket error while sending data') log.error('Socket error while sending data')
self._owner.disconnected() self._owner.on_disconnect()
self.sent_data = None self.sent_data = None
class ClientZeroconf: class ClientZeroconf:
@ -698,9 +698,7 @@ class ClientZeroconf:
# look for hashed connections # look for hashed connections
if to in self.recipient_to_hash: if to in self.recipient_to_hash:
conn = self.connections[self.recipient_to_hash[to]] conn = self.connections[self.recipient_to_hash[to]]
if not stanza.getID(): id_ = stanza.getID() or ''
id_ = conn.Dispatcher.getAnID()
stanza.setID(id_)
if conn.add_stanza(stanza, is_message): if conn.add_stanza(stanza, is_message):
if on_ok: if on_ok:
on_ok(id_) on_ok(id_)
@ -710,9 +708,7 @@ class ClientZeroconf:
hash_ = self.ip_to_hash[item['address']] hash_ = self.ip_to_hash[item['address']]
if self.hash_to_port[hash_] == item['port']: if self.hash_to_port[hash_] == item['port']:
conn = self.connections[hash_] conn = self.connections[hash_]
if not stanza.getID(): id_ = stanza.getID() or ''
id_ = conn.Dispatcher.getAnID()
stanza.setID(id_)
if conn.add_stanza(stanza, is_message): if conn.add_stanza(stanza, is_message):
if on_ok: if on_ok:
on_ok(id_) on_ok(id_)