/*
- * $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 as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include <netdb.h>
#include <string.h>
#include <errno.h>
+#include <syslog.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
* as dotted-quad, even if they come in over a hybrid IPv6/IPv4 socket.
*/
if ( (strlen(abuf) > 7) && (!strncasecmp(abuf, "::ffff:", 7)) ) {
+ if (!strcmp(abuf, tbuf)) strcpy(tbuf, &tbuf[7]);
strcpy(abuf, &abuf[7]);
}
}
/* Make our DNS query. */
answer = fixedans;
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
{
if (txtbuf != NULL) {
snprintf(txtbuf, txtbufsize, "System shutting down");
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");
/*
* Check to see if the client host is on some sort of spam list (RBL)
* If spammer, returns nonzero and places reason in 'message_to_spammer'
- *
- * FIXME: support IPv6 RBL as specified in http://tools.ietf.org/html/draft-irtf-asrg-dnsbl-08
*/
int rbl_check(char *message_to_spammer)
{
- int a1, a2, a3, a4;
- char tbuf[256];
+ char tbuf[256] = "";
+ int suffix_pos = 0;
int rbl;
int num_rbl;
char rbl_domains[SIZ];
char txt_answer[1024];
strcpy(message_to_spammer, "ok");
- sscanf(CC->cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
+
+ if ((strchr(CC->cs_addr, '.')) && (!strchr(CC->cs_addr, ':'))) {
+ int a1, a2, a3, a4;
+
+ sscanf(CC->cs_addr, "%d.%d.%d.%d", &a1, &a2, &a3, &a4);
+ snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
+ suffix_pos = strlen(tbuf);
+ }
+ else if ((!strchr(CC->cs_addr, '.')) && (strchr(CC->cs_addr, ':'))) {
+ int num_colons = 0;
+ int i = 0;
+ char workbuf[sizeof tbuf];
+ char *ptr;
+
+ /* 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 */
+
+ /* expand the "::" shorthand */
+ while (num_colons < 7) {
+ ptr = strstr(tbuf, "::");
+ if (!ptr) return(0); /* badly formed address */
+ ++ptr;
+ strcpy(workbuf, ptr);
+ strcpy(ptr, ":");
+ strcat(ptr, workbuf);
+ ++num_colons;
+ }
+
+ /* expand to 32 hex characters with no colons */
+ strcpy(workbuf, tbuf);
+ strcpy(tbuf, "00000000000000000000000000000000");
+ for (i=0; i<8; ++i) {
+ char tokbuf[5];
+ extract_token(tokbuf, workbuf, i, ':', sizeof tokbuf);
+
+ memcpy(&tbuf[ (i*4) + (4-strlen(tokbuf)) ], tokbuf, strlen(tokbuf) );
+ }
+ if (strlen(tbuf) != 32) return(0);
+
+ /* now reverse it and add dots */
+ strcpy(workbuf, tbuf);
+ for (i=0; i<32; ++i) {
+ tbuf[i*2] = workbuf[31-i];
+ tbuf[(i*2)+1] = '.';
+ }
+ tbuf[64] = 0;
+ suffix_pos = 64;
+ }
+ else {
+ return(0); /* unknown address format */
+ }
/* See if we have any RBL domains configured */
num_rbl = get_hosts(rbl_domains, "rbl");
/* Try all configured RBL's */
for (rbl=0; rbl<num_rbl; ++rbl) {
- snprintf(tbuf, sizeof tbuf, "%d.%d.%d.%d.", a4, a3, a2, a1);
- extract_token(&tbuf[strlen(tbuf)], rbl_domains, rbl, '|', (sizeof tbuf - strlen(tbuf)));
+ extract_token(&tbuf[suffix_pos], rbl_domains, rbl, '|', (sizeof tbuf - suffix_pos));
if (rblcheck_backend(tbuf, txt_answer, sizeof txt_answer)) {
strcpy(message_to_spammer, txt_answer);
- CtdlLogPrintf(CTDL_INFO, "RBL: %s\n", txt_answer);
+ syslog(LOG_INFO, "RBL: %s\n", txt_answer);
return(1);
}
}
/*
* Convert a host name to a dotted quad address.
* Returns zero on success or nonzero on failure.
+ *
+ * FIXME this is obviously not IPv6 compatible.
*/
int hostname_to_dotted_quad(char *addr, char *host) {
struct hostent *ch;
projects / citadel.git / blobdiff