]> git.proxmox.com Git - mirror_iproute2.git/blobdiff - ip/xfrm_state.c
Merge branch 'hdrs-for-dump-req' into iproute2-next
[mirror_iproute2.git] / ip / xfrm_state.c
index 6aa991f1bebf991c8c4acc4493a691772cf37880..913e9fa3bbdb631101a1bf39a5f6bbd1a6d1d575 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
 #include <stdlib.h>
 #include <string.h>
 #include <netdb.h>
-#include <linux/xfrm.h>
 #include "utils.h"
 #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:
  *   data = struct xfrm_usersa_info
  *   rtattr
  *   rtattr
- *   ... (max count of rtattr is XFRM_MAX_DEPTH)
+ *   ... (max count of rtattr is XFRM_MAX+1
  *
  *  each rtattr data = struct xfrm_algo(dynamic size) or xfrm_address_t
  */
 #define NLMSG_BUF_SIZE 4096
 #define RTA_BUF_SIZE 2048
 #define XFRM_ALGO_KEY_BUF_SIZE 512
+#define CTX_BUF_SIZE 256
 
 static void usage(void) __attribute__((noreturn));
 
 static void usage(void)
 {
        fprintf(stderr, "Usage: ip xfrm state { add | update } ID [ ALGO-LIST ] [ mode MODE ]\n");
-       fprintf(stderr, "        [ reqid REQID ] [ FLAG-LIST ] [ sel SELECTOR ] [ LIMIT-LIST ]\n");
-
-       fprintf(stderr, "Usage: ip xfrm state { delete | get } ID\n");
-       fprintf(stderr, "Usage: ip xfrm state { flush | list } [ ID ] [ mode MODE ] [ reqid REQID ]\n");
-       fprintf(stderr, "        [ FLAG_LIST ]\n");
-
-       fprintf(stderr, "ID := [ src ADDR ] [ dst ADDR ] [ proto XFRM_PROTO ] [ spi SPI ]\n");
-       //fprintf(stderr, "XFRM_PROTO := [ esp | ah | ipcomp ]\n");
-       fprintf(stderr, "XFRM_PROTO := [ ");
-       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_ESP));
-       fprintf(stderr, "%s | ", strxf_proto(IPPROTO_AH));
-       fprintf(stderr, "%s ", strxf_proto(IPPROTO_COMP));
-       fprintf(stderr, "]\n");
-
-       //fprintf(stderr, "SPI - security parameter index(default=0)\n");
-
-       fprintf(stderr, "MODE := [ transport | tunnel ](default=transport)\n");
-       //fprintf(stderr, "REQID - number(default=0)\n");
-
-       fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] [ flag FLAG ]\n");
-       fprintf(stderr, "FLAG := [ noecn ]\n");
-
-       fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] | [ ALGO ]\n");
-       fprintf(stderr, "ALGO := ALGO_TYPE ALGO_NAME ALGO_KEY\n");
-       fprintf(stderr, "ALGO_TYPE := [ ");
+       fprintf(stderr, "        [ mark MARK [ mask MASK ] ] [ reqid REQID ] [ seq SEQ ]\n");
+       fprintf(stderr, "        [ replay-window SIZE ] [ replay-seq SEQ ] [ replay-oseq SEQ ]\n");
+       fprintf(stderr, "        [ replay-seq-hi SEQ ] [ replay-oseq-hi SEQ ]\n");
+       fprintf(stderr, "        [ flag FLAG-LIST ] [ sel SELECTOR ] [ LIMIT-LIST ] [ encap ENCAP ]\n");
+       fprintf(stderr, "        [ coa ADDR[/PLEN] ] [ ctx CTX ] [ extra-flag EXTRA-FLAG-LIST ]\n");
+       fprintf(stderr, "        [ offload [dev DEV] dir DIR ]\n");
+       fprintf(stderr, "        [ output-mark OUTPUT-MARK ]\n");
+       fprintf(stderr, "Usage: ip xfrm state allocspi ID [ mode MODE ] [ mark MARK [ mask MASK ] ]\n");
+       fprintf(stderr, "        [ reqid REQID ] [ seq SEQ ] [ min SPI max SPI ]\n");
+       fprintf(stderr, "Usage: ip xfrm state { delete | get } ID [ mark MARK [ mask MASK ] ]\n");
+       fprintf(stderr, "Usage: ip xfrm state { deleteall | list } [ ID ] [ mode MODE ] [ reqid REQID ]\n");
+       fprintf(stderr, "        [ flag FLAG-LIST ]\n");
+       fprintf(stderr, "Usage: ip xfrm state flush [ proto XFRM-PROTO ]\n");
+       fprintf(stderr, "Usage: ip xfrm state count\n");
+       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, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
+       fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
+       fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");
+       fprintf(stderr, "ALGO := { ");
        fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_CRYPT));
-       fprintf(stderr, "%s | ", strxf_algotype(XFRMA_ALG_AUTH));
-       fprintf(stderr, "%s ", strxf_algotype(XFRMA_ALG_COMP));
-       fprintf(stderr, "]\n");
-
-       //fprintf(stderr, "ALGO_NAME - algorithm name\n");
-       //fprintf(stderr, "ALGO_KEY - algorithm key\n");
-
-       fprintf(stderr, "SELECTOR := src ADDR[/PLEN] dst ADDR[/PLEN] [ upspec UPSPEC ] [ dev DEV ]\n");
+       fprintf(stderr, "%s", strxf_algotype(XFRMA_ALG_AUTH));
+       fprintf(stderr, " } ALGO-NAME ALGO-KEYMAT |\n");
+       fprintf(stderr, "        %s", strxf_algotype(XFRMA_ALG_AUTH_TRUNC));
+       fprintf(stderr, " ALGO-NAME ALGO-KEYMAT ALGO-TRUNC-LEN |\n");
+       fprintf(stderr, "        %s", strxf_algotype(XFRMA_ALG_AEAD));
+       fprintf(stderr, " ALGO-NAME ALGO-KEYMAT ALGO-ICV-LEN |\n");
+       fprintf(stderr, "        %s", strxf_algotype(XFRMA_ALG_COMP));
+       fprintf(stderr, " ALGO-NAME\n");
+       fprintf(stderr, "MODE := transport | tunnel | beet | ro | in_trigger\n");
+       fprintf(stderr, "FLAG-LIST := [ FLAG-LIST ] FLAG\n");
+       fprintf(stderr, "FLAG := noecn | decap-dscp | nopmtudisc | wildrecv | icmp | af-unspec | align4 | esn\n");
+       fprintf(stderr, "EXTRA-FLAG-LIST := [ EXTRA-FLAG-LIST ] EXTRA-FLAG\n");
+       fprintf(stderr, "EXTRA-FLAG := dont-encap-dscp\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, "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, "ENCAP := { espinudp | espinudp-nonike } SPORT DPORT OADDR\n");
+       fprintf(stderr, "DIR := in | out\n");
 
-       fprintf(stderr, "UPSPEC := proto PROTO [ sport PORT ] [ dport PORT ]\n");
-
-       //fprintf(stderr, "DEV - device name(default=none)\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");
        exit(-1);
 }
 
 static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type,
-                          char *name, char *key, int max)
+                          char *name, char *key, char *buf, int max)
 {
        int len;
        int slen = strlen(key);
 
-#if 1
+#if 0
        /* XXX: verifying both name and key is required! */
-       fprintf(stderr, "warning: ALGONAME/ALGOKEY will send to kernel promiscuously!(verifying them isn't implemented yet)\n");
+       fprintf(stderr, "warning: ALGO-NAME/ALGO-KEYMAT values will be sent to the kernel promiscuously! (verifying them isn't implemented yet)\n");
 #endif
 
-       strncpy(alg->alg_name, name, sizeof(alg->alg_name));
+       strlcpy(alg->alg_name, name, sizeof(alg->alg_name));
 
        if (slen > 2 && strncmp(key, "0x", 2) == 0) {
-               /*
-                * XXX: fix me!!
+               /* split two chars "0x" from the top */
+               char *p = key + 2;
+               int plen = slen - 2;
+               int i;
+               int j;
+
+               /* Converting hexadecimal numbered string into real key;
+                * Convert each two chars into one char(value). If number
+                * of the length is odd, add zero on the top for rounding.
                 */
-               union {
-                       __u64 x;
-                       unsigned char p[8];
-               } val;
 
-               memset(&val, 0, sizeof(val));
+               /* calculate length of the converted values(real key) */
+               len = (plen + 1) / 2;
+               if (len > max)
+                       invarg("ALGO-KEYMAT value makes buffer overflow\n", key);
 
-               if (get_u64(&val.x, key, 16))
-                       invarg("\"ALGOKEY\" is invalid", key);
+               for (i = -(plen % 2), j = 0; j < len; i += 2, j++) {
+                       char vbuf[3];
+                       __u8 val;
 
-               len = (slen - 2) / 2;
-               if (len > sizeof(val))
-                       invarg("\"ALGOKEY\" is invalid: too large", key);
+                       vbuf[0] = i >= 0 ? p[i] : '0';
+                       vbuf[1] = p[i + 1];
+                       vbuf[2] = '\0';
 
-               if (len > 0) {
-                       int i;
+                       if (get_u8(&val, vbuf, 16))
+                               invarg("ALGO-KEYMAT value is invalid", key);
 
-                       if (len > max)
-                               invarg("\"ALGOKEY\" makes buffer overflow\n", key);
-                       for (i = sizeof(val.p) - 1; i >= 0; i--) {
-                               int j = sizeof(val.p) - 1 - i;
-                               alg->alg_key[j] = val.p[i];
-                       }
+                       buf[j] = val;
                }
-
        } else {
                len = slen;
                if (len > 0) {
                        if (len > max)
-                               invarg("\"ALGOKEY\" makes buffer overflow\n", key);
+                               invarg("ALGO-KEYMAT value makes buffer overflow\n", key);
 
-                       strncpy(alg->alg_key, key, len);
+                       memcpy(buf, key, len);
                }
        }
 
@@ -157,6 +173,20 @@ static int xfrm_algo_parse(struct xfrm_algo *alg, enum xfrm_attr_type_t type,
        return 0;
 }
 
+static int xfrm_seq_parse(__u32 *seq, int *argcp, char ***argvp)
+{
+       int argc = *argcp;
+       char **argv = *argvp;
+
+       if (get_be32(seq, *argv, 0))
+               invarg("SEQ value is invalid", *argv);
+
+       *argcp = argc;
+       *argvp = argv;
+
+       return 0;
+}
+
 static int xfrm_state_flag_parse(__u8 *flags, int *argcp, char ***argvp)
 {
        int argc = *argcp;
@@ -167,16 +197,69 @@ static int xfrm_state_flag_parse(__u8 *flags, int *argcp, char ***argvp)
                __u8 val = 0;
 
                if (get_u8(&val, *argv, 16))
-                       invarg("\"FLAG\" is invalid", *argv);
+                       invarg("FLAG value is invalid", *argv);
                *flags = val;
        } else {
-               if (strcmp(*argv, "noecn") == 0)
-                       *flags |= XFRM_STATE_NOECN;
-               else
-                       invarg("\"FLAG\" is invalid", *argv);
+               while (1) {
+                       if (strcmp(*argv, "noecn") == 0)
+                               *flags |= XFRM_STATE_NOECN;
+                       else if (strcmp(*argv, "decap-dscp") == 0)
+                               *flags |= XFRM_STATE_DECAP_DSCP;
+                       else if (strcmp(*argv, "nopmtudisc") == 0)
+                               *flags |= XFRM_STATE_NOPMTUDISC;
+                       else if (strcmp(*argv, "wildrecv") == 0)
+                               *flags |= XFRM_STATE_WILDRECV;
+                       else if (strcmp(*argv, "icmp") == 0)
+                               *flags |= XFRM_STATE_ICMP;
+                       else if (strcmp(*argv, "af-unspec") == 0)
+                               *flags |= XFRM_STATE_AF_UNSPEC;
+                       else if (strcmp(*argv, "align4") == 0)
+                               *flags |= XFRM_STATE_ALIGN4;
+                       else if (strcmp(*argv, "esn") == 0)
+                               *flags |= XFRM_STATE_ESN;
+                       else {
+                               PREV_ARG(); /* back track */
+                               break;
+                       }
+
+                       if (!NEXT_ARG_OK())
+                               break;
+                       NEXT_ARG();
+               }
        }
 
-       filter.state_flags_mask = XFRM_FILTER_MASK_FULL;
+       *argcp = argc;
+       *argvp = argv;
+
+       return 0;
+}
+
+static int xfrm_state_extra_flag_parse(__u32 *extra_flags, int *argcp, char ***argvp)
+{
+       int argc = *argcp;
+       char **argv = *argvp;
+       int len = strlen(*argv);
+
+       if (len > 2 && strncmp(*argv, "0x", 2) == 0) {
+               __u32 val = 0;
+
+               if (get_u32(&val, *argv, 16))
+                       invarg("\"EXTRA-FLAG\" is invalid", *argv);
+               *extra_flags = val;
+       } else {
+               while (1) {
+                       if (strcmp(*argv, "dont-encap-dscp") == 0)
+                               *extra_flags |= XFRM_SA_XFLAG_DONT_ENCAP_DSCP;
+                       else {
+                               PREV_ARG(); /* back track */
+                               break;
+                       }
+
+                       if (!NEXT_ARG_OK())
+                               break;
+                       NEXT_ARG();
+               }
+       }
 
        *argcp = argc;
        *argvp = argv;
@@ -184,100 +267,285 @@ static int xfrm_state_flag_parse(__u8 *flags, int *argcp, char ***argvp)
        return 0;
 }
 
-static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
+static int xfrm_offload_dir_parse(__u8 *dir, int *argcp, char ***argvp)
+{
+       int argc = *argcp;
+       char **argv = *argvp;
+
+       if (strcmp(*argv, "in") == 0)
+               *dir = XFRM_OFFLOAD_INBOUND;
+       else if (strcmp(*argv, "out") == 0)
+               *dir = 0;
+       else
+               invarg("DIR value is invalid", *argv);
+
+       *argcp = argc;
+       *argvp = argv;
+
+       return 0;
+}
+
+static int xfrm_state_modify(int cmd, unsigned int flags, int argc, char **argv)
 {
        struct rtnl_handle rth;
        struct {
-               struct nlmsghdr         n;
+               struct nlmsghdr n;
                struct xfrm_usersa_info xsinfo;
-               char                    buf[RTA_BUF_SIZE];
-       } req;
+               char                    buf[RTA_BUF_SIZE];
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsinfo)),
+               .n.nlmsg_flags = NLM_F_REQUEST | flags,
+               .n.nlmsg_type = cmd,
+               .xsinfo.family = preferred_family,
+               .xsinfo.lft.soft_byte_limit = XFRM_INF,
+               .xsinfo.lft.hard_byte_limit = XFRM_INF,
+               .xsinfo.lft.soft_packet_limit = XFRM_INF,
+               .xsinfo.lft.hard_packet_limit = XFRM_INF,
+       };
+       struct xfrm_replay_state replay = {};
+       struct xfrm_replay_state_esn replay_esn = {};
+       struct xfrm_user_offload xuo = {};
+       unsigned int ifindex = 0;
+       __u8 dir = 0;
+       bool is_offload = false;
+       __u32 replay_window = 0;
+       __u32 seq = 0, oseq = 0, seq_hi = 0, oseq_hi = 0;
        char *idp = NULL;
+       char *aeadop = NULL;
        char *ealgop = NULL;
        char *aalgop = NULL;
        char *calgop = NULL;
-
-       memset(&req, 0, sizeof(req));
-
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsinfo));
-       req.n.nlmsg_flags = NLM_F_REQUEST|flags;
-       req.n.nlmsg_type = cmd;
-       req.xsinfo.family = preferred_family;
-
-       req.xsinfo.lft.soft_byte_limit = XFRM_INF;
-       req.xsinfo.lft.hard_byte_limit = XFRM_INF;
-       req.xsinfo.lft.soft_packet_limit = XFRM_INF;
-       req.xsinfo.lft.hard_packet_limit = XFRM_INF;
+       char *coap = NULL;
+       char *sctxp = NULL;
+       __u32 extra_flags = 0;
+       struct xfrm_mark mark = {0, 0};
+       struct {
+               struct xfrm_user_sec_ctx sctx;
+               char    str[CTX_BUF_SIZE];
+       } ctx = {};
+       __u32 output_mark = 0;
 
        while (argc > 0) {
                if (strcmp(*argv, "mode") == 0) {
                        NEXT_ARG();
                        xfrm_mode_parse(&req.xsinfo.mode, &argc, &argv);
+               } else if (strcmp(*argv, "mark") == 0) {
+                       xfrm_parse_mark(&mark, &argc, &argv);
                } else if (strcmp(*argv, "reqid") == 0) {
                        NEXT_ARG();
                        xfrm_reqid_parse(&req.xsinfo.reqid, &argc, &argv);
+               } else if (strcmp(*argv, "seq") == 0) {
+                       NEXT_ARG();
+                       xfrm_seq_parse(&req.xsinfo.seq, &argc, &argv);
+               } else if (strcmp(*argv, "replay-window") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&replay_window, *argv, 0))
+                               invarg("value after \"replay-window\" is invalid", *argv);
+               } else if (strcmp(*argv, "replay-seq") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&seq, *argv, 0))
+                               invarg("value after \"replay-seq\" is invalid", *argv);
+               } else if (strcmp(*argv, "replay-seq-hi") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&seq_hi, *argv, 0))
+                               invarg("value after \"replay-seq-hi\" is invalid", *argv);
+               } else if (strcmp(*argv, "replay-oseq") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&oseq, *argv, 0))
+                               invarg("value after \"replay-oseq\" is invalid", *argv);
+               } else if (strcmp(*argv, "replay-oseq-hi") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&oseq_hi, *argv, 0))
+                               invarg("value after \"replay-oseq-hi\" is invalid", *argv);
                } else if (strcmp(*argv, "flag") == 0) {
                        NEXT_ARG();
                        xfrm_state_flag_parse(&req.xsinfo.flags, &argc, &argv);
+               } else if (strcmp(*argv, "extra-flag") == 0) {
+                       NEXT_ARG();
+                       xfrm_state_extra_flag_parse(&extra_flags, &argc, &argv);
                } else if (strcmp(*argv, "sel") == 0) {
                        NEXT_ARG();
+                       preferred_family = AF_UNSPEC;
                        xfrm_selector_parse(&req.xsinfo.sel, &argc, &argv);
+                       preferred_family = req.xsinfo.sel.family;
                } else if (strcmp(*argv, "limit") == 0) {
                        NEXT_ARG();
                        xfrm_lifetime_cfg_parse(&req.xsinfo.lft, &argc, &argv);
+               } else if (strcmp(*argv, "encap") == 0) {
+                       struct xfrm_encap_tmpl encap;
+                       inet_prefix oa;
+                       NEXT_ARG();
+                       xfrm_encap_type_parse(&encap.encap_type, &argc, &argv);
+                       NEXT_ARG();
+                       if (get_be16(&encap.encap_sport, *argv, 0))
+                               invarg("SPORT value after \"encap\" is invalid", *argv);
+                       NEXT_ARG();
+                       if (get_be16(&encap.encap_dport, *argv, 0))
+                               invarg("DPORT value after \"encap\" is invalid", *argv);
+                       NEXT_ARG();
+                       get_addr(&oa, *argv, AF_UNSPEC);
+                       memcpy(&encap.encap_oa, &oa.data, sizeof(encap.encap_oa));
+                       addattr_l(&req.n, sizeof(req.buf), XFRMA_ENCAP,
+                                 (void *)&encap, sizeof(encap));
+               } else if (strcmp(*argv, "coa") == 0) {
+                       inet_prefix coa;
+                       xfrm_address_t xcoa = {};
+
+                       if (coap)
+                               duparg("coa", *argv);
+                       coap = *argv;
+
+                       NEXT_ARG();
+
+                       get_prefix(&coa, *argv, preferred_family);
+                       if (coa.family == AF_UNSPEC)
+                               invarg("value after \"coa\" has an unrecognized address family", *argv);
+                       if (coa.bytelen > sizeof(xcoa))
+                               invarg("value after \"coa\" is too large", *argv);
+
+                       memcpy(&xcoa, &coa.data, coa.bytelen);
+
+                       addattr_l(&req.n, sizeof(req.buf), XFRMA_COADDR,
+                                 (void *)&xcoa, sizeof(xcoa));
+               } 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);
+                       addattr_l(&req.n, sizeof(req.buf), XFRMA_SEC_CTX,
+                                 (void *)&ctx, ctx.sctx.len);
+               } else if (strcmp(*argv, "offload") == 0) {
+                       is_offload = true;
+                       NEXT_ARG();
+                       if (strcmp(*argv, "dev") == 0) {
+                               NEXT_ARG();
+                               ifindex = ll_name_to_index(*argv);
+                               if (!ifindex) {
+                                       invarg("value after \"offload dev\" is invalid", *argv);
+                                       is_offload = false;
+                               }
+                               NEXT_ARG();
+                       }
+                       if (strcmp(*argv, "dir") == 0) {
+                               NEXT_ARG();
+                               xfrm_offload_dir_parse(&dir, &argc, &argv);
+                       } else {
+                               invarg("value after \"offload dir\" is invalid", *argv);
+                               is_offload = false;
+                       }
+               } else if (strcmp(*argv, "output-mark") == 0) {
+                       NEXT_ARG();
+                       if (get_u32(&output_mark, *argv, 0))
+                               invarg("value after \"output-mark\" is invalid", *argv);
                } else {
                        /* try to assume ALGO */
                        int type = xfrm_algotype_getbyname(*argv);
+
                        switch (type) {
+                       case XFRMA_ALG_AEAD:
                        case XFRMA_ALG_CRYPT:
                        case XFRMA_ALG_AUTH:
+                       case XFRMA_ALG_AUTH_TRUNC:
                        case XFRMA_ALG_COMP:
                        {
                                /* ALGO */
                                struct {
-                                       struct xfrm_algo alg;
+                                       union {
+                                               struct xfrm_algo alg;
+                                               struct xfrm_algo_aead aead;
+                                               struct xfrm_algo_auth auth;
+                                       } u;
                                        char buf[XFRM_ALGO_KEY_BUF_SIZE];
-                               } alg;
+                               } alg = {};
                                int len;
+                               __u32 icvlen, trunclen;
                                char *name;
-                               char *key;
+                               char *key = "";
+                               char *buf;
 
                                switch (type) {
+                               case XFRMA_ALG_AEAD:
+                                       if (ealgop || aalgop || aeadop)
+                                               duparg("ALGO-TYPE", *argv);
+                                       aeadop = *argv;
+                                       break;
                                case XFRMA_ALG_CRYPT:
-                                       if (ealgop)
-                                               duparg("ALGOTYPE", *argv);
+                                       if (ealgop || aeadop)
+                                               duparg("ALGO-TYPE", *argv);
                                        ealgop = *argv;
                                        break;
                                case XFRMA_ALG_AUTH:
-                                       if (aalgop)
-                                               duparg("ALGOTYPE", *argv);
+                               case XFRMA_ALG_AUTH_TRUNC:
+                                       if (aalgop || aeadop)
+                                               duparg("ALGO-TYPE", *argv);
                                        aalgop = *argv;
                                        break;
                                case XFRMA_ALG_COMP:
                                        if (calgop)
-                                               duparg("ALGOTYPE", *argv);
+                                               duparg("ALGO-TYPE", *argv);
                                        calgop = *argv;
                                        break;
                                default:
                                        /* not reached */
-                                       invarg("\"ALGOTYPE\" is invalid\n", *argv);
+                                       invarg("ALGO-TYPE value is invalid\n", *argv);
                                }
 
                                if (!NEXT_ARG_OK())
-                                       missarg("ALGONAME");
+                                       missarg("ALGO-NAME");
                                NEXT_ARG();
                                name = *argv;
 
-                               if (!NEXT_ARG_OK())
-                                       missarg("ALGOKEY");
-                               NEXT_ARG();
-                               key = *argv;
+                               switch (type) {
+                               case XFRMA_ALG_AEAD:
+                               case XFRMA_ALG_CRYPT:
+                               case XFRMA_ALG_AUTH:
+                               case XFRMA_ALG_AUTH_TRUNC:
+                                       if (!NEXT_ARG_OK())
+                                               missarg("ALGO-KEYMAT");
+                                       NEXT_ARG();
+                                       key = *argv;
+                                       break;
+                               }
+
+                               buf = alg.u.alg.alg_key;
+                               len = sizeof(alg.u.alg);
 
-                               memset(&alg, 0, sizeof(alg));
+                               switch (type) {
+                               case XFRMA_ALG_AEAD:
+                                       if (!NEXT_ARG_OK())
+                                               missarg("ALGO-ICV-LEN");
+                                       NEXT_ARG();
+                                       if (get_u32(&icvlen, *argv, 0))
+                                               invarg("ALGO-ICV-LEN value is invalid",
+                                                      *argv);
+                                       alg.u.aead.alg_icv_len = icvlen;
+
+                                       buf = alg.u.aead.alg_key;
+                                       len = sizeof(alg.u.aead);
+                                       break;
+                               case XFRMA_ALG_AUTH_TRUNC:
+                                       if (!NEXT_ARG_OK())
+                                               missarg("ALGO-TRUNC-LEN");
+                                       NEXT_ARG();
+                                       if (get_u32(&trunclen, *argv, 0))
+                                               invarg("ALGO-TRUNC-LEN value is invalid",
+                                                      *argv);
+                                       alg.u.auth.alg_trunc_len = trunclen;
+
+                                       buf = alg.u.auth.alg_key;
+                                       len = sizeof(alg.u.auth);
+                                       break;
+                               }
 
                                xfrm_algo_parse((void *)&alg, type, name, key,
-                                               sizeof(alg.buf));
-                               len = sizeof(struct xfrm_algo) + alg.alg.alg_key_len;
+                                               buf, sizeof(alg.buf));
+                               len += alg.u.alg.alg_key_len / 8;
 
                                addattr_l(&req.n, sizeof(req.buf), type,
                                          (void *)&alg, len);
@@ -299,34 +567,175 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
                argc--; argv++;
        }
 
+       if (req.xsinfo.flags & XFRM_STATE_ESN &&
+           replay_window == 0) {
+               fprintf(stderr, "Error: esn flag set without replay-window.\n");
+               exit(-1);
+       }
+
+       if (replay_window > XFRMA_REPLAY_ESN_MAX) {
+               fprintf(stderr,
+                       "Error: replay-window (%u) > XFRMA_REPLAY_ESN_MAX (%u).\n",
+                       replay_window, XFRMA_REPLAY_ESN_MAX);
+               exit(-1);
+       }
+
+       if (is_offload) {
+               xuo.ifindex = ifindex;
+               xuo.flags = dir;
+               addattr_l(&req.n, sizeof(req.buf), XFRMA_OFFLOAD_DEV, &xuo,
+                         sizeof(xuo));
+       }
+       if (req.xsinfo.flags & XFRM_STATE_ESN ||
+           replay_window > (sizeof(replay.bitmap) * 8)) {
+               replay_esn.seq = seq;
+               replay_esn.oseq = oseq;
+               replay_esn.seq_hi = seq_hi;
+               replay_esn.oseq_hi = oseq_hi;
+               replay_esn.replay_window = replay_window;
+               replay_esn.bmp_len = (replay_window + sizeof(__u32) * 8 - 1) /
+                                    (sizeof(__u32) * 8);
+               addattr_l(&req.n, sizeof(req.buf), XFRMA_REPLAY_ESN_VAL,
+                         &replay_esn, sizeof(replay_esn));
+       } else {
+               if (seq || oseq) {
+                       replay.seq = seq;
+                       replay.oseq = oseq;
+                       addattr_l(&req.n, sizeof(req.buf), XFRMA_REPLAY_VAL,
+                                 &replay, sizeof(replay));
+               }
+               req.xsinfo.replay_window = replay_window;
+       }
+
+       if (extra_flags)
+               addattr32(&req.n, sizeof(req.buf), XFRMA_SA_EXTRA_FLAGS,
+                         extra_flags);
+
        if (!idp) {
-               fprintf(stderr, "Not enough information: \"ID\" is required\n");
+               fprintf(stderr, "Not enough information: ID is required\n");
                exit(1);
        }
 
-       if (ealgop || aalgop || calgop) {
-               if (req.xsinfo.id.proto != IPPROTO_ESP &&
-                   req.xsinfo.id.proto != IPPROTO_AH &&
-                   req.xsinfo.id.proto != IPPROTO_COMP) {
-                       fprintf(stderr, "\"ALGO\" is invalid with proto=%s\n", strxf_proto(req.xsinfo.id.proto));
+       if (mark.m) {
+               int r = addattr_l(&req.n, sizeof(req.buf), XFRMA_MARK,
+                                 (void *)&mark, sizeof(mark));
+               if (r < 0) {
+                       fprintf(stderr, "XFRMA_MARK failed\n");
+                       exit(1);
+               }
+       }
+
+       if (xfrm_xfrmproto_is_ipsec(req.xsinfo.id.proto)) {
+               switch (req.xsinfo.mode) {
+               case XFRM_MODE_TRANSPORT:
+               case XFRM_MODE_TUNNEL:
+                       break;
+               case XFRM_MODE_BEET:
+                       if (req.xsinfo.id.proto == IPPROTO_ESP)
+                               break;
+               default:
+                       fprintf(stderr, "MODE value is invalid with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
                        exit(1);
                }
+
+               switch (req.xsinfo.id.proto) {
+               case IPPROTO_ESP:
+                       if (calgop) {
+                               fprintf(stderr, "ALGO-TYPE value \"%s\" is invalid with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_COMP),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       if (!ealgop && !aeadop) {
+                               fprintf(stderr, "ALGO-TYPE value \"%s\" or \"%s\" is required with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_CRYPT),
+                                       strxf_algotype(XFRMA_ALG_AEAD),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       break;
+               case IPPROTO_AH:
+                       if (ealgop || aeadop || calgop) {
+                               fprintf(stderr, "ALGO-TYPE values \"%s\", \"%s\", and \"%s\" are invalid with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_CRYPT),
+                                       strxf_algotype(XFRMA_ALG_AEAD),
+                                       strxf_algotype(XFRMA_ALG_COMP),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       if (!aalgop) {
+                               fprintf(stderr, "ALGO-TYPE value \"%s\" or \"%s\" is required with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_AUTH),
+                                       strxf_algotype(XFRMA_ALG_AUTH_TRUNC),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       break;
+               case IPPROTO_COMP:
+                       if (ealgop || aalgop || aeadop) {
+                               fprintf(stderr, "ALGO-TYPE values \"%s\", \"%s\", \"%s\", and \"%s\" are invalid with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_CRYPT),
+                                       strxf_algotype(XFRMA_ALG_AUTH),
+                                       strxf_algotype(XFRMA_ALG_AUTH_TRUNC),
+                                       strxf_algotype(XFRMA_ALG_AEAD),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       if (!calgop) {
+                               fprintf(stderr, "ALGO-TYPE value \"%s\" is required with XFRM-PROTO value \"%s\"\n",
+                                       strxf_algotype(XFRMA_ALG_COMP),
+                                       strxf_xfrmproto(req.xsinfo.id.proto));
+                               exit(1);
+                       }
+                       break;
+               }
        } else {
-               if (req.xsinfo.id.proto == IPPROTO_ESP ||
-                   req.xsinfo.id.proto == IPPROTO_AH ||
-                   req.xsinfo.id.proto == IPPROTO_COMP) {
-                       fprintf(stderr, "\"ALGO\" is required with proto=%s\n", strxf_proto(req.xsinfo.id.proto));
-                       exit (1);
+               if (ealgop || aalgop || aeadop || calgop) {
+                       fprintf(stderr, "ALGO is invalid with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
+                       exit(1);
                }
        }
 
+       if (xfrm_xfrmproto_is_ro(req.xsinfo.id.proto)) {
+               switch (req.xsinfo.mode) {
+               case XFRM_MODE_ROUTEOPTIMIZATION:
+               case XFRM_MODE_IN_TRIGGER:
+                       break;
+               case 0:
+                       fprintf(stderr, "\"mode\" is required with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
+                       exit(1);
+               default:
+                       fprintf(stderr, "MODE value is invalid with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
+                       exit(1);
+               }
+
+               if (!coap) {
+                       fprintf(stderr, "\"coa\" is required with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
+                       exit(1);
+               }
+       } else {
+               if (coap) {
+                       fprintf(stderr, "\"coa\" is invalid with XFRM-PROTO value \"%s\"\n",
+                               strxf_xfrmproto(req.xsinfo.id.proto));
+                       exit(1);
+               }
+       }
+
+       if (output_mark)
+               addattr32(&req.n, sizeof(req.buf), XFRMA_OUTPUT_MARK, output_mark);
+
        if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
                exit(1);
 
        if (req.xsinfo.family == AF_UNSPEC)
                req.xsinfo.family = AF_INET;
 
-       if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
                exit(2);
 
        rtnl_close(&rth);
@@ -334,18 +743,155 @@ static int xfrm_state_modify(int cmd, unsigned flags, int argc, char **argv)
        return 0;
 }
 
+static int xfrm_state_allocspi(int argc, char **argv)
+{
+       struct rtnl_handle rth;
+       struct {
+               struct nlmsghdr n;
+               struct xfrm_userspi_info xspi;
+               char                    buf[RTA_BUF_SIZE];
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xspi)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .n.nlmsg_type = XFRM_MSG_ALLOCSPI,
+               .xspi.info.family = preferred_family,
+#if 0
+               .xspi.lft.soft_byte_limit = XFRM_INF,
+               .xspi.lft.hard_byte_limit = XFRM_INF,
+               .xspi.lft.soft_packet_limit = XFRM_INF,
+               .xspi.lft.hard_packet_limit = XFRM_INF,
+#endif
+       };
+       char *idp = NULL;
+       char *minp = NULL;
+       char *maxp = NULL;
+       struct xfrm_mark mark = {0, 0};
+       struct nlmsghdr *answer;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "mode") == 0) {
+                       NEXT_ARG();
+                       xfrm_mode_parse(&req.xspi.info.mode, &argc, &argv);
+               } else if (strcmp(*argv, "mark") == 0) {
+                       xfrm_parse_mark(&mark, &argc, &argv);
+               } else if (strcmp(*argv, "reqid") == 0) {
+                       NEXT_ARG();
+                       xfrm_reqid_parse(&req.xspi.info.reqid, &argc, &argv);
+               } else if (strcmp(*argv, "seq") == 0) {
+                       NEXT_ARG();
+                       xfrm_seq_parse(&req.xspi.info.seq, &argc, &argv);
+               } else if (strcmp(*argv, "min") == 0) {
+                       if (minp)
+                               duparg("min", *argv);
+                       minp = *argv;
+
+                       NEXT_ARG();
+
+                       if (get_u32(&req.xspi.min, *argv, 0))
+                               invarg("value after \"min\" is invalid", *argv);
+               } else if (strcmp(*argv, "max") == 0) {
+                       if (maxp)
+                               duparg("max", *argv);
+                       maxp = *argv;
+
+                       NEXT_ARG();
+
+                       if (get_u32(&req.xspi.max, *argv, 0))
+                               invarg("value after \"max\" is invalid", *argv);
+               } else {
+                       /* try to assume ID */
+                       if (idp)
+                               invarg("unknown", *argv);
+                       idp = *argv;
+
+                       /* ID */
+                       xfrm_id_parse(&req.xspi.info.saddr, &req.xspi.info.id,
+                                     &req.xspi.info.family, 0, &argc, &argv);
+                       if (req.xspi.info.id.spi) {
+                               fprintf(stderr, "\"spi\" is invalid\n");
+                               exit(1);
+                       }
+                       if (preferred_family == AF_UNSPEC)
+                               preferred_family = req.xspi.info.family;
+               }
+               argc--; argv++;
+       }
+
+       if (!idp) {
+               fprintf(stderr, "Not enough information: ID is required\n");
+               exit(1);
+       }
+
+       if (minp) {
+               if (!maxp) {
+                       fprintf(stderr, "\"max\" is missing\n");
+                       exit(1);
+               }
+               if (req.xspi.min > req.xspi.max) {
+                       fprintf(stderr, "value after \"min\" is larger than value after \"max\"\n");
+                       exit(1);
+               }
+       } else {
+               if (maxp) {
+                       fprintf(stderr, "\"min\" is missing\n");
+                       exit(1);
+               }
+
+               /* XXX: Default value defined in PF_KEY;
+                * See kernel's net/key/af_key.c(pfkey_getspi).
+                */
+               req.xspi.min = 0x100;
+               req.xspi.max = 0x0fffffff;
+
+               /* XXX: IPCOMP spi is 16-bits;
+                * See kernel's net/xfrm/xfrm_user(verify_userspi_info).
+                */
+               if (req.xspi.info.id.proto == IPPROTO_COMP)
+                       req.xspi.max = 0xffff;
+       }
+
+       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, "XFRMA_MARK failed\n");
+                       exit(1);
+               }
+       }
+
+       if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
+               exit(1);
+
+       if (req.xspi.info.family == AF_UNSPEC)
+               req.xspi.info.family = AF_INET;
+
+
+       if (rtnl_talk(&rth, &req.n, &answer) < 0)
+               exit(2);
+
+       if (xfrm_state_print(NULL, answer, (void *)stdout) < 0) {
+               fprintf(stderr, "An error :-)\n");
+               exit(1);
+       }
+
+       free(answer);
+       rtnl_close(&rth);
+
+       return 0;
+}
+
 static int xfrm_state_filter_match(struct xfrm_usersa_info *xsinfo)
 {
        if (!filter.use)
                return 1;
 
        if (filter.id_src_mask)
-               if (memcmp(&xsinfo->saddr, &filter.xsinfo.saddr,
-                          filter.id_src_mask) != 0)
+               if (xfrm_addr_match(&xsinfo->saddr, &filter.xsinfo.saddr,
+                                   filter.id_src_mask))
                        return 0;
        if (filter.id_dst_mask)
-               if (memcmp(&xsinfo->id.daddr, &filter.xsinfo.id.daddr,
-                          filter.id_dst_mask) != 0)
+               if (xfrm_addr_match(&xsinfo->id.daddr, &filter.xsinfo.id.daddr,
+                                   filter.id_dst_mask))
                        return 0;
        if ((xsinfo->id.proto^filter.xsinfo.id.proto)&filter.id_proto_mask)
                return 0;
@@ -362,77 +908,89 @@ static int xfrm_state_filter_match(struct xfrm_usersa_info *xsinfo)
        return 1;
 }
 
-static int xfrm_selector_iszero(struct xfrm_selector *s)
-{
-       struct xfrm_selector s0;
-
-       memset(&s0, 0, sizeof(s0));
-
-       return (memcmp(&s0, s, sizeof(s0)) == 0);
-}
-
-int xfrm_state_print(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+int xfrm_state_print(const struct sockaddr_nl *who, struct nlmsghdr *n,
+                    void *arg)
 {
-       FILE *fp = (FILE*)arg;
-       struct xfrm_usersa_info *xsinfo = NLMSG_DATA(n);
+       FILE *fp = (FILE *)arg;
+       struct rtattr *tb[XFRMA_MAX+1];
+       struct rtattr *rta;
+       struct xfrm_usersa_info *xsinfo = NULL;
+       struct xfrm_user_expire *xexp = NULL;
+       struct xfrm_usersa_id   *xsid = NULL;
        int len = n->nlmsg_len;
-       struct rtattr * tb[XFRMA_MAX+1];
-       int ntb;
 
        if (n->nlmsg_type != XFRM_MSG_NEWSA &&
-           n->nlmsg_type != XFRM_MSG_DELSA) {
+           n->nlmsg_type != XFRM_MSG_DELSA &&
+           n->nlmsg_type != XFRM_MSG_UPDSA &&
+           n->nlmsg_type != XFRM_MSG_EXPIRE) {
                fprintf(stderr, "Not a state: %08x %08x %08x\n",
                        n->nlmsg_len, n->nlmsg_type, n->nlmsg_flags);
                return 0;
        }
 
-       len -= NLMSG_LENGTH(sizeof(*xsinfo));
+       if (n->nlmsg_type == XFRM_MSG_DELSA) {
+               /* Dont blame me for this .. Herbert made me do it */
+               xsid = NLMSG_DATA(n);
+               len -= NLMSG_SPACE(sizeof(*xsid));
+       } else if (n->nlmsg_type == XFRM_MSG_EXPIRE) {
+               xexp = NLMSG_DATA(n);
+               xsinfo = &xexp->state;
+               len -= NLMSG_SPACE(sizeof(*xexp));
+       } else {
+               xexp = NULL;
+               xsinfo = NLMSG_DATA(n);
+               len -= NLMSG_SPACE(sizeof(*xsinfo));
+       }
+
        if (len < 0) {
                fprintf(stderr, "BUG: wrong nlmsg len %d\n", len);
                return -1;
        }
 
-       if (!xfrm_state_filter_match(xsinfo))
+       if (xsinfo && !xfrm_state_filter_match(xsinfo))
                return 0;
 
-       memset(tb, 0, sizeof(tb));
-       ntb = parse_rtattr_byindex(tb, XFRM_MAX_DEPTH, XFRMS_RTA(xsinfo), len);
-
        if (n->nlmsg_type == XFRM_MSG_DELSA)
                fprintf(fp, "Deleted ");
+       else if (n->nlmsg_type == XFRM_MSG_UPDSA)
+               fprintf(fp, "Updated ");
+       else if (n->nlmsg_type == XFRM_MSG_EXPIRE)
+               fprintf(fp, "Expired ");
 
-       xfrm_id_info_print(&xsinfo->saddr, &xsinfo->id, xsinfo->mode,
-                          xsinfo->reqid, xsinfo->family, fp, NULL);
-
-       fprintf(fp, "\t");
-       fprintf(fp, "replay-window %d ", xsinfo->replay_window);
-       if (show_stats > 0)
-               fprintf(fp, "seq 0x%08u ", xsinfo->seq);
-       if (xsinfo->flags) {
-               fprintf(fp, "flag 0x%s", strxf_flags(xsinfo->flags));
-               if (show_stats > 0) {
-                       if (xsinfo->flags) {
-                               fprintf(fp, "(");
-                               if (xsinfo->flags & XFRM_STATE_NOECN)
-                                       fprintf(fp, "noecn");
-                               fprintf(fp, ")");
-                       }
+       if (n->nlmsg_type == XFRM_MSG_DELSA)
+               rta = XFRMSID_RTA(xsid);
+       else if (n->nlmsg_type == XFRM_MSG_EXPIRE)
+               rta = XFRMEXP_RTA(xexp);
+       else
+               rta = XFRMS_RTA(xsinfo);
+
+       parse_rtattr(tb, XFRMA_MAX, rta, len);
+
+       if (n->nlmsg_type == XFRM_MSG_DELSA) {
+               /* xfrm_policy_id_print(); */
+
+               if (!tb[XFRMA_SA]) {
+                       fprintf(stderr, "Buggy XFRM_MSG_DELSA: no XFRMA_SA\n");
+                       return -1;
+               }
+               if (RTA_PAYLOAD(tb[XFRMA_SA]) < sizeof(*xsinfo)) {
+                       fprintf(stderr, "Buggy XFRM_MSG_DELPOLICY: too short XFRMA_POLICY len\n");
+                       return -1;
                }
+               xsinfo = RTA_DATA(tb[XFRMA_SA]);
        }
-       fprintf(fp, "%s", _SL_);
 
-       xfrm_xfrma_print(tb, ntb, xsinfo->family, fp, "\t");
+       xfrm_state_info_print(xsinfo, tb, fp, NULL, NULL);
 
-       if (!xfrm_selector_iszero(&xsinfo->sel))
-               xfrm_selector_print(&xsinfo->sel, xsinfo->family, fp, "\tsel ");
-
-       if (show_stats > 0) {
-               xfrm_lifetime_print(&xsinfo->lft, &xsinfo->curlft, fp, "\t");
-               xfrm_stats_print(&xsinfo->stats, fp, "\t");
+       if (n->nlmsg_type == XFRM_MSG_EXPIRE) {
+               fprintf(fp, "\t");
+               fprintf(fp, "hard %u", xexp->hard);
+               fprintf(fp, "%s", _SL_);
        }
 
        if (oneline)
                fprintf(fp, "\n");
+       fflush(fp);
 
        return 0;
 }
@@ -441,43 +999,55 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete)
 {
        struct rtnl_handle rth;
        struct {
-               struct nlmsghdr         n;
+               struct nlmsghdr n;
                struct xfrm_usersa_id   xsid;
-       } req;
+               char                    buf[RTA_BUF_SIZE];
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsid)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .n.nlmsg_type = delete ? XFRM_MSG_DELSA : XFRM_MSG_GETSA,
+               .xsid.family = preferred_family,
+       };
        struct xfrm_id id;
        char *idp = NULL;
-
-       memset(&req, 0, sizeof(req));
-
-       req.n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsid));
-       req.n.nlmsg_flags = NLM_F_REQUEST;
-       req.n.nlmsg_type = delete ? XFRM_MSG_DELSA : XFRM_MSG_GETSA;
-       req.xsid.family = preferred_family;
+       struct xfrm_mark mark = {0, 0};
 
        while (argc > 0) {
-               /*
-                * XXX: Source address is not used and ignore it to follow
-                * XXX: a manner of setkey e.g. in the case of deleting/getting
-                * XXX: message of IPsec SA.
-                */
-               xfrm_address_t ignore_saddr;
+               xfrm_address_t saddr;
 
-               if (idp)
-                       invarg("unknown", *argv);
-               idp = *argv;
+               if (strcmp(*argv, "mark") == 0) {
+                       xfrm_parse_mark(&mark, &argc, &argv);
+               } else {
+                       if (idp)
+                               invarg("unknown", *argv);
+                       idp = *argv;
+
+                       /* ID */
+                       memset(&id, 0, sizeof(id));
+                       memset(&saddr, 0, sizeof(saddr));
+                       xfrm_id_parse(&saddr, &id, &req.xsid.family, 0,
+                                     &argc, &argv);
 
-               /* ID */
-               memset(&id, 0, sizeof(id));
-               xfrm_id_parse(&ignore_saddr, &id, &req.xsid.family, 0,
-                             &argc, &argv);
+                       memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr));
+                       req.xsid.spi = id.spi;
+                       req.xsid.proto = id.proto;
 
-               memcpy(&req.xsid.daddr, &id.daddr, sizeof(req.xsid.daddr));
-               req.xsid.spi = id.spi;
-               req.xsid.proto = id.proto;
+                       addattr_l(&req.n, sizeof(req.buf), XFRMA_SRCADDR,
+                                 (void *)&saddr, sizeof(saddr));
+               }
 
                argc--; argv++;
        }
 
+       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, "XFRMA_MARK failed\n");
+                       exit(1);
+               }
+       }
+
        if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
                exit(1);
 
@@ -485,21 +1055,20 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete)
                req.xsid.family = AF_INET;
 
        if (delete) {
-               if (rtnl_talk(&rth, &req.n, 0, 0, NULL, NULL, NULL) < 0)
+               if (rtnl_talk(&rth, &req.n, NULL) < 0)
                        exit(2);
        } else {
-               char buf[NLMSG_BUF_SIZE];
-               struct nlmsghdr *res_n = (struct nlmsghdr *)buf;
+               struct nlmsghdr *answer;
 
-               memset(buf, 0, sizeof(buf));
-
-               if (rtnl_talk(&rth, &req.n, 0, 0, res_n, NULL, NULL) < 0)
+               if (rtnl_talk(&rth, &req.n, &answer) < 0)
                        exit(2);
 
-               if (xfrm_state_print(NULL, res_n, (void*)stdout) < 0) {
+               if (xfrm_state_print(NULL, answer, (void *)stdout) < 0) {
                        fprintf(stderr, "An error :-)\n");
                        exit(1);
                }
+
+               free(answer);
        }
 
        rtnl_close(&rth);
@@ -511,7 +1080,9 @@ static int xfrm_state_get_or_delete(int argc, char **argv, int delete)
  * With an existing state of nlmsg, make new nlmsg for deleting the state
  * and store it to buffer.
  */
-int xfrm_state_keep(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
+static int xfrm_state_keep(const struct sockaddr_nl *who,
+                          struct nlmsghdr *n,
+                          void *arg)
 {
        struct xfrm_buffer *xb = (struct xfrm_buffer *)arg;
        struct rtnl_handle *rth = xb->rth;
@@ -519,6 +1090,7 @@ int xfrm_state_keep(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
        int len = n->nlmsg_len;
        struct nlmsghdr *new_n;
        struct xfrm_usersa_id *xsid;
+       struct rtattr *tb[XFRMA_MAX+1];
 
        if (n->nlmsg_type != XFRM_MSG_NEWSA) {
                fprintf(stderr, "Not a state: %08x %08x %08x\n",
@@ -536,7 +1108,7 @@ int xfrm_state_keep(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
                return 0;
 
        if (xb->offset > xb->size) {
-               fprintf(stderr, "Flush buffer overflow\n");
+               fprintf(stderr, "State buffer overflow\n");
                return -1;
        }
 
@@ -552,18 +1124,33 @@ int xfrm_state_keep(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
        xsid->spi = xsinfo->id.spi;
        xsid->proto = xsinfo->id.proto;
 
+       addattr_l(new_n, xb->size, XFRMA_SRCADDR, &xsinfo->saddr,
+                 sizeof(xsid->daddr));
+
+       parse_rtattr(tb, XFRMA_MAX, XFRMS_RTA(xsinfo), len);
+
+       if (tb[XFRMA_MARK]) {
+               int r = addattr_l(new_n, xb->size, XFRMA_MARK,
+                               (void *)RTA_DATA(tb[XFRMA_MARK]), tb[XFRMA_MARK]->rta_len);
+               if (r < 0) {
+                       fprintf(stderr, "%s: XFRMA_MARK failed\n", __func__);
+                       exit(1);
+               }
+       }
+
        xb->offset += new_n->nlmsg_len;
-       xb->nlmsg_count ++;
+       xb->nlmsg_count++;
 
        return 0;
 }
 
-static int xfrm_state_list_or_flush(int argc, char **argv, int flush)
+static int xfrm_state_list_or_deleteall(int argc, char **argv, int deleteall)
 {
        char *idp = NULL;
        struct rtnl_handle rth;
 
-       filter.use = 1;
+       if (argc > 0)
+               filter.use = 1;
        filter.xsinfo.family = preferred_family;
 
        while (argc > 0) {
@@ -602,9 +1189,9 @@ static int xfrm_state_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,45 +1199,78 @@ static int xfrm_state_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_GETSA,
+                               .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_GETSA) < 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_state_keep, &xb, NULL, NULL) < 0) {
-                               fprintf(stderr, "Flush terminated\n");
+                       if (rtnl_dump_filter(&rth, xfrm_state_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\n");
                                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_GETSA) < 0) {
+               struct xfrm_address_filter addrfilter = {
+                       .saddr = filter.xsinfo.saddr,
+                       .daddr = filter.xsinfo.id.daddr,
+                       .family = filter.xsinfo.family,
+                       .splen = filter.id_src_mask,
+                       .dplen = filter.id_dst_mask,
+               };
+               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_GETSA,
+                       .n.nlmsg_seq = rth.dump = ++rth.seq,
+               };
+
+               if (filter.xsinfo.id.proto)
+                       addattr8(&req.n, sizeof(req), XFRMA_PROTO,
+                                filter.xsinfo.id.proto);
+               addattr_l(&req.n, sizeof(req), XFRMA_ADDRESS_FILTER,
+                         &addrfilter, sizeof(addrfilter));
+
+               if (rtnl_send(&rth, (void *)&req, req.n.nlmsg_len) < 0) {
                        perror("Cannot send dump request");
                        exit(1);
                }
 
-               if (rtnl_dump_filter(&rth, xfrm_state_print, stdout, NULL, NULL) < 0) {
+               if (rtnl_dump_filter(&rth, xfrm_state_print, stdout) < 0) {
                        fprintf(stderr, "Dump terminated\n");
                        exit(1);
                }
@@ -661,10 +1281,136 @@ static int xfrm_state_list_or_flush(int argc, char **argv, int flush)
        exit(0);
 }
 
+static int print_sadinfo(struct nlmsghdr *n, void *arg)
+{
+       FILE *fp = (FILE *)arg;
+       __u32 *f = NLMSG_DATA(n);
+       struct rtattr *tb[XFRMA_SAD_MAX+1];
+       struct rtattr *rta;
+       int len = n->nlmsg_len;
+
+       len -= NLMSG_LENGTH(sizeof(__u32));
+       if (len < 0) {
+               fprintf(stderr, "SADinfo: Wrong len %d\n", len);
+               return -1;
+       }
+
+       rta = XFRMSAPD_RTA(f);
+       parse_rtattr(tb, XFRMA_SAD_MAX, rta, len);
+
+       if (tb[XFRMA_SAD_CNT]) {
+               __u32 cnt;
+
+               fprintf(fp, "\t SAD");
+               cnt = rta_getattr_u32(tb[XFRMA_SAD_CNT]);
+               fprintf(fp, " count %u", cnt);
+       } else {
+               fprintf(fp, "BAD SAD info returned\n");
+               return -1;
+       }
+
+       if (show_stats) {
+               if (tb[XFRMA_SAD_HINFO]) {
+                       struct xfrmu_sadhinfo *si;
+
+                       if (RTA_PAYLOAD(tb[XFRMA_SAD_HINFO]) < sizeof(*si)) {
+                               fprintf(fp, "BAD SAD length returned\n");
+                               return -1;
+                       }
+
+                       si = RTA_DATA(tb[XFRMA_SAD_HINFO]);
+                       fprintf(fp, " (buckets ");
+                       fprintf(fp, "count %d", si->sadhcnt);
+                       fprintf(fp, " Max %d", si->sadhmcnt);
+                       fprintf(fp, ")");
+               }
+       }
+       fprintf(fp, "\n");
+
+       return 0;
+}
+
+static int xfrm_sad_getinfo(int argc, char **argv)
+{
+       struct rtnl_handle rth;
+       struct {
+               struct nlmsghdr                 n;
+               __u32                           flags;
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(req.flags)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .n.nlmsg_type = XFRM_MSG_GETSADINFO,
+               .flags = 0XFFFFFFFF,
+       };
+       struct nlmsghdr *answer;
+
+       if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
+               exit(1);
+
+       if (rtnl_talk(&rth, &req.n, &answer) < 0)
+               exit(2);
+
+       print_sadinfo(answer, (void *)stdout);
+
+       free(answer);
+       rtnl_close(&rth);
+
+       return 0;
+}
+
+static int xfrm_state_flush(int argc, char **argv)
+{
+       struct rtnl_handle rth;
+       struct {
+               struct nlmsghdr                 n;
+               struct xfrm_usersa_flush        xsf;
+       } req = {
+               .n.nlmsg_len = NLMSG_LENGTH(sizeof(req.xsf)),
+               .n.nlmsg_flags = NLM_F_REQUEST,
+               .n.nlmsg_type = XFRM_MSG_FLUSHSA,
+       };
+       char *protop = NULL;
+
+       while (argc > 0) {
+               if (strcmp(*argv, "proto") == 0) {
+                       int ret;
+
+                       if (protop)
+                               duparg("proto", *argv);
+                       protop = *argv;
+
+                       NEXT_ARG();
+
+                       ret = xfrm_xfrmproto_getbyname(*argv);
+                       if (ret < 0)
+                               invarg("XFRM-PROTO value is invalid", *argv);
+
+                       req.xsf.proto = (__u8)ret;
+               } else
+                       invarg("unknown", *argv);
+
+               argc--; argv++;
+       }
+
+       if (rtnl_open_byproto(&rth, 0, NETLINK_XFRM) < 0)
+               exit(1);
+
+       if (show_stats > 1)
+               fprintf(stderr, "Flush state with XFRM-PROTO value \"%s\"\n",
+                       strxf_xfrmproto(req.xsf.proto));
+
+       if (rtnl_talk(&rth, &req.n, NULL) < 0)
+               exit(2);
+
+       rtnl_close(&rth);
+
+       return 0;
+}
+
 int do_xfrm_state(int argc, char **argv)
 {
        if (argc < 1)
-               return xfrm_state_list_or_flush(0, NULL, 0);
+               return xfrm_state_list_or_deleteall(0, NULL, 0);
 
        if (matches(*argv, "add") == 0)
                return xfrm_state_modify(XFRM_MSG_NEWSA, 0,
@@ -672,15 +1418,22 @@ int do_xfrm_state(int argc, char **argv)
        if (matches(*argv, "update") == 0)
                return xfrm_state_modify(XFRM_MSG_UPDSA, 0,
                                         argc-1, argv+1);
-       if (matches(*argv, "delete") == 0 || matches(*argv, "del") == 0)
+       if (matches(*argv, "allocspi") == 0)
+               return xfrm_state_allocspi(argc-1, argv+1);
+       if (matches(*argv, "delete") == 0)
                return xfrm_state_get_or_delete(argc-1, argv+1, 1);
+       if (matches(*argv, "deleteall") == 0 || matches(*argv, "delall") == 0)
+               return xfrm_state_list_or_deleteall(argc-1, argv+1, 1);
        if (matches(*argv, "list") == 0 || matches(*argv, "show") == 0
            || matches(*argv, "lst") == 0)
-               return xfrm_state_list_or_flush(argc-1, argv+1, 0);
+               return xfrm_state_list_or_deleteall(argc-1, argv+1, 0);
        if (matches(*argv, "get") == 0)
                return xfrm_state_get_or_delete(argc-1, argv+1, 0);
        if (matches(*argv, "flush") == 0)
-               return xfrm_state_list_or_flush(argc-1, argv+1, 1);
+               return xfrm_state_flush(argc-1, argv+1);
+       if (matches(*argv, "count") == 0) {
+               return xfrm_sad_getinfo(argc, argv);
+       }
        if (matches(*argv, "help") == 0)
                usage();
        fprintf(stderr, "Command \"%s\" is unknown, try \"ip xfrm state help\".\n", *argv);