diff options
author | Susant Sahani <susant@redhat.com> | 2014-05-15 09:46:40 +0530 |
---|---|---|
committer | Tom Gundersen <teg@jklm.no> | 2014-05-19 22:50:23 +0200 |
commit | abf446af60bf1508c8093c5a0a6e4bf10365afb4 (patch) | |
tree | 2ffd14735fa0b8c315d18436883e9c4243357a8d | |
parent | 473dfd7bd5a74b4724818ab8a764c072335fd510 (diff) |
networkd: introduce sit tunnel
This patch introduces sit tunnel support to networkd
Example conf:
file: sit.netdev
[NetDev]
Name=sit-tun
Kind=sit
MTUBytes=1480
[Tunnel]
Local=10.65.223.238
Remote=10.65.223.239
file: sit.network
[Match]
Name=em1
[Network]
Tunnel=sit-tun
[tomegun: rebased]
-rw-r--r-- | src/network/networkd-tunnel.c | 103 |
1 files changed, 102 insertions, 1 deletions
diff --git a/src/network/networkd-tunnel.c b/src/network/networkd-tunnel.c index 5ea28781b3..fee474cf4d 100644 --- a/src/network/networkd-tunnel.c +++ b/src/network/networkd-tunnel.c @@ -129,6 +129,103 @@ static int netdev_fill_ipip_rtnl_message(Link *link, sd_rtnl_message *m) { return r; } +static int netdev_fill_sit_rtnl_message(Link *link, sd_rtnl_message *m) { + NetDev *netdev; + int r; + + assert(link); + assert(link->network); + assert(link->network->tunnel); + assert(m); + + netdev = link->network->tunnel; + + r = sd_rtnl_message_append_string(m, IFLA_IFNAME, netdev->ifname); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_IFNAME, attribute: %s", + strerror(-r)); + return r; + } + + if(netdev->mtu) { + r = sd_rtnl_message_append_u32(m, IFLA_MTU, netdev->mtu); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_MTU attribute: %s", + strerror(-r)); + return r; + } + } + + r = sd_rtnl_message_open_container(m, IFLA_LINKINFO); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_open_container_union(m, IFLA_INFO_DATA, + netdev_kind_to_string(netdev->kind)); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_INFO_DATA attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_IPTUN_LINK attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_LOCAL, &netdev->tunnel_local); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_IPTUN_LOCAL attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_append_in_addr(m, IFLA_IPTUN_REMOTE, &netdev->tunnel_remote); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_IPTUN_REMOTE attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_append_u8(m, IFLA_IPTUN_TOS, netdev->tunnel_tos); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_IPTUN_TOS attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_INFO_DATA attribute: %s", + strerror(-r)); + return r; + } + + r = sd_rtnl_message_close_container(m); + if (r < 0) { + log_error_netdev(netdev, + "Could not append IFLA_LINKINFO attribute: %s", + strerror(-r)); + return r; + } + + return r; +} + int netdev_create_tunnel(Link *link, sd_rtnl_message_handler_t callback) { _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; NetDev *netdev; @@ -178,8 +275,12 @@ int netdev_create_tunnel(Link *link, sd_rtnl_message_handler_t callback) { if(r < 0) return r; break; - case NETDEV_KIND_GRE: case NETDEV_KIND_SIT: + r = netdev_fill_sit_rtnl_message(link, m); + if(r < 0) + return r; + break; + case NETDEV_KIND_GRE: default: return -ENOTSUP; } |