Commit d790940f authored by Martin Sustrik's avatar Martin Sustrik

udp transport renamed to epgm

parent 5a776f55
...@@ -560,8 +560,8 @@ AC_MSG_RESULT([ C++: $cppzmq]) ...@@ -560,8 +560,8 @@ AC_MSG_RESULT([ C++: $cppzmq])
AC_MSG_RESULT([ Java: $jzmq]) AC_MSG_RESULT([ Java: $jzmq])
AC_MSG_RESULT([ Transports:]) AC_MSG_RESULT([ Transports:])
AC_MSG_RESULT([ tcp: yes]) AC_MSG_RESULT([ tcp: yes])
AC_MSG_RESULT([ udp: $pgm_ext]) AC_MSG_RESULT([ pgm (epgm): $pgm_ext])
AC_MSG_RESULT([ pgm: $pgm_ext]) AC_MSG_RESULT([ ipc: yes])
AC_MSG_RESULT([ inproc: yes]) AC_MSG_RESULT([ inproc: yes])
AC_MSG_RESULT([ Devices:]) AC_MSG_RESULT([ Devices:])
AC_MSG_RESULT([ Forwarder: $forwarder]) AC_MSG_RESULT([ Forwarder: $forwarder])
......
...@@ -111,7 +111,7 @@ int zmq::socket_base_t::bind (const char *addr_) ...@@ -111,7 +111,7 @@ int zmq::socket_base_t::bind (const char *addr_)
} }
#if defined ZMQ_HAVE_OPENPGM #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. // In the case of PGM bind behaves the same like connect.
return connect (addr_); return connect (addr_);
} }
...@@ -252,7 +252,7 @@ int zmq::socket_base_t::connect (const char *addr_) ...@@ -252,7 +252,7 @@ int zmq::socket_base_t::connect (const char *addr_)
} }
#if defined ZMQ_HAVE_OPENPGM #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 // If the socket type requires bi-directional communication
// multicast is not an option (it is uni-directional). // multicast is not an option (it is uni-directional).
...@@ -261,10 +261,8 @@ int zmq::socket_base_t::connect (const char *addr_) ...@@ -261,10 +261,8 @@ int zmq::socket_base_t::connect (const char *addr_)
return -1; return -1;
} }
// For udp, pgm transport with udp encapsulation is used. // For epgm, pgm transport with UDP encapsulation is used.
bool udp_encapsulation = false; bool udp_encapsulation = (addr_type == "epgm");
if (addr_type == "udp")
udp_encapsulation = true;
// At this point we'll create message pipes to the session straight // 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' // away. There's no point in delaying it as no concept of 'connect'
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment