Changeset 14574

Timestamp:

Oct 11, 2015, 4:35:51 PM (6 years ago)

Author:

mikedld

Message:

Initialise networking in daemon before making libevent calls

Location:

trunk

Files:

• daemon/daemon.c (modified) (1 diff)
• libtransmission/net.c (modified) (1 diff)
• libtransmission/net.h (modified) (1 diff)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/utils.c (modified) (2 diffs)
• libtransmission/utils.h (modified) (1 diff)

trunk/daemon/daemon.c

@@ -495 +495 @@
     sd_notifyf (0, "MAINPID=%d\n", (int)getpid());
 
+    /* should go before libevent calls */
+    tr_net_init ();
+
     /* setup event state */
-    ev_base = event_base_new();
+    ev_base = event_base_new ();
     if (ev_base == NULL)
     {
         char buf[256];
-        tr_snprintf(buf, sizeof(buf), "Failed to init daemon event state: %s", tr_strerror(errno));
+        tr_snprintf (buf, sizeof (buf), "Failed to init daemon event state: %s", tr_strerror (errno));
         printMessage (logfile, TR_LOG_ERROR, MY_NAME, buf, __FILE__, __LINE__);
         return 1;

trunk/libtransmission/net.c

@@ -56 +56 @@
 const tr_address tr_inaddr_any = { TR_AF_INET, { { { { INADDR_ANY, 0x00, 0x00, 0x00 } } } } };
 
-void
-tr_netInit (void)
-{
-    static bool initialized = false;
-
-    if (!initialized)
-    {
-#ifdef _WIN32
-        WSADATA wsaData;
-        WSAStartup (MAKEWORD (2, 2), &wsaData);
-#endif
-        initialized = true;
-    }
-}
-
 char *
 tr_net_strerror (char * buf, size_t buflen, int err)

trunk/libtransmission/net.h

@@ -164 +164 @@
 void tr_netCloseSocket (tr_socket_t fd);
 
-void tr_netInit (void);
-
 bool tr_net_hasIPv6 (tr_port);
 

trunk/libtransmission/session.c

@@ -611 +611 @@
 
   /* start the libtransmission thread */
-  tr_netInit (); /* must go before tr_eventInit */
+  tr_net_init (); /* must go before tr_eventInit */
   tr_eventInit (session);
   assert (session->events != NULL);

trunk/libtransmission/utils.c

@@ -30 +30 @@
 
 #ifdef _WIN32
+ #include <ws2tcpip.h> /* WSAStartup () */
  #include <windows.h> /* Sleep (), GetSystemTimeAsFileTime (), GetEnvironmentVariable () */
  #include <shellapi.h> /* CommandLineToArgv () */
@@ -1843 +1844 @@
 #endif
 }
+
+/***
+****
+***/
+
+void
+tr_net_init (void)
+{
+    static bool initialized = false;
+
+    if (!initialized)
+    {
+#ifdef _WIN32
+        WSADATA wsaData;
+        WSAStartup (MAKEWORD (2, 2), &wsaData);
+#endif
+        initialized = true;
+    }
+}

trunk/libtransmission/utils.h

@@ -505 +505 @@
 ***/
 
+void tr_net_init (void);
+
+/***
+****
+***/
+
 #ifdef __cplusplus
 }