Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: extend getsockname and getaddrname with addr/port

This commit is contained in:
Dmitry Simonenko 2017-08-17 18:15:19 +03:00
parent ad8809acb2
commit 758666070d
2 changed files with 41 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sources/io.c
View File

@ -60,38 +60,67 @@ int od_write(machine_io_t *io, shapito_stream_t *stream)
return rc; return rc;
} }
int od_getsockaddrname(struct sockaddr *sa, char *buf, int size) static int
od_getsockaddrname(struct sockaddr *sa, char *buf, int size,
int add_addr,
int add_port)
{ {
char addr[128]; char addr[128];
if (sa->sa_family == AF_INET) { if (sa->sa_family == AF_INET) {
struct sockaddr_in *sin = (struct sockaddr_in*)sa; struct sockaddr_in *sin = (struct sockaddr_in*)sa;
inet_ntop(sa->sa_family, &sin->sin_addr, addr, sizeof(addr)); inet_ntop(sa->sa_family, &sin->sin_addr, addr, sizeof(addr));
if (add_addr && add_port)
snprintf(buf, size, "%s:%d", addr, ntohs(sin->sin_port)); snprintf(buf, size, "%s:%d", addr, ntohs(sin->sin_port));
else
if (add_addr)
snprintf(buf, size, "%s", addr);
else
if (add_port)
snprintf(buf, size, "%d", ntohs(sin->sin_port));
return 0; return 0;
} }
if (sa->sa_family == AF_INET6) { if (sa->sa_family == AF_INET6) {
struct sockaddr_in6 *sin = (struct sockaddr_in6*)sa; struct sockaddr_in6 *sin = (struct sockaddr_in6*)sa;
inet_ntop(sa->sa_family, &sin->sin6_addr, addr, sizeof(addr)); inet_ntop(sa->sa_family, &sin->sin6_addr, addr, sizeof(addr));
if (add_addr && add_port)
snprintf(buf, size, "[%s]:%d", addr, ntohs(sin->sin6_port)); snprintf(buf, size, "[%s]:%d", addr, ntohs(sin->sin6_port));
else
if (add_addr)
snprintf(buf, size, "%s", addr);
else
if (add_port)
snprintf(buf, size, "%d", ntohs(sin->sin6_port));
return 0; return 0;
} }
snprintf(buf, size, "unknown"); snprintf(buf, size, "%s", "");
return -1; return -1;
} }
int od_getaddrname(struct addrinfo *ai, char *buf, int size) int od_getaddrname(struct addrinfo *ai, char *buf, int size, int add_addr, int add_port)
{ {
return od_getsockaddrname(ai->ai_addr, buf, size); return od_getsockaddrname(ai->ai_addr, buf, size, add_addr, add_port);
} }
int od_getpeername(machine_io_t *io, char *buf, int size) int od_getpeername(machine_io_t *io, char *buf, int size, int add_addr, int add_port)
{ {
struct sockaddr_storage sa; struct sockaddr_storage sa;
int salen = sizeof(sa); int salen = sizeof(sa);
int rc = machine_getpeername(io, (struct sockaddr*)&sa, &salen); int rc = machine_getpeername(io, (struct sockaddr*)&sa, &salen);
if (rc < 0) { if (rc < 0) {
snprintf(buf, size, "unknown"); snprintf(buf, size, "%s", "");
return -1; return -1;
} }
return od_getsockaddrname((struct sockaddr*)&sa, buf, size); return od_getsockaddrname((struct sockaddr*)&sa, buf, size, add_addr, add_port);
}
int od_getsockname(machine_io_t *io, char *buf, int size, int add_addr, int add_port)
{
struct sockaddr_storage sa;
int salen = sizeof(sa);
int rc = machine_getsockname(io, (struct sockaddr*)&sa, &salen);
if (rc < 0) {
snprintf(buf, size, "%s", "");
return -1;
}
return od_getsockaddrname((struct sockaddr*)&sa, buf, size, add_addr, add_port);
} }

6
sources/io.h
View File

@ -9,8 +9,8 @@
int od_read(machine_io_t*, shapito_stream_t*, int); int od_read(machine_io_t*, shapito_stream_t*, int);
int od_write(machine_io_t*, shapito_stream_t*); int od_write(machine_io_t*, shapito_stream_t*);
int od_getpeername(machine_io_t*, char*, int); int od_getaddrname(struct addrinfo*, char*, int, int, int);
int od_getsockaddrname(struct sockaddr*, char*, int); int od_getpeername(machine_io_t*, char*, int, int, int);
int od_getaddrname(struct addrinfo*, char*, int); int od_getsockname(machine_io_t*, char*, int, int, int);
#endif /* OD_IO_H */ #endif /* OD_IO_H */