[incubator-nuttx-apps] branch master updated: netutils/dhcp: fix build warning/break of dhcp6c

[xi...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx-apps.git


The following commit(s) were added to refs/heads/master by this push:
     new e031a8288 netutils/dhcp: fix build warning/break of dhcp6c
e031a8288 is described below

commit e031a8288293283da5082ea46c7bda5bee46552d
Author: chao an <an...@xiaomi.com>
AuthorDate: Tue Sep 6 12:22:46 2022 +0800

    netutils/dhcp: fix build warning/break of dhcp6c
    
    dhcp6c.c:222:3: error: unknown type name ‘pthread_t’
      222 |   pthread_t thread;
          |   ^~~~~~~~~
    dhcp6c.c: In function ‘dhcp6c_get_result’:
    dhcp6c.c:415:7: warning: implicit declaration of function ‘netlib_prefix2ipv6netmask’ [-Wimplicit-function-declaration]
      415 |       netlib_prefix2ipv6netmask(presult->pl, &presult->netmask);
          |       ^~~~~~~~~~~~~~~~~~~~~~~~~
    dhcp6c.c: In function ‘dhcp6c_parse_ia’:
    dhcp6c.c:1046:30: warning: unused variable ‘pdhcp6c’ [-Wunused-variable]
     1046 |   FAR struct dhcp6c_state_s *pdhcp6c = (FAR struct dhcp6c_state_s *)handle;
          |                              ^~~~~~~
    dhcp6c.c: In function ‘dhcp6c_precise_open’:
    dhcp6c.c:1702:3: warning: missing braces around initializer [-Wmissing-braces]
     1702 |   {
          |   ^
    ......
     1706 |     {0},
          |      -
          |      {{0}}
    dhcp6c.c:1796:43: error: ‘UDP_BINDTODEVICE’ undeclared (first use in this function); did you mean ‘SO_BINDTODEVICE’?
     1796 |   setsockopt(pdhcp6c->sockfd, SOL_SOCKET, UDP_BINDTODEVICE, ifname,
          |                                           ^~~~~~~~~~~~~~~~
          |                                           SO_BINDTODEVICE
    dhcp6c.c:1796:43: note: each undeclared identifier is reported only once for each function it appears in
    dhcp6c.c: In function ‘dhcp6c_request_async’:
    dhcp6c.c:1886:9: warning: implicit declaration of function ‘pthread_create’; did you mean ‘timer_create’? [-Wimplicit-function-declaration]
     1886 |   ret = pthread_create(&pdhcp6c->thread, NULL, dhcp6c_run, pdhcp6c);
          |         ^~~~~~~~~~~~~~
          |         timer_create
    
    Signed-off-by: chao an <an...@xiaomi.com>
---
 netutils/dhcp6c/dhcp6c.c | 20 +++++++++-----------
 netutils/dhcpd/dhcpd.c   |  2 +-
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/netutils/dhcp6c/dhcp6c.c b/netutils/dhcp6c/dhcp6c.c
index cbfe56042..c52ab1b89 100644
--- a/netutils/dhcp6c/dhcp6c.c
+++ b/netutils/dhcp6c/dhcp6c.c
@@ -38,6 +38,7 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <malloc.h>
+#include <pthread.h>
 #include <sys/time.h>
 #include <nuttx/clock.h>
 #include <sys/ioctl.h>
@@ -48,6 +49,7 @@
 #include <net/ethernet.h>
 #include <arpa/inet.h>
 
+#include "netutils/netlib.h"
 #include "netutils/dhcp6c.h"
 
 /****************************************************************************
@@ -1043,7 +1045,6 @@ static int dhcp6c_commit_advert(FAR void *handle, uint32_t elapsed)
 
 static time_t dhcp6c_parse_ia(FAR void *handle, FAR void *opt, FAR void *end)
 {
-  FAR struct dhcp6c_state_s *pdhcp6c = (FAR struct dhcp6c_state_s *)handle;
   uint32_t timeout = UINT32_MAX;
   uint16_t otype;
   uint16_t olen;
@@ -1686,6 +1687,7 @@ static FAR void *dhcp6c_precise_open(FAR const char *ifname,
                                      uint16_t opt[], int cnt)
 {
   FAR struct dhcp6c_state_s *pdhcp6c;
+  struct sockaddr_in6 client_addr;
   struct ifreq ifr;
   size_t client_id_len;
   int val = 1;
@@ -1698,15 +1700,6 @@ static FAR void *dhcp6c_precise_open(FAR const char *ifname,
     htons(DHCPV6_OPT_SIP_SERVER_D)
   };
 
-  struct sockaddr_in6 client_addr =
-  {
-    AF_INET6,
-    htons(DHCPV6_CLIENT_PORT),
-    0,
-    {0},
-    0
-  };
-
   pdhcp6c = malloc(sizeof(struct dhcp6c_state_s));
   if (pdhcp6c == NULL)
     {
@@ -1793,8 +1786,13 @@ static FAR void *dhcp6c_precise_open(FAR const char *ifname,
 
   setsockopt(pdhcp6c->sockfd, IPPROTO_IPV6, IPV6_V6ONLY, &val, sizeof(val));
   setsockopt(pdhcp6c->sockfd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
-  setsockopt(pdhcp6c->sockfd, SOL_SOCKET, UDP_BINDTODEVICE, ifname,
+  setsockopt(pdhcp6c->sockfd, SOL_SOCKET, SO_BINDTODEVICE, ifname,
              strlen(ifname));
+
+  memset(&client_addr, 0, sizeof(client_addr));
+  client_addr.sin6_family = AF_INET6;
+  client_addr.sin6_port = htons(DHCPV6_CLIENT_PORT);
+
   if (bind(pdhcp6c->sockfd, (struct sockaddr *)&client_addr,
            sizeof(client_addr)) != 0)
     {
diff --git a/netutils/dhcpd/dhcpd.c b/netutils/dhcpd/dhcpd.c
index d5eb45569..667e8290f 100644
--- a/netutils/dhcpd/dhcpd.c
+++ b/netutils/dhcpd/dhcpd.c
@@ -874,7 +874,7 @@ static inline int dhcpd_socket(FAR const char *interface)
   if (setsockopt(sockfd, SOL_SOCKET, SO_BINDTODEVICE,
                  interface, strlen(interface)) < 0)
     {
-      ninfo("ERROR: setsockopt UDP_BINDTODEVICE failed: %d\n", errno);
+      ninfo("ERROR: setsockopt SO_BINDTODEVICE failed: %d\n", errno);
       close(sockfd);
       return ERROR;
     }