* Removed all of the thread cancellation cruft that is no longer necessary

[citadel.git] / citadel / locate_host.c

diff --git a/citadel/locate_host.c b/citadel/locate_host.c
index a18d6e99a39c406659b194c81b2458120aa04dac..b4f5cdbadcbb810385a4908cc26f82219f4b1a51 100644 (file)
--- a/citadel/locate_host.c
+++ b/citadel/locate_host.c
@@ -14,35 +14,26 @@
 #include <limits.h>
 #include <netdb.h>
 #include <string.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
 #include "citadel.h"
 #include "server.h"
 #include "locate_host.h"
 #include "config.h"
+#include "tools.h"
 
-void locate_host(char *tbuf)
+void locate_host(char *tbuf, const struct in_addr *addr)
 {
-       struct sockaddr_in cs;
-       struct hostent *ch, *ch2;
-       int len;
+       struct hostent *ch;
        char *i;
        int a1, a2, a3, a4;
 
-       len = sizeof(cs);
-       if (getpeername(CC->client_socket, (struct sockaddr *) &cs, &len) < 0) {
-               strcpy(tbuf, config.c_fqdn);
-               return;
-       }
 #ifdef HAVE_NONREENTRANT_NETDB
        begin_critical_section(S_NETDB);
 #endif
 
-       if ((ch = gethostbyaddr((char *) &cs.sin_addr, sizeof(cs.sin_addr),
-                               AF_INET)) == NULL) {
+       if ((ch = gethostbyaddr((char *) addr, sizeof(*addr), AF_INET)) ==
+           NULL) {
              bad_dns:
-               i = (char *) &cs.sin_addr;
+               i = (char *) addr;
                a1 = ((*i++) & 0xff);
                a2 = ((*i++) & 0xff);
                a3 = ((*i++) & 0xff);
@@ -52,14 +43,17 @@ void locate_host(char *tbuf)
                                   section */
        }
        /* check if the forward DNS agrees; if not, they're spoofing */
-       if ((ch2 = gethostbyname(ch->h_name)) == NULL)
+       i = strdoop(ch->h_name);
+       ch = gethostbyname(i);
+       phree(i);
+       if (ch == NULL)
                goto bad_dns;
 
        /* check address for consistency */
-       for (; *ch2->h_addr_list; ch2->h_addr_list++)
-               if (!memcmp(*ch2->h_addr_list, &cs.sin_addr,
-                           sizeof cs.sin_addr)) {
-                       strncpy(tbuf, ch->h_name, 24);
+       for (; *ch->h_addr_list; ch->h_addr_list++)
+               if (!memcmp(*ch->h_addr_list, addr,
+                           sizeof *addr)) {
+                       safestrncpy(tbuf, ch->h_name, 25);
                        goto end;
                }
        goto bad_dns;           /* they were spoofing. report a numeric IP
@@ -71,5 +65,5 @@ void locate_host(char *tbuf)
        end_critical_section(S_NETDB);
 #endif
 
-       tbuf[24] = 0;
+       tbuf[25] = 0;
 }