removed a bunch of blank comment lines

[citadel.git] / webcit / locate_host.c

diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index 9a19f9b5b9806c22e299b24a3ecff8042370a612..1db2832e99676b58ccba99a4b27996b7023b54c1 100644 (file)
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -1,43 +1,31 @@
 /*
- * locate the originating host
+ * Given a socket, supply the name of the host at the other end.
+ *
+ * Copyright (c) 1996-2012 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 <stdlib.h>
-#include <unistd.h>
-#include <stdio.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <limits.h>
-#include <netdb.h>
-#include <string.h>
+#include "webcit.h"
+#include "webserver.h"
 
-void locate_host(char *tbuf, int client_socket)
+/*
+ * IPv4/IPv6 locate_host()
+ */
+void locate_host(StrBuf *tbuf, int client_socket)
 {
-       struct sockaddr_in      cs;     
-       struct hostent      *   ch;        
-       int                     len;     
-       char *i;
-       int a1,a2,a3,a4;
-       
-    len = sizeof(cs);   
-    if (getpeername(client_socket, (struct sockaddr *)&cs,&len) < 0) {
-       strcpy(tbuf, "<unknown>");
-       return;
-       }
-     
-    if((ch = gethostbyaddr((char *) &cs.sin_addr, sizeof(cs.sin_addr),  
-         AF_INET)) == NULL) { 
-               i = (char *) &cs.sin_addr;
-               a1 = ((*i++)&0xff);
-               a2 = ((*i++)&0xff);
-               a3 = ((*i++)&0xff);
-               a4 = ((*i++)&0xff);
-               sprintf(tbuf,"%d.%d.%d.%d",a1,a2,a3,a4);
-               return;
-               }
+       struct sockaddr_in6 clientaddr;
+       unsigned int addrlen = sizeof(clientaddr);
+       char clienthost[NI_MAXHOST];
 
-       strncpy(tbuf,ch->h_name, 24);
-       tbuf[24] = 0;
-       }
+       getpeername(client_socket, (struct sockaddr *)&clientaddr, &addrlen);
+       getnameinfo((struct sockaddr *)&clientaddr, addrlen, clienthost, sizeof(clienthost), NULL, 0, 0);
+        StrBufAppendBufPlain(tbuf, clienthost, -1, 0);
+       syslog(9, "Client is at %s\n", clienthost);
+}