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

Merge pull request #654 from ssahani/nl

Browse source 
network: Add tunnel params
This commit is contained in:
Lennart Poettering 2015-07-22 19:06:36 +02:00
parent bd37a92297 8aee0f1ff3
commit d21f001496
3 changed files with 42 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -300,6 +300,7 @@ AC_CHECK_DECLS([IFLA_INET6_ADDR_GEN_MODE,
IFLA_VLAN_PROTOCOL,
IFLA_VXLAN_REMCSUM_NOPARTIAL,
IFLA_IPTUN_ENCAP_DPORT,
IFLA_GRE_ENCAP_DPORT,
IFLA_BRIDGE_VLAN_INFO,
IFLA_BRPORT_UNICAST_FLOOD,
NDA_IFINDEX,

25
src/basic/missing.h
View file

@ -798,6 +798,31 @@ static inline int setns(int fd, int nstype) {
#define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_GRE_ENCAP_DPORT
#define IFLA_GRE_UNSPEC 0
#define IFLA_GRE_LINK 1
#define IFLA_GRE_IFLAGS 2
#define IFLA_GRE_OFLAGS 3
#define IFLA_GRE_IKEY 4
#define IFLA_GRE_OKEY 5
#define IFLA_GRE_LOCAL 6
#define IFLA_GRE_REMOTE 7
#define IFLA_GRE_TTL 8
#define IFLA_GRE_TOS 9
#define IFLA_GRE_PMTUDISC 10
#define IFLA_GRE_ENCAP_LIMIT 11
#define IFLA_GRE_FLOWINFO 12
#define IFLA_GRE_FLAGS 13
#define IFLA_GRE_ENCAP_TYPE 14
#define IFLA_GRE_ENCAP_FLAGS 15
#define IFLA_GRE_ENCAP_SPORT 16
#define IFLA_GRE_ENCAP_DPORT 17
#define __IFLA_GRE_MAX 18
#define IFLA_GRE_MAX (__IFLA_GRE_MAX - 1)
#endif
#if !HAVE_DECL_IFLA_BRIDGE_VLAN_INFO
#define IFLA_BRIDGE_FLAGS 0
#define IFLA_BRIDGE_MODE 1

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

@ -203,16 +203,22 @@ static const NLType rtnl_link_info_data_iptun_types[IFLA_IPTUN_MAX + 1] = {
};
static const NLType rtnl_link_info_data_ipgre_types[IFLA_GRE_MAX + 1] = {
[IFLA_GRE_LINK] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_IFLAGS] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_OFLAGS] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_IKEY] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_OKEY] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_LOCAL] = { .type = NETLINK_TYPE_IN_ADDR },
[IFLA_GRE_REMOTE] = { .type = NETLINK_TYPE_IN_ADDR },
[IFLA_GRE_TTL] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_TOS] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_PMTUDISC] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_LINK] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_IFLAGS] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_OFLAGS] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_IKEY] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_OKEY] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_LOCAL] = { .type = NETLINK_TYPE_IN_ADDR },
[IFLA_GRE_REMOTE] = { .type = NETLINK_TYPE_IN_ADDR },
[IFLA_GRE_TTL] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_TOS] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_PMTUDISC] = { .type = NETLINK_TYPE_U8 },
[IFLA_GRE_FLOWINFO] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_FLAGS] = { .type = NETLINK_TYPE_U32 },
[IFLA_GRE_ENCAP_TYPE] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_ENCAP_FLAGS] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_ENCAP_SPORT] = { .type = NETLINK_TYPE_U16 },
[IFLA_GRE_ENCAP_DPORT] = { .type = NETLINK_TYPE_U16 },
};
static const NLType rtnl_link_info_data_ipvti_types[IFLA_VTI_MAX + 1] = {