Move builds to VC10

unstable
HD Moore 2012-06-21 23:51:46 -05:00
parent c5e9e5d374
commit a648c24b4e
2 changed files with 123 additions and 171 deletions

View File

@ -1,108 +1,108 @@
#ifndef _METERPRETER_SOURCE_EXTENSION_SNIFFER_SNIFFER_H #ifndef _METERPRETER_SOURCE_EXTENSION_SNIFFER_SNIFFER_H
#define _METERPRETER_SOURCE_EXTENSION_SNIFFER_SNIFFER_H #define _METERPRETER_SOURCE_EXTENSION_SNIFFER_SNIFFER_H
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include "HNPsSdkUser.h" #include <HNPsSdkUser.h>
#include "dnet.h" #include "dnet.h"
#else #else
#include <pcap/pcap.h> #include <pcap/pcap.h>
#ifndef ERROR_ACCESS_DENIED #ifndef ERROR_ACCESS_DENIED
#define ERROR_ACCESS_DENIED EACCES #define ERROR_ACCESS_DENIED EACCES
#endif #endif
#endif #endif
#include "../../common/common.h" #include "../../common/common.h"
typedef struct capturejob typedef struct capturejob
{ {
unsigned int active; unsigned int active;
unsigned int intf; unsigned int intf;
unsigned int max_pkts; unsigned int max_pkts;
unsigned int idx_pkts; unsigned int idx_pkts;
unsigned int cur_pkts; unsigned int cur_pkts;
unsigned int cur_bytes; unsigned int cur_bytes;
unsigned int mtu; unsigned int mtu;
HANDLE adp; HANDLE adp;
HANDLE *pkts; HANDLE *pkts;
unsigned char *dbuf; unsigned char *dbuf;
unsigned int dlen; unsigned int dlen;
unsigned int didx; unsigned int didx;
int capture_linktype; //current capture link type that we want to save, ie. LINKTYPE_ETHERNET int capture_linktype; //current capture link type that we want to save, ie. LINKTYPE_ETHERNET
#ifndef _WIN32 #ifndef _WIN32
THREAD *thread; THREAD *thread;
pcap_t *pcap; pcap_t *pcap;
#endif #endif
} CaptureJob; } CaptureJob;
#define TLV_TYPE_EXTENSION_SNIFFER 0 #define TLV_TYPE_EXTENSION_SNIFFER 0
#define TLV_TYPE_SNIFFER_INTERFACES \ #define TLV_TYPE_SNIFFER_INTERFACES \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_GROUP, \ TLV_META_TYPE_GROUP, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 1) TLV_EXTENSIONS + 1)
#define TLV_TYPE_SNIFFER_INTERFACE_ID \ #define TLV_TYPE_SNIFFER_INTERFACE_ID \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_UINT, \ TLV_META_TYPE_UINT, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 2) TLV_EXTENSIONS + 2)
#define TLV_TYPE_SNIFFER_INTERFACE_HANDLE \ #define TLV_TYPE_SNIFFER_INTERFACE_HANDLE \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_UINT, \ TLV_META_TYPE_UINT, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 3) TLV_EXTENSIONS + 3)
#define TLV_TYPE_SNIFFER_PACKET_COUNT \ #define TLV_TYPE_SNIFFER_PACKET_COUNT \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_UINT, \ TLV_META_TYPE_UINT, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 4) TLV_EXTENSIONS + 4)
#define TLV_TYPE_SNIFFER_BYTE_COUNT \ #define TLV_TYPE_SNIFFER_BYTE_COUNT \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_UINT, \ TLV_META_TYPE_UINT, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 5) TLV_EXTENSIONS + 5)
#define TLV_TYPE_SNIFFER_EXCLUDE_PORTS \ #define TLV_TYPE_SNIFFER_EXCLUDE_PORTS \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_GROUP, \ TLV_META_TYPE_GROUP, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 6) TLV_EXTENSIONS + 6)
#define TLV_TYPE_SNIFFER_INCLUDE_PORTS \ #define TLV_TYPE_SNIFFER_INCLUDE_PORTS \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_GROUP, \ TLV_META_TYPE_GROUP, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 7) TLV_EXTENSIONS + 7)
#define TLV_TYPE_SNIFFER_PACKETS \ #define TLV_TYPE_SNIFFER_PACKETS \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_GROUP, \ TLV_META_TYPE_GROUP, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 8) TLV_EXTENSIONS + 8)
#define TLV_TYPE_SNIFFER_PACKET \ #define TLV_TYPE_SNIFFER_PACKET \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_RAW, \ TLV_META_TYPE_RAW, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 9) TLV_EXTENSIONS + 9)
#define TLV_TYPE_SNIFFER_ADDITIONAL_FILTER \ #define TLV_TYPE_SNIFFER_ADDITIONAL_FILTER \
MAKE_CUSTOM_TLV( \ MAKE_CUSTOM_TLV( \
TLV_META_TYPE_STRING, \ TLV_META_TYPE_STRING, \
TLV_TYPE_EXTENSION_SNIFFER, \ TLV_TYPE_EXTENSION_SNIFFER, \
TLV_EXTENSIONS + 10) TLV_EXTENSIONS + 10)
#endif #endif

View File

@ -1,72 +1,29 @@
 
Microsoft Visual Studio Solution File, Format Version 10.00 Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2008 # Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcproj", "{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_priv", "ext_server_priv\ext_server_priv.vcproj", "{87C64204-C82F-415D-AF45-D0B33BDFE39A}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_priv", "ext_server_priv\ext_server_priv.vcxproj", "{87C64204-C82F-415D-AF45-D0B33BDFE39A}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
{662AFBB3-F64A-4AD1-8956-B9F1B846231C} = {662AFBB3-F64A-4AD1-8956-B9F1B846231C}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_stdapi", "ext_server_stdapi\ext_server_stdapi.vcproj", "{405245AB-0071-4CB9-BFBE-ED4E2A987EFF}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_stdapi", "ext_server_stdapi\ext_server_stdapi.vcxproj", "{405245AB-0071-4CB9-BFBE-ED4E2A987EFF}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metcli", "metcli\metcli.vcproj", "{4DECF649-2B11-47A2-908E-031105D706F8}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metcli", "metcli\metcli.vcxproj", "{4DECF649-2B11-47A2-908E-031105D706F8}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metsrv", "metsrv\metsrv.vcproj", "{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "metsrv", "metsrv\metsrv.vcxproj", "{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReflectiveDLLInjection", "ReflectiveDLLInjection\ReflectiveDLLInjection.vcproj", "{72F0246A-A38D-4547-9057-46020E8E503D}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReflectiveDLLInjection", "ReflectiveDLLInjection\ReflectiveDLLInjection.vcxproj", "{72F0246A-A38D-4547-9057-46020E8E503D}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_incognito", "ext_server_incognito\ext_server_incognito.vcproj", "{C427F6B9-C287-4BDA-A5BB-401FC19E207C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_incognito", "ext_server_incognito\ext_server_incognito.vcxproj", "{C427F6B9-C287-4BDA-A5BB-401FC19E207C}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_boiler", "ext_server_boiler\ext_server_boiler.vcproj", "{488BE203-8407-42D1-B334-8B5C3BC5AB3E}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_boiler", "ext_server_boiler\ext_server_boiler.vcxproj", "{488BE203-8407-42D1-B334-8B5C3BC5AB3E}"
ProjectSection(ProjectDependencies) = postProject
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_espia", "ext_server_espia\ext_server_espia.vcproj", "{CF56DDCC-505F-4D5C-AC2E-9787C7EF1504}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_espia", "ext_server_espia\ext_server_espia.vcxproj", "{CF56DDCC-505F-4D5C-AC2E-9787C7EF1504}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_sniffer", "ext_server_sniffer\ext_server_sniffer.vcproj", "{BF0C0D6E-9119-4518-A3BC-2CF99C0E27D9}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_sniffer", "ext_server_sniffer\ext_server_sniffer.vcxproj", "{BF0C0D6E-9119-4518-A3BC-2CF99C0E27D9}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elevator", "elevator\elevator.vcproj", "{662AFBB3-F64A-4AD1-8956-B9F1B846231C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "elevator", "elevator\elevator.vcxproj", "{662AFBB3-F64A-4AD1-8956-B9F1B846231C}"
ProjectSection(ProjectDependencies) = postProject
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshot", "screenshot\screenshot.vcproj", "{09DF8FBC-EDFB-44E6-ACE6-9C0F5A60AB1C}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "screenshot", "screenshot\screenshot.vcxproj", "{09DF8FBC-EDFB-44E6-ACE6-9C0F5A60AB1C}"
ProjectSection(ProjectDependencies) = postProject
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_pivot", "ext_server_pivot\ext_server_pivot.vcproj", "{C4801040-A3B8-11DF-811F-2A3AE0D72085}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_pivot", "ext_server_pivot\ext_server_pivot.vcproj", "{C4801040-A3B8-11DF-811F-2A3AE0D72085}"
ProjectSection(ProjectDependencies) = postProject ProjectSection(ProjectDependencies) = postProject
@ -75,12 +32,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_pivot", "ext_ser
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_lanattacks", "ext_server_lanattacks\ext_server_lanattacks.vcproj", "{2FCCCE33-77E9-43F3-928E-DBF6B9340A62}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ext_server_lanattacks", "ext_server_lanattacks\ext_server_lanattacks.vcxproj", "{2FCCCE33-77E9-43F3-928E-DBF6B9340A62}"
ProjectSection(ProjectDependencies) = postProject
{9E4DE963-873F-4525-A7D0-CE34EDBBDCCA} = {9E4DE963-873F-4525-A7D0-CE34EDBBDCCA}
{72F0246A-A38D-4547-9057-46020E8E503D} = {72F0246A-A38D-4547-9057-46020E8E503D}
{37E24F8F-1BD9-490B-8CD2-4768B89E5EAB} = {37E24F8F-1BD9-490B-8CD2-4768B89E5EAB}
EndProjectSection
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution