[Minor] Copy ipv6 address in full on accept

diff --git a/src/libutil/addr.c b/src/libutil/addr.c
index 138dc1318a9e7a762ba4314a8b141956a5e95f43..15480a9ad121d014e68e11bb48f49a9d7c4085f2 100644 (file)
--- a/src/libutil/addr.c
+++ b/src/libutil/addr.c
@@ -248,18 +248,19 @@ rspamd_accept_from_socket (gint sock, rspamd_inet_addr_t **target,
                                addr = rspamd_inet_addr_create (AF_INET, NULL);
                                memcpy (&addr->u.in.addr.s4.sin_addr, &p[12],
                                                sizeof (struct in_addr));
+                               addr->u.in.addr.s4.sin_port = su.s6.sin6_port;
                        }
                        else {
                                /* Something strange but not mapped v4 address */
                                addr = rspamd_inet_addr_create (AF_INET6, NULL);
-                               memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr,
-                                               sizeof (struct in6_addr));
+                               memcpy (&addr->u.in.addr.s6, &su.s6,
+                                               sizeof (struct sockaddr_in6));
                        }
                }
                else {
                        addr = rspamd_inet_addr_create (AF_INET6, NULL);
-                       memcpy (&addr->u.in.addr.s6.sin6_addr, &su.s6.sin6_addr,
-                                       sizeof (struct in6_addr));
+                       memcpy (&addr->u.in.addr.s6, &su.s6,
+                                       sizeof (struct sockaddr_in6));
                }
 
        }