GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

human_addr2: Avoid the usage of getnameinfo and use the simpler inet_ntop

Browse Source 
This simplifies the function.
This commit is contained in:
Nikos Mavrogiannopoulos
2016-01-27 16:01:37 +01:00
parent 1e3171685b
commit f035ae170d
1 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/log.c
View File

@@ -23,6 +23,7 @@
#include <string.h>
#include <stdio.h>
#include <stdarg.h>
#include <arpa/inet.h>
#include <base64-helper.h>
#include <vpn.h>
@@ -36,6 +37,8 @@ char *human_addr2(const struct sockaddr *sa, socklen_t salen,
char *save_buf = _buf;
char *buf = _buf;
size_t l;
const char *ret;
unsigned port;
if (!buf || !buflen)
return NULL;
@@ -44,22 +47,24 @@ char *human_addr2(const struct sockaddr *sa, socklen_t salen,
return NULL;
}
if (full != 0 && salen == sizeof(struct sockaddr_in6) &&
((struct sockaddr_in6*)sa)->sin6_port != 0) {
*buf = '[';
buf++;
buflen--;
if (salen == sizeof(struct sockaddr_in6)) {
port = (unsigned)ntohs(((struct sockaddr_in6*)sa)->sin6_port);
if (full != 0 && port != 0 && buflen > 0) {
*buf = '[';
buf++;
buflen--;
}
ret = inet_ntop(AF_INET6, &((struct sockaddr_in6*)sa)->sin6_addr, buf, buflen);
} else {
port = (unsigned)ntohs(((struct sockaddr_in*)sa)->sin_port);
ret = inet_ntop(AF_INET, &((struct sockaddr_in*)sa)->sin_addr, buf, buflen);
}
if (getnameinfo(sa, salen, buf, buflen, NULL, 0, NI_NUMERICHOST) != 0)
if (ret == NULL) {
return NULL;
if (salen == sizeof(struct sockaddr_in6)) {
char *p = strchr(buf, '%');
/* remove any zone info */
if (p != NULL) {
*p = 0;
}
}
if (full == 0)
@@ -69,23 +74,18 @@ char *human_addr2(const struct sockaddr *sa, socklen_t salen,
buf += l;
buflen -= l;
if (salen == sizeof(struct sockaddr_in6) &&
((struct sockaddr_in6*)sa)->sin6_port != 0) {
if (salen == sizeof(struct sockaddr_in6) && port != 0 && buflen > 0) {
*buf = ']';
buf++;
buflen--;
}
*buf = ':';
buf++;
buflen--;
if (port != 0 && buflen > 0) {
*buf = ':';
buf++;
buflen--;
if (getnameinfo(sa, salen, NULL, 0, buf, buflen, NI_NUMERICSERV) != 0)
return NULL;
if (buf[0] == '0' && buf[1] == 0) {
buf--;
buf[0] = 0;
snprintf(buf, buflen, "%u", port);
}
finish: