/*
- * $Id$
- *
* 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
+ * 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.
*/
#include "webcit.h"
+#include "webserver.h"
-
-#ifdef CTDL_IPV6
-
+/*
+ * IPv4/IPv6 locate_host()
+ */
void locate_host(StrBuf *tbuf, int client_socket)
{
struct sockaddr_in6 clientaddr;
unsigned int addrlen = sizeof(clientaddr);
- char str[256];
+ char clienthost[NI_MAXHOST];
getpeername(client_socket, (struct sockaddr *)&clientaddr, &addrlen);
- if(inet_ntop(AF_INET6, &clientaddr.sin6_addr, str, sizeof(str))) {
- StrBufAppendBufPlain(tbuf, str, -1, 0);
- }
- else {
- StrBufAppendBufPlain(tbuf, HKEY("<unknown>"), 0);
- }
-}
-
-#else /* CTDL_IPV6 */
-
-void locate_host(StrBuf *tbuf, int client_socket)
-{
- struct sockaddr_in cs;
- struct hostent *ch;
- socklen_t len;
- char *i;
- int a1, a2, a3, a4;
-
- len = sizeof(cs);
- if (getpeername(client_socket, (struct sockaddr *) &cs, &len) < 0) {
- StrBufAppendBufPlain(tbuf, HKEY("<unknown>"), 0);
- 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);
- StrBufPrintf(tbuf, "%d.%d.%d.%d", a1, a2, a3, a4);
- return;
- }
- StrBufAppendBufPlain(tbuf, ch->h_name, -1, 0);
+ getnameinfo((struct sockaddr *)&clientaddr, addrlen, clienthost, sizeof(clienthost), NULL, 0, 0);
+ StrBufAppendBufPlain(tbuf, clienthost, -1, 0);
+ lprintf(9, "Client is at %s\n", clienthost);
}
-
-#endif /* CTDL_IPV6 */