Merge branch 'iproute2-master' into iproute2-next

Signed-off-by: David Ahern <dsahern@gmail.com>

diff --git a/README b/README
index f66fd5faf4cf0e9bf6218e085da9e716b0b96d83..bc82187cf01872c2abc6a262f445c60be27fa045 100644 (file)
--- a/README
+++ b/README
@@ -16,8 +16,8 @@ How to compile this.
 --------------------
 1. libdbm
 
-arpd needs to have the db4 development libraries. For Debian
-users this is the package with a name like libdb4.x-dev.
+arpd needs to have the berkeleydb development libraries. For Debian
+users this is the package with a name like libdbX.X-dev.
 DBM_INCLUDE points to the directory with db_185.h which
 is the include file used by arpd to get to the old format Berkeley
 database routines.  Often this is in the db-devel package.

diff --git a/include/json_print.h b/include/json_print.h
index 2ca7830adbd6cfb6f89e690a419fa7da35894e56..218fedc51b0d9d7ed8a8ad00a90f91aa3aad76d3 100644 (file)
--- a/include/json_print.h
+++ b/include/json_print.h
@@ -56,13 +56,16 @@ void close_json_array(enum output_type type, const char *delim);
                print_color_##type_name(t, COLOR_NONE, key, fmt, value);        \
        }
 _PRINT_FUNC(int, int);
+_PRINT_FUNC(s64, int64_t);
 _PRINT_FUNC(bool, bool);
 _PRINT_FUNC(null, const char*);
 _PRINT_FUNC(string, const char*);
-_PRINT_FUNC(uint, uint64_t);
+_PRINT_FUNC(uint, unsigned int);
+_PRINT_FUNC(u64, uint64_t);
 _PRINT_FUNC(hu, unsigned short);
 _PRINT_FUNC(hex, unsigned int);
 _PRINT_FUNC(0xhex, unsigned int);
+_PRINT_FUNC(luint, unsigned long int);
 _PRINT_FUNC(lluint, unsigned long long int);
 _PRINT_FUNC(float, double);
 #undef _PRINT_FUNC

diff --git a/include/json_writer.h b/include/json_writer.h
index 4b4dec2869be9bac1d72d9a3ce3487c0629839b7..9ab88e1dbdd9136f1189c4849248dbf23548a129 100644 (file)
--- a/include/json_writer.h
+++ b/include/json_writer.h
@@ -34,22 +34,29 @@ void jsonw_string(json_writer_t *self, const char *value);
 void jsonw_bool(json_writer_t *self, bool value);
 void jsonw_float(json_writer_t *self, double number);
 void jsonw_float_fmt(json_writer_t *self, const char *fmt, double num);
-void jsonw_uint(json_writer_t *self, uint64_t number);
+void jsonw_uint(json_writer_t *self, unsigned int number);
+void jsonw_u64(json_writer_t *self, uint64_t number);
 void jsonw_xint(json_writer_t *self, uint64_t number);
 void jsonw_hu(json_writer_t *self, unsigned short number);
-void jsonw_int(json_writer_t *self, int64_t number);
+void jsonw_int(json_writer_t *self, int number);
+void jsonw_s64(json_writer_t *self, int64_t number);
 void jsonw_null(json_writer_t *self);
+void jsonw_luint(json_writer_t *self, unsigned long int num);
 void jsonw_lluint(json_writer_t *self, unsigned long long int num);
 
 /* Useful Combinations of name and value */
 void jsonw_string_field(json_writer_t *self, const char *prop, const char *val);
 void jsonw_bool_field(json_writer_t *self, const char *prop, bool value);
 void jsonw_float_field(json_writer_t *self, const char *prop, double num);
-void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num);
+void jsonw_uint_field(json_writer_t *self, const char *prop, unsigned int num);
+void jsonw_u64_field(json_writer_t *self, const char *prop, uint64_t num);
 void jsonw_xint_field(json_writer_t *self, const char *prop, uint64_t num);
 void jsonw_hu_field(json_writer_t *self, const char *prop, unsigned short num);
-void jsonw_int_field(json_writer_t *self, const char *prop, int64_t num);
+void jsonw_int_field(json_writer_t *self, const char *prop, int num);
+void jsonw_s64_field(json_writer_t *self, const char *prop, int64_t num);
 void jsonw_null_field(json_writer_t *self, const char *prop);
+void jsonw_luint_field(json_writer_t *self, const char *prop,
+                       unsigned long int num);
 void jsonw_lluint_field(json_writer_t *self, const char *prop,
                        unsigned long long int num);
 void jsonw_float_field_fmt(json_writer_t *self, const char *prop,

diff --git a/ip/ipaddress.c b/ip/ipaddress.c
index aecc9a1d070ef859de54a61551d619168915143f..75539e057f6a7b11e70749192c4dd4689730bf1d 100644 (file)
--- a/ip/ipaddress.c
+++ b/ip/ipaddress.c
@@ -554,21 +554,21 @@ static void print_vf_stats64(FILE *fp, struct rtattr *vfstats)
 
                /* RX stats */
                open_json_object("rx");
-               print_uint(PRINT_JSON, "bytes", NULL,
+               print_u64(PRINT_JSON, "bytes", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_RX_BYTES]));
-               print_uint(PRINT_JSON, "packets", NULL,
+               print_u64(PRINT_JSON, "packets", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_RX_PACKETS]));
-               print_uint(PRINT_JSON, "multicast", NULL,
+               print_u64(PRINT_JSON, "multicast", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_MULTICAST]));
-               print_uint(PRINT_JSON, "broadcast", NULL,
+               print_u64(PRINT_JSON, "broadcast", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_BROADCAST]));
                close_json_object();
 
                /* TX stats */
                open_json_object("tx");
-               print_uint(PRINT_JSON, "tx_bytes", NULL,
+               print_u64(PRINT_JSON, "tx_bytes", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_TX_BYTES]));
-               print_uint(PRINT_JSON, "tx_packets", NULL,
+               print_u64(PRINT_JSON, "tx_packets", NULL,
                           rta_getattr_u64(vf[IFLA_VF_STATS_TX_PACKETS]));
                close_json_object();
                close_json_object();
@@ -608,69 +608,69 @@ static void __print_link_stats(FILE *fp, struct rtattr *tb[])
 
                /* RX stats */
                open_json_object("rx");
-               print_uint(PRINT_JSON, "bytes", NULL, s->rx_bytes);
-               print_uint(PRINT_JSON, "packets", NULL, s->rx_packets);
-               print_uint(PRINT_JSON, "errors", NULL, s->rx_errors);
-               print_uint(PRINT_JSON, "dropped", NULL, s->rx_dropped);
-               print_uint(PRINT_JSON, "over_errors", NULL, s->rx_over_errors);
-               print_uint(PRINT_JSON, "multicast", NULL, s->multicast);
+               print_u64(PRINT_JSON, "bytes", NULL, s->rx_bytes);
+               print_u64(PRINT_JSON, "packets", NULL, s->rx_packets);
+               print_u64(PRINT_JSON, "errors", NULL, s->rx_errors);
+               print_u64(PRINT_JSON, "dropped", NULL, s->rx_dropped);
+               print_u64(PRINT_JSON, "over_errors", NULL, s->rx_over_errors);
+               print_u64(PRINT_JSON, "multicast", NULL, s->multicast);
                if (s->rx_compressed)
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "compressed", NULL, s->rx_compressed);
 
                /* RX error stats */
                if (show_stats > 1) {
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "length_errors",
                                   NULL, s->rx_length_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "crc_errors",
                                   NULL, s->rx_crc_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "frame_errors",
                                   NULL, s->rx_frame_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "fifo_errors",
                                   NULL, s->rx_fifo_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "missed_errors",
                                   NULL, s->rx_missed_errors);
                        if (s->rx_nohandler)
-                               print_uint(PRINT_JSON,
+                               print_u64(PRINT_JSON,
                                           "nohandler", NULL, s->rx_nohandler);
                }
                close_json_object();
 
                /* TX stats */
                open_json_object("tx");
-               print_uint(PRINT_JSON, "bytes", NULL, s->tx_bytes);
-               print_uint(PRINT_JSON, "packets", NULL, s->tx_packets);
-               print_uint(PRINT_JSON, "errors", NULL, s->tx_errors);
-               print_uint(PRINT_JSON, "dropped", NULL, s->tx_dropped);
-               print_uint(PRINT_JSON,
+               print_u64(PRINT_JSON, "bytes", NULL, s->tx_bytes);
+               print_u64(PRINT_JSON, "packets", NULL, s->tx_packets);
+               print_u64(PRINT_JSON, "errors", NULL, s->tx_errors);
+               print_u64(PRINT_JSON, "dropped", NULL, s->tx_dropped);
+               print_u64(PRINT_JSON,
                           "carrier_errors",
                           NULL, s->tx_carrier_errors);
-               print_uint(PRINT_JSON, "collisions", NULL, s->collisions);
+               print_u64(PRINT_JSON, "collisions", NULL, s->collisions);
                if (s->tx_compressed)
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "compressed", NULL, s->tx_compressed);
 
                /* TX error stats */
                if (show_stats > 1) {
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "aborted_errors",
                                   NULL, s->tx_aborted_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "fifo_errors",
                                   NULL, s->tx_fifo_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "window_errors",
                                   NULL, s->tx_window_errors);
-                       print_uint(PRINT_JSON,
+                       print_u64(PRINT_JSON,
                                   "heartbeat_errors",
                                   NULL, s->tx_heartbeat_errors);
                        if (carrier_changes)
-                               print_uint(PRINT_JSON, "carrier_changes", NULL,
+                               print_u64(PRINT_JSON, "carrier_changes", NULL,
                                           rta_getattr_u32(carrier_changes));
                }
 

diff --git a/ip/ipmacsec.c b/ip/ipmacsec.c
index 38ec7136e55599e679c893f6d43e05f83623d821..4e4e158ea0f238a06f1c3fa335e8edddf013b9db 100644 (file)
--- a/ip/ipmacsec.c
+++ b/ip/ipmacsec.c
@@ -640,7 +640,7 @@ static void print_attrs(struct rtattr *attrs[])
        }
 }
 
-static __u64 getattr_uint(struct rtattr *stat)
+static __u64 getattr_u64(struct rtattr *stat)
 {
        switch (RTA_PAYLOAD(stat)) {
        case sizeof(__u64):
@@ -681,7 +681,7 @@ static void print_fp_stats(const char *prefix,
 
                pad = strlen(names[i]) + 1;
                if (stats[i])
-                       printf("%*llu", pad, getattr_uint(stats[i]));
+                       printf("%*llu", pad, getattr_u64(stats[i]));
                else
                        printf("%*c", pad, '-');
        }
@@ -697,8 +697,8 @@ static void print_json_stats(const char *names[], unsigned int num,
                if (!names[i] || !stats[i])
                        continue;
 
-               print_uint(PRINT_JSON, names[i],
-                          NULL, getattr_uint(stats[i]));
+               print_u64(PRINT_JSON, names[i],
+                          NULL, getattr_u64(stats[i]));
        }
 }
 

diff --git a/ip/ipmroute.c b/ip/ipmroute.c
index 59c5b7718e1823a0c00116b3e2993e6cdc74bc2b..cdb4d898c43668e215f25ff6e0daf636a8ead4c8 100644 (file)
--- a/ip/ipmroute.c
+++ b/ip/ipmroute.c
@@ -182,12 +182,12 @@ int print_mroute(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                struct rta_mfc_stats *mfcs = RTA_DATA(tb[RTA_MFC_STATS]);
 
                print_string(PRINT_FP, NULL, "%s", _SL_);
-               print_uint(PRINT_ANY, "packets", "  %"PRIu64" packets,",
+               print_u64(PRINT_ANY, "packets", "  %"PRIu64" packets,",
                           mfcs->mfcs_packets);
-               print_uint(PRINT_ANY, "bytes", " %"PRIu64" bytes", mfcs->mfcs_bytes);
+               print_u64(PRINT_ANY, "bytes", " %"PRIu64" bytes", mfcs->mfcs_bytes);
 
                if (mfcs->mfcs_wrong_if)
-                       print_uint(PRINT_ANY, "wrong_if",
+                       print_u64(PRINT_ANY, "wrong_if",
                                   ", %"PRIu64" arrived on wrong iif.",
                                   mfcs->mfcs_wrong_if);
        }

diff --git a/ip/ipntable.c b/ip/ipntable.c
index 82f40f87ae1528093befaebdedb91f329a91453d..4fae181dd3fa147eeac0d3de1e0ba91b0d2e1cc5 100644 (file)
--- a/ip/ipntable.c
+++ b/ip/ipntable.c
@@ -392,7 +392,7 @@ static void print_ndtparams(struct rtattr *tpb[])
        if (tpb[NDTPA_REACHABLE_TIME]) {
                __u64 reachable = rta_getattr_u64(tpb[NDTPA_REACHABLE_TIME]);
 
-               print_uint(PRINT_ANY, "reachable",
+               print_u64(PRINT_ANY, "reachable",
                           "reachable %llu ", reachable);
        }
 
@@ -400,14 +400,14 @@ static void print_ndtparams(struct rtattr *tpb[])
                __u64 breachable
                        = rta_getattr_u64(tpb[NDTPA_BASE_REACHABLE_TIME]);
 
-               print_uint(PRINT_ANY, "base_reachable",
+               print_u64(PRINT_ANY, "base_reachable",
                           "base_reachable %llu ", breachable);
        }
 
        if (tpb[NDTPA_RETRANS_TIME]) {
                __u64 retrans = rta_getattr_u64(tpb[NDTPA_RETRANS_TIME]);
 
-               print_uint(PRINT_ANY, "retrans", "retrans %llu ", retrans);
+               print_u64(PRINT_ANY, "retrans", "retrans %llu ", retrans);
        }
 
        print_string(PRINT_FP, NULL, "%s    ", _SL_);
@@ -415,14 +415,14 @@ static void print_ndtparams(struct rtattr *tpb[])
        if (tpb[NDTPA_GC_STALETIME]) {
                __u64 gc_stale = rta_getattr_u64(tpb[NDTPA_GC_STALETIME]);
 
-               print_uint(PRINT_ANY, "gc_stale", "gc_stale %llu ", gc_stale);
+               print_u64(PRINT_ANY, "gc_stale", "gc_stale %llu ", gc_stale);
        }
 
        if (tpb[NDTPA_DELAY_PROBE_TIME]) {
                __u64 delay_probe
                        = rta_getattr_u64(tpb[NDTPA_DELAY_PROBE_TIME]);
 
-               print_uint(PRINT_ANY, "delay_probe",
+               print_u64(PRINT_ANY, "delay_probe",
                           "delay_probe %llu ", delay_probe);
        }
 
@@ -459,14 +459,14 @@ static void print_ndtparams(struct rtattr *tpb[])
        if (tpb[NDTPA_ANYCAST_DELAY]) {
                __u64 anycast_delay = rta_getattr_u64(tpb[NDTPA_ANYCAST_DELAY]);
 
-               print_uint(PRINT_ANY, "anycast_delay",
+               print_u64(PRINT_ANY, "anycast_delay",
                           "anycast_delay %llu ", anycast_delay);
        }
 
        if (tpb[NDTPA_PROXY_DELAY]) {
                __u64 proxy_delay = rta_getattr_u64(tpb[NDTPA_PROXY_DELAY]);
 
-               print_uint(PRINT_ANY, "proxy_delay",
+               print_u64(PRINT_ANY, "proxy_delay",
                           "proxy_delay %llu ", proxy_delay);
        }
 
@@ -479,7 +479,7 @@ static void print_ndtparams(struct rtattr *tpb[])
        if (tpb[NDTPA_LOCKTIME]) {
                __u64 locktime = rta_getattr_u64(tpb[NDTPA_LOCKTIME]);
 
-               print_uint(PRINT_ANY, "locktime", "locktime %llu ", locktime);
+               print_u64(PRINT_ANY, "locktime", "locktime %llu ", locktime);
        }
 
        print_string(PRINT_FP, NULL, "%s", _SL_);
@@ -490,31 +490,31 @@ static void print_ndtstats(const struct ndt_stats *ndts)
 
        print_string(PRINT_FP, NULL, "    stats ", NULL);
 
-       print_uint(PRINT_ANY, "allocs", "allocs %llu ", ndts->ndts_allocs);
-       print_uint(PRINT_ANY, "destroys", "destroys %llu ",
+       print_u64(PRINT_ANY, "allocs", "allocs %llu ", ndts->ndts_allocs);
+       print_u64(PRINT_ANY, "destroys", "destroys %llu ",
                   ndts->ndts_destroys);
-       print_uint(PRINT_ANY, "hash_grows", "hash_grows %llu ",
+       print_u64(PRINT_ANY, "hash_grows", "hash_grows %llu ",
                   ndts->ndts_hash_grows);
 
        print_string(PRINT_FP, NULL, "%s    ", _SL_);
 
-       print_uint(PRINT_ANY, "res_failed", "res_failed %llu ",
+       print_u64(PRINT_ANY, "res_failed", "res_failed %llu ",
                   ndts->ndts_res_failed);
-       print_uint(PRINT_ANY, "lookups", "lookups %llu ", ndts->ndts_lookups);
-       print_uint(PRINT_ANY, "hits", "hits %llu ", ndts->ndts_hits);
+       print_u64(PRINT_ANY, "lookups", "lookups %llu ", ndts->ndts_lookups);
+       print_u64(PRINT_ANY, "hits", "hits %llu ", ndts->ndts_hits);
 
        print_string(PRINT_FP, NULL, "%s    ", _SL_);
 
-       print_uint(PRINT_ANY, "rcv_probes_mcast", "rcv_probes_mcast %llu ",
+       print_u64(PRINT_ANY, "rcv_probes_mcast", "rcv_probes_mcast %llu ",
                   ndts->ndts_rcv_probes_mcast);
-       print_uint(PRINT_ANY, "rcv_probes_ucast", "rcv_probes_ucast %llu ",
+       print_u64(PRINT_ANY, "rcv_probes_ucast", "rcv_probes_ucast %llu ",
                   ndts->ndts_rcv_probes_ucast);
 
        print_string(PRINT_FP, NULL, "%s    ", _SL_);
 
-       print_uint(PRINT_ANY, "periodic_gc_runs", "periodic_gc_runs %llu ",
+       print_u64(PRINT_ANY, "periodic_gc_runs", "periodic_gc_runs %llu ",
                   ndts->ndts_periodic_gc_runs);
-       print_uint(PRINT_ANY, "forced_gc_runs", "forced_gc_runs %llu ",
+       print_u64(PRINT_ANY, "forced_gc_runs", "forced_gc_runs %llu ",
                   ndts->ndts_forced_gc_runs);
 
        print_string(PRINT_FP, NULL, "%s", _SL_);
@@ -607,7 +607,7 @@ static int print_ntable(const struct sockaddr_nl *who,
        if (tb[NDTA_GC_INTERVAL]) {
                __u64 gc_int = rta_getattr_u64(tb[NDTA_GC_INTERVAL]);
 
-               print_uint(PRINT_ANY, "gc_interval", "gc_int %llu ", gc_int);
+               print_u64(PRINT_ANY, "gc_interval", "gc_int %llu ", gc_int);
        }
 
        if (ret)

diff --git a/ip/iproute.c b/ip/iproute.c
index 44351bc51b4bd7dd3d08f6357a720288e0ca4bc3..56dd9f25e38e13336eee7022408e0c6965f2c481 100644 (file)
--- a/ip/iproute.c
+++ b/ip/iproute.c
@@ -650,7 +650,7 @@ static void print_rta_multipath(FILE *fp, const struct rtmsg *r,
        int len = RTA_PAYLOAD(rta);
        int first = 1;
 
-       while (len > sizeof(*nh)) {
+       while (len >= sizeof(*nh)) {
                struct rtattr *tb[RTA_MAX + 1];
 
                if (nh->rtnh_len > len)

diff --git a/ip/iproute_lwtunnel.c b/ip/iproute_lwtunnel.c
index cde9b3d298ecbb96137826e6c172f3398f8f19ba..46a212c8721e01209b0fbbbd82957433ece813fc 100644 (file)
--- a/ip/iproute_lwtunnel.c
+++ b/ip/iproute_lwtunnel.c
@@ -273,7 +273,7 @@ static void print_encap_ip(FILE *fp, struct rtattr *encap)
        parse_rtattr_nested(tb, LWTUNNEL_IP_MAX, encap);
 
        if (tb[LWTUNNEL_IP_ID])
-               print_uint(PRINT_ANY, "id", "id %llu ",
+               print_u64(PRINT_ANY, "id", "id %llu ",
                           ntohll(rta_getattr_u64(tb[LWTUNNEL_IP_ID])));
 
        if (tb[LWTUNNEL_IP_SRC])
@@ -333,7 +333,7 @@ static void print_encap_ip6(FILE *fp, struct rtattr *encap)
        parse_rtattr_nested(tb, LWTUNNEL_IP6_MAX, encap);
 
        if (tb[LWTUNNEL_IP6_ID])
-               print_uint(PRINT_ANY, "id", "id %llu ",
+               print_u64(PRINT_ANY, "id", "id %llu ",
                            ntohll(rta_getattr_u64(tb[LWTUNNEL_IP6_ID])));
 
        if (tb[LWTUNNEL_IP6_SRC])
@@ -347,7 +347,7 @@ static void print_encap_ip6(FILE *fp, struct rtattr *encap)
                                   rt_addr_n2a_rta(AF_INET6, tb[LWTUNNEL_IP6_DST]));
 
        if (tb[LWTUNNEL_IP6_HOPLIMIT])
-               print_uint(PRINT_ANY, "hoplimit",
+               print_u64(PRINT_ANY, "hoplimit",
                           "hoplimit %u ",
                           rta_getattr_u8(tb[LWTUNNEL_IP6_HOPLIMIT]));
 

diff --git a/ip/iptuntap.c b/ip/iptuntap.c
index 6c5a7259d15573bd7763686163afd5d50d28af22..58996e6c573323157f31e2272301fc261f73b49a 100644 (file)
--- a/ip/iptuntap.c
+++ b/ip/iptuntap.c
@@ -440,10 +440,10 @@ static int print_tuntap(const struct sockaddr_nl *who,
                           "ifname", "%s:", name);
        print_flags(flags);
        if (owner != -1)
-               print_uint(PRINT_ANY, "user",
+               print_u64(PRINT_ANY, "user",
                           " user %ld", owner);
        if (group != -1)
-               print_uint(PRINT_ANY, "group",
+               print_u64(PRINT_ANY, "group",
                           " group %ld", group);
 
        if (show_details) {

diff --git a/ip/tcp_metrics.c b/ip/tcp_metrics.c
index 72dc980c92a64c6a6453ee5eae32565ca1c8ba4e..ad3d6f363003dfc9ab6f29ce37c88c6950ea68ab 100644 (file)
--- a/ip/tcp_metrics.c
+++ b/ip/tcp_metrics.c
@@ -139,19 +139,19 @@ static void print_tcp_metrics(struct rtattr *a)
 
                print_uint(PRINT_JSON, name, NULL, val);
                print_string(PRINT_FP, NULL, " %s ", name);
-               print_uint(PRINT_FP, NULL, "%lu", val);
+               print_uint(PRINT_FP, NULL, "%u", val);
        }
 
        if (rtt) {
                print_float(PRINT_JSON, "rtt", NULL,
                            (double)rtt / usec_per_sec);
-               print_uint(PRINT_FP, NULL,
+               print_u64(PRINT_FP, NULL,
                           " rtt %luus", rtt);
        }
        if (rttvar) {
                print_float(PRINT_JSON, "rttvar", NULL,
                            (double) rttvar / usec_per_sec);
-               print_uint(PRINT_FP, NULL,
+               print_u64(PRINT_FP, NULL,
                           " rttvar %luus", rttvar);
        }
 }

diff --git a/lib/json_print.c b/lib/json_print.c
index bda7293350c33907c64ce3ad8fcbbf4d0f73e5ee..5dc41bfabfd4db84965c43d83dfd80ee09c37939 100644 (file)
--- a/lib/json_print.c
+++ b/lib/json_print.c
@@ -116,8 +116,11 @@ void close_json_array(enum output_type type, const char *str)
                }                                                       \
        }
 _PRINT_FUNC(int, int);
+_PRINT_FUNC(s64, int64_t);
 _PRINT_FUNC(hu, unsigned short);
-_PRINT_FUNC(uint, uint64_t);
+_PRINT_FUNC(uint, unsigned int);
+_PRINT_FUNC(u64, uint64_t);
+_PRINT_FUNC(luint, unsigned long int);
 _PRINT_FUNC(lluint, unsigned long long int);
 _PRINT_FUNC(float, double);
 #undef _PRINT_FUNC

diff --git a/lib/json_writer.c b/lib/json_writer.c
index 0ad042188ab9406683465270cc351caddf0b18fa..aa9ce1c65e513567f1160248772b7ea4a9caa18b 100644 (file)
--- a/lib/json_writer.c
+++ b/lib/json_writer.c
@@ -220,7 +220,12 @@ void jsonw_hu(json_writer_t *self, unsigned short num)
        jsonw_printf(self, "%hu", num);
 }
 
-void jsonw_uint(json_writer_t *self, uint64_t num)
+void jsonw_uint(json_writer_t *self, unsigned int num)
+{
+       jsonw_printf(self, "%u", num);
+}
+
+void jsonw_u64(json_writer_t *self, uint64_t num)
 {
        jsonw_printf(self, "%"PRIu64, num);
 }
@@ -230,12 +235,22 @@ void jsonw_xint(json_writer_t *self, uint64_t num)
        jsonw_printf(self, "%"PRIx64, num);
 }
 
+void jsonw_luint(json_writer_t *self, unsigned long int num)
+{
+       jsonw_printf(self, "%lu", num);
+}
+
 void jsonw_lluint(json_writer_t *self, unsigned long long int num)
 {
        jsonw_printf(self, "%llu", num);
 }
 
-void jsonw_int(json_writer_t *self, int64_t num)
+void jsonw_int(json_writer_t *self, int num)
+{
+       jsonw_printf(self, "%d", num);
+}
+
+void jsonw_s64(json_writer_t *self, int64_t num)
 {
        jsonw_printf(self, "%"PRId64, num);
 }
@@ -268,12 +283,18 @@ void jsonw_float_field_fmt(json_writer_t *self,
        jsonw_float_fmt(self, fmt, val);
 }
 
-void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num)
+void jsonw_uint_field(json_writer_t *self, const char *prop, unsigned int num)
 {
        jsonw_name(self, prop);
        jsonw_uint(self, num);
 }
 
+void jsonw_u64_field(json_writer_t *self, const char *prop, uint64_t num)
+{
+       jsonw_name(self, prop);
+       jsonw_u64(self, num);
+}
+
 void jsonw_xint_field(json_writer_t *self, const char *prop, uint64_t num)
 {
        jsonw_name(self, prop);
@@ -286,6 +307,14 @@ void jsonw_hu_field(json_writer_t *self, const char *prop, unsigned short num)
        jsonw_hu(self, num);
 }
 
+void jsonw_luint_field(json_writer_t *self,
+                       const char *prop,
+                       unsigned long int num)
+{
+       jsonw_name(self, prop);
+       jsonw_luint(self, num);
+}
+
 void jsonw_lluint_field(json_writer_t *self,
                        const char *prop,
                        unsigned long long int num)
@@ -294,12 +323,18 @@ void jsonw_lluint_field(json_writer_t *self,
        jsonw_lluint(self, num);
 }
 
-void jsonw_int_field(json_writer_t *self, const char *prop, int64_t num)
+void jsonw_int_field(json_writer_t *self, const char *prop, int num)
 {
        jsonw_name(self, prop);
        jsonw_int(self, num);
 }
 
+void jsonw_s64_field(json_writer_t *self, const char *prop, int64_t num)
+{
+       jsonw_name(self, prop);
+       jsonw_s64(self, num);
+}
+
 void jsonw_null_field(json_writer_t *self, const char *prop)
 {
        jsonw_name(self, prop);

diff --git a/misc/Makefile b/misc/Makefile
index 34ef6b21b4ed4299dda4a824263de9a3c687d70b..b2dd6b26e2dc53b9648122c1ca483e0752382826 100644 (file)
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -25,7 +25,7 @@ rtacct: rtacct.c
        $(QUIET_CC)$(CC) $(CFLAGS) $(LDFLAGS) -o rtacct rtacct.c $(LDLIBS) -lm
 
 arpd: arpd.c
-       $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb -lpthread
+       $(QUIET_CC)$(CC) $(CFLAGS) -I$(DBM_INCLUDE) $(LDFLAGS) -o arpd arpd.c $(LDLIBS) -ldb
 
 ssfilter.c: ssfilter.y
        $(QUIET_YACC)bison ssfilter.y -o ssfilter.c

diff --git a/tc/q_ingress.c b/tc/q_ingress.c
index 1e4222984d891283e5347b74506c85e57d50dc2f..93313c9c2aec6edf41b51336df4466926be35033 100644 (file)
--- a/tc/q_ingress.c
+++ b/tc/q_ingress.c
@@ -40,7 +40,7 @@ static int ingress_parse_opt(struct qdisc_util *qu, int argc, char **argv,
 static int ingress_print_opt(struct qdisc_util *qu, FILE *f,
                             struct rtattr *opt)
 {
-       fprintf(f, "---------------- ");
+       print_string(PRINT_FP, NULL, "---------------- ", NULL);
        return 0;
 }