diff options
author | 2016-02-20 18:03:31 +0530 | |
---|---|---|
committer | 2016-03-05 10:58:54 -0500 | |
commit | 4a2b1605f2550ebb1ddcbbd694139e03306ed1ca (patch) | |
tree | eade45cf0e9963fa82bc06340c6f36103ce5f84e | |
parent | udev/path_id: correct segmentation fault due to missing NULL check (diff) | |
download | systemd-4a2b1605f2550ebb1ddcbbd694139e03306ed1ca.tar.gz systemd-4a2b1605f2550ebb1ddcbbd694139e03306ed1ca.tar.bz2 systemd-4a2b1605f2550ebb1ddcbbd694139e03306ed1ca.zip |
networkd: tunnel fix tunnel address
this fixes 2655
-rw-r--r-- | src/network/networkd-netdev-tunnel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/networkd-netdev-tunnel.c b/src/network/networkd-netdev-tunnel.c index 46ff2974f..7aaa041ba 100644 --- a/src/network/networkd-netdev-tunnel.c +++ b/src/network/networkd-netdev-tunnel.c @@ -54,7 +54,7 @@ static int netdev_ipip_fill_message_create(NetDev *netdev, Link *link, sd_netlin assert(link); assert(m); assert(t); - assert(t->family == AF_INET || t->family != -1); + assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex); if (r < 0) @@ -87,7 +87,7 @@ static int netdev_sit_fill_message_create(NetDev *netdev, Link *link, sd_netlink assert(link); assert(m); assert(t); - assert(t->family == AF_INET || t->family != -1); + assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); r = sd_netlink_message_append_u32(m, IFLA_IPTUN_LINK, link->ifindex); if (r < 0) @@ -124,7 +124,7 @@ static int netdev_gre_fill_message_create(NetDev *netdev, Link *link, sd_netlink t = GRETAP(netdev); assert(t); - assert(t->family == AF_INET || t->family != -1); + assert(IN_SET(t->family, AF_INET, AF_UNSPEC)); assert(link); assert(m); @@ -497,7 +497,7 @@ static void ipip_init(NetDev *n) { assert(t); t->pmtudisc = true; - t->family = -1; + t->family = AF_UNSPEC; } static void sit_init(NetDev *n) { @@ -507,7 +507,7 @@ static void sit_init(NetDev *n) { assert(t); t->pmtudisc = true; - t->family = -1; + t->family = AF_UNSPEC; } static void vti_init(NetDev *n) { @@ -538,7 +538,7 @@ static void gre_init(NetDev *n) { assert(t); t->pmtudisc = true; - t->family = -1; + t->family = AF_UNSPEC; } static void ip6gre_init(NetDev *n) { |