denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android does not support 'struct in6_pktinfo'.

Browse Source
This commit is contained in:
Tobias Brunner
2011-10-13 19:23:10 +02:00
parent c27c9529b7
commit 03ef4e3461
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libcharon/plugins/socket_raw/socket_raw_socket.c
+5 -1
View File
@@ -31,7 +31,6 @@
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <netinet/in.h> #include <netinet/in.h>
#include <netinet/ip.h> #include <netinet/ip.h>
#include <netinet/ip6.h>
#include <netinet/udp.h> #include <netinet/udp.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/filter.h> #include <linux/filter.h>
@@ -259,6 +258,8 @@ METHOD(socket_t, receiver, status_t,
DBG1(DBG_NET, "error reading IPv6 ancillary data"); DBG1(DBG_NET, "error reading IPv6 ancillary data");
return FAILED; return FAILED;
} }
#ifdef HAVE_IN6_PKTINFO
if (cmsgptr->cmsg_level == SOL_IPV6 && if (cmsgptr->cmsg_level == SOL_IPV6 &&
cmsgptr->cmsg_type == IPV6_2292PKTINFO) cmsgptr->cmsg_type == IPV6_2292PKTINFO)
{ {
@@ -273,6 +274,7 @@ METHOD(socket_t, receiver, status_t,
src.sin6_port = udp->source; src.sin6_port = udp->source;
dest = host_create_from_sockaddr((sockaddr_t*)&dst); dest = host_create_from_sockaddr((sockaddr_t*)&dst);
} }
#endif /* HAVE_IN6_PKTINFO */
} }
/* ancillary data missing? */ /* ancillary data missing? */
if (dest == NULL) if (dest == NULL)
@@ -397,6 +399,7 @@ METHOD(socket_t, sender, status_t,
sin = (struct sockaddr_in*)src->get_sockaddr(src); sin = (struct sockaddr_in*)src->get_sockaddr(src);
memcpy(&pktinfo->ipi_spec_dst, &sin->sin_addr, sizeof(struct in_addr)); memcpy(&pktinfo->ipi_spec_dst, &sin->sin_addr, sizeof(struct in_addr));
} }
#ifdef HAVE_IN6_PKTINFO
else else
{ {
char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))]; char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
@@ -414,6 +417,7 @@ METHOD(socket_t, sender, status_t,
sin = (struct sockaddr_in6*)src->get_sockaddr(src); sin = (struct sockaddr_in6*)src->get_sockaddr(src);
memcpy(&pktinfo->ipi6_addr, &sin->sin6_addr, sizeof(struct in6_addr)); memcpy(&pktinfo->ipi6_addr, &sin->sin6_addr, sizeof(struct in6_addr));
} }
#endif /* HAVE_IN6_PKTINFO */
} }
bytes_sent = sendmsg(skt, &msg, 0); bytes_sent = sendmsg(skt, &msg, 0);