From 811086ff850df1d1a14f4419c61f12f14adb7e05 Mon Sep 17 00:00:00 2001
From: Masayuki Ishikawa <masayuki.ishikawa@gmail.com>
Date: Wed, 14 Aug 2019 11:29:18 +0000
Subject: [PATCH] Merged in masayuki2009/nuttx.apps/dhcpc_host_name (pull
 request #197)

netutils/dhcpc: Add host name support to dhcp client

Signed-off-by: Masayuki Ishikawa <Masayuki.Ishikawa@jp.sony.com>

Approved-by: Gregory Nutt <gnutt@nuttx.org>
---
 netutils/dhcpc/Kconfig |  4 ++++
 netutils/dhcpc/dhcpc.c | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/netutils/dhcpc/Kconfig b/netutils/dhcpc/Kconfig
index 348bbec97..304cfc384 100644
--- a/netutils/dhcpc/Kconfig
+++ b/netutils/dhcpc/Kconfig
@@ -12,4 +12,8 @@ config NETUTILS_DHCPC
 
 if NETUTILS_DHCPC
 
+config NETUTILS_DHCPC_HOST_NAME
+	string "DHCP client host name"
+	default "nuttx"
+
 endif
diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c
index fb0973266..1b2a3c377 100644
--- a/netutils/dhcpc/dhcpc.c
+++ b/netutils/dhcpc/dhcpc.c
@@ -93,6 +93,7 @@
 #define DHCP_OPTION_SUBNET_MASK 1
 #define DHCP_OPTION_ROUTER      3
 #define DHCP_OPTION_DNS_SERVER  6
+#define DHCP_OPTION_HOST_NAME   12
 #define DHCP_OPTION_REQ_IPADDR  50
 #define DHCP_OPTION_LEASE_TIME  51
 #define DHCP_OPTION_MSG_TYPE    53
@@ -153,6 +154,16 @@ static const uint8_t magic_cookie[4] = {99, 130, 83, 99};
  * Name: dhcpc_add<option>
  ****************************************************************************/
 
+static FAR uint8_t *dhcpc_addhostname(FAR const char *hostname,
+                                      FAR uint8_t *optptr)
+{
+  int len = strlen(hostname);
+  *optptr++ = DHCP_OPTION_HOST_NAME;
+  *optptr++ = len;
+  memcpy(optptr, hostname, len);
+  return optptr + len;
+}
+
 static FAR uint8_t *dhcpc_addmsgtype(FAR uint8_t *optptr, uint8_t type)
 {
   *optptr++ = DHCP_OPTION_MSG_TYPE;
@@ -235,6 +246,8 @@ static int dhcpc_sendmsg(FAR struct dhcpc_state_s *pdhcpc,
          */
 
         pdhcpc->packet.flags = HTONS(BOOTP_BROADCAST); /*  Broadcast bit. */
+
+        pend     = dhcpc_addhostname(CONFIG_NETUTILS_DHCPC_HOST_NAME, pend);
         pend     = dhcpc_addreqoptions(pend);
         break;
 
@@ -246,6 +259,8 @@ static int dhcpc_sendmsg(FAR struct dhcpc_state_s *pdhcpc,
          */
 
         pdhcpc->packet.flags = HTONS(BOOTP_BROADCAST); /*  Broadcast bit. */
+
+        pend     = dhcpc_addhostname(CONFIG_NETUTILS_DHCPC_HOST_NAME, pend);
         pend     = dhcpc_addserverid(&pdhcpc->serverid, pend);
         pend     = dhcpc_addreqipaddr(&pdhcpc->ipaddr, pend);
         break;