]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/xfrm_policy.c
libnetlink: add size argument to rtnl_talk
[mirror_iproute2.git] / ip / xfrm_policy.c
index bea0162562b35ffc7b557fcf066ac55ee38bac48..8f4d1a0751248314e9b216704e99733dcbc88363 100644 (file)
@@ -2,20 +2,19 @@
 
 /*
  * Copyright (C)2004 USAGI/WIDE Project
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * 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 iproute.c
@@ -35,8 +34,8 @@
 #include "xfrm.h"
 #include "ip_common.h"
 
-//#define NLMSG_FLUSH_BUF_SIZE (4096-512)
-#define NLMSG_FLUSH_BUF_SIZE 8192
+//#define NLMSG_DELETEALL_BUF_SIZE (4096-512)
+#define NLMSG_DELETEALL_BUF_SIZE 8192
 
 /*
  * Receiving buffer defines:
 #define NLMSG_BUF_SIZE 4096
 #define RTA_BUF_SIZE 2048
 #define XFRM_TMPLS_BUF_SIZE 1024
+#define CTX_BUF_SIZE 256
 
 static void usage(void) __attribute__((noreturn));
 
 static void usage(void)
 {
-       fprintf(stderr, "Usage: ip xfrm policy { add | update } dir DIR SELECTOR [ index INDEX ] \n");
-       fprintf(stderr, "        [ action ACTION ] [ priority PRIORITY ] [ LIMIT-LIST ] [ TMPL-LIST ]\n");
-       fprintf(stderr, "Usage: ip xfrm policy { delete | get } dir DIR [ SELECTOR | index INDEX ]\n");
-       fprintf(stderr, "Usage: ip xfrm policy { flush | list } [ dir DIR ] [ SELECTOR ]\n");
-       fprintf(stderr, "        [ index INDEX ] [ action ACTION ] [ priority PRIORITY ]\n");
-       fprintf(stderr, "DIR := [ in | out | fwd ]\n");
-
-       fprintf(stderr, "SELECTOR := src ADDR[/PLEN] dst ADDR[/PLEN] [ UPSPEC ] [ dev DEV ]\n");
-
-       fprintf(stderr, "UPSPEC := proto PROTO [ [ sport PORT ] [ dport PORT ] |\n");
-       fprintf(stderr, "                        [ type NUMBER ] [ code NUMBER ] ]\n");
-
-       //fprintf(stderr, "DEV - device name(default=none)\n");
-
-       fprintf(stderr, "ACTION := [ allow | block ](default=allow)\n");
-
-       //fprintf(stderr, "PRIORITY - priority value(default=0)\n");
-
-       fprintf(stderr, "LIMIT-LIST := [ LIMIT-LIST ] | [ limit LIMIT ]\n");
-       fprintf(stderr, "LIMIT := [ [time-soft|time-hard|time-use-soft|time-use-hard] SECONDS ] |\n");
-       fprintf(stderr, "         [ [byte-soft|byte-hard] SIZE ] | [ [packet-soft|packet-hard] NUMBER ]\n");
-
-       fprintf(stderr, "TMPL-LIST := [ TMPL-LIST ] | [ tmpl TMPL ]\n");
+       fprintf(stderr, "Usage: ip xfrm policy { add | update } SELECTOR dir DIR [ ctx CTX ]\n");
+       fprintf(stderr, "        [ mark MARK [ mask MASK ] ] [ index INDEX ] [ ptype PTYPE ]\n");
+       fprintf(stderr, "        [ action ACTION ] [ priority PRIORITY ] [ flag FLAG-LIST ]\n");
+       fprintf(stderr, "        [ LIMIT-LIST ] [ TMPL-LIST ]\n");
+       fprintf(stderr, "Usage: ip xfrm policy { delete | get } { SELECTOR | index INDEX } dir DIR\n");
+       fprintf(stderr, "        [ ctx CTX ] [ mark MARK [ mask MASK ] ] [ ptype PTYPE ]\n");
+       fprintf(stderr, "Usage: ip xfrm policy { deleteall | list } [ SELECTOR ] [ dir DIR ]\n");
+       fprintf(stderr, "        [ index INDEX ] [ ptype PTYPE ] [ action ACTION ] [ priority PRIORITY ]\n");
+       fprintf(stderr, "        [ flag FLAG-LIST ]\n");
+       fprintf(stderr, "Usage: ip xfrm policy flush [ ptype PTYPE ]\n");
+       fprintf(stderr, "Usage: ip xfrm policy count\n");
+       fprintf(stderr, "Usage: ip xfrm policy set [ hthresh4 LBITS RBITS ] [ hthresh6 LBITS RBITS ]\n");
+       fprintf(stderr, "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV ] [ UPSPEC ]\n");
+       fprintf(stderr, "UPSPEC := proto { { ");
+       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_TCP));
+       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_UDP));
+       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_SCTP));
+       fprintf(stderr, "%s", strxf_proto(IPPROTO_DCCP));
+       fprintf(stderr, " } [ sport PORT ] [ dport PORT ] |\n");
+       fprintf(stderr, "                  { ");
+       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_ICMP));
+       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_ICMPV6));
+       fprintf(stderr, "%s", strxf_proto(IPPROTO_MH));
+       fprintf(stderr, " } [ type NUMBER ] [ code NUMBER ] |\n");
+       fprintf(stderr, "                  %s", strxf_proto(IPPROTO_GRE));
+       fprintf(stderr, " [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n");
+       fprintf(stderr, "DIR := in | out | fwd\n");
+       fprintf(stderr, "PTYPE := main | sub\n");
+       fprintf(stderr, "ACTION := allow | block\n");
+       fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
+       fprintf(stderr, "FLAG := localok | icmp\n");
+       fprintf(stderr, "LIMIT-LIST := [ LIMIT-LIST ] limit LIMIT\n");
+       fprintf(stderr, "LIMIT := { time-soft | time-hard | time-use-soft | time-use-hard } SECONDS |\n");
+       fprintf(stderr, "         { byte-soft | byte-hard } SIZE | { packet-soft | packet-hard } COUNT\n");
+       fprintf(stderr, "TMPL-LIST := [ TMPL-LIST ] tmpl TMPL\n");
        fprintf(stderr, "TMPL := ID [ mode MODE ] [ reqid REQID ] [ level LEVEL ]\n");
-       fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n");
-
-       //fprintf(stderr, "XFRM_PROTO := [ esp | ah | comp ]\n");
-       fprintf(stderr, "XFRM_PROTO := [ ");
+       fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM-PROTO ] [ spi SPI ]\n");
+       fprintf(stderr, "XFRM-PROTO := ");
        fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ESP));
        fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_AH));
-       fprintf(stderr, "%s", strxf_xfrmproto(IPPROTO_COMP));
-       fprintf(stderr, " ]\n");
-
-       fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
-       //fprintf(stderr, "REQID - number(default=0)\n");
-       fprintf(stderr, "LEVEL := [ required | use ](default=required)\n");
+       fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_COMP));
+       fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
+       fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
+       fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n");
+       fprintf(stderr, "LEVEL := required | use\n");
 
        exit(-1);
 }
@@ -105,7 +114,60 @@ static int xfrm_policy_dir_parse(__u8 *dir, int *argcp, char ***argvp)
        else if (strcmp(*argv, "fwd") == 0)
                *dir = XFRM_POLICY_FWD;
        else
-               invarg("\"DIR\" is invalid", *argv);
+               invarg("DIR value is invalid", *argv);
+
+       *argcp = argc;
+       *argvp = argv;
+
+       return 0;
+}
+
+static int xfrm_policy_ptype_parse(__u8 *ptype, int *argcp, char ***argvp)
+{
+       int argc = *argcp;
+       char **argv = *argvp;
+
+       if (strcmp(*argv, "main") == 0)
+               *ptype = XFRM_POLICY_TYPE_MAIN;
+       else if (strcmp(*argv, "sub") == 0)
+               *ptype = XFRM_POLICY_TYPE_SUB;
+       else
+               invarg("PTYPE value is invalid", *argv);
+
+       *argcp = argc;
+       *argvp = argv;
+
+       return 0;
+}
+
+static int xfrm_policy_flag_parse(__u8 *flags, int *argcp, char ***argvp)
+{
+       int argc = *argcp;
+       char **argv = *argvp;
+       int len = strlen(*argv);
+
+       if (len > 2 && strncmp(*argv, "0x", 2) == 0) {
+               __u8 val = 0;
+
+               if (get_u8(&val, *argv, 16))
+                       invarg("FLAG value is invalid", *argv);
+               *flags = val;
+       } else {
+               while (1) {
+                       if (strcmp(*argv, "localok") == 0)
+                               *flags |= XFRM_POLICY_LOCALOK;
+                       else if (strcmp(*argv, "icmp") == 0)
+                               *flags |= XFRM_POLICY_ICMP;
+                       else {
+                               PREV_ARG(); /* back track */
+                               break;
+                       }
+
+                       if (!NEXT_ARG_OK())
+                               break;
+                       NEXT_ARG();
+               }
+       }
 
        *argcp = argc;
        *argvp = argv;
@@ -135,7 +197,7 @@ static int xfrm_tmpl_parse(struct xfrm_user_tmpl *tmpl,
                        else if (strcmp(*argv, "use") == 0)
                                tmpl->optional = 1;
                        else
-                               invarg("\"LEVEL\" is invalid\n", *argv);
+                               invarg("LEVEL value is invalid\n", *argv);
 
                } else {
                        if (idp) {
@@ -143,10 +205,10 @@ static int xfrm_tmpl_parse(struct xfrm_user_tmpl *tmpl,
                                break;
                        }
                        idp = *argv;
+                       preferred_family = AF_UNSPEC;
                        xfrm_id_parse(&tmpl->saddr, &tmpl->id, &tmpl->family,
                                      0, &argc, &argv);
-                       if (preferred_family == AF_UNSPEC)
-                               preferred_family = tmpl->family;
+                       preferred_family = tmpl->family;
                }
 
                if (!NEXT_ARG_OK())
@@ -163,6 +225,23 @@ static int xfrm_tmpl_parse(struct xfrm_user_tmpl *tmpl,
        return 0;
 }
 
+int xfrm_sctx_parse(char *ctxstr, char *s,
+                          struct xfrm_user_sec_ctx *sctx)
+{
+       int slen;
+
+       slen = strlen(s) + 1;
+
+       sctx->exttype = XFRMA_SEC_CTX;
+       sctx->ctx_doi = 1;
+       sctx->ctx_alg = 1;
+       sctx->ctx_len = slen;
+       sctx->len = sizeof(struct xfrm_user_sec_ctx) + slen;
+       memcpy(ctxstr, s, slen);
+
+       return 0;
+}
+
 static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
 {
        struct rtnl_handle rth;
@@ -173,11 +252,21 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
        } req;
        char *dirp = NULL;
        char *selp = NULL;
+       char *ptypep = NULL;
+       char *sctxp = NULL;
+       struct xfrm_userpolicy_type upt;
        char tmpls_buf[XFRM_TMPLS_BUF_SIZE];
        int tmpls_len = 0;
+       struct xfrm_mark mark = {0, 0};
+       struct {
+               struct xfrm_user_sec_ctx sctx;
+               char    str[CTX_BUF_SIZE];
+       } ctx;
 
        memset(&req, 0, sizeof(req));
+       memset(&upt, 0, sizeof(upt));
        memset(&tmpls_buf, 0, sizeof(tmpls_buf));
+       memset(&ctx, 0, sizeof(ctx));
 
        req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xpinfo));
        req.n.nlmsg_flags = NLM_F_REQUEST|flags;
@@ -197,16 +286,28 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
 
                        NEXT_ARG();
                        xfrm_policy_dir_parse(&req.xpinfo.dir, &argc, &argv);
+               } else if (strcmp(*argv, "ctx") == 0) {
+                       char *context;
 
-                       filter.dir_mask = XFRM_FILTER_MASK_FULL;
-
+                       if (sctxp)
+                               duparg("ctx", *argv);
+                       sctxp = *argv;
+                       NEXT_ARG();
+                       context = *argv;
+                       xfrm_sctx_parse((char *)&ctx.str, context, &ctx.sctx);
+               } else if (strcmp(*argv, "mark") == 0) {
+                       xfrm_parse_mark(&mark, &argc, &argv);
                } else if (strcmp(*argv, "index") == 0) {
                        NEXT_ARG();
                        if (get_u32(&req.xpinfo.index, *argv, 0))
-                               invarg("\"INDEX\" is invalid", *argv);
-
-                       filter.index_mask = XFRM_FILTER_MASK_FULL;
+                               invarg("INDEX value is invalid", *argv);
+               } else if (strcmp(*argv, "ptype") == 0) {
+                       if (ptypep)
+                               duparg("ptype", *argv);
+                       ptypep = *argv;
 
+                       NEXT_ARG();
+                       xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
                } else if (strcmp(*argv, "action") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "allow") == 0)
@@ -214,17 +315,15 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
                        else if (strcmp(*argv, "block") == 0)
                                req.xpinfo.action = XFRM_POLICY_BLOCK;
                        else
-                               invarg("\"action\" value is invalid\n", *argv);
-
-                       filter.action_mask = XFRM_FILTER_MASK_FULL;
-
+                               invarg("ACTION value is invalid\n", *argv);
                } else if (strcmp(*argv, "priority") == 0) {
                        NEXT_ARG();
                        if (get_u32(&req.xpinfo.priority, *argv, 0))
-                               invarg("\"PRIORITY\" is invalid", *argv);
-
-                       filter.priority_mask = XFRM_FILTER_MASK_FULL;
-
+                               invarg("PRIORITY value is invalid", *argv);
+               } else if (strcmp(*argv, "flag") == 0) {
+                       NEXT_ARG();
+                       xfrm_policy_flag_parse(&req.xpinfo.flags, &argc,
+                                              &argv);
                } else if (strcmp(*argv, "limit") == 0) {
                        NEXT_ARG();
                        xfrm_lifetime_cfg_parse(&req.xpinfo.lft, &argc, &argv);
@@ -260,22 +359,41 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
        }
 
        if (!dirp) {
-               fprintf(stderr, "Not enough information: \"DIR\" is required.\n");
+               fprintf(stderr, "Not enough information: DIR is required.\n");
                exit(1);
        }
 
+       if (ptypep) {
+               addattr_l(&req.n, sizeof(req), XFRMA_POLICY_TYPE,
+                         (void *)&upt, sizeof(upt));
+       }
+
        if (tmpls_len > 0) {
                addattr_l(&req.n, sizeof(req), XFRMA_TMPL,
                          (void *)tmpls_buf, tmpls_len);
        }
 
+       if (mark.m) {
+               int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK,
+                                 (void *)&mark, sizeof(mark));
+               if (r < 0) {
+                       fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__);
+                       exit(1);
+               }
+       }
+
+       if (sctxp) {
+               addattr_l(&req.n, sizeof(req), XFRMA_SEC_CTX,
+                         (void *)&ctx, ctx.sctx.len);
+       }
+
        if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
                exit(1);
 
        if (req.xpinfo.sel.family == AF_UNSPEC)
                req.xpinfo.sel.family = AF_INET;
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
                exit(2);
 
        rtnl_close(&rth);
@@ -283,7 +401,8 @@ static int xfrm_policy_modify(int cmd, unsigned flags, int argc, char **argv)
        return 0;
 }
 
-static int xfrm_policy_filter_match(struct xfrm_userpolicy_info *xpinfo)
+static int xfrm_policy_filter_match(struct xfrm_userpolicy_info *xpinfo,
+                                   __u8 ptype)
 {
        if (!filter.use)
                return 1;
@@ -291,6 +410,9 @@ static int xfrm_policy_filter_match(struct xfrm_userpolicy_info *xpinfo)
        if ((xpinfo->dir^filter.xpinfo.dir)&filter.dir_mask)
                return 0;
 
+       if ((ptype^filter.ptype)&filter.ptype_mask)
+               return 0;
+
        if (filter.sel_src_mask) {
                if (xfrm_addr_match(&xpinfo->sel.saddr, &filter.xpinfo.sel.saddr,
                                    filter.sel_src_mask))
@@ -328,37 +450,45 @@ static int xfrm_policy_filter_match(struct xfrm_userpolicy_info *xpinfo)
        if ((xpinfo->priority^filter.xpinfo.priority)&filter.priority_mask)
                return 0;
 
+       if (filter.policy_flags_mask)
+               if ((xpinfo->flags & filter.xpinfo.flags) == 0)
+                       return 0;
+
        return 1;
 }
 
 int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
                      void *arg)
 {
-       FILE *fp = (FILE*)arg;
-       struct xfrm_userpolicy_info *xpinfo;
-       struct xfrm_user_polexpire *xpexp;
-       int len = n->nlmsg_len;
        struct rtattr * tb[XFRMA_MAX+1];
        struct rtattr * rta;
+       struct xfrm_userpolicy_info *xpinfo = NULL;
+       struct xfrm_user_polexpire *xpexp = NULL;
+       struct xfrm_userpolicy_id *xpid = NULL;
+       __u8 ptype = XFRM_POLICY_TYPE_MAIN;
+       FILE *fp = (FILE*)arg;
+       int len = n->nlmsg_len;
 
        if (n->nlmsg_type != XFRM_MSG_NEWPOLICY &&
            n->nlmsg_type != XFRM_MSG_DELPOLICY &&
+           n->nlmsg_type != XFRM_MSG_UPDPOLICY &&
            n->nlmsg_type != XFRM_MSG_POLEXPIRE) {
                fprintf(stderr, "Not a policy: %08x %08x %08x\n",
                        n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
                return 0;
        }
 
-       if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
+       if (n->nlmsg_type == XFRM_MSG_DELPOLICY)  {
+               xpid = NLMSG_DATA(n);
+               len -= NLMSG_SPACE(sizeof(*xpid));
+       } else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
                xpexp = NLMSG_DATA(n);
                xpinfo = &xpexp->pol;
-
-               len -= NLMSG_LENGTH(sizeof(*xpexp));
+               len -= NLMSG_SPACE(sizeof(*xpexp));
        } else {
                xpexp = NULL;
                xpinfo = NLMSG_DATA(n);
-
-               len -= NLMSG_LENGTH(sizeof(*xpinfo));
+               len -= NLMSG_SPACE(sizeof(*xpinfo));
        }
 
        if (len < 0) {
@@ -366,21 +496,49 @@ int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
                return -1;
        }
 
-       if (!xfrm_policy_filter_match(xpinfo))
-               return 0;
-
-       if (n->nlmsg_type == XFRM_MSG_POLEXPIRE)
+       if (n->nlmsg_type == XFRM_MSG_DELPOLICY)
+               rta = XFRMPID_RTA(xpid);
+       else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE)
                rta = XFRMPEXP_RTA(xpexp);
        else
                rta = XFRMP_RTA(xpinfo);
 
        parse_rtattr(tb, XFRMA_MAX, rta, len);
 
+       if (tb[XFRMA_POLICY_TYPE]) {
+               struct xfrm_userpolicy_type *upt;
+
+               if (RTA_PAYLOAD(tb[XFRMA_POLICY_TYPE]) < sizeof(*upt)) {
+                       fprintf(stderr, "too short XFRMA_POLICY_TYPE len\n");
+                       return -1;
+               }
+               upt = (struct xfrm_userpolicy_type *)RTA_DATA(tb[XFRMA_POLICY_TYPE]);
+               ptype = upt->type;
+       }
+
+       if (xpinfo && !xfrm_policy_filter_match(xpinfo, ptype))
+               return 0;
+
        if (n->nlmsg_type == XFRM_MSG_DELPOLICY)
                fprintf(fp, "Deleted ");
+       else if (n->nlmsg_type == XFRM_MSG_UPDPOLICY)
+               fprintf(fp, "Updated ");
        else if (n->nlmsg_type == XFRM_MSG_POLEXPIRE)
                fprintf(fp, "Expired ");
 
+       if (n->nlmsg_type == XFRM_MSG_DELPOLICY) {
+               //xfrm_policy_id_print();
+               if (!tb[XFRMA_POLICY]) {
+                       fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: no XFRMA_POLICY\n");
+                       return -1;
+               }
+               if (RTA_PAYLOAD(tb[XFRMA_POLICY]) < sizeof(*xpinfo)) {
+                       fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: too short XFRMA_POLICY len\n");
+                       return -1;
+               }
+               xpinfo = (struct xfrm_userpolicy_info *)RTA_DATA(tb[XFRMA_POLICY]);
+       }
+
        xfrm_policy_info_print(xpinfo, tb, fp, NULL, NULL);
 
        if (n->nlmsg_type == XFRM_MSG_POLEXPIRE) {
@@ -391,23 +549,36 @@ int xfrm_policy_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
 
        if (oneline)
                fprintf(fp, "\n");
+       fflush(fp);
 
        return 0;
 }
 
 static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
-                                    void *res_nlbuf)
+                                    void *res_nlbuf, size_t res_size)
 {
        struct rtnl_handle rth;
        struct {
                struct nlmsghdr                 n;
                struct xfrm_userpolicy_id       xpid;
+               char                            buf[RTA_BUF_SIZE];
        } req;
        char *dirp = NULL;
        char *selp = NULL;
        char *indexp = NULL;
+       char *ptypep = NULL;
+       char *sctxp = NULL;
+       struct xfrm_userpolicy_type upt;
+       struct xfrm_mark mark = {0, 0};
+       struct {
+               struct xfrm_user_sec_ctx sctx;
+               char    str[CTX_BUF_SIZE];
+       } ctx;
+
 
        memset(&req, 0, sizeof(req));
+       memset(&upt, 0, sizeof(upt));
+       memset(&ctx, 0, sizeof(ctx));
 
        req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xpid));
        req.n.nlmsg_flags = NLM_F_REQUEST;
@@ -422,6 +593,17 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
                        NEXT_ARG();
                        xfrm_policy_dir_parse(&req.xpid.dir, &argc, &argv);
 
+               } else if (strcmp(*argv, "ctx") == 0) {
+                       char *context;
+
+                       if (sctxp)
+                               duparg("ctx", *argv);
+                       sctxp = *argv;
+                       NEXT_ARG();
+                       context = *argv;
+                       xfrm_sctx_parse((char *)&ctx.str, context, &ctx.sctx);
+               } else if (strcmp(*argv, "mark") == 0) {
+                       xfrm_parse_mark(&mark, &argc, &argv);
                } else if (strcmp(*argv, "index") == 0) {
                        if (indexp)
                                duparg("index", *argv);
@@ -429,7 +611,15 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
 
                        NEXT_ARG();
                        if (get_u32(&req.xpid.index, *argv, 0))
-                               invarg("\"INDEX\" is invalid", *argv);
+                               invarg("INDEX value is invalid", *argv);
+
+               } else if (strcmp(*argv, "ptype") == 0) {
+                       if (ptypep)
+                               duparg("ptype", *argv);
+                       ptypep = *argv;
+
+                       NEXT_ARG();
+                       xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
 
                } else {
                        if (selp)
@@ -446,11 +636,15 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
        }
 
        if (!dirp) {
-               fprintf(stderr, "Not enough information: \"DIR\" is required.\n");
+               fprintf(stderr, "Not enough information: DIR is required.\n");
                exit(1);
        }
+       if (ptypep) {
+               addattr_l(&req.n, sizeof(req), XFRMA_POLICY_TYPE,
+                         (void *)&upt, sizeof(upt));
+       }
        if (!selp && !indexp) {
-               fprintf(stderr, "Not enough information: either \"SELECTOR\" or \"INDEX\" is required.\n");
+               fprintf(stderr, "Not enough information: either SELECTOR or INDEX is required.\n");
                exit(1);
        }
        if (selp && indexp)
@@ -462,7 +656,21 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
        if (req.xpid.sel.family == AF_UNSPEC)
                req.xpid.sel.family = AF_INET;
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, res_nlbuf, NULL, NULL) < 0)
+       if (mark.m & mark.v) {
+               int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK,
+                                 (void *)&mark, sizeof(mark));
+               if (r < 0) {
+                       fprintf(stderr, "%s: XFRMA_MARK failed\n",__func__);
+                       exit(1);
+               }
+       }
+
+       if (sctxp) {
+               addattr_l(&req.n, sizeof(req), XFRMA_SEC_CTX,
+                         (void *)&ctx, ctx.sctx.len);
+       }
+
+       if (rtnl_talk(&rth, &req.n, res_nlbuf, res_size) < 0)
                exit(2);
 
        rtnl_close(&rth);
@@ -472,7 +680,7 @@ static int xfrm_policy_get_or_delete(int argc, char **argv, int delete,
 
 static int xfrm_policy_delete(int argc, char **argv)
 {
-       return xfrm_policy_get_or_delete(argc, argv, 1, NULL);
+       return xfrm_policy_get_or_delete(argc, argv, 1, NULL, 0);
 }
 
 static int xfrm_policy_get(int argc, char **argv)
@@ -482,7 +690,7 @@ static int xfrm_policy_get(int argc, char **argv)
 
        memset(buf, 0, sizeof(buf));
 
-       xfrm_policy_get_or_delete(argc, argv, 0, n);
+       xfrm_policy_get_or_delete(argc, argv, 0, n, sizeof(buf));
 
        if (xfrm_policy_print(NULL, n, (void*)stdout) < 0) {
                fprintf(stderr, "An error :-)\n");
@@ -504,6 +712,8 @@ static int xfrm_policy_keep(const struct sockaddr_nl *who,
        struct rtnl_handle *rth = xb->rth;
        struct xfrm_userpolicy_info *xpinfo = NLMSG_DATA(n);
        int len = n->nlmsg_len;
+       struct rtattr *tb[XFRMA_MAX+1];
+       __u8 ptype = XFRM_POLICY_TYPE_MAIN;
        struct nlmsghdr *new_n;
        struct xfrm_userpolicy_id *xpid;
 
@@ -519,11 +729,24 @@ static int xfrm_policy_keep(const struct sockaddr_nl *who,
                return -1;
        }
 
-       if (!xfrm_policy_filter_match(xpinfo))
+       parse_rtattr(tb, XFRMA_MAX, XFRMP_RTA(xpinfo), len);
+
+       if (tb[XFRMA_POLICY_TYPE]) {
+               struct xfrm_userpolicy_type *upt;
+
+               if (RTA_PAYLOAD(tb[XFRMA_POLICY_TYPE]) < sizeof(*upt)) {
+                       fprintf(stderr, "too short XFRMA_POLICY_TYPE len\n");
+                       return -1;
+               }
+               upt = (struct xfrm_userpolicy_type *)RTA_DATA(tb[XFRMA_POLICY_TYPE]);
+               ptype = upt->type;
+       }
+
+       if (!xfrm_policy_filter_match(xpinfo, ptype))
                return 0;
 
        if (xb->offset > xb->size) {
-               fprintf(stderr, "Flush buffer overflow\n");
+               fprintf(stderr, "Policy buffer overflow\n");
                return -1;
        }
 
@@ -544,7 +767,7 @@ static int xfrm_policy_keep(const struct sockaddr_nl *who,
        return 0;
 }
 
-static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
+static int xfrm_policy_list_or_deleteall(int argc, char **argv, int deleteall)
 {
        char *selp = NULL;
        struct rtnl_handle rth;
@@ -563,10 +786,16 @@ static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
                } else if (strcmp(*argv, "index") == 0) {
                        NEXT_ARG();
                        if (get_u32(&filter.xpinfo.index, *argv, 0))
-                               invarg("\"INDEX\" is invalid", *argv);
+                               invarg("INDEX value is invalid", *argv);
 
                        filter.index_mask = XFRM_FILTER_MASK_FULL;
 
+               } else if (strcmp(*argv, "ptype") == 0) {
+                       NEXT_ARG();
+                       xfrm_policy_ptype_parse(&filter.ptype, &argc, &argv);
+
+                       filter.ptype_mask = XFRM_FILTER_MASK_FULL;
+
                } else if (strcmp(*argv, "action") == 0) {
                        NEXT_ARG();
                        if (strcmp(*argv, "allow") == 0)
@@ -574,17 +803,24 @@ static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
                        else if (strcmp(*argv, "block") == 0)
                                filter.xpinfo.action = XFRM_POLICY_BLOCK;
                        else
-                               invarg("\"ACTION\" is invalid\n", *argv);
+                               invarg("ACTION value is invalid\n", *argv);
 
                        filter.action_mask = XFRM_FILTER_MASK_FULL;
 
                } else if (strcmp(*argv, "priority") == 0) {
                        NEXT_ARG();
                        if (get_u32(&filter.xpinfo.priority, *argv, 0))
-                               invarg("\"PRIORITY\" is invalid", *argv);
+                               invarg("PRIORITY value is invalid", *argv);
 
                        filter.priority_mask = XFRM_FILTER_MASK_FULL;
 
+               } else if (strcmp(*argv, "flag") == 0) {
+                       NEXT_ARG();
+                       xfrm_policy_flag_parse(&filter.xpinfo.flags, &argc,
+                                              &argv);
+
+                       filter.policy_flags_mask = XFRM_FILTER_MASK_FULL;
+
                } else {
                        if (selp)
                                invarg("unknown", *argv);
@@ -602,9 +838,9 @@ static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
        if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
                exit(1);
 
-       if (flush) {
+       if (deleteall) {
                struct xfrm_buffer xb;
-               char buf[NLMSG_FLUSH_BUF_SIZE];
+               char buf[NLMSG_DELETEALL_BUF_SIZE];
                int i;
 
                xb.buf = buf;
@@ -612,44 +848,64 @@ static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
                xb.rth = &rth;
 
                for (i = 0; ; i++) {
+                       struct {
+                               struct nlmsghdr n;
+                               char buf[NLMSG_BUF_SIZE];
+                       } req = {
+                               .n.nlmsg_len = NLMSG_HDRLEN,
+                               .n.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
+                               .n.nlmsg_type = XFRM_MSG_GETPOLICY,
+                               .n.nlmsg_seq = rth.dump = ++rth.seq,
+                       };
+
                        xb.offset = 0;
                        xb.nlmsg_count = 0;
 
                        if (show_stats > 1)
-                               fprintf(stderr, "Flush round = %d\n", i);
+                               fprintf(stderr, "Delete-all round = %d\n", i);
 
-                       if (rtnl_wilddump_request(&rth, preferred_family, XFRM_MSG_GETPOLICY) < 0) {
+                       if (rtnl_send(&rth, (void *)&req, req.n.nlmsg_len) < 0) {
                                perror("Cannot send dump request");
                                exit(1);
                        }
 
-                       if (rtnl_dump_filter(&rth, xfrm_policy_keep, &xb, NULL, NULL) < 0) {
-                               fprintf(stderr, "Flush terminated\n");
+                       if (rtnl_dump_filter(&rth, xfrm_policy_keep, &xb) < 0) {
+                               fprintf(stderr, "Delete-all terminated\n");
                                exit(1);
                        }
                        if (xb.nlmsg_count == 0) {
                                if (show_stats > 1)
-                                       fprintf(stderr, "Flush completed\n");
+                                       fprintf(stderr, "Delete-all completed\n");
                                break;
                        }
 
-                       if (rtnl_send(&rth, xb.buf, xb.offset) < 0) {
-                               perror("Failed to send flush request\n");
+                       if (rtnl_send_check(&rth, xb.buf, xb.offset) < 0) {
+                               perror("Failed to send delete-all request");
                                exit(1);
                        }
                        if (show_stats > 1)
-                               fprintf(stderr, "Flushed nlmsg count = %d\n", xb.nlmsg_count);
+                               fprintf(stderr, "Delete-all nlmsg count = %d\n", xb.nlmsg_count);
 
                        xb.offset = 0;
                        xb.nlmsg_count = 0;
                }
        } else {
-               if (rtnl_wilddump_request(&rth, preferred_family, XFRM_MSG_GETPOLICY) < 0) {
+               struct {
+                       struct nlmsghdr n;
+                       char buf[NLMSG_BUF_SIZE];
+               } req = {
+                       .n.nlmsg_len = NLMSG_HDRLEN,
+                       .n.nlmsg_flags = NLM_F_DUMP | NLM_F_REQUEST,
+                       .n.nlmsg_type = XFRM_MSG_GETPOLICY,
+                       .n.nlmsg_seq = rth.dump = ++rth.seq,
+               };
+
+               if (rtnl_send(&rth, (void *)&req, req.n.nlmsg_len) < 0) {
                        perror("Cannot send dump request");
                        exit(1);
                }
 
-               if (rtnl_dump_filter(&rth, xfrm_policy_print, stdout, NULL, NULL) < 0) {
+               if (rtnl_dump_filter(&rth, xfrm_policy_print, stdout) < 0) {
                        fprintf(stderr, "Dump terminated\n");
                        exit(1);
                }
@@ -660,26 +916,234 @@ static int xfrm_policy_list_or_flush(int argc, char **argv, int flush)
        exit(0);
 }
 
-static int xfrm_policy_flush_all(void)
+static int print_spdinfo( struct nlmsghdr *n, void *arg)
+{
+       FILE *fp = (FILE*)arg;
+       __u32 *f = NLMSG_DATA(n);
+       struct rtattr * tb[XFRMA_SPD_MAX+1];
+       struct rtattr * rta;
+
+       int len = n->nlmsg_len;
+
+       len -= NLMSG_LENGTH(sizeof(__u32));
+       if (len < 0) {
+               fprintf(stderr, "SPDinfo: Wrong len %d\n", len);
+               return -1;
+       }
+
+       rta = XFRMSAPD_RTA(f);
+       parse_rtattr(tb, XFRMA_SPD_MAX, rta, len);
+
+       fprintf(fp,"\t SPD");
+       if (tb[XFRMA_SPD_INFO]) {
+               struct xfrmu_spdinfo *si;
+
+               if (RTA_PAYLOAD(tb[XFRMA_SPD_INFO]) < sizeof(*si)) {
+                       fprintf(stderr, "SPDinfo: Wrong len %d\n", len);
+                       return -1;
+               }
+               si = RTA_DATA(tb[XFRMA_SPD_INFO]);
+               fprintf(fp," IN  %d", si->incnt);
+               fprintf(fp," OUT %d", si->outcnt);
+               fprintf(fp," FWD %d", si->fwdcnt);
+
+               if (show_stats) {
+                       fprintf(fp," (Sock:");
+                       fprintf(fp," IN %d", si->inscnt);
+                       fprintf(fp," OUT %d", si->outscnt);
+                       fprintf(fp," FWD %d", si->fwdscnt);
+                       fprintf(fp,")");
+               }
+
+               fprintf(fp, "%s", _SL_);
+       }
+       if (show_stats > 1) {
+               struct xfrmu_spdhinfo *sh;
+
+               if (tb[XFRMA_SPD_HINFO]) {
+                       if (RTA_PAYLOAD(tb[XFRMA_SPD_HINFO]) < sizeof(*sh)) {
+                               fprintf(stderr, "SPDinfo: Wrong len %d\n", len);
+                               return -1;
+                       }
+                       sh = RTA_DATA(tb[XFRMA_SPD_HINFO]);
+                       fprintf(fp,"\t SPD buckets:");
+                       fprintf(fp," count %d", sh->spdhcnt);
+                       fprintf(fp," Max %d", sh->spdhmcnt);
+                       fprintf(fp, "%s", _SL_);
+               }
+               if (tb[XFRMA_SPD_IPV4_HTHRESH]) {
+                       struct xfrmu_spdhthresh *th;
+                       if (RTA_PAYLOAD(tb[XFRMA_SPD_IPV4_HTHRESH]) < sizeof(*th)) {
+                               fprintf(stderr, "SPDinfo: Wrong len %d\n", len);
+                               return -1;
+                       }
+                       th = RTA_DATA(tb[XFRMA_SPD_IPV4_HTHRESH]);
+                       fprintf(fp,"\t SPD IPv4 thresholds:");
+                       fprintf(fp," local %d", th->lbits);
+                       fprintf(fp," remote %d", th->rbits);
+                       fprintf(fp, "%s", _SL_);
+
+               }
+               if (tb[XFRMA_SPD_IPV6_HTHRESH]) {
+                       struct xfrmu_spdhthresh *th;
+                       if (RTA_PAYLOAD(tb[XFRMA_SPD_IPV6_HTHRESH]) < sizeof(*th)) {
+                               fprintf(stderr, "SPDinfo: Wrong len %d\n", len);
+                               return -1;
+                       }
+                       th = RTA_DATA(tb[XFRMA_SPD_IPV6_HTHRESH]);
+                       fprintf(fp,"\t SPD IPv6 thresholds:");
+                       fprintf(fp," local %d", th->lbits);
+                       fprintf(fp," remote %d", th->rbits);
+                       fprintf(fp, "%s", _SL_);
+               }
+       }
+
+       if (oneline)
+               fprintf(fp, "\n");
+
+        return 0;
+}
+
+static int xfrm_spd_setinfo(int argc, char **argv)
+{
+       struct rtnl_handle rth;
+       struct {
+               struct nlmsghdr                 n;
+               __u32                           flags;
+               char                            buf[RTA_BUF_SIZE];
+       } req;
+
+       char *thr4 = NULL;
+       char *thr6 = NULL;
+
+       memset(&req, 0, sizeof(req));
+
+       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(__u32));
+       req.n.nlmsg_flags = NLM_F_REQUEST;
+       req.n.nlmsg_type = XFRM_MSG_NEWSPDINFO;
+       req.flags = 0XFFFFFFFF;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "hthresh4") == 0) {
+                       struct xfrmu_spdhthresh thr;
+
+                       if (thr4)
+                               duparg("hthresh4", *argv);
+                       thr4 = *argv;
+                       NEXT_ARG();
+                       if (get_u8(&thr.lbits, *argv, 0) || thr.lbits > 32)
+                               invarg("hthresh4 LBITS value is invalid", *argv);
+                       NEXT_ARG();
+                       if (get_u8(&thr.rbits, *argv, 0) || thr.rbits > 32)
+                               invarg("hthresh4 RBITS value is invalid", *argv);
+
+                       addattr_l(&req.n, sizeof(req), XFRMA_SPD_IPV4_HTHRESH,
+                                 (void *)&thr, sizeof(thr));
+               } else if (strcmp(*argv, "hthresh6") == 0) {
+                       struct xfrmu_spdhthresh thr;
+
+                       if (thr6)
+                               duparg("hthresh6", *argv);
+                       thr6 = *argv;
+                       NEXT_ARG();
+                       if (get_u8(&thr.lbits, *argv, 0) || thr.lbits > 128)
+                               invarg("hthresh6 LBITS value is invalid", *argv);
+                       NEXT_ARG();
+                       if (get_u8(&thr.rbits, *argv, 0) || thr.rbits > 128)
+                               invarg("hthresh6 RBITS value is invalid", *argv);
+
+                       addattr_l(&req.n, sizeof(req), XFRMA_SPD_IPV6_HTHRESH,
+                                 (void *)&thr, sizeof(thr));
+               } else {
+                       invarg("unknown", *argv);
+               }
+
+               argc--; argv++;
+       }
+
+       if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
+               exit(1);
+
+       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
+               exit(2);
+
+       rtnl_close(&rth);
+
+       return 0;
+}
+
+static int xfrm_spd_getinfo(int argc, char **argv)
+{
+       struct rtnl_handle rth;
+       struct {
+               struct nlmsghdr                 n;
+               __u32                           flags;
+               char                            ans[128];
+       } req;
+
+       memset(&req, 0, sizeof(req));
+
+       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(__u32));
+       req.n.nlmsg_flags = NLM_F_REQUEST;
+       req.n.nlmsg_type = XFRM_MSG_GETSPDINFO;
+       req.flags = 0XFFFFFFFF;
+
+       if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
+               exit(1);
+
+       if (rtnl_talk(&rth, &req.n, &req.n, sizeof(req)) < 0)
+               exit(2);
+
+       print_spdinfo(&req.n, (void*)stdout);
+
+       rtnl_close(&rth);
+
+       return 0;
+}
+
+static int xfrm_policy_flush(int argc, char **argv)
 {
        struct rtnl_handle rth;
        struct {
                struct nlmsghdr n;
+               char            buf[RTA_BUF_SIZE];
        } req;
+       char *ptypep = NULL;
+       struct xfrm_userpolicy_type upt;
 
        memset(&req, 0, sizeof(req));
+       memset(&upt, 0, sizeof(upt));
 
        req.n.nlmsg_len = NLMSG_LENGTH(0); /* nlmsg data is nothing */
        req.n.nlmsg_flags = NLM_F_REQUEST;
        req.n.nlmsg_type = XFRM_MSG_FLUSHPOLICY;
 
+       while (argc > 0) {
+               if (strcmp(*argv, "ptype") == 0) {
+                       if (ptypep)
+                               duparg("ptype", *argv);
+                       ptypep = *argv;
+
+                       NEXT_ARG();
+                       xfrm_policy_ptype_parse(&upt.type, &argc, &argv);
+               } else
+                       invarg("unknown", *argv);
+
+               argc--; argv++;
+       }
+
+       if (ptypep) {
+               addattr_l(&req.n, sizeof(req), XFRMA_POLICY_TYPE,
+                         (void *)&upt, sizeof(upt));
+       }
+
        if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
                exit(1);
 
        if (show_stats > 1)
-               fprintf(stderr, "Flush all\n");
+               fprintf(stderr, "Flush policy\n");
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL, 0) < 0)
                exit(2);
 
        rtnl_close(&rth);
@@ -690,7 +1154,7 @@ static int xfrm_policy_flush_all(void)
 int do_xfrm_policy(int argc, char **argv)
 {
        if (argc < 1)
-               return xfrm_policy_list_or_flush(0, NULL, 0);
+               return xfrm_policy_list_or_deleteall(0, NULL, 0);
 
        if (matches(*argv, "add") == 0)
                return xfrm_policy_modify(XFRM_MSG_NEWPOLICY, 0,
@@ -698,19 +1162,21 @@ int do_xfrm_policy(int argc, char **argv)
        if (matches(*argv, "update") == 0)
                return xfrm_policy_modify(XFRM_MSG_UPDPOLICY, 0,
                                          argc-1, argv+1);
-       if (matches(*argv, "delete") == 0 || matches(*argv, "del") == 0)
+       if (matches(*argv, "delete") == 0)
                return xfrm_policy_delete(argc-1, argv+1);
+       if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0)
+               return xfrm_policy_list_or_deleteall(argc-1, argv+1, 1);
        if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0
            || matches(*argv, "lst") == 0)
-               return xfrm_policy_list_or_flush(argc-1, argv+1, 0);
+               return xfrm_policy_list_or_deleteall(argc-1, argv+1, 0);
        if (matches(*argv, "get") == 0)
                return xfrm_policy_get(argc-1, argv+1);
-       if (matches(*argv, "flush") == 0) {
-               if (argc-1 < 1)
-                       return xfrm_policy_flush_all();
-               else
-                       return xfrm_policy_list_or_flush(argc-1, argv+1, 1);
-       }
+       if (matches(*argv, "flush") == 0)
+               return xfrm_policy_flush(argc-1, argv+1);
+       if (matches(*argv, "count") == 0)
+               return xfrm_spd_getinfo(argc, argv);
+       if (matches(*argv, "set") == 0)
+               return xfrm_spd_setinfo(argc-1, argv+1);
        if (matches(*argv, "help") == 0)
                usage();
        fprintf(stderr, "Command \"%s\" is unknown, try \"ip xfrm policy help\".\n", *argv);