Merge branch 'master' of ../iproute2-next

diff --git a/include/SNAPSHOT.h b/include/SNAPSHOT.h
index e9d546d029054618a6703a71ccc8b40fc64e99c1..3b2f8f1b18ee60e77bd61dc1fd93b01b19429ef7 100644 (file)
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
@@ -1 +1 @@
-static const char SNAPSHOT[] = "190107";
+static const char SNAPSHOT[] = "190319";

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index 76edf7064819c08970db32e5ddf665112996be9a..b504200bb3776a09d90a6ff697da4846bcb890d4 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -174,7 +174,9 @@ static void print_queuelen(FILE *f, struct rtattr *tb[IFLA_MAX + 1])
 
                strcpy(ifr.ifr_name, rta_getattr_str(tb[IFLA_IFNAME]));
                if (ioctl(s, SIOCGIFTXQLEN, &ifr) < 0) {
-                       fprintf(f, "ioctl(SIOCGIFTXQLEN) failed: %s\n", strerror(errno));
+                       fprintf(stderr,
+                               "ioctl(SIOCGIFTXQLEN) failed: %s\n",
+                               strerror(errno));
                        close(s);
                        return;
                }

diff --git a/ip/iproute.c b/ip/iproute.c
index cc02a3e1b0aa65ba1e4f1c4e701d3897a1e14ff6..2b3dcc5dbd53fc2318853f40f35c87c81561e5ff 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -450,10 +450,8 @@ static void print_cache_flags(FILE *fp, __u32 flags)
        if (flags)
                print_hex(PRINT_ANY, "flags", "%x>", flags);
 
-       if (jw) {
+       if (jw)
                jsonw_end_array(jw);
-               jsonw_destroy(&jw);
-       }
 }
 
 static void print_rta_cacheinfo(FILE *fp, const struct rta_cacheinfo *ci)
@@ -766,7 +764,7 @@ int print_route(struct nlmsghdr *n, void *arg)
 
        if ((r->rtm_type != RTN_UNICAST || show_details > 0) &&
            (!filter.typemask || (filter.typemask & (1 << r->rtm_type))))
-               print_string(PRINT_ANY, NULL, "%s ",
+               print_string(PRINT_ANY, "type", "%s ",
                             rtnl_rtntype_n2a(r->rtm_type, b1, sizeof(b1)));
 
        color = COLOR_NONE;
@@ -2079,6 +2077,8 @@ static int iproute_get(int argc, char **argv)
        if (rtnl_talk(&rth, &req.n, &answer) < 0)
                return -2;
 
+       new_json_obj(json);
+
        if (connected && !from_ok) {
                struct rtmsg *r = NLMSG_DATA(answer);
                int len = answer->nlmsg_len;
@@ -2123,6 +2123,7 @@ static int iproute_get(int argc, char **argv)
                req.n.nlmsg_flags = NLM_F_REQUEST;
                req.n.nlmsg_type = RTM_GETROUTE;
 
+               delete_json_obj();
                free(answer);
                if (rtnl_talk(&rth, &req.n, &answer) < 0)
                        return -2;
@@ -2134,6 +2135,7 @@ static int iproute_get(int argc, char **argv)
                return -1;
        }
 
+       delete_json_obj();
        free(answer);
        return 0;
 }

diff --git a/ip/iprule.c b/ip/iprule.c
index 4e9437de343780df8c56c68a8d8792ec4ece5a7a..83aef38e0dc7362efc5caacc8eec67154d0f5fce 100644 (file)
--- a/ip/iprule.c
+++ b/ip/iprule.c
@@ -455,7 +455,8 @@ int print_rule(struct nlmsghdr *n, void *arg)
                        print_string(PRINT_ANY, "goto", "goto %s", "none");
 
                if (frh->flags & FIB_RULE_UNRESOLVED)
-                       print_null(PRINT_ANY, "unresolved", "unresolved", NULL);
+                       print_null(PRINT_ANY, "unresolved",
+                                  " [unresolved]", NULL);
        } else if (frh->action == FR_ACT_NOP) {
                print_null(PRINT_ANY, "nop", "nop", NULL);
        } else if (frh->action != FR_ACT_TO_TBL) {

diff --git a/tc/m_connmark.c b/tc/m_connmark.c
index 45e2d05f1a9114f7df37c88ee79a11e109390bf8..13543d337cc2dec9d842fecae97cdd1319174642 100644 (file)
--- a/tc/m_connmark.c
+++ b/tc/m_connmark.c
@@ -73,7 +73,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
                if (matches(*argv, "zone") == 0) {
                        NEXT_ARG();
                        if (get_u16(&sel.zone, *argv, 10)) {
-                               fprintf(stderr, "simple: Illegal \"index\"\n");
+                               fprintf(stderr, "connmark: Illegal \"zone\"\n");
                                return -1;
                        }
                        argc--;
@@ -87,7 +87,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
                if (matches(*argv, "index") == 0) {
                        NEXT_ARG();
                        if (get_u32(&sel.index, *argv, 10)) {
-                               fprintf(stderr, "simple: Illegal \"index\"\n");
+                               fprintf(stderr, "connmark: Illegal \"index\"\n");
                                return -1;
                        }
                        argc--;