Commit 3e55545a authored by bjovke's avatar bjovke

Code reformatting of proxy.cpp

parent 2b543e7a
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
#include "socket_base.hpp" #include "socket_base.hpp"
#include "err.hpp" #include "err.hpp"
int capture( int capture (
class zmq::socket_base_t *capture_, class zmq::socket_base_t *capture_,
zmq::msg_t& msg_, zmq::msg_t& msg_,
int more_ = 0) int more_ = 0)
...@@ -66,14 +66,14 @@ int capture( ...@@ -66,14 +66,14 @@ int capture(
rc = ctrl.copy (msg_); rc = ctrl.copy (msg_);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return -1; return -1;
rc = capture_->send (&ctrl, more_? ZMQ_SNDMORE: 0); rc = capture_->send (&ctrl, more_ ? ZMQ_SNDMORE : 0);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return -1; return -1;
} }
return 0; return 0;
} }
int forward( int forward (
class zmq::socket_base_t *from_, class zmq::socket_base_t *from_,
class zmq::socket_base_t *to_, class zmq::socket_base_t *to_,
class zmq::socket_base_t *capture_, class zmq::socket_base_t *capture_,
...@@ -92,11 +92,11 @@ int forward( ...@@ -92,11 +92,11 @@ int forward(
return -1; return -1;
// Copy message to capture socket if any // Copy message to capture socket if any
rc = capture(capture_, msg_, more); rc = capture (capture_, msg_, more);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return -1; return -1;
rc = to_->send (&msg_, more? ZMQ_SNDMORE: 0); rc = to_->send (&msg_, more ? ZMQ_SNDMORE : 0);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return -1; return -1;
if (more == 0) if (more == 0)
...@@ -174,21 +174,21 @@ int zmq::proxy ( ...@@ -174,21 +174,21 @@ int zmq::proxy (
if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0) if (msg.size () == 5 && memcmp (msg.data (), "PAUSE", 5) == 0)
state = paused; state = paused;
else else
if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0) if (msg.size () == 6 && memcmp (msg.data (), "RESUME", 6) == 0)
state = active; state = active;
else else
if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0) if (msg.size () == 9 && memcmp (msg.data (), "TERMINATE", 9) == 0)
state = terminated; state = terminated;
else { else {
// This is an API error, so we assert // This is an API error, so we assert
puts ("E: invalid command sent to proxy"); puts ("E: invalid command sent to proxy");
zmq_assert (false); zmq_assert (false);
} }
} }
// Process a request // Process a request
if (state == active if (state == active
&& items [0].revents & ZMQ_POLLIN && items [0].revents & ZMQ_POLLIN
&& (frontend_ == backend_ || itemsout [1].revents & ZMQ_POLLOUT)) { && (frontend_ == backend_ || itemsout [1].revents & ZMQ_POLLOUT)) {
rc = forward (frontend_, backend_, capture_, msg); rc = forward (frontend_, backend_, capture_, msg);
if (unlikely (rc < 0)) if (unlikely (rc < 0))
return close_and_return (&msg, -1); return close_and_return (&msg, -1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment