Commit 91c45e86 authored by garciay's avatar garciay
Browse files

Upgrade for MSVS compiler

parent 4e43b684

adapter/src/Capture/PCAPCapture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ bool PCAPCapture::SetFilter(const std::string sFilter) 
			s += "...";

			Logger::Instance().LogDebug(s);

		}				

		if (pcap_compile(m_fp[i], &fcode, sFormattedFilter.c_str(), 1, 0) < 0)

		if (pcap_compile(m_fp[i], &fcode, (char *)sFormattedFilter.c_str(), 1, 0) < 0)

		{

			Logger::Instance().LogError("Error compiling packet filter");

			bRes = false;

adapter/src/Capture/PCAPCapture.h

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
#include <boost/thread/condition.hpp>



#define HAVE_REMOTE

#include "pcap/pcap.h"

#include "pcap.h"



/**

 * This abstract class describes capturing based on the pcap library.

adapter/src/Capture/PCAPOfflineCapture.cpp

+3 −0
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ ECaptureInitResult PCAPOfflineCapture::OpenDevice(const std::string sParams) 


	pcap_t * fp = OpenPcapSource(source);

	if (!fp)

	{

		Logger::Instance().LogError("Failed to open source " + sParams);

		return ECaptureInit_Failed;

	}



	pcap_pkthdr header;

	if (pcap_next(fp, &header))

adapter/src/Capture/TcpipDefs.h

+2 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#ifndef TCPIP_DEFS_H

#define TCPIP_DEFS_H



#define USE_IPV6 1



#ifdef WIN32

#include <Winsock2.h>

#include <Ws2tcpip.h>

adapter/src/Capture/TrafficCapture.vcproj

+3 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="Windows-1252"?>

<VisualStudioProject

	ProjectType="Visual C++"

	Version="9,00"

	Version="9.00"

	Name="TrafficCapture"

	ProjectGUID="{098C43A2-2F76-4395-A53B-7585150285EC}"

	RootNamespace="TrafficCapture"
@@ -114,7 +114,7 @@ 
				Name="VCCLCompilerTool"

				Optimization="2"

				EnableIntrinsicFunctions="true"

				AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;C:\Program Files\WinPcap\WpdPack\Include&quot;;&quot;C:\Program Files\boost\boost_1_38&quot;"

				AdditionalIncludeDirectories="&quot;$(SolutionDir)..&quot;;&quot;C:\Program Files\WinPcap\WpdPack\Include&quot;;D:\cygwin\usr\include\boost_1_38_0"

				PreprocessorDefinitions="WIN32"

				RuntimeLibrary="2"

				EnableFunctionLevelLinking="true"
@@ -133,7 +133,7 @@ 
			<Tool

				Name="VCLinkerTool"

				AdditionalDependencies="wpcap.lib ws2_32.lib"

				AdditionalLibraryDirectories="&quot;C:\Program Files\WinPcap\WpdPack\Lib&quot;;&quot;C:\Program Files\boost\boost_1_38\lib&quot;"

				AdditionalLibraryDirectories="&quot;C:\Program Files\WinPcap\WpdPack\Lib&quot;;&quot;D:\STF370\WP2 - IMS case study\adapter\MM\lib&quot;"

				GenerateDebugInformation="true"

				OptimizeReferences="2"

				EnableCOMDATFolding="2"