diff options
Diffstat (limited to 'src/libcharon/network/sender.c')
-rw-r--r-- | src/libcharon/network/sender.c | 48 |
1 files changed, 28 insertions, 20 deletions
diff --git a/src/libcharon/network/sender.c b/src/libcharon/network/sender.c index b62185f8c..c12941e25 100644 --- a/src/libcharon/network/sender.c +++ b/src/libcharon/network/sender.c @@ -80,7 +80,7 @@ struct private_sender_t { bool send_delay_response; }; -METHOD(sender_t, send_, void, +METHOD(sender_t, send_no_marker, void, private_sender_t *this, packet_t *packet) { host_t *src, *dst; @@ -116,13 +116,37 @@ METHOD(sender_t, send_, void, this->mutex->unlock(this->mutex); } +METHOD(sender_t, send_, void, + private_sender_t *this, packet_t *packet) +{ + host_t *src, *dst; + + /* if neither source nor destination port is 500 we add a Non-ESP marker */ + src = packet->get_source(packet); + dst = packet->get_destination(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); + } + } + + send_no_marker(this, packet); +} + /** * Job callback function to send packets */ -static job_requeue_t send_packets(private_sender_t * this) +static job_requeue_t send_packets(private_sender_t *this) { packet_t *packet; - host_t *src, *dst; bool oldstate; this->mutex->lock(this->mutex); @@ -141,23 +165,6 @@ 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; @@ -195,6 +202,7 @@ sender_t * sender_create() INIT(this, .public = { .send = _send_, + .send_no_marker = _send_no_marker, .flush = _flush, .destroy = _destroy, }, |