add get_sockaddr + tests

to convert textual representation of host:port to sockaddr

having this new function, we can also test get_sockaddr_str

Author: MartinPulec

src/rtp/net_udp.c

@@ -1394,6 +1394,13 @@ int udp_fd(socket_udp * s)
         return 0;
 }
 
+/**
+ * @param[in]  mode  IP version preference (4 or 6) or 0 for none;
+                     if 0 is requested, v4-mapped IPv6 address is returned
+ * @param[out] mode  sockaddr struct version - 4 for input mode 4, 6 otherwise
+ *
+ * @returns 0 on success, GAI error on failure
+ */
 int resolve_addrinfo(const char *addr, uint16_t tx_port,
                 struct sockaddr_storage *dst, socklen_t *len, int *mode)
 {

src/utils/net.c

@@ -34,6 +34,12 @@
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+ /**
+  * @todo
+  * move/use common network defs from compat/net.h
+  */
+
+#include "utils/net.h"
 
 #ifdef _WIN32
 #include <winsock2.h>
@@ -49,20 +55,19 @@ typedef SOCKET fd_t;
 #include <sys/socket.h>
 #include <sys/types.h>
 #include <unistd.h>
-#define closesocket close
 #define INVALID_SOCKET (-1)
 typedef int fd_t;
 #endif
 
 #include <assert.h>
 #include <ctype.h>
 #include <errno.h>
-#include <limits.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 
-#include "utils/net.h"
+#include "rtp/net_udp.h"   // for resolve_addrinfo
+#include "utils/macros.h"  // for STR_LEN
 #include "utils/windows.h"
 
 #include "debug.h"
@@ -406,7 +411,7 @@ bool is_ipv6_supported(void)
                 return false;
         }
         if (fd != INVALID_SOCKET) {
-                closesocket(fd);
+                CLOSESOCKET(fd);
         }
         return true;
 }
@@ -451,6 +456,68 @@ get_sockaddr_str(const struct sockaddr *sa, unsigned sa_len, char *buf,
         return buf;
 }
 
+/**
+ * @brief counterpart of get_sockaddr_str()
+ *
+ * @param mode  mode to enforce 4, 6 or 0 (auto, as @ref resolve_addrinfo
+ * returns v4-mapped IPv6 address for 0, the returned address will be aiways in
+ * sockaddr_in6, either native or v4-mapped)
+ *
+ * @note
+ * Even for dot-decimal IPv4 address, sockaddr_in6 struct with v4-mapped
+ * address may be returned (Linux).
+ *
+ * Converts from textual representation of <host>:<port> to sockaddr_storage.
+ * IPv6 numeric addresses must be enclosed in [] brackets.
+ */
+struct sockaddr_storage
+get_sockaddr(const char *hostport, int mode)
+{
+        struct sockaddr_storage ret;
+        socklen_t               socklen_unused = 0;
+        char host[STR_LEN];
+
+        ret.ss_family = AF_UNSPEC;
+        const char *const rightmost_colon = strrchr(hostport, ':');
+        if (rightmost_colon == NULL) {
+                MSG(ERROR, "Address %s not in format host:port!\n", hostport);
+                return ret;
+        }
+        if (rightmost_colon == hostport) {
+                MSG(ERROR, "Empty host spec: %s!\n", hostport);
+                return ret;
+        }
+
+        const char *const port_str = rightmost_colon + 1;
+        char             *endptr   = NULL;
+        long port = strtol(port_str, &endptr, 10);
+        if (*endptr != '\0') {
+                MSG(ERROR, "Wrong port value: %s\n", port_str);
+                return ret;
+        }
+        if (port < 0 || port > UINT16_MAX) {
+                MSG(ERROR, "Port %ld out of range!\n", port);
+                return ret;
+        }
+
+        const char *host_start = hostport;
+        const char *host_end = rightmost_colon;
+        if (*host_start == '[') { // skip IPv6 []
+                host_start += 1;
+                if (host_end[-1] != ']') {
+                        MSG(ERROR, "Malformed IPv6 host (missing ]): %s\n",
+                            hostport);
+                        return ret;
+                }
+                host_end -= 1;
+        }
+
+        const size_t len = host_end - host_start;
+        snprintf(host, MIN(sizeof host, len + 1), "%s", host_start);
+        resolve_addrinfo(host, port, &ret, &socklen_unused, &mode);
+        return ret;
+}
+
 const char *ug_gai_strerror(int errcode)
 {
 #ifdef _WIN32

src/utils/net.h

@@ -89,6 +89,7 @@ bool get_local_addresses(struct sockaddr_storage *addrs, size_t *len, int ip_ver
 bool is_ipv6_supported(void);
 char *get_sockaddr_str(const struct sockaddr *sa, unsigned sa_len, char *buf,
                        size_t n);
+struct sockaddr_storage get_sockaddr(const char *hostport, int mode);
 const char *ug_gai_strerror(int errcode);
 
 #ifdef _WIN32

test/misc_test.cpp

@@ -6,6 +6,7 @@
 
 #include "color.h"
 #include "types.h"
+#include "utils/net.h"
 #include "utils/string.h"
 #include "unit_common.h"
 #include "video.h"
@@ -15,6 +16,7 @@ extern "C" {
 int misc_test_color_coeff_range();
 int misc_test_replace_all();
 int misc_test_video_desc_io_op_symmetry();
+int misc_test_net_getsockaddr();
 }
 
 using namespace std;
@@ -66,6 +68,46 @@ misc_test_color_coeff_range()
         return 0;
 }
 
+int
+misc_test_net_getsockaddr()
+{
+        struct {
+                const char *str;
+                int ip_mode;
+        } test_cases[] = {
+                { "10.0.0.1:10",          4 },
+                { "[100::1:abcd]:10",     6 },
+#if defined   __APPLE__
+                { "[fe80::123%lo0]:1000", 6 },
+#elif defined __linux__
+                { "[fe80::123%lo]:1000",  6 },
+#elif defined _WIN32
+                { "[fe80::123%1]:1000",   6 },
+#endif
+        };
+        for (unsigned i = 0; i < sizeof test_cases / sizeof test_cases[0];
+             ++i) {
+                struct sockaddr_storage ss =
+                    get_sockaddr(test_cases[i].str, test_cases[i].ip_mode);
+                char buf[ADDR_STR_BUF_LEN] = "";
+                get_sockaddr_str((struct sockaddr *) &ss, sizeof ss, buf,
+                                 sizeof buf);
+                char msg[2048];
+                snprintf(msg, sizeof msg,
+                         "get_sockaddr_str conversion of '%s' failed",
+                         test_cases[i].str);
+                ASSERT_MESSAGE(msg, ss.ss_family != AF_UNSPEC);
+                snprintf(
+                    msg, sizeof msg,
+                    "sockaddr output string '%s' doesn't match the input '%s'",
+                    buf, test_cases[i].str);
+
+                ASSERT_MESSAGE(msg, strcmp(test_cases[i].str, buf) == 0);
+        }
+
+        return 0;
+}
+
 #ifdef __clang__
 #pragma clang diagnostic ignored "-Wstring-concatenation"
 #endif

test/run_tests.c

@@ -87,6 +87,7 @@ DECLARE_TEST(get_framerate_test_free);
 DECLARE_TEST(gpujpeg_test_simple);
 DECLARE_TEST(libavcodec_test_get_decoder_from_uv_to_uv);
 DECLARE_TEST(misc_test_color_coeff_range);
+DECLARE_TEST(misc_test_net_getsockaddr);
 DECLARE_TEST(misc_test_replace_all);
 DECLARE_TEST(misc_test_video_desc_io_op_symmetry);
 
@@ -121,6 +122,7 @@ struct {
         DEFINE_TEST(gpujpeg_test_simple),
         DEFINE_TEST(libavcodec_test_get_decoder_from_uv_to_uv),
         DEFINE_TEST(misc_test_color_coeff_range),
+        DEFINE_TEST(misc_test_net_getsockaddr),
         DEFINE_TEST(misc_test_replace_all),
         DEFINE_TEST(misc_test_video_desc_io_op_symmetry),
 };