/*
- * $Id$
- *
* Functions which handle hostname/address lookups and resolution
*
+ * Copyright (c) 1987-2011 by the citadel.org team
+ *
+ * This program is open source software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 3.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
*/
#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
+#include <string.h>
#include <stdio.h>
+#include <syslog.h>
#include <ctype.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
+#include <netdb.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include <limits.h>
-#include <netdb.h>
-#include <string.h>
-#include <errno.h>
+
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "locate_host.h"
-#include "sysdep_decls.h"
-#include "config.h"
-#include "domain.h"
-#include "context.h"
-#include "ctdl_module.h"
+
+#include "context.h"
#ifdef HAVE_RESOLV_H
#include <arpa/nameser.h>
#ifdef HAVE_ARPA_NAMESER_COMPAT_H
#include <resolv.h>
#endif
+#include "domain.h"
+#include "locate_host.h"
+
+/** START:some missing macros on OpenBSD 3.9 */
+#ifndef NS_CMPRSFLGS
+#define NS_CMPRSFLGS 0xc0
+#endif
+#if !defined(NS_MAXCDNAME) && defined (MAXCDNAME)
+#define NS_MAXCDNAME MAXCDNAME
+#endif
+#if !defined(NS_INT16SZ) && defined(INT16SZ)
+#define NS_INT16SZ INT16SZ
+#define NS_INT32SZ INT32SZ
+#endif
+#ifndef NS_GET16
+# define NS_GET16 GETSHORT
+#endif
+
+/** END:some missing macros on OpenBSD 3.9 */
/*
* Given an open client socket, return the host name and IP address at the other end.
/* Make our DNS query. */
answer = fixedans;
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize, "System shutting down");
if( len == -1 ) {
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize,
- "Message rejected due to known spammer source IP address");
+ "Message rejected due to known spammer source IP address");
}
if (need_to_free_answer) free(answer);
return(1);
}
}
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL)
snprintf(txtbuf, txtbufsize, "System shutting down");
* nameserver we're using.
*/
len = res_query(domain, C_IN, T_TXT, answer, PACKETSZ);
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize, "System shutting down");
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize,
- "Message rejected due to known spammer source IP address");
+ "Message rejected due to known spammer source IP address");
}
if (need_to_free_answer) free(answer);
free(result);
}
*rp = '\0';
if (txtbuf != NULL) {
- snprintf(txtbuf, txtbufsize, "%s", result);
- }
- /* Remove nonprintable characters */
- for (p=txtbuf; *p; ++p) {
- if (!isprint(*p)) strcpy(p, p+1);
+ long len;
+ len = snprintf(txtbuf, txtbufsize, "%s", result);
+
+ /* Remove nonprintable characters */
+ for (p = txtbuf; *p != '\0'; p++) {
+ if (!isprint(*p)) {
+ memmove (p,
+ p + 1,
+ len - (p - txtbuf) - 1);
+ }
+ }
}
if (need_to_free_answer) free(answer);
free(result);
char tbuf[256] = "";
int suffix_pos = 0;
int rbl;
+ int rc;
int num_rbl;
char rbl_domains[SIZ];
char txt_answer[1024];
- int ip_version = 4;
+ struct timeval tx_start;
+ struct timeval tx_finish;
+ rc = 0;
strcpy(message_to_spammer, "ok");
+ gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */
if ((strchr(CC->cs_addr, '.')) && (!strchr(CC->cs_addr, ':'))) {
int a1, a2, a3, a4;
- ip_version = 4;
sscanf(CC->cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
char workbuf[sizeof tbuf];
char *ptr;
- ip_version = 6;
-
/* tedious code to expand and reverse an IPv6 address */
safestrncpy(tbuf, CC->cs_addr, sizeof tbuf);
num_colons = haschar(tbuf, ':');
- if ((num_colons < 2) || (num_colons > 7)) return(0); /* badly formed address */
+ if ((num_colons < 2) || (num_colons > 7))
+ goto finish_rbl; /* badly formed address */
/* expand the "::" shorthand */
while (num_colons < 7) {
ptr = strstr(tbuf, "::");
- if (!ptr) return(0); /* badly formed address */
+ if (!ptr)
+ goto finish_rbl; /* badly formed address */
+
++ptr;
strcpy(workbuf, ptr);
strcpy(ptr, ":");
memcpy(&tbuf[ (i*4) + (4-strlen(tokbuf)) ], tokbuf, strlen(tokbuf) );
}
- if (strlen(tbuf) != 32) return(0);
+ if (strlen(tbuf) != 32)
+ goto finish_rbl;
/* now reverse it and add dots */
strcpy(workbuf, tbuf);
suffix_pos = 64;
}
else {
- return(0); /* unknown address format */
+ goto finish_rbl; /* unknown address format */
}
/* See if we have any RBL domains configured */
num_rbl = get_hosts(rbl_domains, "rbl");
- if (num_rbl < 1) return(0);
+ if (num_rbl < 1)
+ {
+ goto finish_rbl;
+ }
/* Try all configured RBL's */
for (rbl=0; rbl<num_rbl; ++rbl) {
if (rblcheck_backend(tbuf, txt_answer, sizeof txt_answer)) {
strcpy(message_to_spammer, txt_answer);
- CtdlLogPrintf(CTDL_INFO, "RBL: %s\n", txt_answer);
- return(1);
+ syslog(LOG_INFO, "RBL: %s\n", txt_answer);
+ rc = 1;
}
}
+finish_rbl:
+ /* How long did this transaction take? */
+ gettimeofday(&tx_finish, NULL);
- return(0);
+ syslog(LOG_WARNING, "RBL [%ld.%06ld] %s",
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000,
+ (rc)?"Found":"none Found");
+
+ return rc;
}
projects / citadel.git / blobdiff