diff --git a/ChangeLog b/ChangeLog
index 3b60fc81284..f4bdc7ed01a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3564,4 +3564,6 @@
* RGMP 4.0 updated from Qiany Yu.
* configs/*/Make.defs and configs/*/ld.script: Massive clean-up
and standardization of linker scripts from Freddie Chopin.
+ * net/netdev_ioctl.c: Add interface state flags and ioctl calls
+ to bring network interfaces up and down (from Darcy Gong).
diff --git a/Documentation/NuttShell.html b/Documentation/NuttShell.html
index f8ef41fb964..31546a100c3 100644
--- a/Documentation/NuttShell.html
+++ b/Documentation/NuttShell.html
@@ -8,7 +8,7 @@
NuttShell (NSH)
- Last Updated: October 31, 2012
+ Last Updated: November 4, 2012
|
@@ -173,175 +173,187 @@
|
- 2.16 Show Network Configuration (ifconfig)
+ 2.16 Manage Network Configuration (ifconfig)
|
|
- 2.17 Send a signal to a task (kill)
+ 2.17 Take a network down (ifdown)
|
|
- 2.18 Setup/teardown the Loop Device (losetup)
+ 2.18 Bring a network up (ifup)
|
|
- 2.19 List Directory Contents (ls)
+ 2.19 Send a signal to a task (kill)
|
|
- 2.20 Calculate MD5 (md5)
+ 2.20 Setup/teardown the Loop Device (losetup)
|
|
- 2.21 Access Memory (mb, mh, and mw)
+ 2.21 List Directory Contents (ls)
|
|
- 2.22 Show Current Tasks and Threads (ps)
+ 2.22 Calculate MD5 (md5)
|
|
- 2.23 Create a Directory (mkdir)
+ 2.23 Access Memory (mb, mh, and mw)
|
|
- 2.24 Create a FAT Filesystem (mkfatfs)
+ 2.24 Show Current Tasks and Threads (ps)
|
|
- 2.25 Create a FIFO (mkfifo)
+ 2.25 Create a Directory (mkdir)
|
|
- 2.26 Create a RAMDISK (mkrd)
+ 2.26 Create a FAT Filesystem (mkfatfs)
|
|
- 2.27 Mount a File System (mount)
+ 2.27 Create a FIFO (mkfifo)
|
|
- 2.28 Rename a File (mv)
+ 2.28 Create a RAMDISK (mkrd)
|
|
- 2.29 Mount an NFS file system (nfsmount)
+ 2.29 Mount a File System (mount)
|
|
- 2.30 Check Network Peer (ping)
+ 2.30 Rename a File (mv)
|
|
- 2.31 Send File Via TFTP (put)
+ 2.31 Mount an NFS file system (nfsmount)
|
|
- 2.32 Show Current Working Directory (pwd)
+ 2.32 Check Network Peer (ping)
|
|
- 2.33 Remove a File (rm)
+ 2.33 Send File Via TFTP (put)
|
|
- 2.34 Remove a Directory (rmdir)
+ 2.34 Show Current Working Directory (pwd)
|
|
- 2.35 Set an Environment Variable (set)
+ 2.35 Remove a File (rm)
|
|
- 2.36 Execute an NSH Script (sh)
+ 2.36 Remove a Directory (rmdir)
|
|
- 2.37 Wait for Seconds (sleep)
+ 2.37 Set an Environment Variable (set)
|
|
- 2.38 Unmount a File System (umount)
+ 2.38 Execute an NSH Script (sh)
|
|
- 2.39 Unset an Environment Variable (unset)
+ 2.39 Wait for Seconds (sleep)
|
|
- 2.40 URL Decode (urldecode)
+ 2.40 Unmount a File System (umount)
|
|
- 2.41 URL Encode (urlencode)
+ 2.41 Unset an Environment Variable (unset)
|
|
- 2.42 Wait for Microseconds (usleep)
+ 2.42 URL Decode (urldecode)
|
|
- 2.43 Get File Via HTTP (wget)
+ 2.43 URL Encode (urlencode)
|
|
- 2.44 Hexadecimal Dump (xd)
+ 2.44 Wait for Microseconds (usleep)
+ |
+
+
+
|
+
+ 2.45 Get File Via HTTP (wget)
+ |
+
+
+
|
+
+ 2.46 Hexadecimal Dump (xd)
|
@@ -1170,18 +1182,18 @@ help [-v] [<cmd>]
Command Syntax:
-ifconfig [nic_name [ip_address]]
+ifconfig [nic_name [ip]] [dr|gw|gateway <dr-address>] [netmask <net-mask>] [dns <dns-address>] [hw <hw-mac>]]
Synopsis.
- Two forms of the ifconfigcommand are supported:
+ Multiple forms of the ifconfigcommand are supported:
-
@@ -1214,14 +1226,63 @@ eth0 HWaddr 00:18:11:80:10:06
ifconfig nic_name ip_address
-
+
+ -
+ Other forms to be provided
+
+Command Syntax:
+
+ifdown <nic-name>
+
+
+ Synopsis.
+ Take down the interface identified by the name <nic-name>.
+
+
+ Example:
+
+
+ifdown eth0
+
+
+
+
+Command Syntax:
+
+ifup <nic-name>
+
+
+ Synopsis.
+ Bring up down the interface identified by the name <nic-name>.
+
+
+ Example:
+
+
+ifup eth0
+
+
+
@@ -1262,7 +1323,7 @@ nsh>
@@ -1315,7 +1376,7 @@ losetup d <dev-path>
@@ -1352,7 +1413,7 @@ ls [-lRs] <dir-path>
@@ -1369,7 +1430,7 @@ md5 [-f] <string or filepath>
@@ -1423,7 +1484,7 @@ nsh>
@@ -1449,7 +1510,7 @@ nsh>
@@ -1484,7 +1545,7 @@ nsh>
@@ -1504,7 +1565,7 @@ mkfatfs <path>
@@ -1542,7 +1603,7 @@ nsh>
@@ -1593,7 +1654,7 @@ nsh>
@@ -1672,7 +1733,7 @@ nsh> mount
@@ -1690,7 +1751,7 @@ mv <old-path> <new-path>
@@ -1709,7 +1770,7 @@ nfsmount <server-address> <mount-point> <remote-path>
@@ -1742,7 +1803,7 @@ nsh>
@@ -1777,7 +1838,7 @@ put [-b|-n] [-f <remote-path>] -h <ip-address> <local-path>
@@ -1807,7 +1868,7 @@ nsh>
@@ -1841,7 +1902,7 @@ nsh>
@@ -1876,7 +1937,7 @@ nsh>
@@ -1902,7 +1963,7 @@ nsh>
@@ -1920,7 +1981,7 @@ sh <script-path>
@@ -1937,7 +1998,7 @@ sleep <sec>
@@ -1967,7 +2028,7 @@ nsh>
@@ -1993,7 +2054,7 @@ nsh>
@@ -2010,7 +2071,7 @@ urldecode [-f] <string or filepath>
@@ -2027,7 +2088,7 @@ urlencode [-f] <string or filepath>
@@ -2044,7 +2105,7 @@ usleep <usec>
@@ -2071,7 +2132,7 @@ wget [-o <local-path>] <url>
@@ -2215,6 +2276,16 @@ nsh>
CONFIG_NET |
CONFIG_NSH_DISABLE_IFCONFIG |
+
+ ifdown |
+ CONFIG_NET |
+ CONFIG_NSH_DISABLE_IFUPDOWN |
+
+
+ ifup |
+ CONFIG_NET |
+ CONFIG_NSH_DISABLE_IFUPDOWN |
+
kill |
!CONFIG_DISABLE_SIGNALS |
@@ -3723,9 +3794,9 @@ mount -t vfat /dev/ram1 /tmp
/etc/init.d/rcS
exec
exec_namedapp()
+ exit
- exit
free
g_cmdmap
genromfs
@@ -3734,6 +3805,8 @@ mount -t vfat /dev/ram1 /tmp
help
if-then[-else]-fi
ifconfig
+ ifdown
+ ifup
Initialization sequence
kill
losetup
diff --git a/include/net/if.h b/include/net/if.h
index e64b58563f9..1ff8ebc3838 100644
--- a/include/net/if.h
+++ b/include/net/if.h
@@ -52,6 +52,10 @@
#define IF_NAMESIZE 6 /* Newer naming standard */
#define IFHWADDRLEN 6
+#define IFF_RUNNING (1 << 0)
+#define IF_FLAG_IFUP (1 << 0)
+#define IF_FLAG_IFDOWN (2 << 0)
+
/*******************************************************************************************
* Public Type Definitions
*******************************************************************************************/
@@ -72,6 +76,7 @@ struct lifreq
struct sockaddr lifru_hwaddr; /* MAC address */
int lifru_count; /* Number of devices */
int lifru_mtu; /* MTU size */
+ uint8_t lifru_flags; /* Interface flags */
} lifr_ifru;
};
@@ -82,6 +87,7 @@ struct lifreq
#define lifr_hwaddr lifr_ifru.lifru_hwaddr /* MAC address */
#define lifr_mtu lifr_ifru.lifru_mtu /* MTU */
#define lifr_count lifr_ifru.lifru_count /* Number of devices */
+#define lifr_flags lifr_ifru.lifru_flags /* interface flags */
/* This is the older I/F request that should only be used with IPv4. However, since
* NuttX only supports IPv4 or 6 (not both), we can force the older structure to
@@ -101,6 +107,7 @@ struct ifreq
struct sockaddr ifru_hwaddr; /* MAC address */
int ifru_count; /* Number of devices */
int ifru_mtu; /* MTU size */
+ uint8_t ifru_flags; /* Interface flags */
} ifr_ifru;
};
@@ -111,6 +118,7 @@ struct ifreq
#define ifr_hwaddr ifr_ifru.ifru_hwaddr /* MAC address */
#define ifr_mtu ifr_ifru.ifru_mtu /* MTU */
#define ifr_count ifr_ifru.ifru_count /* Number of devices */
+#define ifr_flags ifr_ifru.ifru_flags /* interface flags */
#else /* CONFIG_NET_IPv6 */
@@ -123,6 +131,7 @@ struct ifreq
#define ifr_hwaddr lifr_ifru.lifru_hwaddr /* MAC address */
#define ifr_mtu lifr_ifru.lifru_mtu /* MTU */
#define ifr_count lifr_ifru.lifru_count /* Number of devices */
+#define ifr_flags lifr_ifru.lifru_flags /* interface flags */
#endif /* CONFIG_NET_IPv6 */
diff --git a/include/nuttx/net/ioctl.h b/include/nuttx/net/ioctl.h
index be3f597f47c..d5d1a001c81 100644
--- a/include/nuttx/net/ioctl.h
+++ b/include/nuttx/net/ioctl.h
@@ -146,9 +146,15 @@
#define SIOCSIWPMKSA _SIOC(0x0036) /* PMKSA cache operation */
+/* Interface flags */
+
+#define SIOCSIFFLAGS _SIOC(0x0037) /* Sets the interface flags */
+#define SIOCGIFFLAGS _SIOC(0x0038) /* Gets the interface flags */
+
/****************************************************************************
* Type Definitions
****************************************************************************/
+
/* See include/net/if.h */
/****************************************************************************
diff --git a/include/nuttx/net/uip/uip-arch.h b/include/nuttx/net/uip/uip-arch.h
index 9546de04eb2..73805c6fb13 100644
--- a/include/nuttx/net/uip/uip-arch.h
+++ b/include/nuttx/net/uip/uip-arch.h
@@ -90,6 +90,10 @@ struct uip_driver_s
char d_ifname[IFNAMSIZ];
#endif
+ /* Drivers interface flags. See IFF_* definitions in include/net/if.h */
+
+ uint8_t d_flags;
+
/* Ethernet device identity */
#ifdef CONFIG_NET_ETHERNET
diff --git a/net/netdev_ioctl.c b/net/netdev_ioctl.c
index 4b5876efa0e..ea5c0e4362b 100644
--- a/net/netdev_ioctl.c
+++ b/net/netdev_ioctl.c
@@ -138,19 +138,47 @@ static void ioctl_setipaddr(FAR uip_ipaddr_t *outaddr, FAR const void *inaddr)
*
****************************************************************************/
-static inline void ioctl_ifup(FAR struct uip_driver_s *dev)
+static void ioctl_ifup(FAR struct uip_driver_s *dev)
{
+ /* Make sure that the device supports the d_ifup() method */
+
if (dev->d_ifup)
{
- dev->d_ifup(dev);
+ /* Is the interface already up? */
+
+ if ((dev->d_flags & IFF_RUNNING) == 0)
+ {
+ /* No, bring the interface up now */
+
+ if (dev->d_ifup(dev) == OK)
+ {
+ /* Mark the interface as up */
+
+ dev->d_flags |= IFF_RUNNING;
+ }
+ }
}
}
-static inline void ioctl_ifdown(FAR struct uip_driver_s *dev)
+static void ioctl_ifdown(FAR struct uip_driver_s *dev)
{
+ /* Make sure that the device supports the d_ifdown() method */
+
if (dev->d_ifdown)
{
- dev->d_ifdown(dev);
+ /* Is the interface already down? */
+
+ if ((dev->d_flags & IFF_RUNNING) != 0)
+ {
+ /* No, take the interface down now */
+
+ if (dev->d_ifdown(dev) == OK)
+ {
+ /* Mark the interface as down */
+
+ dev->d_flags &= ~IFF_RUNNING;
+ }
+ }
}
}
@@ -194,63 +222,130 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd, struct ifreq *req)
switch (cmd)
{
- case SIOCGIFADDR: /* Get IP address */
- ioctl_getipaddr(&req->ifr_addr, &dev->d_ipaddr);
+ case SIOCGIFADDR: /* Get IP address */
+ {
+ ioctl_getipaddr(&req->ifr_addr, &dev->d_ipaddr);
+ }
break;
- case SIOCSIFADDR: /* Set IP address */
- ioctl_ifdown(dev);
- ioctl_setipaddr(&dev->d_ipaddr, &req->ifr_addr);
- ioctl_ifup(dev);
+ case SIOCSIFADDR: /* Set IP address */
+ {
+ ioctl_ifdown(dev);
+ ioctl_setipaddr(&dev->d_ipaddr, &req->ifr_addr);
+ ioctl_ifup(dev);
+ }
break;
case SIOCGIFDSTADDR: /* Get P-to-P address */
- ioctl_getipaddr(&req->ifr_dstaddr, &dev->d_draddr);
+ {
+ ioctl_getipaddr(&req->ifr_dstaddr, &dev->d_draddr);
+ }
break;
case SIOCSIFDSTADDR: /* Set P-to-P address */
- ioctl_setipaddr(&dev->d_draddr, &req->ifr_dstaddr);
+ {
+ ioctl_setipaddr(&dev->d_draddr, &req->ifr_dstaddr);
+ }
break;
case SIOCGIFNETMASK: /* Get network mask */
- ioctl_getipaddr(&req->ifr_addr, &dev->d_netmask);
+ {
+ ioctl_getipaddr(&req->ifr_addr, &dev->d_netmask);
+ }
break;
case SIOCSIFNETMASK: /* Set network mask */
- ioctl_setipaddr(&dev->d_netmask, &req->ifr_addr);
+ {
+ ioctl_setipaddr(&dev->d_netmask, &req->ifr_addr);
+ }
break;
case SIOCGIFMTU: /* Get MTU size */
- req->ifr_mtu = CONFIG_NET_BUFSIZE;
+ {
+ req->ifr_mtu = CONFIG_NET_BUFSIZE;
+ }
+ break;
+
+ case SIOCSIFFLAGS: /* Sets the interface flags */
+ {
+ /* Is this a request to bring the interface up? */
+
+ if (req->ifr_flags & IF_FLAG_IFUP)
+ {
+ /* Yes.. bring the interface up */
+
+ ioctl_ifup(dev);
+ }
+
+ /* Is this a request to take the interface down? */
+
+ else if (req->ifr_flags & IF_FLAG_IFDOWN)
+ {
+ /* Yes.. take the interface down */
+
+ ioctl_ifdown(dev);
+ }
+ }
+ break;
+
+ case SIOCGIFFLAGS: /* Gets the interface flags */
+ {
+ req->ifr_flags = 0;
+
+ /* Is the interface running? */
+
+ if (dev->d_flags & IFF_RUNNING)
+ {
+ /* Yes.. report interface up */
+
+ req->ifr_flags |= IF_FLAG_IFUP;
+ }
+ else
+ {
+ /* No.. report interface down */
+
+ req->ifr_flags |= IF_FLAG_IFDOWN;
+ }
+ }
break;
/* MAC address operations only make sense if Ethernet is supported */
#ifdef CONFIG_NET_ETHERNET
case SIOCGIFHWADDR: /* Get hardware address */
- req->ifr_hwaddr.sa_family = AF_INETX;
- memcpy(req->ifr_hwaddr.sa_data, dev->d_mac.ether_addr_octet, IFHWADDRLEN);
+ {
+ req->ifr_hwaddr.sa_family = AF_INETX;
+ memcpy(req->ifr_hwaddr.sa_data, dev->d_mac.ether_addr_octet, IFHWADDRLEN);
+ }
break;
case SIOCSIFHWADDR: /* Set hardware address -- will not take effect until ifup */
- req->ifr_hwaddr.sa_family = AF_INETX;
- memcpy(dev->d_mac.ether_addr_octet, req->ifr_hwaddr.sa_data, IFHWADDRLEN);
+ {
+ req->ifr_hwaddr.sa_family = AF_INETX;
+ memcpy(dev->d_mac.ether_addr_octet, req->ifr_hwaddr.sa_data, IFHWADDRLEN);
+ }
break;
#endif
case SIOCDIFADDR: /* Delete IP address */
- ioctl_ifdown(dev);
- memset(&dev->d_ipaddr, 0, sizeof(uip_ipaddr_t));
+ {
+ ioctl_ifdown(dev);
+ memset(&dev->d_ipaddr, 0, sizeof(uip_ipaddr_t));
+ }
break;
case SIOCGIFCOUNT: /* Get number of devices */
- req->ifr_count = netdev_count();
- ret = -ENOSYS;
+ {
+ req->ifr_count = netdev_count();
+ ret = -ENOSYS;
+ }
break;
- case SIOCGIFBRDADDR: /* Get broadcast IP address */
- case SIOCSIFBRDADDR: /* Set broadcast IP address */
- ret = -ENOSYS;
+ case SIOCGIFBRDADDR: /* Get broadcast IP address */
+ case SIOCSIFBRDADDR: /* Set broadcast IP address */
+ {
+ ret = -ENOSYS;
+ }
break;
#ifdef CONFIG_NET_ARPIOCTLS
@@ -261,7 +356,9 @@ static int netdev_ifrioctl(FAR struct socket *psock, int cmd, struct ifreq *req)
#endif
default:
- ret = -EINVAL;
+ {
+ ret = -EINVAL;
+ }
break;;
}
|