mcproxy/patches/0006-block-ingress.patch

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