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

Removed the unneeded socket-raw plugin

Browse Source
This commit is contained in:
Tobias Brunner
2012-09-14 14:10:14 +02:00
parent a889cfe5e1
commit 6d30954ae8
10 changed files with 0 additions and 895 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
-4
View File
@@ -178,7 +178,6 @@ ARG_ENABL_SET([kernel-pfroute], [enable the PF_ROUTE kernel interface.])
ARG_ENABL_SET([kernel-klips], [enable the KLIPS kernel interface.])
ARG_ENABL_SET([libipsec], [enable user space IPsec implementation.])
ARG_DISBL_SET([socket-default], [disable default socket implementation for charon.])
ARG_ENABL_SET([socket-raw], [enable raw socket implementation of charon])
ARG_ENABL_SET([socket-dynamic], [enable dynamic socket implementation for charon])
ARG_ENABL_SET([farp], [enable ARP faking plugin that responds to ARP requests to peers virtual IP])
ARG_ENABL_SET([dumm], [enable the DUMM UML test framework.])
@@ -904,7 +903,6 @@ ADD_PLUGIN([kernel-klips], [h charon starter])
ADD_PLUGIN([kernel-netlink], [h charon starter nm])
ADD_PLUGIN([resolve], [h charon])
ADD_PLUGIN([socket-default], [c charon nm])
ADD_PLUGIN([socket-raw], [c charon nm])
ADD_PLUGIN([socket-dynamic], [c charon])
ADD_PLUGIN([farp], [c charon])
ADD_PLUGIN([stroke], [c charon])
@@ -1077,7 +1075,6 @@ AM_CONDITIONAL(USE_IMV_SCANNER, test x$imv_scanner = xtrue)
AM_CONDITIONAL(USE_IMC_ATTESTATION, test x$imc_attestation = xtrue)
AM_CONDITIONAL(USE_IMV_ATTESTATION, test x$imv_attestation = xtrue)
AM_CONDITIONAL(USE_SOCKET_DEFAULT, test x$socket_default = xtrue)
AM_CONDITIONAL(USE_SOCKET_RAW, test x$socket_raw = xtrue)
AM_CONDITIONAL(USE_SOCKET_DYNAMIC, test x$socket_dynamic = xtrue)
AM_CONDITIONAL(USE_FARP, test x$farp = xtrue)
AM_CONDITIONAL(USE_ADDRBLOCK, test x$addrblock = xtrue)
@@ -1253,7 +1250,6 @@ AC_OUTPUT(
src/libcharon/plugins/tnccs_20/Makefile
src/libcharon/plugins/tnccs_dynamic/Makefile
src/libcharon/plugins/socket_default/Makefile
src/libcharon/plugins/socket_raw/Makefile
src/libcharon/plugins/socket_dynamic/Makefile
src/libcharon/plugins/farp/Makefile
src/libcharon/plugins/smp/Makefile
src/libcharon/Android.mk
-2
View File
@@ -200,8 +200,6 @@ LOCAL_SRC_FILES += $(call add_plugin, socket-default)
LOCAL_SRC_FILES += $(call add_plugin, socket-dynamic)
LOCAL_SRC_FILES += $(call add_plugin, socket-raw)
LOCAL_SRC_FILES += $(call add_plugin, stroke)
ifneq ($(call plugin_enabled, stroke),)
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../stroke/
src/libcharon/Makefile.am
-7
View File
@@ -176,13 +176,6 @@ if MONOLITHIC
endif
endif
if USE_SOCKET_RAW
SUBDIRS += plugins/socket_raw
if MONOLITHIC
libcharon_la_LIBADD += plugins/socket_raw/libstrongswan-socket-raw.la
endif
endif
if USE_SOCKET_DYNAMIC
SUBDIRS += plugins/socket_dynamic
if MONOLITHIC
src/libcharon/plugins/socket_raw/Makefile.am
-17
View File
@@ -1,17 +0,0 @@
INCLUDES = -I${linux_headers} -I$(top_srcdir)/src/libstrongswan \
-I$(top_srcdir)/src/libhydra -I$(top_srcdir)/src/libcharon
AM_CFLAGS = -rdynamic
if MONOLITHIC
noinst_LTLIBRARIES = libstrongswan-socket-raw.la
else
plugin_LTLIBRARIES = libstrongswan-socket-raw.la
endif
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
src/libcharon/plugins/socket_raw/socket_raw_plugin.c
-79
View File
@@ -1,79 +0,0 @@
/*
* Copyright (C) 2010 Tobias Brunner
* Hochschule fuer Technik Rapperswil
* 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;
};
METHOD(plugin_t, get_name, char*,
private_socket_raw_plugin_t *this)
{
return "socket-raw";
}
METHOD(plugin_t, get_features, int,
private_socket_raw_plugin_t *this, plugin_feature_t *features[])
{
static plugin_feature_t f[] = {
PLUGIN_CALLBACK(socket_register, socket_raw_socket_create),
PLUGIN_PROVIDE(CUSTOM, "socket"),
};
*features = f;
return countof(f);
}
METHOD(plugin_t, destroy, void,
private_socket_raw_plugin_t *this)
{
free(this);
}
/*
* see header file
*/
plugin_t *socket_raw_plugin_create()
{
private_socket_raw_plugin_t *this;
INIT(this,
.public = {
.plugin = {
.get_name = _get_name,
.get_features = _get_features,
.destroy = _destroy,
},
},
);
return &this->public.plugin;
}
src/libcharon/plugins/socket_raw/socket_raw_plugin.h
-42
View File
@@ -1,42 +0,0 @@
/*
* 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;
};
#endif /** SOCKET_RAW_PLUGIN_H_ @}*/
src/libcharon/plugins/socket_raw/socket_raw_socket.c
-687
View File
@@ -1,687 +0,0 @@
/*
* Copyright (C) 2006-2012 Tobias Brunner
* Copyright (C) 2005-2010 Martin Willi
* Copyright (C) 2006 Daniel Roethlisberger
* 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/udp.h>
#include <linux/types.h>
#include <linux/filter.h>
#include <net/if.h>
#include <hydra.h>
#include <daemon.h>
#include <threading/thread.h>
/* Maximum size of a packet */
#define MAX_PACKET 10000
/* 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
/* 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;
/**
* Maximum packet size to receive
*/
int max_packet;
};
METHOD(socket_t, receiver, status_t,
private_socket_raw_socket_t *this, packet_t **packet)
{
char buffer[this->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, this->max_packet, 0);
if (bytes_read < 0)
{
DBG1(DBG_NET, "error reading from IPv4 socket: %s", strerror(errno));
return FAILED;
}
if (bytes_read == this->max_packet)
{
DBG1(DBG_NET, "receive buffer too small, packet discarded");
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)
{
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;
data.len = bytes_read - data_offset;
data.ptr = buffer + data_offset;
pkt->set_data(pkt, chunk_clone(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 = this->max_packet;
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)
{
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;
}
#ifdef HAVE_IN6_PKTINFO
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);
}
#endif /* HAVE_IN6_PKTINFO */
}
/* 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;
data.len = bytes_read - data_offset;
data.ptr = buffer + data_offset;
pkt->set_data(pkt, chunk_clone(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;
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 == 0 || sport == CHARON_UDP_PORT)
{
if (family == AF_INET)
{
skt = this->send4;
}
else
{
skt = this->send6;
}
}
else if (sport == CHARON_NATT_PORT)
{
if (family == AF_INET)
{
skt = this->send4_natt;
}
else
{
skt = this->send6_natt;
}
}
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));
}
#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_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));
}
#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 packets
*/
static int open_send_socket(private_socket_raw_socket_t *this,
int family, u_int16_t port)
{
int on = TRUE;
struct sockaddr_storage addr;
int skt;
memset(&addr, 0, sizeof(addr));
addr.ss_family = family;
/* precalculate constants depending on address family */
switch (family)
{
case AF_INET:
{
struct sockaddr_in *sin = (struct sockaddr_in *)&addr;
htoun32(&sin->sin_addr.s_addr, INADDR_ANY);
htoun16(&sin->sin_port, port);
break;
}
case AF_INET6:
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
memcpy(&sin6->sin6_addr, &in6addr_any, sizeof(in6addr_any));
htoun16(&sin6->sin6_port, port);
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 (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
skt, family))
{
DBG1(DBG_NET, "installing bypass policy on send socket failed");
}
/* enable UDP decapsulation for NAT-T sockets */
if (port == CHARON_NATT_PORT &&
!hydra->kernel_interface->enable_udp_decap(hydra->kernel_interface,
skt, family, port))
{
DBG1(DBG_NET, "enabling UDP decapsulation failed");
}
return skt;
}
METHOD(socket_t, get_port, u_int16_t,
private_socket_raw_socket_t *this, bool nat_t)
{
return nat_t ? CHARON_NATT_PORT : CHARON_UDP_PORT;
}
/**
* 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 ip_len, sol, udp_header, ike_header;
/* precalculate constants depending on address family */
switch (family)
{
case AF_INET:
ip_len = IP_LEN;
sol = SOL_IP;
break;
case AF_INET6:
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, CHARON_UDP_PORT, 1, 0),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, CHARON_NATT_PORT, 6, 14),
/* port */
/* IKE version must be 2.x */
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + IKE_VERSION_OFFSET),
BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 4),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 2, 0, 11),
/* 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, 6),
/* nat-t: IKE version must be 2.x */
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, ike_header + MARKER_LEN + IKE_VERSION_OFFSET),
BPF_STMT(BPF_ALU+BPF_RSH+BPF_K, 4),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 2, 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;
}
if (!hydra->kernel_interface->bypass_socket(hydra->kernel_interface,
skt, family))
{
DBG1(DBG_NET, "installing bypass policy on receive socket failed");
}
return skt;
}
METHOD(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,
.get_port = _get_port,
.destroy = _destroy,
},
},
.max_packet = lib->settings->get_int(lib->settings,
"%s.max_packet", MAX_PACKET, charon->name),
);
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, CHARON_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, CHARON_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, CHARON_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, CHARON_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;
}
src/libcharon/plugins/socket_raw/socket_raw_socket.h
-51
View File
@@ -1,51 +0,0 @@
/*
* 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;
};
/**
* Create a socket_raw_socket instance.
*/
socket_raw_socket_t *socket_raw_socket_create();
#endif /** SOCKET_RAW_SOCKET_H_ @}*/
testing/scripts/build-umlrootfs
-5
View File
@@ -317,11 +317,6 @@ then
echo -n " --enable-socket-dynamic" >> $INSTALLSHELL
fi
if [ "$USE_SOCKET_RAW" = "yes" ]
then
echo -n " --enable-socket-raw" >> $INSTALLSHELL
fi
if [ "$USE_DHCP" = "yes" ]
then
echo -n " --enable-dhcp" >> $INSTALLSHELL
testing/testing.conf
-1
View File
@@ -72,7 +72,6 @@ USE_TEST_VECTORS="yes"
USE_GCRYPT="yes"
USE_SOCKET_DEFAULT="yes"
USE_SOCKET_DYNAMIC="yes"
USE_SOCKET_RAW="yes"
USE_DHCP="yes"
USE_FARP="yes"
USE_ADDRBLOCK="yes"