korg/iproute2
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/iproute2/iproute2.git synced 2024-11-15 22:15:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

iptunnel: add support for mpls/ip to sit tunnels

Browse Source 
Original-Author: Simon Horman <simon.horman@netronome.com>
Signed-off-by: Krister Johansen <kjlx@templeofstupid.com>
This commit is contained in:
Krister Johansen 2017-06-09 18:31:31 -07:00 committed by Stephen Hemminger
parent 7baca946c4
commit f005b700cf
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/utils.h
View File

@ -74,6 +74,9 @@ struct ipx_addr {
#ifndef AF_MPLS
# define AF_MPLS 28
#endif
#ifndef IPPROTO_MPLS
#define IPPROTO_MPLS 137
#endif
__u32 get_addr32(const char *name);
int get_addr_1(inet_prefix *dst, const char *arg, int family);

9
ip/link_iptnl.c
View File

@ -16,6 +16,7 @@
#include <sys/socket.h>
#include <arpa/inet.h>
#include <linux/in.h>
#include <linux/ip.h>
#include <linux/if_tunnel.h>
#include "rt_names.h"
@ -47,9 +48,8 @@ static void print_usage(FILE *f, int sit)
type
);
if (sit) {
fprintf(f,
" [ mode { ip6ip | ipip | any } ]\n"
" [ isatap ]\n");
fprintf(f, " [ mode { ip6ip | ipip | mplsip | any } ]\n");
fprintf(f, " [ isatap ]\n");
}
fprintf(f, " [ external ]\n");
fprintf(f, " [ fwmark MARK ]\n");
@ -243,6 +243,9 @@ get_failed:
strcmp(*argv, "ipip") == 0 ||
strcmp(*argv, "ip4ip4") == 0)
proto = IPPROTO_IPIP;
else if (strcmp(*argv, "mpls/ipv4") == 0 ||
strcmp(*argv, "mplsip") == 0)
proto = IPPROTO_MPLS;
else if (strcmp(*argv, "any/ipv4") == 0 ||
strcmp(*argv, "any") == 0)
proto = 0;

3
ip/tunnel.c
View File

@ -54,6 +54,9 @@ const char *tnl_strproto(__u8 proto)
case IPPROTO_ESP:
strcpy(buf, "esp");
break;
case IPPROTO_MPLS:
strcpy(buf, "mpls");
break;
case 0:
strcpy(buf, "any");
break;

9
man/man8/ip-link.8.in
View File

@ -662,7 +662,7 @@ the following additional arguments are supported:
] [
.I " [no]encap-remcsum "
] [
.I " mode " { ip6ip | ipip | any } "
.I " mode " { ip6ip | ipip | mplsip | any } "
]
.in +8
@ -700,10 +700,11 @@ encapsulation.
applicable for Generic UDP Encapsulation.
.sp
.BI mode " { ip6ip | ipip | any } "
.BI mode " { ip6ip | ipip | mplsip | any } "
- specifies mode in which device should run. "ip6ip" indicates
IPv6-Over-IPv4, "ipip" indicates "IPv4-Over-IPv4", "any" indicates either
IPv6 or IPv4 Over IPv4. Only supported for SIT where the default is "ip6ip".
IPv6-Over-IPv4, "ipip" indicates "IPv4-Over-IPv4", "mplsip" indicates
MPLS-Over-IPv4, "any" indicates IPv6, IPv4 or MPLS Over IPv4. Only
supported for SIT where the default is "ip6ip".
.in -8