Routing functionality complete, and working. (Have not done extensive testing, though.)

For building, made it possible to include or exclude the routing functionality with simple changes in the main Makefile and enables in lib/Makefile and include/config.h
The Device object (device.c and .h) was extended to support the virtually routed Devices, with most of the new functions in new file gw_device.c to replace their simpler cousins in device.c.
This commit is contained in:
tbrennan3
2010-10-13 15:59:39 +00:00
parent f934f8add8
commit 48411b8dbf
12 changed files with 754 additions and 46 deletions
+20 -11
View File
@@ -1,6 +1,9 @@
# Main Makefile for BACnet-stack project
# Including "routing" in this list to add routing functionality
all: library readprop writeprop readfile writefile reinit server dcc \
whohas whois ucov timesync epics readpropm mstpcap \
whoisrouter iamrouter initrouter gateway
routing
@echo "utilities are in the bin directory"
clean: lib/Makefile\
@@ -87,17 +90,9 @@ whois: demo/whois/Makefile
mstpcap: demo/mstpcap/Makefile
( cd demo/mstpcap ; make clean all; cp mstpcap ../../bin )
whoisrouter: demo/whoisrouter/Makefile
( cd demo/whoisrouter ; make ; cp bacwir ../../bin )
iamrouter: demo/iamrouter/Makefile
( cd demo/iamrouter ; make ; cp baciamr ../../bin )
initrouter: demo/initrouter/Makefile
( cd demo/initrouter ; make ; cp bacinitr ../../bin )
# Add "ports" to the build, if desired
ports: atmega168 bdk-atxx4-mstp at91sam7s
echo "Built the ports"
@echo "Built the ports"
atmega168: ports/atmega168/Makefile
make -C ports/atmega168 clean all
@@ -108,6 +103,20 @@ at91sam7s: ports/at91sam7s/makefile
bdk-atxx4-mstp: ports/bdk-atxx4-mstp/Makefile
make -C ports/bdk-atxx4-mstp clean all
# Build these demo projects if you want to test routing capability
# Also enable BACROUTE_ENABLE in lib/Makefile and BAC_ROUTING in config.h
routing: whoisrouter iamrouter initrouter gateway
@echo "Built routing demos"
whoisrouter: demo/whoisrouter/Makefile
( cd demo/whoisrouter ; make ; cp bacwir ../../bin )
iamrouter: demo/iamrouter/Makefile
( cd demo/iamrouter ; make ; cp baciamr ../../bin )
initrouter: demo/initrouter/Makefile
( cd demo/initrouter ; make ; cp bacinitr ../../bin )
gateway: demo/gateway/Makefile
( cd demo/gateway ; make ; cp bacgateway ../../bin )