From 7d0c51919ce4d0be00fd8ae92d6f16b86aad9fd2 Mon Sep 17 00:00:00 2001
From: Manuel Novoa III
Date: Wed, 10 Mar 2004 07:42:38 +0000
Subject: In spite of the feature freeze, check in a complete rework of route
 which fixes some bugs, adds some error checking, and removes _lots_ of bloat.
 Text size on i386...               old     new    ipv6      5425    3523   
 no ipv6   3143    2193

---
 include/inet_common.h |  4 ++--
 include/usage.h       | 14 +++++++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'include')

diff --git a/include/inet_common.h b/include/inet_common.h
index 0375c1c..afea5de 100644
--- a/include/inet_common.h
+++ b/include/inet_common.h
@@ -4,7 +4,7 @@
  *
  * Heavily modified by Manuel Novoa III       Mar 12, 2001
  *
- * Version:     $Id: inet_common.h,v 1.3 2003/07/14 21:20:52 andersen Exp $
+ * Version:     $Id: inet_common.h,v 1.4 2004/03/10 07:42:37 mjn3 Exp $
  *
  */
 
@@ -29,5 +29,5 @@ extern int INET_resolve(const char *name, struct sockaddr_in *s_in, int hostfirs
 extern int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
 			 int numeric, unsigned int netmask);
 
-extern int INET6_resolve(char *name, struct sockaddr_in6 *sin6);
+extern int INET6_resolve(const char *name, struct sockaddr_in6 *sin6);
 extern int INET6_rresolve(char *name, size_t len, struct sockaddr_in6 *sin6, int numeric);
diff --git a/include/usage.h b/include/usage.h
index 9390e34..37f8841 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -2039,13 +2039,21 @@
 #define rmmod_example_usage \
 	"$ rmmod tulip\n"
 
+#ifdef CONFIG_FEATURE_IPV6
+  #define USAGE_ROUTE_IPV6(a) a
+#else
+  #define USAGE_ROUTE_IPV6(a) "\t"
+#endif
+
+
 #define route_trivial_usage \
-	"[{add|del|flush}]"
+	"[{add|del|delete}]"
 #define route_full_usage \
 	"Edit the kernel's routing tables.\n\n" \
 	"Options:\n" \
-	"\t-n\tDont resolve names.\n" \
-	"\t-e\tDisplay other/more information"
+	"\t-n\t\tDont resolve names.\n" \
+	"\t-e\t\tDisplay other/more information.\n" \
+	"\t-A inet" USAGE_ROUTE_IPV6("{6}") "\tSelect address family."
 
 #define rpm_trivial_usage \
 	"-i -q[ildc]p package.rpm"
-- 
cgit v1.1