Cleanup2017: Remove function IPInSubnet
Message ID | 1498725151-12074-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 16F5562068 for <patchwork@ipfire.org>; Thu, 29 Jun 2017 10:32:39 +0200 (CEST) Received: from mail01.ipfire.org (localhost [IPv6:::1]) by mail01.ipfire.org (Postfix) with ESMTP id B9D3527E5; Thu, 29 Jun 2017 10:32:37 +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)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 06DD327E3; Thu, 29 Jun 2017 10:32:33 +0200 (CEST) From: Alexander Marx <alexander.marx@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH] Cleanup2017: Remove function IPInSubnet Date: Thu, 29 Jun 2017 10:32:31 +0200 Message-Id: <1498725151-12074-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.20 Precedence: list List-Id: IPFire development talk <development.lists.ipfire.org> List-Unsubscribe: <http://lists.ipfire.org/mailman/options/development>, <mailto:development-request@lists.ipfire.org?subject=unsubscribe> List-Archive: <http://lists.ipfire.org/pipermail/development/> List-Post: <mailto:development@lists.ipfire.org> List-Help: <mailto:development-request@lists.ipfire.org?subject=help> List-Subscribe: <http://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> |
Message
Alexander Marx
June 29, 2017, 6:32 p.m. UTC
In order to cleanup code, the old function IpInSubnet is deleted from general-functions.
In the future only network functions from network-functions.pl should be used.
So this commit deletes the IpInSubnet and replaces it with the ip_address_in_network from the new network-functions.pl
Signed-off-by: Alexander Marx <alexander.marx@ipfire.org>
---
config/cfgroot/general-functions.pl | 32 ++++++++++++--------------------
config/firewall/convert-dmz | 8 ++++----
config/firewall/convert-outgoingfw | 6 +++---
config/firewall/firewall-lib.pl | 6 +++---
html/cgi-bin/dhcp.cgi | 22 ++++++----------------
html/cgi-bin/firewall.cgi | 29 ++++++++++++++---------------
html/cgi-bin/fwhosts.cgi | 17 ++++++++---------
html/cgi-bin/ovpnmain.cgi | 33 ++++++++++++++-------------------
html/cgi-bin/wireless.cgi | 4 +---
9 files changed, 65 insertions(+), 92 deletions(-)