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

Added define to control IP_DHCP_Enable property being present in Network Port object (#796)

Browse Source
This commit is contained in:
Steve Karg
2024-10-04 22:15:31 -05:00
committed by GitHub
parent 9d5c3ec515
commit c4c1d9f921
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/bacnet/basic/object/netport.c
+10
View File
@@ -42,7 +42,9 @@ struct bacnet_ipv4_port {
uint8_t IP_DNS_Server[BIP_DNS_MAX][4]; uint8_t IP_DNS_Server[BIP_DNS_MAX][4];
uint16_t Port; uint16_t Port;
BACNET_IP_MODE Mode; BACNET_IP_MODE Mode;
#if defined(BACDL_BIP) && (BACNET_NETWORK_PORT_IP_DHCP_ENABLED)
bool IP_DHCP_Enable; bool IP_DHCP_Enable;
#endif
uint32_t IP_DHCP_Lease_Seconds; uint32_t IP_DHCP_Lease_Seconds;
uint32_t IP_DHCP_Lease_Seconds_Remaining; uint32_t IP_DHCP_Lease_Seconds_Remaining;
uint8_t IP_DHCP_Server[4]; uint8_t IP_DHCP_Server[4];
@@ -147,7 +149,9 @@ static const int BIP_Port_Properties_Optional[] = {
PROP_IP_SUBNET_MASK, PROP_IP_SUBNET_MASK,
PROP_IP_DEFAULT_GATEWAY, PROP_IP_DEFAULT_GATEWAY,
PROP_IP_DNS_SERVER, PROP_IP_DNS_SERVER,
#if defined(BACDL_BIP) && (BACNET_NETWORK_PORT_IP_DHCP_ENABLED)
PROP_IP_DHCP_ENABLE, PROP_IP_DHCP_ENABLE,
#endif
#if defined(BACDL_BIP) && (BBMD_ENABLED) #if defined(BACDL_BIP) && (BBMD_ENABLED)
PROP_BBMD_ACCEPT_FD_REGISTRATIONS, PROP_BBMD_ACCEPT_FD_REGISTRATIONS,
PROP_BBMD_BROADCAST_DISTRIBUTION_TABLE, PROP_BBMD_BROADCAST_DISTRIBUTION_TABLE,
@@ -1297,6 +1301,7 @@ bool Network_Port_IP_Gateway_Set(
return status; return status;
} }
#if defined(BACDL_BIP) && (BACNET_NETWORK_PORT_IP_DHCP_ENABLED)
/** /**
* For a given object instance-number, returns the IP_DHCP_Enable * For a given object instance-number, returns the IP_DHCP_Enable
* property value * property value
@@ -1319,7 +1324,9 @@ bool Network_Port_IP_DHCP_Enable(uint32_t object_instance)
return dhcp_enable; return dhcp_enable;
} }
#endif
#if defined(BACDL_BIP) && (BACNET_NETWORK_PORT_IP_DHCP_ENABLED)
/** /**
* For a given object instance-number, sets the IP_DHCP_Enable property value * For a given object instance-number, sets the IP_DHCP_Enable property value
* *
@@ -1343,6 +1350,7 @@ bool Network_Port_IP_DHCP_Enable_Set(uint32_t object_instance, bool value)
return status; return status;
} }
#endif
/** /**
* For a given object instance-number and dns_index, loads the ip-address into * For a given object instance-number and dns_index, loads the ip-address into
@@ -3274,10 +3282,12 @@ int Network_Port_Read_Property(BACNET_READ_PROPERTY_DATA *rpdata)
Network_Port_IP_Gateway(rpdata->object_instance, &octet_string); Network_Port_IP_Gateway(rpdata->object_instance, &octet_string);
apdu_len = encode_application_octet_string(&apdu[0], &octet_string); apdu_len = encode_application_octet_string(&apdu[0], &octet_string);
break; break;
#if defined(BACDL_BIP) && (BACNET_NETWORK_PORT_IP_DHCP_ENABLED)
case PROP_IP_DHCP_ENABLE: case PROP_IP_DHCP_ENABLE:
apdu_len = encode_application_boolean( apdu_len = encode_application_boolean(
&apdu[0], Network_Port_IP_DHCP_Enable(rpdata->object_instance)); &apdu[0], Network_Port_IP_DHCP_Enable(rpdata->object_instance));
break; break;
#endif
case PROP_IP_DNS_SERVER: case PROP_IP_DNS_SERVER:
apdu_len = bacnet_array_encode( apdu_len = bacnet_array_encode(
rpdata->object_instance, rpdata->array_index, rpdata->object_instance, rpdata->array_index,