iplink_bareudp: use common include syntax

[mirror_iproute2.git] / ip / xfrm_state.c

diff --git a/ip/xfrm_state.c b/ip/xfrm_state.c
index b03ccc5807e900d82ced4d92d00661e845fc6cf9..f4bf3356bb01f67dc0f92f46a6db83c99116bab6 100644 (file)
--- a/ip/xfrm_state.c
+++ b/ip/xfrm_state.c
@@ -106,31 +106,13 @@ static void usage(void)
                "EXTRA-FLAG-LIST := [ EXTRA-FLAG-LIST ] EXTRA-FLAG\n"
                "EXTRA-FLAG := dont-encap-dscp\n"
                "SELECTOR := [ src ADDR[/PLEN] ] [ dst ADDR[/PLEN] ] [ dev DEV ] [ UPSPEC ]\n"
-               "UPSPEC := proto { { ");
-       fprintf(stderr,
-               "%s | %s | %s | %s",
-               strxf_proto(IPPROTO_TCP),
-               strxf_proto(IPPROTO_UDP),
-               strxf_proto(IPPROTO_SCTP),
-               strxf_proto(IPPROTO_DCCP));
-       fprintf(stderr,
-               " } [ sport PORT ] [ dport PORT ] |\n"
-               "                  { ");
-       fprintf(stderr,
-               "%s | %s | %s",
-               strxf_proto(IPPROTO_ICMP),
-               strxf_proto(IPPROTO_ICMPV6),
-               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"
+               "UPSPEC := proto { { tcp | udp | sctp | dccp } [ sport PORT ] [ dport PORT ] |\n"
+               "                  { icmp | ipv6-icmp | mobility-header } [ type NUMBER ] [ code NUMBER ] |\n"
+               "                  gre [ key { DOTTED-QUAD | NUMBER } ] | PROTO }\n"
                "LIMIT-LIST := [ LIMIT-LIST ] limit LIMIT\n"
                "LIMIT := { time-soft | time-hard | time-use-soft | time-use-hard } SECONDS |\n"
                "         { byte-soft | byte-hard } SIZE | { packet-soft | packet-hard } COUNT\n"
-               "ENCAP := { espinudp | espinudp-nonike } SPORT DPORT OADDR\n"
+               "ENCAP := { espinudp | espinudp-nonike | espintcp } SPORT DPORT OADDR\n"
                "DIR := in | out\n");
 
        exit(-1);
@@ -1149,6 +1131,10 @@ static int xfrm_state_keep(struct nlmsghdr *n, void *arg)
        if (!xfrm_state_filter_match(xsinfo))
                return 0;
 
+       if (xsinfo->id.proto == IPPROTO_IPIP ||
+           xsinfo->id.proto == IPPROTO_IPV6)
+               return 0;
+
        if (xb->offset > xb->size) {
                fprintf(stderr, "State buffer overflow\n");
                return -1;