Moved socket and socket-raw implementations to plugins
authorMartin Willi <martin@revosec.ch>
Mon, 22 Feb 2010 13:56:35 +0000 (14:56 +0100)
committerMartin Willi <martin@revosec.ch>
Fri, 26 Feb 2010 10:44:32 +0000 (11:44 +0100)
19 files changed:
configure.in
src/charon/Makefile.am
src/charon/daemon.c
src/charon/daemon.h
src/charon/network/socket-raw.c [deleted file]
src/charon/network/socket.c [deleted file]
src/charon/network/socket.h
src/charon/network/socket_manager.c [new file with mode: 0644]
src/charon/network/socket_manager.h [new file with mode: 0644]
src/charon/plugins/socket_default/Makefile.am [new file with mode: 0644]
src/charon/plugins/socket_default/socket_default_plugin.c [new file with mode: 0644]
src/charon/plugins/socket_default/socket_default_plugin.h [new file with mode: 0644]
src/charon/plugins/socket_default/socket_default_socket.c [new file with mode: 0644]
src/charon/plugins/socket_default/socket_default_socket.h [new file with mode: 0644]
src/charon/plugins/socket_raw/Makefile.am [new file with mode: 0644]
src/charon/plugins/socket_raw/socket_raw_plugin.c [new file with mode: 0644]
src/charon/plugins/socket_raw/socket_raw_plugin.h [new file with mode: 0644]
src/charon/plugins/socket_raw/socket_raw_socket.c [new file with mode: 0644]
src/charon/plugins/socket_raw/socket_raw_socket.h [new file with mode: 0644]

index e3eccd9..7c48959 100644 (file)
@@ -114,6 +114,8 @@ ARG_DISBL_SET([kernel-netlink], [disable the netlink kernel interface.])
 ARG_ENABL_SET([kernel-pfkey],   [enable the PF_KEY kernel interface.])
 ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.])
 ARG_ENABL_SET([kernel-klips],   [enable the KLIPS kernel interface.])
+ARG_DISBL_SET([socket-default], [disable default socket implementation for charon.])
+ARG_ENABL_SET([socket-raw],     [enable raw socket implementation of charon, enforced if pluto is enabled])
 ARG_ENABL_SET([nat-transport],  [enable NAT traversal with IPsec transport mode in pluto.])
 ARG_DISBL_SET([vendor-id],      [disable the sending of the strongSwan vendor ID in pluto.])
 ARG_DISBL_SET([xauth-vid],      [disable the sending of the XAUTH vendor ID.])
@@ -234,6 +236,14 @@ if test x$medcli = xtrue; then
        mediation=true
 fi
 
+if test x$pluto = xtrue; then
+       if test x$socket_raw = xfalse; then
+               AC_MSG_NOTICE([Enforcing --enable-socket-raw/--disable-socket-default, as pluto is enabled])
+               socket_default=false
+               socket_raw=true
+       fi
+fi
+
 dnl ===========================================
 dnl  check required libraries and header files
 dnl ===========================================
@@ -800,6 +810,8 @@ AM_CONDITIONAL(USE_KERNEL_NETLINK, test x$kernel_netlink = xtrue)
 AM_CONDITIONAL(USE_KERNEL_PFKEY, test x$kernel_pfkey = xtrue)
 AM_CONDITIONAL(USE_KERNEL_PFROUTE, test x$kernel_pfroute = xtrue)
 AM_CONDITIONAL(USE_KERNEL_KLIPS, test x$kernel_klips = xtrue)
+AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue)
+AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue)
 
 dnl other options
 dnl =============
@@ -894,6 +906,8 @@ AC_OUTPUT(
        src/charon/plugins/kernel_pfkey/Makefile
        src/charon/plugins/kernel_pfroute/Makefile
        src/charon/plugins/kernel_klips/Makefile
+       src/charon/plugins/socket_default/Makefile
+       src/charon/plugins/socket_raw/Makefile
        src/charon/plugins/smp/Makefile
        src/charon/plugins/sql/Makefile
        src/charon/plugins/medsrv/Makefile
index 0a02140..000515b 100644 (file)
@@ -45,7 +45,7 @@ kernel/kernel_net.h \
 network/packet.c network/packet.h \
 network/receiver.c network/receiver.h \
 network/sender.c network/sender.h \
-network/socket.h \
+network/socket_manager.c network/socket_manager.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 \
@@ -109,13 +109,6 @@ charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lm $(PTHREADL
 # compile options
 #################
 
-# Use RAW socket if pluto gets built
-if USE_PLUTO
-  charon_SOURCES += network/socket-raw.c
-else
-  charon_SOURCES += network/socket.c
-endif
-
 if USE_ME
   charon_SOURCES += encoding/payloads/endpoint_notify.c encoding/payloads/endpoint_notify.h \
     processing/jobs/initiate_mediation_job.c processing/jobs/initiate_mediation_job.h \
@@ -161,6 +154,16 @@ if USE_KERNEL_NETLINK
   PLUGINS += kernel-netlink
 endif
 
+if USE_SOCKET_DEFAULT
+  SUBDIRS += plugins/socket_default
+  PLUGINS += socket-default
+endif
+
+if USE_SOCKET_RAW
+  SUBDIRS += plugins/socket_raw
+  PLUGINS += socket-raw
+endif
+
 if USE_STROKE
   SUBDIRS += plugins/stroke
   PLUGINS += stroke
index e71225f..abaab7e 100644 (file)
@@ -185,6 +185,7 @@ static void destroy(private_daemon_t *this)
        {
                this->public.ike_sa_manager->flush(this->public.ike_sa_manager);
        }
+       DESTROY_IF(this->public.receiver);
        /* unload plugins to release threads */
        lib->plugins->unload(lib->plugins);
 #ifdef CAPABILITIES
@@ -204,7 +205,6 @@ static void destroy(private_daemon_t *this)
        DESTROY_IF(this->public.backends);
        DESTROY_IF(this->public.credentials);
        DESTROY_IF(this->public.sender);
-       DESTROY_IF(this->public.receiver);
        DESTROY_IF(this->public.socket);
        /* wait until all threads are gone */
        DESTROY_IF(this->public.processor);
@@ -494,7 +494,7 @@ static bool initialize(private_daemon_t *this, bool syslog, level_t levels[])
        this->public.sim = sim_manager_create();
        this->public.backends = backend_manager_create();
        this->public.kernel_interface = kernel_interface_create();
-       this->public.socket = socket_create();
+       this->public.socket = socket_manager_create();
        this->public.traps = trap_manager_create();
 
        /* load plugins, further infrastructure may need it */
index cb5946d..c0a449e 100644 (file)
@@ -148,7 +148,7 @@ typedef struct daemon_t daemon_t;
 
 #include <network/sender.h>
 #include <network/receiver.h>
-#include <network/socket.h>
+#include <network/socket_manager.h>
 #include <processing/scheduler.h>
 #include <processing/processor.h>
 #include <kernel/kernel_interface.h>
@@ -200,9 +200,9 @@ typedef struct daemon_t daemon_t;
 struct daemon_t {
 
        /**
-        * A socket_t instance.
+        * Socket manager instance
         */
-       socket_t *socket;
+       socket_manager_t *socket;
 
        /**
         * A ike_sa_manager_t instance.
diff --git a/src/charon/network/socket-raw.c b/src/charon/network/socket-raw.c
deleted file mode 100644 (file)
index 6cc0463..0000000
+++ /dev/null
@@ -1,761 +0,0 @@
-/*
- * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
- * Copyright (C) 2005-2008 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.
- */
-
-/* for struct in6_pktinfo */
-#define _GNU_SOURCE
-
-#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/types.h>
-#include <linux/filter.h>
-#include <net/if.h>
-
-#include "socket.h"
-
-#include <daemon.h>
-#include <threading/thread.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/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*/
-
-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, data_offset;
-       bool 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");
-
-       oldstate = thread_cancelability(TRUE);
-       if (select(max(this->recv4, this->recv6) + 1, &rfds, NULL, NULL, NULL) <= 0)
-       {
-               thread_cancelability(oldstate);
-               return FAILED;
-       }
-       thread_cancelability(oldstate);
-
-       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 (!src->is_anyaddr(src))
-       {
-               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;
-       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;
-                       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;
-                       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;
-       }
-
-       /* 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, udp_header, ike_header;
-
-       /* precalculate constants depending on address family */
-       switch (family)
-       {
-               case AF_INET:
-                       proto_offset = IP_PROTO_OFFSET;
-                       ip_len = IP_LEN;
-                       sol = SOL_IP;
-                       break;
-               case AF_INET6:
-                       proto_offset = IP6_PROTO_OFFSET;
-                       ip_len = 0; /* IPv6 raw sockets contain no IP header */
-                       sol = SOL_IPV6;
-                       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;
-       }
-
-       return skt;
-}
-
-/**
- * enumerator for underlying sockets
- */
-typedef struct {
-       /** implements enumerator_t */
-       enumerator_t public;
-       /** sockets we enumerate */
-       private_socket_t *socket;
-       /** counter */
-       int index;
-} socket_enumerator_t;
-
-/**
- * enumerate function for socket_enumerator_t
- */
-static bool enumerate(socket_enumerator_t *this, int *fd, int *family, int *port)
-{
-       static const struct {
-               int fd_offset;
-               int family;
-               int port;
-       } sockets[] = {
-               { offsetof(private_socket_t, recv4), AF_INET, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, recv6), AF_INET6, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, send4), AF_INET, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, send6), AF_INET6, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, send4_natt), AF_INET, IKEV2_NATT_PORT },
-               { offsetof(private_socket_t, send6_natt), AF_INET6, IKEV2_NATT_PORT }
-       };
-
-       while(++this->index < countof(sockets))
-       {
-               int sock = *(int*)((char*)this->socket + sockets[this->index].fd_offset);
-               if (!sock)
-               {
-                       continue;
-               }
-               *fd = sock;
-               *family = sockets[this->index].family;
-               *port = sockets[this->index].port;
-               return TRUE;
-       }
-       return FALSE;
-}
-
-/**
- * implementation of socket_t.create_enumerator
- */
-static enumerator_t *create_enumerator(private_socket_t *this)
-{
-       socket_enumerator_t *enumerator;
-
-       enumerator = malloc_thing(socket_enumerator_t);
-       enumerator->index = -1;
-       enumerator->socket = this;
-       enumerator->public.enumerate = (void*)enumerate;
-       enumerator->public.destroy = (void*)free;
-       return &enumerator->public;
-}
-
-/**
- * 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()
-{
-       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.create_enumerator = (enumerator_t*(*)(socket_t*))create_enumerator;
-       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;
-
-       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;
-}
diff --git a/src/charon/network/socket.c b/src/charon/network/socket.c
deleted file mode 100644 (file)
index 81f860b..0000000
+++ /dev/null
@@ -1,685 +0,0 @@
-/*
- * Copyright (C) 2006-2009 Tobias Brunner
- * Copyright (C) 2006 Daniel Roethlisberger
- * Copyright (C) 2005-2007 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.
- */
-
-/* for struct in6_pktinfo */
-#define _GNU_SOURCE
-#ifdef __sun
-#define _XPG4_2
-#define __EXTENSIONS__
-#endif
-
-#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_systm.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-#include <net/if.h>
-#ifdef __APPLE__
-#include <sys/sysctl.h>
-#endif
-
-#include "socket.h"
-
-#include <daemon.h>
-#include <threading/thread.h>
-
-/* length of non-esp marker */
-#define MARKER_LEN sizeof(u_int32_t)
-
-/* 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*/
-
-/* these are not defined on some platforms */
-#ifndef SOL_IP
-#define SOL_IP IPPROTO_IP
-#endif
-#ifndef SOL_IPV6
-#define SOL_IPV6 IPPROTO_IPV6
-#endif
-#ifndef SOL_UDP
-#define SOL_UDP IPPROTO_UDP
-#endif
-
-/* IPV6_RECVPKTINFO is defined in RFC 3542 which obsoletes RFC 2292 that
- * previously defined IPV6_PKTINFO */
-#ifndef IPV6_RECVPKTINFO
-#define IPV6_RECVPKTINFO IPV6_PKTINFO
-#endif
-
-#ifndef IN6ADDR_ANY_INIT
-#define IN6ADDR_ANY_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}
-#endif
-
-#ifndef HAVE_IN6ADDR_ANY
-static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
-#endif
-
-typedef struct private_socket_t private_socket_t;
-
-/**
- * Private data of an socket_t object
- */
-struct private_socket_t {
-       /**
-        * public functions
-        */
-       socket_t public;
-
-       /**
-        * IPv4 socket (500)
-        */
-       int ipv4;
-
-       /**
-        * IPv4 socket for NATT (4500)
-        */
-       int ipv4_natt;
-
-       /**
-        * IPv6 socket (500)
-        */
-       int ipv6;
-
-       /**
-        * IPv6 socket for NATT (4500)
-        */
-       int ipv6_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;
-       host_t *source = NULL, *dest = NULL;
-       int bytes_read = 0, data_offset;
-       bool oldstate;
-
-       fd_set rfds;
-       int max_fd = 0, selected = 0;
-       u_int16_t port = 0;
-
-       FD_ZERO(&rfds);
-
-       if (this->ipv4)
-       {
-               FD_SET(this->ipv4, &rfds);
-       }
-       if (this->ipv4_natt)
-       {
-               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 sockets");
-       oldstate = thread_cancelability(TRUE);
-       if (select(max_fd + 1, &rfds, NULL, NULL, NULL) <= 0)
-       {
-               thread_cancelability(oldstate);
-               return FAILED;
-       }
-       thread_cancelability(oldstate);
-
-       if (FD_ISSET(this->ipv4, &rfds))
-       {
-               port = IKEV2_UDP_PORT;
-               selected = this->ipv4;
-       }
-       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)
-       {
-               struct msghdr msg;
-               struct cmsghdr *cmsgptr;
-               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);
-               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(selected, &msg, 0);
-               if (bytes_read < 0)
-               {
-                       DBG1(DBG_NET, "error reading socket: %s", strerror(errno));
-                       return FAILED;
-               }
-               DBG3(DBG_NET, "received packet %b", buffer, bytes_read);
-
-               if (bytes_read < MARKER_LEN)
-               {
-                       DBG3(DBG_NET, "received 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 ancillary data");
-                               return FAILED;
-                       }
-
-#ifdef HAVE_IN6_PKTINFO
-                       if (cmsgptr->cmsg_level == SOL_IPV6 &&
-                               cmsgptr->cmsg_type == IPV6_PKTINFO)
-                       {
-                               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;
-                               dst.sin6_port = htons(port);
-                               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
-                       }
-#endif /* HAVE_IN6_PKTINFO */
-                       if (cmsgptr->cmsg_level == SOL_IP &&
-#ifdef IP_PKTINFO
-                               cmsgptr->cmsg_type == IP_PKTINFO
-#elif defined(IP_RECVDSTADDR)
-                               cmsgptr->cmsg_type == IP_RECVDSTADDR
-#else
-                               FALSE
-#endif
-                               )
-                       {
-                               struct in_addr *addr;
-                               struct sockaddr_in dst;
-
-#ifdef IP_PKTINFO
-                               struct in_pktinfo *pktinfo;
-                               pktinfo = (struct in_pktinfo*)CMSG_DATA(cmsgptr);
-                               addr = &pktinfo->ipi_addr;
-#elif defined(IP_RECVDSTADDR)
-                               addr = (struct in_addr*)CMSG_DATA(cmsgptr);
-#endif
-                               memset(&dst, 0, sizeof(dst));
-                               memcpy(&dst.sin_addr, 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;
-                       }
-               }
-               if (dest == NULL)
-               {
-                       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 = 0;
-               /* 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->ipv4;
-               }
-               else
-               {
-                       skt = this->ipv6;
-               }
-       }
-       else if (sport == IKEV2_NATT_PORT)
-       {
-               if (family == AF_INET)
-               {
-                       skt = this->ipv4_natt;
-               }
-               else
-               {
-                       skt = this->ipv6_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 (!src->is_anyaddr(src))
-       {
-               if (family == AF_INET)
-               {
-#if defined(IP_PKTINFO) || defined(IP_SENDSRCADDR)
-                       struct in_addr *addr;
-                       struct sockaddr_in *sin;
-#ifdef IP_PKTINFO
-                       char buf[CMSG_SPACE(sizeof(struct in_pktinfo))];
-                       struct in_pktinfo *pktinfo;
-#elif defined(IP_SENDSRCADDR)
-                       char buf[CMSG_SPACE(sizeof(struct in_addr))];
-#endif
-                       msg.msg_control = buf;
-                       msg.msg_controllen = sizeof(buf);
-                       cmsg = CMSG_FIRSTHDR(&msg);
-                       cmsg->cmsg_level = SOL_IP;
-#ifdef IP_PKTINFO
-                       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));
-                       addr = &pktinfo->ipi_spec_dst;
-#elif defined(IP_SENDSRCADDR)
-                       cmsg->cmsg_type = IP_SENDSRCADDR;
-                       cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
-                       addr = (struct in_addr*)CMSG_DATA(cmsg);
-#endif
-                       sin = (struct sockaddr_in*)src->get_sockaddr(src);
-                       memcpy(addr, &sin->sin_addr, sizeof(struct in_addr));
-#endif /* IP_PKTINFO || IP_SENDSRCADDR */
-               }
-#ifdef HAVE_IN6_PKTINFO
-               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_PKTINFO;
-                       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));
-               }
-#endif /* HAVE_IN6_PKTINFO */
-       }
-
-       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 and receive packets
- */
-static int open_socket(private_socket_t *this, int family, u_int16_t port)
-{
-       int on = TRUE;
-       struct sockaddr_storage addr;
-       socklen_t addrlen;
-       u_int sol, pktinfo = 0;
-       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);
-                       addrlen = sizeof(struct sockaddr_in);
-                       sol = SOL_IP;
-#ifdef IP_PKTINFO
-                       pktinfo = IP_PKTINFO;
-#elif defined(IP_RECVDSTADDR)
-                       pktinfo = IP_RECVDSTADDR;
-#endif
-                       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);
-                       addrlen = sizeof(struct sockaddr_in6);
-                       sol = SOL_IPV6;
-                       pktinfo = IPV6_RECVPKTINFO;
-                       break;
-               }
-               default:
-                       return 0;
-       }
-
-       skt = socket(family, SOCK_DGRAM, IPPROTO_UDP);
-       if (skt < 0)
-       {
-               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 socket: %s", strerror(errno));
-               close(skt);
-               return 0;
-       }
-
-       /* bind the socket */
-       if (bind(skt, (struct sockaddr *)&addr, addrlen) < 0)
-       {
-               DBG1(DBG_NET, "unable to bind socket: %s", strerror(errno));
-               close(skt);
-               return 0;
-       }
-
-       /* get additional packet info on receive */
-       if (pktinfo > 0)
-       {
-               if (setsockopt(skt, sol, pktinfo, &on, sizeof(on)) < 0)
-               {
-                       DBG1(DBG_NET, "unable to set IP_PKTINFO on socket: %s", strerror(errno));
-                       close(skt);
-                       return 0;
-               }
-       }
-
-#ifndef __APPLE__
-       {
-               /* enable UDP decapsulation globally, only for one socket needed */
-               int type = UDP_ENCAP_ESPINUDP;
-               if (family == AF_INET && port == IKEV2_NATT_PORT &&
-                       setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
-               {
-                       DBG1(DBG_NET, "unable to set UDP_ENCAP: %s", strerror(errno));
-               }
-       }
-#endif
-       return skt;
-}
-
-/**
- * enumerator for underlying sockets
- */
-typedef struct {
-       /** implements enumerator_t */
-       enumerator_t public;
-       /** sockets we enumerate */
-       private_socket_t *socket;
-       /** counter */
-       int index;
-} socket_enumerator_t;
-
-/**
- * enumerate function for socket_enumerator_t
- */
-static bool enumerate(socket_enumerator_t *this, int *fd, int *family, int *port)
-{
-       static const struct {
-               int fd_offset;
-               int family;
-               int port;
-       } sockets[] = {
-               { offsetof(private_socket_t, ipv4), AF_INET, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, ipv6), AF_INET6, IKEV2_UDP_PORT },
-               { offsetof(private_socket_t, ipv4_natt), AF_INET, IKEV2_NATT_PORT },
-               { offsetof(private_socket_t, ipv6_natt), AF_INET6, IKEV2_NATT_PORT }
-       };
-
-       while(++this->index < countof(sockets))
-       {
-               int sock = *(int*)((char*)this->socket + sockets[this->index].fd_offset);
-               if (!sock)
-               {
-                       continue;
-               }
-               *fd = sock;
-               *family = sockets[this->index].family;
-               *port = sockets[this->index].port;
-               return TRUE;
-       }
-       return FALSE;
-}
-
-/**
- * implementation of socket_t.create_enumerator
- */
-static enumerator_t *create_enumerator(private_socket_t *this)
-{
-       socket_enumerator_t *enumerator;
-
-       enumerator = malloc_thing(socket_enumerator_t);
-       enumerator->index = -1;
-       enumerator->socket = this;
-       enumerator->public.enumerate = (void*)enumerate;
-       enumerator->public.destroy = (void*)free;
-       return &enumerator->public;
-}
-
-/**
- * implementation of socket_t.destroy
- */
-static void destroy(private_socket_t *this)
-{
-       if (this->ipv4)
-       {
-               close(this->ipv4);
-       }
-       if (this->ipv4_natt)
-       {
-               close(this->ipv4_natt);
-       }
-       if (this->ipv6)
-       {
-               close(this->ipv6);
-       }
-       if (this->ipv6_natt)
-       {
-               close(this->ipv6_natt);
-       }
-       free(this);
-}
-
-/*
- * See header for description
- */
-socket_t *socket_create()
-{
-       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.create_enumerator = (enumerator_t*(*)(socket_t*))create_enumerator;
-       this->public.destroy = (void(*)(socket_t*)) destroy;
-
-       this->ipv4 = 0;
-       this->ipv6 = 0;
-       this->ipv4_natt = 0;
-       this->ipv6_natt = 0;
-
-#ifdef __APPLE__
-       {
-               int natt_port = IKEV2_NATT_PORT;
-               if (sysctlbyname("net.inet.ipsec.esp_port", NULL, NULL, &natt_port,
-                                                sizeof(natt_port)) != 0)
-               {
-                       DBG1(DBG_NET, "could not set net.inet.ipsec.esp_port to %d: %s",
-                                natt_port, strerror(errno));
-               }
-       }
-#endif
-
-       this->ipv4 = open_socket(this, AF_INET, IKEV2_UDP_PORT);
-       if (this->ipv4 == 0)
-       {
-               DBG1(DBG_NET, "could not open IPv4 socket, IPv4 disabled");
-       }
-       else
-       {
-               this->ipv4_natt = open_socket(this, AF_INET, IKEV2_NATT_PORT);
-               if (this->ipv4_natt == 0)
-               {
-                       DBG1(DBG_NET, "could not open IPv4 NAT-T socket");
-               }
-       }
-
-       this->ipv6 = open_socket(this, AF_INET6, IKEV2_UDP_PORT);
-       if (this->ipv6 == 0)
-       {
-               DBG1(DBG_NET, "could not open IPv6 socket, IPv6 disabled");
-       }
-       else
-       {
-               this->ipv6_natt = open_socket(this, AF_INET6, IKEV2_NATT_PORT);
-               if (this->ipv6_natt == 0)
-               {
-                       DBG1(DBG_NET, "could not open IPv6 NAT-T socket");
-               }
-       }
-
-       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 83bb9d4..798d341 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
- * Copyright (C) 2005-2008 Martin Willi
+ * Copyright (C) 2005-2010 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
  *
@@ -27,29 +27,10 @@ typedef struct socket_t socket_t;
 
 #include <library.h>
 #include <network/packet.h>
-#include <utils/host.h>
 #include <utils/enumerator.h>
 
 /**
- * Maximum size of a packet.
- *
- * 3000 Bytes should be sufficient, see IKEv2 RFC. However, to run our
- * multi-CA test with 2 intermediate CAs, we increase that to 5000 bytes.
- */
-#define MAX_PACKET 5000
-
-/**
- * Abstraction of all sockets (IPv4/IPv6 send/receive).
- *
- * All available sockets are bound and the receive function
- * reads from them. There are actually two implementations:
- * The first uses raw sockets to allow binding of other daemons (pluto) to
- * UDP/500. An installed "Linux socket filter" filters out all non-IKEv2
- * traffic and handles just IKEv2 messages. An other daemon (pluto) must
- * handle all traffic separately, e.g. ignore IKEv2 traffic, since charon
- * handles that.
- * The other implementation uses normal sockets and is built if
- * --disable-pluto is given to the configure script.
+ * Socket interface definition.
  */
 struct socket_t {
 
@@ -85,18 +66,6 @@ struct socket_t {
         * @return                              enumerator over (int fd, int family, int port)
         */
        enumerator_t *(*create_enumerator) (socket_t *this);
-
-       /**
-        * Destroy socket.
-        */
-       void (*destroy) (socket_t *this);
 };
 
-/**
- * Create a socket_t, which binds multiple sockets.
- *
- * @return                             socket_t object
- */
-socket_t *socket_create();
-
 #endif /** SOCKET_H_ @}*/
diff --git a/src/charon/network/socket_manager.c b/src/charon/network/socket_manager.c
new file mode 100644 (file)
index 0000000..5bd9356
--- /dev/null
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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 "socket_manager.h"
+
+#include <daemon.h>
+#include <threading/thread.h>
+#include <threading/rwlock.h>
+#include <utils/linked_list.h>
+
+typedef struct private_socket_manager_t private_socket_manager_t;
+
+/**
+ * Private data of an socket_manager_t object.
+ */
+struct private_socket_manager_t {
+
+       /**
+        * Public socket_manager_t interface.
+        */
+       socket_manager_t public;
+
+       /**
+        * List of registered socket
+        */
+       linked_list_t *sockets;
+
+       /**
+        * Lock for sockets list
+        */
+       rwlock_t *lock;
+};
+
+METHOD(socket_manager_t, receiver, status_t,
+       private_socket_manager_t *this, packet_t **packet)
+{
+       socket_t *socket;
+       status_t status;
+
+       this->lock->read_lock(this->lock);
+       if (this->sockets->get_first(this->sockets, (void**)&socket) != SUCCESS)
+       {
+               DBG1(DBG_NET, "no socket implementation registered, receiving failed");
+               this->lock->unlock(this->lock);
+               return NOT_SUPPORTED;
+       }
+       /* receive is blocking and the thread can be cancelled */
+       thread_cleanup_push((thread_cleanup_t)this->lock->unlock, this->lock);
+       status = socket->receive(socket, packet);
+       thread_cleanup_pop(TRUE);
+       return status;
+}
+
+METHOD(socket_manager_t, sender, status_t,
+       private_socket_manager_t *this, packet_t *packet)
+{
+       socket_t *socket;
+       status_t status;
+
+       this->lock->read_lock(this->lock);
+       if (this->sockets->get_first(this->sockets, (void**)&socket) != SUCCESS)
+       {
+               DBG1(DBG_NET, "no socket implementation registered, sending failed");
+               this->lock->unlock(this->lock);
+               return NOT_SUPPORTED;
+       }
+       status = socket->send(socket, packet);
+       this->lock->unlock(this->lock);
+       return status;
+}
+
+METHOD(socket_manager_t, create_enumerator, enumerator_t*,
+       private_socket_manager_t *this)
+{
+       socket_t *socket;
+
+       this->lock->read_lock(this->lock);
+       if (this->sockets->get_first(this->sockets, (void**)&socket) != SUCCESS)
+       {
+               this->lock->unlock(this->lock);
+               return enumerator_create_empty();
+       }
+       return enumerator_create_cleaner(socket->create_enumerator(socket),
+                                                                        (void*)this->lock->unlock, this->lock);
+}
+
+METHOD(socket_manager_t, add_socket, void,
+       private_socket_manager_t *this, socket_t *socket)
+{
+       this->lock->write_lock(this->lock);
+       this->sockets->insert_last(this->sockets, socket);
+       this->lock->unlock(this->lock);
+}
+
+METHOD(socket_manager_t, remove_socket, void,
+       private_socket_manager_t *this, socket_t *socket)
+{
+       this->lock->write_lock(this->lock);
+       this->sockets->remove(this->sockets, socket, NULL);
+       this->lock->unlock(this->lock);
+}
+
+METHOD(socket_manager_t, destroy, void,
+       private_socket_manager_t *this)
+{
+       this->sockets->destroy(this->sockets);
+       this->lock->destroy(this->lock);
+       free(this);
+}
+
+/**
+ * See header
+ */
+socket_manager_t *socket_manager_create()
+{
+       private_socket_manager_t *this;
+
+       INIT(this,
+               .public = {
+                       .send = _sender,
+                       .receive = _receiver,
+                       .create_enumerator = _create_enumerator,
+                       .add_socket = _add_socket,
+                       .remove_socket = _remove_socket,
+                       .destroy = _destroy,
+               },
+               .sockets = linked_list_create(),
+               .lock = rwlock_create(RWLOCK_TYPE_DEFAULT),
+       );
+
+       return &this->public;
+}
+
diff --git a/src/charon/network/socket_manager.h b/src/charon/network/socket_manager.h
new file mode 100644 (file)
index 0000000..da38f56
--- /dev/null
@@ -0,0 +1,81 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup socket_manager socket_manager
+ * @{ @ingroup network
+ */
+
+#ifndef SOCKET_MANAGER_H_
+#define SOCKET_MANAGER_H_
+
+#include <network/socket.h>
+
+typedef struct socket_manager_t socket_manager_t;
+
+/**
+ * Handle pluggable socket implementations and send/receive packets through it.
+ */
+struct socket_manager_t {
+
+       /**
+        * Receive a packet using the registered socket.
+        *
+        * @param packet                allocated packet that has been received
+        * @return
+        *                                              - SUCCESS when packet successfully received
+        *                                              - FAILED when unable to receive
+        */
+       status_t (*receive) (socket_manager_t *this, packet_t **packet);
+
+       /**
+        * Send a packet using the registered socket.
+        *
+        * @param packet                packet to send out
+        * @return
+        *                                              - SUCCESS when packet successfully sent
+        *                                              - FAILED when unable to send
+        */
+       status_t (*send) (socket_manager_t *this, packet_t *packet);
+
+       /**
+        * Enumerate all underlying socket file descriptors of the active socket.
+        *
+        * @return                              enumerator over (int fd, int family, int port)
+        */
+       enumerator_t *(*create_enumerator) (socket_manager_t *this);
+
+       /**
+        * Register a socket implementation.
+        */
+       void (*add_socket)(socket_manager_t *this, socket_t *socket);
+
+       /**
+        * Unregister a registered socket implementation.
+        */
+       void (*remove_socket)(socket_manager_t *this, socket_t *socket);
+
+       /**
+        * Destroy a socket_manager_t.
+        */
+       void (*destroy)(socket_manager_t *this);
+};
+
+/**
+ * Create a socket_manager instance.
+ */
+socket_manager_t *socket_manager_create();
+
+#endif /** SOCKET_MANAGER_H_ @}*/
diff --git a/src/charon/plugins/socket_default/Makefile.am b/src/charon/plugins/socket_default/Makefile.am
new file mode 100644 (file)
index 0000000..bf7bf05
--- /dev/null
@@ -0,0 +1,11 @@
+
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+
+AM_CFLAGS = -rdynamic
+
+plugin_LTLIBRARIES = libstrongswan-socket-default.la
+
+libstrongswan_socket_default_la_SOURCES = \
+       socket_default_plugin.h socket_default_plugin.c \
+       socket_default_socket.h socket_default_socket.c
+libstrongswan_socket_default_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/socket_default/socket_default_plugin.c b/src/charon/plugins/socket_default/socket_default_plugin.c
new file mode 100644 (file)
index 0000000..4f455b4
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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 "socket_default_plugin.h"
+
+#include "socket_default_socket.h"
+
+#include <daemon.h>
+
+typedef struct private_socket_default_plugin_t private_socket_default_plugin_t;
+
+/**
+ * Private data of socket plugin
+ */
+struct private_socket_default_plugin_t {
+
+       /**
+        * Implements plugin interface
+        */
+       socket_default_plugin_t public;
+
+       /**
+        * Socket instance.
+        */
+       socket_default_socket_t *socket;
+};
+
+METHOD(plugin_t, destroy, void,
+       private_socket_default_plugin_t *this)
+{
+       charon->socket->remove_socket(charon->socket, &this->socket->socket);
+       this->socket->destroy(this->socket);
+       free(this);
+}
+
+/*
+ * see header file
+ */
+plugin_t *plugin_create()
+{
+       private_socket_default_plugin_t *this;
+
+       INIT(this,
+               .public.plugin.destroy = _destroy,
+               .socket = socket_default_socket_create(),
+       );
+
+       if (!this->socket)
+       {
+               free(this);
+               return NULL;
+       }
+       charon->socket->add_socket(charon->socket, &this->socket->socket);
+
+       return &this->public.plugin;
+}
+
diff --git a/src/charon/plugins/socket_default/socket_default_plugin.h b/src/charon/plugins/socket_default/socket_default_plugin.h
new file mode 100644 (file)
index 0000000..af98bb5
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup socket_default socket_default
+ * @ingroup cplugins
+ *
+ * @defgroup socket_default_plugin socket_default_plugin
+ * @{ @ingroup socket_default
+ */
+
+#ifndef SOCKET_DEFAULT_PLUGIN_H_
+#define SOCKET_DEFAULT_PLUGIN_H_
+
+#include <plugins/plugin.h>
+
+typedef struct socket_default_plugin_t socket_default_plugin_t;
+
+/**
+ * Default socket implementation plugin.
+ */
+struct socket_default_plugin_t {
+
+       /**
+        * implements plugin interface
+        */
+       plugin_t plugin;
+};
+
+/**
+ * Create a socket_default_plugin instance.
+ */
+plugin_t *plugin_create();
+
+#endif /** SOCKET_DEFAULT_PLUGIN_H_ @}*/
diff --git a/src/charon/plugins/socket_default/socket_default_socket.c b/src/charon/plugins/socket_default/socket_default_socket.c
new file mode 100644 (file)
index 0000000..d69f309
--- /dev/null
@@ -0,0 +1,686 @@
+/*
+ * Copyright (C) 2006-2009 Tobias Brunner
+ * Copyright (C) 2006 Daniel Roethlisberger
+ * Copyright (C) 2005-2010 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.
+ */
+
+/* for struct in6_pktinfo */
+#define _GNU_SOURCE
+#ifdef __sun
+#define _XPG4_2
+#define __EXTENSIONS__
+#endif
+
+#include "socket_default_socket.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_systm.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netinet/udp.h>
+#include <net/if.h>
+#ifdef __APPLE__
+#include <sys/sysctl.h>
+#endif
+
+#include <daemon.h>
+#include <threading/thread.h>
+
+/* Maximum size of a packet */
+#define MAX_PACKET 5000
+
+/* length of non-esp marker */
+#define MARKER_LEN sizeof(u_int32_t)
+
+/* 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*/
+
+/* these are not defined on some platforms */
+#ifndef SOL_IP
+#define SOL_IP IPPROTO_IP
+#endif
+#ifndef SOL_IPV6
+#define SOL_IPV6 IPPROTO_IPV6
+#endif
+#ifndef SOL_UDP
+#define SOL_UDP IPPROTO_UDP
+#endif
+
+/* IPV6_RECVPKTINFO is defined in RFC 3542 which obsoletes RFC 2292 that
+ * previously defined IPV6_PKTINFO */
+#ifndef IPV6_RECVPKTINFO
+#define IPV6_RECVPKTINFO IPV6_PKTINFO
+#endif
+
+#ifndef IN6ADDR_ANY_INIT
+#define IN6ADDR_ANY_INIT {{{0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}}}
+#endif
+
+#ifndef HAVE_IN6ADDR_ANY
+static const struct in6_addr in6addr_any = IN6ADDR_ANY_INIT;
+#endif
+
+typedef struct private_socket_default_socket_t private_socket_default_socket_t;
+
+/**
+ * Private data of an socket_t object
+ */
+struct private_socket_default_socket_t {
+
+       /**
+        * public functions
+        */
+       socket_default_socket_t public;
+
+       /**
+        * IPv4 socket (500)
+        */
+       int ipv4;
+
+       /**
+        * IPv4 socket for NATT (4500)
+        */
+       int ipv4_natt;
+
+       /**
+        * IPv6 socket (500)
+        */
+       int ipv6;
+
+       /**
+        * IPv6 socket for NATT (4500)
+        */
+       int ipv6_natt;
+};
+
+METHOD(socket_t, receiver, status_t,
+       private_socket_default_socket_t *this, packet_t **packet)
+{
+       char buffer[MAX_PACKET];
+       chunk_t data;
+       packet_t *pkt;
+       host_t *source = NULL, *dest = NULL;
+       int bytes_read = 0, data_offset;
+       bool oldstate;
+
+       fd_set rfds;
+       int max_fd = 0, selected = 0;
+       u_int16_t port = 0;
+
+       FD_ZERO(&rfds);
+
+       if (this->ipv4)
+       {
+               FD_SET(this->ipv4, &rfds);
+       }
+       if (this->ipv4_natt)
+       {
+               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 sockets");
+       oldstate = thread_cancelability(TRUE);
+       if (select(max_fd + 1, &rfds, NULL, NULL, NULL) <= 0)
+       {
+               thread_cancelability(oldstate);
+               return FAILED;
+       }
+       thread_cancelability(oldstate);
+
+       if (FD_ISSET(this->ipv4, &rfds))
+       {
+               port = IKEV2_UDP_PORT;
+               selected = this->ipv4;
+       }
+       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)
+       {
+               struct msghdr msg;
+               struct cmsghdr *cmsgptr;
+               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);
+               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(selected, &msg, 0);
+               if (bytes_read < 0)
+               {
+                       DBG1(DBG_NET, "error reading socket: %s", strerror(errno));
+                       return FAILED;
+               }
+               DBG3(DBG_NET, "received packet %b", buffer, bytes_read);
+
+               if (bytes_read < MARKER_LEN)
+               {
+                       DBG3(DBG_NET, "received 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 ancillary data");
+                               return FAILED;
+                       }
+
+#ifdef HAVE_IN6_PKTINFO
+                       if (cmsgptr->cmsg_level == SOL_IPV6 &&
+                               cmsgptr->cmsg_type == IPV6_PKTINFO)
+                       {
+                               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;
+                               dst.sin6_port = htons(port);
+                               dest = host_create_from_sockaddr((sockaddr_t*)&dst);
+                       }
+#endif /* HAVE_IN6_PKTINFO */
+                       if (cmsgptr->cmsg_level == SOL_IP &&
+#ifdef IP_PKTINFO
+                               cmsgptr->cmsg_type == IP_PKTINFO
+#elif defined(IP_RECVDSTADDR)
+                               cmsgptr->cmsg_type == IP_RECVDSTADDR
+#else
+                               FALSE
+#endif
+                               )
+                       {
+                               struct in_addr *addr;
+                               struct sockaddr_in dst;
+
+#ifdef IP_PKTINFO
+                               struct in_pktinfo *pktinfo;
+                               pktinfo = (struct in_pktinfo*)CMSG_DATA(cmsgptr);
+                               addr = &pktinfo->ipi_addr;
+#elif defined(IP_RECVDSTADDR)
+                               addr = (struct in_addr*)CMSG_DATA(cmsgptr);
+#endif
+                               memset(&dst, 0, sizeof(dst));
+                               memcpy(&dst.sin_addr, 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;
+                       }
+               }
+               if (dest == NULL)
+               {
+                       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 = 0;
+               /* 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;
+}
+
+METHOD(socket_t, sender, status_t,
+       private_socket_default_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->ipv4;
+               }
+               else
+               {
+                       skt = this->ipv6;
+               }
+       }
+       else if (sport == IKEV2_NATT_PORT)
+       {
+               if (family == AF_INET)
+               {
+                       skt = this->ipv4_natt;
+               }
+               else
+               {
+                       skt = this->ipv6_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 (!src->is_anyaddr(src))
+       {
+               if (family == AF_INET)
+               {
+#if defined(IP_PKTINFO) || defined(IP_SENDSRCADDR)
+                       struct in_addr *addr;
+                       struct sockaddr_in *sin;
+#ifdef IP_PKTINFO
+                       char buf[CMSG_SPACE(sizeof(struct in_pktinfo))];
+                       struct in_pktinfo *pktinfo;
+#elif defined(IP_SENDSRCADDR)
+                       char buf[CMSG_SPACE(sizeof(struct in_addr))];
+#endif
+                       msg.msg_control = buf;
+                       msg.msg_controllen = sizeof(buf);
+                       cmsg = CMSG_FIRSTHDR(&msg);
+                       cmsg->cmsg_level = SOL_IP;
+#ifdef IP_PKTINFO
+                       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));
+                       addr = &pktinfo->ipi_spec_dst;
+#elif defined(IP_SENDSRCADDR)
+                       cmsg->cmsg_type = IP_SENDSRCADDR;
+                       cmsg->cmsg_len = CMSG_LEN(sizeof(struct in_addr));
+                       addr = (struct in_addr*)CMSG_DATA(cmsg);
+#endif
+                       sin = (struct sockaddr_in*)src->get_sockaddr(src);
+                       memcpy(addr, &sin->sin_addr, sizeof(struct in_addr));
+#endif /* IP_PKTINFO || IP_SENDSRCADDR */
+               }
+#ifdef HAVE_IN6_PKTINFO
+               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_PKTINFO;
+                       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));
+               }
+#endif /* HAVE_IN6_PKTINFO */
+       }
+
+       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 and receive packets
+ */
+static int open_socket(private_socket_default_socket_t *this,
+                                          int family, u_int16_t port)
+{
+       int on = TRUE;
+       struct sockaddr_storage addr;
+       socklen_t addrlen;
+       u_int sol, pktinfo = 0;
+       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);
+                       addrlen = sizeof(struct sockaddr_in);
+                       sol = SOL_IP;
+#ifdef IP_PKTINFO
+                       pktinfo = IP_PKTINFO;
+#elif defined(IP_RECVDSTADDR)
+                       pktinfo = IP_RECVDSTADDR;
+#endif
+                       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);
+                       addrlen = sizeof(struct sockaddr_in6);
+                       sol = SOL_IPV6;
+                       pktinfo = IPV6_RECVPKTINFO;
+                       break;
+               }
+               default:
+                       return 0;
+       }
+
+       skt = socket(family, SOCK_DGRAM, IPPROTO_UDP);
+       if (skt < 0)
+       {
+               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 socket: %s", strerror(errno));
+               close(skt);
+               return 0;
+       }
+
+       /* bind the socket */
+       if (bind(skt, (struct sockaddr *)&addr, addrlen) < 0)
+       {
+               DBG1(DBG_NET, "unable to bind socket: %s", strerror(errno));
+               close(skt);
+               return 0;
+       }
+
+       /* get additional packet info on receive */
+       if (pktinfo > 0)
+       {
+               if (setsockopt(skt, sol, pktinfo, &on, sizeof(on)) < 0)
+               {
+                       DBG1(DBG_NET, "unable to set IP_PKTINFO on socket: %s", strerror(errno));
+                       close(skt);
+                       return 0;
+               }
+       }
+
+#ifndef __APPLE__
+       {
+               /* enable UDP decapsulation globally, only for one socket needed */
+               int type = UDP_ENCAP_ESPINUDP;
+               if (family == AF_INET && port == IKEV2_NATT_PORT &&
+                       setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
+               {
+                       DBG1(DBG_NET, "unable to set UDP_ENCAP: %s", strerror(errno));
+               }
+       }
+#endif
+       return skt;
+}
+
+/**
+ * enumerator for underlying sockets
+ */
+typedef struct {
+       /** implements enumerator_t */
+       enumerator_t public;
+       /** sockets we enumerate */
+       private_socket_default_socket_t *socket;
+       /** counter */
+       int index;
+} socket_enumerator_t;
+
+/**
+ * enumerate function for socket_enumerator_t
+ */
+static bool enumerate(socket_enumerator_t *this, int *fd, int *family, int *port)
+{
+       static const struct {
+               int fd_offset;
+               int family;
+               int port;
+       } sockets[] = {
+               { offsetof(private_socket_default_socket_t, ipv4),
+                       AF_INET, IKEV2_UDP_PORT },
+               { offsetof(private_socket_default_socket_t, ipv6),
+                       AF_INET6, IKEV2_UDP_PORT },
+               { offsetof(private_socket_default_socket_t, ipv4_natt),
+                       AF_INET, IKEV2_NATT_PORT },
+               { offsetof(private_socket_default_socket_t, ipv6_natt),
+                       AF_INET6, IKEV2_NATT_PORT }
+       };
+
+       while(++this->index < countof(sockets))
+       {
+               int sock = *(int*)((char*)this->socket + sockets[this->index].fd_offset);
+               if (!sock)
+               {
+                       continue;
+               }
+               *fd = sock;
+               *family = sockets[this->index].family;
+               *port = sockets[this->index].port;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+METHOD(socket_t, create_enumerator, enumerator_t*,
+       private_socket_default_socket_t *this)
+{
+       socket_enumerator_t *enumerator;
+
+       enumerator = malloc_thing(socket_enumerator_t);
+       enumerator->index = -1;
+       enumerator->socket = this;
+       enumerator->public.enumerate = (void*)enumerate;
+       enumerator->public.destroy = (void*)free;
+       return &enumerator->public;
+}
+
+METHOD(socket_default_socket_t, destroy, void,
+       private_socket_default_socket_t *this)
+{
+       if (this->ipv4)
+       {
+               close(this->ipv4);
+       }
+       if (this->ipv4_natt)
+       {
+               close(this->ipv4_natt);
+       }
+       if (this->ipv6)
+       {
+               close(this->ipv6);
+       }
+       if (this->ipv6_natt)
+       {
+               close(this->ipv6_natt);
+       }
+       free(this);
+}
+
+/*
+ * See header for description
+ */
+socket_default_socket_t *socket_default_socket_create()
+{
+       private_socket_default_socket_t *this;
+
+       INIT(this,
+               .public = {
+                       .socket = {
+                               .send = _sender,
+                               .receive = _receiver,
+                               .create_enumerator = _create_enumerator,
+                       },
+                       .destroy = _destroy,
+               },
+       );
+
+#ifdef __APPLE__
+       {
+               int natt_port = IKEV2_NATT_PORT;
+               if (sysctlbyname("net.inet.ipsec.esp_port", NULL, NULL, &natt_port,
+                                                sizeof(natt_port)) != 0)
+               {
+                       DBG1(DBG_NET, "could not set net.inet.ipsec.esp_port to %d: %s",
+                                natt_port, strerror(errno));
+               }
+       }
+#endif
+
+       this->ipv4 = open_socket(this, AF_INET, IKEV2_UDP_PORT);
+       if (this->ipv4 == 0)
+       {
+               DBG1(DBG_NET, "could not open IPv4 socket, IPv4 disabled");
+       }
+       else
+       {
+               this->ipv4_natt = open_socket(this, AF_INET, IKEV2_NATT_PORT);
+               if (this->ipv4_natt == 0)
+               {
+                       DBG1(DBG_NET, "could not open IPv4 NAT-T socket");
+               }
+       }
+
+       this->ipv6 = open_socket(this, AF_INET6, IKEV2_UDP_PORT);
+       if (this->ipv6 == 0)
+       {
+               DBG1(DBG_NET, "could not open IPv6 socket, IPv6 disabled");
+       }
+       else
+       {
+               this->ipv6_natt = open_socket(this, AF_INET6, IKEV2_NATT_PORT);
+               if (this->ipv6_natt == 0)
+               {
+                       DBG1(DBG_NET, "could not open IPv6 NAT-T socket");
+               }
+       }
+
+       if (!this->ipv4 && !this->ipv6)
+       {
+               DBG1(DBG_NET, "could not create any sockets");
+               destroy(this);
+               return NULL;
+       }
+       return &this->public;
+}
+
diff --git a/src/charon/plugins/socket_default/socket_default_socket.h b/src/charon/plugins/socket_default/socket_default_socket.h
new file mode 100644 (file)
index 0000000..7550166
--- /dev/null
@@ -0,0 +1,49 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup socket_default_socket socket_default_socket
+ * @{ @ingroup socket_default
+ */
+
+#ifndef SOCKET_DEFAULT_SOCKET_H_
+#define SOCKET_DEFAULT_SOCKET_H_
+
+typedef struct socket_default_socket_t socket_default_socket_t;
+
+#include <network/socket.h>
+
+/**
+ * Default socket, binds to port 500/4500 using any IPv4/IPv6 address.
+ */
+struct socket_default_socket_t {
+
+       /**
+        * Implements the socket_t interface.
+        */
+       socket_t socket;
+
+       /**
+        * Destroy a socket_default_socket_t.
+        */
+       void (*destroy)(socket_default_socket_t *this);
+};
+
+/**
+ * Create a socket_default_socket instance.
+ */
+socket_default_socket_t *socket_default_socket_create();
+
+#endif /** SOCKET_DEFAULT_SOCKET_H_ @}*/
diff --git a/src/charon/plugins/socket_raw/Makefile.am b/src/charon/plugins/socket_raw/Makefile.am
new file mode 100644 (file)
index 0000000..e9a342a
--- /dev/null
@@ -0,0 +1,11 @@
+
+INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
+
+AM_CFLAGS = -rdynamic
+
+plugin_LTLIBRARIES = libstrongswan-socket-raw.la
+
+libstrongswan_socket_raw_la_SOURCES = \
+       socket_raw_plugin.h socket_raw_plugin.c \
+       socket_raw_socket.h socket_raw_socket.c
+libstrongswan_socket_raw_la_LDFLAGS = -module -avoid-version
diff --git a/src/charon/plugins/socket_raw/socket_raw_plugin.c b/src/charon/plugins/socket_raw/socket_raw_plugin.c
new file mode 100644 (file)
index 0000000..76eb71f
--- /dev/null
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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 "socket_raw_plugin.h"
+
+#include "socket_raw_socket.h"
+
+#include <daemon.h>
+
+typedef struct private_socket_raw_plugin_t private_socket_raw_plugin_t;
+
+/**
+ * Private data of socket plugin
+ */
+struct private_socket_raw_plugin_t {
+
+       /**
+        * Implements plugin interface
+        */
+       socket_raw_plugin_t public;
+
+       /**
+        * Raw socket instance.
+        */
+       socket_raw_socket_t *socket;
+};
+
+METHOD(plugin_t, destroy, void,
+       private_socket_raw_plugin_t *this)
+{
+       charon->socket->remove_socket(charon->socket, &this->socket->socket);
+       this->socket->destroy(this->socket);
+       free(this);
+}
+
+/*
+ * see header file
+ */
+plugin_t *plugin_create()
+{
+       private_socket_raw_plugin_t *this;
+
+       INIT(this,
+               .public.plugin.destroy = _destroy,
+               .socket = socket_raw_socket_create(),
+       );
+
+       if (!this->socket)
+       {
+               free(this);
+               return NULL;
+       }
+       charon->socket->add_socket(charon->socket, &this->socket->socket);
+
+       return &this->public.plugin;
+}
+
diff --git a/src/charon/plugins/socket_raw/socket_raw_plugin.h b/src/charon/plugins/socket_raw/socket_raw_plugin.h
new file mode 100644 (file)
index 0000000..1a295f8
--- /dev/null
@@ -0,0 +1,47 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup socket_raw socket_raw
+ * @ingroup cplugins
+ *
+ * @defgroup socket_raw_plugin socket_raw_plugin
+ * @{ @ingroup socket_raw
+ */
+
+#ifndef SOCKET_RAW_PLUGIN_H_
+#define SOCKET_RAW_PLUGIN_H_
+
+#include <plugins/plugin.h>
+
+typedef struct socket_raw_plugin_t socket_raw_plugin_t;
+
+/**
+ * RAW socket implementation plugin.
+ */
+struct socket_raw_plugin_t {
+
+       /**
+        * implements plugin interface
+        */
+       plugin_t plugin;
+};
+
+/**
+ * Create a socket_raw_plugin instance.
+ */
+plugin_t *plugin_create();
+
+#endif /** SOCKET_RAW_PLUGIN_H_ @}*/
diff --git a/src/charon/plugins/socket_raw/socket_raw_socket.c b/src/charon/plugins/socket_raw/socket_raw_socket.c
new file mode 100644 (file)
index 0000000..7835856
--- /dev/null
@@ -0,0 +1,756 @@
+/*
+ * Copyright (C) 2006 Tobias Brunner, Daniel Roethlisberger
+ * Copyright (C) 2005-2010 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.
+ */
+
+/* for struct in6_pktinfo */
+#define _GNU_SOURCE
+
+#include "socket_raw_socket.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/types.h>
+#include <linux/filter.h>
+#include <net/if.h>
+
+#include <daemon.h>
+#include <threading/thread.h>
+
+/* Maximum size of a packet */
+#define MAX_PACKET 5000
+
+/* 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/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*/
+
+typedef struct private_socket_raw_socket_t private_socket_raw_socket_t;
+
+/**
+ * Private data of an socket_t object
+ */
+struct private_socket_raw_socket_t {
+
+       /**
+        * public functions
+        */
+        socket_raw_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;
+};
+
+METHOD(socket_t, receiver, status_t,
+       private_socket_raw_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, data_offset;
+       bool 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");
+
+       oldstate = thread_cancelability(TRUE);
+       if (select(max(this->recv4, this->recv6) + 1, &rfds, NULL, NULL, NULL) <= 0)
+       {
+               thread_cancelability(oldstate);
+               return FAILED;
+       }
+       thread_cancelability(oldstate);
+
+       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;
+}
+
+METHOD(socket_t, sender, status_t,
+       private_socket_raw_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 (!src->is_anyaddr(src))
+       {
+               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_raw_socket_t *this,
+                                                       int family, u_int16_t port)
+{
+       int on = TRUE;
+       int type = UDP_ENCAP_ESPINUDP;
+       struct sockaddr_storage addr;
+       u_int sol;
+       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;
+                       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;
+                       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;
+       }
+
+       /* 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_raw_socket_t *this, int family)
+{
+       int skt;
+       int on = TRUE;
+       u_int proto_offset, ip_len, sol, udp_header, ike_header;
+
+       /* precalculate constants depending on address family */
+       switch (family)
+       {
+               case AF_INET:
+                       proto_offset = IP_PROTO_OFFSET;
+                       ip_len = IP_LEN;
+                       sol = SOL_IP;
+                       break;
+               case AF_INET6:
+                       proto_offset = IP6_PROTO_OFFSET;
+                       ip_len = 0; /* IPv6 raw sockets contain no IP header */
+                       sol = SOL_IPV6;
+                       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;
+       }
+
+       return skt;
+}
+
+/**
+ * enumerator for underlying sockets
+ */
+typedef struct {
+       /** implements enumerator_t */
+       enumerator_t public;
+       /** sockets we enumerate */
+       private_socket_raw_socket_t *socket;
+       /** counter */
+       int index;
+} socket_enumerator_t;
+
+/**
+ * enumerate function for socket_enumerator_t
+ */
+static bool enumerate(socket_enumerator_t *this, int *fd, int *family, int *port)
+{
+       static const struct {
+               int fd_offset;
+               int family;
+               int port;
+       } sockets[] = {
+               { offsetof(private_socket_raw_socket_t, recv4), AF_INET, IKEV2_UDP_PORT },
+               { offsetof(private_socket_raw_socket_t, recv6), AF_INET6, IKEV2_UDP_PORT },
+               { offsetof(private_socket_raw_socket_t, send4), AF_INET, IKEV2_UDP_PORT },
+               { offsetof(private_socket_raw_socket_t, send6), AF_INET6, IKEV2_UDP_PORT },
+               { offsetof(private_socket_raw_socket_t, send4_natt), AF_INET, IKEV2_NATT_PORT },
+               { offsetof(private_socket_raw_socket_t, send6_natt), AF_INET6, IKEV2_NATT_PORT }
+       };
+
+       while(++this->index < countof(sockets))
+       {
+               int sock = *(int*)((char*)this->socket + sockets[this->index].fd_offset);
+               if (!sock)
+               {
+                       continue;
+               }
+               *fd = sock;
+               *family = sockets[this->index].family;
+               *port = sockets[this->index].port;
+               return TRUE;
+       }
+       return FALSE;
+}
+
+METHOD(socket_t, create_enumerator, enumerator_t*,
+       private_socket_raw_socket_t *this)
+{
+       socket_enumerator_t *enumerator;
+
+       enumerator = malloc_thing(socket_enumerator_t);
+       enumerator->index = -1;
+       enumerator->socket = this;
+       enumerator->public.enumerate = (void*)enumerate;
+       enumerator->public.destroy = (void*)free;
+       return &enumerator->public;
+}
+
+METHOD(socket_raw_socket_t, destroy, void,
+       private_socket_raw_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_raw_socket_t *socket_raw_socket_create()
+{
+       private_socket_raw_socket_t *this;
+
+       INIT(this,
+               .public = {
+                       .socket = {
+                               .send = _sender,
+                               .receive = _receiver,
+                               .create_enumerator = _create_enumerator,
+                       },
+                       .destroy = _destroy,
+               },
+       );
+
+       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);
+               return NULL;
+       }
+
+       return &this->public;
+}
diff --git a/src/charon/plugins/socket_raw/socket_raw_socket.h b/src/charon/plugins/socket_raw/socket_raw_socket.h
new file mode 100644 (file)
index 0000000..94cf666
--- /dev/null
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2010 Martin Willi
+ * Copyright (C) 2010 revosec AG
+ *
+ * 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.
+ */
+
+/**
+ * @defgroup socket_raw_socket socket_raw_socket
+ * @{ @ingroup socket_raw
+ */
+
+#ifndef SOCKET_RAW_SOCKET_H_
+#define SOCKET_RAW_SOCKET_H_
+
+typedef struct socket_raw_socket_t socket_raw_socket_t;
+
+#include <network/socket.h>
+
+/**
+ * Raw socket, binds to port 500/4500 using any IPv4/IPv6 address.
+ *
+ * This imeplementation uses raw sockets to allow binding of other daemons
+ * (pluto) to UDP/500/4500. An installed "Linux socket filter" filters out
+ * all non-IKEv2 traffic and handles just IKEv2 messages. An other daemon
+ * must handle all traffic separately, e.g. ignore IKEv2 traffic, since charon
+ * handles that.
+ */
+struct socket_raw_socket_t {
+
+       /**
+        * Implements the socket_t interface.
+        */
+       socket_t socket;
+
+       /**
+        * Destroy a socket_raw_socket_t.
+        */
+       void (*destroy)(socket_raw_socket_t *this);
+};
+
+/**
+ * Create a socket_raw_socket instance.
+ */
+socket_raw_socket_t *socket_raw_socket_create();
+
+#endif /** SOCKET_RAW_SOCKET_H_ @}*/