X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnetutl.c;h=3b5d5b05d7eb8ed2cc11109da1bd995ade9d656b;hp=95a168cacfb5054df8b94429280e4f929d1bbc5c;hb=106fc2b769a635142bf5f9233a2f03e3a0f26b7f;hpb=8b84c44175fedb81ca38107e0067ddea750add00 diff --git a/src/netutl.c b/src/netutl.c index 95a168ca..3b5d5b05 100644 --- a/src/netutl.c +++ b/src/netutl.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: netutl.c,v 1.12.4.29 2002/03/17 15:59:29 guus Exp $ + $Id: netutl.c,v 1.12.4.32 2002/03/18 14:39:37 guus Exp $ */ #include "config.h" @@ -43,6 +43,10 @@ #include "system.h" +#ifndef s6_addr32 +#define s6_addr32 __u6_addr.__u6_addr32 +#endif + int hostnames = 0; /* @@ -173,7 +177,7 @@ cp void sockaddrunmap(sockaddr_t *sa) { - if(IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) + if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) { sa->in.sin_addr.s_addr = sa->in6.sin6_addr.s6_addr32[3]; sa->in.sin_family = AF_INET;