mcproxy/patches/0006-block-ingress.patch

   1 Index: mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/proxy/proxy_instance.cpp
   2 ===================================================================
   3 --- mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99.orig/mcproxy/src/proxy/proxy_instance.cpp
   4 +++ mcproxy-2017-08-24-93b5ace42268160ebbfff4c61818fb15fa2d9b99/mcproxy/src/proxy/proxy_instance.cpp
   5 @@ -171,6 +171,9 @@ void proxy_instance::worker_thread()
   6      HC_LOG_TRACE("");
   7      while (m_running) {
   8          auto msg = m_job_queue.dequeue();
   9 +
  10 +        HC_LOG_DEBUG("Proxy Message: " << msg->get_message_type_name(msg->get_type()) );
  11 +
  12          switch (msg->get_type()) {
  13          case proxy_msg::TEST_MSG:
  14              (*msg)();
  15 @@ -193,25 +196,66 @@ void proxy_instance::worker_thread()
  16          }
  17          break;
  18          case proxy_msg::GROUP_RECORD_MSG: {
  19 -            auto r =  std::static_pointer_cast<group_record_msg>(msg);
  20 +            auto gr = std::static_pointer_cast<group_record_msg>(msg);
  21
  22              if (m_in_debug_testing_mode) {
  23                  std::cout << "!!--ACTION: receive record" << std::endl;
  24 -                std::cout << *r << std::endl;
  25 +                std::cout << *gr << std::endl;
  26                  std::cout << std::endl;
  27              }
  28
  29 -            auto it = m_downstreams.find(r->get_if_index());
  30 +            auto slist = gr->get_slist();
  31 +            addr_storage saddr;
  32 +            if (slist.empty()) {
  33 +                saddr = "0.0.0.0";
  34 +            } else {
  35 +                saddr = slist.begin()->saddr;
  36 +            }
  37 +            auto it = m_downstreams.find(gr->get_if_index());
  38              if (it != std::end(m_downstreams)) {
  39 -                it->second.m_querier->receive_record(msg);
  40 +                // Check for input filters
  41 +                if (!it->second.m_interface->match_input_filter(interfaces::get_if_name(gr->get_if_index()), saddr, gr->get_gaddr()))
  42 +                {
  43 +                    HC_LOG_DEBUG("group report " << gr->get_gaddr() << " filtered");
  44 +                }
  45 +                else
  46 +                {
  47 +                    it->second.m_querier->receive_record(msg);
  48 +                }
  49              } else {
  50 -                HC_LOG_DEBUG("failed to find querier of interface: " << interfaces::get_if_name(std::static_pointer_cast<timer_msg>(msg)->get_if_index()));
  51 +                HC_LOG_DEBUG("failed to find querier of interface: " << interfaces::get_if_name( gr->get_if_index() ));
  52              }
  53 -        }
  54 +               }
  55 +        break;
  56 +        case proxy_msg::NEW_SOURCE_MSG: {
  57 +            auto sm = std::static_pointer_cast<new_source_msg>(msg);
  58 +            // Find the interface
  59 +            std::shared_ptr<interface> interf;
  60 +            auto it = m_downstreams.find(sm->get_if_index());
  61 +            if (it != std::end(m_downstreams)) {
  62 +                interf = it->second.m_interface;
  63 +            } else {
  64 +                for (auto & e : m_upstreams) {
  65 +                    if (e.m_if_index == sm->get_if_index()) {
  66 +                        interf = e.m_interface;
  67 +                        break;
  68 +                    }
  69 +                }
  70 +            }
  71 +            if ( !interf )
  72 +            {
  73 +                HC_LOG_DEBUG("failed to find interface: " << interfaces::get_if_name( sm->get_if_index() ) << " for Source message " << sm->get_saddr()  << " | " << sm->get_gaddr() );
  74 +                break;
  75 +            }
  76 +            // Check for input filters
  77 +            if (!interf->match_input_filter(interfaces::get_if_name(sm->get_if_index()), sm->get_saddr(), sm->get_gaddr()))
  78 +            {
  79 +                HC_LOG_DEBUG("source " << sm->get_saddr()  << " | " << sm->get_gaddr() << " filtered");
  80 +            } else {
  81 +                m_routing_management->event_new_source(msg);
  82 +            }
  83 +               }
  84          break;
  85 -        case proxy_msg::NEW_SOURCE_MSG:
  86 -            m_routing_management->event_new_source(msg);
  87 -            break;
  88          case proxy_msg::NEW_SOURCE_TIMER_MSG:
  89              m_routing_management->timer_triggerd_maintain_routing_table(msg);
  90              break;