summaryrefslogtreecommitdiff
path: root/lib/ovs-router.c
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@ovn.org>2015-10-25 13:19:22 -0700
committerJustin Pettit <jpettit@ovn.org>2015-11-24 12:48:44 -0800
commitac6d120f8e8ad1802b7d89dcf3c6e6d9d399cdf7 (patch)
tree64a0a7525de5fd27104c1899db0d584bc3541478 /lib/ovs-router.c
parent30ef36c6dbc77f91ee63ccd177b2db236270ab66 (diff)
downloadopenvswitch-ac6d120f8e8ad1802b7d89dcf3c6e6d9d399cdf7.tar.gz
packets: Change IPv6 functions to more closely resemble IPv4 ones.
Signed-off-by: Justin Petitt <jpettit@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
Diffstat (limited to 'lib/ovs-router.c')
-rw-r--r--lib/ovs-router.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ovs-router.c b/lib/ovs-router.c
index 2f093e8a3..3962aef5b 100644
--- a/lib/ovs-router.c
+++ b/lib/ovs-router.c
@@ -318,7 +318,7 @@ ovs_router_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
} else {
ds_put_format(&ds, "User: ");
}
- print_ipv6_mapped(&ds, &rt->nw_addr);
+ ipv6_format_mapped(&rt->nw_addr, &ds);
plen = rt->plen;
if (IN6_IS_ADDR_V4MAPPED(&rt->nw_addr)) {
plen -= 96;
@@ -326,7 +326,7 @@ ovs_router_show(struct unixctl_conn *conn, int argc OVS_UNUSED,
ds_put_format(&ds, "/%"PRIu16" dev %s", plen, rt->output_bridge);
if (ipv6_addr_is_set(&rt->gw)) {
ds_put_format(&ds, " GW ");
- print_ipv6_mapped(&ds, &rt->gw);
+ ipv6_format_mapped(&rt->gw, &ds);
}
ds_put_format(&ds, "\n");
}
@@ -353,7 +353,7 @@ ovs_router_lookup_cmd(struct unixctl_conn *conn, int argc OVS_UNUSED,
if (ovs_router_lookup(&ip6, iface, &gw)) {
struct ds ds = DS_EMPTY_INITIALIZER;
ds_put_format(&ds, "gateway ");
- print_ipv6_mapped(&ds, &ip6);
+ ipv6_format_mapped(&ip6, &ds);
ds_put_format(&ds, "\ndev %s\n", iface);
unixctl_command_reply(conn, ds_cstr(&ds));
ds_destroy(&ds);