From: Forrest Voight <forrest@forre.st>
Date: Sat, 2 Feb 2013 17:06:53 +0000 (-0800)
Subject: Merge pull request #81 from varatada/master
X-Git-Tag: 11.2^0
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=refs%2Ftags%2F11.2;hp=19bf4eac02eb3e12ca168ebc87f61f561e848d90;p=p2pool.git

Merge pull request #81 from varatada/master

Abort timed out connections with abortConnection()
---

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index 979b51e..f643b0c 100644
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -80,7 +80,12 @@ class Protocol(p2protocol.Protocol):
     def _connect_timeout(self):
         self.timeout_delayed = None
         print 'Handshake timed out, disconnecting from %s:%i' % self.addr
-        self.transport.loseConnection()
+        if self.transport.abortConnection is not None:
+            # Available since Twisted 11.1
+            self.transport.abortConnection()
+        else:
+            # This doesn't always close timed out connections!
+            self.transport.loseConnection()
     
     def packetReceived(self, command, payload2):
         try:
@@ -101,7 +106,12 @@ class Protocol(p2protocol.Protocol):
     def _timeout(self):
         self.timeout_delayed = None
         print 'Connection timed out, disconnecting from %s:%i' % self.addr
-        self.transport.loseConnection()
+        if self.transport.abortConnection is not None:
+            # Available since Twisted 11.1
+            self.transport.abortConnection()
+        else:
+            # This doesn't always close timed out connections!
+            self.transport.loseConnection()
     
     message_version = pack.ComposedType([
         ('version', pack.IntType(32)),