Skip to content

Commit

Permalink
Add experimental changes, see changelog + disclamer for more infos
Browse files Browse the repository at this point in the history
  • Loading branch information
@gillesdubois
gillesdubois committed Jan 7, 2016
1 parent 82db80f commit 37cff58
Show file tree
Hide file tree
Showing 82 changed files with 9,740 additions and 2,501 deletions.
418 changes: 209 additions & 209 deletions Agent/CapDownload.cpp
View file

Large diffs are not rendered by default.

691 changes: 350 additions & 341 deletions Agent/CapIpdiscover.cpp
View file

Large diffs are not rendered by default.

204 changes: 103 additions & 101 deletions Agent/CapIpdiscover.h
View file
Original file line number Diff line number Diff line change
@@ -1,101 +1,103 @@
//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org

// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================

// Ipdiscover.h: interface for the CIpdiscover class.
//
//////////////////////////////////////////////////////////////////////

#if !defined(AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_)
#define AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_

#pragma once

#define IPDISCOVER_MIN_LATENCY 10 //ms
#define IPDISCOVER_DEFAULT_LATENCY 100 //ms
#define NB_IP_MAX 65534
#define DEFAULT_PORT 80
#define MAX_THREADS 300
#define MAX_FASTIP_THREADS 800

#ifndef WIN32
#include <pthread.h>
#define THREAD_CC
#define THREAD_TYPE pthread_t
#define THREAD_CREATE(tid, entry, arg) pthread_create(&(tid), NULL, \
(entry), (arg))
#else
#include <windows.h>
#define THREAD_CC __cdecl
#define THREAD_TYPE DWORD
#define THREAD_CREATE(tid, entry, arg) do { _beginthread((entry), 0, (arg));\
(tid) = GetCurrentThreadId(); \
} while (0)
#endif /* WIN32 */

#include "CapacityAbstract.h"
#include <Afxmt.h>

class CCapIpdiscover : public CCapacityAbstract
{

public: // Methods

// Standard constructor.and destructor
CCapIpdiscover();
~CCapIpdiscover();

// overloaded CCapacity method to set ipdiscover parameters
void setPrologResp(CPrologResponse* pPrologResp);

// Launch the scan
BOOL scanLocalNetwork();
// set the lan to scan (can be used manually)
void setLocalNetwork( LPCTSTR);
// set the latency (can be used manually)
void setLatency( LPCTSTR);
// Speed up detection by decreasing the latency significantly
void setFastIp();
// Do not wait for the threads termination
void setNoWait();
// Get current IP address worker thread must scan
ULONG CCapIpdiscover::GetIpToScan();
// Return the network number
ULONG GetNetworkNumber();
// Indicates that a new host was found
void AddHostFound( LPCTSTR lpstrIP, LPCTSTR lpstrMac, LPCTSTR lpstrHostName);
// Report that there was an error for host
void ReportHostFailed( LPCTSTR lpstrMessage);
// Lock and unlock access to the object, to grant worker threads exclusive access when updating results
BOOL LockCriticalSection();
BOOL UnlockCriticalSection();

// Function SendARP of IPHLPAPI.DLL (available on Windows 98 or higher and NT4 SP4 or higher)
DWORD (WINAPI *lpfn_SendARP)(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen);

// Functions from Winsock2
u_long (WINAPI *lpfn_htonl)(u_long hostlong);
u_long (WINAPI *lpfn_ntohl)(u_long netlong);
unsigned long (WINAPI *lpfn_inet_addr)(const char* cp);
char* FAR (WINAPI *lpfn_inet_ntoa)(struct in_addr in);

private: // Attributes
ULONG m_ulIpToScan; // IP to scan
ULONG m_ulNetNumber; // Network scanned
CString m_csLan;
ULONG m_ulHostFound; // Number of hosts found
ULONG m_ulIpDisc_lat; // Latency between each thread
CString m_csLatency;
BOOL m_bFastIp; // Do not wait Latency
CCriticalSection m_cs; // To grant exclusive access
DWORD m_dwMaxWaitTime;
};


#endif // !defined(AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_)
//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org

// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================

// Ipdiscover.h: interface for the CIpdiscover class.
//
//////////////////////////////////////////////////////////////////////

#if !defined(AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_)
#define AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_

#pragma once

#define IPDISCOVER_MIN_LATENCY 10 //ms
#define IPDISCOVER_DEFAULT_LATENCY 100 //ms
#define NB_IP_MAX 65534
#define DEFAULT_PORT 80
#define MAX_THREADS 300
#define MAX_FASTIP_THREADS 800

#ifndef WIN32
#include <pthread.h>
#define THREAD_CC
#define THREAD_TYPE pthread_t
#define THREAD_CREATE(tid, entry, arg) pthread_create(&(tid), NULL, \
(entry), (arg))
#else
#include <windows.h>
#define THREAD_CC __cdecl
#define THREAD_TYPE DWORD
#define THREAD_CREATE(tid, entry, arg) do { _beginthread((entry), 0, (arg));\
(tid) = GetCurrentThreadId(); \
} while (0)
#endif /* WIN32 */

#include "CapacityAbstract.h"
#include <Afxmt.h>
#include <iostream>
#include <fstream>

class CCapIpdiscover : public CCapacityAbstract
{

public: // Methods

// Standard constructor.and destructor
CCapIpdiscover();
~CCapIpdiscover();

// overloaded CCapacity method to set ipdiscover parameters
void setPrologResp(CPrologResponse* pPrologResp);

// Launch the scan
BOOL scanLocalNetwork();
// set the lan to scan (can be used manually)
void setLocalNetwork( LPCTSTR);
// set the latency (can be used manually)
void setLatency( LPCTSTR);
// Speed up detection by decreasing the latency significantly
void setFastIp();
// Do not wait for the threads termination
void setNoWait();
// Get current IP address worker thread must scan
ULONG CCapIpdiscover::GetIpToScan();
// Return the network number
ULONG GetNetworkNumber();
// Indicates that a new host was found
void AddHostFound( LPCTSTR lpstrIP, LPCTSTR lpstrMac, LPCTSTR lpstrHostName);
// Report that there was an error for host
void ReportHostFailed( LPCTSTR lpstrMessage);
// Lock and unlock access to the object, to grant worker threads exclusive access when updating results
BOOL LockCriticalSection();
BOOL UnlockCriticalSection();

// Function SendARP of IPHLPAPI.DLL (available on Windows 98 or higher and NT4 SP4 or higher)
DWORD (WINAPI *lpfn_SendARP)(IPAddr DestIP, IPAddr SrcIP, PULONG pMacAddr, PULONG PhyAddrLen);

// Functions from Winsock2
u_long (WINAPI *lpfn_htonl)(u_long hostlong);
u_long (WINAPI *lpfn_ntohl)(u_long netlong);
unsigned long (WINAPI *lpfn_inet_addr)(const char* cp);
char* FAR (WINAPI *lpfn_inet_ntoa)(struct in_addr in);

private: // Attributes
ULONG m_ulIpToScan; // IP to scan
ULONG m_ulNetNumber; // Network scanned
CString m_csLan;
ULONG m_ulHostFound; // Number of hosts found
ULONG m_ulIpDisc_lat; // Latency between each thread
CString m_csLatency;
BOOL m_bFastIp; // Do not wait Latency
CCriticalSection m_cs; // To grant exclusive access
DWORD m_dwMaxWaitTime;
};


#endif // !defined(AFX_IPDISCOVER_H__D6015530_B5EE_45F3_B92A_021A5894341A__INCLUDED_)
64 changes: 32 additions & 32 deletions Agent/CapKeyFinder.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org

// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================

//====================================================================================
// Open Computer and Software Inventory Next Generation
// Copyright (C) 2010 OCS Inventory NG Team. All rights reserved.
// Web: http://www.ocsinventory-ng.org

// This code is open source and may be copied and modified as long as the source
// code is always made freely available.
// Please refer to the General Public Licence V2 http://www.gnu.org/ or Licence.txt
//====================================================================================

#include "stdafx.h"
#include "CapacityAbstract.h"
#include "CapKeyFinder.h"
Expand Down Expand Up @@ -69,26 +69,26 @@ BOOL CCapKeyFinder::decodeMicrosoftKey( LPBYTE lpData, UINT uLength, CString csK
return TRUE;
}

/***
*
* Retrieve the keys from registry
*
***/
BOOL CCapKeyFinder::retrieveKeys()
{
INT_PTR nIndex = 0;
CMapStringToStringArray *pQueryArray = NULL;
CMapStringToString *pQuery = NULL;

try
{
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "KEYFINDER => Searching for software Product Key"));
return TRUE;
}
catch (CException *pEx)
{
pEx->Delete();
m_pLogger->log( LOG_PRIORITY_ERROR, _T( "KEYFINDER => Unknown error while searching for Product Key %ld"), nIndex+1);
return FALSE;
}
/***
*
* Retrieve the keys from registry
*
***/
BOOL CCapKeyFinder::retrieveKeys()
{
INT_PTR nIndex = 0;
CMapStringToStringArray *pQueryArray = NULL;
CMapStringToString *pQuery = NULL;

try
{
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "KEYFINDER => Searching for software Product Key"));
return TRUE;
}
catch (CException *pEx)
{
pEx->Delete();
m_pLogger->log( LOG_PRIORITY_ERROR, _T( "KEYFINDER => Unknown error while searching for Product Key %ld"), nIndex+1);
return FALSE;
}
}
Loading

0 comments on commit 37cff58

Please sign in to comment.