You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by gb...@apache.org on 2018/10/12 06:14:12 UTC
svn commit: r1843622 - in /spamassassin:
branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
Author: gbechis
Date: Fri Oct 12 06:14:11 2018
New Revision: 1843622
URL: http://svn.apache.org/viewvc?rev=1843622&view=rev
Log:
Fix txrep_ipv{4,6}_mask_len option
bz #7640
Modified:
spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1843622&r1=1843621&r2=1843622&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/TxRep.pm Fri Oct 12 06:14:11 2018
@@ -225,8 +225,6 @@ sub new { # constr
$self->{main} = $main;
$self->{conf} = $main->{conf};
$self->{factor} = $main->{conf}->{txrep_factor};
- $self->{ipv4_mask_len} = $main->{conf}->{txrep_ipv4_mask_len};
- $self->{ipv6_mask_len} = $main->{conf}->{txrep_ipv6_mask_len};
$self->register_eval_rule("check_senders_reputation");
$self->set_config($main->{conf});
@@ -1739,7 +1737,7 @@ sub ip_to_awl_key {
if (!defined $origip) {
# could not find an IP address to use
} elsif ($origip =~ /^ (\d{1,3} \. \d{1,3}) \. \d{1,3} \. \d{1,3} $/xs) {
- my $mask_len = $self->{ipv4_mask_len};
+ my $mask_len = $self->{conf}->{txrep_ipv4_mask_len};
$mask_len = 16 if !defined $mask_len;
# handle the default and easy cases manually
if ($mask_len == 32) {$result = $origip;}
@@ -1757,7 +1755,7 @@ sub ip_to_awl_key {
$origip =~
/^ [0-9a-f]{0,4} (?: : [0-9a-f]{0,4} | \. [0-9]{1,3} ){2,9} $/xsi) {
# looks like an IPv6 address
- my $mask_len = $self->{ipv6_mask_len};
+ my $mask_len = $self->{conf}->{txrep_ipv6_mask_len};
$mask_len = 48 if !defined $mask_len;
my $origip_obj = NetAddr::IP->new6($origip . '/' . $mask_len);
if (!defined $origip_obj) { # invalid IPv6 address
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1843622&r1=1843621&r2=1843622&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Fri Oct 12 06:14:11 2018
@@ -225,8 +225,6 @@ sub new { # constr
$self->{main} = $main;
$self->{conf} = $main->{conf};
$self->{factor} = $main->{conf}->{txrep_factor};
- $self->{ipv4_mask_len} = $main->{conf}->{txrep_ipv4_mask_len};
- $self->{ipv6_mask_len} = $main->{conf}->{txrep_ipv6_mask_len};
$self->register_eval_rule("check_senders_reputation");
$self->set_config($main->{conf});
@@ -1739,7 +1737,7 @@ sub ip_to_awl_key {
if (!defined $origip) {
# could not find an IP address to use
} elsif ($origip =~ /^ (\d{1,3} \. \d{1,3}) \. \d{1,3} \. \d{1,3} $/xs) {
- my $mask_len = $self->{ipv4_mask_len};
+ my $mask_len = $self->{conf}->{txrep_ipv4_mask_len};
$mask_len = 16 if !defined $mask_len;
# handle the default and easy cases manually
if ($mask_len == 32) {$result = $origip;}
@@ -1757,7 +1755,7 @@ sub ip_to_awl_key {
$origip =~
/^ [0-9a-f]{0,4} (?: : [0-9a-f]{0,4} | \. [0-9]{1,3} ){2,9} $/xsi) {
# looks like an IPv6 address
- my $mask_len = $self->{ipv6_mask_len};
+ my $mask_len = $self->{conf}->{txrep_ipv6_mask_len};
$mask_len = 48 if !defined $mask_len;
my $origip_obj = NetAddr::IP->new6($origip . '/' . $mask_len);
if (!defined $origip_obj) { # invalid IPv6 address