uapi: updates to lwtunnel and rpl iptunnel
Subsystems (2)
PATCH 1/2 uapi: updates to lwtunnel and rpl iptunnel
Update uapi headers.
Signed-off-by Alexander Aring <[email protected]>
--- include/uapi/linux/rpl.h | 48 +++++++++++++++++++++++++++++++ include/uapi/linux/rpl_iptunnel.h | 21 ++++++++++++++ 2 files changed, 69 insertions(+) create mode 100644 include/uapi/linux/rpl.h create mode 100644 include/uapi/linux/rpl_iptunnel.h
include/uapi/linux/rpl.h new file +48 -0
@@ -0,0 +1,48 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* IPv6 RPL-SR implementation +* +* Author: +* (C) 2020 Alexander Aring <[email protected]> +*/ + +#ifndef _LINUX_RPL_H +#define _LINUX_RPL_H + +#include <asm/byteorder.h> +#include <linux/types.h> +#include <linux/in6.h> + +/* +* RPL SR Header +*/ +struct ipv6_rpl_sr_hdr { +__u8 nexthdr; +__u8 hdrlen; +__u8 type; +__u8 segments_left; +#if defined(__LITTLE_ENDIAN_BITFIELD) +__u32 cmpre:4 , + cmpri:4 , + reserved:4 , + pad:4 , + reserved1:16 ; +#elif defined(__BIG_ENDIAN_BITFIELD) +__u32 reserved:20 , + pad:4 , + cmpri:4 , + cmpre:4 ; +#else +#error "Please fix <asm/byteorder.h>" +#endif + +union { +struct in6_addr addr[0 ]; +__u8 data[0 ]; + } segments; +} __attribute__((packed)); + +#define rpl_segaddr segments.addr +#define rpl_segdata segments.data + +#endif
include/uapi/linux/rpl_iptunnel.h new file +21 -0
@@ -0,0 +1,21 @@ +/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ +/* +* IPv6 RPL-SR implementation +* +* Author: +* (C) 2020 Alexander Aring <[email protected]> +*/ + +#ifndef _LINUX_RPL_IPTUNNEL_H +#define _LINUX_RPL_IPTUNNEL_H + +enum { +RPL_IPTUNNEL_UNSPEC , +RPL_IPTUNNEL_SRH , + __RPL_IPTUNNEL_MAX, +}; +#define RPL_IPTUNNEL_MAX (__RPL_IPTUNNEL_MAX - 1) + +#define RPL_IPTUNNEL_SRH_SIZE (srh) (((srh)->hdrlen + 1) << 3) + +#endif
Signature · 1 line
2.20.1
PATCH 2/2 lwtunnel: add support for rpl segment routing
This patch adds support for rpl segment routing settings. Example:
ip -n ns0 -6 route add 2001::3 encap rpl segs \
fe80::c8fe:beef:cafe:cafe,fe80::c8fe:beef:cafe:beef dev lowpan0
Signed-off-by Alexander Aring <[email protected]>
--- ip/iproute.c | 2 +- ip/iproute_lwtunnel.c | 111 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 1 deletion(-)
ip/iproute.c +1 -1
@@ -101,7 +101,7 @@ static void usage(void)"TIME := NUMBER[s|ms]\n" "BOOL := [1|0]\n" "FEATURES := ecn\n" -"ENCAPTYPE := [ mpls | ip | ip6 | seg6 | seg6local ]\n" +"ENCAPTYPE := [ mpls | ip | ip6 | seg6 | seg6local | rpl ]\n" "ENCAPHDR := [ MPLSLABEL | SEG6HDR ]\n" "SEG6HDR := [ mode SEGMODE ] segs ADDR1,ADDRi,ADDRn [hmac HMACKEYID] [cleanup]\n" "SEGMODE := [ encap | inline ]\n"
ip/iproute_lwtunnel.c +111 -0
153 lines not on this page · raw message
Signature · 1 line
2.20.1
Re: [PATCH iproute2-next 2/2] lwtunnel: add support for rpl segment routing
ip/iproute_lwtunnel.c static void print_encap_seg6(FILE *fp, struct rtattr *encap) · line 178
Quoted 12 lines · Alexander Aring
ip/iproute_lwtunnel.c +8
-0@@ -162,6 +168,32 @@ static void print_encap_seg6(FILE *fp, struct rtattr *encap)print_srh (fp, tuninfo->srh); } +static void print_rpl_srh (FILE *fp,struct ipv6_rpl_sr_hdr *srh) +{ +int i; + +for (i = srh->segments_left -1 ; i >=0 ; i--) { +print_color_string (PRINT_ANY ,COLOR_INET6 , +NULL ,"%s " , +rt_addr_n2a (AF_INET6 ,16 , &srh->rpl_segaddr[i]));
you aren't printing anything for the json case?