Fix a bug in MBD.

[nms] / mbd / mbd.pl

diff --git a/mbd/mbd.pl b/mbd/mbd.pl
index 90ee4d6b63bc50bc6cb9b2f7fbb765d2512b7d96..e5c2879e01b9310fe1b73becae6e1bd9743692f1 100644 (file)
--- a/mbd/mbd.pl
+++ b/mbd/mbd.pl
@@ -6,30 +6,7 @@ use Net::CIDR;
 use Net::RawIP;
 require './access_list.pl';
 require './nets.pl';
-
-sub expand_range {
-       my $range = shift;
-
-       if ($range =~ /^(\d+)\.\.(\d+)$/) {
-               return $1..$2;
-       } else {
-               return $range;
-       }
-}
-
-sub match_ranges {
-       my ($elem, $ranges) = @_;
-       
-       for my $range (@$ranges) {
-               if ($range =~ /^(\d+)\.\.(\d+)$/) {
-                       return 1 if ($elem >= $1 && $elem <= $2);
-               } else {
-                       return 1 if ($elem == $range);
-               }
-       }
-
-       return 0;
-}
+require './mbd.pm';
 
 sub fhbits {
        my $bits = 0;
@@ -39,16 +16,7 @@ sub fhbits {
        return $bits;
 }
 
-# Find what ports we need to listen on
-my %port_hash = ();
-for my $e (@Config::access_list) {
-       for my $r (@{$e->{'ports'}}) {
-               for my $p (expand_range($r)) {
-                       $port_hash{$p} = 1;
-               }
-       }
-}
-my @ports = sort { $a <=> $b } keys %port_hash;
+my @ports = mbd::find_all_ports();
 
 # Open a socket for each port
 my @socks = ();
@@ -83,8 +51,8 @@ while (1) {
                # Check against the ACL.
                my $pass = 0;
                for my $rule (@Config::access_list) {
-                       if (match_ranges($dport, $rule->{'ports'}) &&
-                           match_ranges($size, $rule->{'sizes'})) {
+                       if (mbd::match_ranges($dport, $rule->{'ports'}) &&
+                           mbd::match_ranges($size, $rule->{'sizes'})) {
                                $pass = 1;
                        }
                }