mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-24 22:01:02 +02:00
Code Issues Projects Releases Wiki Activity

Stop proxyarp from handling mcast packets and a configuration item to

Browse Source 
stop fwd from handling mcast packets.  FWD & ProxyArp checks the IPv4
mac address to determine if the packet is multicast.

Change-Id: Ibf1c207635badea2f3d2a824e8574f352bfbab16
This commit is contained in:
Rusty Eddy 2015-07-07 19:33:47 -07:00 committed by Gerrit Code Review
parent e3c951e940
commit 29acad6182
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
View File

@ -155,6 +155,9 @@ public class ReactiveForwarding {
"default is false") "default is false")
private boolean matchIcmpFields = false; private boolean matchIcmpFields = false;
@Property(name = "ignoreIPv4Multicast", boolValue = false,
label = "Ignore (do not forward) IPv4 multicast packets; default is false")
private boolean ignoreIpv4McastPackets = false;
@Activate @Activate
public void activate(ComponentContext context) { public void activate(ComponentContext context) {
@ -319,6 +322,14 @@ public class ReactiveForwarding {
log.info("Configured. Flow Priority is configured to {}", log.info("Configured. Flow Priority is configured to {}",
flowPriority); flowPriority);
} }
boolean ignoreIpv4McastPacketsEnabled =
isPropertyEnabled(properties, "ignoreIpv4McastPackets");
if (ignoreIpv4McastPackets != ignoreIpv4McastPacketsEnabled) {
ignoreIpv4McastPackets = ignoreIpv4McastPacketsEnabled;
log.info("Configured. Ignore IPv4 multicast packets is {}",
ignoreIpv4McastPackets ? "enabled" : "disabled");
}
} }
/** /**
@ -400,6 +411,13 @@ public class ReactiveForwarding {
return; return;
} }
// Do not process IPv4 multicast packets, let mfwd handle them
if (ignoreIpv4McastPackets && ethPkt.getEtherType() == Ethernet.TYPE_IPV4) {
if (id.mac().isMulticast()) {
return;
}
}
// Do we know who this is for? If not, flood and bail. // Do we know who this is for? If not, flood and bail.
Host dst = hostService.getHost(id); Host dst = hostService.getHost(id);
if (dst == null) { if (dst == null) {

8
apps/proxyarp/src/main/java/org/onosproject/proxyarp/ProxyArp.java
View File

@ -223,6 +223,14 @@ public class ProxyArp {
if (!ipv6NeighborDiscovery && (ethPkt.getEtherType() == TYPE_IPV6)) { if (!ipv6NeighborDiscovery && (ethPkt.getEtherType() == TYPE_IPV6)) {
return; return;
} }
// Do not ARP for multicast packets. Let mfwd handle them.
if (ethPkt.getEtherType() == Ethernet.TYPE_IPV4) {
if (ethPkt.getDestinationMAC().isMulticast()) {
return;
}
}
//handle the arp packet. //handle the arp packet.
proxyArpService.handlePacket(context); proxyArpService.handlePacket(context);
} }