From 16c02a07d752ae976e8664307c1315dfd569c0c4 Mon Sep 17 00:00:00 2001 From: Pelle Windestam Date: Thu, 14 Jan 2016 07:24:36 -0600 Subject: [PATCH] Add netlib_get_dripv4addr() and netlib_get_ipv4netmask() --- ChangeLog.txt | 2 + include/netutils/netlib.h | 2 + netutils/netlib/Makefile | 1 + netutils/netlib/netlib_getdripv4addr.c | 105 ++++++++++++++++++++++++ netutils/netlib/netlib_getipv4netmask.c | 105 ++++++++++++++++++++++++ 5 files changed, 215 insertions(+) create mode 100644 netutils/netlib/netlib_getdripv4addr.c create mode 100644 netutils/netlib/netlib_getipv4netmask.c diff --git a/ChangeLog.txt b/ChangeLog.txt index 773a206dc..e7738f6a4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1508,3 +1508,5 @@ SIGEV_THREAD (20156-12-30). * apps/nshlib: Add a 'time' command that may be used to time the execution of other commands (2015-12-31). + * apps/netutils/netlib: Add netlib_get_dripv4addr() and + netlib_get_ipv4netmask(). From Pelle Windestam (2016-01-14). diff --git a/include/netutils/netlib.h b/include/netutils/netlib.h index 841c0724f..5c0613102 100644 --- a/include/netutils/netlib.h +++ b/include/netutils/netlib.h @@ -120,7 +120,9 @@ int netlib_getmacaddr(FAR const char *ifname, uint8_t *macaddr); int netlib_get_ipv4addr(FAR const char *ifname, FAR struct in_addr *addr); int netlib_set_ipv4addr(FAR const char *ifname, FAR const struct in_addr *addr); int netlib_set_dripv4addr(FAR const char *ifname, FAR const struct in_addr *addr); +int netlib_get_dripv4addr(FAR const char *ifname, FAR struct in_addr *addr); int netlib_set_ipv4netmask(FAR const char *ifname, FAR const struct in_addr *addr); +int netlib_get_ipv4netmask(FAR const char *ifname, FAR struct in_addr *addr); #endif #ifdef CONFIG_NET_IPv6 diff --git a/netutils/netlib/Makefile b/netutils/netlib/Makefile index a366a0119..b3545fe97 100644 --- a/netutils/netlib/Makefile +++ b/netutils/netlib/Makefile @@ -48,6 +48,7 @@ CSRCS += netlib_setifstatus.c netlib_getifstatus.c ifeq ($(CONFIG_NET_IPv4),y) CSRCS += netlib_setipv4addr.c netlib_getipv4addr.c CSRCS += netlib_setdripv4addr.c netlib_setipv4netmask.c +CSRCS += netlib_getdripv4addr.c netlib_getipv4netmask.c ifeq ($(CONFIG_NETDB_DNSCLIENT),y) CSRCS += netlib_setipv4dnsaddr.c netlib_getipv4dnsaddr.c endif diff --git a/netutils/netlib/netlib_getdripv4addr.c b/netutils/netlib/netlib_getdripv4addr.c new file mode 100644 index 000000000..d15fe5ab1 --- /dev/null +++ b/netutils/netlib/netlib_getdripv4addr.c @@ -0,0 +1,105 @@ +/**************************************************************************** + * netutils/netlib/netlib_getdripv4addr.c + * + * Copyright (C) 2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#if defined(CONFIG_NET_IPv4) && CONFIG_NSOCKET_DESCRIPTORS > 0 + +#include +#include + +#include +#include +#include + +#include +#include + +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: netlib_get_dripv4addr + * + * Description: + * Get the network driver IPv4 default router address + * + * Parameters: + * ifname The name of the interface to use + * ipaddr The location to return the default router address + * + * Return: + * 0 on success; -1 on failure + * + ****************************************************************************/ + +int netlib_get_dripv4addr(FAR const char *ifname, FAR struct in_addr *addr) +{ + int ret = ERROR; + + if (ifname && addr) + { + int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0); + if (sockfd >= 0) + { + struct ifreq req; + strncpy(req.ifr_name, ifname, IFNAMSIZ); + ret = ioctl(sockfd, SIOCGIFDSTADDR, (unsigned long)&req); + if (!ret) + { + FAR struct sockaddr_in *req_addr; + + req_addr = (FAR struct sockaddr_in*)&req.ifr_addr; + memcpy(addr, &req_addr->sin_addr, sizeof(struct in_addr)); + } + + close(sockfd); + } + } + + return ret; +} + +#endif /* CONFIG_NET_IPv4 && CONFIG_NSOCKET_DESCRIPTORS */ diff --git a/netutils/netlib/netlib_getipv4netmask.c b/netutils/netlib/netlib_getipv4netmask.c new file mode 100644 index 000000000..503f971f9 --- /dev/null +++ b/netutils/netlib/netlib_getipv4netmask.c @@ -0,0 +1,105 @@ +/**************************************************************************** + * netutils/netlib/netlib_getipv4netmask.c + * + * Copyright (C) 2016 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#if defined(CONFIG_NET_IPv4) && CONFIG_NSOCKET_DESCRIPTORS > 0 + +#include +#include + +#include +#include +#include + +#include +#include + +#include + +/**************************************************************************** + * Pre-processor Definitions + ****************************************************************************/ + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: netlib_get_ipv4netmask + * + * Description: + * Get the network driver IPv4 netmask + * + * Parameters: + * ifname The name of the interface to use + * ipaddr The location to return the netmask + * + * Return: + * 0 on success; -1 on failure + * + ****************************************************************************/ + +int netlib_get_ipv4netmask(FAR const char *ifname, FAR struct in_addr *addr) +{ + int ret = ERROR; + + if (ifname && addr) + { + int sockfd = socket(PF_INET, NETLIB_SOCK_IOCTL, 0); + if (sockfd >= 0) + { + struct ifreq req; + strncpy(req.ifr_name, ifname, IFNAMSIZ); + ret = ioctl(sockfd, SIOCGIFNETMASK, (unsigned long)&req); + if (!ret) + { + FAR struct sockaddr_in *req_addr; + + req_addr = (FAR struct sockaddr_in*)&req.ifr_addr; + memcpy(addr, &req_addr->sin_addr, sizeof(struct in_addr)); + } + + close(sockfd); + } + } + + return ret; +} + +#endif /* CONFIG_NET_IPv4 && CONFIG_NSOCKET_DESCRIPTORS */