svn commit: r1030925 - in /spamassassin/trunk/lib/Mail/SpamAssassin: Conf.pm NetSet.pm

[mm...@apache.org]

Author: mmartinec
Date: Thu Nov  4 13:05:08 2010
New Revision: 1030925

URL: http://svn.apache.org/viewvc?rev=1030925&view=rev
Log:
NetSet cosmetics: generalize new_netset, store a netset name for debugging purposes

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
    spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1030925&r1=1030924&r2=1030925&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Thu Nov  4 13:05:08 2010
@@ -1220,7 +1220,7 @@ Empty the list of trusted networks.
       unless (!defined $value || $value eq '') {
         return $INVALID_VALUE;
       }
-      $self->{trusted_networks} = $self->new_netset();
+      $self->{trusted_networks} = $self->new_netset('trusted_networks',1);
       $self->{trusted_networks_configured} = 0;
     }
   });
@@ -1274,7 +1274,7 @@ Empty the list of internal networks.
       unless (!defined $value || $value eq '') {
         return $INVALID_VALUE;
       }
-      $self->{internal_networks} = $self->new_netset();
+      $self->{internal_networks} = $self->new_netset('internal_networks',1);
       $self->{internal_networks_configured} = 0;
     }
   });
@@ -1327,7 +1327,8 @@ Empty the list of msa networks.
       unless (!defined $value || $value eq '') {
         return $INVALID_VALUE;
       }
-      $self->{msa_networks} = Mail::SpamAssassin::NetSet->new(); # not new_netset
+      $self->{msa_networks} =
+        $self->new_netset('msa_networks',0);  # no loopback IP
       $self->{msa_networks_configured} = 0;
     }
   });
@@ -3849,9 +3850,9 @@ sub new {
   $self->{more_spam_to} = { };
   $self->{all_spam_to} = { };
 
-  $self->{trusted_networks} = $self->new_netset();
-  $self->{internal_networks} = $self->new_netset();
-  $self->{msa_networks} = Mail::SpamAssassin::NetSet->new(); # not new_netset
+  $self->{trusted_networks} = $self->new_netset('trusted_networks',1);
+  $self->{internal_networks} = $self->new_netset('internal_networks',1);
+  $self->{msa_networks} = $self->new_netset('msa_networks',0); # no loopback IP
   $self->{trusted_networks_configured} = 0;
   $self->{internal_networks_configured} = 0;
 
@@ -4353,10 +4354,12 @@ sub free_uncompiled_rule_source {
 }
 
 sub new_netset {
-  my ($self) = @_;
-  my $set = Mail::SpamAssassin::NetSet->new();
-  $set->add_cidr ('127.0.0.0/8');
-  $set->add_cidr ('::1');
+  my ($self, $netset_name, $add_loopback) = @_;
+  my $set = Mail::SpamAssassin::NetSet->new($netset_name);
+  if ($add_loopback) {
+    $set->add_cidr('127.0.0.0/8');
+    $set->add_cidr('::1');
+  }
   return $set;
 }
 

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm?rev=1030925&r1=1030924&r2=1030925&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Thu Nov  4 13:05:08 2010
@@ -36,10 +36,11 @@ use vars qw{
 ###########################################################################
 
 sub new {
-  my $class = shift;
+  my ($class,$netset_name) = @_;
   $class = ref($class) || $class;
 
-  my $self = { };
+  $netset_name = ''  if !defined $netset_name;  # object name for debugging
+  my $self = { name => $netset_name };
   bless $self, $class;
 
   $self;
@@ -192,7 +193,7 @@ sub contains_net {
 
 sub clone {
   my ($self) = @_;
-  my $dup = Mail::SpamAssassin::NetSet->new();
+  my $dup = Mail::SpamAssassin::NetSet->new($self->{name});
   if (defined $self->{nets}) {
     @{$dup->{nets}} = @{$self->{nets}};
   }