Changeset 962

Timestamp:

08/22/07 03:16:29 (6 years ago)

Author:

rakshasa

Message:

• Moved PF_LOCAL to rak/socket_address.h and made it portable.

• Added "d." to '{create,delete}_link', and marked the old names as

obsolete.

• Added "d.{get,set}_message'.

Location:

trunk

Files:

• libtorrent/rak/socket_address.h (modified) (1 diff)
• libtorrent/src/net/socket_fd.cc (modified) (1 diff)
• rtorrent/rak/socket_address.h (modified) (1 diff)
• rtorrent/src/command_download.cc (modified) (3 diffs)
• rtorrent/src/utils/socket_fd.cc (modified) (1 diff)

trunk/libtorrent/rak/socket_address.h

@@ -64 +64 @@
 public:
   static const sa_family_t af_inet   = AF_INET;
+  static const int         pf_inet   = PF_INET;
   static const sa_family_t af_inet6  = AF_INET6;
+  static const int         pf_inet6  = PF_INET6;
   static const sa_family_t af_unspec = AF_UNSPEC;
+  static const int         pf_unspec = PF_UNSPEC;
 
 #ifdef AF_LOCAL
   static const sa_family_t af_local  = AF_LOCAL;
+  static const int         pf_local  = PF_LOCAL;
 #else
   static const sa_family_t af_local  = AF_UNIX;
+  static const itn         pf_local  = PF_UNIX;
 #endif
 

trunk/libtorrent/src/net/socket_fd.cc

@@ -113 +113 @@
 bool
 SocketFd::open_stream() {
-  return (m_fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
 }
 
 bool
 SocketFd::open_datagram() {
-  return (m_fd = socket(PF_INET, SOCK_DGRAM, 0)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1;
 }
 
 bool
 SocketFd::open_local() {
-  return (m_fd = socket(PF_LOCAL, SOCK_STREAM, 0)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_local, SOCK_STREAM, 0)) != -1;
 }
 

trunk/rtorrent/rak/socket_address.h

@@ -64 +64 @@
 public:
   static const sa_family_t af_inet   = AF_INET;
+  static const int         pf_inet   = PF_INET;
   static const sa_family_t af_inet6  = AF_INET6;
+  static const int         pf_inet6  = PF_INET6;
   static const sa_family_t af_unspec = AF_UNSPEC;
+  static const int         pf_unspec = PF_UNSPEC;
 
 #ifdef AF_LOCAL
   static const sa_family_t af_local  = AF_LOCAL;
+  static const int         pf_local  = PF_LOCAL;
 #else
   static const sa_family_t af_local  = AF_UNIX;
+  static const itn         pf_local  = PF_UNIX;
 #endif
 

trunk/rtorrent/src/command_download.cc

@@ -295 +295 @@
   ADD_CD_SLOT_PUBLIC("d." key, call_unknown, rpc::object_void_d_fn(slot), "i:", "")
 
+#define ADD_CD_LIST_OBSOLETE(key, slot) \
+  ADD_CD_SLOT_PUBLIC(key, call_list, slot, "i:", "")
+
 #define ADD_CD_LIST(key, slot) \
-  ADD_CD_SLOT_PUBLIC(key, call_list, slot, "i:", "")
+  ADD_CD_SLOT_PUBLIC("d." key, call_list, slot, "i:", "")
 
 #define ADD_CD_VARIABLE_VALUE(key, firstKey, secondKey) \
@@ -347 +350 @@
   ADD_CD_STRING_UNI("name",    rak::on(std::mem_fun(&core::Download::download), std::mem_fun(&torrent::Download::name)));
 
+  ADD_CD_LIST_OBSOLETE("create_link",   rak::bind_ptr_fn(&apply_d_change_link, 0));
+  ADD_CD_LIST_OBSOLETE("delete_link",   rak::bind_ptr_fn(&apply_d_change_link, 1));
+
   ADD_CD_LIST("create_link",   rak::bind_ptr_fn(&apply_d_change_link, 0));
   ADD_CD_LIST("delete_link",   rak::bind_ptr_fn(&apply_d_change_link, 1));
@@ -391 +397 @@
 
   ADD_CD_STRING_BI("connection_current", std::ptr_fun(&apply_d_connection_type), std::ptr_fun(&retrieve_d_connection_type));
+
+  // This command really needs to be improved, so we have proper
+  // logging support.
+  ADD_CD_STRING_BI("message",            std::mem_fun(&core::Download::set_message), std::mem_fun(&core::Download::message));
 
   add_copy_to_download("get_connection_leech", "d.get_connection_leech");

trunk/rtorrent/src/utils/socket_fd.cc

@@ -131 +131 @@
 bool
 SocketFd::open_stream() {
-  return (m_fd = socket(PF_INET, SOCK_STREAM, IPPROTO_TCP)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_inet, SOCK_STREAM, IPPROTO_TCP)) != -1;
 }
 
 bool
 SocketFd::open_datagram() {
-  return (m_fd = socket(PF_INET, SOCK_DGRAM, 0)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_inet, SOCK_DGRAM, 0)) != -1;
 }
 
 bool
 SocketFd::open_local() {
-  return (m_fd = socket(PF_LOCAL, SOCK_STREAM, 0)) != -1;
+  return (m_fd = socket(rak::socket_address::pf_local, SOCK_STREAM, 0)) != -1;
 }