diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:24:49 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-12-11 14:24:49 +0000 |
commit | 71d243809b6f25b4d1d4265c74a5ea6f5d763490 (patch) | |
tree | 3ed44272a5f09444097e1c9dff416eb0f93967a8 /nuttx/examples/nsh | |
parent | 795f8ff4f8135c5daf68a52ebadcef61b63be04d (diff) | |
download | px4-nuttx-71d243809b6f25b4d1d4265c74a5ea6f5d763490.tar.gz px4-nuttx-71d243809b6f25b4d1d4265c74a5ea6f5d763490.tar.bz2 px4-nuttx-71d243809b6f25b4d1d4265c74a5ea6f5d763490.zip |
Add ifconfig command to NSH
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@441 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/examples/nsh')
-rw-r--r-- | nuttx/examples/nsh/Makefile | 6 | ||||
-rw-r--r-- | nuttx/examples/nsh/nsh.h | 3 | ||||
-rw-r--r-- | nuttx/examples/nsh/nsh_main.c | 33 | ||||
-rw-r--r-- | nuttx/examples/nsh/nsh_netcmds.c | 110 |
4 files changed, 137 insertions, 15 deletions
diff --git a/nuttx/examples/nsh/Makefile b/nuttx/examples/nsh/Makefile index ef812a00d..56c5611a0 100644 --- a/nuttx/examples/nsh/Makefile +++ b/nuttx/examples/nsh/Makefile @@ -41,6 +41,12 @@ MKDEP = $(TOPDIR)/tools/mkdeps.sh ASRCS = CSRCS = nsh_main.c nsh_fscmds.c nsh_proccmds.c nsh_envcmds.c +ifeq ($(CONFIG_NET),y) +ifneq ($(CONFIG_NSOCKET_DESCRIPTORS),0) +CSRCS += nsh_netcmds.c +endif +endif + ifeq ($(CONFIG_EXAMPLES_NSH_TELNET),y) CSRCS += nsh_telnetd.c else diff --git a/nuttx/examples/nsh/nsh.h b/nuttx/examples/nsh/nsh.h index 7d0179b8e..39514656a 100644 --- a/nuttx/examples/nsh/nsh.h +++ b/nuttx/examples/nsh/nsh.h @@ -110,6 +110,9 @@ extern void cmd_cp(FAR void *handle, int argc, char **argv); extern void cmd_echo(FAR void *handle, int argc, char **argv); extern void cmd_exec(FAR void *handle, int argc, char **argv); extern void cmd_exit(FAR void *handle, int argc, char **argv); +#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 +extern void cmd_ifconfig(FAR void *handle, int argc, char **argv); +#endif #if CONFIG_NFILE_DESCRIPTORS > 0 extern void cmd_ls(FAR void *handle, int argc, char **argv); #endif diff --git a/nuttx/examples/nsh/nsh_main.c b/nuttx/examples/nsh/nsh_main.c index cb65833d1..72bd175a1 100644 --- a/nuttx/examples/nsh/nsh_main.c +++ b/nuttx/examples/nsh/nsh_main.c @@ -81,32 +81,35 @@ static const char delim[] = " \t\n"; static const struct cmdmap_s g_cmdmap[] = { #if CONFIG_NFILE_DESCRIPTORS > 0 - { "cat", cmd_cat, 2, 2, "<path>" }, - { "cp", cmd_cp, 3, 3, "<source-path> <dest-path>" }, + { "cat", cmd_cat, 2, 2, "<path>" }, + { "cp", cmd_cp, 3, 3, "<source-path> <dest-path>" }, #endif #ifndef CONFIG_DISABLE_ENVIRON - { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string|$name> [<string|$name>...]]" }, + { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string|$name> [<string|$name>...]]" }, #else - { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string> [<string>...]]" }, + { "echo", cmd_echo, 0, NSH_MAX_ARGUMENTS, "[<string> [<string>...]]" }, +#endif + { "exec", cmd_exec, 2, 3, "<hex-address>" }, + { "exit", cmd_exit, 1, 1, NULL }, + { "help", cmd_help, 1, 1, NULL }, +#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 + { "ifconfig", cmd_ifconfig, 1, 1, NULL }, #endif - { "exec", cmd_exec, 2, 3, "<hex-address>" }, - { "exit", cmd_exit, 1, 1, NULL }, - { "help", cmd_help, 1, 1, NULL }, #if CONFIG_NFILE_DESCRIPTORS > 0 - { "ls", cmd_ls, 2, 5, "[-lRs] <dir-path>" }, + { "ls", cmd_ls, 2, 5, "[-lRs] <dir-path>" }, #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 - { "mkdir", cmd_mkdir, 2, 2, "<path>" }, - { "mount", cmd_mount, 4, 5, "-t <fstype> <block-device> <dir-path>" }, + { "mkdir", cmd_mkdir, 2, 2, "<path>" }, + { "mount", cmd_mount, 4, 5, "-t <fstype> <block-device> <dir-path>" }, #endif - { "ps", cmd_ps, 1, 1, NULL }, + { "ps", cmd_ps, 1, 1, NULL }, #ifndef CONFIG_DISABLE_ENVIRON - { "set", cmd_set, 3, 3, "<name> <value>" }, + { "set", cmd_set, 3, 3, "<name> <value>" }, #endif #if !defined(CONFIG_DISABLE_MOUNTPOINT) && CONFIG_NFILE_DESCRIPTORS > 0 - { "rm", cmd_rm, 2, 2, "<file-path>" }, - { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, - { "umount", cmd_umount, 2, 2, "<dir-path>" }, + { "rm", cmd_rm, 2, 2, "<file-path>" }, + { "rmdir", cmd_rmdir, 2, 2, "<dir-path>" }, + { "umount", cmd_umount, 2, 2, "<dir-path>" }, #endif #ifndef CONFIG_DISABLE_ENVIRON { "unset", cmd_unset, 2, 2, "<name>" }, diff --git a/nuttx/examples/nsh/nsh_netcmds.c b/nuttx/examples/nsh/nsh_netcmds.c new file mode 100644 index 000000000..c58a23f07 --- /dev/null +++ b/nuttx/examples/nsh/nsh_netcmds.c @@ -0,0 +1,110 @@ +/**************************************************************************** + * examples/nsh/nsh_netcmds.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * 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 Gregory Nutt 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 <nuttx/config.h> +#if defined(CONFIG_NET) && CONFIG_NSOCKET_DESCRIPTORS > 0 + +#include <sys/types.h> +#include <stdio.h> +#include <stdlib.h> +#include <sched.h> + +#include <nuttx/net.h> +#include <net/ethernet.h> +#include <net/uip/uip.h> +#include <net/uip/uip-arch.h> +#include <netinet/ether.h> + +#include "nsh.h" + +/**************************************************************************** + * Definitions + ****************************************************************************/ + +/**************************************************************************** + * Private Types + ****************************************************************************/ + +/**************************************************************************** + * Private Function Prototypes + ****************************************************************************/ + +/**************************************************************************** + * Private Data + ****************************************************************************/ + +/**************************************************************************** + * Public Data + ****************************************************************************/ + +/**************************************************************************** + * Private Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: ifconfig_callback + ****************************************************************************/ + +int ifconfig_callback(FAR struct uip_driver_s *dev, void *arg) +{ + struct in_addr addr; + + nsh_output(arg, "%s\tHWaddr %s\n", dev->d_ifname, ether_ntoa(&dev->d_mac)); + addr.s_addr = dev->d_ipaddr; + nsh_output(arg, "\tIPaddr:%s ", inet_ntoa(addr)); + addr.s_addr = dev->d_draddr; + nsh_output(arg, "DRaddr:%s ", inet_ntoa(addr)); + addr.s_addr = dev->d_netmask; + nsh_output(arg, "Mask:%s\n", inet_ntoa(addr)); +} + +/**************************************************************************** + * Public Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: cmd_ifconfig + ****************************************************************************/ + +void cmd_ifconfig(FAR void *handle, int argc, char **argv) +{ + netdev_foreach(ifconfig_callback, handle); +} + +#endif /* CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS */ |