From 2984fa3911196de3d857fdaa16da54ed052e7293 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sun, 21 May 2017 10:51:26 -0600 Subject: [PATCH] apps/system/dhcpc: Add a command to renew or establish a lease on an IPv4 address. --- examples/buttons/Kconfig | 6 +- netutils/dhcpc/dhcpc.c | 1 + system/dhcpc/.gitignore | 11 +++ system/dhcpc/Kconfig | 32 +++++++++ system/dhcpc/Make.defs | 40 +++++++++++ system/dhcpc/Makefile | 142 ++++++++++++++++++++++++++++++++++++++ system/dhcpc/dhcpc_main.c | 138 ++++++++++++++++++++++++++++++++++++ 7 files changed, 367 insertions(+), 3 deletions(-) create mode 100644 system/dhcpc/.gitignore create mode 100644 system/dhcpc/Kconfig create mode 100644 system/dhcpc/Make.defs create mode 100644 system/dhcpc/Makefile create mode 100644 system/dhcpc/dhcpc_main.c diff --git a/examples/buttons/Kconfig b/examples/buttons/Kconfig index 96910293c..32a9e5aed 100644 --- a/examples/buttons/Kconfig +++ b/examples/buttons/Kconfig @@ -21,15 +21,15 @@ config EXAMPLES_BUTTONS_PROGNAME program is installed. config EXAMPLES_BUTTONS_PRIORITY - int "LED task priority" + int "Button task priority" default 100 config EXAMPLES_BUTTONS_STACKSIZE - int "LED stack size" + int "Button stack size" default 2048 config EXAMPLES_BUTTONS_DEVPATH - string "LED device path" + string "Button device path" default "/dev/buttons" config EXAMPLES_BUTTONS_NAMES diff --git a/netutils/dhcpc/dhcpc.c b/netutils/dhcpc/dhcpc.c index 0f900df44..9f4c7e52d 100644 --- a/netutils/dhcpc/dhcpc.c +++ b/netutils/dhcpc/dhcpc.c @@ -541,6 +541,7 @@ int dhcpc_request(FAR void *handle, FAR struct dhcpc_state *presult) { return ERROR; } + retries++; /* Get the ACK/NAK response to the REQUEST (or timeout) */ diff --git a/system/dhcpc/.gitignore b/system/dhcpc/.gitignore new file mode 100644 index 000000000..fa1ec7579 --- /dev/null +++ b/system/dhcpc/.gitignore @@ -0,0 +1,11 @@ +/Make.dep +/.depend +/.built +/*.asm +/*.obj +/*.rel +/*.lst +/*.sym +/*.adb +/*.lib +/*.src diff --git a/system/dhcpc/Kconfig b/system/dhcpc/Kconfig new file mode 100644 index 000000000..51d59bf22 --- /dev/null +++ b/system/dhcpc/Kconfig @@ -0,0 +1,32 @@ +# +# For a description of the syntax of this configuration file, +# see the file kconfig-language.txt in the NuttX tools repository. +# + +config SYSTEM_DHCPC + bool "DHCP Address Renewal" + default n + select NETUTILS_DHCPC + depends on NET_UDP && NET_BROADCAST && NET_IPv4 + ---help--- + Enble the DHCP client 'renew' command + +if SYSTEM_DHCPC + +config SYSTEM_DHCPC_PROGNAME + string "Program name" + default "renew" + depends on BUILD_KERNEL + ---help--- + This is the name of the program that will be use when the NSH ELF + program is installed. + +config SYSTEM_DHCPC_PRIORITY + int "DHCPC task priority" + default 100 + +config SYSTEM_DHCPC_STACKSIZE + int "DHCPC stack size" + default 2048 + +endif diff --git a/system/dhcpc/Make.defs b/system/dhcpc/Make.defs new file mode 100644 index 000000000..7e559c2a2 --- /dev/null +++ b/system/dhcpc/Make.defs @@ -0,0 +1,40 @@ +############################################################################ +# apps/system/dhcpc/Make.defs +# Adds selected applications to apps/ build +# +# Copyright (C) 2017 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. +# +############################################################################ + +ifeq ($(CONFIG_SYSTEM_DHCPC),y) +CONFIGURED_APPS += system/dhcpc +endif + diff --git a/system/dhcpc/Makefile b/system/dhcpc/Makefile new file mode 100644 index 000000000..935277acf --- /dev/null +++ b/system/dhcpc/Makefile @@ -0,0 +1,142 @@ +############################################################################ +# apps/system/dhcpc/Makefile +# +# Copyright (C) 2017 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. +# +############################################################################ + +-include $(TOPDIR)/.config +-include $(TOPDIR)/Make.defs +include $(APPDIR)/Make.defs + +# DHCPC address renewal built-in application info + +CONFIG_SYSTEM_DHCPC_PRIORITY ?= SCHED_PRIORITY_DEFAULT +CONFIG_SYSTEM_DHCPC_STACKSIZE ?= 2048 + +APPNAME = renew +PRIORITY = $(CONFIG_SYSTEM_DHCPC_PRIORITY) +STACKSIZE = $(CONFIG_SYSTEM_DHCPC_STACKSIZE) + +CONFIG_SYSTEM_DHCPC_PROGNAME ?= renew$(EXEEXT) +PROGNAME = $(CONFIG_SYSTEM_DHCPC_PROGNAME) + +# DHCPC address renewal + +ASRCS = +CSRCS = +MAINSRC = dhcpc_main.c + +AOBJS = $(ASRCS:.S=$(OBJEXT)) +COBJS = $(CSRCS:.c=$(OBJEXT)) +MAINOBJ = $(MAINSRC:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) $(MAINSRC) +OBJS = $(AOBJS) $(COBJS) + +ifneq ($(CONFIG_BUILD_KERNEL),y) + OBJS += $(MAINOBJ) +endif + +ifeq ($(CONFIG_WINDOWS_NATIVE),y) + BIN = ..\..\libapps$(LIBEXT) +else +ifeq ($(WINTOOL),y) + BIN = ..\\..\\libapps$(LIBEXT) +else + BIN = ../../libapps$(LIBEXT) +endif +endif + +ifeq ($(WINTOOL),y) + INSTALL_DIR = "${shell cygpath -w $(BIN_DIR)}" +else + INSTALL_DIR = $(BIN_DIR) +endif + +ROOTDEPPATH = --dep-path . + +# Common build + +VPATH = + +all: .built +.PHONY: clean depend distclean + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS) $(MAINOBJ): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +.built: $(OBJS) + $(call ARCHIVE, $(BIN), $(OBJS)) + @touch .built + +ifeq ($(CONFIG_BUILD_KERNEL),y) +$(BIN_DIR)$(DELIM)$(PROGNAME): $(OBJS) $(MAINOBJ) + @echo "LD: $(PROGNAME)" + $(Q) $(LD) $(LDELFFLAGS) $(LDLIBPATH) -o $(INSTALL_DIR)$(DELIM)$(PROGNAME) $(ARCHCRT0OBJ) $(MAINOBJ) $(LDLIBS) + $(Q) $(NM) -u $(INSTALL_DIR)$(DELIM)$(PROGNAME) + +install: $(BIN_DIR)$(DELIM)$(PROGNAME) + +else +install: + +endif + +ifeq ($(CONFIG_NSH_BUILTIN_APPS),y) +$(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat: $(DEPCONFIG) Makefile + $(call REGISTER,$(APPNAME),$(PRIORITY),$(STACKSIZE),$(APPNAME)_main) + +context: $(BUILTIN_REGISTRY)$(DELIM)$(APPNAME)_main.bdat +else +context: +endif + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +clean: + $(call DELFILE, .built) + $(call CLEAN) + +distclean: clean + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) + +-include Make.dep +.PHONY: preconfig +preconfig: diff --git a/system/dhcpc/dhcpc_main.c b/system/dhcpc/dhcpc_main.c new file mode 100644 index 000000000..fd3deec1c --- /dev/null +++ b/system/dhcpc/dhcpc_main.c @@ -0,0 +1,138 @@ +/**************************************************************************** + * system/dhcpc/dhcpc_main.c + * + * Copyright (C) 2017 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 + +#include +#include + +#include + +#include "netutils/netlib.h" +#include "netutils/dhcpc.h" + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * dhcpc_showusage + ****************************************************************************/ + +static void dhcpc_showusage(FAR const char *progname, int exitcode) +{ + fprintf(stderr, "Usage: %s \n"); + exit(exitcode); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * dhcpc_main + ****************************************************************************/ + +#ifdef CONFIG_BUILD_KERNEL +int main(int argc, FAR char *argv[]) +#else +int dhcpc_main(int argc, char *argv[]) +#endif +{ + FAR const char *devname; + FAR void *handle; + uint8_t mac[IFHWADDRLEN]; + struct dhcpc_state ds; + int ret; + + /* One and only one argument is expected: The network device name. */ + + if (argc != 2) + { + fprintf(stderr, "ERROR: Invalid number of arguments\n"); + dhcpc_showusage(argv[0], EXIT_FAILURE); + } + + devname = argv[1]; + + /* Get the MAC address of the NIC */ + + netlib_getmacaddr(devname, mac); + + /* Set up the DHCPC modules */ + + handle = dhcpc_open(devname, &mac, IFHWADDRLEN); + if (handle == NULL) + { + fprintf(stderr, "ERROR: dhcpc_open() for '%s' failed\n", devname); + return EXIT_FAILURE; + } + + /* Get an IP address. */ + + ret = dhcpc_request(handle, &ds); + if (ret < 0) + { + (void)dhcpc_close(handle); + fprintf(stderr, "ERROR: dhcpc_request() failed\n"); + return EXIT_FAILURE; + } + + /* Save the addresses that we obtained. */ + + netlib_set_ipv4addr(devname, &ds.ipaddr); + + if (ds.netmask.s_addr != 0) + { + netlib_set_ipv4netmask(devname, &ds.netmask); + } + + if (ds.default_router.s_addr != 0) + { + netlib_set_dripv4addr(devname, &ds.default_router); + } + + if (ds.dnsaddr.s_addr != 0) + { + netlib_set_ipv4dnsaddr(&ds.dnsaddr); + } + + dhcpc_close(handle); + return EXIT_SUCCESS; +}