mirror of
https://github.com/JoelBender/bacpypes
synced 2025-10-27 00:57:47 +08:00
merge (#211)
This commit is contained in:
@@ -15,7 +15,7 @@ import argparse
|
||||
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
|
||||
from bacpypes.consolelogging import ArgumentParser
|
||||
|
||||
from bacpypes.core import run
|
||||
from bacpypes.core import run, deferred
|
||||
from bacpypes.comm import bind
|
||||
|
||||
from bacpypes.pdu import Address, LocalBroadcast
|
||||
@@ -219,6 +219,9 @@ def main():
|
||||
# bind the router stack to the vlan network through this node
|
||||
router.nsap.bind(router_node, vlan_network)
|
||||
|
||||
# send network topology
|
||||
deferred(router.nse.i_am_router_to_network)
|
||||
|
||||
# device identifier is assigned from the address
|
||||
device_instance = vlan_network * 100 + int(args.addr2)
|
||||
_log.debug(" - device_instance: %r", device_instance)
|
||||
|
||||
@@ -21,7 +21,7 @@ As a router, this does not have an application layer.
|
||||
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
|
||||
from bacpypes.consolelogging import ArgumentParser
|
||||
|
||||
from bacpypes.core import run
|
||||
from bacpypes.core import run, deferred
|
||||
from bacpypes.comm import bind
|
||||
|
||||
from bacpypes.pdu import Address
|
||||
@@ -115,6 +115,9 @@ def main():
|
||||
router = IP2IPRouter(Address(args.addr1), args.net1, Address(args.addr2), args.net2)
|
||||
if _debug: _log.debug(" - router: %r", router)
|
||||
|
||||
# send network topology
|
||||
deferred(router.nse.i_am_router_to_network)
|
||||
|
||||
_log.debug("running")
|
||||
|
||||
run()
|
||||
|
||||
@@ -15,7 +15,7 @@ import argparse
|
||||
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
|
||||
from bacpypes.consolelogging import ArgumentParser
|
||||
|
||||
from bacpypes.core import run
|
||||
from bacpypes.core import run, deferred
|
||||
from bacpypes.comm import bind
|
||||
|
||||
from bacpypes.pdu import Address, LocalBroadcast
|
||||
@@ -219,6 +219,9 @@ def main():
|
||||
# bind the router stack to the vlan network through this node
|
||||
router.nsap.bind(router_node, vlan_network)
|
||||
|
||||
# send network topology
|
||||
deferred(router.nse.i_am_router_to_network)
|
||||
|
||||
# make some devices
|
||||
for device_number in range(2, 2 + args.count):
|
||||
# device identifier is assigned from the address
|
||||
|
||||
@@ -19,7 +19,7 @@ The sample addresses are like running BR1 from Figure J-8, Clause J.7.5.
|
||||
from bacpypes.debugging import bacpypes_debugging, ModuleLogger
|
||||
from bacpypes.consolelogging import ArgumentParser
|
||||
|
||||
from bacpypes.core import run
|
||||
from bacpypes.core import run, deferred
|
||||
from bacpypes.comm import bind
|
||||
|
||||
from bacpypes.pdu import Address
|
||||
@@ -128,6 +128,9 @@ def main():
|
||||
router = NATRouter(args.addr1, args.port1, args.net1, args.addr2, args.port2, args.net2)
|
||||
if _debug: _log.debug(" - router: %r", router)
|
||||
|
||||
# send network topology
|
||||
deferred(router.nse.i_am_router_to_network)
|
||||
|
||||
_log.debug("running")
|
||||
|
||||
run()
|
||||
|
||||
Reference in New Issue
Block a user