From 70fe498015c01d6b8419af2b0a2dcd18b15e9f2f Mon Sep 17 00:00:00 2001 From: skarg Date: Thu, 14 Apr 2016 02:01:57 +0000 Subject: [PATCH] fixing gateway demo for MS/TP --- bacnet-stack/demo/gateway/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bacnet-stack/demo/gateway/main.c b/bacnet-stack/demo/gateway/main.c index 689d109d..b5f4c26d 100644 --- a/bacnet-stack/demo/gateway/main.c +++ b/bacnet-stack/demo/gateway/main.c @@ -183,20 +183,20 @@ static void Initialize_Device_Addresses( uint32_t virtual_mac = 0; DEVICE_OBJECT_DATA *pDev = NULL; /* Setup info for the main gateway device first */ + pDev = Get_Routed_Device_Object(i); #if defined(BACDL_BIP) uint16_t myPort; struct in_addr *netPtr; /* Lets us cast to this type */ uint8_t *gatewayMac = NULL; uint32_t myAddr = bip_get_addr(); - pDev = Get_Routed_Device_Object(i); gatewayMac = pDev->bacDevAddr.mac; /* Keep pointer to the main MAC */ memcpy(pDev->bacDevAddr.mac, &myAddr, 4); myPort = bip_get_port(); memcpy(&pDev->bacDevAddr.mac[4], &myPort, 2); pDev->bacDevAddr.mac_len = 6; #elif defined(BACDL_MSTP) - /* Todo: */ - pDev->bacDevAddr.mac_len = 2; + pDev->bacDevAddr.mac_len = 1; + pDev->bacDevAddr.mac[0] = dlmstp_mac_address(); #else #error "No support for this Data Link Layer type " #endif