mcproxy: add igmpV2 reply support

[feed/routing.git] / mcproxy / patches / 0006-block-ingress.patch

diff --git a/mcproxy/patches/0006-block-ingress.patch b/mcproxy/patches/0006-block-ingress.patch
index c8bcdb30f9f5ec6cd89313db541516bc5626c3d8..59987419836b3e11664643d405ebdb0d1d2aeaa6 100644 (file)
--- a/mcproxy/patches/0006-block-ingress.patch
+++ b/mcproxy/patches/0006-block-ingress.patch
@@ -1,25 +1,23 @@
---- a/mcproxy/src/proxy/proxy_instance.cpp
-+++ b/mcproxy/src/proxy/proxy_instance.cpp
+Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/proxy/proxy_instance.cpp
+===================================================================
+--- mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99.orig/mcproxy/src/proxy/proxy_instance.cpp
++++ mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/proxy/proxy_instance.cpp
 @@ -171,6 +171,9 @@ void proxy_instance::worker_thread()
      HC_LOG_TRACE("");
      while (m_running) {
          auto msg = m_job_queue.dequeue();
 +
-+              HC_LOG_DEBUG("Proxy Message: " << msg->get_message_type_name(msg->get_type()) );
++        HC_LOG_DEBUG("Proxy Message: " << msg->get_message_type_name(msg->get_type()) );
 +
          switch (msg->get_type()) {
          case proxy_msg::TEST_MSG:
              (*msg)();
-@@ -190,28 +193,80 @@ void proxy_instance::worker_thread()
-             } else {
-                 HC_LOG_DEBUG("failed to find querier of interface: " << interfaces::get_if_name(std::static_pointer_cast<timer_msg>(msg)->get_if_index()));
-             }
--        }
-+              }
+@@ -193,25 +196,66 @@ void proxy_instance::worker_thread()
+         }
          break;
          case proxy_msg::GROUP_RECORD_MSG: {
 -            auto r =  std::static_pointer_cast<group_record_msg>(msg);
-+            auto gr =  std::static_pointer_cast<group_record_msg>(msg);
++            auto gr = std::static_pointer_cast<group_record_msg>(msg);
  
              if (m_in_debug_testing_mode) {
                  std::cout << "!!--ACTION: receive record" << std::endl;
@@ -29,31 +27,25 @@
              }
  
 -            auto it = m_downstreams.find(r->get_if_index());
-+                      auto slist = gr->get_slist();
-+                      addr_storage saddr;
-+                      if ( slist.empty() )
-+                      {
-+                              saddr = "0.0.0.0";
-+                      }
-+                      else
-+                      {
-+                              saddr = slist.begin()->saddr;
-+                      }
++            auto slist = gr->get_slist();
++            addr_storage saddr;
++            if (slist.empty()) {
++                saddr = "0.0.0.0";
++            } else {
++                saddr = slist.begin()->saddr;
++            }
 +            auto it = m_downstreams.find(gr->get_if_index());
              if (it != std::end(m_downstreams)) {
 -                it->second.m_querier->receive_record(msg);
-+                              // Check for input filters
-+                              if ( ! it->second.m_interface->match_input_filter( interfaces::get_if_name( gr->get_if_index() ),
-+                                                                                                         saddr,
-+                                                                                                         gr->get_gaddr() )
-+                                       )
-+                              {
-+                                      HC_LOG_DEBUG("group report " << gr->get_gaddr() << " filtered");
-+                              }
-+                              else
-+                              {
-+                                      it->second.m_querier->receive_record(msg);
-+                              }
++                // Check for input filters
++                if (!it->second.m_interface->match_input_filter(interfaces::get_if_name(gr->get_if_index()), saddr, gr->get_gaddr()))
++                {
++                    HC_LOG_DEBUG("group report " << gr->get_gaddr() << " filtered");
++                }
++                else
++                {
++                    it->second.m_querier->receive_record(msg);
++                }
              } else {
 -                HC_LOG_DEBUG("failed to find querier of interface: " << interfaces::get_if_name(std::static_pointer_cast<timer_msg>(msg)->get_if_index()));
 +                HC_LOG_DEBUG("failed to find querier of interface: " << interfaces::get_if_name( gr->get_if_index() ));
@@ -62,37 +54,32 @@
 +              }
 +        break;
 +        case proxy_msg::NEW_SOURCE_MSG: {
-+                      auto sm = std::static_pointer_cast<new_source_msg>(msg);
-+                      // Find the interface
-+                      std::shared_ptr<interface> interf;
-+                      auto it = m_downstreams.find(sm->get_if_index());
-+                      if (it != std::end(m_downstreams)) {
-+                              interf = it->second.m_interface;
-+                      } else {
-+                              for (auto & e : m_upstreams) {
-+                                      if (e.m_if_index == sm->get_if_index()) {
-+                                              interf = e.m_interface;
-+                                              break;
-+                                      }
-+                              }
-+                      }
-+                      if ( !interf )
-+                      {
-+                              HC_LOG_DEBUG("failed to find interface: " << interfaces::get_if_name( sm->get_if_index() ) << " for Source message " << sm->get_saddr()  << " | " << sm->get_gaddr() );
-+                              break;
-+                      }
-+                      // Check for input filters
-+                      if ( ! interf->match_input_filter( interfaces::get_if_name( sm->get_if_index() ),
-+                                                                                                         sm->get_saddr(),
-+                                                                                                         sm->get_gaddr() )
-+                                       )
-+                      {
-+                              HC_LOG_DEBUG("source " << sm->get_saddr()  << " | " << sm->get_gaddr() << " filtered");
-+                      }
-+                      else
-+                      {
-+                              m_routing_management->event_new_source(msg);
-+                      }
++            auto sm = std::static_pointer_cast<new_source_msg>(msg);
++            // Find the interface
++            std::shared_ptr<interface> interf;
++            auto it = m_downstreams.find(sm->get_if_index());
++            if (it != std::end(m_downstreams)) {
++                interf = it->second.m_interface;
++            } else {
++                for (auto & e : m_upstreams) {
++                    if (e.m_if_index == sm->get_if_index()) {
++                        interf = e.m_interface;
++                        break;
++                    }
++                }
++            }
++            if ( !interf )
++            {
++                HC_LOG_DEBUG("failed to find interface: " << interfaces::get_if_name( sm->get_if_index() ) << " for Source message " << sm->get_saddr()  << " | " << sm->get_gaddr() );
++                break;
++            }
++            // Check for input filters
++            if (!interf->match_input_filter(interfaces::get_if_name(sm->get_if_index()), sm->get_saddr(), sm->get_gaddr()))
++            {
++                HC_LOG_DEBUG("source " << sm->get_saddr()  << " | " << sm->get_gaddr() << " filtered");
++            } else {
++                m_routing_management->event_new_source(msg);
++            }
 +              }
          break;
 -        case proxy_msg::NEW_SOURCE_MSG:
@@ -101,4 +88,3 @@
          case proxy_msg::NEW_SOURCE_TIMER_MSG:
              m_routing_management->timer_triggerd_maintain_routing_table(msg);
              break;
-             return false;