X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mbd%2Fmbd.pl;h=44dd334a854dbb2a0a561c707b26a5925b9085fe;hb=7ae11f7618602eef12abc857b7434d26a895d346;hp=90ee4d6b63bc50bc6cb9b2f7fbb765d2512b7d96;hpb=c8f763bc89ec770a9f924667c8a276d356d30b0a;p=nms

diff --git a/mbd/mbd.pl b/mbd/mbd.pl
index 90ee4d6..44dd334 100644
--- 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,31 @@ 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 %cidrcache = ();
+sub cache_cidrlookup {
+	my ($addr, $net) = @_;
+	my $key = $addr . " " . $net;
+
+	if (!exists($cidrcache{$key})) {
+		$cidrcache{$key} = Net::CIDR::cidrlookup($addr, $net);
 	}
+	return $cidrcache{$key};
 }
-my @ports = sort { $a <=> $b } keys %port_hash;
+
+my %rangecache = ();
+sub cache_cidrrange {
+	my ($net) = @_;
+
+	if (!exists($rangecache{$net})) {
+		($rangecache{$net}) = Net::CIDR::cidr2range($net);
+	}
+
+	return $rangecache{$net};
+}
+
+open LOG, ">>", "mbd.log";
+
+my @ports = mbd::find_all_ports();
 
 # Open a socket for each port
 my @socks = ();
@@ -83,27 +75,34 @@ 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'})) {
-				$pass = 1;
+			next unless (mbd::match_ranges($dport, $rule->{'ports'}));
+			next unless (mbd::match_ranges($size, $rule->{'sizes'}));
+
+			if ($rule->{'filter'}) {
+				next unless ($rule->{'filter'}($data));
 			}
+
+			$pass = 1;
+			last;
 		}
 
+		print LOG "$dport $size $pass\n";
+
 		if (!$pass) {
 			print "$dport, $size bytes => filtered\n";
 		}
 
 		next unless $pass;
 
+		my $num_nets = 0;
+
 		for my $net (@Config::networks) {
-			next if (Net::CIDR::cidrlookup(inet_ntoa($saddr), $net));
+			next if (cache_cidrlookup(inet_ntoa($saddr), $net));
 
-			my ($range) = Net::CIDR::cidr2range($net);
+			my ($range) = cache_cidrrange($net);
 			$range =~ /-(.*?)$/;
 			my $broadcast = $1;
 
-			print inet_ntoa($saddr), ", $dport, $size bytes => $broadcast\n";
-
 			$sendsock->set({
 				ip => {
 					saddr => inet_ntoa($saddr),
@@ -116,7 +115,9 @@ while (1) {
 				}
 			});
 			$sendsock->send;
+			++$num_nets;
 		}
+		print inet_ntoa($saddr), ", $dport, $size bytes => ($num_nets networks)\n";
 	}
 }