diff --git a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
index eccc4f3bca98ab5a0dd3d05242517b15b9824abc..f347ef87d18ccb33d017d7e46785fa2f9ae926d8 100644
--- a/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
+++ b/src/main/java/net/floodlightcontroller/forwarding/Forwarding.java
@@ -287,45 +287,60 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
MacAddress srcMac = eth.getSourceMACAddress();
MacAddress dstMac = eth.getDestinationMACAddress();
- // A retentive builder will remember all MatchFields of the parent the builder was generated from
- // With a normal builder, all parent MatchFields will be lost if any MatchFields are added, mod, del
- // TODO (This is a bug in Loxigen and the retentive builder is a workaround.)
Match.Builder mb = sw.getOFFactory().buildMatch();
- mb.setExact(MatchField.IN_PORT, inPort)
- .setExact(MatchField.ETH_SRC, srcMac)
- .setExact(MatchField.ETH_DST, dstMac);
+ mb.setExact(MatchField.IN_PORT, inPort);
- if (!vlan.equals(VlanVid.ZERO)) {
- mb.setExact(MatchField.VLAN_VID, OFVlanVidMatch.ofVlanVid(vlan));
+ if (FLOWMOD_DEFAULT_MATCH_MAC) {
+ mb.setExact(MatchField.ETH_SRC, srcMac)
+ .setExact(MatchField.ETH_DST, dstMac);
+ }
+
+ if (FLOWMOD_DEFAULT_MATCH_VLAN) {
+ if (!vlan.equals(VlanVid.ZERO)) {
+ mb.setExact(MatchField.VLAN_VID, OFVlanVidMatch.ofVlanVid(vlan));
+ }
}
// TODO Detect switch type and match to create hardware-implemented flow
- // TODO Set option in config file to support specific or MAC-only matches
+ // TODO Allow for IPv6 matches
if (eth.getEtherType() == EthType.IPv4) { /* shallow check for equality is okay for EthType */
IPv4 ip = (IPv4) eth.getPayload();
IPv4Address srcIp = ip.getSourceAddress();
IPv4Address dstIp = ip.getDestinationAddress();
- mb.setExact(MatchField.IPV4_SRC, srcIp)
- .setExact(MatchField.IPV4_DST, dstIp)
- .setExact(MatchField.ETH_TYPE, EthType.IPv4);
-
- if (ip.getProtocol().equals(IpProtocol.TCP)) {
- TCP tcp = (TCP) ip.getPayload();
- mb.setExact(MatchField.IP_PROTO, IpProtocol.TCP)
- .setExact(MatchField.TCP_SRC, tcp.getSourcePort())
- .setExact(MatchField.TCP_DST, tcp.getDestinationPort());
- } else if (ip.getProtocol().equals(IpProtocol.UDP)) {
- UDP udp = (UDP) ip.getPayload();
- mb.setExact(MatchField.IP_PROTO, IpProtocol.UDP)
- .setExact(MatchField.UDP_SRC, udp.getSourcePort())
- .setExact(MatchField.UDP_DST, udp.getDestinationPort());
- }
+
+ if (FLOWMOD_DEFAULT_MATCH_IP_ADDR) {
+ mb.setExact(MatchField.ETH_TYPE, EthType.IPv4)
+ .setExact(MatchField.IPV4_SRC, srcIp)
+ .setExact(MatchField.IPV4_DST, dstIp);
+ }
+
+ if (FLOWMOD_DEFAULT_MATCH_TRANSPORT) {
+ /*
+ * Take care of the ethertype if not included earlier,
+ * since it's a prerequisite for transport ports.
+ */
+ if (!FLOWMOD_DEFAULT_MATCH_IP_ADDR) {
+ mb.setExact(MatchField.ETH_TYPE, EthType.IPv4);
+ }
+
+ if (ip.getProtocol().equals(IpProtocol.TCP)) {
+ TCP tcp = (TCP) ip.getPayload();
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.TCP)
+ .setExact(MatchField.TCP_SRC, tcp.getSourcePort())
+ .setExact(MatchField.TCP_DST, tcp.getDestinationPort());
+ } else if (ip.getProtocol().equals(IpProtocol.UDP)) {
+ UDP udp = (UDP) ip.getPayload();
+ mb.setExact(MatchField.IP_PROTO, IpProtocol.UDP)
+ .setExact(MatchField.UDP_SRC, udp.getSourcePort())
+ .setExact(MatchField.UDP_DST, udp.getDestinationPort());
+ }
+ }
} else if (eth.getEtherType() == EthType.ARP) { /* shallow check for equality is okay for EthType */
mb.setExact(MatchField.ETH_TYPE, EthType.ARP);
}
return mb.build();
}
-
+
/**
* Creates a OFPacketOut with the OFPacketIn data that is flooded on all ports unless
* the port is blocked, in which case the packet will be dropped.
@@ -455,6 +470,24 @@ public class Forwarding extends ForwardingBase implements IFloodlightModule {
} else {
log.info("Default priority not configured. Using {}.", FLOWMOD_DEFAULT_PRIORITY);
}
+ tmp = configParameters.get("match");
+ if (tmp != null) {
+ tmp = tmp.toLowerCase();
+ if (!tmp.contains("vlan") && !tmp.contains("mac") && !tmp.contains("ip") && !tmp.contains("port")) {
+ /* leave the default configuration -- blank or invalid 'match' value */
+ } else {
+ FLOWMOD_DEFAULT_MATCH_VLAN = tmp.contains("vlan") ? true : false;
+ FLOWMOD_DEFAULT_MATCH_MAC = tmp.contains("mac") ? true : false;
+ FLOWMOD_DEFAULT_MATCH_IP_ADDR = tmp.contains("ip") ? true : false;
+ FLOWMOD_DEFAULT_MATCH_TRANSPORT = tmp.contains("port") ? true : false;
+
+ }
+ }
+ log.info("Default flow matches set to: VLAN=" + FLOWMOD_DEFAULT_MATCH_VLAN
+ + ", MAC=" + FLOWMOD_DEFAULT_MATCH_MAC
+ + ", IP=" + FLOWMOD_DEFAULT_MATCH_IP_ADDR
+ + ", TPPT=" + FLOWMOD_DEFAULT_MATCH_TRANSPORT);
+
}
@Override
diff --git a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
index 8088f01f6a27dad354bb7cab101ed96feda9cc25..015b83a01c27b76ca7f0e3c9baead2fa71faf05c 100644
--- a/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
+++ b/src/main/java/net/floodlightcontroller/routing/ForwardingBase.java
@@ -83,6 +83,11 @@ public abstract class ForwardingBase implements IOFMessageListener {
public static int FLOWMOD_DEFAULT_IDLE_TIMEOUT = 5; // in seconds
public static int FLOWMOD_DEFAULT_HARD_TIMEOUT = 0; // infinite
public static int FLOWMOD_DEFAULT_PRIORITY = 1; // 0 is the default table-miss flow in OF1.3+, so we need to use 1
+
+ public static boolean FLOWMOD_DEFAULT_MATCH_VLAN = true;
+ public static boolean FLOWMOD_DEFAULT_MATCH_MAC = true;
+ public static boolean FLOWMOD_DEFAULT_MATCH_IP_ADDR = true;
+ public static boolean FLOWMOD_DEFAULT_MATCH_TRANSPORT = true;
public static final short FLOWMOD_DEFAULT_IDLE_TIMEOUT_CONSTANT = 5;
public static final short FLOWMOD_DEFAULT_HARD_TIMEOUT_CONSTANT = 0;
diff --git a/src/main/resources/floodlightdefault.properties b/src/main/resources/floodlightdefault.properties
index ea42cff47f97d73a666306340ee4fd296bae80e0..f66186bf5da412c62127b82eaa2466a04e40884f 100644
--- a/src/main/resources/floodlightdefault.properties
+++ b/src/main/resources/floodlightdefault.properties
@@ -19,8 +19,10 @@ org.sdnplatform.sync.internal.SyncManager.authScheme=CHALLENGE_RESPONSE
org.sdnplatform.sync.internal.SyncManager.keyStorePath=/etc/floodlight/auth_credentials.jceks
org.sdnplatform.sync.internal.SyncManager.dbPath=/var/lib/floodlight/
org.sdnplatform.sync.internal.SyncManager.port=6642
+net.floodlightcontroller.forwarding.Forwarding.match=vlan, mac, ip, transport
net.floodlightcontroller.core.internal.FloodlightProvider.openflowPort=6653
net.floodlightcontroller.core.internal.FloodlightProvider.role=ACTIVE
+net.floodlightcontroller.core.internal.OFSwitchManager.addDefaultSendToControllerFlowInTables='{"all":"0,1,2"}'
net.floodlightcontroller.core.internal.OFSwitchManager.clearTablesOnInitialHandshakeAsMaster=YES
net.floodlightcontroller.core.internal.OFSwitchManager.clearTablesOnEachTransitionToMaster=YES
net.floodlightcontroller.core.internal.OFSwitchManager.keyStorePath=/path/to/your/keystore-file.jks