| Message ID | 1508924548-9876-1-git-send-email-alexander.marx@ipfire.org |
|---|---|
| State | Dropped |
| Headers |
Return-Path: <development-bounces@lists.ipfire.org> Received: from mail01.ipfire.org (unknown [172.28.1.200]) by web02.ipfire.org (Postfix) with ESMTP id 0F37F60360 for <patchwork@ipfire.org>; Wed, 25 Oct 2017 11:42:35 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id 3777B13AA; Wed, 25 Oct 2017 11:42:33 +0200 (CEST) Received: from EDV1.kappeln2011.lan (business-90-187-3-157.pool2.vodafone-ip.de [90.187.3.157]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 9154F13AA; Wed, 25 Oct 2017 11:42:31 +0200 (CEST) From: Alexander Marx <alexander.marx@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] BUG11466: Fix broken function check_net_internal_exact. Fixes #11466 Date: Wed, 25 Oct 2017 11:42:28 +0200 Message-Id: <1508924548-9876-1-git-send-email-alexander.marx@ipfire.org> X-Mailer: git-send-email 2.7.4 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <https://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <https://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <https://lists.ipfire.org/mailman/listinfo/development>, <mailto:development-request@lists.ipfire.org?subject=subscribe> Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org> |
| Series |
BUG11466: Fix broken function check_net_internal_exact. Fixes #11466
|
|
Commit Message
Alexander Marx
Oct. 25, 2017, 8:42 p.m. UTC
The check_net_internal_exact function needs subnetmask in cidr notation to work. Routing.cgi was also updated to use this function. --- config/cfgroot/general-functions.pl | 8 ++++---- html/cgi-bin/routing.cgi | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-)
Comments
Alexander, Will this also fix the behavior seen in bug 11235? https://bugzilla.ipfire.org/show_bug.cgi?id=11235 Tom > On Oct 25, 2017, at 5:42 AM, Alexander Marx <alexander.marx@ipfire.org> wrote: > > The check_net_internal_exact function needs subnetmask in cidr notation to work. > Routing.cgi was also updated to use this function. > --- > config/cfgroot/general-functions.pl | 8 ++++---- > html/cgi-bin/routing.cgi | 2 +- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl > index 0577afe..024285e 100644 > --- a/config/cfgroot/general-functions.pl > +++ b/config/cfgroot/general-functions.pl > @@ -579,10 +579,10 @@ sub check_net_internal_exact{ > $cidr=&iporsubtocidr($cidr); > #check if we use one of ipfire's networks (green,orange,blue) > &readhash("${General::swroot}/ethernet/settings", \%ownnet); > - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} > - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} > - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} > - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} > + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsubtocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} > + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/".&iporsubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} > + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtocidr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} > + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/".&iporsubtocidr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} > } > > sub validport > diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi > index 15989bd..f2014e2 100644 > --- a/html/cgi-bin/routing.cgi > +++ b/html/cgi-bin/routing.cgi > @@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { > last; > } > #Is the network part of an internal network? > - $errormessage .= &General::check_net_internal($settings{'IP'}); > + $errormessage .= &General::check_net_internal_exact($settings{'IP'}); > last; > } > > -- > 2.7.4 > <html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div></div><div>Alexander,</div><div><br></div><div>Will this also fix the behavior seen in bug 11235?</div><div><br></div><div><a href="https://bugzilla.ipfire.org/show_bug.cgi?id=11235">https://bugzilla.ipfire.org/show_bug.cgi?id=11235</a></div><div><br></div><div>Tom</div><div><br>On Oct 25, 2017, at 5:42 AM, Alexander Marx <<a href="mailto:alexander.marx@ipfire.org">alexander.marx@ipfire.org</a>> wrote:<br><br></div><blockquote type="cite"><div><span>The check_net_internal_exact function needs subnetmask in cidr notation to work.</span><br><span>Routing.cgi was also updated to use this function.</span><br><span>---</span><br><span> config/cfgroot/general-functions.pl | 8 ++++----</span><br><span> html/cgi-bin/routing.cgi | 2 +-</span><br><span> 2 files changed, 5 insertions(+), 5 deletions(-)</span><br><span></span><br><span>diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl</span><br><span>index 0577afe..024285e 100644</span><br><span>--- a/config/cfgroot/general-functions.pl</span><br><span>+++ b/config/cfgroot/general-functions.pl</span><br><span>@@ -579,10 +579,10 @@ sub check_net_internal_exact{</span><br><span> $cidr=&iporsubtocidr($cidr);</span><br><span> #check if we use one of ipfire's networks (green,orange,blue)</span><br><span> &readhash("${General::swroot}/ethernet/settings", \%ownnet);</span><br><span>- if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}</span><br><span>- if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}</span><br><span>- if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}</span><br><span>- if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}</span><br><span>+ if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsubtocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}</span><br><span>+ if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/".&iporsubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}</span><br><span>+ if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtocidr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}</span><br><span>+ if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/".&iporsubtocidr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}</span><br><span> }</span><br><span></span><br><span> sub validport</span><br><span>diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi</span><br><span>index 15989bd..f2014e2 100644</span><br><span>--- a/html/cgi-bin/routing.cgi</span><br><span>+++ b/html/cgi-bin/routing.cgi</span><br><span>@@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {</span><br><span> last;</span><br><span> }</span><br><span> #Is the network part of an internal network?</span><br><span>- $errormessage .= &General::check_net_internal($settings{'IP'});</span><br><span>+ $errormessage .= &General::check_net_internal_exact($settings{'IP'});</span><br><span> last;</span><br><span> }</span><br><span></span><br><span>-- </span><br><span>2.7.4</span><br><span></span><br></div></blockquote></body></html>
Never mind, I sent before reading the notes. Sorry about that. Tom > On Oct 25, 2017, at 6:50 AM, Tom Rymes <trymes@rymes.com> wrote: > > Alexander, > > Will this also fix the behavior seen in bug 11235? > > https://bugzilla.ipfire.org/show_bug.cgi?id=11235 > > Tom > >> On Oct 25, 2017, at 5:42 AM, Alexander Marx <alexander.marx@ipfire.org> wrote: >> >> The check_net_internal_exact function needs subnetmask in cidr notation to work. >> Routing.cgi was also updated to use this function. >> --- >> config/cfgroot/general-functions.pl | 8 ++++---- >> html/cgi-bin/routing.cgi | 2 +- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl >> index 0577afe..024285e 100644 >> --- a/config/cfgroot/general-functions.pl >> +++ b/config/cfgroot/general-functions.pl >> @@ -579,10 +579,10 @@ sub check_net_internal_exact{ >> $cidr=&iporsubtocidr($cidr); >> #check if we use one of ipfire's networks (green,orange,blue) >> &readhash("${General::swroot}/ethernet/settings", \%ownnet); >> - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} >> - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} >> - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} >> - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} >> + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsubtocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} >> + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/".&iporsubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} >> + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtocidr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} >> + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/".&iporsubtocidr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} >> } >> >> sub validport >> diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi >> index 15989bd..f2014e2 100644 >> --- a/html/cgi-bin/routing.cgi >> +++ b/html/cgi-bin/routing.cgi >> @@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { >> last; >> } >> #Is the network part of an internal network? >> - $errormessage .= &General::check_net_internal($settings{'IP'}); >> + $errormessage .= &General::check_net_internal_exact($settings{'IP'}); >> last; >> } >> >> -- >> 2.7.4 >> <html><head><meta http-equiv="content-type" content="text/html; charset=utf-8"></head><body dir="auto"><div></div><div>Never mind, I sent before reading the notes. Sorry about that.</div><div><br></div><div>Tom</div><div><br>On Oct 25, 2017, at 6:50 AM, Tom Rymes <<a href="mailto:trymes@rymes.com">trymes@rymes.com</a>> wrote:<br><br></div><blockquote type="cite"><div><meta http-equiv="content-type" content="text/html; charset=utf-8"><div></div><div>Alexander,</div><div><br></div><div>Will this also fix the behavior seen in bug 11235?</div><div><br></div><div><a href="https://bugzilla.ipfire.org/show_bug.cgi?id=11235">https://bugzilla.ipfire.org/show_bug.cgi?id=11235</a></div><div><br></div><div>Tom</div><div><br>On Oct 25, 2017, at 5:42 AM, Alexander Marx <<a href="mailto:alexander.marx@ipfire.org">alexander.marx@ipfire.org</a>> wrote:<br><br></div><blockquote type="cite"><div><span>The check_net_internal_exact function needs subnetmask in cidr notation to work.</span><br><span>Routing.cgi was also updated to use this function.</span><br><span>---</span><br><span> config/cfgroot/general-functions.pl | 8 ++++----</span><br><span> html/cgi-bin/routing.cgi | 2 +-</span><br><span> 2 files changed, 5 insertions(+), 5 deletions(-)</span><br><span></span><br><span>diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl</span><br><span>index 0577afe..024285e 100644</span><br><span>--- a/config/cfgroot/general-functions.pl</span><br><span>+++ b/config/cfgroot/general-functions.pl</span><br><span>@@ -579,10 +579,10 @@ sub check_net_internal_exact{</span><br><span> $cidr=&iporsubtocidr($cidr);</span><br><span> #check if we use one of ipfire's networks (green,orange,blue)</span><br><span> &readhash("${General::swroot}/ethernet/settings", \%ownnet);</span><br><span>- if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}</span><br><span>- if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}</span><br><span>- if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}</span><br><span>- if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}</span><br><span>+ if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsubtocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;}</span><br><span>+ if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/".&iporsubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;}</span><br><span>+ if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtocidr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;}</span><br><span>+ if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/".&iporsubtocidr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;}</span><br><span> }</span><br><span></span><br><span> sub validport</span><br><span>diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi</span><br><span>index 15989bd..f2014e2 100644</span><br><span>--- a/html/cgi-bin/routing.cgi</span><br><span>+++ b/html/cgi-bin/routing.cgi</span><br><span>@@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) {</span><br><span> last;</span><br><span> }</span><br><span> #Is the network part of an internal network?</span><br><span>- $errormessage .= &General::check_net_internal($settings{'IP'});</span><br><span>+ $errormessage .= &General::check_net_internal_exact($settings{'IP'});</span><br><span> last;</span><br><span> }</span><br><span></span><br><span>-- </span><br><span>2.7.4</span><br><span></span><br></div></blockquote></div></blockquote></body></html>
diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl index 0577afe..024285e 100644 --- a/config/cfgroot/general-functions.pl +++ b/config/cfgroot/general-functions.pl @@ -579,10 +579,10 @@ sub check_net_internal_exact{ $cidr=&iporsubtocidr($cidr); #check if we use one of ipfire's networks (green,orange,blue) &readhash("${General::swroot}/ethernet/settings", \%ownnet); - if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/$ownnet{'GREEN_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} - if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/$ownnet{'ORANGE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} - if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/$ownnet{'BLUE_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} - if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/$ownnet{'RED_NETMASK'}", $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} + if (($ownnet{'GREEN_NETADDRESS'} ne '' && $ownnet{'GREEN_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'GREEN_NETADDRESS'}/".&iporsubtocidr($ownnet{'GREEN_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err green'};return $errormessage;} + if (($ownnet{'ORANGE_NETADDRESS'} ne '' && $ownnet{'ORANGE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'ORANGE_NETADDRESS'}/".&iporsubtocidr($ownnet{'ORANGE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err orange'};return $errormessage;} + if (($ownnet{'BLUE_NETADDRESS'} ne '' && $ownnet{'BLUE_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'BLUE_NETADDRESS'}/".&iporsubtocidr($ownnet{'BLUE_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err blue'};return $errormessage;} + if (($ownnet{'RED_NETADDRESS'} ne '' && $ownnet{'RED_NETADDRESS'} ne '0.0.0.0') && &Network::network_equal("$ownnet{'RED_NETADDRESS'}/".&iporsubtocidr($ownnet{'RED_NETMASK'}), $network)){ $errormessage=$Lang::tr{'ccd err red'};return $errormessage;} } sub validport diff --git a/html/cgi-bin/routing.cgi b/html/cgi-bin/routing.cgi index 15989bd..f2014e2 100644 --- a/html/cgi-bin/routing.cgi +++ b/html/cgi-bin/routing.cgi @@ -154,7 +154,7 @@ if ($settings{'ACTION'} eq $Lang::tr{'add'}) { last; } #Is the network part of an internal network? - $errormessage .= &General::check_net_internal($settings{'IP'}); + $errormessage .= &General::check_net_internal_exact($settings{'IP'}); last; }