[M] Change in libosmocore[master]: socket: Introduce API osmo_sockaddr_pton()
pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/44072?usp=email ) Change subject: socket: Introduce API osmo_sockaddr_pton() ...................................................................... socket: Introduce API osmo_sockaddr_pton() Related: SYS#7719 Change-Id: I196dc4ab58ab300e2b16daeb214278cfb9bb8226 --- M TODO-RELEASE M include/osmocom/core/socket.h M src/core/libosmocore.map M src/core/socket.c M tests/socket/socket_test.c 5 files changed, 88 insertions(+), 0 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve diff --git a/TODO-RELEASE b/TODO-RELEASE index 62281d3..5f1904b 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,3 +9,4 @@ #library what description / commit summary line vty added VTY node for libsosmo-sigtran L_CS7_QOS_CLASS_NODE vty added VTY nodes for libosmo-octoi L_OCTOI_SRV_NODE, L_OCTOI_ACCOUNT_NODE, L_OCTOI_CLNT_NODE, L_OCTOI_CLNT_ACCOUNT_NODE +core added osmo_sockaddr_pton() diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index 726e0d5..7a635f2 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -74,6 +74,7 @@ const struct sockaddr_in *sin); const char *osmo_sockaddr_ntop(const struct sockaddr *sa, char *dst); +int osmo_sockaddr_pton(const char *src, struct sockaddr *sa); uint16_t osmo_sockaddr_port(const struct sockaddr *sa); void osmo_sockaddr_set_port(struct sockaddr *sa, uint16_t port); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 0cb696b..602319d 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -406,6 +406,7 @@ osmo_sockaddr_netmask_to_prefixlen; osmo_sockaddr_ntop; osmo_sockaddr_port; +osmo_sockaddr_pton; osmo_sockaddr_set_port; osmo_sockaddr_str_cmp; osmo_sockaddr_str_from_32; diff --git a/src/core/socket.c b/src/core/socket.c index 3a2d7b7..9755e06 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1660,6 +1660,37 @@ dst, INET6_ADDRSTRLEN); } +/*! inet_pton() wrapper for a struct sockaddr. + * \param[in] src string buffer containing a potential IPv4 or IPv6 address. + * \param[out] dst destination sockaddr to store the encoded address + * \returns returns 1 on success (network address was successfully converted). + * 0 is returned if src does not contain a character string representing a + * valid IPv4 or IPv6 network address. + */ +int osmo_sockaddr_pton(const char *src, struct sockaddr *sa) +{ + struct osmo_sockaddr *osa = (struct osmo_sockaddr *)sa; + int rc; + + if (!src || !osa) + return 0; + + if (!!strchr(&src[0], ':')) { /* IPv6 */ + rc = inet_pton(AF_INET6, src, (void *)&osa->u.sin6.sin6_addr); + if (rc != 1) + return rc; + osa->u.sin6.sin6_family = AF_INET6; + return 1; + } + + /* Assume IPv4 or fail */ + rc = inet_pton(AF_INET, src, (void *)&osa->u.sin.sin_addr); + if (rc != 1) + return rc; + osa->u.sin6.sin6_family = AF_INET; + return 1; +} + /*! Get sockaddr port content (in host byte order) * \param[in] sa source sockaddr to get the port from. * \returns returns the sockaddr port in host byte order diff --git a/tests/socket/socket_test.c b/tests/socket/socket_test.c index 34130b2..ed315b3 100644 --- a/tests/socket/socket_test.c +++ b/tests/socket/socket_test.c @@ -455,6 +455,59 @@ OSMO_ASSERT(rc == 24); } +static void test_osa_pton(void) +{ + struct osmo_sockaddr osa; + struct sockaddr *sa = (struct sockaddr *)&osa; + int rc; + + rc = osmo_sockaddr_pton("0.0.0.0", sa); + OSMO_ASSERT(rc == 1); + OSMO_ASSERT(osa.u.sa.sa_family = AF_INET); + OSMO_ASSERT(osa.u.sin.sin_addr.s_addr == 0); + + rc = osmo_sockaddr_pton("255.255.255.255", sa); + OSMO_ASSERT(rc == 1); + OSMO_ASSERT(osa.u.sa.sa_family == AF_INET); + OSMO_ASSERT(osa.u.sin.sin_addr.s_addr == 0xffffffff); + + rc = osmo_sockaddr_pton("::", sa); + OSMO_ASSERT(rc == 1); + OSMO_ASSERT(osa.u.sa.sa_family == AF_INET6); + + rc = osmo_sockaddr_pton("fe::", sa); + OSMO_ASSERT(rc == 1); + OSMO_ASSERT(osa.u.sa.sa_family == AF_INET6); + + rc = osmo_sockaddr_pton("ff:ff::ff", sa); + OSMO_ASSERT(rc == 1); + OSMO_ASSERT(osa.u.sa.sa_family == AF_INET6); + + rc = osmo_sockaddr_pton("", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton(".", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton(":", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton("foobar", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton(".com", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton("foobar.com", sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton(NULL, sa); + OSMO_ASSERT(rc == 0); + + rc = osmo_sockaddr_pton(NULL, NULL); + OSMO_ASSERT(rc == 0); +} + const struct log_info_cat default_categories[] = { }; @@ -478,6 +531,7 @@ test_sockinit_osa(); test_osa_str(); test_osa_netmask_prefixlen(); + test_osa_pton(); return EXIT_SUCCESS; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/44072?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I196dc4ab58ab300e2b16daeb214278cfb9bb8226 Gerrit-Change-Number: 44072 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin@sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> Gerrit-Reviewer: laforge <laforge@osmocom.org> Gerrit-Reviewer: osmith <osmith@sysmocom.de> Gerrit-Reviewer: pespin <pespin@sysmocom.de>
participants (1)
-
pespin