Merge pull request #544 from steve-o/libzmq-446

[#LIBZMQ-446] Silence error on setting PGM_TOS on REL 4.
This commit is contained in:
Pieter Hintjens 2013-04-13 02:55:02 -07:00
commit c5721f9988

View File

@ -336,10 +336,11 @@ int zmq::pgm_socket_t::init (bool udp_encapsulation_, const char *network_)
goto err_abort; goto err_abort;
// Expedited Forwarding PHB for network elements, no ECN. // Expedited Forwarding PHB for network elements, no ECN.
// Ignore return value due to varied runtime support.
const int dscp = 0x2e << 2; const int dscp = 0x2e << 2;
if (AF_INET6 != sa_family && !pgm_setsockopt (sock, if (AF_INET6 != sa_family)
IPPROTO_PGM, PGM_TOS, &dscp, sizeof (dscp))) pgm_setsockopt (sock, IPPROTO_PGM, PGM_TOS,
goto err_abort; &dscp, sizeof (dscp));
const int nonblocking = 1; const int nonblocking = 1;
if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_NOBLOCK, if (!pgm_setsockopt (sock, IPPROTO_PGM, PGM_NOBLOCK,