From: Gert Doering <gert@greenie.muc.de>
Date: Fri, 25 Sep 2015 06:36:10 +0000 (+0200)
Subject: Repair test_local_addr() on WIN32
X-Git-Tag: v2.4_alpha1~241
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c40f088e52132273f6d4e83d05fa64bbaedd860f;p=thirdparty%2Fopenvpn.git

Repair test_local_addr() on WIN32

Intermediate result was stored in a "bool" variable, but the actual
range of results is 0/1/2 - so "2" (TLA_LOCAL) never worked.  Change
to "int".

Diagnosed by "dferbas" in trac #609 (thanks).

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: Steffan Karger <steffan.karger@fox-it.com>
Message-Id: <1443162970-38210-1-git-send-email-gert@greenie.muc.de>
URL: http://article.gmane.org/gmane.network.openvpn.devel/10168
---

diff --git a/src/openvpn/route.c b/src/openvpn/route.c
index c011f993e..1b3539645 100644
--- a/src/openvpn/route.c
+++ b/src/openvpn/route.c
@@ -3547,7 +3547,7 @@ test_local_addr (const in_addr_t addr, const struct route_gateway_info *rgi)
 {
   struct gc_arena gc = gc_new ();
   const in_addr_t nonlocal_netmask = 0x80000000L; /* routes with netmask <= to this are considered non-local */
-  bool ret = TLA_NONLOCAL;
+  int ret = TLA_NONLOCAL;
 
   /* get full routing table */
   const MIB_IPFORWARDTABLE *rt = get_windows_routing_table (&gc);