laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/27263 )
Change subject: add osmo_sockaddr_set_port() ......................................................................
add osmo_sockaddr_set_port()
Do it like osmo_sockaddr_port() in reverse.
Related: SYS#5599 Change-Id: I9512e44c3203daebb3fe3435fceef167613c1a73 --- M include/osmocom/core/socket.h M src/socket.c 2 files changed, 18 insertions(+), 0 deletions(-)
Approvals: fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified
diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index fffc25c..183220d 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -96,6 +96,7 @@
const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); uint16_t osmo_sockaddr_port(const struct sockaddr *sa); +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port);
int osmo_sock_unix_init(uint16_t type, uint8_t proto, const char *socket_path, unsigned int flags); diff --git a/src/socket.c b/src/socket.c index 80cba17..4605db4 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1254,6 +1254,23 @@ return 0; }
+/*! Set sockaddr port content (to network byte order). + * \param[out] sa sockaddr to set the port of. + * \param[in] port port nr to set. + */ +void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port) +{ + struct osmo_sockaddr *osa = (struct osmo_sockaddr *)sa; + switch (osa->u.sa.sa_family) { + case AF_INET6: + osa->u.sin6.sin6_port = htons(port); + return; + case AF_INET: + osa->u.sin.sin_port = htons(port); + return; + } +} + /*! Initialize a unix domain socket (including bind/connect) * \param[in] type Socket type like SOCK_DGRAM, SOCK_STREAM * \param[in] proto Protocol like IPPROTO_TCP, IPPROTO_UDP