From 81a01fe1d3cfa5af668965ab678913593ec495ae Mon Sep 17 00:00:00 2001 From: Erick Turnquist Date: Wed, 25 Mar 2009 00:36:11 +0000 Subject: [PATCH] (trunk libT) re-add rpc password to settings benc dict --- libtransmission/crypto.c | 1 - libtransmission/session.c | 9 +++++++++ libtransmission/transmission.h | 6 ++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/libtransmission/crypto.c b/libtransmission/crypto.c index a3b7bd934..6257b74dc 100644 --- a/libtransmission/crypto.c +++ b/libtransmission/crypto.c @@ -19,7 +19,6 @@ #include #include -#include #include #include #include diff --git a/libtransmission/session.c b/libtransmission/session.c index 7cf4dd980..b0fb10286 100644 --- a/libtransmission/session.c +++ b/libtransmission/session.c @@ -297,6 +297,7 @@ tr_sessionGetSettings( tr_session * s, struct tr_benc * d ) tr_bencDictAddInt( d, TR_PREFS_KEY_RATIO_ENABLED, s->isRatioLimited ); tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_AUTH_REQUIRED, tr_sessionIsRPCPasswordEnabled( s ) ); tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_ENABLED, tr_sessionIsRPCEnabled( s ) ); + tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_PASSWORD, freeme[n++] = tr_sessionGetRPCPassword( s ) ); tr_bencDictAddInt( d, TR_PREFS_KEY_RPC_PORT, tr_sessionGetRPCPort( s ) ); tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_USERNAME, freeme[n++] = tr_sessionGetRPCUsername( s ) ); tr_bencDictAddStr( d, TR_PREFS_KEY_RPC_WHITELIST, freeme[n++] = tr_sessionGetRPCWhitelist( s ) ); @@ -1453,6 +1454,14 @@ tr_sessionSetRPCPassword( tr_session * session, tr_rpcSetPassword( session->rpcServer, password ); } +char* +tr_sessionGetRPCPassword( const tr_session * session ) +{ + assert( tr_isSession( session ) ); + + return tr_rpcGetPassword( session->rpcServer ); +} + void tr_sessionSetRPCUsername( tr_session * session, const char * username ) diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h index dbf12634d..7fa4c9603 100644 --- a/libtransmission/transmission.h +++ b/libtransmission/transmission.h @@ -370,6 +370,12 @@ void tr_sessionSetRPCPassword( tr_session * session, void tr_sessionSetRPCUsername( tr_session * session, const char * username ); +/** @brief get the password used to restrict RPC requests. + @return the password string. tr_free() when done. + @see tr_sessionInit() + @see tr_sessionSetRPCPassword() */ +char* tr_sessionGetRPCPassword( const tr_session * session ); + char* tr_sessionGetRPCUsername( const tr_session * session ); void tr_sessionSetRPCPasswordEnabled( tr_session * session, -- 2.40.0