Revert "broadcast shares in serial", strongly suspected of causing a memory leak

[p2pool.git] / p2pool / util / p2protocol.py

diff --git a/p2pool/util/p2protocol.py b/p2pool/util/p2protocol.py
index e3f83a2..28ace01 100644 (file)
--- a/p2pool/util/p2protocol.py
+++ b/p2pool/util/p2protocol.py
@@ -19,21 +19,8 @@ class Protocol(protocol.Protocol):
         self._message_prefix = message_prefix
         self._max_payload_length = max_payload_length
         self.dataReceived2 = datachunker.DataChunker(self.dataReceiver())
-        self.paused_var = variable.Variable(False)
         self.traffic_happened = traffic_happened
     
-    def connectionMade(self):
-        self.transport.registerProducer(self, True)
-    
-    def pauseProducing(self):
-        self.paused_var.set(True)
-    
-    def resumeProducing(self):
-        self.paused_var.set(False)
-    
-    def stopProducing(self):
-        pass
-    
     def dataReceived(self, data):
         self.traffic_happened.happened('p2p/in', len(data))
         self.dataReceived2(data)
@@ -54,6 +41,7 @@ class Protocol(protocol.Protocol):
             
             if hashlib.sha256(hashlib.sha256(payload).digest()).digest()[:4] != checksum:
                 print 'invalid hash for', self.transport.getPeer().host, repr(command), length, checksum.encode('hex'), hashlib.sha256(hashlib.sha256(payload).digest()).digest()[:4].encode('hex'), payload.encode('hex')
+                self.badPeerHappened()
                 continue
             
             type_ = getattr(self, 'message_' + command, None)
@@ -95,7 +83,6 @@ class Protocol(protocol.Protocol):
         data = self._message_prefix + struct.pack('<12sI', command, len(payload)) + hashlib.sha256(hashlib.sha256(payload).digest()).digest()[:4] + payload
         self.traffic_happened.happened('p2p/out', len(data))
         self.transport.write(data)
-        return self.paused_var.get_when_satisfies(lambda paused: not paused)
     
     def __getattr__(self, attr):
         prefix = 'send_'