Fixed filter application and removed lazy load (temporary).

WhiteNoise/DeviceWorker.cs

@@ -83,25 +83,25 @@ namespace WhiteNoise
		{
			_file = new FileInfo("results.pcap");
			
			if (!lazyLoad)
			{
				this._devices = CaptureDeviceList.Instance;
			}
			
			this.Devices = new List<string>();
			this.Filter = "ip and tcp";
			this.Timeout = 1000;
			this.Version = SharpPcap.Version.VersionString;
			
			// Make a pretty list of devices.
			for (int i = 0; i < this._devices.Count; i++)
			if (!lazyLoad)
			{
				this.Devices.Add(
					string.Format("{1}. {2}{0}", 
						Environment.NewLine, 
						i + 1, 
						this._devices[i].Description)
					);
				this._devices = CaptureDeviceList.Instance;
				
								// Make a pretty list of devices.
				for (int i = 0; i < this._devices.Count; i++)
				{
					this.Devices.Add(
						string.Format("{1}. {2}{0}", 
							Environment.NewLine, 
							i + 1, 
							this._devices[i].Description)
						);
				}
			}
		}
		
@@ -115,16 +115,9 @@ namespace WhiteNoise
		{
			var device = this._devices[deviceNumber - 1];
			
			//// NOTE: This may need to be placed elsewhere.
			//if (!this._captureDevices.Contains(device))
			//{
			//	this._captureDevices.Add(device);
			//}
			
			// Apply filter and event handler(s).
			// Add event handler(s).
			device.OnPacketArrival += new PacketArrivalEventHandler(Device_OnPacketArrival);
			device.Filter = this.Filter;
						
			
			// Open each device requested for scan.
			if (device is AirPcapDevice)
			{
@@ -142,6 +135,9 @@ namespace WhiteNoise
				device.Open(DeviceMode.Promiscuous, this.Timeout);
			}
			
			// Apply the filter *only* after the device is open.
			device.Filter = this.Filter;
			
			// Start capturing.
			device.StartCapture();
		}
@@ -192,6 +188,7 @@ namespace WhiteNoise
		private static void Device_OnPacketArrival(object sender, CaptureEventArgs e)
		{
			CaptureFileWriterDevice writer = null;
			Debug.WriteLine("Received {0} bytes.", e.Packet.Data.Length);
			
			try
			{

WhiteNoise/Main.cs

@@ -3,8 +3,17 @@ using System.Diagnostics;
namespace WhiteNoise
{
	/// <summary>
	/// Main class.
	/// </summary>
	public static class MainClass
	{
		/// <summary>
		/// The entry point of the program, where the program control starts and ends.
		/// </summary>
		/// <param name='args'>
		/// The command-line arguments.
		/// </param>
		public static void Main (string[] args)
		{
			DeviceWorker devWorker = null;
@@ -12,7 +21,7 @@ namespace WhiteNoise
			try
			{
				// Initialize a new worker (this will throw an exception if no PCAP libraries are found).
				devWorker = new DeviceWorker(lazyLoad: true);
				devWorker = new DeviceWorker();
			
				if (devWorker.Devices.Count < 1)
				{
@@ -28,6 +37,7 @@ namespace WhiteNoise
					Console.WriteLine(item);
				}
				
				Console.WriteLine();
				Console.Write ("Device(s) to be captured (comma separated): ");
				string inputDevices = Console.ReadLine();
				
@@ -39,6 +49,9 @@ namespace WhiteNoise
					devWorker.Filter = filter;
				}
				
				Console.WriteLine();
				Console.WriteLine("Capturing selected devices. Press any key to exit.");
				
				// Pull apart the request in an attempt to find the devices.
				foreach (string segment in inputDevices.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries))
				{