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

ip: export print_rta_gateway version which outputs prepared gateway string 

Export a new __print_rta_gateway that takes a prepared gateway string to
print which is also used by print_rta_gateway for consistent format.

Signed-off-by: Nikolay Aleksandrov <nikolay@nvidia.com>
Signed-off-by: David Ahern <dsahern@kernel.org>
This commit is contained in:
Nikolay Aleksandrov 2021-09-30 14:38:34 +03:00 committed by David Ahern
parent f72789965e
commit 371e889da7
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ip/ip_common.h
View File

@ -169,6 +169,7 @@ int name_is_vrf(const char *name);
void print_num(FILE *fp, unsigned int width, uint64_t count); void print_num(FILE *fp, unsigned int width, uint64_t count);
void print_rt_flags(FILE *fp, unsigned int flags); void print_rt_flags(FILE *fp, unsigned int flags);
void print_rta_ifidx(FILE *fp, __u32 ifidx, const char *prefix); void print_rta_ifidx(FILE *fp, __u32 ifidx, const char *prefix);
void __print_rta_gateway(FILE *fp, unsigned char family, const char *gateway);
void print_rta_gateway(FILE *fp, unsigned char family, void print_rta_gateway(FILE *fp, unsigned char family,
const struct rtattr *rta); const struct rtattr *rta);
#endif /* _IP_COMMON_H_ */ #endif /* _IP_COMMON_H_ */

15
ip/iproute.c
View File

@ -547,13 +547,11 @@ static void print_rta_newdst(FILE *fp, const struct rtmsg *r,
} }
} }
void print_rta_gateway(FILE *fp, unsigned char family, const struct rtattr *rta) void __print_rta_gateway(FILE *fp, unsigned char family, const char *gateway)
{ {
const char *gateway = format_host_rta(family, rta); if (is_json_context()) {
if (is_json_context())
print_string(PRINT_JSON, "gateway", NULL, gateway); print_string(PRINT_JSON, "gateway", NULL, gateway);
else { } else {
fprintf(fp, "via "); fprintf(fp, "via ");
print_color_string(PRINT_FP, print_color_string(PRINT_FP,
ifa_family_color(family), ifa_family_color(family),
@ -561,6 +559,13 @@ void print_rta_gateway(FILE *fp, unsigned char family, const struct rtattr *rta)
} }
} }
void print_rta_gateway(FILE *fp, unsigned char family, const struct rtattr *rta)
{
const char *gateway = format_host_rta(family, rta);
__print_rta_gateway(fp, family, gateway);
}
static void print_rta_via(FILE *fp, const struct rtattr *rta) static void print_rta_via(FILE *fp, const struct rtattr *rta)
{ {
size_t len = RTA_PAYLOAD(rta) - 2; size_t len = RTA_PAYLOAD(rta) - 2;