ZMQII-57: Shutdown OpenPGM library

1 files changed, 1 insertions, 30 deletions

diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp
index 64bf02f..1eeb34f 100644
--- a/src/pgm_socket.cpp
+++ b/src/pgm_socket.cpp
@@ -82,34 +82,6 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
     int rc;
     GError *pgm_error = NULL;
 
-    //  Init PGM transport if not already done.
-    //  Ensure threading enabled, ensure timer enabled and find PGM protocol id.
-    //
-    //  Note that if you want to use gettimeofday and sleep for openPGM timing,
-    //  set environment variables PGM_TIMER to "GTOD" 
-    //  and PGM_SLEEP to "USLEEP".
-    if (!pgm_supported ()) {
-        rc = pgm_init (&pgm_error);
-        if (rc != TRUE) {
-            if (pgm_error->domain == PGM_IF_ERROR && (
-                  pgm_error->code == PGM_IF_ERROR_INVAL ||
-                  pgm_error->code == PGM_IF_ERROR_XDEV ||
-                  pgm_error->code == PGM_IF_ERROR_NODEV ||
-                  pgm_error->code == PGM_IF_ERROR_NOTUNIQ ||
-                  pgm_error->code == PGM_IF_ERROR_ADDRFAMILY ||
-                  pgm_error->code == PGM_IF_ERROR_FAMILY ||
-                  pgm_error->code == PGM_IF_ERROR_NODATA ||
-                  pgm_error->code == PGM_IF_ERROR_NONAME ||
-                  pgm_error->code == PGM_IF_ERROR_SERVICE)) {
-                errno = EINVAL;
-	            g_error_free (pgm_error);
-                return -1;
-            }
-
-            zmq_assert (false);
-        }
-    }
-
     //  PGM transport GSI.
     pgm_gsi_t gsi;
  
@@ -137,7 +109,6 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
     hint.ti_family = AF_INET;
     
     if (!pgm_if_get_transport_info (network, &hint, &res, &pgm_error)) {
-
         if (pgm_error->domain == PGM_IF_ERROR && (
               pgm_error->code == PGM_IF_ERROR_INVAL ||
               pgm_error->code == PGM_IF_ERROR_XDEV ||
@@ -148,8 +119,8 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
               pgm_error->code == PGM_IF_ERROR_NODATA ||
               pgm_error->code == PGM_IF_ERROR_NONAME ||
               pgm_error->code == PGM_IF_ERROR_SERVICE)) {
+            g_error_free (pgm_error);
             errno = EINVAL;
-	        g_error_free (pgm_error);
             return -1;
         }