From 971cbeda3de6691b212ad18bed9e9f08b278cfe1 Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Tue, 1 May 2012 16:41:04 +0200 Subject: Revert "Implement protocol versioning (except PGM)" This reverts commit 512f3a604924fec9d89e2b4bfd6f73aa66309fa7. --- src/xrespondent.cpp | 32 -------------------------------- 1 file changed, 32 deletions(-) (limited to 'src/xrespondent.cpp') diff --git a/src/xrespondent.cpp b/src/xrespondent.cpp index bd19913..c16d900 100644 --- a/src/xrespondent.cpp +++ b/src/xrespondent.cpp @@ -35,10 +35,6 @@ xs::xrespondent_t::xrespondent_t (class ctx_t *parent_, uint32_t tid_, next_peer_id (generate_random ()) { options.type = XS_XRESPONDENT; - options.sp_pattern = SP_SURVEY; - options.sp_version = 1; - options.sp_role = SP_SURVEY_RESPONDENT; - options.sp_complement = SP_SURVEY_SURVEYOR; // If the connection disappears it makes no sense to read any more surveys // from it. The responses will be unroutable anyway. @@ -53,34 +49,6 @@ xs::xrespondent_t::~xrespondent_t () prefetched_msg.close (); } -int xs::xrespondent_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 != 1) { - errno = EINVAL; - return -1; - } - - options.sp_version = version; - return 0; -} - void xs::xrespondent_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_) { xs_assert (pipe_); -- cgit v1.2.3