Changeset 6946

Timestamp:

Oct 22, 2008, 5:16:12 PM (12 years ago)

Author:

charles

Message:

Add a new token, TR_DEFAULT_ENCRYPTION, and use it as the default in the various clients.
Add a new #define, TR_EMBEDDED. When it's set, gettext is disabled and non-encrypted connections are the default.

Location:

trunk

Files:

• cli/cli.c (modified) (1 diff)
• daemon/daemon.c (modified) (1 diff)
• gtk/tr-prefs.c (modified) (1 diff)
• libtransmission/session.c (modified) (1 diff)
• libtransmission/transmission.h (modified) (1 diff)
• libtransmission/utils.h (modified) (1 diff)
• macosx/Controller.m (modified) (1 diff)

trunk/cli/cli.c

@@ -44 +44 @@
 static int          isPrivate        = 0;
 static int          verboseLevel     = 0;
-static int          encryptionMode   = TR_ENCRYPTION_PREFERRED;
+static int          encryptionMode   = TR_DEFAULT_ENCRYPTION;
 static int          peerPort         = TR_DEFAULT_PORT;
 static int          peerSocketTOS    = TR_DEFAULT_PEER_SOCKET_TOS;

trunk/daemon/daemon.c

@@ -219 +219 @@
     getConfigStr( dict, KEY_PASSWORD,        &password,          NULL );
     getConfigInt( dict, KEY_ENCRYPTION,      &encryption,
-                  TR_ENCRYPTION_PREFERRED );
+                  TR_DEFAULT_ENCRYPTION );
 
     /***

trunk/gtk/tr-prefs.c

@@ -113 +113 @@
     pref_flag_set_default   ( PREF_KEY_PEX, TR_DEFAULT_PEX_ENABLED );
     pref_flag_set_default   ( PREF_KEY_ASKQUIT, TRUE );
-    pref_flag_set_default   ( PREF_KEY_ENCRYPTION, TR_ENCRYPTION_PREFERRED );
+    pref_flag_set_default   ( PREF_KEY_ENCRYPTION, TR_DEFAULT_ENCRYPTION );
     pref_flag_set_default   ( PREF_KEY_LAZY_BITFIELD,
                               TR_DEFAULT_LAZY_BITFIELD_ENABLED );

trunk/libtransmission/session.c

@@ -315 +315 @@
                                TR_DEFAULT_PORT_FORWARDING_ENABLED,
                                -1, /* public port */
-                               TR_ENCRYPTION_PREFERRED, /* encryption mode */
+                               TR_DEFAULT_ENCRYPTION, /* encryption mode */
                                TR_DEFAULT_LAZY_BITFIELD_ENABLED,
                                FALSE, /* use upload speed limit? */

trunk/libtransmission/transmission.h

@@ -98 +98 @@
 /** @see tr_sessionInitFull */
 #define TR_DEFAULT_CONFIG_DIR               tr_getDefaultConfigDir( )
+/** @see tr_sessionInitFull */
+#ifdef TR_EMBEDDED
+ #define TR_DEFAULT_ENCRYPTION              TR_CLEAR_PREFERRED
+#else
+ #define TR_DEFAULT_ENCRYPTION              TR_ENCRYPTION_PREFERRED
+#endif
 /** @see tr_sessionInitFull */
 #define TR_DEFAULT_PEX_ENABLED              1

trunk/libtransmission/utils.h

@@ -99 +99 @@
 
 /* #define DISABLE_GETTEXT */
+#if defined(TR_EMBEDDED) && !defined(DISABLE_GETTEXT)
+ #define DISABLE_GETTEXT
+#endif
 #ifdef DISABLE_GETTEXT
-const char* tr_strip_positional_args( const char* fmt );
-
+ const char * tr_strip_positional_args( const char * fmt );
  #undef _
  #define _( a ) tr_strip_positional_args( a )

trunk/macosx/Controller.m

@@ -211 +211 @@
                                 [fDefaults boolForKey: @"NatTraversal"],
                                 [fDefaults integerForKey: @"BindPort"],
-                                TR_ENCRYPTION_PREFERRED, /* reset in prefs */
+                                TR_DEFAULT_ENCRYPTION, /* reset in prefs */
                                 TR_DEFAULT_LAZY_BITFIELD_ENABLED,
                                 NO, /* reset in prefs */