j3d1/tinc
1
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

Don't use s6_addr[16|32] anymore.

Browse source
This commit is contained in:
Guus Sliepen 2002-03-19 00:08:23 +00:00
parent 9d99a789c3
commit 5c2d74de86
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/netutl.c
View file

@ -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.32 2002/03/18 14:39:37 guus Exp $
$Id: netutl.c,v 1.12.4.33 2002/03/19 00:08:23 guus Exp $
*/
#include "config.h"
@ -43,10 +43,6 @@
#include "system.h"
#ifndef s6_addr32
#define s6_addr32 __u6_addr.__u6_addr32
#endif
int hostnames = 0;
/*
@ -179,7 +175,7 @@ void sockaddrunmap(sockaddr_t *sa)
{
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_addr.s_addr = ((uint32_t *)&sa->in6.sin6_addr)[3];
sa->in.sin_family = AF_INET;
}
}

10
src/route.c
View file

@ -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: route.c,v 1.1.2.36 2002/03/15 15:50:14 guus Exp $
$Id: route.c,v 1.1.2.37 2002/03/19 00:08:23 guus Exp $
*/
#include "config.h"
@ -52,10 +52,6 @@
#include "system.h"
#ifndef s6_addr16
#define s6_addr16 __u6_addr.__u6_addr16
#endif
int routing_mode = RMODE_ROUTER;
int priorityinheritance = 0;
int macexpire = 600;
@ -268,8 +264,8 @@ cp
if(debug_lvl >= DEBUG_TRAFFIC)
{
syslog(LOG_WARNING, _("Cannot route packet: neighbor solicitation request for unknown address %hx:%hx:%hx:%hx:%hx:%hx:%hx:%hx"),
ntohs(ns->nd_ns_target.s6_addr16[0]), ntohs(ns->nd_ns_target.s6_addr16[1]), ntohs(ns->nd_ns_target.s6_addr16[2]), ntohs(ns->nd_ns_target.s6_addr16[3]),
ntohs(ns->nd_ns_target.s6_addr16[4]), ntohs(ns->nd_ns_target.s6_addr16[5]), ntohs(ns->nd_ns_target.s6_addr16[6]), ntohs(ns->nd_ns_target.s6_addr16[7]));
ntohs(((uint16_t *)&ns->nd_ns_target)[0]), ntohs(((uint16_t *)&ns->nd_ns_target)[1]), ntohs(((uint16_t *)&ns->nd_ns_target)[2]), ntohs(((uint16_t *)&ns->nd_ns_target)[3]),
ntohs(((uint16_t *)&ns->nd_ns_target)[4]), ntohs(((uint16_t *)&ns->nd_ns_target)[5]), ntohs(((uint16_t *)&ns->nd_ns_target)[6]), ntohs(((uint16_t *)&ns->nd_ns_target)[7]));
}
return;