matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

iproute: make printing icmpv6 a function 

Refactor to reduce size of print_route and improve
readability.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Ahern <dsahern@gmail.com>
This commit is contained in:
Stephen Hemminger 2018-02-07 09:10:10 -08:00 committed by David Ahern
parent b3ab1e68e7
commit 8cfc2d4739
1 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ip/iproute.c
View File

@ -363,6 +363,25 @@ static void print_rt_flags(FILE *fp, unsigned int flags)
fprintf(fp, "unresolved "); fprintf(fp, "unresolved ");
} }
static void print_rt_pref(FILE *fp, unsigned int pref)
{
fprintf(fp, "pref ");
switch (pref) {
case ICMPV6_ROUTER_PREF_LOW:
fprintf(fp, "low");
break;
case ICMPV6_ROUTER_PREF_MEDIUM:
fprintf(fp, "medium");
break;
case ICMPV6_ROUTER_PREF_HIGH:
fprintf(fp, "high");
break;
default:
fprintf(fp, "%u", pref);
}
}
int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
{ {
FILE *fp = (FILE *)arg; FILE *fp = (FILE *)arg;
@ -740,25 +759,10 @@ int print_route(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
nh = RTNH_NEXT(nh); nh = RTNH_NEXT(nh);
} }
} }
if (tb[RTA_PREF]) {
unsigned int pref = rta_getattr_u8(tb[RTA_PREF]);
fprintf(fp, "pref "); if (tb[RTA_PREF])
print_rt_pref(fp, rta_getattr_u8(tb[RTA_PREF]));
switch (pref) {
case ICMPV6_ROUTER_PREF_LOW:
fprintf(fp, "low");
break;
case ICMPV6_ROUTER_PREF_MEDIUM:
fprintf(fp, "medium");
break;
case ICMPV6_ROUTER_PREF_HIGH:
fprintf(fp, "high");
break;
default:
fprintf(fp, "%u", pref);
}
}
if (tb[RTA_TTL_PROPAGATE]) { if (tb[RTA_TTL_PROPAGATE]) {
fprintf(fp, "ttl-propagate "); fprintf(fp, "ttl-propagate ");
if (rta_getattr_u8(tb[RTA_TTL_PROPAGATE])) if (rta_getattr_u8(tb[RTA_TTL_PROPAGATE]))