From 33cc55db303418ef30619a2eb7e18fc35c5d5e1d Mon Sep 17 00:00:00 2001
From: Steve Karg <skarg@users.sourceforge.net>
Date: Mon, 13 Apr 2020 14:55:18 -0500
Subject: [PATCH] Fixed router app after BACnet IPv4 refactor

---
 .travis.yml            | 5 +++++
 apps/router/Makefile   | 4 ++--
 apps/router/ipmodule.c | 7 ++-----
 apps/router/ipmodule.h | 3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 61bdca95..1b7aba42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,7 @@ before_install:
   - sudo apt-get install -qq libnewlib-arm-none-eabi
   - sudo apt-get install -qq gcc-avr avr-libc binutils-avr
   - sudo apt-get install -qq mingw-w64
+  - sudo apt-get install -qq libconfig-dev
 
 compiler:
   - gcc
@@ -36,6 +37,10 @@ jobs:
       os: linux
       compiler: gcc
       script: make clean gateway
+    - stage: router
+      os: linux
+      compiler: gcc
+      script: make clean router
     - stage: mstp-build
       os: linux
       compiler: gcc
diff --git a/apps/router/Makefile b/apps/router/Makefile
index ea7c6b1a..3997364e 100644
--- a/apps/router/Makefile
+++ b/apps/router/Makefile
@@ -26,7 +26,7 @@ SRCS = main.c \
 	${BACNET_PORT_DIR}/mstimer-init.c \
 	${BACNET_PORT_DIR}/bip-init.c \
 	${BACNET_PORT_DIR}/dlmstp_linux.c \
-	${BACNET_SOURCE_DIR}/datalink/bip.c \
+	${BACNET_SOURCE_DIR}/basic/bbmd/h_bbmd.c \
 	${BACNET_SOURCE_DIR}/datalink/bvlc.c \
 	${BACNET_SOURCE_DIR}/basic/sys/fifo.c \
 	${BACNET_SOURCE_DIR}/datalink/mstp.c \
@@ -43,7 +43,7 @@ SRCS = main.c \
 	portthread.c \
 	msgqueue.c \
 	network_layer.c
-	
+
 CFLAGS = -I${SOURCE_DIR} -I${BACNET_PORT_DIR}
 
 OBJS = ${SRCS:.c=.o}
diff --git a/apps/router/ipmodule.c b/apps/router/ipmodule.c
index f885e2d7..9f4c7d04 100644
--- a/apps/router/ipmodule.c
+++ b/apps/router/ipmodule.c
@@ -39,9 +39,6 @@ uint8_t test_packet[] = { 0x81, 0x0a, 0x00, 0x16, /* BVLC header */
     0x55 }; /* APDU */
 #endif
 
-extern int get_local_address_ioctl(
-    char *ifname, struct in_addr *addr, int request);
-
 void *dl_ip_thread(void *pArgs)
 {
     MSGBOX_ID msgboxid;
@@ -147,12 +144,12 @@ bool dl_ip_init(ROUTER_PORT *port, IP_DATA *ip_data)
 
     /* get local address */
     status =
-        get_local_address_ioctl(port->iface, &ip_data->local_addr, SIOCGIFADDR);
+        bip_get_local_address_ioctl(port->iface, &ip_data->local_addr, SIOCGIFADDR);
     if (status < 0) {
         return false;
     }
     /* get broadcast address */
-    status = get_local_address_ioctl(
+    status = bip_get_local_address_ioctl(
         port->iface, &ip_data->broadcast_addr, SIOCGIFBRDADDR);
     if (status < 0) {
         return false;
diff --git a/apps/router/ipmodule.h b/apps/router/ipmodule.h
index 699d9a03..86ae02f6 100644
--- a/apps/router/ipmodule.h
+++ b/apps/router/ipmodule.h
@@ -31,12 +31,13 @@
 
 #include <stdint.h>
 #include <stdbool.h>
+#include "bacport.h"
 #include "portthread.h"
 #include "bacnet/datalink/bip.h"
 
 #define MAX_BIP_APDU	1476
 #define MAX_BIP_PDU		(MAX_NPDU + MAX_BIP_APDU)
-#define MAX_BIP_MPDU	(MAX_HEADER + MAX_BIP_PDU)
+#define MAX_BIP_MPDU	(BIP_HEADER_MAX + MAX_BIP_PDU)
 /* Yes, we know this is longer than an Ethernet Frame,
    a UDP payload and an IPv6 packet.
    Grandfathered in from BACnet Ethernet days,