ip: ipnetconf: Convert to use print_on_off()

[mirror_iproute2.git] / ip / link_vti.c

diff --git a/ip/link_vti.c b/ip/link_vti.c
index 6196a1c9e2f37a1da34d2ae5408d53ad929884b2..3a52ea870b56b6e3df15c7c882420262bfa0503e 100644 (file)
--- a/ip/link_vti.c
+++ b/ip/link_vti.c
@@ -26,22 +26,16 @@
 static void vti_print_help(struct link_util *lu, int argc, char **argv, FILE *f)
 {
        fprintf(f,
-               "Usage: ... %-4s [ remote ADDR ]\n",
-               lu->id
-       );
-       fprintf(f,
-               "                [ local ADDR ]\n"
-               "                [ [i|o]key KEY ]\n"
-               "                [ dev PHYS_DEV ]\n"
-               "                [ fwmark MARK ]\n"
+               "Usage: ... %-4s        [ remote ADDR ]\n"
+               "               [ local ADDR ]\n"
+               "               [ [i|o]key KEY ]\n"
+               "               [ dev PHYS_DEV ]\n"
+               "               [ fwmark MARK ]\n"
                "\n"
-       );
-       fprintf(f,
-               "Where: ADDR := { IP%s_ADDRESS }\n"
-               "       KEY  := { DOTTED_QUAD | NUMBER }\n"
-               "       MARK := { 0x0..0xffffffff }\n",
-               ""
-       );
+               "Where: ADDR := { IP_ADDRESS }\n"
+               "       KEY  := { DOTTED_QUAD | NUMBER }\n"
+               "       MARK := { 0x0..0xffffffff }\n",
+               lu->id);
 }
 
 static int vti_parse_opt(struct link_util *lu, int argc, char **argv,
@@ -157,9 +151,9 @@ get_failed:
 
        addattr32(n, 1024, IFLA_VTI_IKEY, ikey);
        addattr32(n, 1024, IFLA_VTI_OKEY, okey);
-       if (is_addrtype_inet(&saddr))
+       if (is_addrtype_inet_not_unspec(&saddr))
                addattr_l(n, 1024, IFLA_VTI_LOCAL, saddr.data, saddr.bytelen);
-       if (is_addrtype_inet(&daddr))
+       if (is_addrtype_inet_not_unspec(&daddr))
                addattr_l(n, 1024, IFLA_VTI_REMOTE, daddr.data, daddr.bytelen);
        addattr32(n, 1024, IFLA_VTI_FWMARK, fwmark);
        if (link)
@@ -208,7 +202,7 @@ static void vti_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
 
                if (fwmark) {
                        print_0xhex(PRINT_ANY,
-                                   "fwmark", "fwmark 0x%x ", fwmark);
+                                   "fwmark", "fwmark %#llx ", fwmark);
                }
        }
 }