Changeset 6811

Timestamp:

Sep 29, 2008, 4:26:52 AM (13 years ago)

Author:

charles

Message:

(libT) make sure to init the rpc server with the correct event base.

Location:

trunk/libtransmission

Files:

• rpc-server.c (modified) (4 diffs)
• trevent.c (modified) (1 diff)
• trevent.h (modified) (1 diff)

trunk/libtransmission/rpc-server.c

@@ -29 +29 @@
 #include "rpcimpl.h"
 #include "rpc-server.h"
+#include "trevent.h"
 #include "utils.h"
 #include "web.h"
@@ -328 +329 @@
 {
     struct tr_rpc_server * server = arg;
-    tr_ndbg( MY_NAME, _( "Got request: \"%s\"" ), req->uri );
+    fprintf( stderr, "%s:%d Got request: \"%s\"\n", __FILE__, __LINE__, req->uri );
 
     if( req && req->evcon )
@@ -394 +395 @@
         tr_free( user );
     }
+    fprintf( stderr, "%s:%d\n", __FILE__, __LINE__ );
 }
 
@@ -399 +401 @@
 startServer( tr_rpc_server * server )
 {
-    dbgmsg( "in startServer; current context is %p", server->httpd );
+    fprintf( stderr, "%s:%d in startServer; current context is %p\n", __FILE__, __LINE__, server->httpd );
 
     if( !server->httpd )
     {
-        if( ( server->httpd = evhttp_start( "0.0.0.0", server->port ) ) )
-            evhttp_set_gencb( server->httpd, handle_request, server );
-        else
-            tr_nerr( MY_NAME, _( "Failed to start RPC server" ) );
+        int i;
+        server->httpd = evhttp_new( tr_eventGetBase( server->session ) );
+        fprintf( stderr, "%s:%d in startServer; new context is %p\n", __FILE__, __LINE__, server->httpd );
+        i = evhttp_bind_socket( server->httpd, "0.0.0.0", server->port );
+        fprintf( stderr, "evhttp_bind_socket returned %d\n", i );
     }
 }

trunk/libtransmission/trevent.c

@@ -303 +303 @@
 }
 
+struct event_base *
+tr_eventGetBase( tr_session * session )
+{
+    return session->events->base;
+}

trunk/libtransmission/trevent.h

@@ -22 +22 @@
 
 void      tr_eventClose( struct tr_handle * tr_handle );
+
+struct event_base * tr_eventGetBase( struct tr_handle * tr_handle );