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

Merge pull request #2281 from vtellier/master

Browse Source 
Code formatting + reverted hard error handshake fail
This commit is contained in:
Luca Boccassi
2016-12-30 21:00:17 +01:00
committed by GitHub
parent 0ad600c7de 48bc75e8a1
commit 0ebed80dc1
6 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/zmq.h
View File

@@ -417,8 +417,6 @@ ZMQ_EXPORT const char *zmq_msg_gets (zmq_msg_t *msg, const char *property);
#define ZMQ_EVENT_CLOSE_FAILED 0x0100 #define ZMQ_EVENT_CLOSE_FAILED 0x0100
#define ZMQ_EVENT_DISCONNECTED 0x0200 #define ZMQ_EVENT_DISCONNECTED 0x0200
#define ZMQ_EVENT_MONITOR_STOPPED 0x0400 #define ZMQ_EVENT_MONITOR_STOPPED 0x0400
#define ZMQ_EVENT_HANDSHAKE_FAILED 0x0800
#define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
#define ZMQ_EVENT_ALL 0xFFFF #define ZMQ_EVENT_ALL 0xFFFF
ZMQ_EXPORT void *zmq_socket (void *, int type); ZMQ_EXPORT void *zmq_socket (void *, int type);
@@ -563,7 +561,11 @@ ZMQ_EXPORT void zmq_threadclose (void* thread);
#define ZMQ_SCATTER 17 #define ZMQ_SCATTER 17
#define ZMQ_DGRAM 18 #define ZMQ_DGRAM 18
/* DRAFT Context options */ /* DRAFT 0MQ socket events and monitoring */
#define ZMQ_EVENT_HANDSHAKE_FAILED 0x0800
#define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
/* DRAFT Context options */
#define ZMQ_MSG_T_SIZE 6 #define ZMQ_MSG_T_SIZE 6
/* DRAFT Socket methods. */ /* DRAFT Socket methods. */

11
src/curve_server.cpp
View File

@@ -310,14 +310,13 @@ int zmq::curve_server_t::process_hello (msg_t *msg_)
sizeof hello_box, sizeof hello_box,
hello_nonce, cn_client, secret_key); hello_nonce, cn_client, secret_key);
if (rc != 0) { if (rc != 0) {
// Hard error, the client knows a wrong server public key, it shall not try to reconnect using the same. // Temporary support for security debugging
status_code = "100"; puts("CURVE I: cannot open client HELLO -- wrong server key?");
state = send_error; errno = EPROTO;
rc = 0; return -1;
} }
else
state = send_welcome;
state = send_welcome;
return rc; return rc;
} }

4
src/socket_base.cpp
View File

@@ -1680,12 +1680,12 @@ void zmq::socket_base_t::event_disconnected (const std::string &addr_, zmq::fd_t
void zmq::socket_base_t::event_handshake_failed(const std::string &addr_, int err_) void zmq::socket_base_t::event_handshake_failed(const std::string &addr_, int err_)
{ {
event(addr_, err_, ZMQ_EVENT_HANDSHAKE_FAILED); event(addr_, err_, ZMQ_EVENT_HANDSHAKE_FAILED);
} }
void zmq::socket_base_t::event_handshake_succeed(const std::string &addr_, int err_) void zmq::socket_base_t::event_handshake_succeed(const std::string &addr_, int err_)
{ {
event(addr_, err_, ZMQ_EVENT_HANDSHAKE_SUCCEED); event(addr_, err_, ZMQ_EVENT_HANDSHAKE_SUCCEED);
} }
void zmq::socket_base_t::event(const std::string &addr_, intptr_t value_, int type_) void zmq::socket_base_t::event(const std::string &addr_, intptr_t value_, int type_)

2
src/socket_base.hpp
View File

@@ -134,7 +134,7 @@ namespace zmq
void event_close_failed (const std::string &addr_, int err_); void event_close_failed (const std::string &addr_, int err_);
void event_disconnected (const std::string &addr_, zmq::fd_t fd_); void event_disconnected (const std::string &addr_, zmq::fd_t fd_);
void event_handshake_failed(const std::string &addr_, int err_); void event_handshake_failed(const std::string &addr_, int err_);
void event_handshake_succeed(const std::string &addr_, int err_); void event_handshake_succeed(const std::string &addr_, int err_);
protected: protected:

4
src/stream_engine.cpp
View File

@@ -790,8 +790,8 @@ int zmq::stream_engine_t::next_handshake_command (msg_t *msg_)
if (rc == 0) if (rc == 0)
msg_->set_flags (msg_t::command); msg_->set_flags (msg_t::command);
if(mechanism->status() == mechanism_t::error) if(mechanism->status() == mechanism_t::error)
socket->event_handshake_failed(endpoint, 0); socket->event_handshake_failed(endpoint, 0);
return rc; return rc;
} }

6
src/zmq_draft.h
View File

@@ -46,7 +46,11 @@
#define ZMQ_SCATTER 17 #define ZMQ_SCATTER 17
#define ZMQ_DGRAM 18 #define ZMQ_DGRAM 18
/* DRAFT Context options */ /* DRAFT 0MQ socket events and monitoring */
#define ZMQ_EVENT_HANDSHAKE_FAILED 0x0800
#define ZMQ_EVENT_HANDSHAKE_SUCCEED 0x1000
/* DRAFT Context options */
#define ZMQ_MSG_T_SIZE 6 #define ZMQ_MSG_T_SIZE 6
/* DRAFT Socket methods. */ /* DRAFT Socket methods. */