Link WinPcap packet driver statically into the main binary in preparation of removing the services.

This commit is contained in:
oliverschmidt 2007-04-09 11:57:15 +00:00
parent 9cc1871810
commit 38c3950d66
6 changed files with 18 additions and 472 deletions

View File

@ -30,7 +30,7 @@
*
* Author: Oliver Schmidt <ol.sc@web.de>
*
* $Id: contiki-main.c,v 1.4 2007/04/06 23:09:32 oliverschmidt Exp $
* $Id: contiki-main.c,v 1.5 2007/04/09 11:57:15 oliverschmidt Exp $
*/
#define WIN32_LEAN_AND_MEAN
@ -58,6 +58,7 @@ PROCINIT(&etimer_process,
&cfs_win32_process,
&ctk_conio_service_process,
&ctk_process,
&wpcap_service_process,
&tcpip_process,
&resolv_process,
&program_handler_process);
@ -130,8 +131,6 @@ main(void)
uip_ipaddr(&addr, 192,168,0,1);
resolv_conf(&addr);
program_handler_load("wpcap.drv", NULL);
}
#endif

View File

@ -87,13 +87,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webserver.prg", "vcproj\web
{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.drv", "vcproj\wpcap.drv.vcproj", "{39F3E492-1EE3-4904-8962-D482011AB375}"
ProjectSection(ProjectDependencies) = postProject
{DD219C2D-D3F8-4C76-B2AA-376978722232} = {DD219C2D-D3F8-4C76-B2AA-376978722232}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wpcap.dsc", "vcproj\wpcap.dsc.vcproj", "{618101EC-0777-4FA6-B1B7-3B7C1981707B}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.dsc", "vcproj\www.dsc.vcproj", "{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "www.prg", "vcproj\www.prg.vcproj", "{2A1D67D7-7FAE-42D3-AC99-DB68A3570735}"
@ -207,14 +200,6 @@ Global
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Debug|Win32.Build.0 = Debug|Win32
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Release|Win32.ActiveCfg = Release|Win32
{C741203A-ADD3-4C4A-9BF1-82978105F057}.Release|Win32.Build.0 = Release|Win32
{39F3E492-1EE3-4904-8962-D482011AB375}.Debug|Win32.ActiveCfg = Debug|Win32
{39F3E492-1EE3-4904-8962-D482011AB375}.Debug|Win32.Build.0 = Debug|Win32
{39F3E492-1EE3-4904-8962-D482011AB375}.Release|Win32.ActiveCfg = Release|Win32
{39F3E492-1EE3-4904-8962-D482011AB375}.Release|Win32.Build.0 = Release|Win32
{618101EC-0777-4FA6-B1B7-3B7C1981707B}.Debug|Win32.ActiveCfg = Debug|Win32
{618101EC-0777-4FA6-B1B7-3B7C1981707B}.Debug|Win32.Build.0 = Debug|Win32
{618101EC-0777-4FA6-B1B7-3B7C1981707B}.Release|Win32.ActiveCfg = Release|Win32
{618101EC-0777-4FA6-B1B7-3B7C1981707B}.Release|Win32.Build.0 = Release|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Debug|Win32.ActiveCfg = Debug|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Debug|Win32.Build.0 = Debug|Win32
{76D7F9A9-9C9E-41C9-9BF8-DB305BCEEF71}.Release|Win32.ActiveCfg = Release|Win32

View File

@ -1,74 +0,0 @@
/*
* Copyright (c) 2006, Swedish Institute of Computer Science.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* 3. Neither the name of the Institute nor the names of its contributors
* may be used to endorse or promote products derived from this software
* without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE INSTITUTE AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE INSTITUTE OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* This file is part of the Contiki operating system.
*
* Author: Oliver Schmidt <ol.sc@web.de>
*
* $Id: wpcap-dsc.c,v 1.1 2006/09/23 20:25:02 oliverschmidt Exp $
*/
#include "sys/dsc.h"
extern struct ctk_icon wpcap_icon;
/*-----------------------------------------------------------------------------------*/
DSC(wpcap_dsc,
"WinPcap driver",
"wpcap.drv",
wpcap_process,
&wpcap_icon);
/*-----------------------------------------------------------------------------------*/
#if CTK_CONF_ICON_BITMAPS
static unsigned char wpcapicon_bitmap[3*3*8] = {
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00
};
#endif /* CTK_CONF_ICON_BITMAPS */
#if CTK_CONF_ICON_TEXTMAPS
static char wpcapicon_textmap[9] = {
'W', 'i', 'n',
' ', 'P', ' ',
'c', 'a', 'p'
};
#endif /* CTK_CONF_ICON_TEXTMAPS */
#if CTK_CONF_ICONS
static struct ctk_icon wpcap_icon =
{CTK_ICON("WinPcap driver", wpcapicon_bitmap, wpcapicon_textmap)};
#endif /* CTK_CONF_ICONS */
/*-----------------------------------------------------------------------------------*/

View File

@ -358,6 +358,10 @@
RelativePath="..\..\..\core\net\uip.h"
>
</File>
<File
RelativePath="..\..\..\core\net\uip_arp.c"
>
</File>
<File
RelativePath="..\..\..\core\net\uip_arp.h"
>
@ -503,6 +507,18 @@
>
</File>
</Filter>
<Filter
Name="net"
>
<File
RelativePath="..\net\wpcap-service.c"
>
</File>
<File
RelativePath="..\net\wpcap-service.h"
>
</File>
</Filter>
</Filter>
</Files>
<Globals>

View File

@ -1,200 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="wpcap.drv"
ProjectGUID="{39F3E492-1EE3-4904-8962-D482011AB375}"
RootNamespace="wpcapdrv"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(OutDir)\contiki.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="2"
GenerateDebugInformation="true"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;PROCESS_LOADABLE;WITH_LOADER_ARCH"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="&quot;$(OutDir)\contiki.lib&quot;"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="1"
GenerateDebugInformation="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<Filter
Name="net"
>
<File
RelativePath="..\..\..\core\net\uip_arp.c"
>
</File>
<File
RelativePath="..\..\..\core\net\uip_arp.h"
>
</File>
</Filter>
<File
RelativePath="..\net\wpcap-service.c"
>
</File>
<File
RelativePath="..\net\wpcap-service.h"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>

View File

@ -1,180 +0,0 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="8,00"
Name="wpcap.dsc"
ProjectGUID="{618101EC-0777-4FA6-B1B7-3B7C1981707B}"
RootNamespace="wpcapdsc"
Keyword="Win32Proj"
>
<Platforms>
<Platform
Name="Win32"
/>
</Platforms>
<ToolFiles>
</ToolFiles>
<Configurations>
<Configuration
Name="Debug|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..;../../../core"
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
BasicRuntimeChecks="3"
RuntimeLibrary="3"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="2"
SubSystem="1"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
<Configuration
Name="Release|Win32"
OutputDirectory="$(SolutionDir)$(ConfigurationName)"
IntermediateDirectory="$(SolutionDir)$(ConfigurationName)"
ConfigurationType="2"
CharacterSet="2"
WholeProgramOptimization="1"
>
<Tool
Name="VCPreBuildEventTool"
/>
<Tool
Name="VCCustomBuildTool"
/>
<Tool
Name="VCXMLDataGeneratorTool"
/>
<Tool
Name="VCWebServiceProxyGeneratorTool"
/>
<Tool
Name="VCMIDLTool"
/>
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="..;../../../core"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
RuntimeLibrary="2"
WarningLevel="3"
Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
CompileAs="0"
/>
<Tool
Name="VCManagedResourceCompilerTool"
/>
<Tool
Name="VCResourceCompilerTool"
/>
<Tool
Name="VCPreLinkEventTool"
/>
<Tool
Name="VCLinkerTool"
OutputFile="$(OutDir)\$(ProjectName)"
LinkIncremental="1"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
TargetMachine="1"
/>
<Tool
Name="VCALinkTool"
/>
<Tool
Name="VCManifestTool"
/>
<Tool
Name="VCXDCMakeTool"
/>
<Tool
Name="VCBscMakeTool"
/>
<Tool
Name="VCFxCopTool"
/>
<Tool
Name="VCAppVerifierTool"
/>
<Tool
Name="VCWebDeploymentTool"
/>
<Tool
Name="VCPostBuildEventTool"
/>
</Configuration>
</Configurations>
<References>
</References>
<Files>
<File
RelativePath="..\net\wpcap-dsc.c"
>
</File>
</Files>
<Globals>
</Globals>
</VisualStudioProject>