Merge branch 'master' of https://github.com/KimiNewt/pyshark

KimiNewt · May 8, 2019 · d8b0c00 · d8b0c00
2 parents ddf2480 + 4d1b190
commit d8b0c00
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/pyshark/capture/capture.py b/src/pyshark/capture/capture.py
@@ -427,9 +427,16 @@ def get_parameters(self, packet_count=None):
             params += ["-x"]
         if packet_count:
             params += ['-c', str(packet_count)]
+
         if self._custom_parameters:
-            for key, val in self._custom_parameters.items():
-                params += [key, val]
+            if isinstance(self._custom_parameters, list):
+                params += self._custom_parameters
+            elif isinstance(self._custom_parameters, dict):
+                for key, val in self._custom_parameters.items():
+                    params += [key, val]
+            else:
+                raise Exception("Custom parameters type not supported.")
+
         if all(self.encryption):
             params += ['-o', 'wlan.enable_decryption:TRUE', '-o', 'uat:80211_keys:"' + self.encryption[1] + '","' +
                                                                   self.encryption[0] + '"']