Replaced RPC remoting with plain sockets and length-prefixed XML.

[shibboleth/cpp-sp.git] / shib-target / TCPListener.cpp

diff --git a/shib-target/shib-sock.cpp b/shib-target/TCPListener.cpp
similarity index 60%
rename from shib-target/shib-sock.cpp
rename to shib-target/TCPListener.cpp
index 512237b..089f56c 100644 (file)
--- a/shib-target/shib-sock.cpp
+++ b/shib-target/TCPListener.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-/*
- * shib-sock.cpp -- Socket-based IListener implementations
- *
- * Created by: Derek Atkins <derek@ihtfp.com>, revised by Scott Cantor
+/**
+ * TCPListener.cpp
+ * 
+ * TCP-based SocketListener implementation
  */
 
-#include "RPCListener.h"
+#include "SocketListener.h"
 
 #ifdef HAVE_UNISTD_H
 # include <sys/socket.h>
@@ -44,7 +44,7 @@ using namespace log4cpp;
 static const XMLCh address[] = { chLatin_a, chLatin_d, chLatin_d, chLatin_r, chLatin_e, chLatin_s, chLatin_s, chNull };
 static const XMLCh port[] = { chLatin_p, chLatin_o, chLatin_r, chLatin_t, chNull };
 
-class TCPListener : virtual public RPCListener
+class TCPListener : virtual public SocketListener
 {
 public:
     TCPListener(const DOMElement* e);
@@ -55,7 +55,14 @@ public:
     bool connect(ShibSocket& s) const;
     bool close(ShibSocket& s) const;
     bool accept(ShibSocket& listener, ShibSocket& s) const;
-    CLIENT* getClientHandle(ShibSocket& s, u_long program, u_long version) const;
+    
+    int send(ShibSocket& s, const char* buf, int len) const {
+        return ::send(s, buf, len, 0);
+    }
+    
+    int recv(ShibSocket& s, char* buf, int buflen) const {
+        return ::recv(s, buf, buflen, 0);
+    }
     
 private:
     void setup_tcp_sockaddr(struct sockaddr_in* addr) const;
@@ -70,7 +77,7 @@ IPlugIn* TCPListenerFactory(const DOMElement* e)
     return new TCPListener(e);
 }
 
-TCPListener::TCPListener(const DOMElement* e) : RPCListener(e), m_address("127.0.0.1"), m_port(12345)
+TCPListener::TCPListener(const DOMElement* e) : SocketListener(e), m_address("127.0.0.1"), m_port(12345)
 {
     // We're stateless, but we need to load the configuration.
     const XMLCh* tag=e->getAttributeNS(NULL,address);
@@ -200,123 +207,3 @@ bool TCPListener::accept(ShibSocket& listener, ShibSocket& s) const
     log->error("accept() rejected client at %s\n",client);
     return false;
 }
-
-CLIENT* TCPListener::getClientHandle(ShibSocket& s, u_long program, u_long version) const
-{
-    struct sockaddr_in sin;
-    memset (&sin, 0, sizeof (sin));
-    sin.sin_port = 1;
-    return clnttcp_create(&sin, program, version, &s, 0, 0);
-}
-
-#ifndef WIN32
-
-class UnixListener : virtual public RPCListener
-{
-public:
-    UnixListener(const DOMElement* e);
-    ~UnixListener() {if (m_bound) unlink(m_address.c_str());}
-
-    bool create(ShibSocket& s) const;
-    bool bind(ShibSocket& s, bool force=false) const;
-    bool connect(ShibSocket& s) const;
-    bool close(ShibSocket& s) const;
-    bool accept(ShibSocket& listener, ShibSocket& s) const;
-    CLIENT* getClientHandle(ShibSocket& s, u_long program, u_long version) const;
-    
-private:
-    string m_address;
-    mutable bool m_bound;
-};
-
-IPlugIn* UnixListenerFactory(const DOMElement* e)
-{
-    return new UnixListener(e);
-}
-
-UnixListener::UnixListener(const DOMElement* e) : RPCListener(e), m_address("/var/run/shar-socket"), m_bound(false)
-{
-    // We're stateless, but we need to load the configuration.
-    const XMLCh* tag=e->getAttributeNS(NULL,address);
-    if (tag && *tag) {
-        auto_ptr_char a(tag);
-        m_address=a.get();
-    }
-}
-
-#ifndef UNIX_PATH_MAX
-#define UNIX_PATH_MAX 100
-#endif
-
-bool UnixListener::create(ShibSocket& sock) const
-{
-    sock = socket(PF_UNIX, SOCK_STREAM, 0);
-    if (sock < 0)
-        return log_error();
-    return true;
-}
-
-bool UnixListener::bind(ShibSocket& s, bool force) const
-{
-    struct sockaddr_un addr;
-    memset(&addr, 0, sizeof (addr));
-    addr.sun_family = AF_UNIX;
-    strncpy(addr.sun_path, m_address.c_str(), UNIX_PATH_MAX);
-
-    if (force)
-        unlink(m_address.c_str());
-
-    if (::bind(s, (struct sockaddr *)&addr, sizeof (addr)) < 0) {
-        log_error();
-        close(s);
-        return false;
-    }
-
-    // Make sure that only the creator can read -- we don't want just
-    // anyone connecting, do we?
-    if (chmod(m_address.c_str(),0777) < 0) {
-        log_error();
-        close(s);
-        unlink(m_address.c_str());
-        return false;
-    }
-
-    listen(s, 3);
-    return m_bound=true;
-}
-
-bool UnixListener::connect(ShibSocket& s) const
-{
-    struct sockaddr_un addr;
-    memset(&addr, 0, sizeof (addr));
-    addr.sun_family = AF_UNIX;
-    strncpy(addr.sun_path, m_address.c_str(), UNIX_PATH_MAX);
-
-    if (::connect(s, (struct sockaddr *)&addr, sizeof (addr)) < 0)
-        return log_error();
-    return true;
-}
-
-bool UnixListener::close(ShibSocket& s) const
-{
-    ::close(s);
-    return true;
-}
-
-bool UnixListener::accept(ShibSocket& listener, ShibSocket& s) const
-{
-    s=::accept(listener,NULL,NULL);
-    if (s < 0)
-        return log_error();
-    return true;
-}
-
-CLIENT* UnixListener::getClientHandle(ShibSocket& s, u_long program, u_long version) const
-{
-    struct sockaddr_in sin;
-    memset (&sin, 0, sizeof (sin));
-    sin.sin_port = 1;
-    return clnttcp_create(&sin, program, version, &s, 0, 0);
-}
-
-#endif /* !WIN32 */