socket_t implementation withouth raw sockets
authorMartin Willi <martin@strongswan.org>
Mon, 26 Nov 2007 11:20:00 +0000 (11:20 -0000)
committerMartin Willi <martin@strongswan.org>
Mon, 26 Nov 2007 11:20:00 +0000 (11:20 -0000)
  --disable-raw-socket configure option
  prevents charon/pluto to run in parallel

configure.in
src/charon/Makefile.am
src/charon/daemon.c
src/charon/network/socket-raw.c [new file with mode: 0644]
src/charon/network/socket.c
src/charon/network/socket.h

index e534c10..572d6f6 100644 (file)
@@ -306,6 +306,18 @@ AC_ARG_ENABLE(
 )
 AM_CONDITIONAL(USE_SELF_TEST, test x$self_test = xtrue)
 
+AC_ARG_ENABLE(
+    [raw-socket],
+    AS_HELP_STRING([--disable-raw-socket],[disable charons RAW socket and use a normal socket instead. Prevents charon and pluto to run in parallel. (default is NO).]),
+    [if test x$enableval = xyes; then
+        raw_socket=true
+     else
+        raw_socket=false
+    fi],
+    raw_socket=true
+)
+AM_CONDITIONAL(USE_RAW_SOCKET, test x$raw_socket = xtrue)
+
 dnl =========================
 dnl  check required programs
 dnl =========================
index 0d783cb..e54c78a 100644 (file)
@@ -45,7 +45,7 @@ kernel/kernel_interface.c kernel/kernel_interface.h \
 network/packet.c network/packet.h \
 network/receiver.c network/receiver.h \
 network/sender.c network/sender.h \
-network/socket.c network/socket.h \
+network/socket.h \
 processing/jobs/job.h \
 processing/jobs/acquire_job.c processing/jobs/acquire_job.h \
 processing/jobs/callback_job.c processing/jobs/callback_job.h \
@@ -85,6 +85,12 @@ sa/tasks/ike_rekey.c sa/tasks/ike_rekey.h \
 sa/tasks/ike_reauth.c sa/tasks/ike_reauth.h \
 sa/tasks/task.c sa/tasks/task.h
 
+if USE_RAW_SOCKET
+  charon_SOURCES += network/socket-raw.c
+else
+  charon_SOURCES += network/socket.c
+endif
+
 if USE_P2P
   charon_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
index 9e151c3..ee97104 100644 (file)
@@ -338,7 +338,7 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
        this->public.interfaces = interface_manager_create();
        this->public.backends = backend_manager_create();
        this->public.kernel_interface = kernel_interface_create();
-       this->public.socket = socket_create(IKEV2_UDP_PORT, IKEV2_NATT_PORT);
+       this->public.socket = socket_create();
        this->public.sender = sender_create();
        this->public.receiver = receiver_create();
        
diff --git a/src/charon/network/socket-raw.c b/src/charon/network/socket-raw.c
new file mode 100644 (file)
index 0000000..3b76ae5
--- /dev/null
@@ -0,0 +1,771 @@
+/**
+ * @file socket.c
+ *
+ * @brief Implementation of socket_t.
+ *
+ */
+
+/*
+ * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
+ * Copyright (C) 2005-2006 Martin Willi
+ * Copyright (C) 2005 Jan Hutter
+ * Hochschule fuer Technik Rapperswil
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.  See <http://www.fsf.org/copyleft/gpl.txt>.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * for more details.
+ */
+
+#include <pthread.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <string.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/ip6.h>
+#include <netinet/udp.h>
+#include <linux/ipsec.h>
+#include <linux/filter.h>
+#include <net/if.h>
+
+#include "socket.h"
+
+#include <daemon.h>
+
+/* constants for packet handling */
+#define IP_LEN sizeof(struct iphdr)
+#define IP6_LEN sizeof(struct ip6_hdr)
+#define UDP_LEN sizeof(struct udphdr)
+#define MARKER_LEN sizeof(u_int32_t)
+
+/* offsets for packet handling */
+#define IP_PROTO_OFFSET 9
+#define IP6_PROTO_OFFSET 6
+#define IKE_VERSION_OFFSET 17
+#define IKE_LENGTH_OFFSET 24
+
+/* from linux/in.h */
+#ifndef IP_IPSEC_POLICY
+#define IP_IPSEC_POLICY 16
+#endif /*IP_IPSEC_POLICY*/
+
+/* from linux/udp.h */
+#ifndef UDP_ENCAP
+#define UDP_ENCAP 100
+#endif /*UDP_ENCAP*/
+
+#ifndef UDP_ENCAP_ESPINUDP
+#define UDP_ENCAP_ESPINUDP 2
+#endif /*UDP_ENCAP_ESPINUDP*/
+
+/* needed for older kernel headers */
+#ifndef IPV6_2292PKTINFO
+#define IPV6_2292PKTINFO 2
+#endif /*IPV6_2292PKTINFO*/
+
+/* missing on uclibc */
+#ifndef IPV6_IPSEC_POLICY
+#define IPV6_IPSEC_POLICY 34
+#endif /*IPV6_IPSEC_POLICY*/
+
+typedef struct private_socket_t private_socket_t;
+
+/**
+ * Private data of an socket_t object
+ */
+struct private_socket_t{
+       /**
+        * public functions
+        */
+        socket_t public;
+
+        /**
+         * regular port
+         */
+        int port;
+
+        /**
+         * port used for nat-t
+         */
+        int natt_port;
+        
+        /**
+         * raw receiver socket for IPv4
+         */
+        int recv4;
+        
+        /**
+         * raw receiver socket for IPv6
+         */
+        int recv6;
+
+        /**
+         * send socket on regular port for IPv4
+         */
+        int send4;
+
+        /**
+         * send socket on regular port for IPv6
+         */
+        int send6;
+
+        /**
+         * send socket on nat-t port for IPv4
+         */
+        int send4_natt;
+
+        /**
+         * send socket on nat-t port for IPv6
+         */
+        int send6_natt;
+};
+
+/**
+ * implementation of socket_t.receive
+ */
+static status_t receiver(private_socket_t *this, packet_t **packet)
+{
+       char buffer[MAX_PACKET];
+       chunk_t data;
+       packet_t *pkt;
+       struct udphdr *udp;
+       host_t *source = NULL, *dest = NULL;
+       int bytes_read = 0;
+       int data_offset, oldstate;
+       fd_set rfds;
+
+       FD_ZERO(&rfds);
+       
+       if (this->recv4)
+       {
+               FD_SET(this->recv4, &rfds);
+       }
+       if (this->recv6)
+       {
+               FD_SET(this->recv6, &rfds);
+       }
+       
+       DBG2(DBG_NET, "waiting for data on raw sockets");
+       
+       pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
+       if (select(max(this->recv4, this->recv6) + 1, &rfds, NULL, NULL, NULL) <= 0)
+       {
+               pthread_setcancelstate(oldstate, NULL);
+               return FAILED;
+       }
+       pthread_setcancelstate(oldstate, NULL);
+       
+       if (this->recv4 && FD_ISSET(this->recv4, &rfds))
+       {
+               /* IPv4 raw sockets return the IP header. We read src/dest
+                * information directly from the raw header */
+               struct iphdr *ip;
+               struct sockaddr_in src, dst;
+               
+               bytes_read = recv(this->recv4, buffer, MAX_PACKET, 0);
+               if (bytes_read < 0)
+               {
+                       DBG1(DBG_NET, "error reading from IPv4 socket: %s", strerror(errno));
+                       return FAILED;
+               }
+               DBG3(DBG_NET, "received IPv4 packet %b", buffer, bytes_read);
+               
+               /* read source/dest from raw IP/UDP header */
+               if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
+               {
+                       DBG1(DBG_NET, "received IPv4 packet too short (%d bytes)",
+                                bytes_read);
+                       return FAILED;
+               }
+               ip = (struct iphdr*) buffer;
+               udp = (struct udphdr*) (buffer + IP_LEN);
+               src.sin_family = AF_INET;
+               src.sin_addr.s_addr = ip->saddr;
+               src.sin_port = udp->source;
+               dst.sin_family = AF_INET;
+               dst.sin_addr.s_addr = ip->daddr;
+               dst.sin_port = udp->dest;
+               source = host_create_from_sockaddr((sockaddr_t*)&src);
+               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
+               
+               pkt = packet_create();
+               pkt->set_source(pkt, source);
+               pkt->set_destination(pkt, dest);
+               DBG2(DBG_NET, "received packet: from %#H to %#H", source, dest);
+               data_offset = IP_LEN + UDP_LEN;
+               /* remove non esp marker */     
+               if (dest->get_port(dest) == IKEV2_NATT_PORT)
+               {
+                       data_offset += MARKER_LEN;
+               }
+               /* fill in packet */
+               data.len = bytes_read - data_offset;
+               data.ptr = malloc(data.len);
+               memcpy(data.ptr, buffer + data_offset, data.len);
+               pkt->set_data(pkt, data);
+       }
+       else if (this->recv6 && FD_ISSET(this->recv6, &rfds))
+       {
+               /* IPv6 raw sockets return no IP header. We must query
+                * src/dest via socket options/ancillary data */
+               struct msghdr msg;
+               struct cmsghdr *cmsgptr;
+               struct sockaddr_in6 src, dst;
+               struct iovec iov;
+               char ancillary[64];
+               
+               msg.msg_name = &src;
+               msg.msg_namelen = sizeof(src);
+               iov.iov_base = buffer;
+               iov.iov_len = sizeof(buffer);
+               msg.msg_iov = &iov;
+               msg.msg_iovlen = 1;
+               msg.msg_control = ancillary;
+               msg.msg_controllen = sizeof(ancillary);
+               msg.msg_flags = 0;
+               
+               bytes_read = recvmsg(this->recv6, &msg, 0);
+               if (bytes_read < 0)
+               {
+                       DBG1(DBG_NET, "error reading from IPv6 socket: %s", strerror(errno));
+                       return FAILED;
+               }
+               DBG3(DBG_NET, "received IPv6 packet %b", buffer, bytes_read);
+               
+               if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
+               {
+                       DBG3(DBG_NET, "received IPv6 packet too short (%d bytes)",
+                                bytes_read);
+                       return FAILED;
+               }
+               
+               /* read ancillary data to get destination address */
+               for (cmsgptr = CMSG_FIRSTHDR(&msg); cmsgptr != NULL;
+                        cmsgptr = CMSG_NXTHDR(&msg, cmsgptr))
+               {
+                       if (cmsgptr->cmsg_len == 0)
+                       {
+                               DBG1(DBG_NET, "error reading IPv6 ancillary data");
+                               return FAILED;
+                       }       
+                       if (cmsgptr->cmsg_level == SOL_IPV6 &&
+                               cmsgptr->cmsg_type == IPV6_2292PKTINFO)
+                       {
+                               struct in6_pktinfo *pktinfo;
+                               pktinfo = (struct in6_pktinfo*)CMSG_DATA(cmsgptr);
+                               
+                               memset(&dst, 0, sizeof(dst));
+                               memcpy(&dst.sin6_addr, &pktinfo->ipi6_addr, sizeof(dst.sin6_addr));
+                               dst.sin6_family = AF_INET6;
+                               udp = (struct udphdr*) (buffer);
+                               dst.sin6_port = udp->dest;
+                               src.sin6_port = udp->source;
+                               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
+                       }
+               }
+               /* ancillary data missing? */
+               if (dest == NULL)
+               {
+                       DBG1(DBG_NET, "error reading IPv6 packet header");
+                       return FAILED;
+               }
+               
+               source = host_create_from_sockaddr((sockaddr_t*)&src);
+               
+               pkt = packet_create();
+               pkt->set_source(pkt, source);
+               pkt->set_destination(pkt, dest);
+               DBG2(DBG_NET, "received packet: from %#H to %#H", source, dest);
+               data_offset = UDP_LEN;
+               /* remove non esp marker */     
+               if (dest->get_port(dest) == IKEV2_NATT_PORT)
+               {
+                       data_offset += MARKER_LEN;
+               }
+               /* fill in packet */
+               data.len = bytes_read - data_offset;
+               data.ptr = malloc(data.len);
+               memcpy(data.ptr, buffer + data_offset, data.len);
+               pkt->set_data(pkt, data);
+       }
+       else
+       {
+               /* oops, shouldn't happen */
+               return FAILED;
+       }
+       
+       /* return packet */
+       *packet = pkt;
+       return SUCCESS;
+}
+
+/**
+ * implementation of socket_t.send
+ */
+status_t sender(private_socket_t *this, packet_t *packet)
+{
+       int sport, skt, family;
+       ssize_t bytes_sent;
+       chunk_t data, marked;
+       host_t *src, *dst;
+       struct msghdr msg;
+       struct cmsghdr *cmsg;
+       struct iovec iov;
+       
+       src = packet->get_source(packet);
+       dst = packet->get_destination(packet);
+       data = packet->get_data(packet);
+
+       DBG2(DBG_NET, "sending packet: from %#H to %#H", src, dst);
+       
+       /* send data */
+       sport = src->get_port(src);
+       family = dst->get_family(dst);
+       if (sport == IKEV2_UDP_PORT)
+       {
+               if (family == AF_INET)
+               {
+                       skt = this->send4;
+               }
+               else
+               {
+                       skt = this->send6;
+               }
+       }
+       else if (sport == IKEV2_NATT_PORT)
+       {
+               if (family == AF_INET)
+               {
+                       skt = this->send4_natt;
+               }
+               else
+               {
+                       skt = this->send6_natt;
+               }
+               /* NAT keepalives without marker */
+               if (data.len != 1 || data.ptr[0] != 0xFF)
+               {
+                       /* add non esp marker to packet */
+                       if (data.len > MAX_PACKET - MARKER_LEN)
+                       {
+                               DBG1(DBG_NET, "unable to send packet: it's too big (%d bytes)",
+                                        data.len);
+                               return FAILED;
+                       }
+                       marked = chunk_alloc(data.len + MARKER_LEN);
+                       memset(marked.ptr, 0, MARKER_LEN);
+                       memcpy(marked.ptr + MARKER_LEN, data.ptr, data.len);
+                       /* let the packet do the clean up for us */
+                       packet->set_data(packet, marked);
+                       data = marked;
+               }
+       }
+       else
+       {
+               DBG1(DBG_NET, "unable to locate a send socket for port %d", sport);
+               return FAILED;
+       }
+       
+       memset(&msg, 0, sizeof(struct msghdr));
+       msg.msg_name = dst->get_sockaddr(dst);;
+       msg.msg_namelen = *dst->get_sockaddr_len(dst);
+       iov.iov_base = data.ptr;
+       iov.iov_len = data.len;
+       msg.msg_iov = &iov;
+       msg.msg_iovlen = 1;
+       msg.msg_flags = 0;
+       
+       if (!dst->is_anyaddr(dst))
+       {
+               if (family == AF_INET)
+               {
+                       char buf[CMSG_SPACE(sizeof(struct in_pktinfo))];
+                       struct in_pktinfo *pktinfo;
+                       struct sockaddr_in *sin;
+                       
+                       msg.msg_control = buf;
+                       msg.msg_controllen = sizeof(buf);
+                       cmsg = CMSG_FIRSTHDR(&msg);
+                       cmsg->cmsg_level = SOL_IP;
+                       cmsg->cmsg_type = IP_PKTINFO;
+                       cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
+                       pktinfo = (struct in_pktinfo*)CMSG_DATA(cmsg);
+                       memset(pktinfo, 0, sizeof(struct in_pktinfo));
+                       sin = (struct sockaddr_in*)src->get_sockaddr(src);
+                       memcpy(&pktinfo->ipi_spec_dst, &sin->sin_addr, sizeof(struct in_addr));
+               }
+               else
+               {
+                       char buf[CMSG_SPACE(sizeof(struct in6_pktinfo))];
+                       struct in6_pktinfo *pktinfo;
+                       struct sockaddr_in6 *sin;
+                       
+                       msg.msg_control = buf;
+                       msg.msg_controllen = sizeof(buf);
+                       cmsg = CMSG_FIRSTHDR(&msg);
+                       cmsg->cmsg_level = SOL_IPV6;
+                       cmsg->cmsg_type = IPV6_2292PKTINFO;
+                       cmsg->cmsg_len = CMSG_LEN(sizeof(struct in6_pktinfo));
+                       pktinfo = (struct in6_pktinfo*)CMSG_DATA(cmsg);
+                       memset(pktinfo, 0, sizeof(struct in6_pktinfo));
+                       sin = (struct sockaddr_in6*)src->get_sockaddr(src);
+                       memcpy(&pktinfo->ipi6_addr, &sin->sin6_addr, sizeof(struct in6_addr));
+               }
+       }
+       
+       bytes_sent = sendmsg(skt, &msg, 0);
+
+       if (bytes_sent != data.len)
+       {
+               DBG1(DBG_NET, "error writing to socket: %s", strerror(errno));
+               return FAILED;
+       }
+       return SUCCESS;
+}
+
+/**
+ * open a socket to send packets
+ */
+static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
+{
+       int on = TRUE;
+       int type = UDP_ENCAP_ESPINUDP;
+       struct sockaddr_storage addr;
+       u_int sol, ipsec_policy;
+       struct sadb_x_policy policy;
+       int skt;
+       
+       memset(&addr, 0, sizeof(addr));
+       /* precalculate constants depending on address family */
+       switch (family)
+       {
+               case AF_INET:
+               {
+                       struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
+                       sin->sin_family = AF_INET;
+                       sin->sin_addr.s_addr = INADDR_ANY;
+                       sin->sin_port = htons(port);
+                       sol = SOL_IP;
+                       ipsec_policy = IP_IPSEC_POLICY;
+                       break;
+               }
+               case AF_INET6:
+               {
+                       struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
+                       sin6->sin6_family = AF_INET6;
+                       memcpy(&sin6->sin6_addr, &in6addr_any, sizeof(in6addr_any));
+                       sin6->sin6_port = htons(port);
+                       sol = SOL_IPV6;
+                       ipsec_policy = IPV6_IPSEC_POLICY;
+                       break;
+               }
+               default:
+                       return 0;
+       }
+       
+       skt = socket(family, SOCK_DGRAM, IPPROTO_UDP);
+       if (skt < 0)
+       {
+               DBG1(DBG_NET, "could not open send socket: %s", strerror(errno));
+               return 0;
+       }
+       
+       if (setsockopt(skt, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
+       {
+               DBG1(DBG_NET, "unable to set SO_REUSEADDR on send socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       /* bypass outgoung IKE traffic on send socket */
+       memset(&policy, 0, sizeof(policy));
+       policy.sadb_x_policy_len = sizeof(policy) / sizeof(u_int64_t);
+       policy.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
+       policy.sadb_x_policy_type = IPSEC_POLICY_BYPASS;
+       policy.sadb_x_policy_dir = IPSEC_DIR_OUTBOUND;
+       
+       if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
+       {
+               DBG1(DBG_NET, "unable to set IPSEC_POLICY on send socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       /* We don't receive packets on the send socket, but we need a INBOUND policy.
+        * Otherwise, UDP decapsulation does not work!!! */
+       policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
+       if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
+       {
+               DBG1(DBG_NET, "unable to set IPSEC_POLICY on send socket: %s", 
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       /* bind the send socket */
+       if (bind(skt, (struct sockaddr *)&addr, sizeof(addr)) < 0)
+       {
+               DBG1(DBG_NET, "unable to bind send socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       if (family == AF_INET)
+       {
+               /* enable UDP decapsulation globally, only for one socket needed */
+               if (setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
+               {
+                       DBG1(DBG_NET, "unable to set UDP_ENCAP: %s; NAT-T may fail",
+                                strerror(errno));
+               }
+       }
+       
+       return skt;
+}
+
+/**
+ * open a socket to receive packets
+ */
+static int open_recv_socket(private_socket_t *this, int family)
+{
+       int skt;
+       int on = TRUE;
+       u_int proto_offset, ip_len, sol, ipsec_policy, udp_header, ike_header;
+       struct sadb_x_policy policy;
+       
+       /* precalculate constants depending on address family */
+       switch (family)
+       {
+               case AF_INET:
+                       proto_offset = IP_PROTO_OFFSET;
+                       ip_len = IP_LEN;
+                       sol = SOL_IP;
+                       ipsec_policy = IP_IPSEC_POLICY;
+                       break;
+               case AF_INET6:
+                       proto_offset = IP6_PROTO_OFFSET;
+                       ip_len = 0; /* IPv6 raw sockets contain no IP header */
+                       sol = SOL_IPV6;
+                       ipsec_policy = IPV6_IPSEC_POLICY;
+                       break;
+               default:
+                       return 0;
+       }
+       udp_header = ip_len;
+       ike_header = ip_len + UDP_LEN;
+       
+       /* This filter code filters out all non-IKEv2 traffic on
+        * a SOCK_RAW IP_PROTP_UDP socket. Handling of other
+        * IKE versions is done in pluto.
+        */
+       struct sock_filter ikev2_filter_code[] =
+       {
+               /* Destination Port must be either port or natt_port */
+               BPF_STMT(BPF_LD+BPF_H+BPF_ABS, udp_header + 2),
+               BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IKEV2_UDP_PORT, 1, 0),
+               BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IKEV2_NATT_PORT, 5, 12),
+               /* port */
+                       /* IKE version must be 2.0 */
+                       BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + IKE_VERSION_OFFSET),
+                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x20, 0, 10),
+                       /* packet length is length in IKEv2 header + ip header + udp header */
+                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header + IKE_LENGTH_OFFSET),
+                       BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, ip_len + UDP_LEN),
+                       BPF_STMT(BPF_RET+BPF_A, 0),
+               /* natt_port */
+                       /* nat-t: check for marker */
+                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header),
+                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0, 0, 5),
+                       /* nat-t: IKE version must be 2.0 */
+                       BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + MARKER_LEN + IKE_VERSION_OFFSET),
+                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x20, 0, 3),
+                       /* nat-t: packet length is length in IKEv2 header + ip header + udp header + non esp marker */
+                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header + MARKER_LEN + IKE_LENGTH_OFFSET),
+                       BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, ip_len + UDP_LEN + MARKER_LEN),
+                       BPF_STMT(BPF_RET+BPF_A, 0),
+               /* packet doesn't match, ignore */
+               BPF_STMT(BPF_RET+BPF_K, 0),
+       };
+
+       /* Filter struct to use with setsockopt */
+       struct sock_fprog ikev2_filter = {
+               sizeof(ikev2_filter_code) / sizeof(struct sock_filter),
+               ikev2_filter_code
+       };
+       
+       /* set up a raw socket */
+       skt = socket(family, SOCK_RAW, IPPROTO_UDP);
+       if (skt < 0)
+       {
+               DBG1(DBG_NET, "unable to create raw socket: %s", strerror(errno));
+               return 0;
+       }
+       
+       if (setsockopt(skt, SOL_SOCKET, SO_ATTACH_FILTER,
+                                  &ikev2_filter, sizeof(ikev2_filter)) < 0)
+       {
+               DBG1(DBG_NET, "unable to attach IKEv2 filter to raw socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       if (family == AF_INET6 &&
+               /* we use IPV6_2292PKTINFO, as IPV6_PKTINFO is defined as
+                * 2 or 50 depending on kernel header version */
+               setsockopt(skt, sol, IPV6_2292PKTINFO, &on, sizeof(on)) < 0)
+       {
+               DBG1(DBG_NET, "unable to set IPV6_PKTINFO on raw socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       /* bypass incomining IKE traffic on this socket */
+       memset(&policy, 0, sizeof(policy));
+       policy.sadb_x_policy_len = sizeof(policy) / sizeof(u_int64_t);
+       policy.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
+       policy.sadb_x_policy_type = IPSEC_POLICY_BYPASS;
+       policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
+       
+       if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
+       {
+               DBG1(DBG_NET, "unable to set IPSEC_POLICY on raw socket: %s",
+                        strerror(errno));
+               close(skt);
+               return 0;
+       }
+       
+       return skt;
+}
+
+/**
+ * implementation of socket_t.destroy
+ */
+static void destroy(private_socket_t *this)
+{
+       if (this->recv4)
+       {
+               close(this->recv4);
+       }
+       if (this->recv6)
+       {
+               close(this->recv6);
+       }
+       if (this->send4)
+       {
+               close(this->send4);
+       }
+       if (this->send6)
+       {
+               close(this->send6);
+       }
+       if (this->send4_natt)
+       {
+               close(this->send4_natt);
+       }
+       if (this->send6_natt)
+       {
+               close(this->send6_natt);
+       }
+       free(this);
+}
+
+/*
+ * See header for description
+ */
+socket_t *socket_create()
+{
+       int key;
+       private_socket_t *this = malloc_thing(private_socket_t);
+
+       /* public functions */
+       this->public.send = (status_t(*)(socket_t*, packet_t*))sender;
+       this->public.receive = (status_t(*)(socket_t*, packet_t**))receiver;
+       this->public.destroy = (void(*)(socket_t*)) destroy;
+       
+       this->recv4 = 0;
+       this->recv6 = 0;
+       this->send4 = 0;
+       this->send6 = 0;
+       this->send4_natt = 0;
+       this->send6_natt = 0;
+       
+       /* we open a AF_KEY socket to autoload the af_key module. Otherwise
+        * setsockopt(IPSEC_POLICY) won't work. */
+       key = socket(AF_KEY, SOCK_RAW, PF_KEY_V2);
+       if (key == 0)
+       {
+               charon->kill(charon, "could not open AF_KEY socket");
+       }
+       close(key);
+       
+       this->recv4 = open_recv_socket(this, AF_INET);
+       if (this->recv4 == 0)
+       {
+               DBG1(DBG_NET, "could not open IPv4 receive socket, IPv4 disabled");
+       }
+       else
+       {
+               this->send4 = open_send_socket(this, AF_INET, IKEV2_UDP_PORT);
+               if (this->send4 == 0)
+               {
+                       DBG1(DBG_NET, "could not open IPv4 send socket, IPv4 disabled");
+                       close(this->recv4);
+               }
+               else
+               {
+                       this->send4_natt = open_send_socket(this, AF_INET, IKEV2_NATT_PORT);
+                       if (this->send4_natt == 0)
+                       {
+                               DBG1(DBG_NET, "could not open IPv4 NAT-T send socket");
+                       }
+               }
+       }
+       
+       this->recv6 = open_recv_socket(this, AF_INET6);
+       if (this->recv6 == 0)
+       {
+               DBG1(DBG_NET, "could not open IPv6 receive socket, IPv6 disabled");
+       }
+       else
+       {
+               this->send6 = open_send_socket(this, AF_INET6, IKEV2_UDP_PORT);
+               if (this->send6 == 0)
+               {
+                       DBG1(DBG_NET, "could not open IPv6 send socket, IPv6 disabled");
+                       close(this->recv6);
+               }
+               else
+               {
+                       this->send6_natt = open_send_socket(this, AF_INET6, IKEV2_NATT_PORT);
+                       if (this->send6_natt == 0)
+                       {
+                               DBG1(DBG_NET, "could not open IPv6 NAT-T send socket");
+                       }
+               }
+       }
+       
+       if (!(this->send4 || this->send6) || !(this->recv4 || this->recv6))
+       {
+               DBG1(DBG_NET, "could not create any sockets");
+               destroy(this);
+               charon->kill(charon, "socket initialization failed");
+       }
+       
+       return (socket_t*)this;
+}
index dd231eb..a4c4075 100644 (file)
@@ -7,7 +7,7 @@
 
 /*
  * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
- * Copyright (C) 2005-2006 Martin Willi
+ * Copyright (C) 2005-2007 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
 
 #include <daemon.h>
 
-/* constants for packet handling */
-#define IP_LEN sizeof(struct iphdr)
-#define IP6_LEN sizeof(struct ip6_hdr)
-#define UDP_LEN sizeof(struct udphdr)
+/* length of non-esp marker */
 #define MARKER_LEN sizeof(u_int32_t)
 
-/* offsets for packet handling */
-#define IP_PROTO_OFFSET 9
-#define IP6_PROTO_OFFSET 6
-#define IKE_VERSION_OFFSET 17
-#define IKE_LENGTH_OFFSET 24
-
 /* from linux/in.h */
 #ifndef IP_IPSEC_POLICY
 #define IP_IPSEC_POLICY 16
@@ -84,51 +75,31 @@ typedef struct private_socket_t private_socket_t;
 /**
  * Private data of an socket_t object
  */
-struct private_socket_t{
+struct private_socket_t {
        /**
         * public functions
         */
         socket_t public;
-
-        /**
-         * regular port
-         */
-        int port;
-
-        /**
-         * port used for nat-t
-         */
-        int natt_port;
         
         /**
-         * raw receiver socket for IPv4
+         * IPv4 socket (500)
          */
-        int recv4;
+        int ipv4;
         
         /**
-         * raw receiver socket for IPv6
-         */
-        int recv6;
-
-        /**
-         * send socket on regular port for IPv4
+         * IPv4 socket for NATT (4500)
          */
-        int send4;
-
-        /**
-         * send socket on regular port for IPv6
-         */
-        int send6;
-
+        int ipv4_natt;
+        
         /**
-         * send socket on nat-t port for IPv4
+         * IPv6 socket (500)
          */
-        int send4_natt;
-
+        int ipv6;
+        
         /**
-         * send socket on nat-t port for IPv6
+         * IPv6 socket for NATT (4500)
          */
-        int send6_natt;
+        int ipv6_natt;
 };
 
 /**
@@ -139,91 +110,72 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
        char buffer[MAX_PACKET];
        chunk_t data;
        packet_t *pkt;
-       struct udphdr *udp;
        host_t *source = NULL, *dest = NULL;
        int bytes_read = 0;
        int data_offset, oldstate;
        fd_set rfds;
+       int max_fd = 0, selected = 0;
+       u_int16_t port;
 
        FD_ZERO(&rfds);
        
-       if (this->recv4)
+       if (this->ipv4)
        {
-               FD_SET(this->recv4, &rfds);
+               FD_SET(this->ipv4, &rfds);
        }
-       if (this->recv6)
+       if (this->ipv4_natt)
        {
-               FD_SET(this->recv6, &rfds);
+               FD_SET(this->ipv4_natt, &rfds);
        }
+       if (this->ipv6)
+       {
+               FD_SET(this->ipv6, &rfds);
+       }
+       if (this->ipv6_natt)
+       {
+               FD_SET(this->ipv6_natt, &rfds);
+       }
+       max_fd = max(max(this->ipv4, this->ipv4_natt), max(this->ipv6, this->ipv6_natt));
        
-       DBG2(DBG_NET, "waiting for data on raw sockets");
-       
+       DBG2(DBG_NET, "waiting for data on sockets");
        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
-       if (select(max(this->recv4, this->recv6) + 1, &rfds, NULL, NULL, NULL) <= 0)
+       if (select(max_fd + 1, &rfds, NULL, NULL, NULL) <= 0)
        {
                pthread_setcancelstate(oldstate, NULL);
                return FAILED;
        }
        pthread_setcancelstate(oldstate, NULL);
        
-       if (this->recv4 && FD_ISSET(this->recv4, &rfds))
+       if (FD_ISSET(this->ipv4, &rfds))
        {
-               /* IPv4 raw sockets return the IP header. We read src/dest
-                * information directly from the raw header */
-               struct iphdr *ip;
-               struct sockaddr_in src, dst;
-               
-               bytes_read = recv(this->recv4, buffer, MAX_PACKET, 0);
-               if (bytes_read < 0)
-               {
-                       DBG1(DBG_NET, "error reading from IPv4 socket: %s", strerror(errno));
-                       return FAILED;
-               }
-               DBG3(DBG_NET, "received IPv4 packet %b", buffer, bytes_read);
-               
-               /* read source/dest from raw IP/UDP header */
-               if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
-               {
-                       DBG1(DBG_NET, "received IPv4 packet too short (%d bytes)",
-                                bytes_read);
-                       return FAILED;
-               }
-               ip = (struct iphdr*) buffer;
-               udp = (struct udphdr*) (buffer + IP_LEN);
-               src.sin_family = AF_INET;
-               src.sin_addr.s_addr = ip->saddr;
-               src.sin_port = udp->source;
-               dst.sin_family = AF_INET;
-               dst.sin_addr.s_addr = ip->daddr;
-               dst.sin_port = udp->dest;
-               source = host_create_from_sockaddr((sockaddr_t*)&src);
-               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
-               
-               pkt = packet_create();
-               pkt->set_source(pkt, source);
-               pkt->set_destination(pkt, dest);
-               DBG2(DBG_NET, "received packet: from %#H to %#H", source, dest);
-               data_offset = IP_LEN + UDP_LEN;
-               /* remove non esp marker */     
-               if (dest->get_port(dest) == this->natt_port)
-               {
-                       data_offset += MARKER_LEN;
-               }
-               /* fill in packet */
-               data.len = bytes_read - data_offset;
-               data.ptr = malloc(data.len);
-               memcpy(data.ptr, buffer + data_offset, data.len);
-               pkt->set_data(pkt, data);
+               port = IKEV2_UDP_PORT;
+               selected = this->ipv4;
        }
-       else if (this->recv6 && FD_ISSET(this->recv6, &rfds))
+       if (FD_ISSET(this->ipv4_natt, &rfds))
+       {
+               port = IKEV2_NATT_PORT;
+               selected = this->ipv4_natt;
+       }
+       if (FD_ISSET(this->ipv6, &rfds))
+       {
+               port = IKEV2_UDP_PORT;
+               selected = this->ipv6;
+       }
+       if (FD_ISSET(this->ipv6_natt, &rfds))
+       {
+               port = IKEV2_NATT_PORT;
+               selected = this->ipv6_natt;
+       }
+       if (selected)
        {
-               /* IPv6 raw sockets return no IP header. We must query
-                * src/dest via socket options/ancillary data */
                struct msghdr msg;
                struct cmsghdr *cmsgptr;
-               struct sockaddr_in6 src, dst;
                struct iovec iov;
                char ancillary[64];
+               union {
+                       struct sockaddr_in in4;
+                       struct sockaddr_in6 in6;
+               } src;
                
                msg.msg_name = &src;
                msg.msg_namelen = sizeof(src);
@@ -234,18 +186,17 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
                msg.msg_control = ancillary;
                msg.msg_controllen = sizeof(ancillary);
                msg.msg_flags = 0;
-               
-               bytes_read = recvmsg(this->recv6, &msg, 0);
+               bytes_read = recvmsg(selected, &msg, 0);
                if (bytes_read < 0)
                {
-                       DBG1(DBG_NET, "error reading from IPv6 socket: %s", strerror(errno));
+                       DBG1(DBG_NET, "error reading socket: %s", strerror(errno));
                        return FAILED;
                }
-               DBG3(DBG_NET, "received IPv6 packet %b", buffer, bytes_read);
+               DBG3(DBG_NET, "received packet %b", buffer, bytes_read);
                
-               if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
+               if (bytes_read < MARKER_LEN)
                {
-                       DBG3(DBG_NET, "received IPv6 packet too short (%d bytes)",
+                       DBG3(DBG_NET, "received packet too short (%d bytes)",
                                 bytes_read);
                        return FAILED;
                }
@@ -256,40 +207,55 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
                {
                        if (cmsgptr->cmsg_len == 0)
                        {
-                               DBG1(DBG_NET, "error reading IPv6 ancillary data");
+                               DBG1(DBG_NET, "error reading ancillary data");
                                return FAILED;
-                       }       
+                       }
+                       
                        if (cmsgptr->cmsg_level == SOL_IPV6 &&
                                cmsgptr->cmsg_type == IPV6_2292PKTINFO)
                        {
                                struct in6_pktinfo *pktinfo;
                                pktinfo = (struct in6_pktinfo*)CMSG_DATA(cmsgptr);
+                               struct sockaddr_in6 dst;
                                
                                memset(&dst, 0, sizeof(dst));
                                memcpy(&dst.sin6_addr, &pktinfo->ipi6_addr, sizeof(dst.sin6_addr));
                                dst.sin6_family = AF_INET6;
-                               udp = (struct udphdr*) (buffer);
-                               dst.sin6_port = udp->dest;
-                               src.sin6_port = udp->source;
+                               dst.sin6_port = htons(port);
                                dest = host_create_from_sockaddr((sockaddr_t*)&dst);
                        }
+                       if (cmsgptr->cmsg_level == SOL_IP &&
+                               cmsgptr->cmsg_type == IP_PKTINFO)
+                       {                       
+                               struct in_pktinfo *pktinfo;
+                               pktinfo = (struct in_pktinfo*)CMSG_DATA(cmsgptr);
+                               struct sockaddr_in dst;
+                               
+                               memset(&dst, 0, sizeof(dst));
+                               memcpy(&dst.sin_addr, &pktinfo->ipi_addr, sizeof(dst.sin_addr));
+                               dst.sin_family = AF_INET;
+                               dst.sin_port = htons(port);
+                               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
+                       }
+                       if (dest)
+                       {
+                               break;
+                       }
                }
-               /* ancillary data missing? */
                if (dest == NULL)
                {
-                       DBG1(DBG_NET, "error reading IPv6 packet header");
+                       DBG1(DBG_NET, "error reading IP header");
                        return FAILED;
                }
-               
                source = host_create_from_sockaddr((sockaddr_t*)&src);
                
                pkt = packet_create();
                pkt->set_source(pkt, source);
                pkt->set_destination(pkt, dest);
                DBG2(DBG_NET, "received packet: from %#H to %#H", source, dest);
-               data_offset = UDP_LEN;
+               data_offset = 0;
                /* remove non esp marker */     
-               if (dest->get_port(dest) == this->natt_port)
+               if (dest->get_port(dest) == IKEV2_NATT_PORT)
                {
                        data_offset += MARKER_LEN;
                }
@@ -304,7 +270,6 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
                /* oops, shouldn't happen */
                return FAILED;
        }
-       
        /* return packet */
        *packet = pkt;
        return SUCCESS;
@@ -332,26 +297,26 @@ status_t sender(private_socket_t *this, packet_t *packet)
        /* send data */
        sport = src->get_port(src);
        family = dst->get_family(dst);
-       if (sport == this->port)
+       if (sport == IKEV2_UDP_PORT)
        {
                if (family == AF_INET)
                {
-                       skt = this->send4;
+                       skt = this->ipv4;
                }
                else
                {
-                       skt = this->send6;
+                       skt = this->ipv6;
                }
        }
-       else if (sport == this->natt_port)
+       else if (sport == IKEV2_NATT_PORT)
        {
                if (family == AF_INET)
                {
-                       skt = this->send4_natt;
+                       skt = this->ipv4_natt;
                }
                else
                {
-                       skt = this->send6_natt;
+                       skt = this->ipv6_natt;
                }
                /* NAT keepalives without marker */
                if (data.len != 1 || data.ptr[0] != 0xFF)
@@ -437,12 +402,12 @@ status_t sender(private_socket_t *this, packet_t *packet)
 /**
  * open a socket to send packets
  */
-static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
+static int open_socket(private_socket_t *this, int family, u_int16_t port)
 {
        int on = TRUE;
        int type = UDP_ENCAP_ESPINUDP;
        struct sockaddr_storage addr;
-       u_int sol, ipsec_policy;
+       u_int sol, ipsec_policy, pktinfo;
        struct sadb_x_policy policy;
        int skt;
        
@@ -458,6 +423,7 @@ static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
                        sin->sin_port = htons(port);
                        sol = SOL_IP;
                        ipsec_policy = IP_IPSEC_POLICY;
+                       pktinfo = IP_PKTINFO;
                        break;
                }
                case AF_INET6:
@@ -468,6 +434,7 @@ static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
                        sin6->sin6_port = htons(port);
                        sol = SOL_IPV6;
                        ipsec_policy = IPV6_IPSEC_POLICY;
+                       pktinfo = IPV6_2292PKTINFO;
                        break;
                }
                default:
@@ -477,39 +444,34 @@ static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
        skt = socket(family, SOCK_DGRAM, IPPROTO_UDP);
        if (skt < 0)
        {
-               DBG1(DBG_NET, "could not open send socket: %s", strerror(errno));
+               DBG1(DBG_NET, "could not open socket: %s", strerror(errno));
                return 0;
        }
-       
        if (setsockopt(skt, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
        {
-               DBG1(DBG_NET, "unable to set SO_REUSEADDR on send socket: %s",
-                        strerror(errno));
+               DBG1(DBG_NET, "unable to set SO_REUSEADDR on socket: %s", strerror(errno));
                close(skt);
                return 0;
        }
        
-       /* bypass outgoung IKE traffic on send socket */
+       /* bypass IKE traffic on socket */
        memset(&policy, 0, sizeof(policy));
        policy.sadb_x_policy_len = sizeof(policy) / sizeof(u_int64_t);
        policy.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
        policy.sadb_x_policy_type = IPSEC_POLICY_BYPASS;
-       policy.sadb_x_policy_dir = IPSEC_DIR_OUTBOUND;
        
+       policy.sadb_x_policy_dir = IPSEC_DIR_OUTBOUND;
        if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
        {
-               DBG1(DBG_NET, "unable to set IPSEC_POLICY on send socket: %s",
+               DBG1(DBG_NET, "unable to set IPSEC_POLICY on socket: %s",
                         strerror(errno));
                close(skt);
                return 0;
        }
-       
-       /* We don't receive packets on the send socket, but we need a INBOUND policy.
-        * Otherwise, UDP decapsulation does not work!!! */
        policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
        if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
        {
-               DBG1(DBG_NET, "unable to set IPSEC_POLICY on send socket: %s", 
+               DBG1(DBG_NET, "unable to set IPSEC_POLICY on socket: %s", 
                         strerror(errno));
                close(skt);
                return 0;
@@ -518,138 +480,25 @@ static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
        /* bind the send socket */
        if (bind(skt, (struct sockaddr *)&addr, sizeof(addr)) < 0)
        {
-               DBG1(DBG_NET, "unable to bind send socket: %s",
-                        strerror(errno));
+               DBG1(DBG_NET, "unable to bind socket: %s", strerror(errno));
                close(skt);
                return 0;
        }
        
-       if (family == AF_INET)
+       /* get additional packet info on receive */
+       if (setsockopt(skt, sol, pktinfo, &on, sizeof(on)) < 0)
        {
-               /* enable UDP decapsulation globally, only for one socket needed */
-               if (setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
-               {
-                       DBG1(DBG_NET, "unable to set UDP_ENCAP: %s; NAT-T may fail",
-                                strerror(errno));
-               }
-       }
-       
-       return skt;
-}
-
-/**
- * open a socket to receive packets
- */
-static int open_recv_socket(private_socket_t *this, int family)
-{
-       int skt;
-       int on = TRUE;
-       u_int proto_offset, ip_len, sol, ipsec_policy, udp_header, ike_header;
-       struct sadb_x_policy policy;
-       
-       /* precalculate constants depending on address family */
-       switch (family)
-       {
-               case AF_INET:
-                       proto_offset = IP_PROTO_OFFSET;
-                       ip_len = IP_LEN;
-                       sol = SOL_IP;
-                       ipsec_policy = IP_IPSEC_POLICY;
-                       break;
-               case AF_INET6:
-                       proto_offset = IP6_PROTO_OFFSET;
-                       ip_len = 0; /* IPv6 raw sockets contain no IP header */
-                       sol = SOL_IPV6;
-                       ipsec_policy = IPV6_IPSEC_POLICY;
-                       break;
-               default:
-                       return 0;
-       }
-       udp_header = ip_len;
-       ike_header = ip_len + UDP_LEN;
-       
-       /* This filter code filters out all non-IKEv2 traffic on
-        * a SOCK_RAW IP_PROTP_UDP socket. Handling of other
-        * IKE versions is done in pluto.
-        */
-       struct sock_filter ikev2_filter_code[] =
-       {
-               /* Destination Port must be either port or natt_port */
-               BPF_STMT(BPF_LD+BPF_H+BPF_ABS, udp_header + 2),
-               BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, this->port, 1, 0),
-               BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, this->natt_port, 5, 12),
-               /* port */
-                       /* IKE version must be 2.0 */
-                       BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + IKE_VERSION_OFFSET),
-                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x20, 0, 10),
-                       /* packet length is length in IKEv2 header + ip header + udp header */
-                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header + IKE_LENGTH_OFFSET),
-                       BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, ip_len + UDP_LEN),
-                       BPF_STMT(BPF_RET+BPF_A, 0),
-               /* natt_port */
-                       /* nat-t: check for marker */
-                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header),
-                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0, 0, 5),
-                       /* nat-t: IKE version must be 2.0 */
-                       BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + MARKER_LEN + IKE_VERSION_OFFSET),
-                       BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0x20, 0, 3),
-                       /* nat-t: packet length is length in IKEv2 header + ip header + udp header + non esp marker */
-                       BPF_STMT(BPF_LD+BPF_W+BPF_ABS, ike_header + MARKER_LEN + IKE_LENGTH_OFFSET),
-                       BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, ip_len + UDP_LEN + MARKER_LEN),
-                       BPF_STMT(BPF_RET+BPF_A, 0),
-               /* packet doesn't match, ignore */
-               BPF_STMT(BPF_RET+BPF_K, 0),
-       };
-
-       /* Filter struct to use with setsockopt */
-       struct sock_fprog ikev2_filter = {
-               sizeof(ikev2_filter_code) / sizeof(struct sock_filter),
-               ikev2_filter_code
-       };
-       
-       /* set up a raw socket */
-       skt = socket(family, SOCK_RAW, IPPROTO_UDP);
-       if (skt < 0)
-       {
-               DBG1(DBG_NET, "unable to create raw socket: %s", strerror(errno));
-               return 0;
-       }
-       
-       if (setsockopt(skt, SOL_SOCKET, SO_ATTACH_FILTER,
-                                  &ikev2_filter, sizeof(ikev2_filter)) < 0)
-       {
-               DBG1(DBG_NET, "unable to attach IKEv2 filter to raw socket: %s",
-                        strerror(errno));
+               DBG1(DBG_NET, "unable to set IP_PKTINFO on socket: %s", strerror(errno));
                close(skt);
                return 0;
        }
        
-       if (family == AF_INET6 &&
-               /* we use IPV6_2292PKTINFO, as IPV6_PKTINFO is defined as
-                * 2 or 50 depending on kernel header version */
-               setsockopt(skt, sol, IPV6_2292PKTINFO, &on, sizeof(on)) < 0)
+       /* enable UDP decapsulation globally, only for one socket needed */
+       if (family == AF_INET && port == IKEV2_NATT_PORT &&
+               setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
        {
-               DBG1(DBG_NET, "unable to set IPV6_PKTINFO on raw socket: %s",
-                        strerror(errno));
-               close(skt);
-               return 0;
-       }
-       
-       /* bypass incomining IKE traffic on this socket */
-       memset(&policy, 0, sizeof(policy));
-       policy.sadb_x_policy_len = sizeof(policy) / sizeof(u_int64_t);
-       policy.sadb_x_policy_exttype = SADB_X_EXT_POLICY;
-       policy.sadb_x_policy_type = IPSEC_POLICY_BYPASS;
-       policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
-       
-       if (setsockopt(skt, sol, ipsec_policy, &policy, sizeof(policy)) < 0)
-       {
-               DBG1(DBG_NET, "unable to set IPSEC_POLICY on raw socket: %s",
-                        strerror(errno));
-               close(skt);
-               return 0;
+               DBG1(DBG_NET, "unable to set UDP_ENCAP: %s", strerror(errno));
        }
-       
        return skt;
 }
 
@@ -658,29 +507,21 @@ static int open_recv_socket(private_socket_t *this, int family)
  */
 static void destroy(private_socket_t *this)
 {
-       if (this->recv4)
-       {
-               close(this->recv4);
-       }
-       if (this->recv6)
-       {
-               close(this->recv6);
-       }
-       if (this->send4)
+       if (this->ipv4)
        {
-               close(this->send4);
+               close(this->ipv4);
        }
-       if (this->send6)
+       if (this->ipv4_natt)
        {
-               close(this->send6);
+               close(this->ipv4_natt);
        }
-       if (this->send4_natt)
+       if (this->ipv6)
        {
-               close(this->send4_natt);
+               close(this->ipv6);
        }
-       if (this->send6_natt)
+       if (this->ipv6_natt)
        {
-               close(this->send6_natt);
+               close(this->ipv6_natt);
        }
        free(this);
 }
@@ -688,7 +529,7 @@ static void destroy(private_socket_t *this)
 /*
  * See header for description
  */
-socket_t *socket_create(u_int16_t port, u_int16_t natt_port)
+socket_t *socket_create()
 {
        int key;
        private_socket_t *this = malloc_thing(private_socket_t);
@@ -698,14 +539,10 @@ socket_t *socket_create(u_int16_t port, u_int16_t natt_port)
        this->public.receive = (status_t(*)(socket_t*, packet_t**))receiver;
        this->public.destroy = (void(*)(socket_t*)) destroy;
        
-       this->port = port;
-       this->natt_port = natt_port;
-       this->recv4 = 0;
-       this->recv6 = 0;
-       this->send4 = 0;
-       this->send6 = 0;
-       this->send4_natt = 0;
-       this->send6_natt = 0;
+       this->ipv4 = 0;
+       this->ipv6 = 0;
+       this->ipv4_natt = 0;
+       this->ipv6_natt = 0;
        
        /* we open a AF_KEY socket to autoload the af_key module. Otherwise
         * setsockopt(IPSEC_POLICY) won't work. */
@@ -715,59 +552,41 @@ socket_t *socket_create(u_int16_t port, u_int16_t natt_port)
                charon->kill(charon, "could not open AF_KEY socket");
        }
        close(key);
-       
-       this->recv4 = open_recv_socket(this, AF_INET);
-       if (this->recv4 == 0)
+
+       this->ipv4 = open_socket(this, AF_INET, IKEV2_UDP_PORT);
+       if (this->ipv4 == 0)
        {
-               DBG1(DBG_NET, "could not open IPv4 receive socket, IPv4 disabled");
+               DBG1(DBG_NET, "could not open IPv4 socket, IPv4 disabled");
        }
        else
        {
-               this->send4 = open_send_socket(this, AF_INET, this->port);
-               if (this->send4 == 0)
+               this->ipv4_natt = open_socket(this, AF_INET, IKEV2_NATT_PORT);
+               if (this->ipv4_natt == 0)
                {
-                       DBG1(DBG_NET, "could not open IPv4 send socket, IPv4 disabled");
-                       close(this->recv4);
-               }
-               else
-               {
-                       this->send4_natt = open_send_socket(this, AF_INET, this->natt_port);
-                       if (this->send4_natt == 0)
-                       {
-                               DBG1(DBG_NET, "could not open IPv4 NAT-T send socket");
-                       }
+                       DBG1(DBG_NET, "could not open IPv4 NAT-T socket");
                }
        }
-       
-       this->recv6 = open_recv_socket(this, AF_INET6);
-       if (this->recv6 == 0)
+
+       this->ipv6 = open_socket(this, AF_INET6, IKEV2_UDP_PORT);
+       if (this->ipv6 == 0)
        {
-               DBG1(DBG_NET, "could not open IPv6 receive socket, IPv6 disabled");
+               DBG1(DBG_NET, "could not open IPv6 socket, IPv6 disabled");
        }
        else
        {
-               this->send6 = open_send_socket(this, AF_INET6, this->port);
-               if (this->send6 == 0)
+               this->ipv6_natt = open_socket(this, AF_INET6, IKEV2_NATT_PORT);
+               if (this->ipv6_natt == 0)
                {
-                       DBG1(DBG_NET, "could not open IPv6 send socket, IPv6 disabled");
-                       close(this->recv6);
-               }
-               else
-               {
-                       this->send6_natt = open_send_socket(this, AF_INET6, this->natt_port);
-                       if (this->send6_natt == 0)
-                       {
-                               DBG1(DBG_NET, "could not open IPv6 NAT-T send socket");
-                       }
+                       DBG1(DBG_NET, "could not open IPv6 NAT-T socket");
                }
        }
        
-       if (!(this->send4 || this->send6) || !(this->recv4 || this->recv6))
+       if (!this->ipv4 && !this->ipv6)
        {
                DBG1(DBG_NET, "could not create any sockets");
                destroy(this);
                charon->kill(charon, "socket initialization failed");
-       }
-       
+       }       
        return (socket_t*)this;
 }
+
index ef60fa7..4d82513 100644 (file)
@@ -100,13 +100,11 @@ struct socket_t {
 /**
  * @brief Create a socket_t, wich binds multiple sockets.
  *
- * @param port                         port to bind socket to
- * @param natt_port                    port to float to in NAT-T
  * @return                             socket_t object
  *
  * @ingroup network
  */
-socket_t *socket_create(u_int16_t port, u_int16_t natt_port);
+socket_t *socket_create();
 
 
 #endif /*SOCKET_H_*/