Added example Network Port object

bacnet-stack/Makefile

@@ -17,6 +17,7 @@ MY_BACNET_DEFINES += -DBACFILE
 MY_BACNET_DEFINES += -DINTRINSIC_REPORTING
 MY_BACNET_DEFINES += -DBACNET_TIME_MASTER
 MY_BACNET_DEFINES += -DBACNET_PROPERTY_LISTS=1
+MY_BACNET_DEFINES += -DBACNET_PROTOCOL_REVISION=17
 BACNET_DEFINES ?= $(MY_BACNET_DEFINES)
 
 # un-comment the next line to build in uci integration
@@ -73,7 +74,7 @@ gateway:
 	$(MAKE) -B -s -C demo gateway
 
 server:
-	$(MAKE) -B -C demo server
+	$(MAKE) -j -B -C demo server
 
 mstpcap:
 	$(MAKE) -B -C demo mstpcap

bacnet-stack/demo/abort/Makefile

@@ -9,6 +9,7 @@ TARGET = bacabort
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/dcc/Makefile

@@ -9,6 +9,7 @@ TARGET = bacdcc
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/epics/Makefile

@@ -9,6 +9,7 @@ TARGET = bacepics
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/error/Makefile

@@ -9,6 +9,7 @@ TARGET = bacerror
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/gateway/Makefile

@@ -33,6 +33,7 @@ SRCS = main.c \
 	$(BACNET_OBJECT)/mso.c \
 	$(BACNET_OBJECT)/msv.c \
 	$(BACNET_OBJECT)/nc.c  \
+	$(BACNET_OBJECT)/netport.c \
 	$(BACNET_OBJECT)/osv.c \
 	$(BACNET_OBJECT)/piv.c \
 	$(BACNET_OBJECT)/schedule.c \

bacnet-stack/demo/getevent/Makefile

@@ -15,6 +15,7 @@ TARGET = bacge
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/handler/dlenv.c

@@ -35,6 +35,9 @@
 #include "handlers.h"
 #include "dlenv.h"
 #include "tsm.h"
+#if (BACNET_PROTOCOL_REVISION >= 17)
+#include "netport.h"
+#endif
 
 /** @file dlenv.c  Initialize the DataLink configuration. */
 
@@ -164,6 +167,9 @@ int dlenv_register_as_foreign_device(
             pEnv = getenv(bbmd_env);
             if (pEnv) {
                 bbmd_address = bip_getaddrbyname(pEnv);
+            } else if (entry_number == 1) {
+                /* BDT 1 is self (note: can be overridden) */
+                bbmd_address = bip_get_addr();
             }
             if (bbmd_address) {
                 bbmd_port = 0xBAC0;
@@ -174,6 +180,9 @@ int dlenv_register_as_foreign_device(
                     if (bbmd_port > 0xFFFF) {
                         bbmd_port = 0xBAC0;
                     }
+                } else if (entry_number == 1) {
+                    /* BDT 1 is self (note: can be overridden) */
+                    bbmd_port = bip_get_port();
                 }
                 bbmd_mask = 0xFFFFFFFF;
                 sprintf(bbmd_env,"BACNET_BDT_MASK_%u", entry_number);
@@ -200,6 +209,81 @@ int dlenv_register_as_foreign_device(
     return retval;
 }
 
+#if (BACNET_PROTOCOL_REVISION >= 17)
+#if defined(BACDL_BIP)
+/**
+ * Datalink network port object settings
+ */
+static void dlenv_network_port_init(void)
+{
+    uint32_t instance = 0;
+    uint32_t address = 0;
+    uint32_t broadcast = 0;
+    uint32_t test_broadcast = 0;
+    uint32_t mask = 0;
+    uint16_t port = 0;
+    uint8_t mac[4+2] = {0};
+    uint8_t prefix = 0;
+
+    instance = Network_Port_Index_To_Instance(0);
+    Network_Port_Name_Set(instance, "BACnet/IP Port");
+    Network_Port_Type_Set(instance, PORT_TYPE_BIP);
+    port = bip_get_port();
+    Network_Port_BIP_Port_Set(instance, port);
+    address = bip_get_addr();
+    memcpy(&mac[0], &address, 4);
+    memcpy(&mac[4], &port, 2);
+    Network_Port_MAC_Address_Set(instance, &mac[0], 6);
+    broadcast = bip_get_broadcast_addr();
+    for (prefix = 0; prefix < 32; prefix++) {
+        mask = htonl((0xFFFFFFFF << (32 - prefix)) & 0xFFFFFFFF);
+        test_broadcast = (address & mask) | (~mask);
+        if (test_broadcast == broadcast) {
+            break;
+        }
+    }
+    Network_Port_IP_Subnet_Prefix_Set(instance, prefix);
+}
+#elif defined(BACDL_MSTP)
+/**
+ * Datalink network port object settings
+ */
+static void dlenv_network_port_init(void)
+{
+    uint32_t instance = 0;
+    uint8_t mac[1] = {0};
+
+    instance = Network_Port_Index_To_Instance(0);
+    Network_Port_Name_Set(instance, "MS/TP Port");
+    Network_Port_MSTP_Max_Master_Set(instance, dlmstp_max_master());
+    Network_Port_MSTP_Max_Info_Frames_Set(instance, dlmstp_max_info_frames());
+    Network_Port_Link_Speed_Set(instance, dlmstp_baud_rate());
+    mac[0] = dlmstp_mac_address();
+    Network_Port_MAC_Address_Set(instance, &mac[0], 1);
+}
+#elif defined(BACDL_BIP6)
+/**
+ * Datalink network port object settings
+ */
+static void dlenv_network_port_init(void)
+{
+    uint32_t instance = 0;
+    const char *bip_port_name = ;
+
+    instance = Network_Port_Index_To_Instance(0);
+    Network_Port_Name_Set(instance, "BACnet/IPv6 Port");
+
+}
+#endif
+#else
+/**
+ * Datalink network port object settings
+ */
+static void dlenv_network_port_init(void)
+{
+    /* do nothing */
+}
+#endif
 
 /** Datalink maintenance timer
  * @ingroup DataLink
@@ -385,5 +469,6 @@ void dlenv_init(
         tsm_invokeID_set((uint8_t) strtol(pEnv, NULL, 0));
     }
 #endif
+    dlenv_network_port_init();
     dlenv_register_as_foreign_device();
 }

bacnet-stack/demo/iam/Makefile

@@ -9,6 +9,7 @@ TARGET = baciam
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/iamrouter/Makefile

@@ -9,6 +9,7 @@ TARGET = baciamr
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/initrouter/Makefile

@@ -9,6 +9,7 @@ TARGET = bacinitr
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/object/device-client.c

@@ -47,6 +47,9 @@
 #include "handlers.h"
 #include "datalink.h"
 #include "address.h"
+#if (BACNET_PROTOCOL_REVISION >= 17)
+#include "netport.h"
+#endif
 /* include the device object */
 #include "device.h"     /* me */
 
@@ -133,6 +136,23 @@ static object_functions_t Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#if (BACNET_PROTOCOL_REVISION >= 17)
+    {OBJECT_NETWORK_PORT,
+            Network_Port_Init,
+            Network_Port_Count,
+            Network_Port_Index_To_Instance,
+            Network_Port_Valid_Instance,
+            Network_Port_Object_Name,
+            Network_Port_Read_Property,
+            Network_Port_Write_Property,
+            Network_Port_Property_Lists,
+            NULL /* ReadRangeInfo */ ,
+            NULL /* Iterator */ ,
+            NULL /* Value_Lists */ ,
+            NULL /* COV */ ,
+            NULL /* COV Clear */ ,
+        NULL /* Intrinsic Reporting */ },
+#endif
     {MAX_BACNET_OBJECT_TYPE,
             NULL /* Init */ ,
             NULL /* Count */ ,

bacnet-stack/demo/object/device.c

@@ -63,6 +63,9 @@
 #include "ms-input.h"
 #include "mso.h"
 #include "msv.h"
+#if (BACNET_PROTOCOL_REVISION >= 17)
+#include "netport.h"
+#endif
 #include "osv.h"
 #include "piv.h"
 #include "schedule.h"
@@ -113,6 +116,23 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#if (BACNET_PROTOCOL_REVISION >= 17)
+    {OBJECT_NETWORK_PORT,
+            Network_Port_Init,
+            Network_Port_Count,
+            Network_Port_Index_To_Instance,
+            Network_Port_Valid_Instance,
+            Network_Port_Object_Name,
+            Network_Port_Read_Property,
+            Network_Port_Write_Property,
+            Network_Port_Property_Lists,
+            NULL /* ReadRangeInfo */ ,
+            NULL /* Iterator */ ,
+            NULL /* Value_Lists */ ,
+            NULL /* COV */ ,
+            NULL /* COV Clear */ ,
+        NULL /* Intrinsic Reporting */ },
+#endif
     {OBJECT_ANALOG_INPUT,
             Analog_Input_Init,
             Analog_Input_Count,

bacnet-stack/demo/object/netport.h

@@ -0,0 +1,245 @@
+/**
+ * @file
+ * @author Steve Karg
+ * @date 2016
+ * @brief Network port objects, customize for your use
+ *
+ * @section DESCRIPTION
+ *
+ * The Network Port object provides access to the configuration
+ * and properties of network ports of a device.
+ *
+ * @section LICENSE
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef NETPORT_H
+#define NETPORT_H
+
+#include <stdbool.h>
+#include <stdint.h>
+#include "bacdef.h"
+#include "bacenum.h"
+#include "apdu.h"
+#include "rp.h"
+#include "wp.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+    void Network_Port_Property_Lists(
+        const int **pRequired,
+        const int **pOptional,
+        const int **pProprietary);
+
+    bool Network_Port_Object_Name(
+        uint32_t object_instance,
+        BACNET_CHARACTER_STRING * object_name);
+    bool Network_Port_Name_Set(
+        uint32_t object_instance,
+        char *new_name);
+
+    char *Network_Port_Description(
+        uint32_t instance);
+    bool Network_Port_Description_Set(
+        uint32_t instance,
+        char *new_name);
+
+    BACNET_RELIABILITY Network_Port_Reliability(
+        uint32_t object_instance);
+    bool Network_Port_Reliability_Set(
+        uint32_t object_instance,
+        BACNET_RELIABILITY value);
+
+    bool Network_Port_Out_Of_Service(
+        uint32_t instance);
+    bool Network_Port_Out_Of_Service_Set(
+        uint32_t instance,
+        bool oos_flag);
+
+    uint8_t Network_Port_Type(
+        uint32_t object_instance);
+    bool Network_Port_Type_Set(
+        uint32_t object_instance,
+        uint8_t value);
+
+    uint16_t Network_Port_Network_Number(
+        uint32_t object_instance);
+    bool Network_Port_Network_Number_Set(
+        uint32_t object_instance,
+        uint16_t value);
+
+    BACNET_PORT_QUALITY Network_Port_Quality(
+        uint32_t object_instance);
+    bool Network_Port_Quality_Set(
+        uint32_t object_instance,
+        BACNET_PORT_QUALITY value);
+
+    bool Network_Port_MAC_Address(
+        uint32_t object_instance,
+        BACNET_OCTET_STRING *mac_address);
+    bool Network_Port_MAC_Address_Set(
+        uint32_t object_instance,
+        uint8_t *mac_src,
+        uint8_t mac_len);
+
+    uint16_t Network_Port_APDU_Length(
+        uint32_t object_instance);
+    bool Network_Port_APDU_Length_Set(
+        uint32_t object_instance,
+        uint16_t value);
+
+    uint8_t Network_Port_MSTP_Max_Master(
+        uint32_t object_instance);
+    bool Network_Port_MSTP_Max_Master_Set(
+        uint32_t object_instance,
+        uint8_t value);
+
+    uint8_t Network_Port_MSTP_Max_Info_Frames(
+        uint32_t object_instance);
+    bool Network_Port_MSTP_Max_Info_Frames_Set(
+        uint32_t object_instance,
+        uint8_t value);
+
+    uint32_t Network_Port_Link_Speed(
+        uint32_t object_instance);
+    bool Network_Port_Link_Speed_Set(
+        uint32_t object_instance,
+        uint32_t value);
+
+    bool Network_Port_IP_Address(
+        uint32_t object_instance,
+        BACNET_OCTET_STRING *ip_address);
+    bool Network_Port_IP_Address_Get(
+        uint32_t object_instance,
+        uint8_t *a, uint8_t *b, uint8_t *c, uint8_t *d);
+    bool Network_Port_IP_Address_Set(
+        uint32_t object_instance,
+        uint8_t a, uint8_t b, uint8_t c, uint8_t d);
+
+    uint8_t Network_Port_IP_Subnet_Prefix(
+        uint32_t object_instance);
+    bool Network_Port_IP_Subnet_Prefix_Set(
+        uint32_t object_instance,
+        uint8_t value);
+
+    bool Network_Port_IP_Subnet(
+        uint32_t object_instance,
+        BACNET_OCTET_STRING *subnet_mask);
+    bool Network_Port_IP_Subnet_Get(
+        uint32_t object_instance,
+        uint8_t *a, uint8_t *b, uint8_t *c, uint8_t *d);
+    bool Network_Port_IP_Subnet_Set(
+        uint32_t object_instance,
+        uint8_t a, uint8_t b, uint8_t c, uint8_t d);
+
+    bool Network_Port_IP_Gateway(
+        uint32_t object_instance,
+        BACNET_OCTET_STRING *subnet_mask);
+    bool Network_Port_IP_Gateway_Get(
+        uint32_t object_instance,
+        uint8_t *a, uint8_t *b, uint8_t *c, uint8_t *d);
+    bool Network_Port_IP_Gateway_Set(
+        uint32_t object_instance,
+        uint8_t a, uint8_t b, uint8_t c, uint8_t d);
+
+    bool Network_Port_IP_DNS_Server(
+        uint32_t object_instance,
+        unsigned index,
+        BACNET_OCTET_STRING *subnet_mask);
+    bool Network_Port_IP_DNS_Server_Get(
+        uint32_t object_instance,
+        unsigned index,
+        uint8_t *a, uint8_t *b, uint8_t *c, uint8_t *d);
+    bool Network_Port_IP_DNS_Server_Set(
+        uint32_t object_instance,
+        unsigned index,
+        uint8_t a, uint8_t b, uint8_t c, uint8_t d);
+
+    uint16_t Network_Port_BIP_Port(
+        uint32_t object_instance);
+    bool Network_Port_BIP_Port_Set(
+        uint32_t object_instance,
+        uint16_t value);
+
+    BACNET_IP_MODE Network_Port_BIP_Mode(
+        uint32_t object_instance);
+    bool Network_Port_BIP_Mode_Set(
+        uint32_t object_instance,
+        BACNET_IP_MODE value);
+
+    bool Network_Port_BBMD_Accept_FD_Registrations(
+        uint32_t object_instance);
+    bool Network_Port_BBMD_Accept_FD_Registrations_Set(
+        uint32_t object_instance,
+        bool value);
+
+    bool Network_Port_Changes_Pending(
+        uint32_t instance);
+    bool Network_Port_Changes_Pending_Set(
+        uint32_t instance,
+        bool flag);
+
+    bool Network_Port_Valid_Instance(
+        uint32_t object_instance);
+    unsigned Network_Port_Count(
+        void);
+    uint32_t Network_Port_Index_To_Instance(
+        unsigned find_index);
+    unsigned Network_Port_Instance_To_Index(
+        uint32_t object_instance);
+
+    bool Network_Port_Set_Network_Port_Instance_ID(
+        unsigned index,
+        uint32_t object_instance);
+
+    int Network_Port_Read_Range_BDT(
+        uint8_t * apdu,
+        BACNET_READ_RANGE_DATA * pRequest);
+    int Network_Port_Read_Range_FDT(
+        uint8_t * apdu,
+        BACNET_READ_RANGE_DATA * pRequest);
+    bool Network_Port_Read_Range(
+        BACNET_READ_RANGE_DATA * pRequest,
+        RR_PROP_INFO * pInfo);
+
+    bool Network_Port_Create(
+        uint32_t object_instance);
+    bool Network_Port_Delete(
+        uint32_t object_instance);
+    void Network_Port_Cleanup(
+        void);
+    void Network_Port_Init(
+        void);
+
+    /* handling for read property service */
+    int Network_Port_Read_Property(
+        BACNET_READ_PROPERTY_DATA * rpdata);
+
+    /* handling for write property service */
+    bool Network_Port_Write_Property(
+        BACNET_WRITE_PROPERTY_DATA * wp_data);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+#endif

bacnet-stack/demo/object/netport.mak

@@ -0,0 +1,42 @@
+#Makefile to build test case
+CC      = gcc
+SRC_DIR = ../../src
+TEST_DIR = ../../test
+INCLUDES = -I../../include -I$(TEST_DIR) -I.
+DEFINES = -DBIG_ENDIAN=0 -DBACNET_UNIT_TEST -DBACAPP_ALL -DTEST_NETWORK_PORT
+
+CFLAGS  = -Wall $(INCLUDES) $(DEFINES) -g
+
+SRCS = netport.c \
+	$(SRC_DIR)/bacdcode.c \
+	$(SRC_DIR)/bacint.c \
+	$(SRC_DIR)/bacstr.c \
+	$(SRC_DIR)/bacreal.c \
+	$(SRC_DIR)/datetime.c \
+	$(SRC_DIR)/bacapp.c \
+	$(SRC_DIR)/bacdevobjpropref.c \
+	$(SRC_DIR)/bactext.c \
+	$(SRC_DIR)/lighting.c \
+	$(SRC_DIR)/indtext.c \
+	$(TEST_DIR)/ctest.c
+
+TARGET = network_port
+
+all: ${TARGET}
+
+OBJS = ${SRCS:.c=.o}
+
+${TARGET}: ${OBJS}
+	${CC} -o $@ ${OBJS}
+
+.c.o:
+	${CC} -c ${CFLAGS} $*.c -o $@
+
+depend:
+	rm -f .depend
+	${CC} -MM ${CFLAGS} *.c >> .depend
+
+clean:
+	rm -rf core ${TARGET} $(OBJS)
+
+include: .depend

bacnet-stack/demo/piface/Makefile

@@ -83,7 +83,8 @@ DEMOSRC = \
 
 OBJSRC = \
 	$(BACNET_OBJECT)/bi.c \
-	$(BACNET_OBJECT)/bo.c
+	$(BACNET_OBJECT)/bo.c \
+	$(BACNET_OBJECT)/netport.c
 
 # core BACnet stack files
 CORESRC =  \
@@ -171,8 +172,8 @@ OPTIMIZATION = -Os $(OPTIMIZE_FLAGS)
 DEBUGGING = -DNDEBUG
 endif
 
+BFLAGS += -DBACNET_PROTOCOL_REVISION=17
 BFLAGS += -DMAX_TSM_TRANSACTIONS=1
-BFLAGS += -DWRITE_PROPERTY
 BFLAGS += -DMAX_BINARY_INPUTS=4
 BFLAGS += -DMAX_BINARY_OUTPUTS=8
 

bacnet-stack/demo/piface/device.c

@@ -46,6 +46,9 @@
 #include "device.h"
 #include "bi.h"
 #include "bo.h"
+#if (BACNET_PROTOCOL_REVISION >= 17)
+#include "netport.h"
+#endif
 
 /* local forward (semi-private) and external prototypes */
 int Device_Read_Property_Local(
@@ -76,6 +79,23 @@ static object_functions_t My_Object_Table[] = {
             NULL /* COV */ ,
             NULL /* COV Clear */ ,
         NULL /* Intrinsic Reporting */ },
+#if (BACNET_PROTOCOL_REVISION >= 17)
+    {OBJECT_NETWORK_PORT,
+            Network_Port_Init,
+            Network_Port_Count,
+            Network_Port_Index_To_Instance,
+            Network_Port_Valid_Instance,
+            Network_Port_Object_Name,
+            Network_Port_Read_Property,
+            Network_Port_Write_Property,
+            Network_Port_Property_Lists,
+            NULL /* ReadRangeInfo */ ,
+            NULL /* Iterator */ ,
+            NULL /* Value_Lists */ ,
+            NULL /* COV */ ,
+            NULL /* COV Clear */ ,
+        NULL /* Intrinsic Reporting */ },
+#endif
     {OBJECT_BINARY_INPUT,
             Binary_Input_Init,
             Binary_Input_Count,

bacnet-stack/demo/ptransfer/Makefile

@@ -15,6 +15,7 @@ TARGET = ptransfer
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/readbdt/Makefile

@@ -9,6 +9,7 @@ TARGET = bacrbdt
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/readfile/Makefile

@@ -9,6 +9,7 @@ TARGET = bacarf
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/readprop/Makefile

@@ -15,6 +15,7 @@ TARGET = bacrp
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/readpropm/Makefile

@@ -10,6 +10,7 @@ TARGET = bacrpm
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/readrange/Makefile

@@ -15,6 +15,7 @@ TARGET = bacrr
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/reinit/Makefile

@@ -10,6 +10,7 @@ TARGET = bacrd
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/router-ipv6/Makefile

@@ -16,6 +16,7 @@ BACNET_HANDLER_DIR = ../handler
 BACNET_OBJECT_DIR = ../object
 
 SRC = main.c \
+	$(BACNET_OBJECT_DIR)/netport.c \
 	$(BACNET_OBJECT_DIR)/device-client.c
 
 PORT_BIP6_SRC = \

bacnet-stack/demo/scov/Makefile

@@ -15,6 +15,7 @@ TARGET = bacscov
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/server/Makefile

@@ -32,6 +32,7 @@ OBJECT_SRC = \
 	$(BACNET_OBJECT)/osv.c \
 	$(BACNET_OBJECT)/piv.c \
 	$(BACNET_OBJECT)/nc.c  \
+	$(BACNET_OBJECT)/netport.c  \
 	$(BACNET_OBJECT)/trendlog.c \
 	$(BACNET_OBJECT)/schedule.c \
 	$(BACNET_OBJECT)/access_credential.c \

bacnet-stack/demo/timesync/Makefile

@@ -10,6 +10,7 @@ TARGET = bacts
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/ucov/Makefile

@@ -10,6 +10,7 @@ TARGET = bacucov
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/uevent/Makefile

@@ -10,6 +10,7 @@ TARGET = bacuevent
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/uptransfer/Makefile

@@ -15,6 +15,7 @@ TARGET = bacupt
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/whohas/Makefile

@@ -10,6 +10,7 @@ TARGET = bacwh
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/whois/Makefile

@@ -9,6 +9,7 @@ TARGET = bacwi
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/whoisrouter/Makefile

@@ -9,6 +9,7 @@ TARGET = bacwir
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/writefile/Makefile

@@ -10,6 +10,7 @@ TARGET = bacawf
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/writeprop/Makefile

@@ -10,6 +10,7 @@ TARGET = bacwp
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/demo/writepropm/Makefile

@@ -10,6 +10,7 @@ TARGET = bacwpm
 TARGET_BIN = ${TARGET}$(TARGET_EXT)
 
 SRCS = main.c \
+	../object/netport.c \
 	../object/device-client.c
 
 OBJS = ${SRCS:.c=.o}

bacnet-stack/include/bacenum.h

@@ -2346,4 +2346,17 @@ typedef enum BACnetNetworkPortCommand_T {
     NETWORK_PORT_COMMAND_PROPRIETARY_MAX = 255
 } BACNET_NETWORK_PORT_COMMAND;
 
+typedef enum BACnetProtocolLevel_T {
+    BACNET_PROTOCOL_LEVEL_PHYSICAL=0,
+    BACNET_PROTOCOL_LEVEL_PROTOCOL=1,
+    BACNET_PROTOCOL_LEVEL_BACNET_APPLICATION=2,
+    BACNET_PROTOCOL_LEVEL_NON_BACNET_APPLICATION=3
+} BACNET_PROTOCOL_LEVEL;
+
+typedef enum BACnetIPMode_T {
+    BACNET_IP_MODE_NORMAL = 0,
+    BACNET_IP_MODE_FOREIGN = 1,
+    BACNET_IP_MODE_BBMD = 2
+} BACNET_IP_MODE;
+
 #endif /* end of BACENUM_H */