3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2024-12-31 01:43:02 +08:00
Code Issues Projects Releases Wiki Activity

sys transport introdced; inproc://log moved to sys://log

Browse Source
This commit is contained in:
Martin Sustrik 2010-09-01 15:24:46 +02:00
parent ce0972dca3
commit 651c1adc80
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ctx.cpp
View File

@ -70,7 +70,7 @@ zmq::ctx_t::ctx_t (uint32_t io_threads_) :
// Create the logging infrastructure.
log_socket = create_socket (ZMQ_PUB);
zmq_assert (log_socket);
int rc = log_socket->bind ("inproc://log");
int rc = log_socket->bind ("sys://log");
zmq_assert (rc == 0);
}

10
src/socket_base.cpp
View File

@ -143,7 +143,7 @@ int zmq::socket_base_t::check_protocol (const std::string &protocol_)
{
// First check out whether the protcol is something we are aware of.
if (protocol_ != "inproc" && protocol_ != "ipc" && protocol_ != "tcp" &&
protocol_ != "pgm" && protocol_ != "epgm") {
protocol_ != "pgm" && protocol_ != "epgm" && protocol_ != "sys") {
errno = EPROTONOSUPPORT;
return -1;
}
@ -282,8 +282,8 @@ int zmq::socket_base_t::bind (const char *addr_)
if (rc != 0)
return -1;
if (protocol == "inproc")
return register_endpoint (address.c_str (), this);
if (protocol == "inproc" || protocol == "sys")
return register_endpoint (addr_, this);
if (protocol == "tcp" || protocol == "ipc") {
zmq_listener_t *listener = new (std::nothrow) zmq_listener_t (
@ -335,14 +335,14 @@ int zmq::socket_base_t::connect (const char *addr_)
if (rc != 0)
return -1;
if (protocol == "inproc") {
if (protocol == "inproc" || protocol == "sys") {
// TODO: inproc connect is specific with respect to creating pipes
// as there's no 'reconnect' functionality implemented. Once that
// is in place we should follow generic pipe creation algorithm.
// Find the peer socket.
socket_base_t *peer = find_endpoint (address.c_str ());
socket_base_t *peer = find_endpoint (addr_);
if (!peer)
return -1;