From 65da43e2fceb74f297a280c034000a7c01538703 Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 23 Feb 2012 11:35:16 +0100 Subject: Handle Non-ESP marker in receiver and not individual socket plugins. --- src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c') diff --git a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c index d4a9552f6..39ba4736c 100644 --- a/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c +++ b/src/libcharon/plugins/socket_dynamic/socket_dynamic_socket.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Tobias Brunner + * Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2005-2010 Martin Willi * Copyright (C) 2005 Jan Hutter @@ -297,12 +297,6 @@ static packet_t *receive_packet(private_socket_dynamic_socket_t *this, packet = packet_create(); packet->set_source(packet, source); packet->set_destination(packet, dest); - /* we assume a non-ESP marker if none of the ports is on 500 */ - if (dest->get_port(dest) != IKEV2_UDP_PORT && - source->get_port(source) != IKEV2_UDP_PORT) - { - data = chunk_skip(data, MARKER_LEN); - } packet->set_data(packet, chunk_clone(data)); return packet; } -- cgit v1.2.3