Fix warnings all over citserver; handle function replies; remove unused code.

[citadel.git] / citadel / locate_host.c

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index 6ddc48a50d6106297556af49319b78e194a6cdd5..2a7568b232e4ce1fbb05d6f05c7e88fe154ccf1c 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -1,8 +1,21 @@
 /*
- * $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"
@@ -19,6 +32,7 @@
 #include <netdb.h>
 #include <string.h>
 #include <errno.h>
+#include <syslog.h>
 #include <libcitadel.h>
 #include "citadel.h"
 #include "server.h"
@@ -60,6 +74,7 @@ void locate_host(char *tbuf, size_t n, char *abuf, size_t na, int client_socket)
         * 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]);
        }
 }
@@ -90,7 +105,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
 
        /* Make our DNS query. */
        answer = fixedans;
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                if (txtbuf != NULL) {
                        snprintf(txtbuf, txtbufsize, "System shutting down");
@@ -121,7 +136,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
                        return(1);
                }
        }
-       if (CtdlThreadCheckStop())
+       if (server_shutting_down)
        {
                if (txtbuf != NULL)
                        snprintf(txtbuf, txtbufsize, "System shutting down");
@@ -138,7 +153,7 @@ int rblcheck_backend(char *domain, char *txtbuf, int txtbufsize) {
         * 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");
@@ -228,13 +243,11 @@ int rbl_check(char *message_to_spammer)
        int num_rbl;
        char rbl_domains[SIZ];
        char txt_answer[1024];
-       int ip_version = 4;
 
        strcpy(message_to_spammer, "ok");
 
        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);
@@ -246,8 +259,6 @@ int rbl_check(char *message_to_spammer)
                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, ':');
@@ -298,7 +309,7 @@ int rbl_check(char *message_to_spammer)
 
                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);
                }
        }