import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
/**
* Attempts to detect the presence of a specific packet sequence in the set of packets provided through multiple calls
*/
private final List<PcapPacket> mSequence;
+ private int mInclusionTimeMillis;
+
+ /**
+ * Relaxed matching
+ */
+ private int mDelta;
+ private Set<Integer> mPacketSet;
+
/**
* Create a {@code Layer2SequenceMatcher}.
* @param sequence The sequence to match against (search for).
+ * @param trainingRouterWlanMac The training router's WLAN MAC (used for determining the direction of packets).
+ * @param routerWlanMac The target trace router's WLAN MAC (used for determining the direction of packets).
*/
- public Layer2SequenceMatcher(List<PcapPacket> sequence) {
- super(sequence);
+ public Layer2SequenceMatcher(List<PcapPacket> sequence, int inclusionTimeMillis, String trainingRouterWlanMac,
+ String routerWlanMac, int delta, Set<Integer> packetSet) {
+ super(sequence, trainingRouterWlanMac, routerWlanMac);
mSequence = sequence;
// Compute packet directions for sequence.
for (int i = 0; i < sequence.size(); i++) {
mPacketDirections[i] = getPacketDirection(prevPkt, prevPktDirection, sequence.get(i));
}
}
+ mInclusionTimeMillis =
+ inclusionTimeMillis == 0 ? TriggerTrafficExtractor.INCLUSION_WINDOW_MILLIS : inclusionTimeMillis;
+ mDelta = delta;
+ mPacketSet = packetSet;
}
/**
// Get representative of the packet we expect to match next.
PcapPacket expected = mSequence.get(mMatchedPackets.size());
// First verify if the received packet has the length we're looking for.
- if (packet.getOriginalLength() == expected.getOriginalLength()) {
+ if ((mDelta > 0 && mPacketSet.contains(expected.getOriginalLength()) &&
+ expected.getOriginalLength() - mDelta <= packet.getOriginalLength() &&
+ packet.getOriginalLength() <= expected.getOriginalLength() + mDelta) ||
+ packet.getOriginalLength() == expected.getOriginalLength()) {
// If this is the first packet, we only need to verify that its length is correct. Time constraints are
// obviously satisfied as there are no previous packets. Furthermore, direction matches by definition as we
// don't know the MAC of the device (or phone) in advance, so we can't enforce a rule saying "first packet
if (!packet.getTimestamp().isAfter(mMatchedPackets.get(getMatchedPacketsCount()-1).getTimestamp())) {
return false;
}
+// if (packet.getTimestamp().isAfter(mMatchedPackets.get(0).getTimestamp().
+// plusMillis(TriggerTrafficExtractor.INCLUSION_WINDOW_MILLIS))) {
if (packet.getTimestamp().isAfter(mMatchedPackets.get(0).getTimestamp().
- plusMillis(TriggerTrafficExtractor.INCLUSION_WINDOW_MILLIS))) {
+ plusMillis(mInclusionTimeMillis))) {
return false;
}
// If we made it here, it means that this packet has the expected length, direction, and obeys the timing