Add Non-ESP marker in sender and not individual socket plugins.

diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c
index 75635d2e32a7bd2ca72286ad946143bd69f1fb9b..b62185f8c519ad37649278d987bbd8d64d6d8d36 100644 (file)
--- a/src/libcharon/network/sender.c
+++ b/src/libcharon/network/sender.c
@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2012 Tobias Brunner
  * Copyright (C) 2005-2006 Martin Willi
  * Copyright (C) 2005 Jan Hutter
  * Hochschule fuer Technik Rapperswil
@@ -121,6 +122,7 @@ METHOD(sender_t, send_, void,
 static job_requeue_t send_packets(private_sender_t * this)
 {
        packet_t *packet;
+       host_t *src, *dst;
        bool oldstate;
 
        this->mutex->lock(this->mutex);
@@ -139,6 +141,23 @@ static job_requeue_t send_packets(private_sender_t * this)
        this->sent->signal(this->sent);
        this->mutex->unlock(this->mutex);
 
+       /* if neither source nor destination port is 500 we add a Non-ESP marker */
+       dst = packet->get_destination(packet);
+       src = packet->get_source(packet);
+       if (dst->get_port(dst) != IKEV2_UDP_PORT &&
+               src->get_port(src) != IKEV2_UDP_PORT)
+       {
+               chunk_t marker = chunk_from_chars(0x00, 0x00, 0x00, 0x00), data;
+
+               data = packet->get_data(packet);
+               /* NAT keepalives have no marker prepended */
+               if (data.len != 1 || data.ptr[0] != 0xFF)
+               {
+                       data = chunk_cat("cm", marker, data);
+                       packet->set_data(packet, data);
+               }
+       }
+
        charon->socket->send(charon->socket, packet);
        packet->destroy(packet);
        return JOB_REQUEUE_DIRECT;

diff --git a/src/libcharon/network/sender.h b/src/libcharon/network/sender.h
index 6ee0704357d30d34639885b46295b5eb7365a4e7..d8ff8c892c9ab80bb18e6b15a7b9c7dcc6c0f5c0 100644 (file)
--- a/src/libcharon/network/sender.h
+++ b/src/libcharon/network/sender.h
@@ -28,7 +28,7 @@ typedef struct sender_t sender_t;
 #include <network/packet.h>
 
 /**
- * Thread responsible for sending packets over the socket.
+ * Callback job responsible for sending IKE packets over the socket.
  */
 struct sender_t {
 

diff --git a/src/libcharon/plugins/socket_default/socket_default_socket.c b/src/libcharon/plugins/socket_default/socket_default_socket.c
index a0b8e0b98cf9ffae16233539c58a7d7c33aa3dc9..eba7219b24f2dfa8c15cf55ececbe4bf146405ce 100644 (file)
--- a/src/libcharon/plugins/socket_default/socket_default_socket.c
+++ b/src/libcharon/plugins/socket_default/socket_default_socket.c
@@ -315,7 +315,7 @@ METHOD(socket_t, sender, status_t,
 {
        int sport, skt, family;
        ssize_t bytes_sent;
-       chunk_t data, marked;
+       chunk_t data;
        host_t *src, *dst;
        struct msghdr msg;
        struct cmsghdr *cmsg;
@@ -351,17 +351,6 @@ METHOD(socket_t, sender, status_t,
                {
                        skt = this->ipv6_natt;
                }
-               /* NAT keepalives without marker */
-               if (data.len != 1 || data.ptr[0] != 0xFF)
-               {
-                       /* add non esp marker to packet */
-                       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
        {

diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
index 39ba4736cd17c8f91d3ae6777bc4f97bb0b1a497..ec61e61c9212979d0bbfec43128a666479fdd88e 100644 (file)
--- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
+++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c
@@ -477,7 +477,7 @@ METHOD(socket_t, sender, status_t,
        host_t *src, *dst;
        int port, family;
        ssize_t len;
-       chunk_t data, marked;
+       chunk_t data;
        struct msghdr msg;
        struct cmsghdr *cmsg;
        struct iovec iov;
@@ -495,19 +495,6 @@ METHOD(socket_t, sender, status_t,
        data = packet->get_data(packet);
        DBG2(DBG_NET, "sending packet: from %#H to %#H", src, dst);
 
-       /* use non-ESP marker if none of the ports is 500, not for keep alives */
-       if (port != IKEV2_UDP_PORT && dst->get_port(dst) != IKEV2_UDP_PORT &&
-               !(data.len == 1 && data.ptr[0] == 0xFF))
-       {
-               /* add non esp marker to packet */
-               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;
-       }
-
        memset(&msg, 0, sizeof(struct msghdr));
        msg.msg_name = dst->get_sockaddr(dst);;
        msg.msg_namelen = *dst->get_sockaddr_len(dst);

diff --git a/src/libcharon/plugins/socket_raw/socket_raw_socket.c b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
index f363671c15d1b91038e3e51dc992f594fcb9b583..600f5453df763552065b8843292a1292d70dcd38 100644 (file)
--- a/src/libcharon/plugins/socket_raw/socket_raw_socket.c
+++ b/src/libcharon/plugins/socket_raw/socket_raw_socket.c
@@ -303,7 +303,7 @@ METHOD(socket_t, sender, status_t,
 {
        int sport, skt, family;
        ssize_t bytes_sent;
-       chunk_t data, marked;
+       chunk_t data;
        host_t *src, *dst;
        struct msghdr msg;
        struct cmsghdr *cmsg;
@@ -339,17 +339,6 @@ METHOD(socket_t, sender, status_t,
                {
                        skt = this->send6_natt;
                }
-               /* NAT keepalives without marker */
-               if (data.len != 1 || data.ptr[0] != 0xFF)
-               {
-                       /* add non esp marker to packet */
-                       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
        {