* Added support for named pipes and proper parseing of arguments for

SCGI.


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

src/rpc/scgi.cc

@@ -36,10 +36,11 @@
 
 #include "config.h"
 
+#include <rak/socket_address.h>
+#include <sys/un.h>
 #include <torrent/connection_manager.h>
 #include <torrent/poll.h>
 #include <torrent/torrent.h>
-#include <rak/socket_address.h>
 #include <torrent/exceptions.h>
 
 #include "utils/socket_fd.h"
@@ -62,21 +63,43 @@ SCgi::~SCgi() {
   get_fd().clear();
 }
 
-bool
-SCgi::open(uint16_t port) {
+void
+SCgi::open_port(uint16_t port) {
+  rak::socket_address sa;
+  sa.sa_inet()->clear();
+  sa.sa_inet()->set_port(port);
+
   if (!get_fd().open_stream())
-    throw torrent::resource_error("Could not allocate socket for listening.");
+    throw torrent::resource_error("Could not open socket for listening.");
 
+  open(sa.c_sockaddr(), sa.length());
+}
+
+void
+SCgi::open_named(const std::string& filename) {
+  if (filename.empty() || filename.size() > 4096)
+    throw torrent::resource_error("Invalid filename length.");
+
+  char buffer[sizeof(sockaddr_un) + filename.size()];
+  sockaddr_un* sa = reinterpret_cast<sockaddr_un*>(buffer);
+
+  sa->sun_family = AF_LOCAL;
+  std::memcpy(sa->sun_path, filename.c_str(), filename.size() + 1);
+
+  if (!get_fd().open_local())
+    throw torrent::resource_error("Could not open socket for listening.");
+
+  open(sa, offsetof(struct sockaddr_un, sun_path) + filename.size() + 1);
+}
+
+void
+SCgi::open(void* sa, unsigned int length) {
   try {
-    rak::socket_address sa;
-    sa.sa_inet()->clear();
-    sa.sa_inet()->set_port(port);
-
     if (!get_fd().set_nonblock() ||
         !get_fd().set_reuse_address(true) ||
-        !get_fd().bind(sa) ||
+        !get_fd().bind(*reinterpret_cast<rak::socket_address*>(sa), length) ||
         !get_fd().listen(10))
-      throw torrent::resource_error("Could not allocate socket for listening.");
+      throw torrent::resource_error("Could not prepare socket for listening.");
 
     torrent::connection_manager()->inc_socket_count();
 
@@ -90,8 +113,6 @@ SCgi::open(uint16_t port) {
 
     throw e;
   }
-
-  return true;
 }
 
 void

src/rpc/scgi.h

@@ -57,7 +57,8 @@ public:
   SCgi() {}
   virtual ~SCgi();
 
-  bool                open(uint16_t port);
+  void                open_port(uint16_t port);
+  void                open_named(const std::string& filename);
 
   const std::string   path() const { return m_path; }
 
@@ -72,10 +73,10 @@ public:
   utils::SocketFd&    get_fd()            { return *reinterpret_cast<utils::SocketFd*>(&m_fileDesc); }
 
 private:
+  void                open(void* sa, unsigned int length);
+
   std::string         m_path;
-
   slot_process        m_slotProcess;
-
   SCgiTask            m_task[10];
 };
 

src/rpc/scgi_task.cc

@@ -96,7 +96,10 @@ SCgiTask::event_read() {
   // Don't bother caching the parsed values, as we're likely to
   // receive all the data we need the first time.
   char* current;
+  char* contentPos;
+
   int headerSize = strtol(m_buffer, &current, 0);
+  int contentSize;
 
   if (current == m_buffer || current == m_position)
     // Need to validate the header size.
@@ -111,8 +114,7 @@ SCgiTask::event_read() {
   if (std::memcmp(current, "CONTENT_LENGTH", 15) != 0)
     goto event_read_failed;
 
-  char* contentPos;
-  int contentSize = strtol(current + 15, &contentPos, 0);
+  contentSize = strtol(current + 15, &contentPos, 0);
 
   if (*contentPos != '\0' || contentSize <= 0)
     goto event_read_failed;