From 7ef7f4a85a8e130c2910b6be8dc66fcde6c5a74d Mon Sep 17 00:00:00 2001 From: Martin Sustrik Date: Wed, 13 Jun 2012 10:29:20 +0200 Subject: Revert "Minor fixed to UDP transport." This reverts commit b3875624ba409160da6ad9292b5ec1e1ec5f2bef. --- src/socket_base.cpp | 2 +- tests/pubsub_udp.cpp | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/socket_base.cpp b/src/socket_base.cpp index 9a8103e..6b8588a 100644 --- a/src/socket_base.cpp +++ b/src/socket_base.cpp @@ -541,7 +541,7 @@ int xs::socket_base_t::connect (const char *addr_) // PGM does not support subscription forwarding; ask for all data to be // sent to this pipe. bool icanhasall = false; - if (protocol == "pgm" || protocol == "epgm" || protocol == "udp") + if (protocol == "pgm" || protocol == "epgm") icanhasall = true; // Attach local end of the pipe to the socket object. diff --git a/tests/pubsub_udp.cpp b/tests/pubsub_udp.cpp index ff2b08b..e981457 100644 --- a/tests/pubsub_udp.cpp +++ b/tests/pubsub_udp.cpp @@ -37,12 +37,14 @@ int XS_TEST_MAIN () assert (rc != -1); rc = xs_setsockopt (sub, XS_SUBSCRIBE, "", 0); assert (rc == 0); - - // Just in case there's an delay in lower parts of the network stack. - sleep (1); const char *content = "12345678ABCDEFGH12345678abcdefgh"; + // TODO: Due to a core bug, the first message on a PUB/SUB socket + // is always lost. For now just send a dummy message. + rc = xs_send (pub, "", 0, 0); + assert (rc == 0); + // Send a message with two identical parts. rc = xs_send (pub, content, 32, XS_SNDMORE); assert (rc == 32); -- cgit v1.2.3