diff options
| author | Martin Sustrik <sustrik@250bpm.com> | 2010-03-09 18:14:49 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2010-03-09 18:14:49 +0100 |
| commit | d790940fd06060c8a2c624b0e41e470ad31ae0d8 (patch) | |
| tree | 2732f1b82fc6298b21ca80b24788c400e7e89b17 | |
| parent | 5a776f5597cac632ca507e2d80ca0de064bba1d6 (diff) | |
udp transport renamed to epgm
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | src/socket_base.cpp | 10 |
2 files changed, 6 insertions, 8 deletions
diff --git a/configure.in b/configure.in index d838296..a101ec3 100644 --- a/configure.in +++ b/configure.in @@ -560,8 +560,8 @@ AC_MSG_RESULT([ C++: $cppzmq]) AC_MSG_RESULT([ Java: $jzmq]) AC_MSG_RESULT([ Transports:]) AC_MSG_RESULT([ tcp: yes]) -AC_MSG_RESULT([ udp: $pgm_ext]) -AC_MSG_RESULT([ pgm: $pgm_ext]) +AC_MSG_RESULT([ pgm (epgm): $pgm_ext]) +AC_MSG_RESULT([ ipc: yes]) AC_MSG_RESULT([ inproc: yes]) AC_MSG_RESULT([ Devices:]) AC_MSG_RESULT([ Forwarder: $forwarder]) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 871f9e9..f17a578 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -111,7 +111,7 @@ int zmq::socket_base_t::bind (const char *addr_) } #if defined ZMQ_HAVE_OPENPGM - if (addr_type == "pgm" || addr_type == "udp") { + if (addr_type == "pgm" || addr_type == "epgm") { // In the case of PGM bind behaves the same like connect. return connect (addr_); } @@ -252,7 +252,7 @@ int zmq::socket_base_t::connect (const char *addr_) } #if defined ZMQ_HAVE_OPENPGM - if (addr_type == "pgm" || addr_type == "udp") { + if (addr_type == "pgm" || addr_type == "epgm") { // If the socket type requires bi-directional communication // multicast is not an option (it is uni-directional). @@ -261,10 +261,8 @@ int zmq::socket_base_t::connect (const char *addr_) return -1; } - // For udp, pgm transport with udp encapsulation is used. - bool udp_encapsulation = false; - if (addr_type == "udp") - udp_encapsulation = true; + // For epgm, pgm transport with UDP encapsulation is used. + bool udp_encapsulation = (addr_type == "epgm"); // At this point we'll create message pipes to the session straight // away. There's no point in delaying it as no concept of 'connect' |