mirror
/
transmission
mirror of https://github.com/transmission/transmission
1
0
Fork 0
Code Issues Releases Wiki Activity

(rpc server) fix ACL error reported by pea_

This commit is contained in:
Charles Kerr 2008-06-05 04:02:46 +00:00
parent 6d04fb8832
commit 4d29a29003
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libtransmission/rpc-server.c
View File

@ -42,6 +42,8 @@ struct tr_rpc_server
char * acl; char * acl;
}; };
#define dbgmsg(fmt...) tr_deepLog(__FILE__, __LINE__, MY_NAME, ##fmt )
static void static void
handle_rpc( struct shttpd_arg * arg ) handle_rpc( struct shttpd_arg * arg )
{ {
@ -120,6 +122,8 @@ rpcPulse( int socket UNUSED, short action UNUSED, void * vserver )
static void static void
startServer( tr_rpc_server * server ) startServer( tr_rpc_server * server )
{ {
dbgmsg( "in startServer; current context is %p", server->ctx );
if( !server->ctx ) if( !server->ctx )
{ {
char ports[128]; char ports[128];
@ -131,8 +135,10 @@ startServer( tr_rpc_server * server )
shttpd_set_option( server->ctx, "ports", ports ); shttpd_set_option( server->ctx, "ports", ports );
shttpd_set_option( server->ctx, "dir_list", "0" ); shttpd_set_option( server->ctx, "dir_list", "0" );
shttpd_set_option( server->ctx, "root", "/dev/null" ); shttpd_set_option( server->ctx, "root", "/dev/null" );
if( server->acl ) if( server->acl ) {
dbgmsg( "setting acl [%s]", server->acl );
shttpd_set_option( server->ctx, "acl", server->acl ); shttpd_set_option( server->ctx, "acl", server->acl );
}
evtimer_set( &server->timer, rpcPulse, server ); evtimer_set( &server->timer, rpcPulse, server );
evtimer_add( &server->timer, &tv ); evtimer_add( &server->timer, &tv );
@ -303,7 +309,7 @@ tr_rpcSetACL( tr_rpc_server * server,
char * cidr = cidrize( acl ); char * cidr = cidrize( acl );
const int err = tr_rpcTestACL( server, cidr, setme_errmsg ); const int err = tr_rpcTestACL( server, cidr, setme_errmsg );
if( err ) if( !err )
{ {
const int isRunning = server->ctx != NULL; const int isRunning = server->ctx != NULL;
@ -312,6 +318,7 @@ tr_rpcSetACL( tr_rpc_server * server,
tr_free( server->acl ); tr_free( server->acl );
server->acl = tr_strdup( cidr ); server->acl = tr_strdup( cidr );
dbgmsg( "setting our ACL to [%s]", server->acl );
if( isRunning ) if( isRunning )
startServer( server ); startServer( server );