From 7a7c7ee93a0dd029a7709d31fc2ede45a894f150 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 11 Aug 2017 15:56:53 -0600 Subject: [PATCH] Update README and fix some conditional compilation from the last commit. --- nshlib/README.txt | 21 ++++++++++++++++----- nshlib/nsh.h | 7 +++---- nshlib/nsh_command.c | 2 +- nshlib/nsh_routecmds.c | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/nshlib/README.txt b/nshlib/README.txt index 35ab6c43b..5c8e6b02c 100644 --- a/nshlib/README.txt +++ b/nshlib/README.txt @@ -1031,6 +1031,13 @@ o rmmod NAME INIT UNINIT ARG TEXT SIZE DATA SIZE nsh> +o route ipv4|ipv6 + + Show the contents of routing table for IPv4 or IPv6. + + If only IPv4 or IPv6 is enabled, then the argument is optional but, if provided, + must match the enabled internet protocol version. + o set [{+|-}{e|x|xe|ex}] [ ] Set the environment variable to the sting and or set NSH @@ -1298,6 +1305,9 @@ Command Dependencies on Configuration Settings rm (((!CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_WRITABLE) || !CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_DESCRIPTORS > 0) rmdir (((!CONFIG_DISABLE_MOUNTPOINT && CONFIG_FS_WRITABLE) || !CONFIG_DISABLE_PSEUDOFS_OPERATIONS) && CONFIG_NFILE_DESCRIPTORS > 0) rmmod CONFIG_MODULE + route CONFIG_FS_PROCFS && CONFIG_FS_PROCFS_EXCLUDE_NET && + !CONFIG_FS_PROCFS_EXCLUDE_ROUTE && CONFIG_NET_ROUTE && + !CONFIG_NSH_DISABLE_ROUTE && (CONFIG_NET_IPv4 || CONFIG_NET_IPv6) set !CONFIG_DISABLE_ENVIRON sh CONFIG_NFILE_DESCRIPTORS > 0 && CONFIG_NFILE_STREAMS > 0 && !CONFIG_NSH_DISABLESCRIPT shutdown CONFIG_BOARDCTL_POWEROFF || CONFIG_BOARDCTL_RESET @@ -1347,11 +1357,12 @@ also allow it to squeeze into very small memory footprints. CONFIG_NSH_DISABLE_PING6, CONFIG_NSH_DISABLE_POWEROFF, CONFIG_NSH_DISABLE_PS, CONFIG_NSH_DISABLE_PUT, CONFIG_NSH_DISABLE_PWD, CONFIG_NSH_DISABLE_READLINK, CONFIG_NSH_DISABLE_REBOOT, CONFIG_NSH_DISABLE_RM, CONFIG_NSH_DISABLE_RMDIR, - CONFIG_NSH_DISABLE_SET, CONFIG_NSH_DISABLE_SH, CONFIG_NSH_DISABLE_SHUTDOWN, - CONFIG_NSH_DISABLE_SLEEP, CONFIG_NSH_DISABLE_TEST, CONFIG_NSH_DIABLE_TIME, - CONFIG_NSH_DISABLE_UMOUNT, CONFIG_NSH_DISABLE_UNSET, CONFIG_NSH_DISABLE_URLDECODE, - CONFIG_NSH_DISABLE_URLENCODE, CONFIG_NSH_DISABLE_USERADD, CONFIG_NSH_DISABLE_USERDEL, - CONFIG_NSH_DISABLE_USLEEP, CONFIG_NSH_DISABLE_WGET, CONFIG_NSH_DISABLE_XD + CONFIG_NSH_DISABLE_ROUTE, CONFIG_NSH_DISABLE_SET, CONFIG_NSH_DISABLE_SH, + CONFIG_NSH_DISABLE_SHUTDOWN, CONFIG_NSH_DISABLE_SLEEP, CONFIG_NSH_DISABLE_TEST, + CONFIG_NSH_DIABLE_TIME, CONFIG_NSH_DISABLE_UMOUNT, CONFIG_NSH_DISABLE_UNSET, + CONFIG_NSH_DISABLE_URLDECODE, CONFIG_NSH_DISABLE_URLENCODE, CONFIG_NSH_DISABLE_USERADD, + CONFIG_NSH_DISABLE_USERDEL, CONFIG_NSH_DISABLE_USLEEP, CONFIG_NSH_DISABLE_WGET, + CONFIG_NSH_DISABLE_XD Verbose help output can be suppressed by defining CONFIG_NSH_HELP_TERSE. In that case, the help command is still available but will be slightly smaller. diff --git a/nshlib/nsh.h b/nshlib/nsh.h index 6121eefb7..56b7f1c68 100644 --- a/nshlib/nsh.h +++ b/nshlib/nsh.h @@ -187,10 +187,9 @@ #if !defined(CONFIG_FS_PROCFS) || defined(CONFIG_FS_PROCFS_EXCLUDE_NET) || \ defined(CONFIG_FS_PROCFS_EXCLUDE_ROUTE) || !defined(CONFIG_NET_ROUTE) || \ - defined(CONFIG_NSH_DISABLE_ROUTE) || \ (!defined(CONFIG_NET_IPv4) && !defined(CONFIG_NET_IPv6)) -# ifndef CONFIG_FS_PROCFS_EXCLUDE_ROUTE -# define CONFIG_FS_PROCFS_EXCLUDE_ROUTE 1 +# ifndef CONFIG_NSH_DISABLE_ROUTE +# define CONFIG_NSH_DISABLE_ROUTE 1 # endif #endif @@ -1198,7 +1197,7 @@ int cmd_lsmod(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); int cmd_wget(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # endif -# ifndef CONFIG_FS_PROCFS_EXCLUDE_ROUTE +# ifndef CONFIG_NSH_DISABLE_ROUTE int cmd_route(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv); # endif # if defined(CONFIG_NSH_TELNET) diff --git a/nshlib/nsh_command.c b/nshlib/nsh_command.c index ad485e49c..a7b539cbe 100644 --- a/nshlib/nsh_command.c +++ b/nshlib/nsh_command.c @@ -436,7 +436,7 @@ static const struct cmdmap_s g_cmdmap[] = { "rmmod", cmd_rmmod, 2, 2, "" }, #endif -#ifndef CONFIG_FS_PROCFS_EXCLUDE_ROUTE +#ifndef CONFIG_NSH_DISABLE_ROUTE #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6) { "route", cmd_route, 2, 2, "ipv4|ipv6" }, #elif defined(CONFIG_NET_IPv4) diff --git a/nshlib/nsh_routecmds.c b/nshlib/nsh_routecmds.c index 9d6989cb7..a06b50d03 100644 --- a/nshlib/nsh_routecmds.c +++ b/nshlib/nsh_routecmds.c @@ -636,7 +636,7 @@ errout: * ****************************************************************************/ -#ifndef CONFIG_FS_PROCFS_EXCLUDE_ROUTE +#ifndef CONFIG_NSH_DISABLE_ROUTE int cmd_route(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv) { #if defined(CONFIG_NET_IPv4) && defined(CONFIG_NET_IPv6)