Changeset 11659 for trunk/libtransmission/tr-udp.c

Timestamp:

Jan 9, 2011, 9:48:51 PM (11 years ago)

Author:

jch

Message:

Update tr-{dht,udp} to libevent2.

File:

• trunk/libtransmission/tr-udp.c (modified) (6 diffs)

trunk/libtransmission/tr-udp.c

@@ -25 +25 @@
 #include <assert.h>
 
-#include <event.h>
+#include <event2/event.h>
 
 #include "transmission.h"
@@ -158 +158 @@
     if(ss->udp_socket < 0) {
         tr_nerr("UDP", "Couldn't create IPv4 socket");
-        goto ipv6;
-    }
-
-    ss->udp_event = tr_new0(struct event, 1);
-    if(ss->udp_event == NULL) {
-        tr_nerr("UDP", "Couldn't allocate IPv4 event");
-        close(ss->udp_socket);
-        ss->udp_socket = -1;
         goto ipv6;
     }
@@ -180 +172 @@
         goto ipv6;
     }
-
-    event_set(ss->udp_event, ss->udp_socket, EV_READ | EV_PERSIST,
-              event_callback, ss);
+    ss->udp_event =
+        event_new(NULL, ss->udp_socket, EV_READ | EV_PERSIST,
+                  event_callback, ss);
+    tr_nerr("UDP", "Couldn't allocate IPv4 event");
+    /* Don't bother recovering for now. */
 
  ipv6:
@@ -188 +182 @@
         rebind_ipv6(ss, TRUE);
     if(ss->udp6_socket >= 0) {
-        ss->udp6_event = tr_new0(struct event, 1);
-        if(ss->udp6_event == NULL) {
+        ss->udp6_event =
+            event_new(NULL, ss->udp6_socket, EV_READ | EV_PERSIST,
+                      event_callback, ss);
+        if(ss->udp6_event == NULL)
             tr_nerr("UDP", "Couldn't allocate IPv6 event");
-        } else {
-            event_set(ss->udp6_event, ss->udp6_socket, EV_READ | EV_PERSIST,
-                      event_callback, ss);
-        }
     }
 
@@ -217 +209 @@
 
     if(ss->udp_event) {
-        event_del(ss->udp_event);
-        free(ss->udp_event);
+        event_free(ss->udp_event);
         ss->udp_event = NULL;
     }
@@ -228 +219 @@
 
     if(ss->udp6_event) {
-        event_del(ss->udp6_event);
-        free(ss->udp6_event);
+        event_free(ss->udp6_event);
         ss->udp6_event = NULL;
     }