You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@spamassassin.apache.org by he...@apache.org on 2020/05/10 20:06:34 UTC

svn commit: r1877556 - /spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm

Author: hege
Date: Sun May 10 20:06:34 2020
New Revision: 1877556

URL: http://svn.apache.org/viewvc?rev=1877556&view=rev
Log:
Include asn_organization in GeoIP1 results

Modified:
    spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm?rev=1877556&r1=1877555&r2=1877556&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/GeoDB.pm Sun May 10 20:06:34 2020
@@ -568,11 +568,12 @@ sub load_geoip {
       }
       1;
     };
-    if (!defined $asn || $asn !~ /^AS(\d+)/) {
+    if (!defined $asn || $asn !~ /^((?:AS)?\d+)(?:\s+(.+))?/) {
       dbg("geodb: GeoIP asn query failed for $_[1]");
       return $res;
     };
     $res->{asn} = $1;
+    $res->{asn_organization} = $2 if defined $2;
     return $res;
   };