niklas/cyclonedds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename os_sockaddr_size to os_sockaddr_get_size for consitency

Browse source 
Signed-off-by: Jeroen Koekkoek <jeroen@koekkoek.nl>
This commit is contained in:
Jeroen Koekkoek 2018-10-24 15:48:45 +02:00
parent 0324f36dd2
commit 25198e565b
5 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core/ddsi/src/ddsi_tcp.c
View file

@ -560,7 +560,7 @@ static ssize_t ddsi_tcp_conn_write (ddsi_tran_conn_t base, const nn_locator_t *d
memset(&msg, 0, sizeof(msg)); memset(&msg, 0, sizeof(msg));
set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov); set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov);
msg.msg_name = &dstaddr; msg.msg_name = &dstaddr;
msg.msg_namelen = (socklen_t) os_sockaddr_size((os_sockaddr *) &dstaddr); msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr);
#if SYSDEPS_MSGHDR_FLAGS #if SYSDEPS_MSGHDR_FLAGS
msg.msg_flags = (int) flags; msg.msg_flags = (int) flags;
#endif #endif
@ -867,7 +867,7 @@ static ddsi_tcp_conn_t ddsi_tcp_new_conn (os_socket sock, bool server, os_sockad
ddsi_tcp_base_init (&conn->m_base); ddsi_tcp_base_init (&conn->m_base);
os_mutexInit (&conn->m_mutex); os_mutexInit (&conn->m_mutex);
conn->m_sock = Q_INVALID_SOCKET; conn->m_sock = Q_INVALID_SOCKET;
(void)memcpy(&conn->m_peer_addr, peer, os_sockaddr_size(peer)); (void)memcpy(&conn->m_peer_addr, peer, os_sockaddr_get_size(peer));
conn->m_peer_port = os_sockaddr_get_port (peer); conn->m_peer_port = os_sockaddr_get_port (peer);
conn->m_base.m_server = server; conn->m_base.m_server = server;
conn->m_base.m_base.m_port = INVALID_PORT; conn->m_base.m_base.m_port = INVALID_PORT;
@ -1009,7 +1009,7 @@ static void ddsi_tcp_unblock_listener (ddsi_tran_listener_t listener)
} }
do do
{ {
ret = connect (sock, (struct sockaddr *) &addr, (unsigned) os_sockaddr_size((os_sockaddr *)&addr)); ret = connect (sock, (struct sockaddr *) &addr, (unsigned) os_sockaddr_get_size((os_sockaddr *)&addr));
} }
while ((ret == -1) && (os_getErrno() == os_sockEINTR)); while ((ret == -1) && (os_getErrno() == os_sockEINTR));
if (ret == -1) if (ret == -1)

2
src/core/ddsi/src/ddsi_udp.c
View file

@ -121,7 +121,7 @@ static ssize_t ddsi_udp_conn_write (ddsi_tran_conn_t conn, const nn_locator_t *d
ddsi_ipaddr_from_loc(&dstaddr, dst); ddsi_ipaddr_from_loc(&dstaddr, dst);
set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov); set_msghdr_iov (&msg, (ddsi_iovec_t *) iov, niov);
msg.msg_name = &dstaddr; msg.msg_name = &dstaddr;
msg.msg_namelen = (socklen_t) os_sockaddr_size((os_sockaddr *) &dstaddr); msg.msg_namelen = (socklen_t) os_sockaddr_get_size((os_sockaddr *) &dstaddr);
#if !defined(__sun) || defined(_XPG4_2) #if !defined(__sun) || defined(_XPG4_2)
msg.msg_control = NULL; msg.msg_control = NULL;
msg.msg_controllen = 0; msg.msg_controllen = 0;

2
src/os/include/os/os_socket.h
View file

@ -257,7 +257,7 @@ extern "C" {
* @pre sa is a valid os_sockaddr pointer. * @pre sa is a valid os_sockaddr pointer.
*/ */
OSAPI_EXPORT size_t OSAPI_EXPORT size_t
os_sockaddr_size( os_sockaddr_get_size(
const os_sockaddr *const sa) __nonnull_all__; const os_sockaddr *const sa) __nonnull_all__;
/** /**

4
src/os/src/os_socket.c
View file

@ -46,14 +46,14 @@ const os_in6_addr os_in6addr_loopback = { { { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1 }
#endif #endif
size_t size_t
os_sockaddr_size(const os_sockaddr *const sa) os_sockaddr_get_size(const os_sockaddr *const sa)
{ {
size_t sz; size_t sz;
assert(sa != NULL); assert(sa != NULL);
switch(sa->sa_family) { switch(sa->sa_family) {
#if (OS_SOCKET_HAS_IPV6 == 1) #if OS_SOCKET_HAS_IPV6
case AF_INET6: case AF_INET6:
sz = sizeof(os_sockaddr_in6); sz = sizeof(os_sockaddr_in6);
break; break;

2
src/os/src/posix/os_platform_ifaddrs.c
View file

@ -24,7 +24,7 @@ copyaddr(os_ifaddrs_t **ifap, const struct ifaddrs *sys_ifa)
assert(ifap != NULL); assert(ifap != NULL);
assert(sys_ifa != NULL); assert(sys_ifa != NULL);
sz = os_sockaddr_size(sys_ifa->ifa_addr); sz = os_sockaddr_get_size(sys_ifa->ifa_addr);
ifa = os_calloc_s(1, sizeof(*ifa)); ifa = os_calloc_s(1, sizeof(*ifa));
if (ifa == NULL) { if (ifa == NULL) {
err = errno; err = errno;