Add ifconfig command to NSH
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@441 7fd9a85b-ad96-42d3-883c-3090e2eb8679
This commit is contained in:
patacongo
parent
1a002a2015
commit
04e9ae73fe
|
|
@ -26,11 +26,31 @@ examples/ostest
|
|||
examples/nsh
|
||||
^^^^^^^^^^^^
|
||||
|
||||
This directory containst the NuttShell (NSH). This is a primitive
|
||||
This directory containst the NuttShell (NSH). This is a simple
|
||||
shell-like application. With some additional development, NSH will
|
||||
someday be a great NuttX application debugger.
|
||||
someday be a great NuttX application debugger. At present, NSH
|
||||
supports the following commands:
|
||||
|
||||
The behavior of NSH can be modified with the following settings in
|
||||
Command Depends on Configuration
|
||||
---------- --------------------------
|
||||
cat CONFIG_NFILE_DESCRIPTORS > 0
|
||||
cp CONFIG_NFILE_DESCRIPTORS > 0
|
||||
echo --
|
||||
exec --
|
||||
exit --
|
||||
help --
|
||||
ifconfig CONFIG_NET && CONFIG_NSOCKET_DESCRIPTORS > 0
|
||||
ls CONFIG_NFILE_DESCRIPTORS > 0
|
||||
mkdir !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0
|
||||
mount !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0
|
||||
ps --
|
||||
set !CONFIG_DISABLE_ENVIRON
|
||||
rm !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0
|
||||
rmdir !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0
|
||||
umount !CONFIG_DISABLE_MOUNTPOINT && CONFIG_NFILE_DESCRIPTORS > 0
|
||||
unset !CONFIG_DISABLE_ENVIRON
|
||||
|
||||
Other behavior of NSH can be modified with the following settings in
|
||||
the configs/<board-name>/defconfig file:
|
||||
|
||||
* CONFIG_NSH_IOBUFFERSIZE
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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>" },
|
||||
|
|
|
|||
|
|
@ -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 */
|
||||
Loading…
Reference in New Issue