1 files changed, 4 insertions, 0 deletions
diff --git a/pimd/pim_jp_agg.c b/pimd/pim_jp_agg.c
index 67ddf05d06..8d4510324c 100644
--- a/pimd/pim_jp_agg.c
+++ b/pimd/pim_jp_agg.c
@@ -249,6 +249,10 @@ pim_jp_agg_single_upstream_send (struct pim_rpf *rpf,
 
   static bool first = true;
 
+  /* skip JP upstream messages if source is directly connected */
+  if (pim_if_connected_to_source (rpf->source_nexthop.interface, up->sg.src))
+      return;
+
   if (first)
     {
       groups = list_new();