Cleanup of layer 2 sequence detection: get rid of some experimental classes

[pingpong.git] / Code / Projects / SmartPlugDetector / src / main / java / edu / uci / iotproject / Conversation.java

diff --git a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java
index 73d165d00d3c036d67a43aebe2b5ec1b774ecfd0..490dc4f53264ee40f9b3e7c3d995d9482902cbd0 100644 (file)
--- a/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java
+++ b/Code/Projects/SmartPlugDetector/src/main/java/edu/uci/iotproject/Conversation.java
@@ -1,5 +1,6 @@
 package edu.uci.iotproject;
 
+import edu.uci.iotproject.analysis.TcpConversationUtils;
 import edu.uci.iotproject.util.PcapPacketUtils;
 import org.pcap4j.core.PcapPacket;
 import org.pcap4j.packet.IpV4Packet;
@@ -481,8 +482,9 @@ public class Conversation {
          *   inspect the first 4 bytes of each potential TLS packet to see if they match the SSL record header.
          *
          * 08/31/18: Added unconvetional TLS ports used by WeMo plugs and LiFX bulb.
+         * 09/20/18: Moved hardcoded ports to other class to allow other classes to query the set of TLS ports.
          */
-        return mServerPort == 443 || mServerPort == 8443 || mServerPort == 41143;
+        return TcpConversationUtils.isTlsPort(mServerPort);
     }
 
     /**