Hi,
On 03/04/2021 19:24, selva.n...@gmail.com wrote:
> From: Selva Nair <selva.n...@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.n...@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 <anto...@openvpn.net>
--
Antonio Quartulli
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
