mirror/bacpypes
1
0
Fork 0
mirror of https://github.com/JoelBender/bacpypes synced 2025-10-05 22:18:16 +08:00
Code Issues Releases Wiki Activity

give names to vlan nodes, makes it a little each to see which one is getting an indication

Browse Source
This commit is contained in:
Joel Bender 2017-05-25 00:25:23 -04:00
parent 252a669dd5
commit 26792bb941
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
py27/bacpypes/vlan.py
View File

@ -25,9 +25,10 @@ _log = ModuleLogger(globals())
@bacpypes_debugging
class Network:
def __init__(self, dropPercent=0.0):
if _debug: Network._debug("__init__ dropPercent=%r", dropPercent)
def __init__(self, name='', dropPercent=0.0):
if _debug: Network._debug("__init__ name=%r dropPercent=%r", name, dropPercent)
self.name = name
self.nodes = []
self.dropPercent = dropPercent
@ -38,6 +39,10 @@ class Network:
self.nodes.append(node)
node.lan = self
# update the node name
if not node.name:
node.name = '[%s:%s]' % (self.name, node.address)
def remove_node(self, node):
""" Remove a node from this network. """
if _debug: Network._debug("remove_node %r", node)
@ -60,14 +65,14 @@ class Network:
raise RuntimeError("invalid destination address: %r" % (pdu.pduDestination,))
elif pdu.pduDestination.addrType == Address.localBroadcastAddr:
for n in self.nodes:
if (pdu.pduSource != n.address):
n.response(deepcopy(pdu))
for node in self.nodes:
if (pdu.pduSource != node.address):
node.response(deepcopy(pdu))
elif pdu.pduDestination.addrType == Address.localStationAddr:
for n in self.nodes:
if n.promiscuous or (pdu.pduDestination == n.address):
n.response(deepcopy(pdu))
for node in self.nodes:
if node.promiscuous or (pdu.pduDestination == node.address):
node.response(deepcopy(pdu))
else:
raise RuntimeError("invalid destination address type: %r" % (pdu.pduDestination,))
@ -94,6 +99,10 @@ class Node(Server):
if not isinstance(addr, Address):
raise TypeError("addr must be an address")
# start out with no name
self.name = ''
# unbound
self.lan = None
self.address = addr
@ -113,7 +122,7 @@ class Node(Server):
def indication(self, pdu):
"""Send a message."""
if _debug: Node._debug("indication %r", pdu)
if _debug: Node._debug("%sindication %r", self.name, pdu)
# make sure we're connected
if not self.lan: