From db0366c9e4e85ebd60e4f0991834a3d788ce65ce Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Wed, 25 Apr 2018 17:52:21 +0200 Subject: ggsn: Don't explicitly use tun_setaddr() API anymore tun_addaddr() internally contains a fallback to tun_setaddr() for the first address, so we can unify the API usage a bit and use tun_addaddr() from all call sites Change-Id: I34de003a1a040254bd38b29e48caea34cb0c88d2 --- ggsn/ggsn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ggsn/ggsn.c b/ggsn/ggsn.c index bbdb5c8..85a2211 100644 --- a/ggsn/ggsn.c +++ b/ggsn/ggsn.c @@ -220,7 +220,7 @@ int apn_start(struct apn_ctx *apn) if (apn->v4.cfg.ifconfig_prefix.addr.len) { LOGPAPN(LOGL_INFO, apn, "Setting tun IP address %s\n", in46p_ntoa(&apn->v4.cfg.ifconfig_prefix)); - if (tun_setaddr(apn->tun.tun, &apn->v4.cfg.ifconfig_prefix.addr, NULL, + if (tun_addaddr(apn->tun.tun, &apn->v4.cfg.ifconfig_prefix.addr, NULL, apn->v4.cfg.ifconfig_prefix.prefixlen)) { LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv4 address %s: %s\n", in46p_ntoa(&apn->v4.cfg.ifconfig_prefix), strerror(errno)); @@ -232,7 +232,7 @@ int apn_start(struct apn_ctx *apn) if (apn->v6.cfg.ifconfig_prefix.addr.len) { LOGPAPN(LOGL_INFO, apn, "Setting tun IPv6 address %s\n", in46p_ntoa(&apn->v6.cfg.ifconfig_prefix)); - if (tun_setaddr(apn->tun.tun, &apn->v6.cfg.ifconfig_prefix.addr, NULL, + if (tun_addaddr(apn->tun.tun, &apn->v6.cfg.ifconfig_prefix.addr, NULL, apn->v6.cfg.ifconfig_prefix.prefixlen)) { LOGPAPN(LOGL_ERROR, apn, "Failed to set tun IPv6 address %s: %s. " "Ensure you have ipv6 support and not used the disable_ipv6 sysctl?\n", -- cgit v1.2.3