dnsbl: src/context.cpp comparison

comparison src/context.cpp @ 249:15bf4f68a0b2

Add dnswl support

author	Carl Byington <carl@five-ten-sg.com>
date	Sun, 08 Apr 2012 11:42:59 -0700
parents	ef97c7cd4a6e
children	d6d5c50b9278

comparison

equal deleted inserted replaced

-:b0738685bf51
+:15bf4f68a0b2
 const char *token_dccgrey;
 const char *token_dccto;
 const char *token_default;
 const char *token_dnsbl;
 const char *token_dnsbll;
+const char *token_dnswl;
+const char *token_dnswll;
 const char *token_envfrom;
 const char *token_envto;
 const char *token_filter;
 const char *token_generic;
 const char *token_host_limit;
 (strcmp(suffix,  rhs.suffix)  == 0) &&
 (strcmp(message, rhs.message) == 0);
 }
+DNSWL::DNSWL(const char *n, const char *s, const int l) {
+name    = n;
+suffix  = s;
+level   = l;
+}
+bool DNSWL::operator==(const DNSWL &rhs) {
+return (strcmp(name,    rhs.name)    == 0) &&
+(strcmp(suffix,  rhs.suffix)  == 0) &&
+(level == rhs.level);
+}
 CONFIG::CONFIG() {
 reference_count    = 0;
 generation         = 0;
 load_time          = 0;
 default_context    = NULL;
 if (parent) return parent->find_dnsbl(name);
 return NULL;
 }
+DNSWLP CONTEXT::find_dnswl(const char *name) {
+dnswlp_map::iterator i = dnswl_names.find(name);
+if (i != dnswl_names.end()) return (*i).second;
+if (parent) return parent->find_dnswl(name);
+return NULL;
+}
 const char* CONTEXT::get_content_suffix() {
 if (!content_suffix && parent) return parent->get_content_suffix();
 return content_suffix;
 }
 dnsblp_list& CONTEXT::get_dnsbl_list() {
 if (dnsbl_list.empty() && parent) return parent->get_dnsbl_list();
 return dnsbl_list;
+}
+dnswlp_list& CONTEXT::get_dnswl_list() {
+if (dnswl_list.empty() && parent) return parent->get_dnswl_list();
+return dnswl_list;
 }
 bool CONTEXT::acceptable_content(recorder &memory, int score, int bulk, string& msg) {
 if (spamassassin_limit && (score > spamassassin_limit)) {
 const char *n = (*i).first;
 DNSBL &d = *(*i).second;
 printf("%s     dnsbl %s %s \"%s\"; \n", indent, n, d.suffix, d.message);
 }
+for (dnswlp_map::iterator i=dnswl_names.begin(); i!=dnswl_names.end(); i++) {
+const char *n = (*i).first;
+DNSWL &d = *(*i).second;
+printf("%s     dnswl %s %s %d; \n", indent, n, d.suffix, d.level);
+}
+{
 dnsblp_list dl = get_dnsbl_list();
 if (!dl.empty()) {
 printf("%s     dnsbl_list", indent);
 for (dnsblp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
 DNSBL &d = *(*i);
 printf(" %s", d.name);
 }
 printf("; \n");
-}
+}}
+{
+dnswlp_list dl = get_dnswl_list();
+if (!dl.empty()) {
+printf("%s     dnswl_list", indent);
+for (dnswlp_list::iterator i=dl.begin(); i!=dl.end(); i++) {
+DNSWL &d = *(*i);
+printf(" %s", d.name);
+}
+printf("; \n");
+}}
 if (content_filtering) {
 printf("%s     content on { \n", indent);
 if (content_suffix) {
 printf("%s         filter %s \"%s\"; \n", indent, content_suffix, content_message);
 }
 ////////////////////////////////////////////////
 //
+bool parse_dnswl(TOKEN &tok, CONFIG &dc, CONTEXT &me);
+bool parse_dnswl(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
+const char *name = tok.next();
+const char *suf  = tok.next();
+const int   lev  = tok.nextint();
+if (!tsa(tok, token_semi)) return false;
+DNSWLP dnsnew = new DNSWL(name, suf, lev);
+DNSWLP dnsold = me.find_dnswl(name);
+if (dnsold && (*dnsold == *dnsnew)) {
+// duplicate redefinition, ignore it
+delete dnsnew;
+return true;
+}
+me.add_dnswl(name, dnsnew);
+return true;
+}
+////////////////////////////////////////////////
+//
 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me);
 bool parse_dnsbll(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
 while (true) {
 const char *have = tok.next();
 if (!have) break;
 if (dns) {
 me.add_dnsbl(dns);
 }
 else {
 tok.token_error("dnsbl name", have);
+return false;
+}
+}
+return true;
+}
+////////////////////////////////////////////////
+//
+bool parse_dnswll(TOKEN &tok, CONFIG &dc, CONTEXT &me);
+bool parse_dnswll(TOKEN &tok, CONFIG &dc, CONTEXT &me) {
+while (true) {
+const char *have = tok.next();
+if (!have) break;
+if (have == token_semi) break;
+DNSWLP dns = me.find_dnswl(have);
+if (dns) {
+me.add_dnswl(dns);
+}
+else {
+tok.token_error("dnswl name", have);
 return false;
 }
 }
 return true;
 }
 if (!parse_dnsbl(tok, dc, *con)) return false;
 }
 else if (have == token_dnsbll) {
 if (!parse_dnsbll(tok, dc, *con)) return false;
 }
+else if (have == token_dnswl) {
+if (!parse_dnswl(tok, dc, *con)) return false;
+}
+else if (have == token_dnswll) {
+if (!parse_dnswll(tok, dc, *con)) return false;
+}
 else if (have == token_content) {
 if (!parse_content(tok, dc, *con)) return false;
 }
 else if (have == token_envto) {
 if (!parse_envto(tok, dc, *con)) return false;
 token_dccgrey       = register_string("dcc_greylist");
 token_dccto         = register_string("dcc_to");
 token_default       = register_string("default");
 token_dnsbl         = register_string("dnsbl");
 token_dnsbll        = register_string("dnsbl_list");
+token_dnswl         = register_string("dnswl");
+token_dnswll        = register_string("dnswl_list");
 token_envfrom       = register_string("env_from");
 token_envto         = register_string("env_to");
 token_filter        = register_string("filter");
 token_generic       = register_string("generic");
 token_host_limit    = register_string("host_limit");

Mercurial > dnsbl

comparison src/context.cpp @ 249:15bf4f68a0b2