]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/iprule.c
rdma: Properly mark RDMAtool license
[mirror_iproute2.git] / ip / iprule.c
index 8f242067f6178af8220a436bff7b9fdc505084db..4e9437de343780df8c56c68a8d8792ec4ece5a7a 100644 (file)
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <syslog.h>
 #include <fcntl.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 #include <string.h>
+#include <linux/if.h>
 #include <linux/fib_rules.h>
 #include <errno.h>
 
 #include "rt_names.h"
 #include "utils.h"
 #include "ip_common.h"
+#include "json_print.h"
+
+enum list_action {
+       IPRULE_LIST,
+       IPRULE_FLUSH,
+       IPRULE_SAVE,
+};
 
 extern struct rtnl_handle rth;
 
@@ -33,88 +40,268 @@ static void usage(void) __attribute__((noreturn));
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip rule { add | del } SELECTOR ACTION\n");
-       fprintf(stderr, "       ip rule { flush | save | restore }\n");
-       fprintf(stderr, "       ip rule [ list ]\n");
-       fprintf(stderr, "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n");
-       fprintf(stderr, "            [ iif STRING ] [ oif STRING ] [ pref NUMBER ] [ l3mdev ]\n");
-       fprintf(stderr, "ACTION := [ table TABLE_ID ]\n");
-       fprintf(stderr, "          [ nat ADDRESS ]\n");
-       fprintf(stderr, "          [ realms [SRCREALM/]DSTREALM ]\n");
-       fprintf(stderr, "          [ goto NUMBER ]\n");
-       fprintf(stderr, "          SUPPRESSOR\n");
-       fprintf(stderr, "SUPPRESSOR := [ suppress_prefixlength NUMBER ]\n");
-       fprintf(stderr, "              [ suppress_ifgroup DEVGROUP ]\n");
-       fprintf(stderr, "TABLE_ID := [ local | main | default | NUMBER ]\n");
+       fprintf(stderr,
+               "Usage: ip rule { add | del } SELECTOR ACTION\n"
+               "       ip rule { flush | save | restore }\n"
+               "       ip rule [ list [ SELECTOR ]]\n"
+               "SELECTOR := [ not ] [ from PREFIX ] [ to PREFIX ] [ tos TOS ] [ fwmark FWMARK[/MASK] ]\n"
+               "            [ iif STRING ] [ oif STRING ] [ pref NUMBER ] [ l3mdev ]\n"
+               "            [ uidrange NUMBER-NUMBER ]\n"
+               "            [ ipproto PROTOCOL ]\n"
+               "            [ sport [ NUMBER | NUMBER-NUMBER ]\n"
+               "            [ dport [ NUMBER | NUMBER-NUMBER ] ]\n"
+               "ACTION := [ table TABLE_ID ]\n"
+               "          [ protocol PROTO ]\n"
+               "          [ nat ADDRESS ]\n"
+               "          [ realms [SRCREALM/]DSTREALM ]\n"
+               "          [ goto NUMBER ]\n"
+               "          SUPPRESSOR\n"
+               "SUPPRESSOR := [ suppress_prefixlength NUMBER ]\n"
+               "              [ suppress_ifgroup DEVGROUP ]\n"
+               "TABLE_ID := [ local | main | default | NUMBER ]\n");
        exit(-1);
 }
 
-int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static struct
+{
+       int not;
+       int l3mdev;
+       int iifmask, oifmask, uidrange;
+       unsigned int tb;
+       unsigned int tos, tosmask;
+       unsigned int pref, prefmask;
+       unsigned int fwmark, fwmask;
+       uint64_t tun_id;
+       char iif[IFNAMSIZ];
+       char oif[IFNAMSIZ];
+       struct fib_rule_uid_range range;
+       inet_prefix src;
+       inet_prefix dst;
+       int protocol;
+       int protocolmask;
+       struct fib_rule_port_range sport;
+       struct fib_rule_port_range dport;
+       __u8 ipproto;
+} filter;
+
+static inline int frh_get_table(struct fib_rule_hdr *frh, struct rtattr **tb)
 {
-       FILE *fp = (FILE *)arg;
-       struct rtmsg *r = NLMSG_DATA(n);
+       __u32 table = frh->table;
+       if (tb[RTA_TABLE])
+               table = rta_getattr_u32(tb[RTA_TABLE]);
+       return table;
+}
+
+static bool filter_nlmsg(struct nlmsghdr *n, struct rtattr **tb, int host_len)
+{
+       struct fib_rule_hdr *frh = NLMSG_DATA(n);
+       __u32 table;
+
+       if (preferred_family != AF_UNSPEC && frh->family != preferred_family)
+               return false;
+
+       if (filter.prefmask &&
+           filter.pref ^ (tb[FRA_PRIORITY] ? rta_getattr_u32(tb[FRA_PRIORITY]) : 0))
+               return false;
+       if (filter.not && !(frh->flags & FIB_RULE_INVERT))
+               return false;
+
+       if (filter.src.family) {
+               inet_prefix *f_src = &filter.src;
+
+               if (f_src->family != frh->family ||
+                   f_src->bitlen > frh->src_len)
+                       return false;
+
+               if (inet_addr_match_rta(f_src, tb[FRA_SRC]))
+                       return false;
+       }
+
+       if (filter.dst.family) {
+               inet_prefix *f_dst = &filter.dst;
+
+               if (f_dst->family != frh->family ||
+                   f_dst->bitlen > frh->dst_len)
+                       return false;
+
+               if (inet_addr_match_rta(f_dst, tb[FRA_DST]))
+                       return false;
+       }
+
+       if (filter.tosmask && filter.tos ^ frh->tos)
+               return false;
+
+       if (filter.fwmark) {
+               __u32 mark = 0;
+
+               if (tb[FRA_FWMARK])
+                       mark = rta_getattr_u32(tb[FRA_FWMARK]);
+               if (filter.fwmark ^ mark)
+                       return false;
+       }
+       if (filter.fwmask) {
+               __u32 mask = 0;
+
+               if (tb[FRA_FWMASK])
+                       mask = rta_getattr_u32(tb[FRA_FWMASK]);
+               if (filter.fwmask ^ mask)
+                       return false;
+       }
+
+       if (filter.iifmask) {
+               if (tb[FRA_IFNAME]) {
+                       if (strcmp(filter.iif, rta_getattr_str(tb[FRA_IFNAME])) != 0)
+                               return false;
+               } else {
+                       return false;
+               }
+       }
+
+       if (filter.oifmask) {
+               if (tb[FRA_OIFNAME]) {
+                       if (strcmp(filter.oif, rta_getattr_str(tb[FRA_OIFNAME])) != 0)
+                               return false;
+               } else {
+                       return false;
+               }
+       }
+
+       if (filter.l3mdev && !(tb[FRA_L3MDEV] && rta_getattr_u8(tb[FRA_L3MDEV])))
+               return false;
+
+       if (filter.uidrange) {
+               struct fib_rule_uid_range *r = RTA_DATA(tb[FRA_UID_RANGE]);
+
+               if (!tb[FRA_UID_RANGE] ||
+                   r->start != filter.range.start ||
+                   r->end != filter.range.end)
+                       return false;
+       }
+
+       if (filter.ipproto) {
+               __u8 ipproto = 0;
+
+               if (tb[FRA_IP_PROTO])
+                       ipproto = rta_getattr_u8(tb[FRA_IP_PROTO]);
+               if (filter.ipproto != ipproto)
+                       return false;
+       }
+
+       if (filter.sport.start) {
+               const struct fib_rule_port_range *r;
+
+               if (!tb[FRA_SPORT_RANGE])
+                       return false;
+
+               r = RTA_DATA(tb[FRA_SPORT_RANGE]);
+               if (r->start != filter.sport.start ||
+                   r->end != filter.sport.end)
+                       return false;
+       }
+
+       if (filter.dport.start) {
+               const struct fib_rule_port_range *r;
+
+               if (!tb[FRA_DPORT_RANGE])
+                       return false;
+
+               r = RTA_DATA(tb[FRA_DPORT_RANGE]);
+               if (r->start != filter.dport.start ||
+                   r->end != filter.dport.end)
+                       return false;
+       }
+
+       if (filter.tun_id) {
+               __u64 tun_id = 0;
+
+               if (tb[FRA_TUN_ID]) {
+                       tun_id = ntohll(rta_getattr_u64(tb[FRA_TUN_ID]));
+                       if (filter.tun_id != tun_id)
+                               return false;
+               } else {
+                       return false;
+               }
+       }
+
+       table = frh_get_table(frh, tb);
+       if (filter.tb > 0 && filter.tb ^ table)
+               return false;
+
+       return true;
+}
+
+int print_rule(struct nlmsghdr *n, void *arg)
+{
+       FILE *fp = arg;
+       struct fib_rule_hdr *frh = NLMSG_DATA(n);
        int len = n->nlmsg_len;
        int host_len = -1;
-       __u32 table;
+       __u32 table, prio = 0;
        struct rtattr *tb[FRA_MAX+1];
-
        SPRINT_BUF(b1);
 
        if (n->nlmsg_type != RTM_NEWRULE && n->nlmsg_type != RTM_DELRULE)
                return 0;
 
-       len -= NLMSG_LENGTH(sizeof(*r));
+       len -= NLMSG_LENGTH(sizeof(*frh));
        if (len < 0)
                return -1;
 
-       parse_rtattr(tb, FRA_MAX, RTM_RTA(r), len);
+       parse_rtattr(tb, FRA_MAX, RTM_RTA(frh), len);
+
+       host_len = af_bit_len(frh->family);
 
-       host_len = af_bit_len(r->rtm_family);
+       if (!filter_nlmsg(n, tb, host_len))
+               return 0;
 
+       open_json_object(NULL);
        if (n->nlmsg_type == RTM_DELRULE)
-               fprintf(fp, "Deleted ");
+               print_bool(PRINT_ANY, "deleted", "Deleted ", true);
 
        if (tb[FRA_PRIORITY])
-               fprintf(fp, "%u:\t",
-                       rta_getattr_u32(tb[FRA_PRIORITY]));
-       else
-               fprintf(fp, "0:\t");
+               prio = rta_getattr_u32(tb[FRA_PRIORITY]);
+
+       print_uint(PRINT_ANY, "priority", "%u:\t", prio);
 
-       if (r->rtm_flags & FIB_RULE_INVERT)
-               fprintf(fp, "not ");
+       if (frh->flags & FIB_RULE_INVERT)
+               print_null(PRINT_ANY, "not", "not ", NULL);
 
        if (tb[FRA_SRC]) {
-               if (r->rtm_src_len != host_len) {
-                       fprintf(fp, "from %s/%u ",
-                               rt_addr_n2a_rta(r->rtm_family, tb[FRA_SRC]),
-                               r->rtm_src_len);
-               } else {
-                       fprintf(fp, "from %s ",
-                               format_host_rta(r->rtm_family, tb[FRA_SRC]));
-               }
-       } else if (r->rtm_src_len) {
-               fprintf(fp, "from 0/%d ", r->rtm_src_len);
+               const char *src = rt_addr_n2a_rta(frh->family, tb[FRA_SRC]);
+
+               print_string(PRINT_FP, NULL, "from ", NULL);
+               print_color_string(PRINT_ANY, ifa_family_color(frh->family),
+                                  "src", "%s", src);
+               if (frh->src_len != host_len)
+                       print_uint(PRINT_ANY, "srclen", "/%u ", frh->src_len);
+               else
+                       print_string(PRINT_FP, NULL, " ", NULL);
+       } else if (frh->src_len) {
+               print_string(PRINT_ANY, "src", "from %s", "0");
+               print_uint(PRINT_ANY, "srclen", "/%u ", frh->src_len);
        } else {
-               fprintf(fp, "from all ");
+               print_string(PRINT_ANY, "src", "from %s ", "all");
        }
 
        if (tb[FRA_DST]) {
-               if (r->rtm_dst_len != host_len) {
-                       fprintf(fp, "to %s/%u ",
-                               rt_addr_n2a_rta(r->rtm_family, tb[FRA_DST]),
-                               r->rtm_dst_len);
-               } else {
-                       fprintf(fp, "to %s ",
-                               format_host_rta(r->rtm_family, tb[FRA_DST]));
-               }
-       } else if (r->rtm_dst_len) {
-               fprintf(fp, "to 0/%d ", r->rtm_dst_len);
+               const char *dst = rt_addr_n2a_rta(frh->family, tb[FRA_DST]);
+
+               print_string(PRINT_FP, NULL, "to ", NULL);
+               print_color_string(PRINT_ANY, ifa_family_color(frh->family),
+                                  "dst", "%s", dst);
+               if (frh->dst_len != host_len)
+                       print_uint(PRINT_ANY, "dstlen", "/%u ", frh->dst_len);
+               else
+                       print_string(PRINT_FP, NULL, " ", NULL);
+       } else if (frh->dst_len) {
+               print_string(PRINT_ANY, "dst", "to %s", "0");
+               print_uint(PRINT_ANY, "dstlen", "/%u ", frh->dst_len);
        }
 
-       if (r->rtm_tos) {
-               SPRINT_BUF(b1);
-               fprintf(fp, "tos %s ",
-                       rtnl_dsfield_n2a(r->rtm_tos, b1, sizeof(b1)));
+       if (frh->tos) {
+               print_string(PRINT_ANY, "tos",
+                            "tos %s ",
+                            rtnl_dsfield_n2a(frh->tos, b1, sizeof(b1)));
        }
 
        if (tb[FRA_FWMARK] || tb[FRA_FWMASK]) {
@@ -124,47 +311,113 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                        mark = rta_getattr_u32(tb[FRA_FWMARK]);
 
                if (tb[FRA_FWMASK] &&
-                   (mask = rta_getattr_u32(tb[FRA_FWMASK])) != 0xFFFFFFFF)
-                       fprintf(fp, "fwmark 0x%x/0x%x ", mark, mask);
-               else
-                       fprintf(fp, "fwmark 0x%x ", mark);
+                   (mask = rta_getattr_u32(tb[FRA_FWMASK])) != 0xFFFFFFFF) {
+                       print_0xhex(PRINT_ANY, "fwmark", "fwmark %#llx", mark);
+                       print_0xhex(PRINT_ANY, "fwmask", "/%#llx ", mask);
+               } else {
+                       print_0xhex(PRINT_ANY, "fwmark", "fwmark %#llx ", mark);
+               }
        }
 
        if (tb[FRA_IFNAME]) {
-               fprintf(fp, "iif %s ", rta_getattr_str(tb[FRA_IFNAME]));
-               if (r->rtm_flags & FIB_RULE_IIF_DETACHED)
-                       fprintf(fp, "[detached] ");
+               if (!is_json_context())
+                       fprintf(fp, "iif ");
+               print_color_string(PRINT_ANY, COLOR_IFNAME,
+                                  "iif", "%s ",
+                                  rta_getattr_str(tb[FRA_IFNAME]));
+
+               if (frh->flags & FIB_RULE_IIF_DETACHED)
+                       print_null(PRINT_ANY, "iif_detached", "[detached] ",
+                                  NULL);
        }
 
        if (tb[FRA_OIFNAME]) {
-               fprintf(fp, "oif %s ", rta_getattr_str(tb[FRA_OIFNAME]));
-               if (r->rtm_flags & FIB_RULE_OIF_DETACHED)
-                       fprintf(fp, "[detached] ");
+               if (!is_json_context())
+                       fprintf(fp, "oif ");
+
+               print_color_string(PRINT_ANY, COLOR_IFNAME, "oif", "%s ",
+                                  rta_getattr_str(tb[FRA_OIFNAME]));
+
+               if (frh->flags & FIB_RULE_OIF_DETACHED)
+                       print_null(PRINT_ANY, "oif_detached", "[detached] ",
+                                  NULL);
        }
 
        if (tb[FRA_L3MDEV]) {
-               if (rta_getattr_u8(tb[FRA_L3MDEV]))
-                       fprintf(fp, "lookup [l3mdev-table] ");
+               __u8 mdev = rta_getattr_u8(tb[FRA_L3MDEV]);
+
+               if (mdev)
+                       print_null(PRINT_ANY, "l3mdev",
+                                  "lookup [l3mdev-table] ", NULL);
+       }
+
+       if (tb[FRA_UID_RANGE]) {
+               struct fib_rule_uid_range *r = RTA_DATA(tb[FRA_UID_RANGE]);
+
+               print_uint(PRINT_ANY, "uid_start", "uidrange %u", r->start);
+               print_uint(PRINT_ANY, "uid_end", "-%u ", r->end);
+       }
+
+       if (tb[FRA_IP_PROTO]) {
+               SPRINT_BUF(pbuf);
+               print_string(PRINT_ANY, "ipproto", "ipproto %s ",
+                            inet_proto_n2a(rta_getattr_u8(tb[FRA_IP_PROTO]),
+                                           pbuf, sizeof(pbuf)));
+       }
+
+       if (tb[FRA_SPORT_RANGE]) {
+               struct fib_rule_port_range *r = RTA_DATA(tb[FRA_SPORT_RANGE]);
+
+               if (r->start == r->end) {
+                       print_uint(PRINT_ANY, "sport", "sport %u ", r->start);
+               } else {
+                       print_uint(PRINT_ANY, "sport_start", "sport %u",
+                                  r->start);
+                       print_uint(PRINT_ANY, "sport_end", "-%u ", r->end);
+               }
+       }
+
+       if (tb[FRA_DPORT_RANGE]) {
+               struct fib_rule_port_range *r = RTA_DATA(tb[FRA_DPORT_RANGE]);
+
+               if (r->start == r->end) {
+                       print_uint(PRINT_ANY, "dport", "dport %u ", r->start);
+               } else {
+                       print_uint(PRINT_ANY, "dport_start", "dport %u",
+                                  r->start);
+                       print_uint(PRINT_ANY, "dport_end", "-%u ", r->end);
+               }
+       }
+
+       if (tb[FRA_TUN_ID]) {
+               __u64 tun_id = ntohll(rta_getattr_u64(tb[FRA_TUN_ID]));
+
+               print_u64(PRINT_ANY, "tun_id", "tun_id %llu ", tun_id);
        }
 
-       table = rtm_get_table(r, tb);
+       table = frh_get_table(frh, tb);
        if (table) {
-               fprintf(fp, "lookup %s ",
-                       rtnl_rttable_n2a(table, b1, sizeof(b1)));
+               print_string(PRINT_ANY, "table",
+                            "lookup %s ",
+                            rtnl_rttable_n2a(table, b1, sizeof(b1)));
 
                if (tb[FRA_SUPPRESS_PREFIXLEN]) {
                        int pl = rta_getattr_u32(tb[FRA_SUPPRESS_PREFIXLEN]);
 
                        if (pl != -1)
-                               fprintf(fp, "suppress_prefixlength %d ", pl);
+                               print_int(PRINT_ANY, "suppress_prefixlen",
+                                         "suppress_prefixlength %d ", pl);
                }
+
                if (tb[FRA_SUPPRESS_IFGROUP]) {
                        int group = rta_getattr_u32(tb[FRA_SUPPRESS_IFGROUP]);
 
                        if (group != -1) {
-                               SPRINT_BUF(b1);
-                               fprintf(fp, "suppress_ifgroup %s ",
-                                       rtnl_group_n2a(group, b1, sizeof(b1)));
+                               const char *grname
+                                       = rtnl_group_n2a(group, b1, sizeof(b1));
+
+                               print_string(PRINT_ANY, "suppress_ifgroup",
+                                            "suppress_ifgroup %s ", grname);
                        }
                }
        }
@@ -174,37 +427,52 @@ int print_rule(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                __u32 from = to>>16;
 
                to &= 0xFFFF;
-               if (from) {
-                       fprintf(fp, "realms %s/",
-                               rtnl_rtrealm_n2a(from, b1, sizeof(b1)));
-               }
-               fprintf(fp, "%s ",
-                       rtnl_rtrealm_n2a(to, b1, sizeof(b1)));
+               if (from)
+                       print_string(PRINT_ANY,
+                                    "flow_from", "realms %s/",
+                                    rtnl_rtrealm_n2a(from, b1, sizeof(b1)));
+
+               print_string(PRINT_ANY, "flow_to", "%s ",
+                            rtnl_rtrealm_n2a(to, b1, sizeof(b1)));
        }
 
-       if (r->rtm_type == RTN_NAT) {
+       if (frh->action == RTN_NAT) {
                if (tb[RTA_GATEWAY]) {
-                       fprintf(fp, "map-to %s ",
-                               format_host_rta(r->rtm_family,
-                                               tb[RTA_GATEWAY]));
-               } else
-                       fprintf(fp, "masquerade");
-       } else if (r->rtm_type == FR_ACT_GOTO) {
-               fprintf(fp, "goto ");
+                       const char *gateway;
+
+                       gateway = format_host_rta(frh->family, tb[RTA_GATEWAY]);
+
+                       print_string(PRINT_ANY, "nat_gateway",
+                                    "map-to %s ", gateway);
+               } else {
+                       print_null(PRINT_ANY, "masquerade", "masquerade", NULL);
+               }
+       } else if (frh->action == FR_ACT_GOTO) {
                if (tb[FRA_GOTO])
-                       fprintf(fp, "%u", rta_getattr_u32(tb[FRA_GOTO]));
+                       print_uint(PRINT_ANY, "goto", "goto %u",
+                                  rta_getattr_u32(tb[FRA_GOTO]));
                else
-                       fprintf(fp, "none");
-               if (r->rtm_flags & FIB_RULE_UNRESOLVED)
-                       fprintf(fp, " [unresolved]");
-       } else if (r->rtm_type == FR_ACT_NOP)
-               fprintf(fp, "nop");
-       else if (r->rtm_type != RTN_UNICAST)
-               fprintf(fp, "%s",
-                       rtnl_rtntype_n2a(r->rtm_type,
-                                        b1, sizeof(b1)));
-
-       fprintf(fp, "\n");
+                       print_string(PRINT_ANY, "goto", "goto %s", "none");
+
+               if (frh->flags & FIB_RULE_UNRESOLVED)
+                       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) {
+               print_string(PRINT_ANY, "action", "%s",
+                            rtnl_rtntype_n2a(frh->action, b1, sizeof(b1)));
+       }
+
+       if (tb[FRA_PROTOCOL]) {
+               __u8 protocol = rta_getattr_u8(tb[FRA_PROTOCOL]);
+
+               if ((protocol && protocol != RTPROT_KERNEL) || show_details > 0) {
+                       print_string(PRINT_ANY, "protocol", " proto %s ",
+                                    rtnl_rtprot_n2a(protocol, b1, sizeof(b1)));
+               }
+       }
+       print_string(PRINT_FP, NULL, "\n", "");
+       close_json_object();
        fflush(fp);
        return 0;
 }
@@ -229,8 +497,7 @@ static int save_rule_prep(void)
        return 0;
 }
 
-static int save_rule(const struct sockaddr_nl *who,
-                    struct nlmsghdr *n, void *arg)
+static int save_rule(struct nlmsghdr *n, void *arg)
 {
        int ret;
 
@@ -243,35 +510,217 @@ static int save_rule(const struct sockaddr_nl *who,
        return ret == n->nlmsg_len ? 0 : ret;
 }
 
-static int iprule_list_or_save(int argc, char **argv, int save)
+static int flush_rule(struct nlmsghdr *n, void *arg)
 {
-       rtnl_filter_t filter = print_rule;
+       struct rtnl_handle rth2;
+       struct fib_rule_hdr *frh = NLMSG_DATA(n);
+       int len = n->nlmsg_len;
+       struct rtattr *tb[FRA_MAX+1];
+       int host_len = -1;
+
+       len -= NLMSG_LENGTH(sizeof(*frh));
+       if (len < 0)
+               return -1;
+
+       parse_rtattr(tb, FRA_MAX, RTM_RTA(frh), len);
+
+       host_len = af_bit_len(frh->family);
+       if (!filter_nlmsg(n, tb, host_len))
+               return 0;
+
+       if (tb[FRA_PROTOCOL]) {
+               __u8 protocol = rta_getattr_u8(tb[FRA_PROTOCOL]);
+
+               if ((filter.protocol ^ protocol) & filter.protocolmask)
+                       return 0;
+       }
+
+       if (tb[FRA_PRIORITY]) {
+               n->nlmsg_type = RTM_DELRULE;
+               n->nlmsg_flags = NLM_F_REQUEST;
+
+               if (rtnl_open(&rth2, 0) < 0)
+                       return -1;
+
+               if (rtnl_talk(&rth2, n, NULL) < 0)
+                       return -2;
+
+               rtnl_close(&rth2);
+       }
+
+       return 0;
+}
+
+static int iprule_list_flush_or_save(int argc, char **argv, int action)
+{
+       rtnl_filter_t filter_fn;
        int af = preferred_family;
 
        if (af == AF_UNSPEC)
                af = AF_INET;
 
-       if (argc > 0) {
-               fprintf(stderr, "\"ip rule %s\" does not take any arguments.\n",
-                               save ? "save" : "show");
+       if (action == IPRULE_SAVE && argc > 0) {
+               fprintf(stderr, "\"ip rule save\" does not take any arguments.\n");
                return -1;
        }
 
-       if (save) {
+       switch (action) {
+       case IPRULE_SAVE:
                if (save_rule_prep())
                        return -1;
-               filter = save_rule;
+               filter_fn = save_rule;
+               break;
+       case IPRULE_FLUSH:
+               filter_fn = flush_rule;
+               break;
+       default:
+               filter_fn = print_rule;
+       }
+
+       memset(&filter, 0, sizeof(filter));
+
+       while (argc > 0) {
+               if (matches(*argv, "preference") == 0 ||
+                   matches(*argv, "order") == 0 ||
+                   matches(*argv, "priority") == 0) {
+                       __u32 pref;
+
+                       NEXT_ARG();
+                       if (get_u32(&pref, *argv, 0))
+                               invarg("preference value is invalid\n", *argv);
+                       filter.pref = pref;
+                       filter.prefmask = 1;
+               } else if (strcmp(*argv, "not") == 0) {
+                       filter.not = 1;
+               } else if (strcmp(*argv, "tos") == 0) {
+                       __u32 tos;
+
+                       NEXT_ARG();
+                       if (rtnl_dsfield_a2n(&tos, *argv))
+                               invarg("TOS value is invalid\n", *argv);
+                       filter.tos = tos;
+                       filter.tosmask = 1;
+               } else if (strcmp(*argv, "fwmark") == 0) {
+                       char *slash;
+                       __u32 fwmark, fwmask;
+
+                       NEXT_ARG();
+                       slash = strchr(*argv, '/');
+                       if (slash != NULL)
+                               *slash = '\0';
+                       if (get_u32(&fwmark, *argv, 0))
+                               invarg("fwmark value is invalid\n", *argv);
+                       filter.fwmark = fwmark;
+                       if (slash) {
+                               if (get_u32(&fwmask, slash+1, 0))
+                                       invarg("fwmask value is invalid\n",
+                                              slash+1);
+                               filter.fwmask = fwmask;
+                       }
+               } else if (strcmp(*argv, "dev") == 0 ||
+                          strcmp(*argv, "iif") == 0) {
+                       NEXT_ARG();
+                       if (get_ifname(filter.iif, *argv))
+                               invarg("\"iif\"/\"dev\" not a valid ifname", *argv);
+                       filter.iifmask = 1;
+               } else if (strcmp(*argv, "oif") == 0) {
+                       NEXT_ARG();
+                       if (get_ifname(filter.oif, *argv))
+                               invarg("\"oif\" not a valid ifname", *argv);
+                       filter.oifmask = 1;
+               } else if (strcmp(*argv, "l3mdev") == 0) {
+                       filter.l3mdev = 1;
+               } else if (strcmp(*argv, "uidrange") == 0) {
+                       NEXT_ARG();
+                       filter.uidrange = 1;
+                       if (sscanf(*argv, "%u-%u",
+                                  &filter.range.start,
+                                  &filter.range.end) != 2)
+                               invarg("invalid UID range\n", *argv);
+
+               } else if (matches(*argv, "tun_id") == 0) {
+                       __u64 tun_id;
+
+                       NEXT_ARG();
+                       if (get_u64(&tun_id, *argv, 0))
+                               invarg("\"tun_id\" value is invalid\n", *argv);
+                       filter.tun_id = tun_id;
+               } else if (matches(*argv, "lookup") == 0 ||
+                          matches(*argv, "table") == 0) {
+                       __u32 tid;
+
+                       NEXT_ARG();
+                       if (rtnl_rttable_a2n(&tid, *argv))
+                               invarg("table id value is invalid\n", *argv);
+                       filter.tb = tid;
+               } else if (matches(*argv, "from") == 0 ||
+                          matches(*argv, "src") == 0) {
+                       NEXT_ARG();
+                       if (get_prefix(&filter.src, *argv, af))
+                               invarg("from value is invalid\n", *argv);
+               } else if (matches(*argv, "protocol") == 0) {
+                       __u32 prot;
+                       NEXT_ARG();
+                       filter.protocolmask = -1;
+                       if (rtnl_rtprot_a2n(&prot, *argv)) {
+                               if (strcmp(*argv, "all") != 0)
+                                       invarg("invalid \"protocol\"\n", *argv);
+                               prot = 0;
+                               filter.protocolmask = 0;
+                       }
+                       filter.protocol = prot;
+               } else if (strcmp(*argv, "ipproto") == 0) {
+                       int ipproto;
+
+                       NEXT_ARG();
+                       ipproto = inet_proto_a2n(*argv);
+                       if (ipproto < 0)
+                               invarg("Invalid \"ipproto\" value\n", *argv);
+                       filter.ipproto = ipproto;
+               } else if (strcmp(*argv, "sport") == 0) {
+                       struct fib_rule_port_range r;
+                       int ret;
+
+                       NEXT_ARG();
+                       ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end);
+                       if (ret == 1)
+                               r.end = r.start;
+                       else if (ret != 2)
+                               invarg("invalid port range\n", *argv);
+                       filter.sport = r;
+               } else if (strcmp(*argv, "dport") == 0) {
+                       struct fib_rule_port_range r;
+                       int ret;
+
+                       NEXT_ARG();
+                       ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end);
+                       if (ret == 1)
+                               r.end = r.start;
+                       else if (ret != 2)
+                               invarg("invalid dport range\n", *argv);
+                       filter.dport = r;
+               } else{
+                       if (matches(*argv, "dst") == 0 ||
+                           matches(*argv, "to") == 0) {
+                               NEXT_ARG();
+                       }
+                       if (get_prefix(&filter.dst, *argv, af))
+                               invarg("to value is invalid\n", *argv);
+               }
+               argc--; argv++;
        }
 
-       if (rtnl_wilddump_request(&rth, af, RTM_GETRULE) < 0) {
+       if (rtnl_ruledump_req(&rth, af) < 0) {
                perror("Cannot send dump request");
                return 1;
        }
 
-       if (rtnl_dump_filter(&rth, filter, stdout) < 0) {
+       new_json_obj(json);
+       if (rtnl_dump_filter(&rth, filter_fn, stdout) < 0) {
                fprintf(stderr, "Dump terminated\n");
                return 1;
        }
+       delete_json_obj();
 
        return 0;
 }
@@ -296,8 +745,7 @@ static int rule_dump_check_magic(void)
        return 0;
 }
 
-static int restore_handler(const struct sockaddr_nl *nl,
-                          struct rtnl_ctrl_data *ctrl,
+static int restore_handler(struct rtnl_ctrl_data *ctrl,
                           struct nlmsghdr *n, void *arg)
 {
        int ret;
@@ -306,7 +754,7 @@ static int restore_handler(const struct sockaddr_nl *nl,
 
        ll_init_map(&rth);
 
-       ret = rtnl_talk(&rth, n, n, sizeof(*n));
+       ret = rtnl_talk(&rth, n, NULL);
        if ((ret < 0) && (errno == EEXIST))
                ret = 0;
 
@@ -329,40 +777,48 @@ static int iprule_modify(int cmd, int argc, char **argv)
        __u32 tid = 0;
        struct {
                struct nlmsghdr n;
-               struct rtmsg            r;
+               struct fib_rule_hdr     frh;
                char                    buf[1024];
        } req = {
                .n.nlmsg_type = cmd,
-               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg)),
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(struct fib_rule_hdr)),
                .n.nlmsg_flags = NLM_F_REQUEST,
-               .r.rtm_family = preferred_family,
-               .r.rtm_protocol = RTPROT_BOOT,
-               .r.rtm_scope = RT_SCOPE_UNIVERSE,
-               .r.rtm_type = RTN_UNSPEC,
+               .frh.family = preferred_family,
+               .frh.action = FR_ACT_UNSPEC,
        };
 
        if (cmd == RTM_NEWRULE) {
+               if (argc == 0) {
+                       fprintf(stderr,
+                               "\"ip rule add\" requires arguments.\n");
+                       return -1;
+               }
                req.n.nlmsg_flags |= NLM_F_CREATE|NLM_F_EXCL;
-               req.r.rtm_type = RTN_UNICAST;
+               req.frh.action = FR_ACT_TO_TBL;
+       }
+
+       if (cmd == RTM_DELRULE && argc == 0) {
+               fprintf(stderr, "\"ip rule del\" requires arguments.\n");
+               return -1;
        }
 
        while (argc > 0) {
                if (strcmp(*argv, "not") == 0) {
-                       req.r.rtm_flags |= FIB_RULE_INVERT;
+                       req.frh.flags |= FIB_RULE_INVERT;
                } else if (strcmp(*argv, "from") == 0) {
                        inet_prefix dst;
 
                        NEXT_ARG();
-                       get_prefix(&dst, *argv, req.r.rtm_family);
-                       req.r.rtm_src_len = dst.bitlen;
+                       get_prefix(&dst, *argv, req.frh.family);
+                       req.frh.src_len = dst.bitlen;
                        addattr_l(&req.n, sizeof(req), FRA_SRC,
                                  &dst.data, dst.bytelen);
                } else if (strcmp(*argv, "to") == 0) {
                        inet_prefix dst;
 
                        NEXT_ARG();
-                       get_prefix(&dst, *argv, req.r.rtm_family);
-                       req.r.rtm_dst_len = dst.bitlen;
+                       get_prefix(&dst, *argv, req.frh.family);
+                       req.frh.dst_len = dst.bitlen;
                        addattr_l(&req.n, sizeof(req), FRA_DST,
                                  &dst.data, dst.bytelen);
                } else if (matches(*argv, "preference") == 0 ||
@@ -381,7 +837,7 @@ static int iprule_modify(int cmd, int argc, char **argv)
                        NEXT_ARG();
                        if (rtnl_dsfield_a2n(&tos, *argv))
                                invarg("TOS value is invalid\n", *argv);
-                       req.r.rtm_tos = tos;
+                       req.frh.tos = tos;
                } else if (strcmp(*argv, "fwmark") == 0) {
                        char *slash;
                        __u32 fwmark, fwmask;
@@ -408,15 +864,29 @@ static int iprule_modify(int cmd, int argc, char **argv)
                        if (get_rt_realms_or_raw(&realm, *argv))
                                invarg("invalid realms\n", *argv);
                        addattr32(&req.n, sizeof(req), FRA_FLOW, realm);
+               } else if (matches(*argv, "protocol") == 0) {
+                       __u32 proto;
+
+                       NEXT_ARG();
+                       if (rtnl_rtprot_a2n(&proto, *argv))
+                               invarg("\"protocol\" value is invalid\n", *argv);
+                       addattr8(&req.n, sizeof(req), FRA_PROTOCOL, proto);
+               } else if (matches(*argv, "tun_id") == 0) {
+                       __u64 tun_id;
+
+                       NEXT_ARG();
+                       if (get_be64(&tun_id, *argv, 0))
+                               invarg("\"tun_id\" value is invalid\n", *argv);
+                       addattr64(&req.n, sizeof(req), FRA_TUN_ID, tun_id);
                } else if (matches(*argv, "table") == 0 ||
                           strcmp(*argv, "lookup") == 0) {
                        NEXT_ARG();
                        if (rtnl_rttable_a2n(&tid, *argv))
                                invarg("invalid table ID\n", *argv);
                        if (tid < 256)
-                               req.r.rtm_table = tid;
+                               req.frh.table = tid;
                        else {
-                               req.r.rtm_table = RT_TABLE_UNSPEC;
+                               req.frh.table = RT_TABLE_UNSPEC;
                                addattr32(&req.n, sizeof(req), FRA_TABLE, tid);
                        }
                        table_ok = 1;
@@ -443,23 +913,68 @@ static int iprule_modify(int cmd, int argc, char **argv)
                } else if (strcmp(*argv, "dev") == 0 ||
                           strcmp(*argv, "iif") == 0) {
                        NEXT_ARG();
+                       if (check_ifname(*argv))
+                               invarg("\"iif\"/\"dev\" not a valid ifname", *argv);
                        addattr_l(&req.n, sizeof(req), FRA_IFNAME,
                                  *argv, strlen(*argv)+1);
                } else if (strcmp(*argv, "oif") == 0) {
                        NEXT_ARG();
+                       if (check_ifname(*argv))
+                               invarg("\"oif\" not a valid ifname", *argv);
                        addattr_l(&req.n, sizeof(req), FRA_OIFNAME,
                                  *argv, strlen(*argv)+1);
                } else if (strcmp(*argv, "l3mdev") == 0) {
                        addattr8(&req.n, sizeof(req), FRA_L3MDEV, 1);
                        table_ok = 1;
                        l3mdev_rule = 1;
+               } else if (strcmp(*argv, "uidrange") == 0) {
+                       struct fib_rule_uid_range r;
+
+                       NEXT_ARG();
+                       if (sscanf(*argv, "%u-%u", &r.start, &r.end) != 2)
+                               invarg("invalid UID range\n", *argv);
+                       addattr_l(&req.n, sizeof(req), FRA_UID_RANGE, &r,
+                                 sizeof(r));
                } else if (strcmp(*argv, "nat") == 0 ||
                           matches(*argv, "map-to") == 0) {
                        NEXT_ARG();
                        fprintf(stderr, "Warning: route NAT is deprecated\n");
                        addattr32(&req.n, sizeof(req), RTA_GATEWAY,
                                  get_addr32(*argv));
-                       req.r.rtm_type = RTN_NAT;
+                       req.frh.action = RTN_NAT;
+               } else if (strcmp(*argv, "ipproto") == 0) {
+                       int ipproto;
+
+                       NEXT_ARG();
+                       ipproto = inet_proto_a2n(*argv);
+                       if (ipproto < 0)
+                               invarg("Invalid \"ipproto\" value\n",
+                                      *argv);
+                       addattr8(&req.n, sizeof(req), FRA_IP_PROTO, ipproto);
+               } else if (strcmp(*argv, "sport") == 0) {
+                       struct fib_rule_port_range r;
+                       int ret = 0;
+
+                       NEXT_ARG();
+                       ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end);
+                       if (ret == 1)
+                               r.end = r.start;
+                       else if (ret != 2)
+                               invarg("invalid port range\n", *argv);
+                       addattr_l(&req.n, sizeof(req), FRA_SPORT_RANGE, &r,
+                                 sizeof(r));
+               } else if (strcmp(*argv, "dport") == 0) {
+                       struct fib_rule_port_range r;
+                       int ret = 0;
+
+                       NEXT_ARG();
+                       ret = sscanf(*argv, "%hu-%hu", &r.start, &r.end);
+                       if (ret == 1)
+                               r.end = r.start;
+                       else if (ret != 2)
+                               invarg("invalid dport range\n", *argv);
+                       addattr_l(&req.n, sizeof(req), FRA_DPORT_RANGE, &r,
+                                 sizeof(r));
                } else {
                        int type;
 
@@ -481,7 +996,7 @@ static int iprule_modify(int cmd, int argc, char **argv)
                                type = FR_ACT_NOP;
                        else if (rtnl_rtntype_a2n(&type, *argv))
                                invarg("Failed to parse rule type", *argv);
-                       req.r.rtm_type = type;
+                       req.frh.action = type;
                        table_ok = 1;
                }
                argc--;
@@ -494,84 +1009,28 @@ static int iprule_modify(int cmd, int argc, char **argv)
                return -EINVAL;
        }
 
-       if (req.r.rtm_family == AF_UNSPEC)
-               req.r.rtm_family = AF_INET;
+       if (req.frh.family == AF_UNSPEC)
+               req.frh.family = AF_INET;
 
        if (!table_ok && cmd == RTM_NEWRULE)
-               req.r.rtm_table = RT_TABLE_MAIN;
+               req.frh.table = RT_TABLE_MAIN;
 
-       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
                return -2;
 
        return 0;
 }
 
-
-static int flush_rule(const struct sockaddr_nl *who, struct nlmsghdr *n,
-                     void *arg)
-{
-       struct rtnl_handle rth2;
-       struct rtmsg *r = NLMSG_DATA(n);
-       int len = n->nlmsg_len;
-       struct rtattr *tb[FRA_MAX+1];
-
-       len -= NLMSG_LENGTH(sizeof(*r));
-       if (len < 0)
-               return -1;
-
-       parse_rtattr(tb, FRA_MAX, RTM_RTA(r), len);
-
-       if (tb[FRA_PRIORITY]) {
-               n->nlmsg_type = RTM_DELRULE;
-               n->nlmsg_flags = NLM_F_REQUEST;
-
-               if (rtnl_open(&rth2, 0) < 0)
-                       return -1;
-
-               if (rtnl_talk(&rth2, n, NULL, 0) < 0)
-                       return -2;
-
-               rtnl_close(&rth2);
-       }
-
-       return 0;
-}
-
-static int iprule_flush(int argc, char **argv)
-{
-       int af = preferred_family;
-
-       if (af == AF_UNSPEC)
-               af = AF_INET;
-
-       if (argc > 0) {
-               fprintf(stderr, "\"ip rule flush\" does not allow arguments\n");
-               return -1;
-       }
-
-       if (rtnl_wilddump_request(&rth, af, RTM_GETRULE) < 0) {
-               perror("Cannot send dump request");
-               return 1;
-       }
-
-       if (rtnl_dump_filter(&rth, flush_rule, NULL) < 0) {
-               fprintf(stderr, "Flush terminated\n");
-               return 1;
-       }
-
-       return 0;
-}
-
 int do_iprule(int argc, char **argv)
 {
        if (argc < 1) {
-               return iprule_list_or_save(0, NULL, 0);
+               return iprule_list_flush_or_save(0, NULL, IPRULE_LIST);
        } else if (matches(argv[0], "list") == 0 ||
                   matches(argv[0], "lst") == 0 ||
                   matches(argv[0], "show") == 0) {
-               return iprule_list_or_save(argc-1, argv+1, 0);
+               return iprule_list_flush_or_save(argc-1, argv+1, IPRULE_LIST);
        } else if (matches(argv[0], "save") == 0) {
-               return iprule_list_or_save(argc-1, argv+1, 1);
+               return iprule_list_flush_or_save(argc-1, argv+1, IPRULE_SAVE);
        } else if (matches(argv[0], "restore") == 0) {
                return iprule_restore();
        } else if (matches(argv[0], "add") == 0) {
@@ -579,7 +1038,7 @@ int do_iprule(int argc, char **argv)
        } else if (matches(argv[0], "delete") == 0) {
                return iprule_modify(RTM_DELRULE, argc-1, argv+1);
        } else if (matches(argv[0], "flush") == 0) {
-               return iprule_flush(argc-1, argv+1);
+               return iprule_list_flush_or_save(argc-1, argv+1, IPRULE_FLUSH);
        } else if (matches(argv[0], "help") == 0)
                usage();