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
This commit is contained in:
parent
2715fa147a
commit
7d0c51919c
@ -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);
|
||||
|
@ -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"
|
||||
|
@ -4,7 +4,7 @@
|
||||
*
|
||||
* Heavily modified by Manuel Novoa III Mar 12, 2001
|
||||
*
|
||||
* Version: $Id: inet_common.c,v 1.7 2003/07/14 21:20:55 andersen Exp $
|
||||
* Version: $Id: inet_common.c,v 1.8 2004/03/10 07:42:38 mjn3 Exp $
|
||||
*
|
||||
*/
|
||||
|
||||
@ -186,7 +186,7 @@ int INET_rresolve(char *name, size_t len, struct sockaddr_in *s_in,
|
||||
|
||||
#ifdef CONFIG_FEATURE_IPV6
|
||||
|
||||
int INET6_resolve(char *name, struct sockaddr_in6 *sin6)
|
||||
int INET6_resolve(const char *name, struct sockaddr_in6 *sin6)
|
||||
{
|
||||
struct addrinfo req, *ai;
|
||||
int s;
|
||||
|
1230
networking/route.c
1230
networking/route.c
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user