subject:"\[systemd\-devel\] \[PATCH 2\/3\] networkd\: introduce vti6 tunnel"

Re: [systemd-devel] [PATCH 2/3] networkd: introduce vti6 tunnel

2015-04-29 Thread Tom Gundersen

Applied. Thanks!

Tom

On Wed, Apr 22, 2015 at 10:44 AM, Susant Sahani  wrote:
> This patch add support to create vti6 tunnel
>
> test:
>
> vt6.network
> [Match]
> Name=wlan0
>
> [Network]
> Tunnel=ip6vti
>
> vti6.netdev
> [NetDev]
> Name=ip6vti
> Kind=vti6
>
> [Tunnel]
> Local=2a00:ffde:4567:edde::4987
> Remote=2001:473:fece:cafe::5179
>
> ip link
>
> 11: ip6_vti0@NONE:  mtu 1500 qdisc noop state DOWN mode DEFAULT
> group default
> link/tunnel6 :: brd ::
> 12: ip6vti@wlan0:  mtu 1500 qdisc noop state DOWN
> mode DEFAULT group default
> link/tunnel6 2a00:ffde:4567:edde::4987 peer 2001:473:fece:cafe::5179
> ---
>  src/libsystemd/sd-rtnl/rtnl-types.c  |  3 +++
>  src/libsystemd/sd-rtnl/rtnl-types.h  |  1 +
>  src/network/networkd-netdev-tunnel.c | 43 
> 
>  src/network/networkd-netdev-tunnel.h |  1 +
>  src/network/networkd-netdev.c|  2 ++
>  src/network/networkd-netdev.h|  2 ++
>  src/network/networkd-network.c   |  1 +
>  7 files changed, 53 insertions(+)
>
> diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c 
> b/src/libsystemd/sd-rtnl/rtnl-types.c
> index a5c9fdf..d211684 100644
> --- a/src/libsystemd/sd-rtnl/rtnl-types.c
> +++ b/src/libsystemd/sd-rtnl/rtnl-types.c
> @@ -204,6 +204,7 @@ static const char* const 
> nl_union_link_info_data_table[_NL_UNION_LINK_INFO_DATA_
>  [NL_UNION_LINK_INFO_DATA_IP6GRETAP_TUNNEL] = "ip6gretap",
>  [NL_UNION_LINK_INFO_DATA_SIT_TUNNEL] = "sit",
>  [NL_UNION_LINK_INFO_DATA_VTI_TUNNEL] = "vti",
> +[NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL] = "vti6",
>  [NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL] = "ip6tnl",
>  };
>
> @@ -238,6 +239,8 @@ static const NLTypeSystem 
> rtnl_link_info_data_type_systems[_NL_UNION_LINK_INFO_D
>.types = 
> rtnl_link_info_data_iptun_types },
>  [NL_UNION_LINK_INFO_DATA_VTI_TUNNEL] =  { .max = 
> ELEMENTSOF(rtnl_link_info_data_ipvti_types) - 1,
>.types = 
> rtnl_link_info_data_ipvti_types },
> +[NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL] =  { .max = 
> ELEMENTSOF(rtnl_link_info_data_ipvti_types) - 1,
> +  .types = 
> rtnl_link_info_data_ipvti_types },
>  [NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL] =  { .max = 
> ELEMENTSOF(rtnl_link_info_data_ip6tnl_types) - 1,
>   .types = 
> rtnl_link_info_data_ip6tnl_types },
>
> diff --git a/src/libsystemd/sd-rtnl/rtnl-types.h 
> b/src/libsystemd/sd-rtnl/rtnl-types.h
> index 72773ea..de1544b 100644
> --- a/src/libsystemd/sd-rtnl/rtnl-types.h
> +++ b/src/libsystemd/sd-rtnl/rtnl-types.h
> @@ -87,6 +87,7 @@ typedef enum NLUnionLinkInfoData {
>  NL_UNION_LINK_INFO_DATA_IP6GRETAP_TUNNEL,
>  NL_UNION_LINK_INFO_DATA_SIT_TUNNEL,
>  NL_UNION_LINK_INFO_DATA_VTI_TUNNEL,
> +NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL,
>  NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL,
>  _NL_UNION_LINK_INFO_DATA_MAX,
>  _NL_UNION_LINK_INFO_DATA_INVALID = -1
> diff --git a/src/network/networkd-netdev-tunnel.c 
> b/src/network/networkd-netdev-tunnel.c
> index 7aa9317..aef2ef4 100644
> --- a/src/network/networkd-netdev-tunnel.c
> +++ b/src/network/networkd-netdev-tunnel.c
> @@ -212,6 +212,31 @@ static int netdev_vti_fill_message_create(NetDev 
> *netdev, Link *link, sd_rtnl_me
>  return r;
>  }
>
> +static int netdev_vti6_fill_message_create(NetDev *netdev, Link *link, 
> sd_rtnl_message *m) {
> +Tunnel *t = VTI6(netdev);
> +int r;
> +
> +assert(netdev);
> +assert(link);
> +assert(m);
> +assert(t);
> +assert(t->family == AF_INET6);
> +
> +r = sd_rtnl_message_append_u32(m, IFLA_VTI_LINK, link->ifindex);
> +if (r < 0)
> +return log_netdev_error_errno(netdev, r, "Could not append 
> IFLA_IPTUN_LINK attribute: %m");
> +
> +r = sd_rtnl_message_append_in6_addr(m, IFLA_VTI_LOCAL, 
> &t->local.in6);
> +if (r < 0)
> +return log_netdev_error_errno(netdev, r, "Could not append 
> IFLA_IPTUN_LOCAL attribute: %m");
> +
> +r = sd_rtnl_message_append_in6_addr(m, IFLA_VTI_REMOTE, 
> &t->remote.in6);
> +if (r < 0)
> +return log_netdev_error_errno(netdev, r, "Could not append 
> IFLA_IPTUN_REMOTE attribute: %m");
> +
> +return r;
> +}
> +
>  static int netdev_ip6tnl_fill_message_create(NetDev *netdev, Link *link, 
> sd_rtnl_message *m) {
>  Tunnel *t = IP6TNL(netdev);
>  uint8_t proto;
> @@ -287,6 +312,9 @@ static int netdev_tunnel_verify(NetDev *netdev, const 
> char *filename) {
>  case NETDEV_KIND_VTI:
>  t = VTI(netdev);
>  break;
> +case NETDEV_KIND_VTI6:
> +t = VTI6(netdev);
> +break;
>  case NETDEV_KIND_IP6TNL:
>  t = IP6TNL(netd

[systemd-devel] [PATCH 2/3] networkd: introduce vti6 tunnel

2015-04-22 Thread Susant Sahani

This patch add support to create vti6 tunnel

test:

vt6.network
[Match]
Name=wlan0

[Network]
Tunnel=ip6vti

vti6.netdev
[NetDev]
Name=ip6vti
Kind=vti6

[Tunnel]
Local=2a00:ffde:4567:edde::4987
Remote=2001:473:fece:cafe::5179

ip link

11: ip6_vti0@NONE:  mtu 1500 qdisc noop state DOWN mode DEFAULT
group default
link/tunnel6 :: brd ::
12: ip6vti@wlan0:  mtu 1500 qdisc noop state DOWN
mode DEFAULT group default
link/tunnel6 2a00:ffde:4567:edde::4987 peer 2001:473:fece:cafe::5179
---
 src/libsystemd/sd-rtnl/rtnl-types.c  |  3 +++
 src/libsystemd/sd-rtnl/rtnl-types.h  |  1 +
 src/network/networkd-netdev-tunnel.c | 43 
 src/network/networkd-netdev-tunnel.h |  1 +
 src/network/networkd-netdev.c|  2 ++
 src/network/networkd-netdev.h|  2 ++
 src/network/networkd-network.c   |  1 +
 7 files changed, 53 insertions(+)

diff --git a/src/libsystemd/sd-rtnl/rtnl-types.c 
b/src/libsystemd/sd-rtnl/rtnl-types.c
index a5c9fdf..d211684 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.c
+++ b/src/libsystemd/sd-rtnl/rtnl-types.c
@@ -204,6 +204,7 @@ static const char* const 
nl_union_link_info_data_table[_NL_UNION_LINK_INFO_DATA_
 [NL_UNION_LINK_INFO_DATA_IP6GRETAP_TUNNEL] = "ip6gretap",
 [NL_UNION_LINK_INFO_DATA_SIT_TUNNEL] = "sit",
 [NL_UNION_LINK_INFO_DATA_VTI_TUNNEL] = "vti",
+[NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL] = "vti6",
 [NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL] = "ip6tnl",
 };
 
@@ -238,6 +239,8 @@ static const NLTypeSystem 
rtnl_link_info_data_type_systems[_NL_UNION_LINK_INFO_D
   .types = 
rtnl_link_info_data_iptun_types },
 [NL_UNION_LINK_INFO_DATA_VTI_TUNNEL] =  { .max = 
ELEMENTSOF(rtnl_link_info_data_ipvti_types) - 1,
   .types = 
rtnl_link_info_data_ipvti_types },
+[NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL] =  { .max = 
ELEMENTSOF(rtnl_link_info_data_ipvti_types) - 1,
+  .types = 
rtnl_link_info_data_ipvti_types },
 [NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL] =  { .max = 
ELEMENTSOF(rtnl_link_info_data_ip6tnl_types) - 1,
  .types = 
rtnl_link_info_data_ip6tnl_types },
 
diff --git a/src/libsystemd/sd-rtnl/rtnl-types.h 
b/src/libsystemd/sd-rtnl/rtnl-types.h
index 72773ea..de1544b 100644
--- a/src/libsystemd/sd-rtnl/rtnl-types.h
+++ b/src/libsystemd/sd-rtnl/rtnl-types.h
@@ -87,6 +87,7 @@ typedef enum NLUnionLinkInfoData {
 NL_UNION_LINK_INFO_DATA_IP6GRETAP_TUNNEL,
 NL_UNION_LINK_INFO_DATA_SIT_TUNNEL,
 NL_UNION_LINK_INFO_DATA_VTI_TUNNEL,
+NL_UNION_LINK_INFO_DATA_VTI6_TUNNEL,
 NL_UNION_LINK_INFO_DATA_IP6TNL_TUNNEL,
 _NL_UNION_LINK_INFO_DATA_MAX,
 _NL_UNION_LINK_INFO_DATA_INVALID = -1
diff --git a/src/network/networkd-netdev-tunnel.c 
b/src/network/networkd-netdev-tunnel.c
index 7aa9317..aef2ef4 100644
--- a/src/network/networkd-netdev-tunnel.c
+++ b/src/network/networkd-netdev-tunnel.c
@@ -212,6 +212,31 @@ static int netdev_vti_fill_message_create(NetDev *netdev, 
Link *link, sd_rtnl_me
 return r;
 }
 
+static int netdev_vti6_fill_message_create(NetDev *netdev, Link *link, 
sd_rtnl_message *m) {
+Tunnel *t = VTI6(netdev);
+int r;
+
+assert(netdev);
+assert(link);
+assert(m);
+assert(t);
+assert(t->family == AF_INET6);
+
+r = sd_rtnl_message_append_u32(m, IFLA_VTI_LINK, link->ifindex);
+if (r < 0)
+return log_netdev_error_errno(netdev, r, "Could not append 
IFLA_IPTUN_LINK attribute: %m");
+
+r = sd_rtnl_message_append_in6_addr(m, IFLA_VTI_LOCAL, &t->local.in6);
+if (r < 0)
+return log_netdev_error_errno(netdev, r, "Could not append 
IFLA_IPTUN_LOCAL attribute: %m");
+
+r = sd_rtnl_message_append_in6_addr(m, IFLA_VTI_REMOTE, 
&t->remote.in6);
+if (r < 0)
+return log_netdev_error_errno(netdev, r, "Could not append 
IFLA_IPTUN_REMOTE attribute: %m");
+
+return r;
+}
+
 static int netdev_ip6tnl_fill_message_create(NetDev *netdev, Link *link, 
sd_rtnl_message *m) {
 Tunnel *t = IP6TNL(netdev);
 uint8_t proto;
@@ -287,6 +312,9 @@ static int netdev_tunnel_verify(NetDev *netdev, const char 
*filename) {
 case NETDEV_KIND_VTI:
 t = VTI(netdev);
 break;
+case NETDEV_KIND_VTI6:
+t = VTI6(netdev);
+break;
 case NETDEV_KIND_IP6TNL:
 t = IP6TNL(netdev);
 break;
@@ -374,6 +402,12 @@ static void vti_init(NetDev *n) {
 Tunnel *t = VTI(n);
 
 assert(n);
+
+if (n->kind == NETDEV_KIND_VTI)
+t =  VTI(n);
+else
+t = VTI6(n);
+
 assert(t);
 
 t->pmtudisc = true;
@@ -447,6 +481,15 @@ const NetDevVTabl

Re: [systemd-devel] [PATCH 2/3] networkd: introduce vti6 tunnel

[systemd-devel] [PATCH 2/3] networkd: introduce vti6 tunnel

2 matches

Site Navigation

Mail list logo

Footer information