From ee002053da7c09b973d5e3e7c0b9a2dc0b322c8e Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 17 Feb 2021 19:46:37 +0100 Subject: [PATCH] VPN / IPsec: calculatation error in https://github.com/opnsense/core/commit/8b62109a612a256c522344e0c978acdb6fefab2c , start at 31,127 to make sure both points can actually reach eachother. for https://github.com/opnsense/core/issues/4700 --- src/etc/inc/plugins.inc.d/ipsec.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/etc/inc/plugins.inc.d/ipsec.inc b/src/etc/inc/plugins.inc.d/ipsec.inc index 1c63d9822..4223a1eb7 100644 --- a/src/etc/inc/plugins.inc.d/ipsec.inc +++ b/src/etc/inc/plugins.inc.d/ipsec.inc @@ -1848,9 +1848,9 @@ function ipsec_get_configured_vtis() $parts = explode(':', Net_IPv6::Uncompress($phase2[$fieldname], true)); $tunnel_int64[$fieldname] = hexdec(implode("", array_slice($parts, -4))); } - $mask = 128 - decbin(abs($tunnel_int64['tunnel_remote'] - $tunnel_int64['tunnel_local'])); + $mask = 127 - decbin(abs($tunnel_int64['tunnel_remote'] - $tunnel_int64['tunnel_local'])); } else { - $mask = 32 - abs(ip2long($phase2['tunnel_remote']) - ip2long($phase2['tunnel_local'])); + $mask = 31 - abs(ip2long($phase2['tunnel_remote']) - ip2long($phase2['tunnel_local'])); } $configured_intf[$intfnm]['networks'][] = [