From f028874041157304360187eab7b77aaec10a5821 Mon Sep 17 00:00:00 2001 From: skarg Date: Sun, 17 Mar 2019 22:09:55 +0000 Subject: [PATCH] Linux make fixes for router-bip6 --- bacnet-stack/Makefile | 4 ++-- bacnet-stack/src/datalink.c | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/bacnet-stack/Makefile b/bacnet-stack/Makefile index 72f425b9..ee3862f7 100644 --- a/bacnet-stack/Makefile +++ b/bacnet-stack/Makefile @@ -61,7 +61,7 @@ CFLAGS = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DE # (see http://www.gnu.org/software/automake/manual/make/Special-Targets.html) .EXPORT_ALL_VARIABLES: -all: library demos gateway router-ipv6 ${DEMO_LINUX} +all: library demos router-ipv6 ${DEMO_LINUX} .PHONY : all library demos router gateway router-ipv6 clean library: @@ -100,7 +100,7 @@ error: router: library $(MAKE) -s -C demo router -router-ipv6: +router-ipv6: library $(MAKE) -B -s -C demo router-ipv6 # Add "ports" to the build, if desired diff --git a/bacnet-stack/src/datalink.c b/bacnet-stack/src/datalink.c index 0f6b889b..459034ea 100644 --- a/bacnet-stack/src/datalink.c +++ b/bacnet-stack/src/datalink.c @@ -37,6 +37,7 @@ #if defined(BACDL_ALL) || defined FOR_DOXYGEN #include "ethernet.h" #include "bip.h" +#include "bip6.h" #include "bvlc.h" #include "arcnet.h" #include "dlmstp.h" @@ -106,6 +107,20 @@ void datalink_set( datalink_cleanup = bip_cleanup; datalink_get_broadcast_address = bip_get_broadcast_address; datalink_get_my_address = bip_get_my_address; + } else if (strcasecmp("bip6", datalink_string) == 0) { + datalink_init = bip6_init; + datalink_send_pdu = bip6_send_pdu; + datalink_receive = bip6_receive; + datalink_cleanup = bip6_cleanup; + datalink_get_broadcast_address = bip6_get_broadcast_address; + datalink_get_my_address = bip6_get_my_address; + } else if (strcasecmp("bvlc6", datalink_string) == 0) { + datalink_init = bip6_init; + datalink_send_pdu = bvlc6_send_pdu; + datalink_receive = bvlc6_receive; + datalink_cleanup = bip6_cleanup; + datalink_get_broadcast_address = bip6_get_broadcast_address; + datalink_get_my_address = bip6_get_my_address; } else if (strcasecmp("ethernet", datalink_string) == 0) { datalink_init = ethernet_init; datalink_send_pdu = ethernet_send_pdu;