From: Daniel Lenski <dlenski@gmail.com>
Date: Tue, 30 Mar 2021 22:58:50 +0000 (-0700)
Subject: vpnc-script-win: simplify 'internal gateway' calculation
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=dfbf4ad50561a482b027f6bb201c078563d5cdbc;p=users%2Fdwmw2%2Fvpnc-scripts.git

vpnc-script-win: simplify 'internal gateway' calculation

OpenConnect already provides INTERNAL_IP4_NETADDR, so let's use it.

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
---

diff --git a/vpnc-script-win.js b/vpnc-script-win.js
index ab81145..f7e818f 100644
--- a/vpnc-script-win.js
+++ b/vpnc-script-win.js
@@ -57,15 +57,9 @@ case "pre-init":
     break;
 case "connect":
     var gw = getDefaultGateway();
-    var address_array = env("INTERNAL_IP4_ADDRESS").split(".");
-    var netmask_array = env("INTERNAL_IP4_NETMASK").split(".");
     // Calculate the first usable address in subnet
-    var internal_gw_array = new Array(
-        address_array[0] & netmask_array[0],
-        address_array[1] & netmask_array[1],
-        address_array[2] & netmask_array[2],
-        (address_array[3] & netmask_array[3]) + 1
-    );
+    var internal_gw_array = env("INTERNAL_IP4_NETADDR").split(".");
+    internal_gw_array[3]++;
     var internal_gw = internal_gw_array.join(".");
 
     echo("VPN Gateway: " + env("VPNGATEWAY"));