set IPv4 source address correctly on Windows

[catta] / src / socket.c

diff --git a/src/socket.c b/src/socket.c
index dc989d8ac466f1647a5aa278b5ee980b667aae77..7e893a0e041b03a557c05deae8316251f0be9729 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -464,9 +464,12 @@ static int sendmsg_loop(int fd, struct msghdr *msg, int flags) {
 
         if (errno != EAGAIN && errno != EWOULDBLOCK) {
             char where[64];
-            struct sockaddr_in *sin = msg->msg_name;
+            struct sockaddr *sa = msg->msg_name;
 
-            inet_ntop(sin->sin_family, &sin->sin_addr, where, sizeof(where));
+            if(sa->sa_family == AF_INET)
+                inet_ntop(sa->sa_family, &((struct sockaddr_in *)sa)->sin_addr, where, sizeof(where));
+            else
+                inet_ntop(sa->sa_family, &((struct sockaddr_in6 *)sa)->sin6_addr, where, sizeof(where));
             catta_log_debug("sendmsg() to %s failed: %s", where, errnostrsocket());
             return -1;
         }
@@ -541,6 +544,9 @@ int catta_send_dns_packet_ipv4(
 #ifdef HAVE_IPI_SPEC_DST
         if (src_address)
             pkti->ipi_spec_dst.s_addr = src_address->address;
+#else
+        if (src_address)
+            pkti->ipi_addr.s_addr = src_address->address;
 #endif
     }
 #elif defined(IP_MULTICAST_IF)