Jan Engelhardt
c5c46b1d7e
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=95
52 lines
2.2 KiB
Diff
52 lines
2.2 KiB
Diff
From: Jan Engelhardt <jengelh@inai.de>
|
|
Date: 2015-01-21 22:57:10.562539816 +0100
|
|
|
|
xfrm: support displaying transformations used for Mobile IPv6
|
|
|
|
Patch taken from mip6d-ng c397c3b4a16bb2e31a86f6c5e344a1278d1577c5
|
|
and included in openSUSE so as to facilitate mip6d-ng.
|
|
|
|
---
|
|
ip/ipxfrm.c | 2 +-
|
|
ip/xfrm_policy.c | 1 +
|
|
ip/xfrm_state.c | 1 +
|
|
3 files changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
Index: iproute2-3.18.0/ip/ipxfrm.c
|
|
===================================================================
|
|
--- iproute2-3.18.0.orig/ip/ipxfrm.c
|
|
+++ iproute2-3.18.0/ip/ipxfrm.c
|
|
@@ -115,7 +115,7 @@ struct typeent {
|
|
static const struct typeent xfrmproto_types[]= {
|
|
{ "esp", IPPROTO_ESP }, { "ah", IPPROTO_AH }, { "comp", IPPROTO_COMP },
|
|
{ "route2", IPPROTO_ROUTING }, { "hao", IPPROTO_DSTOPTS },
|
|
- { "ipsec-any", IPSEC_PROTO_ANY },
|
|
+ { "ipsec-any", IPSEC_PROTO_ANY }, { "ipv6", IPPROTO_IPV6 },
|
|
{ NULL, -1 }
|
|
};
|
|
|
|
Index: iproute2-3.18.0/ip/xfrm_policy.c
|
|
===================================================================
|
|
--- iproute2-3.18.0.orig/ip/xfrm_policy.c
|
|
+++ iproute2-3.18.0/ip/xfrm_policy.c
|
|
@@ -93,6 +93,7 @@ static void usage(void)
|
|
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_IPV6));
|
|
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");
|
|
Index: iproute2-3.18.0/ip/xfrm_state.c
|
|
===================================================================
|
|
--- iproute2-3.18.0.orig/ip/xfrm_state.c
|
|
+++ iproute2-3.18.0/ip/xfrm_state.c
|
|
@@ -73,6 +73,7 @@ static void usage(void)
|
|
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_IPV6));
|
|
fprintf(stderr, "%s | ", strxf_xfrmproto(IPPROTO_ROUTING));
|
|
fprintf(stderr, "%s\n", strxf_xfrmproto(IPPROTO_DSTOPTS));
|
|
fprintf(stderr, "ALGO-LIST := [ ALGO-LIST ] ALGO\n");
|