From: Alexander Marx <alexander.marx@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] Cleanup2017: make network_equal more robust
Date: Mon, 26 Jun 2017 12:52:01 +0200 [thread overview]
Message-ID: <1498474321-14745-1-git-send-email-alexander.marx@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 1050 bytes --]
Michael fixed this in a telephone session
---
config/cfgroot/network-functions.pl | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-functions.pl
index 66f1ed5..41632c3 100644
--- a/config/cfgroot/network-functions.pl
+++ b/config/cfgroot/network-functions.pl
@@ -108,14 +108,22 @@ sub network_equal {
my $network1 = shift;
my $network2 = shift;
- my $bin1 = &network2bin($network1);
- my $bin2 = &network2bin($network2);
+ my @bin1 = &network2bin($network1);
+ if (scalar @bin1 ne 2) {
+ return undef;
+ }
- if ($bin1 eq $bin2) {
- return 1;
+ my @bin2 = &network2bin($network2);
+ if (scalar @bin2 ne 2) {
+ return undef;
}
- return 0;
+ my $address1 = $bin1[0];
+ my $netmask1 = $bin1[1];
+ my $address2 = $bin2[0];
+ my $netmask2 = $bin2[1];
+
+ return (($address1 eq $address2) && ($netmask1 eq $netmask2));
}
# Takes a network in either a.b.c.d/a.b.c.d or a.b.c.d/e notation
--
2.7.4
reply other threads:[~2017-06-26 10:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=1498474321-14745-1-git-send-email-alexander.marx@ipfire.org \
--to=alexander.marx@ipfire.org \
--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