sergiotarxz/nuttx-apps
sergiotarxz/nuttx-apps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Ooops.. Fix oversight in last commit

Browse Source
This commit is contained in:
Gregory Nutt 2014-11-18 07:43:34 -06:00
parent 424c885f55
commit 24aa151b00
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
netutils/dhcpd/dhcpd.c
View File

@ -755,6 +755,27 @@ static int dhcpd_addoption32(uint8_t code, uint32_t value)
return dhcpd_addoption(option); return dhcpd_addoption(option);
} }
/****************************************************************************
* Name: dhcp_addoption32p
****************************************************************************/
#if HAVE_DNSIP
static int dhcp_addoption32p(uint8_t code, FAR uint8_t *value)
{
uint8_t option[6];
/* Construct the option sequence */
option[DHCPD_OPTION_CODE] = code;
option[DHCPD_OPTION_LENGTH] = 4;
memcpy(&option[DHCPD_OPTION_DATA], value, 4);
/* Add the option sequence to the response */
return dhcpd_addoption(option);
}
#endif
/**************************************************************************** /****************************************************************************
* Name: dhcpd_soclet * Name: dhcpd_soclet
****************************************************************************/ ****************************************************************************/
@ -999,7 +1020,7 @@ static inline int dhcpd_sendoffer(in_addr_t ipaddr, uint32_t leasetime)
dhcpd_addoption32(DHCP_OPTION_ROUTER, htonl(CONFIG_NETUTILS_DHCPD_ROUTERIP)); dhcpd_addoption32(DHCP_OPTION_ROUTER, htonl(CONFIG_NETUTILS_DHCPD_ROUTERIP));
#endif #endif
#if HAVE_DNSIP #if HAVE_DNSIP
dhcpd_addoption32(DHCP_OPTION_DNS_SERVER, (uint8_t*)&dnsaddr); dhcp_addoption32p(DHCP_OPTION_DNS_SERVER, (FAR uint8_t*)&dnsaddr);
#endif #endif
/* Send the offer response */ /* Send the offer response */
@ -1061,7 +1082,7 @@ int dhcpd_sendack(in_addr_t ipaddr)
dhcpd_addoption32(DHCP_OPTION_ROUTER, htonl(CONFIG_NETUTILS_DHCPD_ROUTERIP)); dhcpd_addoption32(DHCP_OPTION_ROUTER, htonl(CONFIG_NETUTILS_DHCPD_ROUTERIP));
#endif #endif
#if HAVE_DNSIP #if HAVE_DNSIP
dhcpd_addoption32(DHCP_OPTION_DNS_SERVER, (uint8_t*)&dnsaddr); dhcp_addoption32p(DHCP_OPTION_DNS_SERVER, (FAR uint8_t*)&dnsaddr);
#endif #endif
#ifdef CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST #ifdef CONFIG_NETUTILS_DHCPD_IGNOREBROADCAST