Merge branch 'master' into core61

[people/teissler/ipfire-2.x.git] / config / cfgroot / general-functions.pl

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index 84aa8aaa646c85a6b2068f2a40b8d59506462feb..567f2e104ec5cb02bae2e588e0b18472a7ab7957 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -18,6 +18,7 @@ use strict;
 use Socket;
 use IO::Socket;
 use Net::SSLeay;
+use Net::IPv4Addr;
 
 $|=1; # line buffering
 
@@ -407,6 +408,20 @@ sub NextIP
                             );
 }
 
+sub ipcidr
+{
+       my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
+       return "$ip\/$cidr";
+}
+
+sub ipcidr2msk
+{
+       my ($ip,$cidr) = &Net::IPv4Addr::ipv4_parse(shift);
+       my $netmask = &Net::IPv4Addr::ipv4_cidr2msk($cidr);
+       return "$ip\/$netmask";
+}
+
+
 sub validemail {
     my $mail = shift;
     return 0 if ( $mail !~ /^[0-9a-zA-Z\.\-\_]+\@[0-9a-zA-Z\.\-]+$/ );