From d790940fd06060c8a2c624b0e41e470ad31ae0d8 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <sustrik@250bpm.com>
Date: Tue, 9 Mar 2010 18:14:49 +0100
Subject: [PATCH] udp transport renamed to epgm

---
 configure.in        |  4 ++--
 src/socket_base.cpp | 10 ++++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/configure.in b/configure.in
index d838296f..a101ec34 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 871f9e93..f17a5781 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'