Merge branch 'feature/add_vendor_class_id_option_in_dhcp' into 'release/v2.2.x'

feat(lwip): add vendor class id option in lwip

See merge request sdk/ESP8266_NONOS_SDK!134

Author: xcguang

VERSION

@@ -18,5 +18,5 @@ phy:
 
 gitlab:
     driver      :   68fc7b06
-    lwip        :   d481a1f7
+    lwip        :   b802c938
     mbedtls     :   e4dace14

lib/liblwip.a

@@ -123,6 +123,8 @@ void dhcp_inform(struct netif *netif);
 /** Handle a possible change in the network configuration */
 void dhcp_network_changed(struct netif *netif);
 
+err_t dhcp_set_vendor_class_identifier(uint8_t len, char *str);
+
 /** if enabled, check whether the offered IP address is not in use, using ARP */
 #if DHCP_DOES_ARP_CHECK
 void dhcp_arp_reply(struct netif *netif, ip_addr_t *addr);

third_party/include/lwip/dhcp.h

@@ -172,6 +172,23 @@ static void dhcp_option_long(struct dhcp *dhcp, u32_t value);
 /* always add the DHCP options trailer to end and pad */
 static void dhcp_option_trailer(struct dhcp *dhcp);
 
+static int vendor_class_len = 0;
+static char * vendor_class_buf = NULL;
+err_t dhcp_set_vendor_class_identifier(uint8_t len, char *str) {
+  if (len == 0)
+    return ERR_ARG;
+
+  if (str == NULL)
+    return ERR_ARG;
+
+  vendor_class_buf = (char *)mem_zalloc(len + 1);
+  if (vendor_class_buf == NULL) {
+    return ERR_MEM;
+  }
+  vendor_class_len = len;
+  memcpy(vendor_class_buf, str, len);
+}
+
 /**
  * Back-off the DHCP client (because of a received NAK response).
  *
@@ -321,6 +338,18 @@ dhcp_select(struct netif *netif)
     }
 #endif /* LWIP_NETIF_HOSTNAME */
 
+    if (vendor_class_buf != NULL) {
+      const char *p = (const char*)vendor_class_buf;
+      u8_t namelen = (u8_t)os_strlen(p);
+      if (vendor_class_len > 0) {
+        LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255);
+        dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len);
+        while (*p) {
+          dhcp_option_byte(dhcp, *p++);
+        }
+      }
+    }
+
     dhcp_option_trailer(dhcp);
     /* shrink the pbuf to the actual content length */
     pbuf_realloc(dhcp->p_out, sizeof(struct dhcp_msg) - DHCP_OPTIONS_LEN + dhcp->options_out_len);
@@ -918,6 +947,19 @@ dhcp_discover(struct netif *netif)
       }
     }
 #endif /* LWIP_NETIF_HOSTNAME */
+
+    if (vendor_class_buf != NULL) {
+      const char *p = (const char*)vendor_class_buf;
+      u8_t namelen = (u8_t)os_strlen(p);
+      if (vendor_class_len > 0) {
+        LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255);
+        dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len);
+        while (*p) {
+          dhcp_option_byte(dhcp, *p++);
+        }
+      }
+    }
+
     dhcp_option(dhcp, DHCP_OPTION_PARAMETER_REQUEST_LIST, 12/*num options*/);
     dhcp_option_byte(dhcp, DHCP_OPTION_SUBNET_MASK);
     dhcp_option_byte(dhcp, DHCP_OPTION_ROUTER);
@@ -1099,6 +1141,18 @@ dhcp_renew(struct netif *netif)
     }
 #endif /* LWIP_NETIF_HOSTNAME */
 
+    if (vendor_class_buf != NULL) {
+      const char *p = (const char*)vendor_class_buf;
+      u8_t namelen = (u8_t)os_strlen(p);
+      if (vendor_class_len > 0) {
+        LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255);
+        dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len);
+        while (*p) {
+          dhcp_option_byte(dhcp, *p++);
+        }
+      }
+    }
+
 #if 0
     dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
     dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));
@@ -1162,6 +1216,18 @@ dhcp_rebind(struct netif *netif)
     }
 #endif /* LWIP_NETIF_HOSTNAME */
 
+    if (vendor_class_buf != NULL) {
+      const char *p = (const char*)vendor_class_buf;
+      u8_t namelen = (u8_t)os_strlen(p);
+      if (vendor_class_len > 0) {
+        LWIP_ASSERT("DHCP: vendor_class_len is too long!", vendor_class_len < 255);
+        dhcp_option(dhcp, DHCP_OPTION_US, vendor_class_len);
+        while (*p) {
+          dhcp_option_byte(dhcp, *p++);
+        }
+      }
+    }
+
 #if 1
     dhcp_option(dhcp, DHCP_OPTION_REQUESTED_IP, 4);
     dhcp_option_long(dhcp, ntohl(dhcp->offered_ip_addr.addr));