Main database finished for now, including unittests.

[quix0rs-apt-p2p.git] / apt_dht_Khashmir / krpc.py

diff --git a/apt_dht_Khashmir/krpc.py b/apt_dht_Khashmir/krpc.py
index 40ab8d84145e3e7e5650f67abbb7edd95b785861..441079c7c13c4a8020b98cdaaafeb51469362ca3 100644 (file)
--- a/apt_dht_Khashmir/krpc.py
+++ b/apt_dht_Khashmir/krpc.py
@@ -10,6 +10,8 @@ from twisted.internet.defer import Deferred
 from twisted.internet import protocol, reactor
 from twisted.trial import unittest
 
+from khash import newID
+
 KRPC_TIMEOUT = 20
 
 KRPC_ERROR = 1
@@ -71,7 +73,6 @@ class KRPC:
         self.addr = addr
         self.noisy = spew
         self.tids = {}
-        self.mtid = 0
         self.stopped = False
 
     def datagramReceived(self, str, addr):
@@ -157,8 +158,7 @@ class KRPC:
             raise ProtocolError, "connection has been stopped"
         # make message
         # send it
-        msg = {TID : chr(self.mtid), TYP : REQ,  REQ : method, ARG : args}
-        self.mtid = (self.mtid + 1) % 256
+        msg = {TID : newID(), TYP : REQ,  REQ : method, ARG : args}
         if self.noisy:
             print self.factory.port, "sending to", self.addr, ":", msg
         str = bencode(msg)