2008-02-19 Joel Sherrill <joel.sherrill@oarcorp.com>

	* libmisc/Makefile.am, libmisc/shell/main_wkspaceinfo.c,
	libmisc/shell/shell.c, libmisc/shell/shellconfig.h: Add route and
	ifconfig commands. The code for these was previously in the
	networking guide. Disable NFS filesystem mount until that code is in
	cpukit.
	* libmisc/shell/main_ifconfig.c, libmisc/shell/main_route.c: New files.

7 files changed, 434 insertions, 6 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 5896cb7944..45fa765308 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-19	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* libmisc/Makefile.am, libmisc/shell/main_wkspaceinfo.c,
+	libmisc/shell/shell.c, libmisc/shell/shellconfig.h: Add route and
+	ifconfig commands. The code for these was previously in the
+	networking guide. Disable NFS filesystem mount until that code is in
+	cpukit.
+	* libmisc/shell/main_ifconfig.c, libmisc/shell/main_route.c: New files.
+
 2008-02-16	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* posix/preinstall.am,  libcsupport/preinstall.am:
diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am
index f23cb6f06c..57fdaddb71 100644
--- a/cpukit/libmisc/Makefile.am
+++ b/cpukit/libmisc/Makefile.am
@@ -83,8 +83,9 @@ libshell_a_SOURCES = shell/cat_file.c shell/cmds.c shell/internal.h \
     shell/vwarn.c shell/vwarnx.c shell/warn.c shell/warnx.c \
     shell/fts.c shell/print_heapinfo.c shell/main_wkspaceinfo.c
 if LIBNETWORKING
-libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_nfs.c \
-    shell/main_mount_tftp.c
+libshell_a_SOURCES += shell/main_mount_ftp.c shell/main_mount_tftp.c \
+    shell/main_ifconfig.c shell/main_route.c
+##libshell_a_SOURCES += shell/main_mount_nfs.c
 endif
 endif
 
diff --git a/cpukit/libmisc/shell/main_ifconfig.c b/cpukit/libmisc/shell/main_ifconfig.c
new file mode 100644
index 0000000000..b6bb192a4f
--- /dev/null
+++ b/cpukit/libmisc/shell/main_ifconfig.c
@@ -0,0 +1,243 @@
+/*
+ *  IFCONFIG Command Implmentation
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <net/if.h>
+
+
+#include <rtems.h>
+#include <rtems/rtems_bsdnet.h>
+#include <rtems/shell.h>
+#include "internal.h"
+
+int rtems_shell_main_ifconfig(
+  int   argc,
+  char *argv[]
+)
+{
+  struct sockaddr_in  ipaddr;
+  struct sockaddr_in  dstaddr;
+  struct sockaddr_in  netmask;
+  struct sockaddr_in  broadcast;
+  char               *iface;
+  int                 f_ip        = 0;
+  int                 f_ptp       = 0;
+  int                 f_netmask   = 0;
+  int                 f_up        = 0;
+  int                 f_down      = 0;
+  int                 f_bcast     = 0;
+  int                 cur_idx;
+  int                 rc;
+  int                 flags;
+
+  bzero((void*) &ipaddr, sizeof(ipaddr));
+  bzero((void*) &dstaddr, sizeof(dstaddr));
+  bzero((void*) &netmask, sizeof(netmask));
+  bzero((void*) &broadcast, sizeof(broadcast));
+    
+  ipaddr.sin_len = sizeof(ipaddr);
+  ipaddr.sin_family = AF_INET;
+  
+  dstaddr.sin_len = sizeof(dstaddr);
+  dstaddr.sin_family = AF_INET;
+  
+  netmask.sin_len = sizeof(netmask);
+  netmask.sin_family = AF_INET;
+  
+  broadcast.sin_len = sizeof(broadcast);
+  broadcast.sin_family = AF_INET;
+  
+  cur_idx = 0;
+  if (argc <= 1) {
+    /* display all interfaces */
+    iface = NULL;
+    cur_idx += 1;
+  } else {
+    iface = argv[1];
+    if (isdigit(*argv[2])) {
+      if (inet_pton(AF_INET, argv[2], &ipaddr.sin_addr) < 0) {
+        printf("bad ip address: %s\n", argv[2]);
+        return 0;
+      }
+      f_ip = 1;
+      cur_idx += 3;
+    } else {
+      cur_idx += 2;
+    }
+  }
+  
+  if ((f_down !=0) && (f_ip != 0)) {
+    f_up = 1;
+  }
+  
+  while(argc > cur_idx) {
+    if (strcmp(argv[cur_idx], "up") == 0) {
+      f_up = 1;
+      if (f_down != 0) {
+        printf("Can't make interface up and down\n");
+      }
+    } else if(strcmp(argv[cur_idx], "down") == 0) {
+      f_down = 1;
+      if (f_up != 0) {
+        printf("Can't make interface up and down\n");
+        }
+    } else if(strcmp(argv[cur_idx], "netmask") == 0) {
+      if ((cur_idx + 1) >= argc) {
+        printf("No netmask address\n");
+        return -1;
+      } 
+      if (inet_pton(AF_INET, argv[cur_idx+1], &netmask.sin_addr) < 0) {
+        printf("bad netmask: %s\n", argv[cur_idx]);
+        return -1;
+      }
+      f_netmask = 1;
+      cur_idx += 1;
+    } else if(strcmp(argv[cur_idx], "broadcast") == 0) {
+      if ((cur_idx + 1) >= argc) {
+        printf("No broadcast address\n");
+        return -1;
+      } 
+      if (inet_pton(AF_INET, argv[cur_idx+1], &broadcast.sin_addr) < 0) {
+        printf("bad broadcast: %s\n", argv[cur_idx]);
+        return -1;
+      }
+      f_bcast = 1;
+      cur_idx += 1;
+    } else if(strcmp(argv[cur_idx], "pointopoint") == 0) {
+      if ((cur_idx + 1) >= argc) {
+        printf("No pointopoint address\n");
+        return -1;
+      } 
+      if (inet_pton(AF_INET, argv[cur_idx+1], &dstaddr.sin_addr) < 0) {
+        printf("bad pointopoint: %s\n", argv[cur_idx]);
+        return -1;
+      }
+      f_ptp = 1;
+      cur_idx += 1;
+    } else {
+      printf("Bad parameter: %s\n", argv[cur_idx]);
+      return -1;
+    }
+    cur_idx += 1;
+  }
+  
+  printf("ifconfig ");
+  if (iface != NULL) {
+    printf("%s ", iface);
+    if (f_ip != 0) {
+      char str[256];
+      inet_ntop(AF_INET, &ipaddr.sin_addr, str, 256);
+      printf("%s ", str);
+    }
+      
+    if (f_netmask != 0) {
+      char str[256];
+      inet_ntop(AF_INET, &netmask.sin_addr, str, 256);
+      printf("netmask %s ", str);
+    }
+      
+    if (f_bcast != 0) {
+      char str[256];
+      inet_ntop(AF_INET, &broadcast.sin_addr, str, 256);
+      printf("broadcast %s ", str);
+    }
+      
+    if (f_ptp != 0) {
+      char str[256];
+      inet_ntop(AF_INET, &dstaddr.sin_addr, str, 256);
+      printf("pointopoint %s ", str);
+    }
+      
+    if (f_up != 0) {
+      printf("up\n");
+    } else if (f_down != 0) {
+      printf("down\n");
+    } else {
+      printf("\n");
+    }
+  }
+  
+  if ((iface == NULL) || ((f_ip == 0) && (f_down == 0) && (f_up == 0))) {
+    rtems_bsdnet_show_if_stats();
+    return 0;
+  }
+  
+  flags = 0;
+  if (f_netmask) {
+    rc = rtems_bsdnet_ifconfig(iface, SIOCSIFNETMASK, &netmask);
+    if (rc < 0) {
+      printf("Could not set netmask: %s\n", strerror(errno));
+      return -1;
+    }
+  }
+  
+  if (f_bcast) {
+    rc = rtems_bsdnet_ifconfig(iface, SIOCSIFBRDADDR, &broadcast);
+    if (rc < 0) {
+      printf("Could not set broadcast: %s\n", strerror(errno));
+      return -1;
+    }
+  }
+  
+  if (f_ptp) {
+    rc = rtems_bsdnet_ifconfig(iface, SIOCSIFDSTADDR, &dstaddr);
+    if (rc < 0) {
+      printf("Could not set destination address: %s\n", strerror(errno));
+      return -1;
+    }
+    flags |= IFF_POINTOPOINT;
+  }
+  
+  /* This must come _after_ setting the netmask, broadcast addresses */    
+  if (f_ip) {
+    rc = rtems_bsdnet_ifconfig(iface, SIOCSIFADDR, &ipaddr);
+    if (rc < 0) {
+      printf("Could not set IP address: %s\n", strerror(errno));
+      return -1;
+    }
+  }
+  
+  if (f_up != 0) {
+    flags |= IFF_UP;
+  }
+  
+  if (f_down != 0) {
+    printf("Warning: taking interfaces down is not supported\n");
+  }
+  
+  rc = rtems_bsdnet_ifconfig(iface, SIOCSIFFLAGS, &flags);
+  if (rc < 0) {
+    printf("Could not set interface flags: %s\n", strerror(errno));
+    return -1;
+  }
+
+  return 0;
+}
+
+rtems_shell_cmd_t rtems_shell_IFCONFIG_Command = {
+  "ifconfig",                                      /* name */
+  "TBD",                                           /* usage */
+  "network",                                       /* topic */
+  rtems_shell_main_ifconfig,                       /* command */
+  NULL,                                            /* alias */
+  NULL                                             /* next */
+};
diff --git a/cpukit/libmisc/shell/main_route.c b/cpukit/libmisc/shell/main_route.c
new file mode 100644
index 0000000000..f10b2509d4
--- /dev/null
+++ b/cpukit/libmisc/shell/main_route.c
@@ -0,0 +1,153 @@
+/*
+ *  ROUTE Command Implmentation
+ *
+ *  The license and distribution terms for this file may be
+ *  found in the file LICENSE in this distribution or at
+ *  http://www.rtems.com/license/LICENSE.
+ *
+ *  $Id$
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+#include <net/route.h>
+
+#include <rtems.h>
+#include <rtems/rtems_bsdnet.h>
+#include <rtems/shell.h>
+#include "internal.h"
+
+int rtems_shell_main_route(
+  int   argc,
+  char *argv[]
+)
+{
+  int                cmd;
+  struct sockaddr_in dst;
+  struct sockaddr_in gw;
+  struct sockaddr_in netmask;
+  int                f_host;
+  int                f_gw       = 0;
+  int                cur_idx;
+  int                flags;
+  int                rc;
+  
+  memset(&dst, 0, sizeof(dst));
+  memset(&gw, 0, sizeof(gw));
+  memset(&netmask, 0, sizeof(netmask));
+  
+  dst.sin_len = sizeof(dst);
+  dst.sin_family = AF_INET;
+  dst.sin_addr.s_addr = inet_addr("0.0.0.0");  
+  
+  gw.sin_len = sizeof(gw);
+  gw.sin_family = AF_INET;
+  gw.sin_addr.s_addr = inet_addr("0.0.0.0"); 
+  
+  netmask.sin_len = sizeof(netmask);
+  netmask.sin_family = AF_INET;
+  netmask.sin_addr.s_addr = inet_addr("255.255.255.0"); 
+  
+  if (argc < 2) {
+    rtems_bsdnet_show_inet_routes();
+    return 0;
+  } 
+  
+  if (strcmp(argv[1], "add") == 0) {
+    cmd = RTM_ADD;
+  } else if (strcmp(argv[1], "del") == 0) {
+    cmd = RTM_DELETE;
+  } else {
+    printf("invalid command: %s\n", argv[1]);
+    printf("\tit should be 'add' or 'del'\n");
+    return -1;
+  }
+  
+  if (argc < 3) {
+    printf("not enough arguments\n");
+    return -1;
+  }
+  
+  if (strcmp(argv[2], "-host") == 0) {
+    f_host = 1;
+  } else if (strcmp(argv[2], "-net") == 0) {
+    f_host = 0;
+  } else {
+    printf("Invalid type: %s\n", argv[1]);
+    printf("\tit should be '-host' or '-net'\n");
+    return -1;
+  }
+  
+  if (argc < 4) {
+    printf("not enough arguments\n");
+    return -1;
+  }
+  
+  inet_pton(AF_INET, argv[3], &dst.sin_addr);
+  
+  cur_idx = 4;
+  while(cur_idx < argc) {
+    if (strcmp(argv[cur_idx], "gw") == 0) {
+      if ((cur_idx +1) >= argc) {
+        printf("no gateway address\n");
+        return -1;
+      }
+      f_gw = 1;
+      inet_pton(AF_INET, argv[cur_idx + 1], &gw.sin_addr);
+      cur_idx += 1;
+    } else if(strcmp(argv[cur_idx], "netmask") == 0) {
+      if ((cur_idx +1) >= argc) {
+        printf("no netmask address\n");
+        return -1;
+      }
+      f_gw = 1;
+      inet_pton(AF_INET, argv[cur_idx + 1], &netmask.sin_addr);
+      cur_idx += 1;
+    } else {
+      printf("Unknown argument\n");
+      return -1;
+    }
+    cur_idx += 1;
+  }
+  
+  flags = RTF_STATIC;
+  if (f_gw != 0) {
+    flags |= RTF_GATEWAY;
+  }
+  if (f_host != 0) {
+    flags |= RTF_HOST;
+  }
+
+  rc = rtems_bsdnet_rtrequest(
+    cmd,
+    (struct sockaddr *)&dst,
+    (struct sockaddr *)&gw,
+    (struct sockaddr *)&netmask,
+    flags,
+    NULL
+  );
+  if (rc < 0) {
+    printf("Error adding route\n");
+  }
+
+  return 0;
+}
+
+rtems_shell_cmd_t rtems_shell_ROUTE_Command = {
+  "route",                                         /* name */
+  "TBD",                                           /* usage */
+  "network",                                       /* topic */
+  rtems_shell_main_route,                          /* command */
+  NULL,                                            /* alias */
+  NULL                                             /* next */
+};
diff --git a/cpukit/libmisc/shell/main_wkspaceinfo.c b/cpukit/libmisc/shell/main_wkspaceinfo.c
index e3b3492d39..b5df7a4b42 100644
--- a/cpukit/libmisc/shell/main_wkspaceinfo.c
+++ b/cpukit/libmisc/shell/main_wkspaceinfo.c
@@ -21,6 +21,7 @@
 #include <rtems.h>
 #include <rtems/malloc.h>
 #include <rtems/shell.h>
+#include <rtems/score/protectedheap.h>
 #include "internal.h"
 
 int rtems_shell_main_wkspace_info(
@@ -31,8 +32,7 @@ int rtems_shell_main_wkspace_info(
   Heap_Information_block info;
   extern void classinfo_tester();
 
-  /* XXX lock allocator and do not violate visibility */
-  _Heap_Get_information( &_Workspace_Area, &info );
+  _Protected_heap_Get_information( &_Workspace_Area, &info );
   rtems_shell_print_heap_info( "free", &info.Free );
   rtems_shell_print_heap_info( "used", &info.Used );
 
@@ -41,7 +41,7 @@ int rtems_shell_main_wkspace_info(
 
 rtems_shell_cmd_t rtems_shell_WKSPACE_INFO_Command = {
   "wkspace",                                  /* name */
-  "",                                         /* usage */
+  "Report on RTEMS Executive Workspace",      /* usage */
   "rtems",                                    /* topic */
   rtems_shell_main_wkspace_info,              /* command */
   NULL,                                       /* alias */
diff --git a/cpukit/libmisc/shell/shell.c b/cpukit/libmisc/shell/shell.c
index 2cbbff924c..eca05f19e8 100644
--- a/cpukit/libmisc/shell/shell.c
+++ b/cpukit/libmisc/shell/shell.c
@@ -488,7 +488,6 @@ fprintf( stderr,
         if (!rtems_shell_scanline(cmd,sizeof(cmd),stdin,stdout)) {
           break; /*EOF*/
         }
-
         line++;
 
         /* evaluate cmd section */
diff --git a/cpukit/libmisc/shell/shellconfig.h b/cpukit/libmisc/shell/shellconfig.h
index d24fa3d93f..3865c398f5 100644
--- a/cpukit/libmisc/shell/shellconfig.h
+++ b/cpukit/libmisc/shell/shellconfig.h
@@ -55,6 +55,12 @@ extern rtems_shell_cmd_t rtems_shell_STACKUSE_Command;
 extern rtems_shell_cmd_t rtems_shell_PERIODUSE_Command;
 extern rtems_shell_cmd_t rtems_shell_WKSPACE_INFO_Command;
 extern rtems_shell_cmd_t rtems_shell_MALLOC_INFO_Command;
+#if RTEMS_NETWORKING
+  #if defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING)
+    extern rtems_shell_cmd_t rtems_shell_IFCONFIG_Command;
+    extern rtems_shell_cmd_t rtems_shell_ROUTE_Command;
+  #endif
+#endif
 
 extern rtems_shell_cmd_t *rtems_shell_Initial_commands[];
 
@@ -305,6 +311,23 @@ extern rtems_shell_filesystems_t *rtems_shell_Mount_filesystems[];
     #endif
 
     /*
+     *  Network related commands
+     */
+    #if RTEMS_NETWORKING
+      #if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \
+           !defined(CONFIGURE_SHELL_COMMAND_IFCONFIG)) || \
+          defined(CONFIGURE_SHELL_COMMAND_IFCONFIG)
+        &rtems_shell_IFCONFIG_Command,
+      #endif
+
+      #if (defined(CONFIGURE_SHELL_COMMANDS_ALL_NETWORKING) && \
+           !defined(CONFIGURE_SHELL_COMMAND_ROUTE)) || \
+          defined(CONFIGURE_SHELL_COMMAND_ROUTE)
+        &rtems_shell_ROUTE_Command,
+      #endif
+    #endif
+
+    /*
      *  User defined shell commands
      */
     #if defined(CONFIGURE_SHELL_USER_COMMANDS)