Merge "Validate the channel before sending update."

Juniper · Dec 8, 2016 · 72402bf · 72402bf
2 parents 680f1ad + 35e392d
commit 72402bf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/vnsw/agent/cmn/agent.h b/src/vnsw/agent/cmn/agent.h
@@ -677,6 +677,11 @@ class Agent {
     void set_dns_xmpp_channel(AgentDnsXmppChannel *chnl, uint8_t idx) {
         dns_xmpp_channel_[idx] = chnl;
     }
+    bool is_dns_xmpp_channel(AgentDnsXmppChannel *channel) {
+        if (channel == dns_xmpp_channel_[0] || channel == dns_xmpp_channel_[1])
+            return true;;
+        return false;
+    }
 
     // DNS Server and port
     const std::string &dns_server(uint8_t idx) const {return dns_addr_[idx];}

diff --git a/src/vnsw/agent/services/dns_handler.cc b/src/vnsw/agent/services/dns_handler.cc
@@ -779,7 +779,7 @@ bool DnsHandler::UpdateAll() {
 
 void DnsHandler::SendXmppUpdate(AgentDnsXmppChannel *channel, 
                                 DnsUpdateData *xmpp_data) {
-    if (channel) {
+    if (channel && agent_->is_dns_xmpp_channel(channel)) {
         // Split the request in case we have more data items
         DnsItems done, store;
         DnsItems::iterator first, last;