From c60db815ffc1dc1da43d3485f189eae7a5920014 Mon Sep 17 00:00:00 2001 From: justin-labry Date: Sat, 6 Jun 2015 22:04:49 +0900 Subject: [PATCH] idle time l2switch and fowarding to 25 seconds and wildcarded IP tos field --- .../etri/sdn/controller/module/forwarding/ForwardingBase.java | 2 +- .../sdn/controller/module/learningmac/OFMLearningMac.java | 2 +- Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Torpedo/src/etri/sdn/controller/module/forwarding/ForwardingBase.java b/Torpedo/src/etri/sdn/controller/module/forwarding/ForwardingBase.java index 8d5e3949..5b5d3b00 100644 --- a/Torpedo/src/etri/sdn/controller/module/forwarding/ForwardingBase.java +++ b/Torpedo/src/etri/sdn/controller/module/forwarding/ForwardingBase.java @@ -87,7 +87,7 @@ public abstract class ForwardingBase extends OFModule implements IDeviceListener protected static int OFMESSAGE_DAMPER_CAPACITY = 50000; // TODO: find sweet spot protected static int OFMESSAGE_DAMPER_TIMEOUT = 250; // ms - public static short FLOWMOD_DEFAULT_IDLE_TIMEOUT = 30; // in seconds + public static short FLOWMOD_DEFAULT_IDLE_TIMEOUT = 25; // in seconds public static short FLOWMOD_DEFAULT_HARD_TIMEOUT = 0; // infinite public static short FLOWMOD_DEFAULT_PRIORITY = 10; diff --git a/Torpedo/src/etri/sdn/controller/module/learningmac/OFMLearningMac.java b/Torpedo/src/etri/sdn/controller/module/learningmac/OFMLearningMac.java index 2d99c6bb..17988d99 100644 --- a/Torpedo/src/etri/sdn/controller/module/learningmac/OFMLearningMac.java +++ b/Torpedo/src/etri/sdn/controller/module/learningmac/OFMLearningMac.java @@ -69,7 +69,7 @@ public final class OFMLearningMac extends OFModule { private static final int APP_ID_SHIFT = (64 - APP_ID_BITS); private static final long LEARNING_SWITCH_COOKIE = (long) (LEARNING_SWITCH_APP_ID & ((1 << APP_ID_BITS) - 1)) << APP_ID_SHIFT; - private static final short IDLE_TIMEOUT_DEFAULT = 30; + private static final short IDLE_TIMEOUT_DEFAULT = 25; private static final short HARD_TIMEOUT_DEFAULT = 0; private static final short PRIORITY_DEFAULT = 100; // normally, setup reverse flow as well. diff --git a/Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java b/Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java index 5d79a14f..1fdd0a09 100644 --- a/Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java +++ b/Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java @@ -767,7 +767,9 @@ public Match loadOFMatchFromPacket(IOFSwitch sw, OFPacketIn packetIn, OFPort inp // nw tos (dscp & ecn) scratch = packetDataBB.get(); - ret.setExact(MatchField.IP_DSCP, IpDscp.of((byte)((0b11111100 & scratch) >> 2))); +// ret.setExact(MatchField.IP_DSCP, IpDscp.of((byte)((0b11111100 & scratch) >> 2))); + ret.wildcard(MatchField.IP_DSCP); + try { ret.setExact(MatchField.IP_ECN, IpEcn.of((byte)(0b00000011 & scratch))); } catch (UnsupportedOperationException u) {