diff options
| author | Martin Sustrik <sustrik@fastmq.commkdir> | 2010-01-28 12:45:37 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2010-01-28 12:45:37 +0100 |
| commit | 849095a042b8326f5789baa04d1dbb7ca36d4632 (patch) | |
| tree | 2974bc9f9f14c67059d45be0a6932b263930506a /src/pgm_socket.cpp | |
| parent | f17f0fa67bc5a373f3fc7964aaad4f08aa1dc761 (diff) | |
| parent | e5ff617c4e061d29c9a019efa2292fd09c87a71e (diff) | |
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'src/pgm_socket.cpp')
| -rw-r--r-- | src/pgm_socket.cpp | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp index 11084ff..4d713e3 100644 --- a/src/pgm_socket.cpp +++ b/src/pgm_socket.cpp @@ -27,8 +27,6 @@ #ifdef ZMQ_HAVE_LINUX #include <poll.h> -// Has to be defined befiore including pgm/pgm.h -#define CONFIG_HAVE_POLL #endif #include <stdlib.h> @@ -88,10 +86,25 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_) // 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". - int rc = pgm_init (); - if (rc != 0) { - errno = EINVAL; - return -1; + int 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. |