From 9c761f67777ef4a01b9ded16499412672e595c5c Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Tue, 3 Dec 2013 09:10:16 +0000
Subject: [PATCH] fix bug in load/save settings (introduced by altering
 pe_settings layout)

---
 include/libtorrent/settings.hpp |  2 +-
 src/session_impl.cpp            | 10 +++++-----
 src/settings.cpp                |  6 ++++++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/include/libtorrent/settings.hpp b/include/libtorrent/settings.hpp
index e09e24e95..1e3df1353 100644
--- a/include/libtorrent/settings.hpp
+++ b/include/libtorrent/settings.hpp
@@ -45,7 +45,7 @@ namespace libtorrent
 	enum struct_field_type_t
 	{
 		std_string, character, integer, floating_point,
-		boolean, size_integer, time_integer
+		boolean, size_integer, time_integer, integer16
 	};
 
 	// this is used to map struct entries
diff --git a/src/session_impl.cpp b/src/session_impl.cpp
index b8b4b1ea6..19b810a5f 100644
--- a/src/session_impl.cpp
+++ b/src/session_impl.cpp
@@ -463,10 +463,10 @@ namespace aux {
 	bencode_map_entry proxy_settings_map[] =
 	{
 		TORRENT_SETTING(std_string, hostname)
-		TORRENT_SETTING(integer, port)
+		TORRENT_SETTING(integer16, port)
 		TORRENT_SETTING(std_string, username)
 		TORRENT_SETTING(std_string, password)
-		TORRENT_SETTING(integer, type)
+		TORRENT_SETTING(character, type)
 		TORRENT_SETTING(boolean, proxy_hostnames)
 		TORRENT_SETTING(boolean, proxy_peer_connections)
 	};
@@ -496,9 +496,9 @@ namespace aux {
 #define TORRENT_SETTING(t, x) {#x, offsetof(pe_settings,x), t},
 	bencode_map_entry pe_settings_map[] = 
 	{
-		TORRENT_SETTING(integer, out_enc_policy)
-		TORRENT_SETTING(integer, in_enc_policy)
-		TORRENT_SETTING(integer, allowed_enc_level)
+		TORRENT_SETTING(character, out_enc_policy)
+		TORRENT_SETTING(character, in_enc_policy)
+		TORRENT_SETTING(character, allowed_enc_level)
 		TORRENT_SETTING(boolean, prefer_rc4)
 	};
 #undef TORRENT_SETTING
diff --git a/src/settings.cpp b/src/settings.cpp
index 20520f26c..524be0359 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -40,6 +40,7 @@ POSSIBILITY OF SUCH DAMAGE.
 namespace libtorrent
 {
 
+	// TODO: 4 eliminate all use of this mechanism
 	void load_struct(lazy_entry const& e, void* s, bencode_map_entry const* m, int num)
 	{
 		for (int i = 0; i < num; ++i)
@@ -56,6 +57,7 @@ namespace libtorrent
 					break;
 				}
 				case character:
+				case integer16:
 				case boolean:
 				case integer:
 				case size_integer:
@@ -67,6 +69,7 @@ namespace libtorrent
 					switch (m[i].type)
 					{
 						case character: *((char*)dest) = char(val); break;
+						case integer16: *((boost::uint16_t*)dest) = boost::uint16_t(val); break;
 						case integer: *((int*)dest) = int(val); break;
 						case size_integer: *((size_type*)dest) = size_type(val); break;
 						case time_integer: *((time_t*)dest) = time_t(val); break;
@@ -101,6 +104,9 @@ namespace libtorrent
 					case integer:
 						if (*((int*)src) == *((int*)default_value)) continue;
 						break;
+					case integer16:
+						if (*((boost::uint16_t*)src) == *((boost::uint16_t*)default_value)) continue;
+						break;
 					case size_integer:
 						if (*((size_type*)src) == *((size_type*)default_value)) continue;
 						break;