Move uTP timer to session struct

diff --git a/libtransmission/session.h b/libtransmission/session.h
index c4158f0758c621876dbe07dfd0ed8f24224b18ab..9499507f9842f2210fecdf72e06c0604c89e0f07 100644 (file)
--- a/libtransmission/session.h
+++ b/libtransmission/session.h
@@ -155,6 +155,8 @@ struct tr_session
     struct event* udp_event;
     struct event* udp6_event;
 
+    struct event* utp_timer;
+
     /* The open port on the local machine for incoming peer requests */
     tr_port private_peer_port;
 

diff --git a/libtransmission/tr-utp.c b/libtransmission/tr-utp.c
index d85c9efbf2c2aef8721ac3a1cdac35e8fa3d1c30..06db2fd4a65a80b6b4f4f82222b3c6e4dec1e797 100644 (file)
--- a/libtransmission/tr-utp.c
+++ b/libtransmission/tr-utp.c
@@ -92,8 +92,6 @@ void tr_utpSendTo(void* closure UNUSED, unsigned char const* buf UNUSED, size_t
 
 #define UTP_INTERVAL_US 50000
 
-static struct event* utp_timer = NULL;
-
 static void incoming(void* closure, struct UTPSocket* s)
 {
     tr_session* ss = closure;
@@ -156,7 +154,7 @@ static void reset_timer(tr_session* ss)
         usec = tr_rand_int_weak(1000000);
     }
 
-    tr_timerAdd(utp_timer, sec, usec);
+    tr_timerAdd(ss->utp_timer, sec, usec);
 }
 
 static void timer_callback(evutil_socket_t s UNUSED, short type UNUSED, void* closure)
@@ -168,11 +166,11 @@ static void timer_callback(evutil_socket_t s UNUSED, short type UNUSED, void* cl
 
 int tr_utpPacket(unsigned char const* buf, size_t buflen, struct sockaddr const* from, socklen_t fromlen, tr_session* ss)
 {
-    if (!ss->isClosed && utp_timer == NULL)
+    if (!ss->isClosed && ss->utp_timer == NULL)
     {
-        utp_timer = evtimer_new(ss->event_base, timer_callback, ss);
+        ss->utp_timer = evtimer_new(ss->event_base, timer_callback, ss);
 
-        if (utp_timer == NULL)
+        if (ss->utp_timer == NULL)
         {
             return -1;
         }
@@ -183,12 +181,12 @@ int tr_utpPacket(unsigned char const* buf, size_t buflen, struct sockaddr const*
     return UTP_IsIncomingUTP(incoming, tr_utpSendTo, ss, buf, buflen, from, fromlen);
 }
 
-void tr_utpClose(tr_session* session UNUSED)
+void tr_utpClose(tr_session* session)
 {
-    if (utp_timer != NULL)
+    if (session->utp_timer != NULL)
     {
-        evtimer_del(utp_timer);
-        utp_timer = NULL;
+        evtimer_del(session->utp_timer);
+        session->utp_timer = NULL;
     }
 }