From: Bernhard Held <berny156@gmx.de>
To: development@lists.ipfire.org
Subject: [PATCH 2/2] proxy.cgi: fix subnet comparison
Date: Sun, 11 Feb 2018 19:51:22 +0100 [thread overview]
Message-ID: <20180211185122.9243-3-berny156@gmx.de> (raw)
In-Reply-To: <20180211185122.9243-1-berny156@gmx.de>
[-- Attachment #1: Type: text/plain, Size: 1062 bytes --]
The logic of subnet comparison is broken. E.g. if the blue netmask is
255.255.255.0, it's impossible to add a VPN subnet with the same netmask.
The proposed patch compares the subnets individually.
---
html/cgi-bin/proxy.cgi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/html/cgi-bin/proxy.cgi b/html/cgi-bin/proxy.cgi
index ea3b41126..4993dde86 100644
--- a/html/cgi-bin/proxy.cgi
+++ b/html/cgi-bin/proxy.cgi
@@ -3066,8 +3066,8 @@ END
@temp = split(/\//);
chomp $temp[1];
if (
- ($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) && ($temp[1] ne $netsettings{'GREEN_NETMASK'}) &&
- ($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) && ($temp[1] ne $netsettings{'BLUE_NETMASK'})
+ (($temp[0] ne $netsettings{'GREEN_NETADDRESS'}) || ($temp[1] ne $netsettings{'GREEN_NETMASK'})) &&
+ (($temp[0] ne $netsettings{'BLUE_NETADDRESS'}) || ($temp[1] ne $netsettings{'BLUE_NETMASK'}))
)
{
print FILE " ||\n (isInNet(myIpAddress(), \"$temp[0]\", \"$temp[1]\"))";
--
2.16.1
next prev parent reply other threads:[~2018-02-11 18:51 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-11 18:51 [PATCH 0/2] proxy.cgi fixes for bugzilla #10852 Bernhard Held
2018-02-11 18:51 ` [PATCH 1/2] proxy.cgi: strip newline from subnet parameter Bernhard Held
2018-02-11 19:49 ` Michael Tremer
2018-02-11 18:51 ` Bernhard Held [this message]
2018-02-11 19:51 ` [PATCH 2/2] proxy.cgi: fix subnet comparison Michael Tremer
2018-02-11 20:47 ` Tom Rymes
2018-02-11 19:49 ` [PATCH 0/2] proxy.cgi fixes for bugzilla #10852 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180211185122.9243-3-berny156@gmx.de \
--to=berny156@gmx.de \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox