From 971cbeda3de6691b212ad18bed9e9f08b278cfe1 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 1 May 2012 16:41:04 +0200
Subject: Revert "Implement protocol versioning (except PGM)"

This reverts commit 512f3a604924fec9d89e2b4bfd6f73aa66309fa7.
---
 src/pull.cpp | 33 ---------------------------------
 1 file changed, 33 deletions(-)

(limited to 'src/pull.cpp')

diff --git a/src/pull.cpp b/src/pull.cpp
index 4d08edb..8ae8208 100644
--- a/src/pull.cpp
+++ b/src/pull.cpp
@@ -23,50 +23,17 @@
 #include "err.hpp"
 #include "msg.hpp"
 #include "pipe.hpp"
-#include "wire.hpp"
 
 xs::pull_t::pull_t (class ctx_t *parent_, uint32_t tid_, int sid_) :
     socket_base_t (parent_, tid_, sid_)
 {
     options.type = XS_PULL;
-    options.sp_pattern = SP_PIPELINE;
-    options.sp_version = 2;
-    options.sp_role = SP_PIPELINE_PULL;
-    options.sp_complement = SP_PIPELINE_PUSH;
 }
 
 xs::pull_t::~pull_t ()
 {
 }
 
-int xs::pull_t::xsetsockopt (int option_, const void *optval_,
-    size_t optvallen_)
-{
-    if (option_ != XS_PROTOCOL) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (optvallen_ != sizeof (int)) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if (!optval_) {
-        errno = EFAULT;
-        return -1;
-    }
-
-    int version = *(int *) optval_;
-    if (version != 2) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    options.sp_version = version;
-    return 0;
-}
-
 void xs::pull_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
 {
     xs_assert (pipe_);
-- 
cgit v1.2.3