Adding more devices
[pingpong.git] / Code / Projects / SmartPlugDetector / src / main / java / edu / uci / iotproject / Main.java
index 4a05501aaa3a7f36a8d129bc784cf375f02e3454..c8d994d3628b2c54c115a305578f6d607b05af99 100644 (file)
@@ -1,11 +1,13 @@
 package edu.uci.iotproject;
 
-import edu.uci.iotproject.analysis.PcapPacketPair;
+import static edu.uci.iotproject.analysis.UserAction.Type;
+
 import edu.uci.iotproject.analysis.TcpConversationUtils;
+import edu.uci.iotproject.analysis.TrafficLabeler;
 import edu.uci.iotproject.analysis.TriggerTrafficExtractor;
+import edu.uci.iotproject.analysis.UserAction;
 import edu.uci.iotproject.io.TriggerTimesFileReader;
 import org.pcap4j.core.*;
-import org.pcap4j.packet.IpV4Packet;
 import org.pcap4j.packet.namednumber.DataLinkType;
 
 import java.io.EOFException;
@@ -29,203 +31,187 @@ public class Main {
 
     public static void main(String[] args) throws PcapNativeException, NotOpenException, EOFException, TimeoutException, UnknownHostException {
         // -------------------------------------------------------------------------------------------------------------
-        // Example/debug code for searching for a pattern at the MAC layer.
-//        String fileName = "./pcap/mac-tplink.local.pcapng";
-//        PcapHandle handle;
-//        try {
-//            handle = Pcaps.openOffline(fileName, PcapHandle.TimestampPrecision.NANO);
-//        } catch (PcapNativeException pne) {
-//            handle = Pcaps.openOffline(fileName);
-//        }
-//        Arrays.asList(1590, 1590, 1590, 1001, 337, 197, 636, 1311, 177) // Full pattern (all non-zero payload packets).
-//        MacLayerFlowPattern pattern = new MacLayerFlowPattern("TP_LINK_LOCAL_OFF_MAC", "50:c7:bf:33:1f:09", Arrays.asList(637, 1312));
-//        MacLayerFlowPatternFinder finder = new MacLayerFlowPatternFinder(handle, pattern);
-//        finder.findFlowPattern();
-        // -------------------------------------------------------------------------------------------------------------
-//
-//        //final String fileName = args.length > 0 ? args[0] : "/home/rtrimana/pcap_processing/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.dns.pcap";
-//        final String fileName = args.length > 0 ? args[0] : "/scratch/June-2018/TPLink/wlan1/tplink.wlan1.local.pcap";
-//        //final String fileName = args.length > 0 ? args[0] : "/scratch/June-2018/DLink/wlan1/dlink.wlan1.local.pcap";
-//        final String trainingFileName = "./pcap/TP_LINK_LOCAL_ON_SUBSET.pcap";
-////        final String trainingFileName = "./pcap/TP_LINK_LOCAL_ON.pcap";
-////
-////        // ====== Debug code ======
-//        PcapHandle handle;
-//        PcapHandle trainingPcap;
-//        try {
-//            handle = Pcaps.openOffline(fileName, PcapHandle.TimestampPrecision.NANO);
-//            trainingPcap = Pcaps.openOffline(trainingFileName, PcapHandle.TimestampPrecision.NANO);
-//        } catch (PcapNativeException pne) {
-//            handle = Pcaps.openOffline(fileName);
-//            trainingPcap = Pcaps.openOffline(trainingFileName);
-//        }
-////
-////        // TODO: The followings are the way to extract multiple hostnames and their associated packet lengths lists
-////        //List<String> list = new ArrayList<>();
-////        //list.add("events.tplinkra.com");
-////        //FlowPattern fp = new FlowPattern("TP_LINK_LOCAL_ON", list, trainingPcap);
-////        //List<String> list2 = new ArrayList<>();
-////        //list2.add("devs.tplinkcloud.com");
-////        //list2.add("events.tplinkra.com");
-////        //FlowPattern fp3 = new FlowPattern("TP_LINK_REMOTE_ON", list2, trainingPcap);
-////
-//        FlowPattern fp = new FlowPattern("TP_LINK_LOCAL_ON", "events.tplinkra.com", trainingPcap);
-//        //FlowPattern fp = new FlowPattern("DLINK_LOCAL_ON", "rfe-us-west-1.dch.dlink.com", trainingPcap);
-//        FlowPatternFinder fpf = new FlowPatternFinder(handle, fp);
-//        fpf.start();
-////
-////        // ========================
-
-        /*
-        PcapReader pcapReader = new PcapReader(args[0]);
-        PcapProcessingPipeline pipeline = new PcapProcessingPipeline(pcapReader);
-        TcpReassembler tcpReassembler = new TcpReassembler();
-        pipeline.addPcapPacketConsumer(tcpReassembler);
-        pipeline.executePipeline();
-        System.out.println("Pipeline terminated");
-
-        List<List<PcapPacketPair>> pairs = new ArrayList<>();
-        for (Conversation c : tcpReassembler.getTcpConversations()) {
-            pairs.add(TcpConversationUtils.extractPacketPairs(c));
-        }
-        */
-
-        /*
-        // -------- 07-17-2018 --------
-        // Only consider packets to/from the TP-Link plug.
-        PcapReader pcapReader = new PcapReader(args[0], "ip host 192.168.1.159");
-        TcpReassembler tcpReassembler = new TcpReassembler();
-        PcapPacket packet;
-        while((packet = pcapReader.readNextPacket()) != null) {
-            tcpReassembler.consumePacket(packet);
-        }
-        // Now we have a set of reassembled TCP conversations.
-        List<Conversation> conversations = tcpReassembler.getTcpConversations();
-        for(Conversation c : conversations) {
-            List<PcapPacketPair> pairs = TcpConversationUtils.extractPacketPairs(c);
-            for (PcapPacketPair pair : pairs) {
-                // TODO ...
-                // 1. discard packets that are not within X seconds after trigger time
-                // 2. conversations may be (are) with different servers - so need to plot in different plots, one per hostname?
-            }
-        }
-
-        // ----------------------------
-        */
+        // ------------ # Code for extracting traffic generated by a device within x seconds of a trigger # ------------
+        // Paths to input and output files (consider supplying these as arguments instead) and IP of the device for
+        // which traffic is to be extracted:
+        String path = "/scratch/July-2018"; // Rahmadi
+        //String path = "/Users/varmarken/temp/UCI IoT Project/experiments"; // Janus
+
+        // 1) D-Link July 26 experiment
+//        final String inputPcapFile = path + "/2018-07/dlink/dlink.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-07/dlink/dlink-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-07/dlink/dlink-july-26-2018.timestamps";
+//        final String deviceIp = "192.168.1.199"; // .246 == phone; .199 == dlink plug?
+
+        // 2) TP-Link July 25 experiment
+//        final String inputPcapFile = path + "/2018-07/tplink/tplink.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-07/tplink/tplink-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-07/tplink/tplink-july-25-2018.timestamps";
+//        final String deviceIp = "192.168.1.159";
+
+        // 3) SmartThings Plug July 25 experiment
+//        final String inputPcapFile = path + "/2018-07/stplug/stplug.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-07/stplug/stplug-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-07/stplug/smartthings-july-25-2018.timestamps";
+//        final String deviceIp = "192.168.1.246"; // .246 == phone; .142 == SmartThings Hub (note: use eth0 capture for this!)
+
+        // 4) Wemo July 30 experiment
+//        final String inputPcapFile = path + "/2018-07/wemo/wemo.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-07/wemo/wemo-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-07/wemo/wemo-july-30-2018.timestamps";
+//        final String deviceIp = "192.168.1.145";
+
+        // 5) Wemo Insight July 31 experiment
+//        final String inputPcapFile = path + "/2018-07/wemoinsight/wemoinsight.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-07/wemoinsight/wemoinsight-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-07/wemoinsight/wemo-insight-july-31-2018.timestamps";
+//        final String deviceIp = "192.168.1.135";
+
+        // 6) TP-Link Bulb August 1 experiment
+//        final String inputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/tplink-bulb/tplinkbulb-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/tplink-bulb/tplink-bulb-aug-3-2018.timestamps";
+//        final String deviceIp = "192.168.1.140";
+
+        // 7) Kwikset Doorlock August 6 experiment
+//        final String inputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/kwikset-doorlock/kwikset-doorlock-aug-6-2018.timestamps";
+//        final String deviceIp = "192.168.1.246"; // .246 == phone; .142 == SmartThings Hub (note: use eth0 capture for this!)
+
+        // 8) Hue Bulb August 7 experiment
+//        final String inputPcapFile = path + "/2018-08/hue-bulb/hue-bulb.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/hue-bulb/hue-bulb-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/hue-bulb/hue-bulb-aug-7-2018.timestamps";
+//        final String deviceIp = "192.168.1.246";
+
+        // 9) Lifx Bulb August 8 experiment
+//        final String inputPcapFile = path + "/2018-08/lifx-bulb/lifx-bulb.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/lifx-bulb/lifx-bulb-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/lifx-bulb/lifx-bulb-aug-8-2018.timestamps";
+//        final String deviceIp = "192.168.1.246"; // .246 == phone; .231 == Lifx
+
+        // 10) Amcrest Camera August 9 experiment
+//        final String inputPcapFile = path + "/2018-08/amcrest-camera/amcrest-camera.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/amcrest-camera/amcrest-camera-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/amcrest-camera/amcrest-camera-aug-9-2018.timestamps";
+//        final String deviceIp = "192.168.1.246"; // .246 == phone; .235 == camera
+
+        // 11) Arlo Camera August 10 experiment
+//        final String inputPcapFile = path + "/2018-08/arlo-camera/arlo-camera.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/arlo-camera/arlo-camera-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/arlo-camera/arlo-camera-aug-10-2018.timestamps";
+//        final String deviceIp = "192.168.1.140"; // .246 == phone; .140 == camera
+
+        // 12) Blossom sprinkler August 13 experiment
+//        final String inputPcapFile = path + "/2018-08/blossom/blossom.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/blossom/blossom-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/blossom/blossom-aug-13-2018.timestamps";
+//        final String deviceIp = "192.168.1.229"; // .246 == phone; .229 == sprinkler
+
+        // 13) DLink siren August 14 experiment
+//        final String inputPcapFile = path + "/2018-08/dlink-siren/dlink-siren.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/dlink-siren/dlink-siren-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/dlink-siren/dlink-siren-aug-14-2018.timestamps";
+//        final String deviceIp = "192.168.1.183"; // .246 == phone; .183 == siren
+
+        // 14) Nest thermostat August 15 experiment
+//        final String inputPcapFile = path + "/2018-08/nest/nest.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/nest/nest-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/nest/nest-aug-15-2018.timestamps";
+//        final String deviceIp = "192.168.1.246"; // .246 == phone; .127 == Nest thermostat
+
+        // 15) Alexa August 16 experiment
+//        final String inputPcapFile = path + "/2018-08/alexa/alexa.wlan1.local.pcap";
+//        final String outputPcapFile = path + "/2018-08/alexa/alexa-processed.pcap";
+//        final String triggerTimesFile = path + "/2018-08/alexa/alexa-aug-16-2018.timestamps";
+//        final String deviceIp = "192.168.1.225"; // .246 == phone; .225 == Alexa
+        // August 17
+        final String inputPcapFile = path + "/2018-08/alexa/alexa2.wlan1.local.pcap";
+        final String outputPcapFile = path + "/2018-08/alexa/alexa2-processed.pcap";
+        final String triggerTimesFile = path + "/2018-08/alexa/alexa-aug-17-2018.timestamps";
+        final String deviceIp = "192.168.1.225"; // .246 == phone; .225 == Alexa
 
-        // -------- 07-19-2018 --------
         TriggerTimesFileReader ttfr = new TriggerTimesFileReader();
-//        List<Instant> triggerTimes = ttfr.readTriggerTimes("/Users/varmarken/Downloads/tplink-feb-13-2018.timestamps", false);
-        List<Instant> triggerTimes = ttfr.readTriggerTimes("/Users/varmarken/temp/UCI IoT Project/June2018 experiments/tplink/tplink-june-14-2018-timestamps.txt", false);
-//        String pcapFile = "/Users/varmarken/Development/Repositories/UCI/NetworkingGroup/smart_home_traffic/Code/Projects/SmartPlugDetector/pcap/wlan1.local.dns.pcap";
-        String pcapFile = "/Users/varmarken/temp/UCI IoT Project/June2018 experiments/tplink/tplink.wlan1.local.pcap";
-        String tpLinkPlugIp = "192.168.1.159";
-        TriggerTrafficExtractor tte = new TriggerTrafficExtractor(pcapFile, triggerTimes, tpLinkPlugIp);
-//        final PcapDumper outputter = Pcaps.openDead(DataLinkType.EN10MB, 65536).dumpOpen("/Users/varmarken/temp/traces/output/tplink-filtered.pcap");
-        final PcapDumper outputter = Pcaps.openDead(DataLinkType.EN10MB, 65536).dumpOpen("/Users/varmarken/temp/UCI IoT Project/June2018 experiments/tplink/tplink-filtered.pcap");
+        List<Instant> triggerTimes = ttfr.readTriggerTimes(triggerTimesFile, false);
+        // Tag each trigger with "ON" or "OFF", assuming that the first trigger is an "ON" and that they alternate.
+        List<UserAction> userActions = new ArrayList<>();
+        for (int i = 0; i < triggerTimes.size(); i++) {
+            userActions.add(new UserAction(i % 2 == 0 ? Type.TOGGLE_ON : Type.TOGGLE_OFF, triggerTimes.get(i)));
+        }
+        TriggerTrafficExtractor tte = new TriggerTrafficExtractor(inputPcapFile, triggerTimes, deviceIp);
+        final PcapDumper outputter = Pcaps.openDead(DataLinkType.EN10MB, 65536).dumpOpen(outputPcapFile);
         DnsMap dnsMap = new DnsMap();
         TcpReassembler tcpReassembler = new TcpReassembler();
+        TrafficLabeler trafficLabeler = new TrafficLabeler(userActions);
         tte.performExtraction(pkt -> {
             try {
                 outputter.dump(pkt);
             } catch (NotOpenException e) {
                 e.printStackTrace();
             }
-        }, dnsMap, tcpReassembler);
+        }, dnsMap, tcpReassembler, trafficLabeler);
         outputter.flush();
         outputter.close();
 
-        /*
-        int packets = 0;
-        for (Conversation c : tcpReassembler.getTcpConversations()) {
-            packets += c.getPackets().size();
-            packets += c.getSynPackets().size();
-            // only count the FIN packets, not the ACKs; every FinAckPair holds a FIN packet
-            packets += c.getFinAckPairs().size();
-        }
-        // Produces 271 packets for the Feb 13 experiment
-        // Applying filter: "(tcp and not tcp.len == 0 and not tcp.analysis.retransmission and not tcp.analysis.fast_retransmission)  or (tcp.flags.syn == 1) or (tcp.flags.fin == 1)"
-        // to the file gives 295 packets, but there are 24 TCP-Out-Of-Order SYN/SYNACKs which are filtered as retransmissions in Conversation, so the numbers seem to match.
-        System.out.println("number of packets: " + packets);
-        */
-
-        List<List<PcapPacketPair>> pairs = new ArrayList<>();
-        for (Conversation c : tcpReassembler.getTcpConversations()) {
-            pairs.add(TcpConversationUtils.extractPacketPairs(c));
+        if (tte.getPacketsIncludedCount() != trafficLabeler.getTotalPacketCount()) {
+            // Sanity/debug check
+            throw new AssertionError(String.format("mismatch between packet count in %s and %s",
+                    TriggerTrafficExtractor.class.getSimpleName(), TrafficLabeler.class.getSimpleName()));
         }
-        /*
-        // Sort pairs according to timestamp of first packet of conversation for (debugging) convenience.
-        Collections.sort(pairs, (l1, l2) -> {
-            if (l1.get(0).getFirst().getTimestamp().isBefore(l2.get(0).getFirst().getTimestamp())) return -1;
-            else if (l2.get(0).getFirst().getTimestamp().isBefore(l1.get(0).getFirst().getTimestamp())) return 1;
-            else return 0;
+
+        // Extract all conversations present in the filtered trace.
+        List<Conversation> allConversations = tcpReassembler.getTcpConversations();
+        // Group conversations by hostname.
+        Map<String, List<Conversation>> convsByHostname = TcpConversationUtils.groupConversationsByHostname(allConversations, dnsMap);
+        System.out.println("Grouped conversations by hostname.");
+        // For each hostname, count the frequencies of packet lengths exchanged with that hostname.
+        final Map<String, Map<Integer, Integer>> pktLenFreqsByHostname = new HashMap<>();
+        convsByHostname.forEach((host, convs) -> pktLenFreqsByHostname.put(host, TcpConversationUtils.countPacketLengthFrequencies(convs)));
+        System.out.println("Counted frequencies of packet lengths exchanged with each hostname.");
+        // For each hostname, count the frequencies of packet sequences (i.e., count how many conversations exchange a
+        // sequence of packets of some specific lengths).
+        final Map<String, Map<String, Integer>> pktSeqFreqsByHostname = new HashMap<>();
+        convsByHostname.forEach((host, convs) -> pktSeqFreqsByHostname.put(host, TcpConversationUtils.countPacketSequenceFrequencies(convs)));
+        System.out.println("Counted frequencies of packet sequences exchanged with each hostname.");
+        // For each hostname, count frequencies of packet pairs exchanged with that hostname across all conversations
+        final Map<String, Map<String, Integer>> pktPairFreqsByHostname =
+                TcpConversationUtils.countPacketPairFrequenciesByHostname(allConversations, dnsMap);
+        System.out.println("Counted frequencies of packet pairs per hostname");
+        // For each user action, reassemble the set of TCP connections occurring shortly after
+        final Map<UserAction, List<Conversation>> userActionToConversations = trafficLabeler.getLabeledReassembledTcpTraffic();
+        final Map<UserAction, Map<String, List<Conversation>>> userActionsToConvsByHostname = trafficLabeler.getLabeledReassembledTcpTraffic(dnsMap);
+        System.out.println("Reassembled TCP conversations occurring shortly after each user event");
+
+
+
+        // Contains all ON events: hostname -> sequence identifier -> list of conversations with that sequence
+        Map<String, Map<String, List<Conversation>>> ons = new HashMap<>();
+        // Contains all OFF events: hostname -> sequence identifier -> list of conversations with that sequence
+        Map<String, Map<String, List<Conversation>>> offs = new HashMap<>();
+        userActionsToConvsByHostname.forEach((ua, hostnameToConvs) -> {
+            Map<String, Map<String, List<Conversation>>> outer = ua.getType() == Type.TOGGLE_ON ? ons : offs;
+            hostnameToConvs.forEach((host, convs) -> {
+                Map<String, List<Conversation>> seqsToConvs = TcpConversationUtils.
+                        groupConversationsByPacketSequence(convs);
+                outer.merge(host, seqsToConvs, (oldMap, newMap) -> {
+                    newMap.forEach((sequence, cs) -> oldMap.merge(sequence, cs, (list1, list2) -> {
+                        list1.addAll(list2);
+                        return list1;
+                    }));
+                    return oldMap;
+                });
+            });
         });
-        */
-        System.out.println("list of pairs produced");
-        List<PcapPacketPair> eventstplinkraPairs = new ArrayList<>();
-        List<List<PcapPacketPair>> otherPairs = new ArrayList<>();
-        String hostname = "events.tplinkra.com";
-        int emptyLists = 0;
-        for (List<PcapPacketPair> lppp : pairs) {
-            if (lppp.size() < 1) {
-                emptyLists++;
-                continue;
-            }
-            IpV4Packet ipPacket = lppp.get(0).getFirst().get(IpV4Packet.class);
-            // If packets are associated with the hostname
-            if (dnsMap.isRelatedToCloudServer(ipPacket.getHeader().getSrcAddr().getHostAddress(), hostname) ||
-                    dnsMap.isRelatedToCloudServer(ipPacket.getHeader().getDstAddr().getHostAddress(), hostname)) {
-                eventstplinkraPairs.addAll(lppp);
-            } else {
-                // Pairs associated with different server
-                otherPairs.add(lppp);
-            }
-        }
-        System.out.println("number of empty list of packet pairs: " + emptyLists);
-        HashMap<String, Integer> pairCount = new HashMap<>();
-        for (PcapPacketPair ppp : eventstplinkraPairs) {
-            if (pairCount.containsKey(ppp.toString())) {
-                pairCount.put(ppp.toString(), pairCount.get(ppp.toString()) + 1);
-            } else {
-                pairCount.put(ppp.toString(), 1);
-            }
-        }
-        System.out.println("pairCount map built");
-
-        // Build map containing frequencies of packet lengths exchanged with events.tplinkra.com as well as a map with
-        // the frequencies of specific sequences of packet lengths for the same hostname
-        HashMap<Integer, Integer> eventstplinkraPacketLengthFreqMap = new HashMap<>();
-        HashMap<String, Integer> eventstplinkraPacketSequenceFreqMap = new HashMap<>();
-        for (Conversation c : tcpReassembler.getTcpConversations()) {
-            if (c.getPackets().size() == 0) {
-                continue;
-            }
-            PcapPacket firstPacket = c.getPackets().get(0);
-            IpV4Packet firstPacketIp = firstPacket.get(IpV4Packet.class);
-            if (!dnsMap.isRelatedToCloudServer(firstPacketIp.getHeader().getSrcAddr().getHostAddress(), hostname) &&
-                    !dnsMap.isRelatedToCloudServer(firstPacketIp.getHeader().getDstAddr().getHostAddress(), hostname)) {
-                continue;
-            }
-            // Update the packet length freq map
-            for (PcapPacket pp : c.getPackets()) {
-                eventstplinkraPacketLengthFreqMap.merge(pp.length(), 1, (i1, i2) -> i1 + i2);
-            }
-            // Update the packet sequence freq map
-            StringBuilder sb = new StringBuilder();
-            for (PcapPacket pp : c.getPackets()) {
-                sb.append(pp.length() + " ");
-            }
-            eventstplinkraPacketSequenceFreqMap.merge(sb.toString(), 1, (i1, i2) -> i1+i2);
-        }
-        System.out.println("packet length frequency map created");
 
-        Map<String, List<Conversation>> hostnameConversationMap =
-                TcpConversationUtils.groupConversationsByHostname(tcpReassembler.getTcpConversations(), dnsMap);
-        System.out.println("hostnameConversationMap created");
-        // ----------------------------
+        System.out.println("");
+
+        // -------------------------------------------------------------------------------------------------------------
+        // -------------------------------------------------------------------------------------------------------------
     }
 
 }
 
 
-// TP-Link MAC 50:c7:bf:33:1f:09 and usually IP 192.168.1.159 (remember to verify per file)
\ No newline at end of file
+// TP-Link MAC 50:c7:bf:33:1f:09 and usually IP 192.168.1.159 (remember to verify per file)
+// frame.len >= 556 && frame.len <= 558 && ip.addr == 192.168.1.159
\ No newline at end of file