generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-03 04:38:42 +01:00
Code Issues Projects Releases Wiki Activity

Problem: duplicated code in socket-related functions

Browse Source 
Solution: extract as_socket_base_t function
This commit is contained in:
sigiesec 2017-08-29 10:30:03 +02:00
parent efa86fe629
commit f4d139bd16
1 changed files with 54 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

141
src/zmq.cpp
View File

@ -247,6 +247,16 @@ int zmq_ctx_destroy (void *ctx_)
// Sockets // Sockets
static zmq::socket_base_t *as_socket_base_t (void *s_)
{
zmq::socket_base_t *s = static_cast<zmq::socket_base_t *> (s_);
if (!s_ || !s->check_tag ()) {
errno = ENOTSOCK;
return NULL;
}
return s;
}
void *zmq_socket (void *ctx_, int type_) void *zmq_socket (void *ctx_, int type_)
{ {
if (!ctx_ || !((zmq::ctx_t *) ctx_)->check_tag ()) { if (!ctx_ || !((zmq::ctx_t *) ctx_)->check_tag ()) {
@ -260,109 +270,83 @@ void *zmq_socket (void *ctx_, int type_)
int zmq_close (void *s_) int zmq_close (void *s_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} s->close ();
((zmq::socket_base_t*) s_)->close ();
return 0; return 0;
} }
int zmq_setsockopt (void *s_, int option_, const void *optval_, int zmq_setsockopt (void *s_, int option_, const void *optval_,
size_t optvallen_) size_t optvallen_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->setsockopt (option_, optval_, optvallen_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->setsockopt (option_, optval_, optvallen_);
return result;
} }
int zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_) int zmq_getsockopt (void *s_, int option_, void *optval_, size_t *optvallen_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->getsockopt (option_, optval_, optvallen_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->getsockopt (option_, optval_, optvallen_);
return result;
} }
int zmq_socket_monitor (void *s_, const char *addr_, int events_) int zmq_socket_monitor (void *s_, const char *addr_, int events_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->monitor (addr_, events_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->monitor (addr_, events_);
return result;
} }
int zmq_join (void *s_, const char* group_) int zmq_join (void *s_, const char* group_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->join (group_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->join (group_);
return result;
} }
int zmq_leave (void *s_, const char* group_) int zmq_leave (void *s_, const char* group_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->leave (group_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->leave (group_);
return result;
} }
int zmq_bind (void *s_, const char *addr_) int zmq_bind (void *s_, const char *addr_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->bind (addr_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->bind (addr_);
return result;
} }
int zmq_connect (void *s_, const char *addr_) int zmq_connect (void *s_, const char *addr_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s->connect (addr_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s->connect (addr_);
return result;
} }
int zmq_unbind (void *s_, const char *addr_) int zmq_unbind (void *s_, const char *addr_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
return s->term_endpoint (addr_); return s->term_endpoint (addr_);
} }
int zmq_disconnect (void *s_, const char *addr_) int zmq_disconnect (void *s_, const char *addr_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
return s->term_endpoint (addr_); return s->term_endpoint (addr_);
} }
@ -392,10 +376,9 @@ int zmq_sendmsg (void *s_, zmq_msg_t *msg_, int flags_)
int zmq_send (void *s_, const void *buf_, size_t len_, int flags_) int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
zmq_msg_t msg; zmq_msg_t msg;
if (zmq_msg_init_size (&msg, len_)) if (zmq_msg_init_size (&msg, len_))
return -1; return -1;
@ -405,7 +388,6 @@ int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
assert (buf_); assert (buf_);
memcpy (zmq_msg_data (&msg), buf_, len_); memcpy (zmq_msg_data (&msg), buf_, len_);
} }
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int rc = s_sendmsg (s, &msg, flags_); int rc = s_sendmsg (s, &msg, flags_);
if (unlikely (rc < 0)) { if (unlikely (rc < 0)) {
int err = errno; int err = errno;
@ -421,16 +403,14 @@ int zmq_send (void *s_, const void *buf_, size_t len_, int flags_)
int zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_) int zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
zmq_msg_t msg; zmq_msg_t msg;
int rc = zmq_msg_init_data (&msg, (void *)buf_, len_, NULL, NULL); int rc = zmq_msg_init_data (&msg, (void *)buf_, len_, NULL, NULL);
if (rc != 0) if (rc != 0)
return -1; return -1;
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
rc = s_sendmsg (s, &msg, flags_); rc = s_sendmsg (s, &msg, flags_);
if (unlikely (rc < 0)) { if (unlikely (rc < 0)) {
int err = errno; int err = errno;
@ -454,10 +434,9 @@ int zmq_send_const (void *s_, const void *buf_, size_t len_, int flags_)
// //
int zmq_sendiov (void *s_, iovec *a_, size_t count_, int flags_) int zmq_sendiov (void *s_, iovec *a_, size_t count_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
if (unlikely (count_ <= 0 || !a_)) { if (unlikely (count_ <= 0 || !a_)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
@ -465,7 +444,6 @@ int zmq_sendiov (void *s_, iovec *a_, size_t count_, int flags_)
int rc = 0; int rc = 0;
zmq_msg_t msg; zmq_msg_t msg;
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
for (size_t i = 0; i < count_; ++i) { for (size_t i = 0; i < count_; ++i) {
rc = zmq_msg_init_size (&msg, a_[i].iov_len); rc = zmq_msg_init_size (&msg, a_[i].iov_len);
@ -512,15 +490,13 @@ int zmq_recvmsg (void *s_, zmq_msg_t *msg_, int flags_)
int zmq_recv (void *s_, void *buf_, size_t len_, int flags_) int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
zmq_msg_t msg; zmq_msg_t msg;
int rc = zmq_msg_init (&msg); int rc = zmq_msg_init (&msg);
errno_assert (rc == 0); errno_assert (rc == 0);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int nbytes = s_recvmsg (s, &msg, flags_); int nbytes = s_recvmsg (s, &msg, flags_);
if (unlikely (nbytes < 0)) { if (unlikely (nbytes < 0)) {
int err = errno; int err = errno;
@ -562,17 +538,14 @@ int zmq_recv (void *s_, void *buf_, size_t len_, int flags_)
// //
int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_) int zmq_recviov (void *s_, iovec *a_, size_t *count_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
}
if (unlikely (!count_ || *count_ <= 0 || !a_)) { if (unlikely (!count_ || *count_ <= 0 || !a_)) {
errno = EINVAL; errno = EINVAL;
return -1; return -1;
} }
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
size_t count = *count_; size_t count = *count_;
int nread = 0; int nread = 0;
bool recvmore = true; bool recvmore = true;
@ -634,24 +607,18 @@ int zmq_msg_init_data (zmq_msg_t *msg_, void *data_, size_t size_,
int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_) int zmq_msg_send (zmq_msg_t *msg_, void *s_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s_sendmsg (s, msg_, flags_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s_sendmsg (s, msg_, flags_);
return result;
} }
int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_) int zmq_msg_recv (zmq_msg_t *msg_, void *s_, int flags_)
{ {
if (!s_ || !((zmq::socket_base_t*) s_)->check_tag ()) { zmq::socket_base_t *s = as_socket_base_t (s_);
errno = ENOTSOCK; if (!s)
return -1; return -1;
} return s_recvmsg (s, msg_, flags_);
zmq::socket_base_t *s = (zmq::socket_base_t *) s_;
int result = s_recvmsg (s, msg_, flags_);
return result;
} }
int zmq_msg_close (zmq_msg_t *msg_) int zmq_msg_close (zmq_msg_t *msg_)