Changeset 8085

Timestamp:

Mar 25, 2009, 12:36:11 AM (14 years ago)

Author:

jhujhiti

Message:

(trunk libT) re-add rpc password to settings benc dict

Location:

trunk/libtransmission

Files:

• crypto.c (modified) (1 diff)
• session.c (modified) (2 diffs)
• transmission.h (modified) (1 diff)

trunk/libtransmission/crypto.c

@@ -20 +20 @@
 
 #include <openssl/bn.h>
-#include <openssl/des.h>
 #include <openssl/dh.h>
 #include <openssl/err.h>

trunk/libtransmission/session.c

@@ -298 +298 @@
     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 ) );
@@ -1454 +1455 @@
 }
 
+char*
+tr_sessionGetRPCPassword( const tr_session * session )
+{
+    assert( tr_isSession( session ) );
+
+    return tr_rpcGetPassword( session->rpcServer );
+}
+
 void
 tr_sessionSetRPCUsername( tr_session * session,

trunk/libtransmission/transmission.h

@@ -371 +371 @@
                                 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  );