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

renew6: Optimize the process of obtaining an IPv6 address.

Browse Source 
If Managed Address Congfiguration flag in the Router Advertisement
Messsage is set, we would obtain the IPv6 address though the stateful
DHCPv6 procedure.

Signed-off-by: liqinhui <liqinhui@xiaomi.com>
This commit is contained in:
liqinhui 2023-11-23 19:14:19 +08:00 committed by Xiang Xiao
parent f57cd2cf0c
commit 91a697a3f4
4 changed files with 187 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/netutils/netlib.h
View File

@ -325,6 +325,10 @@ ssize_t netlib_get_route(FAR struct rtentry *rtelist,
/* ICMPv6 Autoconfiguration */ /* ICMPv6 Autoconfiguration */
int netlib_icmpv6_autoconfiguration(FAR const char *ifname); int netlib_icmpv6_autoconfiguration(FAR const char *ifname);
/* DHCPv6 */
int netlib_obtain_ipv6addr(FAR const char *ifname);
#endif #endif
#ifdef CONFIG_NET_IPTABLES #ifdef CONFIG_NET_IPTABLES

1
netutils/netlib/Makefile
View File

@ -63,6 +63,7 @@ CSRCS += netlib_prefix2ipv6netmask.c netlib_ipv6netmask2prefix.c
CSRCS += netlib_ipv6adaptor.c CSRCS += netlib_ipv6adaptor.c
ifeq ($(CONFIG_NET_ICMPv6_AUTOCONF),y) ifeq ($(CONFIG_NET_ICMPv6_AUTOCONF),y)
CSRCS += netlib_autoconfig.c CSRCS += netlib_autoconfig.c
CSRCS += netlib_obtainipv6addr.c
endif endif
ifeq ($(CONFIG_NETDB_DNSCLIENT),y) ifeq ($(CONFIG_NETDB_DNSCLIENT),y)
CSRCS += netlib_setipv6dnsaddr.c CSRCS += netlib_setipv6dnsaddr.c

178
netutils/netlib/netlib_obtainipv6addr.c Normal file
View File

@ -0,0 +1,178 @@
/****************************************************************************
* apps/netutils/netlib/netlib_obtainipv6addr.c
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership. The
* ASF licenses this file to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance with the
* License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
* License for the specific language governing permissions and limitations
* under the License.
*
****************************************************************************/
/****************************************************************************
* Included Files
****************************************************************************/
#include <nuttx/config.h>
#include <sys/socket.h>
#include <sys/ioctl.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>
#include <debug.h>
#include <netinet/in.h>
#include <net/if.h>
#include <nuttx/net/dns.h>
#include "netutils/netlib.h"
#include "netutils/dhcp6c.h"
/****************************************************************************
* Private Functions
****************************************************************************/
#ifdef CONFIG_NET_ETHERNET
static void icmpv6_linkipaddr_6(FAR const uint8_t *mac, FAR uint16_t *ipaddr)
{
ipaddr[0] = htons(0xfe80);
ipaddr[1] = 0;
ipaddr[2] = 0;
ipaddr[3] = 0;
ipaddr[4] = htons(mac[0] << 8 | mac[1]);
ipaddr[5] = htons(mac[2] << 8 | 0x00ff);
ipaddr[6] = htons(0x00fe << 8 | mac[3]);
ipaddr[7] = htons(mac[4] << 8 | mac[5]);
ipaddr[4] ^= htons(0x0200);
}
static void dhcpv6_set_lladdr(FAR const char *ifname)
{
struct in6_addr addr6;
uint8_t mac[IFHWADDRLEN];
/* Get the MAC address of the NIC */
netlib_getmacaddr(ifname, mac);
/* Set the Link Local Address of the NIC */
icmpv6_linkipaddr_6(mac, (uint16_t *)&addr6);
netlib_set_ipv6addr(ifname, &addr6);
netlib_prefix2ipv6netmask(64, &addr6);
}
#endif
static int dhcpv6_setup_result(FAR const char *ifname,
FAR struct dhcp6c_state *presult)
{
int ret;
ret = netlib_set_ipv6addr(ifname, &presult->addr);
if (ret != OK)
{
nerr("netlib_set_ipv6addr fail\n");
return ret;
}
ret = netlib_set_ipv6netmask(ifname, &presult->netmask);
if (ret != OK)
{
nerr("netlib_set_ipv6netmask fail\n");
return ret;
}
#if defined(CONFIG_NET_IPv6) && defined(CONFIG_NETDB_DNSCLIENT)
ret = netlib_set_ipv6dnsaddr(&presult->dns);
if (ret != OK)
{
nerr("netlib_set_ipv6dnsaddr fail\n");
return ret;
}
#endif
return ret;
}
static int dhcpv6_obtain_statefuladdr(FAR const char *ifname)
{
FAR void *handle = NULL;
struct dhcp6c_state result;
int ret;
memset(&result, 0, sizeof(result));
#ifdef CONFIG_NET_ETHERNET
dhcpv6_set_lladdr(ifname);
#endif
handle = dhcp6c_open(ifname);
ret = dhcp6c_request(handle, &result);
if (ret == OK)
{
dhcpv6_setup_result(ifname, &result);
}
else
{
nerr("dhcp6c_request fail\n");
}
dhcp6c_close(handle);
return ret;
}
/****************************************************************************
* Public Functions
****************************************************************************/
/****************************************************************************
* Name: netlib_obtain_ipv6addr
*
* Description:
* Perform ICMPv6 auto-configuration and DHCPv6 in an attempt to
* get the IP address of the specified network device.
*
* Parameters:
* ifname The name of the interface
*
* Return:
* 0 on success; negative integer on failure
*
****************************************************************************/
int netlib_obtain_ipv6addr(FAR const char *ifname)
{
int ret;
if (ifname == NULL)
{
/* No interface name */
errno = EINVAL;
return ERROR;
}
ret = netlib_icmpv6_autoconfiguration(ifname);
if (ret)
{
if (errno == EADDRNOTAVAIL)
{
ninfo("obtain IPv6 address by dhcpv6\n");
ret = dhcpv6_obtain_statefuladdr(ifname);
}
else
{
nerr("netlib_icmpv6_autoconfiguration fail\n");
}
}
return ret;
}

97
system/dhcp6c/renew6_main.c
View File

@ -25,117 +25,28 @@
#include <nuttx/config.h> #include <nuttx/config.h>
#include <debug.h> #include <debug.h>
#include <net/if.h>
#include <sys/socket.h>
#include <string.h> #include <string.h>
#include <errno.h> #include <errno.h>
#include <netinet/in.h>
#include <nuttx/net/net.h>
#include <nuttx/net/netdev.h>
#include <nuttx/net/dns.h>
#include "netutils/netlib.h" #include "netutils/netlib.h"
#include "netutils/dhcp6c.h"
/**************************************************************************** /****************************************************************************
* Private Functions * Public Functions
****************************************************************************/ ****************************************************************************/
static void icmpv6_linkipaddr_6(FAR const uint8_t *mac, uint16_t *ipaddr)
{
ipaddr[0] = HTONS(0xfe80);
ipaddr[1] = 0;
ipaddr[2] = 0;
ipaddr[3] = 0;
ipaddr[4] = HTONS(mac[0] << 8 | mac[1]);
ipaddr[5] = HTONS(mac[2] << 8 | 0x00ff);
ipaddr[6] = HTONS(0x00fe << 8 | mac[3]);
ipaddr[7] = HTONS(mac[4] << 8 | mac[5]);
ipaddr[4] ^= HTONS(0x0200);
}
static void dhcp6c_set_lladdr(FAR const char *ifname)
{
struct in6_addr addr6;
uint8_t mac[IFHWADDRLEN];
/* Get the MAC address of the NIC */
netlib_getmacaddr(ifname, mac);
/* Set the Link Local Address of the NIC */
icmpv6_linkipaddr_6(mac, (uint16_t *)&addr6);
netlib_set_ipv6addr(ifname, &addr6);
netlib_prefix2ipv6netmask(64, &addr6);
}
static int setup_result(FAR const char *ifname,
FAR struct dhcp6c_state *presult)
{
int ret;
ret = netlib_set_ipv6addr(ifname, &presult->addr);
if (ret != OK)
{
nerr("netlib_set_ipv6addr fail\n");
return ret;
}
ret = netlib_set_ipv6netmask(ifname, &presult->netmask);
if (ret != OK)
{
nerr("netlib_set_ipv6netmask fail\n");
return ret;
}
ret = netlib_set_ipv6dnsaddr(&presult->dns);
if (ret != OK)
{
nerr("netlib_set_ipv6dnsaddr fail\n");
return ret;
}
return ret;
}
int main(int argc, FAR char * const argv[]) int main(int argc, FAR char * const argv[])
{ {
char ifname[IFNAMSIZ];
void *handle = NULL;
struct dhcp6c_state result;
int ret = -EINVAL; int ret = -EINVAL;
memset(ifname, 0, sizeof(ifname));
memset(&result, 0, sizeof(result));
if (argc < 2) if (argc < 2)
{ {
nerr("Input parameters are invalid!\n"); nerr("Input parameters are invalid!\n");
return ret; return ret;
} }
strlcpy(ifname, argv[1], sizeof(ifname)); ret = netlib_obtain_ipv6addr(argv[1]);
if (ret)
if (argc == 2)
{ {
ret = netlib_icmpv6_autoconfiguration(ifname); nerr("obtain ipv6addr fail\n");
if (ret)
{
nerr("netlib_icmpv6_autoconfiguration fail\n");
return ret;
}
}
else
{
dhcp6c_set_lladdr(ifname);
handle = dhcp6c_open(ifname);
ret = dhcp6c_request(handle, &result);
if (ret != OK)
{
nerr("dhcp6c_request fail\n");
}
setup_result(ifname, &result);
dhcp6c_close(handle);
} }
return ret; return ret;