* New code for handling options/variables which used bencode and can

redirect get/set operations.

* Fixed(?) a bug in RequestList::downloading(...) that could cause a
segfault when pieces in the canceled list start downloading.


git-svn-id: svn://rakshasa.no/libtorrent/trunk/rtorrent@622 e378c898-3ddf-0310-93e7-cc216c733640

src/utils/variable_generic.h

@@ -0,0 +1,160 @@
+// rTorrent - BitTorrent client
+// Copyright (C) 2006, Jari Sundell
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// In addition, as a special exception, the copyright holders give
+// permission to link the code of portions of this program with the
+// OpenSSL library under certain conditions as described in each
+// individual source file, and distribute linked combinations
+// including the two.
+//
+// You must obey the GNU General Public License in all respects for
+// all of the code used other than OpenSSL.  If you modify file(s)
+// with this exception, you may extend this exception to your version
+// of the file(s), but you are not obligated to do so.  If you do not
+// wish to do so, delete this exception statement from your version.
+// If you delete this exception statement from all source files in the
+// program, then also delete it here.
+//
+// Contact:  Jari Sundell <jaris@ifi.uio.no>
+//
+//           Skomakerveien 33
+//           3185 Skoppum, NORWAY
+
+#ifndef RTORRENT_UTILS_VARIABLE_GENERIC_H
+#define RTORRENT_UTILS_VARIABLE_GENERIC_H
+
+#include <cstdio>
+#include <string>
+#include <inttypes.h>
+#include <rak/functional_fun.h>
+#include <torrent/bencode.h>
+#include <torrent/exceptions.h>
+
+#include "variable.h"
+
+namespace utils {
+
+// class VariableS : public Variable {
+// public:
+//   VariableString(const std::string& v = "") : m_variable(v) {}
+//   virtual ~VariableString();
+
+//   virtual const torrent::Bencode& get();
+//   virtual void set(const torrent::Bencode& arg);
+
+// private:
+//   std::string         m_variable;
+// };
+
+// VariableSlot?
+template <typename Get = std::string, typename Set = const std::string&>
+class VariableSlotString : public Variable {
+public:
+  typedef rak::function0<Get>       SlotGet;
+  typedef rak::function1<void, Set> SlotSet;
+
+  VariableSlotString(typename SlotGet::base_type* slotGet, typename SlotSet::base_type* slotSet) {
+    m_slotGet.set(slotGet);
+    m_slotSet.set(slotSet);
+  }
+
+  virtual ~VariableSlotString() {}
+
+  virtual const torrent::Bencode& get() {
+    m_cache = m_slotGet();
+
+    if (!m_cache.is_string())
+      throw torrent::internal_error("VariableSlotString::get() got wrong type.");
+
+    return m_cache;
+  }
+
+  virtual void set(const torrent::Bencode& arg) {
+    if (!arg.is_string())
+      throw torrent::internal_error("VariableSlotString::set(...) got wrong type.");
+    
+    m_slotSet(arg.as_string());
+  }
+
+private:
+  SlotGet             m_slotGet;
+  SlotSet             m_slotSet;
+
+  // Store the cache here to avoid unnessesary copying and such. This
+  // should not result in any unresonable memory usage since few
+  // strings will be very large.
+  torrent::Bencode    m_cache;
+};
+
+template <typename Get, typename Set>
+class VariableSlotValue : public Variable {
+public:
+  typedef rak::function0<Get>       SlotGet;
+  typedef rak::function1<void, Set> SlotSet;
+
+  VariableSlotValue(typename SlotGet::base_type* slotGet,
+		    typename SlotSet::base_type* slotSet,
+		    const char* pattern) {
+    m_slotGet.set(slotGet);
+    m_slotSet.set(slotSet);
+    m_pattern = pattern;
+  }
+
+  virtual ~VariableSlotValue() {}
+
+  virtual const torrent::Bencode& get() {
+    m_cache = m_slotGet();
+
+    // Need this?
+    if (!m_cache.is_value())
+      throw torrent::internal_error("VariableSlotValue::get() got wrong type.");
+
+    return m_cache;
+  }
+
+  virtual void set(const torrent::Bencode& arg) {
+    if (arg.is_string()) {
+      Set v;
+
+      if (std::sscanf(arg.as_string().c_str(), m_pattern, &v) != 1)
+	throw torrent::input_error("Not a value.");
+      
+      m_slotSet(v);
+
+    } else if (arg.is_value()) {
+      m_slotSet(arg.as_value());
+
+    } else {
+      throw torrent::input_error("Not a value");
+    }
+  }
+
+private:
+  SlotGet             m_slotGet;
+  SlotSet             m_slotSet;
+
+  const char*         m_pattern;
+
+  // Store the cache here to avoid unnessesary copying and such. This
+  // should not result in any unresonable memory usage since few
+  // strings will be very large.
+  torrent::Bencode    m_cache;
+};
+
+}
+
+#endif