dnsbl: src/dnsbl.cpp comparison

comparison src/dnsbl.cpp @ 86:c1280cd3e248

add multiple debug syslog levels, remove duplicate dnsbl definitions

author	carl
date	Tue, 19 Jul 2005 22:47:15 -0700
parents	091d3fe3db46
children	946fc1bcfb2c

comparison

equal deleted inserted replaced

-:7e4a90e5f213
+:c1280cd3e248
 -p port  The port through which the MTA will connect to this milter.
 -t sec   The timeout value.
 -c       Check the config, and print a copy to stdout. Don't start the
 milter or do anything with the socket.
 -s       Stress test by loading and deleting the current config in a loop.
--d       Add debug syslog entries
+-d       increase debug level
 -e f|t   Print the results of looking up from address f and to address
 t in the current config
 TODO:
 sfsistat mlfi_abort(SMFICTX *ctx);
 sfsistat mlfi_close(SMFICTX *ctx);
 void sig_chld(int signo);
 }
-bool debug_syslog  = false;
+int  debug_syslog  = 0;
 bool syslog_opened = false;
 bool use_syslog    = true;  // false to printf
 bool loader_run    = true;  // used to stop the config loader thread
 CONFIG   *config = NULL;    // protected by the config_mutex
 int   generation = 0;       // protected by the config_mutex
 // try to only look at limit/cnt fraction of the available cnt host names in random mode
 if ((cnt > limit) && (limit > 0) && random) {
 int r = rand() % cnt;
 if (r >= limit) {
-char buf[maxlen];
+if (debug_syslog > 2) {
-snprintf(buf, sizeof(buf), "host %s skipped", host);
+char buf[maxlen];
-my_syslog(&priv, buf);
+snprintf(buf, sizeof(buf), "host %s skipped", host);
+my_syslog(&priv, buf);
+}
 continue;
 }
 }
 count++;
 ip = dns_interface(priv, host, true, &nameservers);
-if (debug_syslog) {
+if (debug_syslog > 2) {
 char buf[maxlen];
 if (ip) {
 char adr[sizeof "255.255.255.255"];
 adr[0] = '\0';
 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
 return true;
 }
 host = (*i).first;  // a transient reference that needs to be replaced before we return it
 ip   = (*i).second;
 if (!ip) ip = dns_interface(priv, host, false, NULL);
-if (debug_syslog) {
+if (debug_syslog > 2) {
 char buf[maxlen];
 if (ip) {
 char adr[sizeof "255.255.255.255"];
 adr[0] = '\0';
 inet_ntop(AF_INET, (const u_char *)&ip, adr, sizeof(adr));
 CONFIG &dc = *priv.pc;
 if (!priv.queueid) priv.queueid = strdup(smfi_getsymval(ctx, "i"));
 char *rcptaddr  = rcpt[0];
 char *loto      = to_lower_string(rcptaddr);
 CONTEXT    &con = *(dc.find_context(loto)->find_context(priv.mailaddr));
-if (debug_syslog) {
+if (debug_syslog > 1) {
 char buf[maxlen];
 char msg[maxlen];
 snprintf(msg, sizeof(msg), "from <%s> to <%s> using context %s", priv.mailaddr, loto, con.get_full_name(buf,maxlen));
 my_syslog(&priv, msg);
 }
 CONFIG* new_conf() {
 CONFIG *newc = new CONFIG;
 pthread_mutex_lock(&config_mutex);
 newc->generation = generation++;
 pthread_mutex_unlock(&config_mutex);
-char buf[maxlen];
+if (debug_syslog) {
-snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation);
+char buf[maxlen];
-my_syslog(buf);
+snprintf(buf, sizeof(buf), "loading configuration generation %d", newc->generation);
+my_syslog(buf);
+}
 if (load_conf(*newc, "dnsbl.conf")) {
 newc->load_time = time(NULL);
 return newc;
 }
 delete newc;
 }
 // now look for old configs with zero ref counts
 for (configp_set::iterator i=old_configs.begin(); i!=old_configs.end(); ) {
 CONFIG *old = *i;
 if (!old->reference_count) {
-char buf[maxlen];
+if (debug_syslog) {
-snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", old->generation);
+char buf[maxlen];
-my_syslog(buf);
+snprintf(buf, sizeof(buf), "freeing memory for old configuration generation %d", old->generation);
+my_syslog(buf);
+}
 delete old; // destructor does all the work
 old_configs.erase(i++);
 }
 else i++;
 }
 void usage(char *prog);
 void usage(char *prog)
 {
-fprintf(stderr, "Usage: %s  [-d] [-c] [-s] [-e from|to] -r port -p sm-sock-addr [-t timeout]\n", prog);
+fprintf(stderr, "Usage: %s  [-d [level]] [-c] [-s] [-e from|to] -r port -p sm-sock-addr [-t timeout]\n", prog);
 fprintf(stderr, "where port is for the connection to our own dns resolver processes\n");
 fprintf(stderr, "    and should be local-domain-socket-file-name\n");
 fprintf(stderr, "where sm-sock-addr is for the connection to sendmail\n");
 fprintf(stderr, "    and should be one of\n");
 fprintf(stderr, "        inet:port@ip-address\n");
 fprintf(stderr, "        local:local-domain-socket-file-name\n");
 fprintf(stderr, "-c will load and dump the config to stdout\n");
 fprintf(stderr, "-s will stress test the config loading code by repeating the load/free cycle\n");
 fprintf(stderr, "        in an infinte loop.\n");
-fprintf(stderr, "-d will add some syslog debug messages\n");
+fprintf(stderr, "-d will set the syslog message level, currently 0 to 3");
 fprintf(stderr, "-e will print the results of looking up the from and to addresses in the\n");
 fprintf(stderr, "        current config. The | character is used to separate the from and to\n");
 fprintf(stderr, "        addresses in the argument to the -e switch\n");
 }
 bool stress  = false;
 bool setconn = false;
 bool setreso = false;
 char *email = NULL;
 int c;
-const char *args = "r:p:t:e:cdhs";
+const char *args = "r:p:t:e:d:chs";
 extern char *optarg;
 // Process command line options
 while ((c = getopt(argc, argv, args)) != -1) {
 switch (c) {
 case 's':
 stress = true;
 break;
 case 'd':
-debug_syslog = true;
+if (optarg == NULL || *optarg == '\0') debug_syslog = 1;
+else                                   debug_syslog = atoi(optarg);
 break;
 case 'h':
 default:
 usage(argv[0]);
 }
 }
 if (check) {
 use_syslog   = false;
-debug_syslog = true;
+debug_syslog = 10;
 CONFIG *conf = new_conf();
 if (conf) {
 conf->dump();
 delete conf;
 return 0;
 int newchild = fork();
 if (newchild == 0) {
 // this is the worker process
 // child does not need the listening socket
 close(resolver_socket);
-//my_syslog("child forked a worker process");
 process_resolver_requests(s);
-//my_syslog("child terminated a worker process");
 exit(0);
 }
 else {
 // this is the parent
 // parent does not need the accepted socket

Mercurial > dnsbl

comparison src/dnsbl.cpp @ 86:c1280cd3e248