Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 3 additions & 1 deletion Torpedo/src/etri/sdn/controller/protocol/OFProtocol.java
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down