diff options
| -rw-r--r-- | TODO-RELEASE | 1 | ||||
| -rw-r--r-- | include/osmocom/core/socket.h | 2 | ||||
| -rw-r--r-- | src/socket.c | 44 |
3 files changed, 46 insertions, 1 deletions
diff --git a/TODO-RELEASE b/TODO-RELEASE index fb0bfeab..5c6bfa3c 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line +libosmocore new function osmo_sock_get_name() diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 6ef0912e..4f00e300 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -38,4 +38,6 @@ int osmo_sock_unix_init(uint16_t type, uint8_t proto, int osmo_sock_unix_init_ofd(struct osmo_fd *ofd, uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); +char *osmo_sock_get_name(void *ctx, int fd); + /*! @} */ diff --git a/src/socket.c b/src/socket.c index cdafadd0..3c5548ff 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1,5 +1,5 @@ /* - * (C) 2011 by Harald Welte <laforge@gnumonks.org> + * (C) 2011-2017 by Harald Welte <laforge@gnumonks.org> * * All Rights Reserved * @@ -34,6 +34,7 @@ #include <osmocom/core/logging.h> #include <osmocom/core/select.h> #include <osmocom/core/socket.h> +#include <osmocom/core/talloc.h> #include <sys/ioctl.h> #include <sys/socket.h> @@ -393,6 +394,47 @@ int osmo_sock_unix_init_ofd(struct osmo_fd *ofd, uint16_t type, uint8_t proto, return osmo_fd_init_ofd(ofd, osmo_sock_unix_init(type, proto, socket_path, flags)); } +/*! \brief Get address/port information on soocket in dyn-alloc string + * \param[in] ctx talloc context from which to allocate string buffer + * \param[in] fd file descriptor of socket + * \returns string identifying the connection of this socket + */ +char *osmo_sock_get_name(void *ctx, int fd) +{ + struct sockaddr sa_l, sa_r; + socklen_t sa_len_l = sizeof(sa_l); + socklen_t sa_len_r = sizeof(sa_r); + char hostbuf_l[64], hostbuf_r[64]; + char portbuf_l[16], portbuf_r[16]; + int rc; + + rc = getsockname(fd, &sa_l, &sa_len_l); + if (rc < 0) + return NULL; + + rc = getnameinfo(&sa_l, sa_len_l, hostbuf_l, sizeof(hostbuf_l), + portbuf_l, sizeof(portbuf_l), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) + return NULL; + + rc = getpeername(fd, &sa_r, &sa_len_r); + if (rc < 0) + goto local_only; + + rc = getnameinfo(&sa_r, sa_len_r, hostbuf_r, sizeof(hostbuf_r), + portbuf_r, sizeof(portbuf_r), + NI_NUMERICHOST | NI_NUMERICSERV); + if (rc < 0) + goto local_only; + + return talloc_asprintf(ctx, "(%s:%s<->%s:%s)", hostbuf_r, portbuf_r, + hostbuf_l, portbuf_l); + +local_only: + return talloc_asprintf(ctx, "(NULL<->%s:%s)", hostbuf_l, portbuf_l); +} + #endif /* HAVE_SYS_SOCKET_H */ /*! @} */ |