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

initial support for IPv6 (more testing needed)

Browse Source 
socket works (without v6 filter)
  traffic selector handle IPv4/v4 cleanly
    improvements in traffic selector code
  kernel interface accepts v6 traffic selectors and hosts
  host_t class has full IPv6 support
This commit is contained in:
Martin Willi
2006-08-30 17:12:56 +00:00
parent 51d4876814
commit 48d9883a3e
16 changed files with 1075 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/charon/network/socket.c
+453 -140
View File
@@ -33,6 +33,7 @@
#include <sys/ioctl.h>
#include <netinet/in.h>
#include <netinet/ip.h>
#include <netinet/ip6.h>
#include <netinet/udp.h>
#include <linux/ipsec.h>
#include <linux/filter.h>
@@ -46,13 +47,15 @@
/* 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 0
#define UDP IP + IP_LEN
#define IKE UDP + UDP_LEN
#define IP_PROTO_OFFSET 9
#define IP6_PROTO_OFFSET 6
#define IKE_VERSION_OFFSET 17
#define IKE_LENGTH_OFFSET 24
/* from linux/in.h */
#ifndef IP_IPSEC_POLICY
@@ -90,19 +93,34 @@ struct private_socket_t{
int natt_port;
/**
* raw socket (receiver)
* raw receiver socket for IPv4
*/
int raw_fd;
int recv4;
/**
* raw receiver socket for IPv6
*/
int recv6;
/**
* send socket on regular port
* send socket on regular port for IPv4
*/
int send_fd;
int send4;
/**
* send socket on nat-t port
* send socket on regular port for IPv6
*/
int natt_fd;
int send6;
/**
* send socket on nat-t port for IPv4
*/
int send4_natt;
/**
* send socket on nat-t port for IPv6
*/
int send6_natt;
/**
* logger for this socket
@@ -120,54 +138,180 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
packet_t *pkt;
struct iphdr *ip;
struct udphdr *udp;
host_t *source, *dest;
host_t *source = NULL, *dest = NULL;
int bytes_read = 0;
int data_offset, oldstate;
this->logger->log(this->logger, CONTROL|LEVEL1, "receive from raw socket");
/* allow cancellation while blocking on recv() */
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
bytes_read = recv(this->raw_fd, buffer, MAX_PACKET, 0);
pthread_setcancelstate(oldstate, NULL);
fd_set rfds;
if (bytes_read < 0)
FD_ZERO(&rfds);
FD_SET(this->recv4, &rfds);
FD_SET(this->recv6, &rfds);
this->logger->log(this->logger, CONTROL|LEVEL1,
"waiting for data on raw sockets");
pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &oldstate);
if (select(max(this->recv4, this->recv6) + 1, &rfds, NULL, NULL, NULL) <= 0)
{
this->logger->log(this->logger, ERROR, "error reading from socket: %s", strerror(errno));
pthread_setcancelstate(oldstate, NULL);
return FAILED;
}
/* read source/dest from raw IP/UDP header */
ip = (struct iphdr*) buffer;
udp = (struct udphdr*) (buffer + IP_LEN);
pthread_setcancelstate(oldstate, NULL);
source = host_create_from_hdr(ip->saddr, udp->source);
dest = host_create_from_hdr(ip->daddr, udp->dest);
pkt = packet_create();
pkt->set_source(pkt, source);
pkt->set_destination(pkt, dest);
this->logger->log(this->logger, CONTROL|LEVEL1, "received packet: from %s:%d to %s:%d",
source->get_string(source), source->get_port(source),
dest->get_string(dest), dest->get_port(dest));
data_offset = IP_LEN + UDP_LEN;
/* remove non esp marker */
if (dest->get_port(dest) == this->natt_port)
if (FD_ISSET(this->recv4, &rfds))
{
data_offset += MARKER_LEN;
/* IPv4 raw sockets return the IP header. We read src/dest
* information directly from the raw header */
struct sockaddr_in src, dst;
bytes_read = recv(this->recv4, buffer, MAX_PACKET, 0);
if (bytes_read < 0)
{
this->logger->log(this->logger, ERROR,
"error reading from IPv4 socket: %s",
strerror(errno));
return FAILED;
}
this->logger->log_bytes(this->logger, RAW,
"received IPv4 packet", buffer, bytes_read);
/* read source/dest from raw IP/UDP header */
if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
{
this->logger->log(this->logger, ERROR,
"received IPv4 packet too short");
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);
this->logger->log(this->logger, CONTROL|LEVEL1,
"received packet: from %s[%d] to %s[%d]",
source->get_string(source), source->get_port(source),
dest->get_string(dest), dest->get_port(dest));
data_offset = IP_LEN + UDP_LEN;
/* remove non esp marker */
if (dest->get_port(dest) == this->natt_port)
{
data_offset += MARKER_LEN;
}
/* fill in packet */
data.len = bytes_read - data_offset;
data.ptr = malloc(data.len);
memcpy(data.ptr, buffer + data_offset, data.len);
pkt->set_data(pkt, data);
}
else if (FD_ISSET(this->recv6, &rfds))
{
/* IPv6 raw sockets return the 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)
{
this->logger->log(this->logger, ERROR,
"error reading from IPv6 socket: %s",
strerror(errno));
return FAILED;
}
this->logger->log_bytes(this->logger, RAW,
"received IPv6 packet", buffer, bytes_read);
if (bytes_read < IP_LEN + UDP_LEN + MARKER_LEN)
{
this->logger->log(this->logger, ERROR,
"received IPv6 packet too short");
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)
{
this->logger->log(this->logger, ERROR,
"error reading IPv6 ancillary data: %s",
strerror(errno));
return FAILED;
}
if (cmsgptr->cmsg_level == IPPROTO_IPV6 &&
cmsgptr->cmsg_type == IPV6_PKTINFO)
{
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)
{
this->logger->log(this->logger, ERROR,
"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);
this->logger->log(this->logger, CONTROL|LEVEL1,
"received packet: from %s[%d] to %s[%d]",
source->get_string(source), source->get_port(source),
dest->get_string(dest), dest->get_port(dest));
data_offset = UDP_LEN;
/* remove non esp marker */
if (dest->get_port(dest) == this->natt_port)
{
data_offset += MARKER_LEN;
}
/* fill in packet */
data.len = bytes_read - data_offset;
data.ptr = malloc(data.len);
memcpy(data.ptr, buffer + data_offset, data.len);
pkt->set_data(pkt, data);
}
else
{
/* oops, shouldn't happen */
return FAILED;
}
/* 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);
/* return packet */
*packet = pkt;
return SUCCESS;
}
@@ -176,7 +320,7 @@ static status_t receiver(private_socket_t *this, packet_t **packet)
*/
status_t sender(private_socket_t *this, packet_t *packet)
{
int sport, fd;
int sport, skt, family;
ssize_t bytes_sent;
chunk_t data, marked;
host_t *src, *dst;
@@ -185,50 +329,68 @@ status_t sender(private_socket_t *this, packet_t *packet)
dst = packet->get_destination(packet);
data = packet->get_data(packet);
this->logger->log(this->logger, CONTROL|LEVEL1, "sending packet: from %s:%d to %s:%d",
this->logger->log(this->logger, CONTROL|LEVEL1, "sending packet: from %s[%d] to %s[%d]",
src->get_string(src), src->get_port(src),
dst->get_string(dst), dst->get_port(dst));
/* send data */
sport = src->get_port(src);
family = dst->get_family(dst);
if (sport == this->port)
{
fd = this->send_fd;
if (family == AF_INET)
{
skt = this->send4;
}
else
{
skt = this->send6;
}
}
else if (sport == this->natt_port)
{
fd = this->natt_fd;
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)
{
this->logger->log(this->logger, ERROR, "unable to send packet: it's too big");
this->logger->log(this->logger, ERROR,
"unable to send packet: it's too big");
return FAILED;
}
marked = chunk_alloc(data.len + MARKER_LEN);
memset(marked.ptr, 0, MARKER_LEN);
memcpy(marked.ptr + MARKER_LEN, data.ptr, data.len);
packet->set_data(packet, marked); /* let the packet do the clean up for us */
/* let the packet do the clean up for us */
packet->set_data(packet, marked);
data = marked;
}
}
else
{
this->logger->log(this->logger, ERROR, "unable to locate a send socket for port: %d", sport);
this->logger->log(this->logger, ERROR,
"unable to locate a send socket for port %d", sport);
return FAILED;
}
bytes_sent = sendto(fd, data.ptr, data.len, 0,
bytes_sent = sendto(skt, data.ptr, data.len, 0,
dst->get_sockaddr(dst), *(dst->get_sockaddr_len(dst)));
if (bytes_sent != data.len)
{
this->logger->log(this->logger, ERROR, "error writing to socket: %s", strerror(errno));
this->logger->log(this->logger, ERROR,
"error writing to socket: %s", strerror(errno));
return FAILED;
}
return SUCCESS;
}
@@ -326,7 +488,9 @@ static linked_list_t* create_local_address_list(private_socket_t *this)
host = host_create_from_sockaddr(cur->ifa_addr);
if (host)
{
/* address supported, add to list */
/* we use always the IKEv2 port. This is relevant for
* natd payload hashing. */
host->set_port(host, this->port);
result->insert_last(result, host);
}
}
@@ -335,27 +499,60 @@ static linked_list_t* create_local_address_list(private_socket_t *this)
}
/**
* setup a send socket on a specified port
* open a socket to send packets
*/
static status_t setup_send_socket(private_socket_t *this, u_int16_t port, int *send_fd)
static int open_send_socket(private_socket_t *this, int family, u_int16_t port)
{
int on = TRUE;
struct sockaddr_in addr;
int type = UDP_ENCAP_ESPINUDP;
struct sockaddr_storage addr;
u_int ip_proto, ipsec_policy;
struct sadb_x_policy policy;
int fd;
int skt;
fd = socket(PF_INET, SOCK_DGRAM, IPPROTO_UDP);
if (fd < 0)
memset(&addr, 0, sizeof(addr));
/* precalculate constants depending on address family */
switch (family)
{
this->logger->log(this->logger, ERROR, "could not open IPv4 send socket!");
return FAILED;
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);
ip_proto = IPPROTO_IP;
ipsec_policy = IP_IPSEC_POLICY;
break;
}
case AF_INET6:
{
struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&addr;
sin6->sin6_family = AF_INET6;
memcpy(&sin6->sin6_addr, &in6addr_any, sizeof(in6addr_any));
sin6->sin6_port = htons(port);
ip_proto = IPPROTO_IPV6;
ipsec_policy = IPV6_IPSEC_POLICY;
break;
}
default:
return 0;
}
if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
skt = socket(family, SOCK_DGRAM, IPPROTO_UDP);
if (skt < 0)
{
this->logger->log(this->logger, ERROR, "unable to set SO_REUSEADDR on send socket!");
close(fd);
return FAILED;
this->logger->log(this->logger, ERROR, "could not open send socket: %s",
strerror(errno));
return 0;
}
if (setsockopt(skt, SOL_SOCKET, SO_REUSEADDR, (void*)&on, sizeof(on)) < 0)
{
this->logger->log(this->logger, ERROR,
"unable to set SO_REUSEADDR on send socket: %s",
strerror(errno));
close(skt);
return 0;
}
/* bypass outgoung IKE traffic on send socket */
@@ -365,44 +562,80 @@ static status_t setup_send_socket(private_socket_t *this, u_int16_t port, int *s
policy.sadb_x_policy_dir = IPSEC_DIR_OUTBOUND;
policy.sadb_x_policy_reserved = 0;
policy.sadb_x_policy_id = 0;
/* TODO: use IPPROTO_IPV6/IPV6_IPSEC_POLICY for IPv6 sockets */
if (setsockopt(fd, IPPROTO_IP, IP_IPSEC_POLICY, &policy, sizeof(policy)) < 0)
if (setsockopt(skt, ip_proto, ipsec_policy, &policy, sizeof(policy)) < 0)
{
this->logger->log(this->logger, ERROR, "unable to set IPSEC_POLICY on send socket!");
close(fd);
return FAILED;
this->logger->log(this->logger, ERROR,
"unable to set IPSEC_POLICY on send socket: %s",
strerror(errno));
close(skt);
return 0;
}
/* We don't receive packets on the send socket, but we need a INBOUND policy.
* Otherwise, UDP decapsulation does not work!!! */
policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
if (setsockopt(fd, IPPROTO_IP, IP_IPSEC_POLICY, &policy, sizeof(policy)) < 0)
if (setsockopt(skt, ip_proto, ipsec_policy, &policy, sizeof(policy)) < 0)
{
this->logger->log(this->logger, ERROR, "unable to set IPSEC_POLICY on send socket!");
close(fd);
return FAILED;
this->logger->log(this->logger, ERROR,
"unable to set IPSEC_POLICY on send socket: %s",
strerror(errno));
close(skt);
return 0;
}
/* bind the send socket */
addr.sin_family = AF_INET;
addr.sin_addr.s_addr = INADDR_ANY;
addr.sin_port = htons(port);
if (bind(fd, (struct sockaddr*)&addr, sizeof(addr)) < 0)
if (bind(skt, (struct sockaddr *)&addr, sizeof(addr)) < 0)
{
this->logger->log(this->logger, ERROR, "unable to bind send socket: %s!", strerror(errno));
return FAILED;
this->logger->log(this->logger, ERROR, "unable to bind send socket: %s",
strerror(errno));
close(skt);
return 0;
}
*send_fd = fd;
return SUCCESS;
/* enable UDP decapsulation globally */
if (setsockopt(skt, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
{
this->logger->log(this->logger, ERROR,
"unable to set UDP_ENCAP: %s; NAT-T may fail",
strerror(errno));
}
return skt;
}
/**
* Initialize all sub sockets
* open a socket to receive packets
*/
static status_t initialize(private_socket_t *this)
static int open_recv_socket(private_socket_t *this, int family)
{
int skt;
int on = TRUE;
u_int proto_offset, ip_len, ip_proto, ipsec_policy, ip_pktinfo, udp_header, ike_header;
struct sadb_x_policy policy;
int type = UDP_ENCAP_ESPINUDP;
/* precalculate constants depending on address family */
switch (family)
{
case AF_INET:
proto_offset = IP_PROTO_OFFSET;
ip_len = IP_LEN;
ip_proto = IPPROTO_IP;
ip_pktinfo = IP_PKTINFO;
ipsec_policy = IP_IPSEC_POLICY;
break;
case AF_INET6:
proto_offset = IP6_PROTO_OFFSET;
ip_len = IP6_LEN;
ip_proto = IPPROTO_IPV6;
ip_pktinfo = IPV6_PKTINFO;
ipsec_policy = IPV6_IPSEC_POLICY;
break;
default:
return 0;
}
udp_header = ip_len;
ike_header = ip_len + UDP_LEN;
/* This filter code filters out all non-IKEv2 traffic on
* a SOCK_RAW IP_PROTP_UDP socket. Handling of other
@@ -411,30 +644,30 @@ static status_t initialize(private_socket_t *this)
struct sock_filter ikev2_filter_code[] =
{
/* Protocol must be UDP */
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, IP + 9),
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, proto_offset),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, IPPROTO_UDP, 0, 15),
/* Destination Port must be either port or natt_port */
BPF_STMT(BPF_LD+BPF_H+BPF_ABS, UDP + 2),
BPF_STMT(BPF_LD+BPF_H+BPF_ABS, udp_header + 2),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, this->port, 1, 0),
BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, this->natt_port, 5, 12),
/* port */
/* IKE version must be 2.0 */
BPF_STMT(BPF_LD+BPF_B+BPF_ABS, IKE + 17),
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 + 24),
BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, IP_LEN + UDP_LEN),
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),
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 + MARKER_LEN + 17),
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 + MARKER_LEN + 24),
BPF_STMT(BPF_ALU+BPF_ADD+BPF_K, IP_LEN + UDP_LEN + MARKER_LEN),
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),
@@ -445,20 +678,37 @@ static status_t initialize(private_socket_t *this)
sizeof(ikev2_filter_code) / sizeof(struct sock_filter),
ikev2_filter_code
};
/* set up raw socket */
this->raw_fd = socket(PF_INET, SOCK_RAW, IPPROTO_UDP);
if (this->raw_fd < 0)
/* set up a raw socket */
skt = socket(family, SOCK_RAW, IPPROTO_UDP);
if (skt < 0)
{
this->logger->log(this->logger, ERROR, "unable to create raw socket!");
return FAILED;
this->logger->log(this->logger, ERROR,
"unable to create raw socket: %s",
strerror(errno));
return 0;
}
if (setsockopt(this->raw_fd, SOL_SOCKET, SO_ATTACH_FILTER, &ikev2_filter, sizeof(ikev2_filter)) < 0)
if (family == AF_INET)
{
this->logger->log(this->logger, ERROR, "unable to attach IKEv2 filter to raw socket!");
close(this->raw_fd);
return FAILED;
if (setsockopt(skt, SOL_SOCKET, SO_ATTACH_FILTER,
&ikev2_filter, sizeof(ikev2_filter)) < 0)
{
this->logger->log(this->logger, ERROR,
"unable to attach IKEv2 filter to raw socket: %s",
strerror(errno));
close(skt);
return 0;
}
}
else if (setsockopt(skt, ip_proto, ip_pktinfo, &on, sizeof(on)) < 0)
{
this->logger->log(this->logger, ERROR,
"unable to set IPV6_PKTINFO on raw socket: %s",
strerror(errno));
close(skt);
return 0;
}
/* bypass incomining IKE traffic on this socket */
@@ -468,35 +718,17 @@ static status_t initialize(private_socket_t *this)
policy.sadb_x_policy_dir = IPSEC_DIR_INBOUND;
policy.sadb_x_policy_reserved = 0;
policy.sadb_x_policy_id = 0;
/* TODO: use IPPROTO_IPV6/IPV6_IPSEC_POLICY for IPv6 sockets */
if (setsockopt(this->raw_fd, IPPROTO_IP, IP_IPSEC_POLICY, &policy, sizeof(policy)) < 0)
{
this->logger->log(this->logger, ERROR, "unable to set IPSEC_POLICY on raw socket!");
close(this->raw_fd);
return FAILED;
}
/* setup the send sockets */
if (setup_send_socket(this, this->port, &this->send_fd) != SUCCESS)
if (setsockopt(skt, ip_proto, ipsec_policy, &policy, sizeof(policy)) < 0)
{
this->logger->log(this->logger, ERROR, "unable to setup send socket on port %d!", this->port);
return FAILED;
}
if (setup_send_socket(this, this->natt_port, &this->natt_fd) != SUCCESS)
{
this->logger->log(this->logger, ERROR, "unable to setup send socket on port %d!", this->natt_port);
return FAILED;
}
/* enable UDP decapsulation globally */
if (setsockopt(this->natt_fd, SOL_UDP, UDP_ENCAP, &type, sizeof(type)) < 0)
{
this->logger->log(this->logger, ERROR,
"unable to set UDP_ENCAP on NAT-T socket: %s; NAT-T may fail",
this->logger->log(this->logger, ERROR,
"unable to set IPSEC_POLICY on raw socket: %s",
strerror(errno));
close(skt);
return 0;
}
return SUCCESS;
return skt;
}
/**
@@ -504,9 +736,30 @@ static status_t initialize(private_socket_t *this)
*/
static void destroy(private_socket_t *this)
{
close(this->natt_fd);
close(this->send_fd);
close(this->raw_fd);
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);
}
@@ -528,12 +781,72 @@ socket_t *socket_create(u_int16_t port, u_int16_t natt_port)
this->port = port;
this->natt_port = natt_port;
this->recv4 = 0;
this->recv6 = 0;
this->send4 = 0;
this->send6 = 0;
this->send4_natt = 0;
this->send6_natt = 0;
if (initialize(this) != SUCCESS)
this->recv4 = open_recv_socket(this, AF_INET);
if (this->recv4 == 0)
{
free(this);
charon->kill(charon, "could not init socket!");
this->logger->log(this->logger, ERROR,
"could not open IPv4 receive socket, IPv4 disabled");
}
else
{
this->send4 = open_send_socket(this, AF_INET, this->port);
if (this->send4 == 0)
{
this->logger->log(this->logger, ERROR,
"could not open IPv4 send socket, IPv4 disabled");
close(this->recv4);
}
else
{
this->send4_natt = open_send_socket(this, AF_INET, this->natt_port);
if (this->send4_natt == 0)
{
this->logger->log(this->logger, ERROR,
"could not open IPv4 NAT-T send socket");
}
}
}
this->recv6 = open_recv_socket(this, AF_INET6);
if (this->recv6 == 0)
{
this->logger->log(this->logger, ERROR,
"could not open IPv6 receive socket, IPv6 disabled");
}
else
{
this->send6 = open_send_socket(this, AF_INET6, this->port);
if (this->send4 == 0)
{
this->logger->log(this->logger, ERROR,
"could not open IPv6 send socket, IPv6 disabled");
close(this->recv6);
}
else
{
this->send6_natt = open_send_socket(this, AF_INET, this->natt_port);
if (this->send6_natt == 0)
{
this->logger->log(this->logger, ERROR,
"could not open IPv6 NAT-T send socket");
}
}
}
if (!(this->send4 || this->send6))
{
this->logger->log(this->logger, ERROR,
"could not create any sockets");
destroy(this);
charon->kill(charon, "socket initialization failed");
}
return (socket_t*)this;
}
src/charon/network/socket.h
-2
View File
@@ -57,8 +57,6 @@ typedef struct socket_t socket_t;
* @b Constructors:
* - socket_create()
*
* @todo add IPv6 support
*
* @ingroup network
*/
struct socket_t {