Use libevent to send MTU probes.

This commit is contained in:
Guus Sliepen 2007-05-17 22:01:07 +00:00
parent ee7844905f
commit 3321591d93
3 changed files with 11 additions and 14 deletions

View file

@ -36,7 +36,6 @@
#include "connection.h" #include "connection.h"
#include "device.h" #include "device.h"
#include "ethernet.h" #include "ethernet.h"
#include "tevent.h"
#include "graph.h" #include "graph.h"
#include "list.h" #include "list.h"
#include "logger.h" #include "logger.h"
@ -61,15 +60,14 @@ static void send_udppacket(node_t *, vpn_packet_t *);
#define MAX_SEQNO 1073741824 #define MAX_SEQNO 1073741824
void send_mtu_probe(node_t *n) static void send_mtu_probe_handler(int fd, short events, void *data) {
{ node_t *n = data;
vpn_packet_t packet; vpn_packet_t packet;
int len, i; int len, i;
cp(); cp();
n->mtuprobes++; n->mtuprobes++;
n->mtuevent = NULL;
if(n->mtuprobes >= 10 && !n->minmtu) { if(n->mtuprobes >= 10 && !n->minmtu) {
ifdebug(TRAFFIC) logger(LOG_INFO, _("No response to MTU probes from %s (%s)"), n->name, n->hostname); ifdebug(TRAFFIC) logger(LOG_INFO, _("No response to MTU probes from %s (%s)"), n->name, n->hostname);
@ -96,11 +94,13 @@ void send_mtu_probe(node_t *n)
send_udppacket(n, &packet); send_udppacket(n, &packet);
} }
n->mtuevent = new_tevent(); event_add(&n->mtuevent, &(struct timeval){1, 0});
n->mtuevent->handler = (event_handler_t)send_mtu_probe; }
n->mtuevent->data = n;
n->mtuevent->time = now + 1; void send_mtu_probe(node_t *n) {
tevent_add(n->mtuevent); if(!n->mtuevent.ev_callback)
timeout_set(&n->mtuevent, send_mtu_probe_handler, n);
send_mtu_probe_handler(0, 0, n);
} }
void mtu_probe_h(node_t *n, vpn_packet_t *packet) { void mtu_probe_h(node_t *n, vpn_packet_t *packet) {

View file

@ -106,10 +106,7 @@ void free_node(node_t *n)
EVP_CIPHER_CTX_cleanup(&n->packet_ctx); EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
if(n->mtuevent) { event_del(&n->mtuevent);
tevent_del(n->mtuevent);
free_tevent(n->mtuevent);
}
if(n->hostname) if(n->hostname)
free(n->hostname); free(n->hostname);

View file

@ -80,7 +80,7 @@ typedef struct node_t {
length_t minmtu; /* Probed minimum MTU */ length_t minmtu; /* Probed minimum MTU */
length_t maxmtu; /* Probed maximum MTU */ length_t maxmtu; /* Probed maximum MTU */
int mtuprobes; /* Number of probes */ int mtuprobes; /* Number of probes */
tevent_t *mtuevent; /* Probe event */ struct event mtuevent; /* Probe event */
} node_t; } node_t;
extern struct node_t *myself; extern struct node_t *myself;