merging #143 for next release

py25/bacpypes/bvllservice.py

@@ -102,6 +102,7 @@ class UDPMultiplexer:
             bind(self.direct, self.broadcastPort)
         else:
             self.broadcast = None
+            self.broadcastPort = None
 
         # create and bind the Annex H and J servers
         self.annexH = _MultiplexServer(self)

py25/bacpypes/udp.py

@@ -253,6 +253,8 @@ class UDPDirector(asyncore.dispatcher, Server, ServiceAccessPoint):
         if _debug: UDPDirector._debug("close_socket")
 
         self.socket.close()
+        self.close()
+        self.socket = None
 
     def handle_close(self):
         """Remove this from the monitor when it's closed."""

py27/bacpypes/bvllservice.py

@@ -103,6 +103,7 @@ class UDPMultiplexer:
             bind(self.direct, self.broadcastPort)
         else:
             self.broadcast = None
+            self.broadcastPort = None
 
         # create and bind the Annex H and J servers
         self.annexH = _MultiplexServer(self)

py27/bacpypes/udp.py

@@ -252,6 +252,8 @@ class UDPDirector(asyncore.dispatcher, Server, ServiceAccessPoint):
         if _debug: UDPDirector._debug("close_socket")
 
         self.socket.close()
+        self.close()
+        self.socket = None
 
     def handle_close(self):
         """Remove this from the monitor when it's closed."""

py34/bacpypes/bvllservice.py

@@ -103,6 +103,7 @@ class UDPMultiplexer:
             bind(self.direct, self.broadcastPort)
         else:
             self.broadcast = None
+            self.broadcastPort = None
 
         # create and bind the Annex H and J servers
         self.annexH = _MultiplexServer(self)

py34/bacpypes/udp.py

@@ -252,6 +252,8 @@ class UDPDirector(asyncore.dispatcher, Server, ServiceAccessPoint):
         if _debug: UDPDirector._debug("close_socket")
 
         self.socket.close()
+        self.close()
+        self.socket = None
 
     def handle_close(self):
         """Remove this from the monitor when it's closed."""