diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-02-23 11:51:53 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-08-08 15:12:24 +0200 |
| commit | 064da8b96b24db331e37c93d8f857c8558d294bb (patch) | |
| tree | 0635f8c3ced5682dec7e84590efbbe1869e9ef61 /src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c | |
| parent | 65da43e2fceb74f297a280c034000a7c01538703 (diff) | |
| download | strongswan-064da8b96b24db331e37c93d8f857c8558d294bb.tar.bz2 strongswan-064da8b96b24db331e37c93d8f857c8558d294bb.tar.xz | |
Add Non-ESP marker in sender and not individual socket plugins.
Diffstat (limited to 'src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c')
| -rw-r--r-- | src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c index 39ba4736c..ec61e61c9 100644 --- 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); |