]> www.infradead.org Git - users/dwmw2/vpnc-scripts.git/commitdiff
vpnc-script-win: simplify 'internal gateway' calculation
authorDaniel Lenski <dlenski@gmail.com>
Tue, 30 Mar 2021 22:58:50 +0000 (15:58 -0700)
committerDaniel Lenski <dlenski@gmail.com>
Thu, 1 Apr 2021 01:11:39 +0000 (01:11 +0000)
OpenConnect already provides INTERNAL_IP4_NETADDR, so let's use it.

Signed-off-by: Daniel Lenski <dlenski@gmail.com>
vpnc-script-win.js

index ab8114595cba531b69ec4317632ffd188c440c6d..f7e818fa257a44ba6d71926c101ac4398233abd0 100644 (file)
@@ -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"));