moparisthebest
/
sslh
mirror of https://github.com/moparisthebest/sslh
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #67 from eehakkin/master 

Fix access rights checking to work with IPv6.
This commit is contained in:
yrutschle 2015-09-28 14:59:16 +02:00
parent 4cbaf447b5 717c285b31
commit 389ab9fbff
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common.c
View File

@ -471,16 +471,19 @@ void log_connection(struct connection *cnx)
int check_access_rights(int in_socket, const char* service) int check_access_rights(int in_socket, const char* service)
{ {
#ifdef LIBWRAP #ifdef LIBWRAP
struct sockaddr peeraddr; union {
socklen_t size = sizeof(peeraddr); struct sockaddr saddr;
struct sockaddr_storage ss;
} peer;
socklen_t size = sizeof(peer);
char addr_str[NI_MAXHOST], host[NI_MAXHOST]; char addr_str[NI_MAXHOST], host[NI_MAXHOST];
int res; int res;
res = getpeername(in_socket, &peeraddr, &size); res = getpeername(in_socket, &peer.saddr, &size);
CHECK_RES_RETURN(res, "getpeername"); CHECK_RES_RETURN(res, "getpeername");
/* extract peer address */ /* extract peer address */
res = getnameinfo(&peeraddr, size, addr_str, sizeof(addr_str), NULL, 0, NI_NUMERICHOST); res = getnameinfo(&peer.saddr, size, addr_str, sizeof(addr_str), NULL, 0, NI_NUMERICHOST);
if (res) { if (res) {
if (verbose) if (verbose)
fprintf(stderr, "getnameinfo(NI_NUMERICHOST):%s\n", gai_strerror(res)); fprintf(stderr, "getnameinfo(NI_NUMERICHOST):%s\n", gai_strerror(res));
@ -489,7 +492,7 @@ int check_access_rights(int in_socket, const char* service)
/* extract peer name */ /* extract peer name */
strcpy(host, STRING_UNKNOWN); strcpy(host, STRING_UNKNOWN);
if (!numeric) { if (!numeric) {
res = getnameinfo(&peeraddr, size, host, sizeof(host), NULL, 0, NI_NAMEREQD); res = getnameinfo(&peer.saddr, size, host, sizeof(host), NULL, 0, NI_NAMEREQD);
if (res) { if (res) {
if (verbose) if (verbose)
fprintf(stderr, "getnameinfo(NI_NAMEREQD):%s\n", gai_strerror(res)); fprintf(stderr, "getnameinfo(NI_NAMEREQD):%s\n", gai_strerror(res));