1 files changed, 7 insertions, 45 deletions
diff --git a/src/pull.cpp b/src/pull.cpp
index b2413ee..c5f6a8e 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -22,9 +22,11 @@
 #include "pull.hpp"
 #include "err.hpp"
 
-zmq::pull_t::pull_t (class app_thread_t *parent_) :
-    socket_base_t (parent_)
+zmq::pull_t::pull_t (class ctx_t *parent_, uint32_t slot_) :
+    socket_base_t (parent_, slot_),
+    fq (this)
 {
+    options.type = ZMQ_PULL;
     options.requires_in = true;
     options.requires_out = false;
 }
@@ -40,45 +42,10 @@ void zmq::pull_t::xattach_pipes (class reader_t *inpipe_,
     fq.attach (inpipe_);
 }
 
-void zmq::pull_t::xdetach_inpipe (class reader_t *pipe_)
+void zmq::pull_t::process_term ()
 {
-    zmq_assert (pipe_);
-    fq.detach (pipe_);
-}
-
-void zmq::pull_t::xdetach_outpipe (class writer_t *pipe_)
-{
-    //  There are no outpipes, so this function shouldn't be called at all.
-    zmq_assert (false);
-}
-
-void zmq::pull_t::xkill (class reader_t *pipe_)
-{
-    fq.kill (pipe_);
-}
-
-void zmq::pull_t::xrevive (class reader_t *pipe_)
-{
-    fq.revive (pipe_);
-}
-
-void zmq::pull_t::xrevive (class writer_t *pipe_)
-{
-    zmq_assert (false);
-}
-
-int zmq::pull_t::xsetsockopt (int option_, const void *optval_,
-    size_t optvallen_)
-{
-    //  No special options for this socket type.
-    errno = EINVAL;
-    return -1;
-}
-
-int zmq::pull_t::xsend (zmq_msg_t *msg_, int flags_)
-{
-    errno = ENOTSUP;
-    return -1;
+    fq.terminate ();
+    socket_base_t::process_term ();
 }
 
 int zmq::pull_t::xrecv (zmq_msg_t *msg_, int flags_)
@@ -91,8 +58,3 @@ bool zmq::pull_t::xhas_in ()
     return fq.has_in ();
 }
 
-bool zmq::pull_t::xhas_out ()
-{
-    return false;
-}
-