diff src/context.h @ 270:f92f24950bd3 stable-6-0-35

Use mozilla prefix list for tld checking, Enable surbl/uribl/dbl rhs lists
author Carl Byington <carl@five-ten-sg.com>
date Mon, 09 Sep 2013 15:15:53 -0700
parents f941563c2a95
children a99b6c1f5f67
line wrap: on
line diff
--- a/src/context.h	Wed May 22 11:34:37 2013 -0700
+++ b/src/context.h	Mon Sep 09 15:15:53 2013 -0700
@@ -161,8 +161,9 @@
     const char *    uribl_suffix;       // for uribl body filtering based on hostnames in the body
     const char *    uribl_message;      // ""
     string_set      content_host_ignore;// hosts to ignore for content sbl checking
-    string_set      content_tlds;       //
-    string_set      content_cctlds;     //
+    string_set      content_tlds;       // names that are tlds
+    string_set      content_tldwilds;   // *.names that are tlds
+    string_set      content_tldnots;    // names that are not tlds
     string_set      html_tags;          // set of valid html tags
     int             host_limit;         // limit on host names
     const char *    host_limit_message; // error message for excessive host names
@@ -227,8 +228,7 @@
     void        set_uribl_suffix(const char *suffix)        {uribl_suffix      = suffix;      };
     void        set_uribl_message(const char *message)      {uribl_message     = message;     };
     void        add_ignore(const char *host)                {content_host_ignore.insert(host);};
-    void        add_tld(const char *tld)                    {content_tlds.insert(tld);        };
-    void        add_cctld(const char *cctld)                {content_cctlds.insert(cctld);    };
+    void        add_tld(const char *tld);
 
     void        set_host_limit(int limit)                   {host_limit         = limit;  };
     void        set_host_message(const char *message)       {host_limit_message = message;};
@@ -273,7 +273,8 @@
     const char*     get_uribl_message();
     string_set&     get_content_host_ignore();
     string_set&     get_content_tlds();
-    string_set&     get_content_cctlds();
+    string_set&     get_content_tldwilds();
+    string_set&     get_content_tldnots();
     string_set&     get_html_tags();
     dnsblp_list&    get_dnsbl_list();
     dnswlp_list&    get_dnswl_list();
@@ -306,9 +307,10 @@
 };
 
 
+extern const char *token_asterisk;
 extern const char *token_autowhite;
+extern const char *token_bang;
 extern const char *token_black;
-extern const char *token_cctld;
 extern const char *token_content;
 extern const char *token_context;
 extern const char *token_dccbulk;
@@ -338,6 +340,7 @@
 extern const char *token_ok;
 extern const char *token_ok2;
 extern const char *token_on;
+extern const char *token_period;
 extern const char *token_rate;
 extern const char *token_rbrace;
 extern const char *token_require;