Ticket #392: deluge-0.9.03.diff

deluge-0.9.03/libtorrent/include/libtorrent/socket.hpp

@@ -75 +75 @@
 #include "libtorrent/time.hpp"
 #include "libtorrent/error_code.hpp"
 
+#define IPV6_V6ONLY             26
+
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif

deluge-0.9.03/libtorrent/include/libtorrent/torrent_info.hpp

@@ -85 +85 @@
         class TORRENT_EXPORT torrent_info : public intrusive_ptr_base<torrent_info>
         {
         public:
-
+#ifdef BOOST_NO_EXCEPTIONS
+                torrent_info();
+#endif
+    
                 torrent_info(sha1_hash const& info_hash);
                 torrent_info(lazy_entry const& torrent_file);
                 torrent_info(char const* buffer, int size);

deluge-0.9.03/libtorrent/include/libtorrent/variant_stream.hpp

@@ -218 +218 @@
       error_code& ec;
   };
 
+#ifndef BOOST_NO_EXCEPTIONS
   struct close_visitor
     : boost::static_visitor<>
   {
@@ -227 +228 @@
 
       void operator()(boost::blank) const {}
   };
-
+#endif
 // -------------- remote_endpoint -----------
 
   template <class EndpointType>
@@ -658 +659 @@
         return boost::apply_visitor(aux::is_open_visitor(), m_variant);
     }
 
-    void close()
-    {
-        if (!instantiated()) return;
-        boost::apply_visitor(aux::close_visitor(), m_variant);
-    }
-
     void close(error_code& ec)
     {
         if (!instantiated()) return;
@@ -672 +667 @@
         );
     }
 
+    void close()
+    {
+//        if (!instantiated()) return;
+//        boost::apply_visitor(aux::close_visitor(), m_variant);
+        error_code ec;
+        close( ec );
+
+    }
+    
     std::size_t in_avail() const
     {
         TORRENT_ASSERT(instantiated());

deluge-0.9.03/libtorrent/src/error_code.cpp

@@ -56 +56 @@
 
 }
 
+#ifdef BOOST_NO_EXCEPTIONS
+namespace boost
+{
+// did not know anything better...
+void throw_exception(std::exception const & e) {}
+}
+#endif
 #endif
 

deluge-0.9.03/libtorrent/src/kademlia/dht_tracker.cpp

@@ -69 +69 @@
 
 namespace
 {
+
+        libtorrent::entry const& get_subentry_const( libtorrent::entry const& e, char const* key )
+        {
+#ifndef BOOST_NO_EXCEPTIONS                             
+            return e[key];
+#else
+            libtorrent::entry const* const s( e.find_key( key ) );
+            if (!s) throw std::runtime_error("subentry not found");
+            return *s;
+#endif
+        }
+
         const int tick_period = 1; // minutes
 
         struct count_peers
@@ -519 +531 @@
 
                                 m.reply = true;
                                 entry const& r = e["r"];
-                                std::string const& id = r["id"].string();
+//                              std::string const& id = r["id"].string();
+                                std::string const& id = get_subentry_const( r, "id" ).string();
                                 if (id.size() != 20) throw std::runtime_error("invalid size of id");
                                 std::copy(id.begin(), id.end(), m.id.begin());
 
@@ -598 +611 @@
                         {
                                 m.reply = false;
                                 entry const& a = e["a"];
-                                std::string const& id = a["id"].string();
+                                std::string const& id = get_subentry_const( a, "id" ).string();
                                 if (id.size() != 20) throw std::runtime_error("invalid size of id");
                                 std::copy(id.begin(), id.end(), m.id.begin());
 
@@ -613 +626 @@
                                 }
                                 else if (request_kind == "find_node")
                                 {
-                                        std::string const& target = a["target"].string();
+//                                      std::string const& target = a["target"].string();
+                                        std::string const& target = get_subentry_const( a, "target" ).string();
                                         if (target.size() != 20) throw std::runtime_error("invalid size of target id");
                                         std::copy(target.begin(), target.end(), m.info_hash.begin());
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
@@ -624 +638 @@
                                 }
                                 else if (request_kind == "get_peers")
                                 {
-                                        std::string const& info_hash = a["info_hash"].string();
+//                                      std::string const& info_hash = a["info_hash"].string();
+                                        std::string const& info_hash = get_subentry_const( a, "info_hash" ).string();
                                         if (info_hash.size() != 20) throw std::runtime_error("invalid size of info-hash");
                                         std::copy(info_hash.begin(), info_hash.end(), m.info_hash.begin());
                                         m.message_id = libtorrent::dht::messages::get_peers;
@@ -637 +652 @@
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
                                         ++m_announces;
 #endif
-                                        std::string const& info_hash = a["info_hash"].string();
+//                                      std::string const& info_hash = a["info_hash"].string();
+                                        std::string const& info_hash = get_subentry_const( a, "info_hash" ).string();
                                         if (info_hash.size() != 20)
                                                 throw std::runtime_error("invalid size of info-hash");
                                         std::copy(info_hash.begin(), info_hash.end(), m.info_hash.begin());
-                                        m.port = a["port"].integer();
-                                        m.write_token = a["token"];
+                                        m.port = get_subentry_const( a, "port" ).integer();
+                                        m.write_token = get_subentry_const( a, "token" );
                                         m.message_id = libtorrent::dht::messages::announce_peer;
 #ifdef TORRENT_DHT_VERBOSE_LOGGING
                                         log_line << " ih: " << boost::lexical_cast<std::string>(m.info_hash);

deluge-0.9.03/libtorrent/src/memdebug.cpp

@@ -30 +30 @@
 
 */
 
+#if 0
 #if defined __linux__ && defined __GNUC__
 #include <execinfo.h>
 
@@ -221 +222 @@
 }
 
 #endif
-
+#endif

deluge-0.9.03/libtorrent/src/torrent_handle.cpp

@@ -530 +530 @@
                 INVARIANT_CHECK;
 
                 entry ret(entry::dictionary_t);
-                TORRENT_FORWARD(write_resume_data(ret));
+//              TORRENT_FORWARD(write_resume_data(ret));
+                TORRENT_FORWARD_RETURN2(write_resume_data(ret), entry() );
                 t->filesystem().write_resume_data(ret);
 
                 return ret;

deluge-0.9.03/libtorrent/src/torrent_info.cpp

@@ -297 +297 @@
                 , m_piece_hashes(0)
         {}
 
+#ifdef BOOST_NO_EXCEPTIONS
+        torrent_info::torrent_info()
+                : m_creation_date(pt::second_clock::universal_time())
+                , m_multifile(false)
+                , m_private(false)
+                , m_info_section_size(0)
+                , m_piece_hashes(0)
+        {}
+#endif                                                                                                          
         torrent_info::torrent_info(fs::path const& filename)
                 : m_creation_date(pt::ptime(pt::not_a_date_time))
                 , m_multifile(false)