Merge branch 'master' into fixDnsIssue

Author: bakwc

pysyncobj/tcp_connection.py

@@ -110,8 +110,10 @@ def fileno(self):
         return self.__fileno
 
     def disconnect(self):
+        print("Disconnect request")
+        needCallDisconnect = False
         if self.__onDisconnected is not None and self.__state != CONNECTION_STATE.DISCONNECTED:
-            self.__onDisconnected()
+            needCallDisconnect = True
         self.sendRandKey = None
         self.recvRandKey = None
         if self.__socket is not None:
@@ -123,6 +125,8 @@ def disconnect(self):
         self.__writeBuffer = bytes()
         self.__readBuffer = bytes()
         self.__state = CONNECTION_STATE.DISCONNECTED
+        if needCallDisconnect:
+            self.__onDisconnected()
 
     def getSendBufferSize(self):
         return len(self.__writeBuffer)

pysyncobj/transport.py

@@ -265,7 +265,10 @@ def _createServer(self):
             host, port = bindAddr.rsplit(':', 1)
         elif seflAddr is not None:
             host, port = seflAddr.rsplit(':', 1)
-            host = '0.0.0.0'
+            if ':' in host:
+                host = '::'
+            else:
+                host = '0.0.0.0'
         else:
             raise RuntimeError('Unable to determine bind address')
 

test_syncobj.py

@@ -638,6 +638,8 @@ def test_encryptionCorrectPassword():
     for conn in list(o1._SyncObj__transport._connections.values()) + list(o2._SyncObj__transport._connections.values()):
         conn.disconnect()
 
+    doTicks(objs, 10)
+
     o1.addValue(100)
 
     doTicks(objs, 10, stopFunc=lambda: o1.getCounter() == 450 and o2.getCounter() == 450)