@@ -140,10 +140,6 @@ void IntfsOrch::doTask(Consumer &consumer)
140140
141141 /* Creating intfRoutes associated to this interface being added */
142142 createIntfRoutes (IntfRouteEntry (ip_prefix, alias), port);
143- if (port.m_type == Port::VLAN && ip_prefix.isV4 ())
144- {
145- addDirectedBroadcast (port, ip_prefix.getBroadcastIp ());
146- }
147143
148144 m_syncdIntfses[alias].ip_addresses .insert (ip_prefix);
149145 it = consumer.m_toSync .erase (it);
@@ -179,11 +175,7 @@ void IntfsOrch::doTask(Consumer &consumer)
179175 {
180176 if (iter->second .ip_addresses .count (ip_prefix))
181177 {
182- if (port.m_type == Port::VLAN && ip_prefix.isV4 ())
183- {
184- removeDirectedBroadcast (port, ip_prefix.getBroadcastIp ());
185- }
186- iter->second .ip_addresses .erase (ip_prefix);
178+ iter->second .ip_addresses .erase (ip_prefix);
187179 }
188180
189181 /* Remove router interface if there's no ip-address left. */
@@ -566,6 +558,24 @@ void IntfsOrch::createIntfRoutes(const IntfRouteEntry &ifRoute,
566558 }
567559 }
568560 }
561+
562+ /*
563+ * A directed-broadcast route is expected in vlan-ipv4 scenarios. Proceed to
564+ * push the route down if no overlap is detected.
565+ */
566+ if (port.m_type == Port::VLAN && ifRoute.prefix .isV4 ())
567+ {
568+ IntfRouteEntry ifBcastRoute (getBcastPrefix (ifRoute.prefix ),
569+ ifRoute.ifName ,
570+ " bcast"
571+
572+ bool bcastOverlap = trackIntfRouteOverlap (ifBcastRoute);
573+
574+ if (!bcastOverlap)
575+ {
576+ addDirectedBroadcast (port, ifBcastRoute.prefix .getIp ());
577+ }
578+ }
569579}
570580
571581/*
@@ -656,6 +666,16 @@ void IntfsOrch::deleteIntfRoutes(const IntfRouteEntry &ifRoute,
656666 deleteIntfRoute (ifSubnetRoute, port);
657667 }
658668 deleteIntfRoute (ifIp2meRoute, port);
669+
670+ /* Also remove the directed-bcast route if applicable. */
671+ if (port.m_type == Port::VLAN && ifRoute.prefix .isV4 ())
672+ {
673+ IntfRouteEntry ifBcastRoute (getBcastPrefix (ifRoute.prefix ),
674+ ifRoute.ifName ,
675+ " bcast"
676+
677+ deleteIntfRoute (ifBcastRoute, port);
678+ }
659679}
660680
661681void IntfsOrch::deleteIntfRoute (const IntfRouteEntry &ifRoute, const Port &port)
@@ -706,6 +726,10 @@ void IntfsOrch::deleteIntfRoute(const IntfRouteEntry &ifRoute, const Port &port)
706726 {
707727 removeIp2MeRoute (ifRoute.prefix );
708728 }
729+ else if (it->type == " bcast"
730+ {
731+ removeDirectedBroadcast (port, ifRoute.prefix .getIp ());
732+ }
709733
710734 /*
711735 * Notice that the resurrection-order is vital here. We must
@@ -774,10 +798,15 @@ void IntfsOrch::resurrectIntfRoute(const IntfRouteEntry &ifRoute)
774798 {
775799 addIp2MeRoute (ifRoute.prefix );
776800 }
801+ else if (ifRoute.type == " bcast"
802+ {
803+ addDirectedBroadcast (port, ifRoute.prefix .getIp ());
804+ }
777805}
778806
779807/*
780- * Perhaps to be moved to a more appropriate location (e.g. IpPrefix class).
808+ * Helper functions. Perhaps to be moved to a more appropriate location (e.g.
809+ * IpPrefix class).
781810 */
782811IpPrefix IntfsOrch::getIp2mePrefix (const IpPrefix &ip_prefix)
783812{
@@ -787,3 +816,12 @@ IpPrefix IntfsOrch::getIp2mePrefix(const IpPrefix &ip_prefix)
787816
788817 return (IpPrefix (newRoutePrefixStr));
789818}
819+
820+ IpPrefix IntfsOrch::getBcastPrefix (const IpPrefix &ip_prefix)
821+ {
822+ string newRoutePrefixStr = ip_prefix.isV4 () ?
823+ ip_prefix.getBroadcastIp ().to_string () + " /32"
824+ ip_prefix.getBroadcastIp ().to_string () + " /128"
825+
826+ return (IpPrefix (newRoutePrefixStr));
827+ }
0 commit comments