picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #625 from ssahani/tun2

Browse source 
sd-netlink: add tunnel parameters
This commit is contained in:
Tom Gundersen 2015-07-20 22:30:18 +02:00
parent 3083663e5d 56bf3853b4
commit e89f2a98e6
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configure.ac
View file

@ -299,7 +299,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
IFLA_BOND_AD_INFO,
IFLA_VLAN_PROTOCOL,
IFLA_VXLAN_REMCSUM_NOPARTIAL,
IFLA_IPTUN_6RD_RELAY_PREFIXLEN,
IFLA_IPTUN_ENCAP_DPORT,
IFLA_BRIDGE_VLAN_INFO,
IFLA_BRPORT_UNICAST_FLOOD,
NDA_IFINDEX,

9
src/basic/missing.h
View file

@ -772,7 +772,7 @@ static inline int setns(int fd, int nstype) {
#define IFLA_VXLAN_MAX (__IFLA_VXLAN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_IPTUN_6RD_RELAY_PREFIXLEN
#if !HAVE_DECL_IFLA_IPTUN_ENCAP_DPORT
#define IFLA_IPTUN_UNSPEC 0
#define IFLA_IPTUN_LINK 1
#define IFLA_IPTUN_LOCAL 2
@ -788,7 +788,12 @@ static inline int setns(int fd, int nstype) {
#define IFLA_IPTUN_6RD_RELAY_PREFIX 12
#define IFLA_IPTUN_6RD_PREFIXLEN 13
#define IFLA_IPTUN_6RD_RELAY_PREFIXLEN 14
#define __IFLA_IPTUN_MAX 15
#define IFLA_IPTUN_ENCAP_TYPE 15
#define IFLA_IPTUN_ENCAP_FLAGS 16
#define IFLA_IPTUN_ENCAP_SPORT 17
#define IFLA_IPTUN_ENCAP_DPORT 18
#define __IFLA_IPTUN_MAX 19
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
#endif

4
src/libsystemd/sd-netlink/netlink-types.c
View file

@ -196,6 +196,10 @@ static const NLType rtnl_link_info_data_iptun_types[IFLA_IPTUN_MAX + 1] = {
[IFLA_IPTUN_6RD_RELAY_PREFIX] = { .type = NETLINK_TYPE_U32 },
[IFLA_IPTUN_6RD_PREFIXLEN] = { .type = NETLINK_TYPE_U16 },
[IFLA_IPTUN_6RD_RELAY_PREFIXLEN] = { .type = NETLINK_TYPE_U16 },
[IFLA_IPTUN_ENCAP_TYPE] = { .type = NETLINK_TYPE_U16},
[IFLA_IPTUN_ENCAP_FLAGS] = { .type = NETLINK_TYPE_U16},
[IFLA_IPTUN_ENCAP_SPORT] = { .type = NETLINK_TYPE_U16},
[IFLA_IPTUN_ENCAP_DPORT] = { .type = NETLINK_TYPE_U16},
};
static const NLType rtnl_link_info_data_ipgre_types[IFLA_GRE_MAX + 1] = {