general-functions.pl: Remove some legacy network functions

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/cfgroot/general-functions.pl b/config/cfgroot/general-functions.pl
index bcc8942c3060b3ab74f8b77f753fb6c1ed2bed92..31123163235513f5834462d49cc84f80bf5bb295 100644 (file)
--- a/config/cfgroot/general-functions.pl
+++ b/config/cfgroot/general-functions.pl
@@ -17,7 +17,6 @@ package General;
 use strict;
 use Socket;
 use IO::Socket;
-use Net::IPv4Addr qw(:all);
 
 $General::version = 'VERSION';
 $General::swroot = 'CONFIG_ROOT';
@@ -880,17 +879,6 @@ sub IpInSubnet {
        return &Network::ip_address_in_network($addr, "$network/$netmask");
 }
 
-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 $address = shift;
     my @parts = split( /\@/, $address );