>From 52eaf600e5fe2acf5de6208a6a5a123dfcfe1fa2 Mon Sep 17 00:00:00 2001
From: Martin Sustrik <[email protected]>
Date: Sat, 9 Jul 2011 09:40:40 +0200
Subject: [PATCH] Drop outbound messages in XREP socket when SNDHWM is reached

Signed-off-by: Martin Sustrik <[email protected]>
---
 src/rep.cpp  |    5 +----
 src/xrep.cpp |    4 ----
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/rep.cpp b/src/rep.cpp
index ee67186..2ad494d 100644
--- a/src/rep.cpp
+++ b/src/rep.cpp
@@ -73,11 +73,8 @@ int zmq::rep_t::xrecv (msg_t *msg_, int flags_)
                 return rc;
             if (!(msg_->flags () & msg_t::label))
                 break;
-
-            //  TODO: If the reply cannot be sent to the peer because
-            //  od congestion, we should drop it.
             rc = xrep_t::xsend (msg_, flags_);
-            zmq_assert (rc == 0);
+            errno_assert (rc == 0);
         }
         request_begins = false;
     }
diff --git a/src/xrep.cpp b/src/xrep.cpp
index 5d111f8..153be46 100644
--- a/src/xrep.cpp
+++ b/src/xrep.cpp
@@ -145,10 +145,6 @@ int zmq::xrep_t::xsend (msg_t *msg_, int flags_)
                     it->second.active = false;
                     more_out = false;
                     current_out = NULL;
-                    rc = empty.close ();
-                    errno_assert (rc == 0);
-                    errno = EAGAIN;
-                    return -1;
                 }
                 rc = empty.close ();
                 errno_assert (rc == 0);
-- 
1.7.0.4

_______________________________________________
zeromq-dev mailing list
[email protected]
http://lists.zeromq.org/mailman/listinfo/zeromq-dev

Reply via email to