|
 |
2b68233 |
From f432f7f9037833d77e6e0d16c275b950e1cd8e03 Mon Sep 17 00:00:00 2001
|
|
|
2b68233 |
From: Susant Sahani <ssahani@gmail.com>
|
|
|
2b68233 |
Date: Sat, 20 Feb 2016 18:03:31 +0530
|
|
|
2b68233 |
Subject: [PATCH] networkd: tunnel fix tunnel address
|
|
|
2b68233 |
|
|
|
2b68233 |
this fixes 2655
|
|
|
2b68233 |
|
|
|
2b68233 |
(cherry picked from commit 07dcb085893a2fe212b7e158028725876d2ab98f)
|
|
|
2b68233 |
---
|
|
|
2b68233 |
src/network/networkd-netdev-tunnel.c | 12 ++++++------
|
|
|
2b68233 |
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
2b68233 |
|
|
|
2b68233 |
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c
|
|
|
2b68233 |
index 46ff2974f4..7aaa041ba3 100644
|
|
|
2b68233 |
--- a/src/network/networkd-netdev-tunnel.c
|
|
|
2b68233 |
+++ b/src/network/networkd-netdev-tunnel.c
|
|
|
2b68233 |
@@ -54,7 +54,7 @@ static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_netlin
|
|
|
2b68233 |
assert(link);
|
|
|
2b68233 |
assert(m);
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
- assert(t->family == AF_INET || t->family != -1);
|
|
|
2b68233 |
+ assert(IN_SET(t->family, AF_INET, AF_UNSPEC));
|
|
|
2b68233 |
|
|
|
2b68233 |
r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
|
|
|
2b68233 |
if (r < 0)
|
|
|
2b68233 |
@@ -87,7 +87,7 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_netlink
|
|
|
2b68233 |
assert(link);
|
|
|
2b68233 |
assert(m);
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
- assert(t->family == AF_INET || t->family != -1);
|
|
|
2b68233 |
+ assert(IN_SET(t->family, AF_INET, AF_UNSPEC));
|
|
|
2b68233 |
|
|
|
2b68233 |
r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex);
|
|
|
2b68233 |
if (r < 0)
|
|
|
2b68233 |
@@ -124,7 +124,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink
|
|
|
2b68233 |
t = GRETAP(netdev);
|
|
|
2b68233 |
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
- assert(t->family == AF_INET || t->family != -1);
|
|
|
2b68233 |
+ assert(IN_SET(t->family, AF_INET, AF_UNSPEC));
|
|
|
2b68233 |
assert(link);
|
|
|
2b68233 |
assert(m);
|
|
|
2b68233 |
|
|
|
2b68233 |
@@ -497,7 +497,7 @@ static void ipip_init(NetDev *n) {
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
|
|
|
2b68233 |
t->pmtudisc = true;
|
|
|
2b68233 |
- t->family = -1;
|
|
|
2b68233 |
+ t->family = AF_UNSPEC;
|
|
|
2b68233 |
}
|
|
|
2b68233 |
|
|
|
2b68233 |
static void sit_init(NetDev *n) {
|
|
|
2b68233 |
@@ -507,7 +507,7 @@ static void sit_init(NetDev *n) {
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
|
|
|
2b68233 |
t->pmtudisc = true;
|
|
|
2b68233 |
- t->family = -1;
|
|
|
2b68233 |
+ t->family = AF_UNSPEC;
|
|
|
2b68233 |
}
|
|
|
2b68233 |
|
|
|
2b68233 |
static void vti_init(NetDev *n) {
|
|
|
2b68233 |
@@ -538,7 +538,7 @@ static void gre_init(NetDev *n) {
|
|
|
2b68233 |
assert(t);
|
|
|
2b68233 |
|
|
|
2b68233 |
t->pmtudisc = true;
|
|
|
2b68233 |
- t->family = -1;
|
|
|
2b68233 |
+ t->family = AF_UNSPEC;
|
|
|
2b68233 |
}
|
|
|
2b68233 |
|
|
|
2b68233 |
static void ip6gre_init(NetDev *n) {
|