From mboxrd@z Thu Jan 1 00:00:00 1970 From: Leo-Andres Hofmann To: development@lists.ipfire.org Subject: [PATCH 2/2] network-functions.pl: Improve zone configuration functions Date: Sun, 17 Jan 2021 15:20:04 +0100 Message-ID: <20210117142004.984-2-hofmann@leo-andres.de> In-Reply-To: <20210117142004.984-1-hofmann@leo-andres.de> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8643254081067607511==" List-Id: --===============8643254081067607511== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Cache ethernet configuration in public variable "ethernet_settings", add functions to simplify working with the network configuration. Signed-off-by: Leo-Andres Hofmann --- config/cfgroot/network-functions.pl | 40 +++++++++++++++++++++++++---- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/config/cfgroot/network-functions.pl b/config/cfgroot/network-fun= ctions.pl index 622731f96..7bd6466e0 100644 --- a/config/cfgroot/network-functions.pl +++ b/config/cfgroot/network-functions.pl @@ -27,6 +27,14 @@ require "/var/ipfire/general-functions.pl"; =20 use Socket; =20 +# System ethernet configuration +our %ethernet_settings =3D (); +&General::readhash("${General::swroot}/ethernet/settings", \%ethernet_settin= gs); + +# List of all possible network zones that can be configured +our @known_network_zones =3D ("red", "green", "orange", "blue"); + +# IPv4 netmask CIDR to dotted decimal notation conversion table my %PREFIX2NETMASK =3D ( 32 =3D> "255.255.255.255", 31 =3D> "255.255.255.254", @@ -448,12 +456,8 @@ sub get_mac_by_name($) { ## Function to get a list of all available network zones. # sub get_available_network_zones () { - # Get netsettings. - my %netsettings =3D (); - &General::readhash("${General::swroot}/ethernet/settings", \%netsettings); - # Obtain the configuration type from the netsettings hash. - my $config_type =3D $netsettings{'CONFIG_TYPE'}; + my $config_type =3D $ethernet_settings{'CONFIG_TYPE'}; =20 # Hash which contains the conversation from the config mode # to the existing network interface names. They are stored like @@ -480,6 +484,32 @@ sub get_available_network_zones () { return @network_zones; } =20 +# +## Function to check if a network zone is available in the current configura= tion +# +sub is_zone_available() { + my $zone =3D lc shift; +=09 + # Make sure the zone is valid + die("Unknown network zone '$zone'") unless ($zone ~~ @known_network_zones); +=09 + # Get available zones and return result + my @available_zones =3D get_available_network_zones(); + return ($zone ~~ @available_zones); +} + +# +## Function to determine if the RED zone is in standard IP (or modem, PPP, V= DSL, ...) mode +# +sub is_red_mode_ip() { + # Obtain the settings from the netsettings hash + my $config_type =3D $ethernet_settings{'CONFIG_TYPE'}; + my $red_type =3D $ethernet_settings{'RED_TYPE'}; + + # RED must be a network device (configuration 1-4) with dynamic or static IP + return (($config_type ~~ [1..4]) && ($red_type ~~ ["DHCP", "STATIC"])); +} + 1; =20 # Remove the next line to enable the testsuite --=20 2.27.0.windows.1 --===============8643254081067607511==--