diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-02-23 11:35:16 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2012-08-08 15:12:24 +0200 |
| commit | 65da43e2fceb74f297a280c034000a7c01538703 (patch) | |
| tree | db319c5b4551d3be672d3b3a1e5bc4aea6cf66fa /src/libcharon/network/receiver.c | |
| parent | a405760395b126c08cb77212acc3d823b9e27448 (diff) | |
| download | strongswan-65da43e2fceb74f297a280c034000a7c01538703.tar.bz2 strongswan-65da43e2fceb74f297a280c034000a7c01538703.tar.xz | |
Handle Non-ESP marker in receiver and not individual socket plugins.
Diffstat (limited to 'src/libcharon/network/receiver.c')
| -rw-r--r-- | src/libcharon/network/receiver.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/libcharon/network/receiver.c b/src/libcharon/network/receiver.c index dff76e245..6a39489b6 100644 --- a/src/libcharon/network/receiver.c +++ b/src/libcharon/network/receiver.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008 Tobias Brunner + * Copyright (C) 2008-2012 Tobias Brunner * Copyright (C) 2005-2006 Martin Willi * Copyright (C) 2005 Jan Hutter * Hochschule fuer Technik Rapperswil @@ -400,6 +400,7 @@ static job_requeue_t receive_packets(private_receiver_t *this) ike_sa_id_t *id; packet_t *packet; message_t *message; + host_t *src, *dst; status_t status; bool supported = TRUE; @@ -415,6 +416,28 @@ static job_requeue_t receive_packets(private_receiver_t *this) return JOB_REQUEUE_FAIR; } + /* if neither source nor destination port is 500 we assume an IKE packet + * with Non-ESP marker or an ESP packet */ + 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); + if (memeq(data.ptr, marker.ptr, marker.len)) + { /* remove Non-ESP marker */ + data = chunk_skip(data, marker.len); + packet->set_data(packet, chunk_clone(data)); + } + else + { /* this seems to be an ESP packet */ + packet->destroy(packet); + return JOB_REQUEUE_DIRECT; + } + } + /* parse message header */ message = message_create_from_packet(packet); if (message->parse_header(message) != SUCCESS) |