Merge pull request #101 from odedshimon/issue-99-wireless-capture-bug

Fix a bug - selecting wrong interface for live capture
odedshimon · Aug 30, 2021 · 0c1efc9 · 0c1efc9
2 parents 34917a2 + 40cf4c7
commit 0c1efc9
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/BruteShark/PcapProcessor/Sniffer.cs b/BruteShark/PcapProcessor/Sniffer.cs
@@ -64,7 +64,9 @@ public void StartSniffing(CancellationToken ct)
             if (selectedDevice is SharpPcap.LibPcap.LibPcapLiveDevice)
             {
                 var livePcapDevice = selectedDevice as SharpPcap.LibPcap.LibPcapLiveDevice;
-                livePcapDevice.Open(PromisciousMode ? SharpPcap.DeviceModes.Promiscuous : SharpPcap.DeviceModes.None);
+                livePcapDevice.Open(mode: PromisciousMode ? SharpPcap.DeviceModes.Promiscuous : SharpPcap.DeviceModes.None 
+                                          | DeviceModes.DataTransferUdp 
+                                          | DeviceModes.NoCaptureLocal);
             }
             else
             {
@@ -98,7 +100,7 @@ public void StartSniffing(CancellationToken ct)
             // Raise events for unfinished sessions.
             HandleUnfinishedSessions();
         }
-
+     
         private void SetupBpfFilter(ICaptureDevice selectedDevice)
         {
             if (this.Filter != null && this.Filter != string.Empty)
@@ -136,14 +138,10 @@ private void ClearOldSniffingsData()
 
         private SharpPcap.ICaptureDevice GetSelectedDevice()
         {
-            var availiableDevices = CaptureDeviceList.Instance;
-
-            if (!AvailiableDevicesNames.Contains(this.SelectedDeviceName))
-            {
-                throw new Exception($"No such device {SelectedDeviceName}");
-            }
-
-            return availiableDevices[AvailiableDevicesNames.IndexOf(this.SelectedDeviceName)];
+            return CaptureDeviceList.Instance
+                .Select(d => (PcapDevice)d)
+                .Where(d => d.Interface.FriendlyName == this.SelectedDeviceName)
+                .FirstOrDefault();
         }
 
         private void StartPacketProcessingThread()