Bump version to 1.32.0

[oweals/busybox.git] / networking / ip.c

diff --git a/networking/ip.c b/networking/ip.c
index 0bc0edc57e486651b2e964733c42e06bdff8c3ea..034ee4fc85aa0c352b6449b63d64db4f9aed0665 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -9,7 +9,7 @@
  * Bernhard Reutner-Fischer rewrote to use index_in_substr_array
  */
 //config:config IP
-//config:      bool "ip (34 kb)"
+//config:      bool "ip (35 kb)"
 //config:      default y
 //config:      select PLATFORM_LINUX
 //config:      help
@@ -28,7 +28,7 @@
 //config:      Short form of "ip addr"
 //config:
 //config:config IPLINK
-//config:      bool "iplink (16 kb)"
+//config:      bool "iplink (17 kb)"
 //config:      default y
 //config:      select FEATURE_IP_LINK
 //config:      select PLATFORM_LINUX
@@ -155,11 +155,61 @@
 //usage:
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iplink_trivial_usage
-//usage:       "set IFACE [up|down] [arp on|off] | show [IFACE]"
-//usage:#define iplink_full_usage "\n\n"
-//usage:       "iplink set IFACE [up|down] [arp on|off] [multicast on|off] [promisc on|off]\n"
-//usage:       "       [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
+//usage:       /*Usage:iplink*/"set IFACE [up|down] [arp on|off] [multicast on|off]\n"
+//usage:       "       [promisc on|off] [mtu NUM] [name NAME] [qlen NUM] [address MAC]\n"
+//usage:       "       [master IFACE | nomaster]"
+// * short help shows only "set" command, long help continues (with just one "\n")
+// * and shows all other commands:
+//usage:#define iplink_full_usage "\n"
+//usage:       "iplink add [link IFACE] IFACE [address MAC] type TYPE [ARGS]\n"
+//usage:       "iplink delete IFACE type TYPE [ARGS]\n"
+//usage:       "       TYPE ARGS := vlan VLANARGS | vrf table NUM\n"
+//usage:       "       VLANARGS := id VLANID [protocol 802.1q|802.1ad] [reorder_hdr on|off]\n"
+//usage:       "               [gvrp on|off] [mvrp on|off] [loose_binding on|off]\n"
 //usage:       "iplink show [IFACE]"
+//upstream man ip-link:
+//=====================
+//ip link add [link DEV] [ name ] NAME
+//                   [ txqueuelen PACKETS ]
+//                   [ address LLADDR ]
+//                   [ broadcast LLADDR ]
+//                   [ mtu MTU ] [index IDX ]
+//                   [ numtxqueues QUEUE_COUNT ]
+//                   [ numrxqueues QUEUE_COUNT ]
+//                   type TYPE [ ARGS ]
+//       ip link delete { DEVICE | dev DEVICE | group DEVGROUP } type TYPE [ ARGS ]
+//       ip link set { DEVICE | dev DEVICE | group DEVGROUP } [ { up | down } ]
+//                      [ arp { on | off } ]
+//                      [ dynamic { on | off } ]
+//                      [ multicast { on | off } ]
+//                      [ allmulticast { on | off } ]
+//                      [ promisc { on | off } ]
+//                      [ trailers { on | off } ]
+//                      [ txqueuelen PACKETS ]
+//                      [ name NEWNAME ]
+//                      [ address LLADDR ]
+//                      [ broadcast LLADDR ]
+//                      [ mtu MTU ]
+//                      [ netns { PID | NAME } ]
+//                      [ link-netnsid ID ]
+//           [ alias NAME ]
+//                      [ vf NUM [ mac LLADDR ]
+//                [ vlan VLANID [ qos VLAN-QOS ] ]
+//                [ rate TXRATE ]
+//                [ spoofchk { on | off} ]
+//                [ query_rss { on | off} ]
+//                [ state { auto | enable | disable} ] ]
+//                [ trust { on | off} ] ]
+//           [ master DEVICE ]
+//           [ nomaster ]
+//           [ addrgenmode { eui64 | none | stable_secret | random } ]
+//                      [ protodown { on | off } ]
+//       ip link show [ DEVICE | group GROUP ] [up] [master DEV] [type TYPE]
+//       ip link help [ TYPE ]
+//TYPE := { vlan | veth | vcan | dummy | ifb | macvlan | macvtap |
+//          bridge | bond | ipoib | ip6tnl | ipip | sit | vxlan |
+//          gre | gretap | ip6gre | ip6gretap | vti | nlmon |
+//          bond_slave | ipvlan | geneve | bridge_slave | vrf }
 //usage:
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iproute_trivial_usage
@@ -217,8 +267,7 @@
 //--------------123456789.123456789.123456789.123456789.123456789.123456789.123456789.123....79
 //usage:#define iptunnel_trivial_usage
 //usage:       "add|change|del|show [NAME]\n"
-//usage:       "       [mode ipip|gre|sit]\n"
-//usage:       "       [remote ADDR] [local ADDR] [ttl TTL]"
+//usage:       "       [mode ipip|gre|sit] [remote ADDR] [local ADDR] [ttl TTL]"
 //usage:#define iptunnel_full_usage "\n\n"
 //usage:       "iptunnel add|change|del|show [NAME]\n"
 //usage:       "       [mode ipip|gre|sit] [remote ADDR] [local ADDR]\n"
@@ -258,10 +307,9 @@
 //usage:       IF_FEATURE_IP_TUNNEL( IP_BAR_TUNNEL"tunnel")
 //usage:       IF_FEATURE_IP_NEIGH(  IP_BAR_NEIGH "neigh")
 //usage:       IF_FEATURE_IP_RULE(   IP_BAR_RULE  "rule")
-//usage:       " [COMMAND]"
+//usage:       " [ARGS]"
 //usage:#define ip_full_usage "\n\n"
 //usage:       "OPTIONS := -f[amily] inet|inet6|link | -o[neline]\n"
-//usage:       "COMMAND :="
 //usage:       IF_FEATURE_IP_ADDRESS("\n"
 //usage:       "ip addr "ipaddr_trivial_usage)
 //usage:       IF_FEATURE_IP_ROUTE("\n"