Import VPN changes by the Special Interest Group.

See here for more details:
  http://lists.ipfire.org/pipermail/sig-vpn/2012-March/000031.html
This commit is contained in:
Michael Tremer
2012-03-06 22:53:07 +01:00
parent 650a4d8097
commit 54fd05358b
8 changed files with 382 additions and 63 deletions

View File

@@ -414,6 +414,14 @@ sub ipcidr
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\.\-]+$/ );