iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IPV6] ROUTE: Use macros to format /proc/net/ipv6_route.

Browse Source 
Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
This commit is contained in:
YOSHIFUJI Hideaki 2006-10-14 02:00:56 +09:00 committed by David S. Miller
parent d83ca5accb
commit 33e93c9699
1 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
net/ipv6/route.c
View File

@ -2246,7 +2246,6 @@ struct rt6_proc_arg
static int rt6_info_route(struct rt6_info *rt, void *p_arg) static int rt6_info_route(struct rt6_info *rt, void *p_arg)
{ {
struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg; struct rt6_proc_arg *arg = (struct rt6_proc_arg *) p_arg;
int i;
if (arg->skip < arg->offset / RT6_INFO_LEN) { if (arg->skip < arg->offset / RT6_INFO_LEN) {
arg->skip++; arg->skip++;
@ -2256,38 +2255,28 @@ static int rt6_info_route(struct rt6_info *rt, void *p_arg)
if (arg->len >= arg->length) if (arg->len >= arg->length)
return 0; return 0;
for (i=0; i<16; i++) { arg->len += sprintf(arg->buffer + arg->len,
sprintf(arg->buffer + arg->len, "%02x", NIP6_SEQFMT " %02x ",
rt->rt6i_dst.addr.s6_addr[i]); NIP6(rt->rt6i_dst.addr),
arg->len += 2;
}
arg->len += sprintf(arg->buffer + arg->len, " %02x ",
rt->rt6i_dst.plen); rt->rt6i_dst.plen);
#ifdef CONFIG_IPV6_SUBTREES #ifdef CONFIG_IPV6_SUBTREES
for (i=0; i<16; i++) { arg->len += sprintf(arg->buffer + arg->len,
sprintf(arg->buffer + arg->len, "%02x", NIP6_SEQFMT " %02x ",
rt->rt6i_src.addr.s6_addr[i]); NIP6(rt->rt6i_src.addr),
arg->len += 2;
}
arg->len += sprintf(arg->buffer + arg->len, " %02x ",
rt->rt6i_src.plen); rt->rt6i_src.plen);
#else #else
sprintf(arg->buffer + arg->len, arg->len += sprintf(arg->buffer + arg->len,
"00000000000000000000000000000000 00 "); "00000000000000000000000000000000 00 ");
arg->len += 36;
#endif #endif
if (rt->rt6i_nexthop) { if (rt->rt6i_nexthop) {
for (i=0; i<16; i++) { arg->len += sprintf(arg->buffer + arg->len,
sprintf(arg->buffer + arg->len, "%02x", NIP6_SEQFMT,
rt->rt6i_nexthop->primary_key[i]); NIP6(*((struct in6_addr *)rt->rt6i_nexthop->primary_key)));
arg->len += 2;
}
} else { } else {
sprintf(arg->buffer + arg->len, arg->len += sprintf(arg->buffer + arg->len,
"00000000000000000000000000000000"); "00000000000000000000000000000000");
arg->len += 32;
} }
arg->len += sprintf(arg->buffer + arg->len, arg->len += sprintf(arg->buffer + arg->len,
" %08x %08x %08x %08x %8s\n", " %08x %08x %08x %08x %8s\n",