diff options
| author | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-22 09:01:01 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@fastmq.commkdir> | 2009-12-22 09:01:01 +0100 |
| commit | b3bd4c15fe869de4f5c530ecc5942968677a85c3 (patch) | |
| tree | 22702668f02ddf9a64bad0c86ca3d279821a74a1 /src/pgm_socket.cpp | |
| parent | 7cf18a2aec8300099e3c3e236ac3cefa3be746d0 (diff) | |
OpenPGM error handling fixed
Diffstat (limited to 'src/pgm_socket.cpp')
| -rw-r--r-- | src/pgm_socket.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pgm_socket.cpp b/src/pgm_socket.cpp index 5067672..c3802b4 100644 --- a/src/pgm_socket.cpp +++ b/src/pgm_socket.cpp @@ -145,7 +145,8 @@ int zmq::pgm_socket_t::open_transport () if (!pgm_if_get_transport_info (network, NULL, &res, &pgm_error)) { - if (pgm_error->code == PGM_IF_ERROR_INVAL || + 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 || @@ -153,7 +154,7 @@ int zmq::pgm_socket_t::open_transport () 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) { + pgm_error->code == PGM_IF_ERROR_SERVICE)) { errno = EINVAL; g_error_free (pgm_error); return -1; @@ -172,9 +173,10 @@ int zmq::pgm_socket_t::open_transport () } if (!pgm_transport_create (&transport, res, &pgm_error)) { - if (pgm_error->code == PGM_TRANSPORT_ERROR_INVAL || + if (pgm_error->domain == PGM_TRANSPORT_ERROR && ( + pgm_error->code == PGM_TRANSPORT_ERROR_INVAL || pgm_error->code == PGM_TRANSPORT_ERROR_PERM || - pgm_error->code == PGM_TRANSPORT_ERROR_NODEV) { + pgm_error->code == PGM_TRANSPORT_ERROR_NODEV)) { pgm_if_free_transport_info (res); g_error_free (pgm_error); errno = EINVAL; @@ -334,7 +336,8 @@ int zmq::pgm_socket_t::open_transport () // Bind a transport to the specified network devices. if (!pgm_transport_bind (transport, &pgm_error)) { - if (pgm_error->code == PGM_IF_ERROR_INVAL || + 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 || @@ -342,7 +345,7 @@ int zmq::pgm_socket_t::open_transport () 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) { + pgm_error->code == PGM_IF_ERROR_SERVICE)) { g_error_free (pgm_error); errno = EINVAL; return -1; |