Skip to content

Commit

Permalink
udp transport renamed to epgm
Browse files Browse the repository at this point in the history
  • Loading branch information
sustrik committed Mar 9, 2010
1 parent 5a776f5 commit d790940
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions configure.in
Original file line number Diff line number Diff line change
Expand Up @@ -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])
Expand Down
10 changes: 4 additions & 6 deletions src/socket_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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_);
}
Expand Down Expand Up @@ -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).
Expand All @@ -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'
Expand Down

0 comments on commit d790940

Please sign in to comment.