dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Linux make fixes for router-bip6

Browse Source
This commit is contained in:
skarg
2019-03-17 22:09:55 +00:00
parent 2c7d5ea4aa
commit f028874041
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bacnet-stack/Makefile
+2 -2
View File
@@ -61,7 +61,7 @@ CFLAGS = $(WARNINGS) $(DEBUGGING) $(OPTIMIZATION) $(STANDARDS) $(INCLUDES) $(DE
# (see http://www.gnu.org/software/automake/manual/make/Special-Targets.html) # (see http://www.gnu.org/software/automake/manual/make/Special-Targets.html)
.EXPORT_ALL_VARIABLES: .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 .PHONY : all library demos router gateway router-ipv6 clean
library: library:
@@ -100,7 +100,7 @@ error:
router: library router: library
$(MAKE) -s -C demo router $(MAKE) -s -C demo router
router-ipv6: router-ipv6: library
$(MAKE) -B -s -C demo router-ipv6 $(MAKE) -B -s -C demo router-ipv6
# Add "ports" to the build, if desired # Add "ports" to the build, if desired
bacnet-stack/src/datalink.c
+15
View File
@@ -37,6 +37,7 @@
#if defined(BACDL_ALL) || defined FOR_DOXYGEN #if defined(BACDL_ALL) || defined FOR_DOXYGEN
#include "ethernet.h" #include "ethernet.h"
#include "bip.h" #include "bip.h"
#include "bip6.h"
#include "bvlc.h" #include "bvlc.h"
#include "arcnet.h" #include "arcnet.h"
#include "dlmstp.h" #include "dlmstp.h"
@@ -106,6 +107,20 @@ void datalink_set(
datalink_cleanup = bip_cleanup; datalink_cleanup = bip_cleanup;
datalink_get_broadcast_address = bip_get_broadcast_address; datalink_get_broadcast_address = bip_get_broadcast_address;
datalink_get_my_address = bip_get_my_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) { } else if (strcasecmp("ethernet", datalink_string) == 0) {
datalink_init = ethernet_init; datalink_init = ethernet_init;
datalink_send_pdu = ethernet_send_pdu; datalink_send_pdu = ethernet_send_pdu;