telnetd: treat all 2-byte IACs in 240..249 range as NOPs.

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

diff --git a/networking/ip.c b/networking/ip.c
index 98fe621b1631de7e71cc0f0889ed5320700f50e3..ddfe74e9cddf2af2d4232c4c9bb8c14e278faa9f 100644 (file)
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -16,6 +16,7 @@
 //usage:       IF_FEATURE_IP_ROUTE("route | ")
 //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}"
 //usage:#define ip_full_usage "\n\n"
@@ -25,6 +26,7 @@
 //usage:       IF_FEATURE_IP_ROUTE("route | ")
 //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"
 //usage:       "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
@@ -33,7 +35,7 @@
 //usage:       "{ {add|del} IFADDR dev STRING | {show|flush}\n"
 //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"
 //usage:       "       IFADDR := PREFIX | ADDR peer PREFIX\n"
@@ -80,6 +82,11 @@
 //usage:       "       [mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n"
 //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"
 
@@ -90,7 +97,8 @@
  || ENABLE_FEATURE_IP_ROUTE \
  || 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)
 {
@@ -140,6 +148,13 @@ int iptunnel_main(int argc UNUSED_PARAM, char **argv)
        return ip_do(do_iptunnel, argv);
 }
 #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
 
 
 int ip_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -153,6 +168,7 @@ int ip_main(int argc UNUSED_PARAM, char **argv)
                IF_FEATURE_IP_TUNNEL("tunnel\0")
                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[] = {
                ip_print_help,
@@ -163,6 +179,7 @@ int ip_main(int argc UNUSED_PARAM, char **argv)
                IF_FEATURE_IP_TUNNEL(do_iptunnel,)
                IF_FEATURE_IP_TUNNEL(do_iptunnel,)
                IF_FEATURE_IP_RULE(do_iprule,)
+               IF_FEATURE_IP_NEIGH(do_ipneigh,)
        };
        ip_func_ptr_t ip_func;
        int key;