Merge branch 'serializingme-dev-fixlinuxcompile-v2' into dev-chaos

This commit is contained in:
Alberto Ortega 2015-05-16 13:30:55 +02:00
commit b0a2aeeda3
2 changed files with 6 additions and 17 deletions

View File

@ -312,19 +312,12 @@ int main(void)
else print_not_traced();
printf("[*] Looking for a MAC address starting with 08:00:27 ... ");
switch (vbox_mac()) {
case TRUE:
write_log("VirtualBox traced using MAC address starting with 08:00:27");
print_traced();
write_trace("hi_virtualbox");
break;
case FALSE:
print_not_traced();
break;
case -1:
print_warning("NOT BUILT");
break;
if (vbox_mac() == TRUE) {
write_log("VirtualBox traced using MAC address starting with 08:00:27");
print_traced();
write_trace("hi_virtualbox");
}
else print_not_traced();
printf("[*] Looking for pseudo devices ... ");
if (vbox_devices(TRUE) == TRUE) {

View File

@ -1,6 +1,7 @@
#define _WIN32_WINNT 0x0501 /* _WIN32_WINNT_WINXP */
#include <winsock2.h>
#include <windows.h>
#include <string.h>
#include <stdio.h>
@ -152,7 +153,6 @@ int vbox_sysfile2(int writelogs) {
* NIC MAC check
**/
int vbox_mac() {
#if defined(_IPTYPES_H) && defined(_IPHLPAPI_H)
WSADATA WSD;
int res = FALSE;
@ -181,10 +181,6 @@ int vbox_mac() {
WSACleanup();
}
return res;
#else
#warning "vbox_mac() function was not built in!"
return -1;
#endif
}
/**