Better ID uniqueness generation

Author: CyrilPeponnet

xmpp/dispatcher.py

@@ -1,4 +1,4 @@
-##   transports.py
+##   dispatcher.py
 ##
 ##   Copyright (C) 2003-2005 Alexey "Snake" Nezhdanov
 ##
@@ -21,12 +21,13 @@
 Dispatcher.SendAndWaitForResponce method will wait for reply stanza before giving up.
 """
 
-import simplexml,time,sys
+import simplexml,time,sys,random
 from protocol import *
 from client import PlugIn
 
 DefaultTimeout=25
 ID=0
+SALT=random.randint(1,100000)
 
 class Dispatcher(PlugIn):
     """ Ancestor of PlugIn class. Handles XMPP stream, i.e. aware of stream headers.
@@ -350,7 +351,7 @@ def send(self,stanza):
         elif not stanza.getID():
             global ID
             ID+=1
-            _ID=`ID`
+            _ID="%s_#%s#-%s" % (self._owner.User, SALT, `ID`)
             stanza.setID(_ID)
         else: _ID=stanza.getID()
         if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from',self._owner._registered_name)