plot: fix destination filter for tcp plots

the filter_dataframe stopped filtering destination because of a change
in the parser settings ("tcpstream" had become "stream").

Author: teto

mptcpanalyzer/plot.py

@@ -7,7 +7,7 @@
 from mptcpanalyzer.data import load_into_pandas
 from mptcpanalyzer.tshark import TsharkConfig
 import enum
-from mptcpanalyzer.connection import MpTcpConnection
+from mptcpanalyzer.connection import MpTcpConnection, TcpConnection
 from typing import List, Tuple, Collection
 import copy
 import abc
@@ -56,9 +56,8 @@ def __init__(
         self.input_pcaps = input_pcaps
         # python shallow copies objects by default
         self.tshark_config = copy.deepcopy(exporter)
-        self.protocol = kwargs.get("protocol", "mptcp")
         # self.tshark_config.read_filter = protocol + " and not icmp"
-
+        
 
     def default_parser(
         self,
@@ -91,10 +90,11 @@ def default_parser(
             parser.add_argument(name, action="store", type=str, help='Pcap file (or its associated csv)')
 
             if bitfield & PreprocessingActions.FilterStream:
-                # TODO generate metavar
+                # difficult to change the varname here => change it everywhere
                 protocol = "mptcp" if bitfield & PreprocessingActions.FilterMpTcpStream else "tcp"
+                print("PROTOCOL", protocol)
                 parser.add_argument(
-                    protocol + 'stream', action="store", type=int,
+                    protocol + 'stream', metavar= protocol + "stream", action="store", type=int,
                     help= protocol + '.stream id')
 
                 if direction:
@@ -118,13 +118,6 @@ def default_parser(
                             "not to take into account (because"
                             "it was filtered by iptables or else)"))
 
-        # not implemented yet
-        # if dst_host:
-        #     parser.add_argument(
-        #         'ipdst_host', action="store",
-        #         help='Filter flows according to the destination hostnames')
-
-
         parser.add_argument('-o', '--out', action="store", default=None,
             help='Name of the output plot')
         parser.add_argument('--display', action="store_true",
@@ -149,7 +142,7 @@ def plot(self, rawdataframes, **kwargs):
         pass
 
     def filter_dataframe(
-        self, rawdf, filterstream=None, skipped_subflows=[],
+        self, rawdf, tcpstream=None, mptcpstream=None, skipped_subflows=[],
         destination: mp.ConnectionRoles=None,
         extra_query: str=None, **kwargs
     ):
@@ -163,7 +156,7 @@ def filter_dataframe(
             rawdf: Raw dataframe
             kwargs: expanded arguments returned by the parser
             destination: Filters packets depending on their :enum:`.ConnectionRoles`
-            mptcpstream: keep only the packets related to mptcp.stream == mptcpstream
+            stream: keep only the packets related to mptcp.stream == mptcpstream
             skipped_subflows: list of skipped subflows
             extra_query: Add some more filters to the pandas query
 
@@ -178,21 +171,30 @@ def filter_dataframe(
         """
         log.debug("Preprocessing dataframe with extra args %s" % kwargs)
         queries = []
+        print("tcp.stream", tcpstream, "mptcp:", mptcpstream)
+        stream = tcpstream if tcpstream is not None else mptcpstream
         dataframe = rawdf
 
         for skipped_subflow in skipped_subflows:
             log.debug("Skipping subflow %d" % skipped_subflow)
             queries.append(" tcpstream!=%d " % skipped_subflow)
 
-        if filterstream is not None:
-            log.debug("Filtering %s stream ." % self.protocol)
-            queries.append(self.protocol + "stream==%d" % filterstream)
+        if stream is not None:
+            protocol = "mptcp" if mptcpstream is not None else "tcp"
+            log.debug("Filtering %s stream #%d." % (protocol, stream))
+            queries.append(protocol + "stream==%d" % stream)
             if destination is not None:
                 log.debug("Filtering destination")
+
                 # Generate a filter for the connection
-                con = MpTcpConnection.build_from_dataframe(dataframe, filterstream)
-                q = con.generate_direction_query(destination)
-                queries.append(q)
+                if protocol == "mptcp":
+                    con = MpTcpConnection.build_from_dataframe(dataframe, stream)
+                    q = con.generate_direction_query(destination)
+                    queries.append(q)
+                else:
+                    con2 = TcpConnection.build_from_dataframe(dataframe, stream)
+                    q = con2.generate_direction_query(destination)
+                    queries.append(q)
 
         if extra_query:
             log.debug("Appending extra_query=%s" % extra_query)
@@ -221,7 +223,7 @@ def preprocess(self, **kwargs) -> Collection[ pd.DataFrame ]:
         """
         dataframes = []
         for pcap_name, actions in self.input_pcaps:
-            log.info("pcap_name=", pcap_name, "value=", kwargs.get(pcap_name))
+            log.info("pcap_name=%s value=%r" % (pcap_name, kwargs.get(pcap_name)))
             if actions & PreprocessingActions.Preload:
                 filename = kwargs.get(pcap_name)
                 df = load_into_pandas(filename, self.tshark_config,)
@@ -348,7 +350,7 @@ def savefig(fig, filename, **kwargs):
             kwargs: Forwarded to :member:`matplotlib.Figure.savefig`.
             You can set *dpi* for instance  (80 by default ?)
         """
-        print("Saving into %s" % (filename))
+        logging.info("Saving into %s" % (filename))
         # most settings (dpi for instance) can be set from resource config
         fig.savefig(filename, format="png", **kwargs)
         return filename

mptcpanalyzer/plots/dsn.py

@@ -12,7 +12,7 @@ class PlotSubflowAttribute(plot.Matplotlib):
     """
 
     def __init__(self, *args, **kwargs):
-        pcaps = [("pcap", plot.PreprocessingActions.Preload | plot.PreprocessingActions.FilterMpTcpStream), ]
+        pcaps = kwargs.get("input_pcaps", [("pcap", plot.PreprocessingActions.Preload | plot.PreprocessingActions.FilterMpTcpStream), ])
         super().__init__(*args, input_pcaps=pcaps, **kwargs)
 
         self._attributes = self.tshark_config.get_fields('name', 'label')
@@ -69,28 +69,29 @@ def plot(self, dat, mptcpstream, field=None, **kwargs):
         return fig
 
 
-class PlotTcpAttribute(PlotSubflowAttribute):
+class PlotTcpAttribute(plot.Matplotlib):
 
     def __init__(self, *args, **kwargs):
 
         pcaps = [("pcap", plot.PreprocessingActions.Preload | plot.PreprocessingActions.FilterTcpStream), ]
         super(plot.Matplotlib, self).__init__(*args, input_pcaps=pcaps, **kwargs)
         self._attributes = self.tshark_config.get_fields('name', 'label')
 
-    # def default_parser(self, *args, **kwargs):
-
-    #     parent = argparse.ArgumentParser(
-    #         description="Plot tcp attributes over time"
-    #     )
-    #     parser = super(PlotSubflowAttribute,self).default_parser(
-    #         *args, parent_parsers=[parent],
-    #         filterstream=True,
-    #         direction=True,
-    #         skip_subflows=True,
-    #         **kwargs)
-    #     # parser.add_argument('field', choices=self.mptcp_attributes.keys(),
-    #     #     help="Choose an mptcp attribute to plot")
-    #     return parser
+    def default_parser(self, *args, **kwargs):
+
+        parent = argparse.ArgumentParser(
+            description="Plot tcp attributes over time"
+        )
+        parser = super().default_parser(
+            *args, parent_parsers=[parent],
+            filterstream=True,
+            direction=True,
+            skip_subflows=True,
+            **kwargs)
+        parser.add_argument('field', choices=self._attributes.keys(),
+            help="Choose an mptcp attribute to plot")
+        return parser
+
 
     def plot(self, df, tcpstream, field=None, **kwargs):
         """