From b9ff398884aa4576f2d9f75f2e2b54cd9688d122 Mon Sep 17 00:00:00 2001 From: Antonio Quartulli Date: Sat, 18 Apr 2020 03:31:23 +0200 Subject: [PATCH] sitnl: fix TUN/TAP confusion in error messages The is_tun_p2p() function can return false for both TAP or TUN interfaces (under certain conditions), therefore we should not assume any TUN/TAP type when printing related messages. Remove reference to TUN/TAP when printing messages under conditions based on is_tun_p2p(). Signed-off-by: Antonio Quartulli Acked-by: Gert Doering Message-Id: <20200418013123.22551-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19775.html Signed-off-by: Gert Doering --- src/openvpn/tun.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 79d92ea6c..8e692977e 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1093,7 +1093,7 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, if (net_addr_ptp_v4_add(ctx, ifname, &tt->local, &tt->remote_netmask) < 0) { - msg(M_FATAL, "Linux can't add IP to TUN interface %s", ifname); + msg(M_FATAL, "Linux can't add IP to interface %s", ifname); } } else @@ -1101,7 +1101,7 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, if (net_addr_v4_add(ctx, ifname, &tt->local, netmask_to_netbits2(tt->remote_netmask)) < 0) { - msg(M_FATAL, "Linux can't add IP to TAP interface %s", ifname); + msg(M_FATAL, "Linux can't add IP to interface %s", ifname); } } #elif defined(TARGET_ANDROID) @@ -1970,7 +1970,7 @@ undo_ifconfig_ipv4(struct tuntap *tt, openvpn_net_ctx_t *ctx) if (net_addr_ptp_v4_del(ctx, tt->actual_name, &tt->local, &tt->remote_netmask) < 0) { - msg(M_WARN, "Linux can't del IP from TUN iface %s", + msg(M_WARN, "Linux can't del IP from iface %s", tt->actual_name); } } @@ -1978,7 +1978,7 @@ undo_ifconfig_ipv4(struct tuntap *tt, openvpn_net_ctx_t *ctx) { if (net_addr_v4_del(ctx, tt->actual_name, &tt->local, netbits) < 0) { - msg(M_WARN, "Linux can't del IP from TAP iface %s", + msg(M_WARN, "Linux can't del IP from iface %s", tt->actual_name); } } -- 2.47.2