]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/ipntable.c
fix print_0xhex on 32 bit
[mirror_iproute2.git] / ip / ipntable.c
index 56ad001654b0c26fe16d204856ca78ac0e4a0c53..50fc949f1fcc43fa63df03094b604fbbf0f47bfd 100644 (file)
@@ -12,8 +12,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ * along with this program; if not, see <http://www.gnu.org/licenses>.
  */
 /*
  * based on ipneigh.c
 
 #include "utils.h"
 #include "ip_common.h"
+#include "json_print.h"
 
 static struct
 {
        int family;
-        int index;
+       int index;
 #define NONE_DEV       (-1)
-       char name[1024];
+       const char *name;
 } filter;
 
 static void usage(void) __attribute__((noreturn));
@@ -53,7 +53,7 @@ static void usage(void)
 
                "PARMS := [ base_reachable MSEC ] [ retrans MSEC ] [ gc_stale MSEC ]\n"
                "         [ delay_probe MSEC ] [ queue LEN ]\n"
-               "         [ app_probs VAL ] [ ucast_probes VAL ] [ mcast_probes VAL ]\n"
+               "         [ app_probes VAL ] [ ucast_probes VAL ] [ mcast_probes VAL ]\n"
                "         [ anycast_delay MSEC ] [ proxy_delay MSEC ] [ proxy_queue LEN ]\n"
                "         [ locktime MSEC ]\n"
                );
@@ -64,29 +64,22 @@ static void usage(void)
 static int ipntable_modify(int cmd, int flags, int argc, char **argv)
 {
        struct {
-               struct nlmsghdr         n;
+               struct nlmsghdr n;
                struct ndtmsg           ndtm;
-               char                    buf[1024];
-       } req;
+               char                    buf[1024];
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndtmsg)),
+               .n.nlmsg_flags = NLM_F_REQUEST | flags,
+               .n.nlmsg_type = cmd,
+               .ndtm.ndtm_family = preferred_family,
+       };
        char *namep = NULL;
        char *threshsp = NULL;
        char *gc_intp = NULL;
-       char parms_buf[1024];
+       char parms_buf[1024] = {};
        struct rtattr *parms_rta = (struct rtattr *)parms_buf;
        int parms_change = 0;
 
-       memset(&req, 0, sizeof(req));
-
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct ndtmsg));
-       req.n.nlmsg_flags = NLM_F_REQUEST|flags;
-       req.n.nlmsg_type = cmd;
-
-       req.ndtm.ndtm_family = preferred_family;
-       req.ndtm.ndtm_pad1 = 0;
-       req.ndtm.ndtm_pad2 = 0;
-
-       memset(&parms_buf, 0, sizeof(parms_buf));
-
        parms_rta->rta_type = NDTA_PARMS;
        parms_rta->rta_len = RTA_LENGTH(0);
 
@@ -147,10 +140,8 @@ static int ipntable_modify(int cmd, int flags, int argc, char **argv)
 
                        NEXT_ARG();
                        ifindex = ll_name_to_index(*argv);
-                       if (ifindex == 0) {
-                               fprintf(stderr, "Cannot find device \"%s\"\n", *argv);
-                               return -1;
-                       }
+                       if (!ifindex)
+                               return nodev(*argv);
 
                        rta_addattr32(parms_rta, sizeof(parms_buf),
                                      NDTPA_IFINDEX, ifindex);
@@ -210,8 +201,6 @@ static int ipntable_modify(int cmd, int flags, int argc, char **argv)
                        if (get_u32(&queue, *argv, 0))
                                invarg("\"queue\" value is invalid", *argv);
 
-                       if (!parms_rta)
-                               parms_rta = (struct rtattr *)&parms_buf;
                        rta_addattr32(parms_rta, sizeof(parms_buf),
                                      NDTPA_QUEUE_LEN, queue);
                        parms_change = 1;
@@ -305,7 +294,7 @@ static int ipntable_modify(int cmd, int flags, int argc, char **argv)
        if (!namep)
                missarg("NAME");
        if (!threshsp && !gc_intp && !parms_change) {
-               fprintf(stderr, "Not enough information: changable attributes required.\n");
+               fprintf(stderr, "Not enough information: changeable attributes required.\n");
                exit(-1);
        }
 
@@ -314,7 +303,7 @@ static int ipntable_modify(int cmd, int flags, int argc, char **argv)
                          RTA_PAYLOAD(parms_rta));
        }
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
                exit(2);
 
        return 0;
@@ -323,15 +312,13 @@ static int ipntable_modify(int cmd, int flags, int argc, char **argv)
 static const char *ntable_strtime_delta(__u32 msec)
 {
        static char str[32];
-       struct timeval now;
+       struct timeval now = {};
        time_t t;
        struct tm *tp;
 
        if (msec == 0)
                goto error;
 
-       memset(&now, 0, sizeof(now));
-
        if (gettimeofday(&now, NULL) < 0) {
                perror("gettimeofday");
                goto error;
@@ -350,9 +337,192 @@ static const char *ntable_strtime_delta(__u32 msec)
        return str;
 }
 
-int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static void print_ndtconfig(const struct ndt_config *ndtc)
+{
+
+       print_uint(PRINT_ANY, "key_length",
+                  "    config key_len %u ", ndtc->ndtc_key_len);
+       print_uint(PRINT_ANY, "entry_size",
+                  "entry_size %u ", ndtc->ndtc_entry_size);
+       print_uint(PRINT_ANY, "entries", "entries %u ", ndtc->ndtc_entries);
+
+       print_nl();
+
+       print_string(PRINT_ANY, "last_flush",
+                    "        last_flush %s ",
+                    ntable_strtime_delta(ndtc->ndtc_last_flush));
+       print_string(PRINT_ANY, "last_rand",
+                    "last_rand %s ",
+                    ntable_strtime_delta(ndtc->ndtc_last_rand));
+
+       print_nl();
+
+       print_uint(PRINT_ANY, "hash_rnd",
+                  "        hash_rnd %u ", ndtc->ndtc_hash_rnd);
+       print_0xhex(PRINT_ANY, "hash_mask",
+                   "hash_mask %08llx ", ndtc->ndtc_hash_mask);
+
+       print_uint(PRINT_ANY, "hash_chain_gc",
+                  "hash_chain_gc %u ", ndtc->ndtc_hash_chain_gc);
+       print_uint(PRINT_ANY, "proxy_qlen",
+                  "proxy_qlen %u ", ndtc->ndtc_proxy_qlen);
+
+       print_nl();
+}
+
+static void print_ndtparams(struct rtattr *tpb[])
 {
-       FILE *fp = (FILE*)arg;
+
+       if (tpb[NDTPA_IFINDEX]) {
+               __u32 ifindex = rta_getattr_u32(tpb[NDTPA_IFINDEX]);
+
+               print_string(PRINT_FP, NULL, "    dev ", NULL);
+               print_color_string(PRINT_ANY, COLOR_IFNAME,
+                                  "dev", "%s ", ll_index_to_name(ifindex));
+               print_nl();
+       }
+
+       print_string(PRINT_FP, NULL, "    ", NULL);
+       if (tpb[NDTPA_REFCNT]) {
+               __u32 refcnt = rta_getattr_u32(tpb[NDTPA_REFCNT]);
+
+               print_uint(PRINT_ANY, "refcnt", "refcnt %u ", refcnt);
+       }
+
+       if (tpb[NDTPA_REACHABLE_TIME]) {
+               __u64 reachable = rta_getattr_u64(tpb[NDTPA_REACHABLE_TIME]);
+
+               print_u64(PRINT_ANY, "reachable",
+                          "reachable %llu ", reachable);
+       }
+
+       if (tpb[NDTPA_BASE_REACHABLE_TIME]) {
+               __u64 breachable
+                       = rta_getattr_u64(tpb[NDTPA_BASE_REACHABLE_TIME]);
+
+               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_u64(PRINT_ANY, "retrans", "retrans %llu ", retrans);
+       }
+
+       print_string(PRINT_FP, NULL, "%s    ", _SL_);
+
+       if (tpb[NDTPA_GC_STALETIME]) {
+               __u64 gc_stale = rta_getattr_u64(tpb[NDTPA_GC_STALETIME]);
+
+               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_u64(PRINT_ANY, "delay_probe",
+                          "delay_probe %llu ", delay_probe);
+       }
+
+       if (tpb[NDTPA_QUEUE_LEN]) {
+               __u32 queue = rta_getattr_u32(tpb[NDTPA_QUEUE_LEN]);
+
+               print_uint(PRINT_ANY, "queue", "queue %u ", queue);
+       }
+
+       print_string(PRINT_FP, NULL, "%s    ", _SL_);
+
+       if (tpb[NDTPA_APP_PROBES]) {
+               __u32 aprobe = rta_getattr_u32(tpb[NDTPA_APP_PROBES]);
+
+               print_uint(PRINT_ANY, "app_probes", "app_probes %u ", aprobe);
+       }
+
+       if (tpb[NDTPA_UCAST_PROBES]) {
+               __u32 uprobe = rta_getattr_u32(tpb[NDTPA_UCAST_PROBES]);
+
+               print_uint(PRINT_ANY, "ucast_probes",
+                          "ucast_probes %u ", uprobe);
+       }
+
+       if (tpb[NDTPA_MCAST_PROBES]) {
+               __u32 mprobe = rta_getattr_u32(tpb[NDTPA_MCAST_PROBES]);
+
+               print_uint(PRINT_ANY, "mcast_probes",
+                          "mcast_probes %u ", mprobe);
+       }
+
+       print_string(PRINT_FP, NULL, "%s    ", _SL_);
+
+       if (tpb[NDTPA_ANYCAST_DELAY]) {
+               __u64 anycast_delay = rta_getattr_u64(tpb[NDTPA_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_u64(PRINT_ANY, "proxy_delay",
+                          "proxy_delay %llu ", proxy_delay);
+       }
+
+       if (tpb[NDTPA_PROXY_QLEN]) {
+               __u32 pqueue = rta_getattr_u32(tpb[NDTPA_PROXY_QLEN]);
+
+               print_uint(PRINT_ANY, "proxy_queue", "proxy_queue %u ", pqueue);
+       }
+
+       if (tpb[NDTPA_LOCKTIME]) {
+               __u64 locktime = rta_getattr_u64(tpb[NDTPA_LOCKTIME]);
+
+               print_u64(PRINT_ANY, "locktime", "locktime %llu ", locktime);
+       }
+
+       print_nl();
+}
+
+static void print_ndtstats(const struct ndt_stats *ndts)
+{
+
+       print_string(PRINT_FP, NULL, "    stats ", NULL);
+
+       print_u64(PRINT_ANY, "allocs", "allocs %llu ", ndts->ndts_allocs);
+       print_u64(PRINT_ANY, "destroys", "destroys %llu ",
+                  ndts->ndts_destroys);
+       print_u64(PRINT_ANY, "hash_grows", "hash_grows %llu ",
+                  ndts->ndts_hash_grows);
+
+       print_string(PRINT_FP, NULL, "%s    ", _SL_);
+
+       print_u64(PRINT_ANY, "res_failed", "res_failed %llu ",
+                  ndts->ndts_res_failed);
+       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_u64(PRINT_ANY, "rcv_probes_mcast", "rcv_probes_mcast %llu ",
+                  ndts->ndts_rcv_probes_mcast);
+       print_u64(PRINT_ANY, "rcv_probes_ucast", "rcv_probes_ucast %llu ",
+                  ndts->ndts_rcv_probes_ucast);
+
+       print_string(PRINT_FP, NULL, "%s    ", _SL_);
+
+       print_u64(PRINT_ANY, "periodic_gc_runs", "periodic_gc_runs %llu ",
+                  ndts->ndts_periodic_gc_runs);
+       print_u64(PRINT_ANY, "forced_gc_runs", "forced_gc_runs %llu ",
+                  ndts->ndts_forced_gc_runs);
+
+       print_nl();
+}
+
+static int print_ntable(struct nlmsghdr *n, void *arg)
+{
+       FILE *fp = (FILE *)arg;
        struct ndtmsg *ndtm = NLMSG_DATA(n);
        int len = n->nlmsg_len;
        struct rtattr *tb[NDTA_MAX+1];
@@ -379,9 +549,10 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
        if (tb[NDTA_NAME]) {
                const char *name = rta_getattr_str(tb[NDTA_NAME]);
 
-               if (strlen(filter.name) > 0 && strcmp(filter.name, name))
+               if (filter.name && strcmp(filter.name, name))
                        return 0;
        }
+
        if (tb[NDTA_PARMS]) {
                parse_rtattr(tpb, NDTPA_MAX, RTA_DATA(tb[NDTA_PARMS]),
                             RTA_PAYLOAD(tb[NDTA_PARMS]));
@@ -397,220 +568,67 @@ int print_ntable(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                }
        }
 
-       if (ndtm->ndtm_family == AF_INET)
-               fprintf(fp, "inet ");
-       else if (ndtm->ndtm_family == AF_INET6)
-               fprintf(fp, "inet6 ");
-       else if (ndtm->ndtm_family == AF_DECnet)
-               fprintf(fp, "dnet ");
-       else
-               fprintf(fp, "(%d) ", ndtm->ndtm_family);
+       open_json_object(NULL);
+       print_string(PRINT_ANY, "family",
+                    "%s ", family_name(ndtm->ndtm_family));
 
        if (tb[NDTA_NAME]) {
                const char *name = rta_getattr_str(tb[NDTA_NAME]);
-               fprintf(fp, "%s ", name);
+
+               print_string(PRINT_ANY, "name", "%s ", name);
        }
 
-       fprintf(fp, "%s", _SL_);
+       print_nl();
 
        ret = (tb[NDTA_THRESH1] || tb[NDTA_THRESH2] || tb[NDTA_THRESH3] ||
               tb[NDTA_GC_INTERVAL]);
        if (ret)
-               fprintf(fp, "    ");
+               print_string(PRINT_FP, NULL, "    ", NULL);
 
        if (tb[NDTA_THRESH1]) {
                __u32 thresh1 = rta_getattr_u32(tb[NDTA_THRESH1]);
-               fprintf(fp, "thresh1 %u ", thresh1);
+
+               print_uint(PRINT_ANY, "thresh1", "thresh1 %u ", thresh1);
        }
+
        if (tb[NDTA_THRESH2]) {
                __u32 thresh2 = rta_getattr_u32(tb[NDTA_THRESH2]);
-               fprintf(fp, "thresh2 %u ", thresh2);
+
+               print_uint(PRINT_ANY, "thresh2", "thresh2 %u ", thresh2);
        }
+
        if (tb[NDTA_THRESH3]) {
                __u32 thresh3 = rta_getattr_u32(tb[NDTA_THRESH3]);
-               fprintf(fp, "thresh3 %u ", thresh3);
-       }
-       if (tb[NDTA_GC_INTERVAL]) {
-               __u64 gc_int = rta_getattr_u64(tb[NDTA_GC_INTERVAL]);
-               fprintf(fp, "gc_int %llu ", (unsigned long long) gc_int);
-       }
 
-       if (ret)
-               fprintf(fp, "%s", _SL_);
-
-       if (tb[NDTA_CONFIG] && show_stats) {
-               struct ndt_config *ndtc = RTA_DATA(tb[NDTA_CONFIG]);
-
-               fprintf(fp, "    ");
-               fprintf(fp, "config ");
-
-               fprintf(fp, "key_len %u ", ndtc->ndtc_key_len);
-               fprintf(fp, "entry_size %u ", ndtc->ndtc_entry_size);
-               fprintf(fp, "entries %u ", ndtc->ndtc_entries);
-
-               fprintf(fp, "%s", _SL_);
-               fprintf(fp, "        ");
-
-               fprintf(fp, "last_flush %s ",
-                       ntable_strtime_delta(ndtc->ndtc_last_flush));
-               fprintf(fp, "last_rand %s ",
-                       ntable_strtime_delta(ndtc->ndtc_last_rand));
-
-               fprintf(fp, "%s", _SL_);
-               fprintf(fp, "        ");
-
-               fprintf(fp, "hash_rnd %u ", ndtc->ndtc_hash_rnd);
-               fprintf(fp, "hash_mask %08x ", ndtc->ndtc_hash_mask);
-
-               fprintf(fp, "hash_chain_gc %u ", ndtc->ndtc_hash_chain_gc);
-               fprintf(fp, "proxy_qlen %u ", ndtc->ndtc_proxy_qlen);
-
-               fprintf(fp, "%s", _SL_);
+               print_uint(PRINT_ANY, "thresh3", "thresh3 %u ", thresh3);
        }
 
-       if (tb[NDTA_PARMS]) {
-               if (tpb[NDTPA_IFINDEX]) {
-                       __u32 ifindex = rta_getattr_u32(tpb[NDTPA_IFINDEX]);
-
-                       fprintf(fp, "    ");
-                       fprintf(fp, "dev %s ", ll_index_to_name(ifindex));
-                       fprintf(fp, "%s", _SL_);
-               }
-
-               fprintf(fp, "    ");
-
-               if (tpb[NDTPA_REFCNT]) {
-                       __u32 refcnt = rta_getattr_u32(tpb[NDTPA_REFCNT]);
-                       fprintf(fp, "refcnt %u ", refcnt);
-               }
-               if (tpb[NDTPA_REACHABLE_TIME]) {
-                       __u64 reachable = rta_getattr_u64(tpb[NDTPA_REACHABLE_TIME]);
-                       fprintf(fp, "reachable %llu ",
-                               (unsigned long long) reachable);
-               }
-               if (tpb[NDTPA_BASE_REACHABLE_TIME]) {
-                       __u64 breachable = rta_getattr_u64(tpb[NDTPA_BASE_REACHABLE_TIME]);
-                       fprintf(fp, "base_reachable %llu ",
-                               (unsigned long long) breachable);
-               }
-               if (tpb[NDTPA_RETRANS_TIME]) {
-                       __u64 retrans = rta_getattr_u64(tpb[NDTPA_RETRANS_TIME]);
-                       fprintf(fp, "retrans %llu ",
-                               (unsigned long long) retrans);
-               }
-
-               fprintf(fp, "%s", _SL_);
-
-               fprintf(fp, "    ");
-
-               if (tpb[NDTPA_GC_STALETIME]) {
-                       __u64 gc_stale = rta_getattr_u64(tpb[NDTPA_GC_STALETIME]);
-                       fprintf(fp, "gc_stale %llu ",
-                               (unsigned long long) gc_stale);
-               }
-               if (tpb[NDTPA_DELAY_PROBE_TIME]) {
-                       __u64 delay_probe = rta_getattr_u64(tpb[NDTPA_DELAY_PROBE_TIME]);
-                       fprintf(fp, "delay_probe %llu ",
-                               (unsigned long long) delay_probe);
-               }
-               if (tpb[NDTPA_QUEUE_LEN]) {
-                       __u32 queue = rta_getattr_u32(tpb[NDTPA_QUEUE_LEN]);
-                       fprintf(fp, "queue %u ", queue);
-               }
-
-               fprintf(fp, "%s", _SL_);
-
-               fprintf(fp, "    ");
-
-               if (tpb[NDTPA_APP_PROBES]) {
-                       __u32 aprobe = rta_getattr_u32(tpb[NDTPA_APP_PROBES]);
-                       fprintf(fp, "app_probes %u ", aprobe);
-               }
-               if (tpb[NDTPA_UCAST_PROBES]) {
-                       __u32 uprobe = rta_getattr_u32(tpb[NDTPA_UCAST_PROBES]);
-                       fprintf(fp, "ucast_probes %u ", uprobe);
-               }
-               if (tpb[NDTPA_MCAST_PROBES]) {
-                       __u32 mprobe = rta_getattr_u32(tpb[NDTPA_MCAST_PROBES]);
-                       fprintf(fp, "mcast_probes %u ", mprobe);
-               }
-
-               fprintf(fp, "%s", _SL_);
-
-               fprintf(fp, "    ");
-
-               if (tpb[NDTPA_ANYCAST_DELAY]) {
-                       __u64 anycast_delay = rta_getattr_u64(tpb[NDTPA_ANYCAST_DELAY]);
-                       fprintf(fp, "anycast_delay %llu ",
-                               (unsigned long long) anycast_delay);
-               }
-               if (tpb[NDTPA_PROXY_DELAY]) {
-                       __u64 proxy_delay = rta_getattr_u64(tpb[NDTPA_PROXY_DELAY]);
-                       fprintf(fp, "proxy_delay %llu ",
-                               (unsigned long long) proxy_delay);
-               }
-               if (tpb[NDTPA_PROXY_QLEN]) {
-                       __u32 pqueue = rta_getattr_u32(tpb[NDTPA_PROXY_QLEN]);
-                       fprintf(fp, "proxy_queue %u ", pqueue);
-               }
-               if (tpb[NDTPA_LOCKTIME]) {
-                       __u64 locktime = rta_getattr_u64(tpb[NDTPA_LOCKTIME]);
-                       fprintf(fp, "locktime %llu ",
-                               (unsigned long long) locktime);
-               }
+       if (tb[NDTA_GC_INTERVAL]) {
+               __u64 gc_int = rta_getattr_u64(tb[NDTA_GC_INTERVAL]);
 
-               fprintf(fp, "%s", _SL_);
+               print_u64(PRINT_ANY, "gc_interval", "gc_int %llu ", gc_int);
        }
 
-       if (tb[NDTA_STATS] && show_stats) {
-               struct ndt_stats *ndts = RTA_DATA(tb[NDTA_STATS]);
-
-               fprintf(fp, "    ");
-               fprintf(fp, "stats ");
-
-               fprintf(fp, "allocs %llu ",
-                       (unsigned long long) ndts->ndts_allocs);
-               fprintf(fp, "destroys %llu ",
-                       (unsigned long long) ndts->ndts_destroys);
-               fprintf(fp, "hash_grows %llu ",
-                       (unsigned long long) ndts->ndts_hash_grows);
-
-               fprintf(fp, "%s", _SL_);
-               fprintf(fp, "        ");
-
-               fprintf(fp, "res_failed %llu ",
-                       (unsigned long long) ndts->ndts_res_failed);
-               fprintf(fp, "lookups %llu ",
-                       (unsigned long long) ndts->ndts_lookups);
-               fprintf(fp, "hits %llu ",
-                       (unsigned long long) ndts->ndts_hits);
-
-               fprintf(fp, "%s", _SL_);
-               fprintf(fp, "        ");
-
-               fprintf(fp, "rcv_probes_mcast %llu ",
-                       (unsigned long long) ndts->ndts_rcv_probes_mcast);
-               fprintf(fp, "rcv_probes_ucast %llu ",
-                       (unsigned long long) ndts->ndts_rcv_probes_ucast);
-
-               fprintf(fp, "%s", _SL_);
-               fprintf(fp, "        ");
+       if (ret)
+               print_nl();
 
-               fprintf(fp, "periodic_gc_runs %llu ",
-                       (unsigned long long) ndts->ndts_periodic_gc_runs);
-               fprintf(fp, "forced_gc_runs %llu ",
-                       (unsigned long long) ndts->ndts_forced_gc_runs);
+       if (tb[NDTA_CONFIG] && show_stats)
+               print_ndtconfig(RTA_DATA(tb[NDTA_CONFIG]));
 
-               fprintf(fp, "%s", _SL_);
-       }
+       if (tb[NDTA_PARMS])
+               print_ndtparams(tpb);
 
-       fprintf(fp, "\n");
+       if (tb[NDTA_STATS] && show_stats)
+               print_ndtstats(RTA_DATA(tb[NDTA_STATS]));
 
+       print_string(PRINT_FP, NULL, "\n", "");
+       close_json_object();
        fflush(fp);
+
        return 0;
 }
 
-void ipntable_reset_filter(void)
+static void ipntable_reset_filter(void)
 {
        memset(&filter, 0, sizeof(filter));
 }
@@ -632,22 +650,24 @@ static int ipntable_show(int argc, char **argv)
                } else if (strcmp(*argv, "name") == 0) {
                        NEXT_ARG();
 
-                       strncpy(filter.name, *argv, sizeof(filter.name));
+                       filter.name = *argv;
                } else
                        invarg("unknown", *argv);
 
                argc--; argv++;
        }
 
-       if (rtnl_wilddump_request(&rth, preferred_family, RTM_GETNEIGHTBL) < 0) {
+       if (rtnl_neightbldump_req(&rth, preferred_family) < 0) {
                perror("Cannot send dump request");
                exit(1);
        }
 
+       new_json_obj(json);
        if (rtnl_dump_filter(&rth, print_ntable, stdout) < 0) {
                fprintf(stderr, "Dump terminated\n");
                exit(1);
        }
+       delete_json_obj();
 
        return 0;
 }