PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-18 13:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Refactor get_hostaddr_string to get_peeraddr_string.

Browse Source 
All the information passed as arguments is present in an iod, and we
only call this with members of one iod. Change it to accept just an iod
as an argument.
This commit is contained in:
david
2012-11-12 20:44:49 +00:00
parent f5ac3e9f4e
commit 7b371609a3
5 changed files with 33 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
nsock/src/netutils.c
View File

@@ -137,9 +137,15 @@ int maximize_fdlimit(void) {
return 0;
}
#if HAVE_SYS_UN_H
#define PEER_STR_LEN sizeof(((struct sockaddr_un *) 0)->sun_path)
#else
#define PEER_STR_LEN sizeof("[ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255]:xxxxx")
#endif
#if HAVE_SYS_UN_H
/* Get the UNIX domain socket path or empty string if the address family != AF_UNIX. */
const char *get_unixsock_path(struct sockaddr_storage *addr)
const char *get_unixsock_path(const struct sockaddr_storage *addr)
{
if (!addr || addr->ss_family != AF_UNIX)
return "";
@@ -153,19 +159,17 @@ const char *get_unixsock_path(struct sockaddr_storage *addr)
* In case we have support for UNIX domain sockets, function returns
* string containing path to UNIX socket if the address family is AF_UNIX,
* otherwise it returns string containing "<address>:<port>". */
char *get_hostaddr_string(struct sockaddr_storage *addr, size_t len, unsigned short port)
char *get_peeraddr_string(const msiod *iod)
{
static char buffer[PEER_STR_LEN];
if (!addr)
return "";
#if HAVE_SYS_UN_H
if (addr->ss_family == AF_UNIX)
sprintf(buffer, "%s", get_unixsock_path(addr));
else
if (iod->peer.ss_family == AF_UNIX) {
sprintf(buffer, "%s", get_unixsock_path(&iod->peer));
return buffer;
}
#endif
sprintf(buffer, "%s:%hu", inet_ntop_ez(addr, len), port);
sprintf(buffer, "%s:%d", inet_ntop_ez(&iod->peer, iod->peerlen), nsi_peerport((msiod *) iod));
return buffer;
}