Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
L
libzmq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
libzmq
Commits
ec2ba8a9
Commit
ec2ba8a9
authored
Jan 01, 2017
by
Luca Boccassi
Committed by
GitHub
Jan 01, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2283 from vtellier/master
Fixed issue #2227 second part
parents
ee98e7dc
ea7e03a7
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
10 deletions
+6
-10
session_base.cpp
src/session_base.cpp
+1
-3
stream_engine.cpp
src/stream_engine.cpp
+2
-5
stream_engine.hpp
src/stream_engine.hpp
+1
-2
README.md
tests/README.md
+2
-0
No files found.
src/session_base.cpp
View file @
ec2ba8a9
...
...
@@ -421,8 +421,7 @@ void zmq::session_base_t::engine_error (
if
(
pipe
)
clean_pipes
();
zmq_assert
(
reason
==
stream_engine_t
::
encryption_error
||
reason
==
stream_engine_t
::
connection_error
zmq_assert
(
reason
==
stream_engine_t
::
connection_error
||
reason
==
stream_engine_t
::
timeout_error
||
reason
==
stream_engine_t
::
protocol_error
);
...
...
@@ -434,7 +433,6 @@ void zmq::session_base_t::engine_error (
else
terminate
();
break
;
case
stream_engine_t
:
:
encryption_error
:
case
stream_engine_t
:
:
protocol_error
:
terminate
();
break
;
...
...
src/stream_engine.cpp
View file @
ec2ba8a9
...
...
@@ -356,10 +356,7 @@ void zmq::stream_engine_t::in_event ()
// or the session has rejected the message.
if
(
rc
==
-
1
)
{
if
(
errno
!=
EAGAIN
)
{
if
(
this
->
process_msg
==
&
stream_engine_t
::
process_handshake_command
)
error
(
encryption_error
);
else
error
(
protocol_error
);
error
(
protocol_error
);
return
;
}
input_stopped
=
true
;
...
...
@@ -981,7 +978,7 @@ void zmq::stream_engine_t::error (error_reason_t reason)
}
zmq_assert
(
session
);
#ifdef ZMQ_BUILD_DRAFT_API
if
(
reason
==
encryption_error
)
if
(
mechanism
==
NULL
||
mechanism
->
status
()
==
mechanism_t
::
handshaking
)
socket
->
event_handshake_failed
(
endpoint
,
(
int
)
s
);
#endif
socket
->
event_disconnected
(
endpoint
,
(
int
)
s
);
...
...
src/stream_engine.hpp
View file @
ec2ba8a9
...
...
@@ -65,8 +65,7 @@ namespace zmq
enum
error_reason_t
{
protocol_error
,
connection_error
,
timeout_error
,
encryption_error
timeout_error
};
stream_engine_t
(
fd_t
fd_
,
const
options_t
&
options_
,
...
...
tests/README.md
View file @
ec2ba8a9
...
...
@@ -19,6 +19,8 @@ to add a sleep, please be consistent with all the other tests and use:
# Building tests in Windows
According to the version of your compiler, you should adapt the path
`libzmq.lib`
in the file
`tests/CMakeLists.txt`
.
Install CMAKE
CMD> CMAKE libzmq/tests
CMD> tests.sln
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment