Merge "Handling of socket block on a TCP write by AgentDnsXmppChannel."

Juniper · Apr 4, 2016 · d09bcd9 · d09bcd9
2 parents f4bd7df + b969692
commit d09bcd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/src/vnsw/agent/controller/controller_dns.cc b/src/vnsw/agent/controller/controller_dns.cc
@@ -48,7 +48,7 @@ bool AgentDnsXmppChannel::SendMsg(uint8_t *msg, std::size_t len) {
         return false;
 
     return channel_->Send((const uint8_t *)msg, len, xmps::DNS, 
-            boost::bind(&AgentDnsXmppChannel::WriteReadyCb, this, msg, _1));
+            boost::bind(&AgentDnsXmppChannel::WriteReadyCb, this, _1));
 }
 
 void AgentDnsXmppChannel::ReceiveMsg(const XmppStanza::XmppMessage *msg) {
@@ -76,9 +76,7 @@ std::string AgentDnsXmppChannel::ToString() const {
     return channel_->ToString();
 }
 
-void AgentDnsXmppChannel::WriteReadyCb(uint8_t *msg, 
-                                       const boost::system::error_code &ec) {
-    delete [] msg;
+void AgentDnsXmppChannel::WriteReadyCb(const boost::system::error_code &ec) {
 }
 
 void AgentDnsXmppChannel::XmppClientChannelEvent(AgentDnsXmppChannel *peer,

diff --git a/src/vnsw/agent/controller/controller_dns.h b/src/vnsw/agent/controller/controller_dns.h
@@ -48,8 +48,7 @@ class AgentDnsXmppChannel {
     void RegisterXmppChannel(XmppChannel *channel);
 
 protected:
-    virtual void WriteReadyCb(uint8_t *msg, 
-                              const boost::system::error_code &ec);
+    virtual void WriteReadyCb(const boost::system::error_code &ec);
 
 private:
     void ReceiveInternal(const XmppStanza::XmppMessage *msg);