Use libevent to send MTU probes.

diff --git a/src/net_packet.c b/src/net_packet.c
index bb81081d25fafc3089beb320da9d44da2e6b4947..57794f98ccceef3371b387a49cedd685e602e7f6 100644 (file)
--- a/src/net_packet.c
+++ b/src/net_packet.c
@@ -36,7 +36,6 @@
 #include "connection.h"
 #include "device.h"
 #include "ethernet.h"
-#include "tevent.h"
 #include "graph.h"
 #include "list.h"
 #include "logger.h"
@@ -61,15 +60,14 @@ static void send_udppacket(node_t *, vpn_packet_t *);
 
 #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;
        int len, i;
        
        cp();
 
        n->mtuprobes++;
-       n->mtuevent = NULL;
 
        if(n->mtuprobes >= 10 && !n->minmtu) {
                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);
        }
 
-       n->mtuevent = new_tevent();
-       n->mtuevent->handler = (event_handler_t)send_mtu_probe;
-       n->mtuevent->data = n;
-       n->mtuevent->time = now + 1;
-       tevent_add(n->mtuevent);
+       event_add(&n->mtuevent, &(struct timeval){1, 0});
+}
+
+void send_mtu_probe(node_t *n) {
+       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) {

diff --git a/src/node.c b/src/node.c
index d90e00a09ab3bc8442757b747102f52a51f396dc..61af6414f6fd7a0a920150a69c72abc2995a0f59 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -106,10 +106,7 @@ void free_node(node_t *n)
 
        EVP_CIPHER_CTX_cleanup(&n->packet_ctx);
 
-       if(n->mtuevent) {
-               tevent_del(n->mtuevent);
-               free_tevent(n->mtuevent);
-       }
+       event_del(&n->mtuevent);
        
        if(n->hostname)
                free(n->hostname);

diff --git a/src/node.h b/src/node.h
index b3319e17350ae1e347c993d0a280d80f23d26ce0..a612e93ba404ca4840e2d4020574b05010338fc7 100644 (file)
--- a/src/node.h
+++ b/src/node.h
@@ -80,7 +80,7 @@ typedef struct node_t {
        length_t minmtu;                        /* Probed minimum MTU */
        length_t maxmtu;                        /* Probed maximum MTU */
        int mtuprobes;                          /* Number of probes */
-       tevent_t *mtuevent;                     /* Probe event */
+       struct event mtuevent;                  /* Probe event */
 } node_t;
 
 extern struct node_t *myself;