From 66aaabf34238aa3ddcbb328b370e2d5abae566b4 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Sun, 16 Jun 2013 20:05:08 +0200 Subject: [PATCH] tun-device: Packets sent over utun devices on Mac OS X have the protocol family prepended --- src/libstrongswan/networking/tun_device.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/libstrongswan/networking/tun_device.c b/src/libstrongswan/networking/tun_device.c index 00de2eddf5..af7e57140f 100644 --- a/src/libstrongswan/networking/tun_device.c +++ b/src/libstrongswan/networking/tun_device.c @@ -225,6 +225,12 @@ METHOD(tun_device_t, write_packet, bool, { ssize_t s; +#ifdef __APPLE__ + /* UTUN's expect the packets to be prepended by a 32-bit protocol number + * instead of parsing the packet again, we assume IPv4 for now */ + u_int32_t proto = htonl(AF_INET); + packet = chunk_cata("cc", chunk_from_thing(proto), packet); +#endif s = write(this->tunfd, packet.ptr, packet.len); if (s < 0) { @@ -271,6 +277,11 @@ METHOD(tun_device_t, read_packet, bool, return FALSE; } packet->len = len; +#ifdef __APPLE__ + /* UTUN's prepend packets with a 32-bit protocol number */ + packet->len -= sizeof(u_int32_t); + memmove(packet->ptr, packet->ptr + sizeof(u_int32_t), packet->len); +#endif return TRUE; } -- 2.47.3