* trunk webcit is now IPv6-enabled by default

[citadel.git] / webcit / locate_host.c

diff --git a/webcit/locate_host.c b/webcit/locate_host.c
index 034fd05e9ef0c2bb4231a368cbcf265b81b64fb9..ecfc4d3da5ce962b63e3ff295caaa4ac6bb47ed9 100644 (file)
--- a/webcit/locate_host.c
+++ b/webcit/locate_host.c
@@ -1,13 +1,54 @@
 /*
  * $Id$
  *
- * Examine a socket and determine the name/address of the originating host.
+ * Given a socket, supply the name of the host at the other end.
+ *
+ * Copyright (c) 1996-2010 by the citadel.org team
+ *
+ * This program is free 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 "webcit.h"
 
-void locate_host(char *tbuf, int client_socket)
+
+/*
+ * IPv6 enabled locate_host()
+ */
+void locate_host(StrBuf *tbuf, int client_socket)
+{
+       struct sockaddr_in6 clientaddr;
+       unsigned int addrlen = sizeof(clientaddr);
+       char clienthost[NI_MAXHOST];
+       char clientservice[NI_MAXSERV];
+
+       getpeername(client_socket, (struct sockaddr *)&clientaddr, &addrlen);
+       getnameinfo((struct sockaddr *)&clientaddr, addrlen,
+               clienthost, sizeof(clienthost),
+               clientservice, sizeof(clientservice),
+               0
+       );
+
+        StrBufAppendBufPlain(tbuf, clienthost, -1, 0);
+}
+
+
+#if 0
+/*
+ * IPv4-only locate_host()
+ */
+void locate_host(StrBuf *tbuf, int client_socket)
 {
        struct sockaddr_in cs;
        struct hostent *ch;
@@ -17,7 +58,7 @@ void locate_host(char *tbuf, int client_socket)
 
        len = sizeof(cs);
        if (getpeername(client_socket, (struct sockaddr *) &cs, &len) < 0) {
-               strcpy(tbuf, "<unknown>");
+               StrBufAppendBufPlain(tbuf, HKEY("<unknown>"), 0);
                return;
        }
        if ((ch = gethostbyaddr((char *) &cs.sin_addr, sizeof(cs.sin_addr),
@@ -27,8 +68,9 @@ void locate_host(char *tbuf, int client_socket)
                a2 = ((*i++) & 0xff);
                a3 = ((*i++) & 0xff);
                a4 = ((*i++) & 0xff);
-               sprintf(tbuf, "%d.%d.%d.%d", a1, a2, a3, a4);
+               StrBufPrintf(tbuf, "%d.%d.%d.%d", a1, a2, a3, a4);
                return;
        }
-       safestrncpy(tbuf, ch->h_name, 64);
+       StrBufAppendBufPlain(tbuf, ch->h_name, -1, 0);
 }
+#endif