Add interfaces flags, extend ifconfig, add ifup and ifdown commands (Darcy Gong

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5308 42af7a65-404d-4744-a932-0658087f49c3

1 files changed, 209 insertions, 13 deletions

diff --git a/apps/nshlib/nsh_netcmds.c b/apps/nshlib/nsh_netcmds.c
index f3457a809..d28fe873d 100644
--- a/apps/nshlib/nsh_netcmds.c
+++ b/apps/nshlib/nsh_netcmds.c
@@ -277,14 +277,34 @@ int ifconfig_callback(FAR struct uip_driver_s *dev, void *arg)
 {
   struct nsh_vtbl_s *vtbl = (struct nsh_vtbl_s*)arg;
   struct in_addr addr;
+  bool is_running = false;
+  int ret;
+
+  ret = uip_getifstatus(dev->d_ifname,&is_running);
+  if (ret != OK)
+    {
+      nsh_output(vtbl, "\tGet %s interface flags error: %d\n",
+                 dev->d_ifname, ret);
+    }
+
+  nsh_output(vtbl, "%s\tHWaddr %s at %s\n",
+             dev->d_ifname, ether_ntoa(&dev->d_mac), (is_running)?"UP":"DOWN");
 
-  nsh_output(vtbl, "%s\tHWaddr %s\n", dev->d_ifname, ether_ntoa(&dev->d_mac));
   addr.s_addr = dev->d_ipaddr;
   nsh_output(vtbl, "\tIPaddr:%s ", inet_ntoa(addr));
+
   addr.s_addr = dev->d_draddr;
   nsh_output(vtbl, "DRaddr:%s ", inet_ntoa(addr));
+
   addr.s_addr = dev->d_netmask;
-  nsh_output(vtbl, "Mask:%s\n\n", inet_ntoa(addr));
+  nsh_output(vtbl, "Mask:%s\n", inet_ntoa(addr));
+
+#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
+  resolv_getserver(&addr);
+  nsh_output(vtbl, "\tDNSaddr:%s\n", inet_ntoa(addr));
+#endif
+
+  nsh_output(vtbl, "\n");
   return OK;
 }
 
@@ -484,6 +504,54 @@ int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 #endif
 
 /****************************************************************************
+ * Name: cmd_ifup
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_IFUPDOWN
+int cmd_ifup(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  FAR char *intf = NULL;
+  int ret;
+
+  if (argc != 2)
+    {
+      nsh_output(vtbl, "Please select nic_name:\n");
+      netdev_foreach(ifconfig_callback, vtbl);
+      return OK;
+    }
+
+  intf = argv[1];
+  ret  = uip_ifup(intf);
+  nsh_output(vtbl, "ifup %s...%s\n", intf, (ret == OK) ? "OK" : "Failed");
+  return ret;
+}
+#endif
+
+/****************************************************************************
+ * Name: cmd_ifdown
+ ****************************************************************************/
+
+#ifndef CONFIG_NSH_DISABLE_IFUPDOWN
+int cmd_ifdown(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
+{
+  FAR char *intf = NULL;
+  int ret;
+
+  if (argc != 2)
+    {
+      nsh_output(vtbl, "Please select nic_name:\n");
+      netdev_foreach(ifconfig_callback, vtbl);
+      return OK;
+    }
+
+  intf = argv[1];
+  ret = uip_ifdown(intf);
+  nsh_output(vtbl, "ifdown %s...%s\n", intf, (ret == OK) ? "OK" : "Failed");
+  return ret;
+}
+#endif
+
+/****************************************************************************
  * Name: cmd_ifconfig
  ****************************************************************************/
 
@@ -491,7 +559,17 @@ int cmd_get(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
 {
   struct in_addr addr;
-  in_addr_t ip;
+  in_addr_t gip;
+  int i;
+  FAR char *intf = NULL;
+  FAR char *hostip = NULL;
+  FAR char *gwip = NULL;
+  FAR char *mask = NULL;
+  FAR char *tmp = NULL;
+  FAR char *hw = NULL;
+  FAR char *dns = NULL;
+  bool badarg=false;
+  uint8_t mac[6];
 
   /* With one or no arguments, ifconfig simply shows the status of ethernet
    * device:
@@ -513,24 +591,142 @@ int cmd_ifconfig(FAR struct nsh_vtbl_s *vtbl, int argc, char **argv)
    *    ifconfig nic_name ip_address
    */
 
+  if (argc > 2)
+    {
+      for(i = 0; i < argc; i++)
+        {
+          if (i == 1)
+            {
+              intf = argv[i];
+            }
+          else if (i == 2)
+            {
+              hostip = argv[i];
+            }
+          else
+            {
+              tmp = argv[i];
+              if (!strcmp(tmp, "dr") || !strcmp(tmp, "gw") || !strcmp(tmp, "gateway"))
+                {
+                  if (argc-1 >= i+1)
+                    {
+                      gwip = argv[i+1];
+                      i++;
+                    }
+                  else
+                    {
+                      badarg = true;
+                    }
+                }
+              else if(!strcmp(tmp, "netmask"))
+                {
+                  if (argc-1 >= i+1)
+                    {
+                      mask = argv[i+1];
+                      i++;
+                    }
+                  else
+                    {
+                      badarg = true;
+                    }
+                }
+              else if(!strcmp(tmp, "hw"))
+                {
+                  if (argc-1>=i+1)
+                    {
+                      hw = argv[i+1];
+                      i++;
+                      badarg = !uiplib_hwmacconv(hw, mac);
+                    }
+                  else
+                    {
+                      badarg = true;
+                    }
+                }
+              else if(!strcmp(tmp, "dns"))
+                {
+                  if (argc-1 >= i+1)
+                    {
+                      dns = argv[i+1];
+                      i++;
+                    }
+                  else
+                    {
+                      badarg = true;
+                    }
+                }
+            }
+        }
+    }
+
+  if (badarg)
+    {
+      nsh_output(vtbl, g_fmtargrequired, argv[0]);
+      return ERROR;
+    }
+
+  /* Set Hardware ethernet MAC addr */
+
+  if (hw)
+    {
+      ndbg("HW MAC: %s\n", hw);
+      uip_setmacaddr(intf, mac);
+    }
+
   /* Set host ip address */
 
-  ip = addr.s_addr = inet_addr(argv[2]);
-  uip_sethostaddr(argv[1], &addr);
+  ndbg("Host IP: %s\n", hostip);
+  gip = addr.s_addr = inet_addr(hostip);
+  uip_sethostaddr(intf, &addr);
 
   /* Set gateway */
 
-  ip = NTOHL(ip);
-  ip &= ~0x000000ff;
-  ip |= 0x00000001;
+  if (gwip)
+    {
+      ndbg("Gateway: %s\n", gwip);
+      gip = addr.s_addr = inet_addr(gwip);
+    }
+  else
+    {
+      ndbg("Gateway: default\n");
+      gip  = NTOHL(gip);
+      gip &= ~0x000000ff;
+      gip |= 0x00000001;
+      gip  = HTONL(gip);
+      addr.s_addr = gip;
+    }
+
+  uip_setdraddr(intf, &addr);
+
+  /* Set network mask */
+
+  if (mask)
+    {
+      ndbg("Netmask: %s\n",mask);
+      addr.s_addr = inet_addr(mask);
+    }
+  else
+    {
+      ndbg("Netmask: Default\n");
+      addr.s_addr = inet_addr("255.255.255.0");
+    }
 
-  addr.s_addr = HTONL(ip);
-  uip_setdraddr(argv[1], &addr);
+  uip_setnetmask(intf, &addr);
 
-  /* Set netmask */
+#if defined(CONFIG_NSH_DHCPC) || defined(CONFIG_NSH_DNS)
+  if (dns)
+    {
+      ndbg("DNS: %s\n", dns);
+      addr.s_addr = inet_addr(dns);
+    }
+  else
+    {
+      ndbg("DNS: Default\n");
+      addr.s_addr = gip;
+    }
 
-  addr.s_addr = inet_addr("255.255.255.0");
-  uip_setnetmask(argv[1], &addr);
+  resolv_conf(&addr);
+#endif
 
   return OK;
 }