osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

Add osmo_sockaddr_in_to_str_and_uint() 

It's similar to osmo_sockaddr_to_str_and_uint() but does not require odd
typecasting for AF_INET case. Make osmo_sockaddr_to_str_and_uint() into
wrapper around new function and make sure to check for address family
before typecasting. Also use proper return type.

Change-Id: Ie384483124d407a960ab6732e6a7fd90554389d2
This commit is contained in:
Max 2018-11-20 15:18:31 +01:00
parent 72dfd43799
commit 9d7a247da4
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/osmocom/core/socket.h
View File

@ -11,6 +11,7 @@
#include <stdbool.h>
#include <stddef.h>
struct sockaddr_in;
struct sockaddr;
struct osmo_fd;
@ -49,6 +50,8 @@ int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen);
unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
const struct sockaddr *sa);
size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
const struct sockaddr_in *sin);
int osmo_sock_unix_init(uint16_t type, uint8_t proto,
const char *socket_path, unsigned int flags);

25
src/socket.c
View File

@ -569,6 +569,25 @@ int osmo_sockaddr_is_local(struct sockaddr *addr, unsigned int addrlen)
return 0;
}
/*! Convert sockaddr_in to IP address as char string and port as uint16_t.
* \param[out] addr String buffer to write IP address to, or NULL.
* \param[out] addr_len Size of \a addr.
* \param[out] port Pointer to uint16_t to write the port number to, or NULL.
* \param[in] sin Sockaddr to convert.
* \returns the required string buffer size, like osmo_strlcpy(), or 0 if \a addr is NULL.
*/
size_t osmo_sockaddr_in_to_str_and_uint(char *addr, unsigned int addr_len, uint16_t *port,
const struct sockaddr_in *sin)
{
if (port)
*port = ntohs(sin->sin_port);
if (addr)
return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len);
return 0;
}
/*! Convert sockaddr to IP address as char string and port as uint16_t.
* \param[out] addr String buffer to write IP address to, or NULL.
* \param[out] addr_len Size of \a addr.
@ -581,11 +600,7 @@ unsigned int osmo_sockaddr_to_str_and_uint(char *addr, unsigned int addr_len, ui
{
const struct sockaddr_in *sin = (const struct sockaddr_in *)sa;
if (port)
*port = ntohs(sin->sin_port);
if (addr)
return osmo_strlcpy(addr, inet_ntoa(sin->sin_addr), addr_len);
return 0;
return osmo_sockaddr_in_to_str_and_uint(addr, addr_len, port, sin);
}
/*! Initialize a unix domain socket (including bind/connect)