TODO: add debugging infos to understand the results :s

Author: teto

README.md

@@ -170,7 +170,8 @@ See the [doc](http://mptcpanalyzer.readthedocs.io/en/latest/contributing.html).
 1. Why packets ids don't match the frame.number from my pcap ?
 mptcpanalyzer
 
-
+2. iperf3 reminder:
+Normally, the test data is sent from the client to the server, and measures the upload speed of the client.
 
 
 

mptcpanalyzer/cli.py

@@ -671,18 +671,21 @@ def do_summary_extended(self, args, unknown):
         df_pcap1 = load_into_pandas(args.pcap1, self.tshark_config)
 
         # to abstract things a bit
-        # destinations = [ ConnectionRoles.Server ];
-        destinations = args.pcap_destinations
+        # TODO revert
+        destinations = [ ConnectionRoles.Server ];
+        print("test %r" % type(destinations[0]))
+        # destinations = args.pcap_destinations
         # or list(mp.ConnectionRoles)
 
         print("NANI ? %r" % destinations )
         for destination in destinations:
-            basic_stats = mptcp_compute_throughput(
-                # TODO here we should load the pcap before hand !
-                df_pcap1,
-                args.pcap1stream,
-                destination,
-            )
+            # will create problems
+            # basic_stats = mptcp_compute_throughput(
+            #     # TODO here we should load the pcap before hand !
+            #     df_pcap1,
+            #     args.pcap1stream,
+            #     destination,
+            # )
 
             # TODO already be done BUT NOT THE CASE FOR GOD's SAKE !
             # TODO we should have the parser do it
@@ -695,6 +698,14 @@ def do_summary_extended(self, args, unknown):
                 self.tshark_config
             )
 
+            debug_dataframe(df, "checking just after merge", ) # usecols=["tcpdest", "mptcpdest"])
+            basic_stats = mptcp_compute_throughput(
+                # TODO here we should load the pcap before hand !
+                df,
+                args.pcap1stream,
+                destination,
+            )
+
             # also here the dest are wrong
 
 
@@ -719,7 +730,7 @@ def do_summary_extended(self, args, unknown):
             total_transferred = stats.mptcp_throughput_bytes
             msg = ("mptcpstream {c.mptcpstreamid} towards {destination} forwarded "
                    "{c.mptcp_throughput_bytes} bytes with a goodput of {c.mptcp_goodput_bytes}")
-            self.poutput(msg.format(c=stats, destination=destination))
+            self.poutput(msg.format(c=stats, destination=destination.name))
 
             for subflow in stats.subflow_stats:
 

mptcpanalyzer/data.py

@@ -26,7 +26,8 @@
 
 # TODO might need a converter when saving/loading
 # TODO pandas.api.types.register_extension_dtype()
-dtype_role = pd.api.types.CategoricalDtype(categories=ConnectionRoles, ordered=True)
+# the list here is important in fact
+dtype_role = pd.api.types.CategoricalDtype(categories=list(ConnectionRoles), ordered=True)
 
 TCP_DEBUG_FIELDS = ['hash', 'packetid', "reltime", "abstime"]
 MPTCP_DEBUG_FIELDS = TCP_DEBUG_FIELDS + ['mptcpdest']
@@ -124,6 +125,22 @@ class PacketMappingMode(Enum):
     SCORE = auto()
 
 
+def check_df(f, checks):
+    '''
+    decorator checking that dataframe fulfill some conditions
+    first argument (dataframe) 
+    '''
+    # TODO
+    @functools.wraps(f)
+    def wrapped(self, *args):
+        if self.data is not None:
+            return f(self, *args)
+        else:
+            raise mp.MpTcpException("Please load a pcap with `load_pcap` first")
+        return None
+    return wrapped
+
+
 def drop_syn(df: pd.DataFrame, mptcp: bool = True) -> pd.DataFrame:
     """
     for mptcp it's as easy as removing packets with MP_CAPABLE or MP_JOIN
@@ -703,7 +720,7 @@ def merge_tcp_dataframes_known_streams(
             log.debug("Setting mptcpdest to %s" % mptcpdest)
             # if tcpdest == main_connection.mptcpdest
 
-        debug_dataframe(total, "concanated df", usecols=["tcpdest", "mptcpdest"])
+        debug_dataframe(total, "concanated df", ) # usecols=["tcpdest", "mptcpdest"])
         # TODO here we should
         total = pd.concat([res, total])
 

mptcpanalyzer/statistics.py

@@ -64,14 +64,19 @@ def tcp_get_stats(
     destination: ConnectionRoles,
     mptcp=False
     ):
+    '''
+    Expects df to have tcpdest set
+    '''
     # -> Tuple[TcpUnidirectionalStats, TcpUnidirectionalStats]:
     log.debug("Getting TCP stats for stream %d" % tcpstreamid)
+    assert destination in ConnectionRoles, "destination is %r" % type(destination)
+
     df = rawdf[rawdf.tcpstream == tcpstreamid]
     if df.empty:
         raise MpTcpException("No packet with tcp.stream == %d" % tcpstreamid)
 
+    # TODO do it only when needed
     con = TcpConnection.build_from_dataframe(df, tcpstreamid)
-
     df2 = tcpdest_from_connections(df, con)
 
     log.debug("df2 size = %d" % len(df2))
@@ -96,6 +101,8 @@ def tcp_get_stats(
 
     # -1 to accoutn for SYN
     tcp_goodput = seq_max - seq_min - 1
+    log.debug("tcp_goodput ({}) = {} (seq_max) - {} (seq_min) - 1".format(tcp_goodput, seq_max, seq_min))
+
 
     # if mptcp:
     #     print("do some extra work")
@@ -119,6 +126,7 @@ def mptcp_compute_throughput(
     Returns:
         a tuple (True/false, dict)
     """
+    assert isinstance(destination, ConnectionRoles), "destination is %r" % destination
 
     df = rawdf[rawdf.mptcpstream == mptcpstreamid]
     if df.empty:
@@ -134,6 +142,8 @@ def mptcp_compute_throughput(
     # -1 because of syn
     dsn_range = dsn_max - dsn_min - 1
 
+    log.debug("tcp_goodput ({}) = {} (seq_max) - {} (seq_min) - 1".format(tcp_goodput, seq_max, seq_min))
+
     # Could groupby destination as well
     d = df.groupby(_sender('tcpstream'))
     subflow_stats: List[TcpUnidirectionalStats] = []
@@ -142,7 +152,7 @@ def mptcp_compute_throughput(
         debug_dataframe(subdf, "subdf for stream %d" % tcpstream)
         dest = subdf.iloc[0, subdf.columns.get_loc(_sender('tcpdest'))]
         sf_stats = tcp_get_stats(subdf, tcpstream,
-            dest,
+            ConnectionRoles(dest),
         True)
 
         # TODO drop retransmitted
@@ -178,7 +188,7 @@ def mptcp_compute_throughput_extended(
     Should display goodput
     """
     assert isinstance(destination, ConnectionRoles)
-    log.debug("Looking at destination ", destination)
+    log.debug("Looking at destination %s" % destination)
     df_both = classify_reinjections(rawdf)
 
     df = df_both[df_both.mptcpdest == destination]