Message ID | 20210403172403.9452-1-selva.nair@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | [Openvpn-devel] tun.c on WIN32: remove more unused variables | expand |
Hi, On 03/04/2021 19:24, selva.nair@gmail.com wrote: > From: Selva Nair <selva.nair@gmail.com> > > Fixes: > tun.c: In function ‘do_ifconfig_ipv4’: > tun.c:1217:17: warning: variable ‘ifconfig_remote_netmask’ set but not > used [-Wunused-but-set-variable] > const char *ifconfig_remote_netmask = NULL; > > tun.c:1213:10: warning: unused variable ‘tun’ [-Wunused-variable] > bool tun = is_tun_p2p(tt); > > Signed-off-by: Selva Nair <selva.nair@gmail.com> > --- > src/openvpn/tun.c | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c > index 6b7c8ef1..8ff825f4 100644 > --- a/src/openvpn/tun.c > +++ b/src/openvpn/tun.c > @@ -1207,10 +1207,12 @@ static void > do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, > const struct env_set *es, openvpn_net_ctx_t *ctx) this function....it's an ifdef trap. > { > +#if !defined(_WIN32) && !defined(TARGET_ANDROID) > /* > * We only handle TUN/TAP devices here, not --dev null devices. > */ > bool tun = is_tun_p2p(tt); > +#endif > > #if !defined(TARGET_LINUX) > const char *ifconfig_local = NULL; > @@ -1534,7 +1536,7 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, > msg(M_INFO, > "******** NOTE: Please manually set the IP/netmask of '%s' to %s/%s (if it is not already set)", > ifname, ifconfig_local, > - print_in_addr_t(tt->adapter_netmask, 0, &gc)); > + ifconfig_remote_netmask); I think this should just go on the line above? It will still fit our 80 chars limit. > } > else if (tt->options.ip_win32_type == IPW32_SET_DHCP_MASQ || tt->options.ip_win32_type == IPW32_SET_ADAPTIVE) > { > Rest looks good. Compile tested on linux and windows, but couldn't test android. Still I visually verified that this variable is indeed not used in windows and android blocks only (used in all other cases). Acked-by: Antonio Quartulli <antonio@openvpn.net>
Test compiled on Ubuntu/MinGW ("just to be sure"). All good. Your patch has been applied to the master branch. commit 165cda3169a860186e0446927e80986c31a837ca Author: Selva Nair Date: Sat Apr 3 13:24:03 2021 -0400 tun.c on WIN32: remove more unused variables Signed-off-by: Selva Nair <selva.nair@gmail.com> Acked-by: Antonio Quartulli <antonio@openvpn.net> Message-Id: <20210403172403.9452-1-selva.nair@gmail.com> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22019.html Signed-off-by: Gert Doering <gert@greenie.muc.de> -- kind regards, Gert Doering
diff --git a/src/openvpn/tun.c b/src/openvpn/tun.c index 6b7c8ef1..8ff825f4 100644 --- a/src/openvpn/tun.c +++ b/src/openvpn/tun.c @@ -1207,10 +1207,12 @@ static void do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, const struct env_set *es, openvpn_net_ctx_t *ctx) { +#if !defined(_WIN32) && !defined(TARGET_ANDROID) /* * We only handle TUN/TAP devices here, not --dev null devices. */ bool tun = is_tun_p2p(tt); +#endif #if !defined(TARGET_LINUX) const char *ifconfig_local = NULL; @@ -1534,7 +1536,7 @@ do_ifconfig_ipv4(struct tuntap *tt, const char *ifname, int tun_mtu, msg(M_INFO, "******** NOTE: Please manually set the IP/netmask of '%s' to %s/%s (if it is not already set)", ifname, ifconfig_local, - print_in_addr_t(tt->adapter_netmask, 0, &gc)); + ifconfig_remote_netmask); } else if (tt->options.ip_win32_type == IPW32_SET_DHCP_MASQ || tt->options.ip_win32_type == IPW32_SET_ADAPTIVE) {