Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/networking/ip.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/networking/ip.c (modified) (8 diffs)

branches/3.3/mindi-busybox/networking/ip.c

@@ -17 +17 @@
 //usage:    IF_FEATURE_IP_LINK("link | ")
 //usage:    IF_FEATURE_IP_TUNNEL("tunnel | ")
+//usage:    IF_FEATURE_IP_NEIGH("neigh | ")
 //usage:    IF_FEATURE_IP_RULE("rule")
 //usage:       "} {COMMAND}"
@@ -26 +27 @@
 //usage:    IF_FEATURE_IP_LINK("link | ")
 //usage:    IF_FEATURE_IP_TUNNEL("tunnel | ")
+//usage:    IF_FEATURE_IP_NEIGH("neigh | ")
 //usage:    IF_FEATURE_IP_RULE("rule")
 //usage:       "}\n"
@@ -34 +36 @@
 //usage:       "        [dev STRING] [to PREFIX] }"
 //usage:#define ipaddr_full_usage "\n\n"
-//usage:       "ipaddr {add|delete} IFADDR dev STRING\n"
+//usage:       "ipaddr {add|change|replace|delete} IFADDR dev STRING\n"
 //usage:       "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
 //usage:       "    [to PREFIX] [label PATTERN]\n"
@@ -81 +83 @@
 //usage:       "    [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n"
 //usage:       "    [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]"
+//usage:
+//usage:#define ipneigh_trivial_usage
+//usage:       "{ show | flush} [ to PREFIX ] [ dev DEV ] [ nud STATE ]"
+//usage:#define ipneigh_full_usage "\n\n"
+//usage:       "ipneigh { show | flush} [ to PREFIX ] [ dev DEV ] [ nud STATE ]"
 
 #include "libbb.h"
@@ -91 +98 @@
  || ENABLE_FEATURE_IP_LINK \
  || ENABLE_FEATURE_IP_TUNNEL \
- || ENABLE_FEATURE_IP_RULE
+ || ENABLE_FEATURE_IP_RULE \
+ || ENABLE_FEATURE_IP_NEIGH
 
 static int FAST_FUNC ip_print_help(char **argv UNUSED_PARAM)
@@ -141 +149 @@
 }
 #endif
+#if ENABLE_FEATURE_IP_NEIGH
+int ipneigh_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ipneigh_main(int argc UNUSED_PARAM, char **argv)
+{
+    return ip_do(do_ipneigh, argv);
+}
+#endif
 
 
@@ -154 +169 @@
         IF_FEATURE_IP_TUNNEL("tunl\0")
         IF_FEATURE_IP_RULE("rule\0")
+        IF_FEATURE_IP_NEIGH("neigh\0")
         ;
     static const ip_func_ptr_t ip_func_ptrs[] = {
@@ -164 +180 @@
         IF_FEATURE_IP_TUNNEL(do_iptunnel,)
         IF_FEATURE_IP_RULE(do_iprule,)
+        IF_FEATURE_IP_NEIGH(do_ipneigh,)
     };
     ip_func_ptr_t ip_func;