[245] Creating single ctor to handle both ipv4 and ipv6.

Author: dmitryborchuk

core/include/userver/engine/io/sockaddr.hpp

@@ -48,15 +48,10 @@ static_assert(
 /// Native ip multicast request wrapper
 class IpMreq final {
 public:
-    /// @brief Creates IPv4 multicast request.
-    /// @param imr_multiaddr IPv4 multicast group address (e.g., "239.255.0.1")
-    /// @param imr_interface IPv4 interface address (nullptr for INADDR_ANY)
-    IpMreq(const char* imr_multiaddr, const char* imr_interface = nullptr);
-
-    /// @brief Creates IPv6 multicast request.
-    /// @param ipv6mr_multiaddr IPv6 multicast group address (e.g., "ff02::1")
-    /// @param ipv6mr_interface Interface index (0 for default)
-    IpMreq(const char* ipv6mr_multiaddr, unsigned int ipv6mr_interface = 0);
+    /// @brief Creates multicast request. IP version is chosen automatically from ip_multiaddr value.
+    /// @param ip_multiaddr IP multicast group address (e.g. 239.255.0.1" or "ff02::1")
+    /// @param interface_index Interface index (0 for default);
+    IpMreq(const char* ip_multiaddr, unsigned int interface_index);
 
     /// @brief Native multicast request structure pointer.
     void* Data() { return &data_; }
@@ -75,11 +70,11 @@ class IpMreq final {
 
     /// Returns appropriate size for setsockopt based on address family.
     /// @param domain Socket domain (AF_INET or AF_INET6)
-    size_t Size() const noexcept { return (family_ == AF_INET ? sizeof(struct ip_mreq) : sizeof(struct ipv6_mreq)); }
+    size_t Size() const noexcept { return (family_ == AF_INET ? sizeof(struct ip_mreqn) : sizeof(struct ipv6_mreq)); }
 
 private:
     union Storage {
-        struct ip_mreq ip_req;
+        struct ip_mreqn ip_req;
         struct ipv6_mreq ipv6_req;
     } data_;
     int family_;

core/src/engine/io/sockaddr.cpp

@@ -18,36 +18,26 @@ USERVER_NAMESPACE_BEGIN
 
 namespace engine::io {
 
-IpMreq::IpMreq(const char* imr_multiaddr, const char* imr_interface) : family_{AF_INET} {
+IpMreq::IpMreq(const char* ip_multiaddr, unsigned int interface_index) {
     data_.ip_req = {};
-    struct ip_mreq* imr_ptr = &data_.ip_req;
-    if (::inet_pton(AF_INET, imr_multiaddr, &imr_ptr->imr_multiaddr) != 1) {
-        throw IpMulticastRequestException(
-            fmt::format("Invalid IPv4 multicast address: {}", imr_multiaddr)
-        );
+    if (inet_pton(AF_INET, ip_multiaddr, &data_.ip_req.imr_multiaddr) == 1) {
+        // imr_address field is not set since it's not used if imr_ifindex presents
+        family_ = AF_INET;
+        data_.ip_req.imr_ifindex = interface_index;
     }
-    if (imr_interface != nullptr) {
-        if (::inet_pton(AF_INET, imr_interface, &imr_ptr->imr_interface) != 1) {
+    else {
+        data_.ipv6_req = {};
+        if (inet_pton(AF_INET6, ip_multiaddr, &data_.ipv6_req.ipv6mr_multiaddr) == 1) {
+            family_ = AF_INET6;
+            data_.ipv6_req.ipv6mr_interface = interface_index;
+        } else {
             throw IpMulticastRequestException(
-                fmt::format("Invalid IPv4 interface address: {}", imr_interface)
+                fmt::format("Invalid IP address: {}", ip_multiaddr)
             );
         }
-    } else {
-        imr_ptr->imr_interface.s_addr = htonl(INADDR_ANY);
     }
 }
 
-IpMreq::IpMreq(const char* ipv6mr_multiaddr, unsigned int ipv6mr_interface) : family_{AF_INET6} {
-    data_.ipv6_req = {};
-    struct ipv6_mreq* req = &data_.ipv6_req;
-    if (inet_pton(AF_INET6, ipv6mr_multiaddr, &req->ipv6mr_multiaddr) != 1) {
-        throw IpMulticastRequestException(
-            fmt::format("Invalid IPv6 address: {}", ipv6mr_multiaddr)
-        );
-    }
-    req->ipv6mr_interface = ipv6mr_interface;
-}
-
 Sockaddr Sockaddr::MakeUnixSocketAddress(std::string_view path) {
     Sockaddr addr;
     auto* sa = addr.As<struct sockaddr_un>();