Skip to content

Commit 696ddcc

Browse files
gillesduboisgillesdubois
authored
Merge pull request #255 from OCSInventory-NG/get_default_dns_gateway
Retrieve default DNS/Gateway
2 parents c2f7c32 + e984dd9 commit 696ddcc

20 files changed

+215
-55
lines changed

‎Agent/OCSInventory.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ IDR_MAINFRAME ICON "res\\OCSInventory.ico"
3535
//
3636

3737
VS_VERSION_INFO VERSIONINFO
38-
FILEVERSION 2,9,2,0
39-
PRODUCTVERSION 2,9,2,0
38+
FILEVERSION 2,10,0,0
39+
PRODUCTVERSION 2,10,0,0
4040
FILEFLAGSMASK 0x3fL
4141
#ifdef _DEBUG
4242
FILEFLAGS 0x1L
@@ -54,13 +54,13 @@ BEGIN
5454
VALUE "Comments", "OCS Inventory Agent"
5555
VALUE "CompanyName", "OCS Inventory"
5656
VALUE "FileDescription", "OCS Inventory Agent"
57-
VALUE "FileVersion", "2.9.2.0"
57+
VALUE "FileVersion", "2.10.0.0"
5858
VALUE "InternalName", "OCSInventory.exe"
5959
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
6060
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
6161
VALUE "OriginalFilename", "OCSInventory.exe"
6262
VALUE "ProductName", "OCS Inventory Windows Agent"
63-
VALUE "ProductVersion", "2.9.2.0"
63+
VALUE "ProductVersion", "2.10.0.0"
6464
END
6565
END
6666
BLOCK "VarFileInfo"

‎ComHTTP/HTTP.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,9,2,0
29-
PRODUCTVERSION 2,9,2,0
28+
FILEVERSION 2,10,0,0
29+
PRODUCTVERSION 2,10,0,0
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Communication Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory cURL Communication Provider"
47-
VALUE "FileVersion", "2.9.2.0"
47+
VALUE "FileVersion", "2.10.0.0"
4848
VALUE "InternalName", "ComHTTP.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "ComHTTP.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.9.2.0"
53+
VALUE "ProductVersion", "2.10.0.0"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

‎Download/Download.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2828
//
2929

3030
VS_VERSION_INFO VERSIONINFO
31-
FILEVERSION 2,9,2,0
32-
PRODUCTVERSION 2,9,2,0
31+
FILEVERSION 2,10,0,0
32+
PRODUCTVERSION 2,10,0,0
3333
FILEFLAGSMASK 0x17L
3434
#ifdef _DEBUG
3535
FILEFLAGS 0x1L
@@ -47,13 +47,13 @@ BEGIN
4747
VALUE "Comments", "OCS Inventory Package Download and Setup Tool"
4848
VALUE "CompanyName", "OCS Inventory"
4949
VALUE "FileDescription", "OCS Inventory Package Download and Setup Tool"
50-
VALUE "FileVersion", "2.9.2.0"
50+
VALUE "FileVersion", "2.10.0.0"
5151
VALUE "InternalName", "Download.exe"
5252
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5353
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5454
VALUE "OriginalFilename", "Download.exe"
5555
VALUE "ProductName", "OCS Inventory Windows Agent"
56-
VALUE "ProductVersion", "2.9.2.0"
56+
VALUE "ProductVersion", "2.10.0.0"
5757
END
5858
END
5959
BLOCK "VarFileInfo"

‎NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x64.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setcompressor /SOLID lzma
1313
; HM NIS Edit Wizard helper defines
1414
!define PRODUCT_NAME "OCS Inventory NG Agent"
1515
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
16-
!define PRODUCT_VERSION "2.9.2.0"
16+
!define PRODUCT_VERSION "2.10.0.0"
1717
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
1818
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
1919
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"

‎NSIS_agent_setup/OCS-NG_Windows_Agent_Setup_x86.nsi

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ setcompressor /SOLID lzma
1313
; HM NIS Edit Wizard helper defines
1414
!define PRODUCT_NAME "OCS Inventory NG Agent"
1515
!define OLD_PRODUCT_NAME "OCS Inventory Agent"
16-
!define PRODUCT_VERSION "2.9.2.0"
16+
!define PRODUCT_VERSION "2.10.0.0"
1717
!define PRODUCT_PUBLISHER "OCS Inventory NG Team"
1818
!define PRODUCT_WEB_SITE "http://www.ocsinventory-ng.org"
1919
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\OCSInventory.exe"

‎OCSInventory Front/InventoryRequest.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -768,6 +768,14 @@ BOOL CInventoryRequest::runInventory()
768768
m_Device.SetIPAddress( m_pSysInfo->getLocalIP());
769769
m_pLogger->log( LOG_PRIORITY_DEBUG, _T( "INVENTORY => Default IPv4 address is <%s>"),
770770
m_Device.GetIPAddress());
771+
// Get the local Gateway Address
772+
m_Device.SetGatewayAddress(m_pSysInfo->getLocalGateway(m_pSysInfo->getLocalIP()));
773+
m_pLogger->log(LOG_PRIORITY_DEBUG, _T("INVENTORY => Default Gateway address is <%s>"),
774+
m_Device.GetGatewayAddress());
775+
// Get the local DNS Address
776+
m_Device.SetDNSAddress(m_pSysInfo->getLocalDNS());
777+
m_pLogger->log(LOG_PRIORITY_DEBUG, _T("INVENTORY => Default DNS address is <%s>"),
778+
m_Device.GetDNSAddress());
771779
// Get Windows registration info
772780
if (!m_pSysInfo->getWindowsRegistration( cs1, cs2, cs3))
773781
m_pLogger->log( LOG_PRIORITY_WARNING, _T( "INVENTORY => Failed to retrieve system registration"));

‎OCSInventory Front/OCSInventory Front.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,9,2,0
29-
PRODUCTVERSION 2,9,2,0
28+
FILEVERSION 2,10,0,0
29+
PRODUCTVERSION 2,10,0,0
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Framework Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory Framework Provider"
47-
VALUE "FileVersion", "2.9.2.0"
47+
VALUE "FileVersion", "2.10.0.0"
4848
VALUE "InternalName", "OCSInventory Front.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OCSInventory Front.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.9.2.0"
53+
VALUE "ProductVersion", "2.10.0.0"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

‎OCSInventory Front/XMLInteract.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,8 @@ BOOL CXMLInteract::UpdateDeviceProperties( CDeviceProperties &pPC)
297297
m_pXml->AddChildElem( _T( "MEMORY"), pPC.GetPhysicalMemory());
298298
m_pXml->AddChildElem( _T( "SWAP"), pPC.GetPageFileSize());
299299
m_pXml->AddChildElem( _T( "IPADDR"), pPC.GetIPAddress());
300+
m_pXml->AddChildElem( _T( "DNS"), pPC.GetDNSAddress());
301+
m_pXml->AddChildElem( _T( "DEFAULTGATEWAY"), pPC.GetGatewayAddress());
300302
m_pXml->AddChildElem( _T( "ETIME"), pPC.GetExecutionDuration());
301303
m_pXml->AddChildElem( _T( "LASTDATE"), pPC.GetLastCheckDate());
302304
m_pXml->AddChildElem( _T( "USERID"), pPC.GetLoggedOnUser());

‎OcsNotifyUser/OcsNotifyUser.rc

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#undef APSTUDIO_READONLY_SYMBOLS
1717

1818
/////////////////////////////////////////////////////////////////////////////
19-
// Anglais resources
19+
// Anglais (neutre) resources
2020

2121
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
2222
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
@@ -127,12 +127,12 @@ BEGIN
127127
AFX_IDS_APP_TITLE "OCS Inventory for Windows Notification"
128128
END
129129

130-
#endif // Anglais resources
130+
#endif // Anglais (neutre) resources
131131
/////////////////////////////////////////////////////////////////////////////
132132

133133

134134
/////////////////////////////////////////////////////////////////////////////
135-
// Espagnol resources
135+
// Espagnol (neutre) resources
136136

137137
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
138138
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -243,12 +243,12 @@ BEGIN
243243
AFX_IDS_APP_TITLE "OCS Inventory for Windows Notification"
244244
END
245245

246-
#endif // Espagnol resources
246+
#endif // Espagnol (neutre) resources
247247
/////////////////////////////////////////////////////////////////////////////
248248

249249

250250
/////////////////////////////////////////////////////////////////////////////
251-
// Fran�ais resources
251+
// Fran�ais (neutre) resources
252252

253253
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
254254
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -359,7 +359,7 @@ BEGIN
359359
AFX_IDS_APP_TITLE "OCS Inventory for Windows Notification"
360360
END
361361

362-
#endif // Fran�ais resources
362+
#endif // Fran�ais (neutre) resources
363363
/////////////////////////////////////////////////////////////////////////////
364364

365365

@@ -386,8 +386,8 @@ IDR_MAINFRAME ICON "..\\Agent\\res\\OCSInventory.ic
386386
//
387387

388388
VS_VERSION_INFO VERSIONINFO
389-
FILEVERSION 2,9,2,0
390-
PRODUCTVERSION 2,9,2,0
389+
FILEVERSION 2,10,0,0
390+
PRODUCTVERSION 2,10,0,0
391391
FILEFLAGSMASK 0x3fL
392392
#ifdef _DEBUG
393393
FILEFLAGS 0x1L
@@ -405,13 +405,13 @@ BEGIN
405405
VALUE "Comments", "OCS Inventory User Notification Provider"
406406
VALUE "CompanyName", "OCS Inventory"
407407
VALUE "FileDescription", "OCS Inventory User Notification Provider"
408-
VALUE "FileVersion", "2.9.2.0"
408+
VALUE "FileVersion", "2.10.0.0"
409409
VALUE "InternalName", "OcsNotifyUser.exe"
410410
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
411411
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
412412
VALUE "OriginalFilename", "OcsNotifyUser.exe"
413413
VALUE "ProductName", "OCS Inventory Windows Agent"
414-
VALUE "ProductVersion", "2.9.2.0"
414+
VALUE "ProductVersion", "2.10.0.0"
415415
END
416416
END
417417
BLOCK "VarFileInfo"

‎OcsSystray/OcsSystray.rc

+10-10
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#undef APSTUDIO_READONLY_SYMBOLS
1717

1818
/////////////////////////////////////////////////////////////////////////////
19-
// Anglais resources
19+
// Anglais (neutre) resources
2020

2121
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
2222
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
@@ -131,12 +131,12 @@ BEGIN
131131
"Cannot display inventory informations !\n\nReason: %s"
132132
END
133133

134-
#endif // Anglais resources
134+
#endif // Anglais (neutre) resources
135135
/////////////////////////////////////////////////////////////////////////////
136136

137137

138138
/////////////////////////////////////////////////////////////////////////////
139-
// Espagnol resources
139+
// Espagnol (neutre) resources
140140

141141
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ESN)
142142
LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -251,12 +251,12 @@ BEGIN
251251
"No se puede mostrar la informaci�n del inventario ! Raz�n: %s"
252252
END
253253

254-
#endif // Espagnol resources
254+
#endif // Espagnol (neutre) resources
255255
/////////////////////////////////////////////////////////////////////////////
256256

257257

258258
/////////////////////////////////////////////////////////////////////////////
259-
// Fran�ais resources
259+
// Fran�ais (neutre) resources
260260

261261
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_FRA)
262262
LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
@@ -371,7 +371,7 @@ BEGIN
371371
"Impossible d'afficher les informations d'inventaire !\n\nRaison: %s"
372372
END
373373

374-
#endif // Fran�ais resources
374+
#endif // Fran�ais (neutre) resources
375375
/////////////////////////////////////////////////////////////////////////////
376376

377377

@@ -388,8 +388,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
388388
//
389389

390390
VS_VERSION_INFO VERSIONINFO
391-
FILEVERSION 2,9,2,0
392-
PRODUCTVERSION 2,9,2,0
391+
FILEVERSION 2,10,0,0
392+
PRODUCTVERSION 2,10,0,0
393393
FILEFLAGSMASK 0x17L
394394
#ifdef _DEBUG
395395
FILEFLAGS 0x1L
@@ -407,13 +407,13 @@ BEGIN
407407
VALUE "Comments", "OCS Inventory Systray applet"
408408
VALUE "CompanyName", "OCS Inventory"
409409
VALUE "FileDescription", "OCS Inventory Systray applet"
410-
VALUE "FileVersion", "2.9.2.0"
410+
VALUE "FileVersion", "2.10.0.0"
411411
VALUE "InternalName", "OcsSystray.exe"
412412
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
413413
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
414414
VALUE "OriginalFilename", "OcsSystray.exe"
415415
VALUE "ProductName", "OCS Inventory Windows Agent"
416-
VALUE "ProductVersion", "2.9.2.0"
416+
VALUE "ProductVersion", "2.10.0.0"
417417
END
418418
END
419419
BLOCK "VarFileInfo"

‎OcsWmi/OcsWmi.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,9,2,0
29-
PRODUCTVERSION 2,9,2,0
28+
FILEVERSION 2,10,0,0
29+
PRODUCTVERSION 2,10,0,0
3030
FILEFLAGSMASK 0x3fL
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory WMI Provider"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory WMI Provider"
47-
VALUE "FileVersion", "2.9.2.0"
47+
VALUE "FileVersion", "2.10.0.0"
4848
VALUE "InternalName", "OcsWmi.dll"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OcsWmi.dll"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.9.2.0"
53+
VALUE "ProductVersion", "2.10.0.0"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

‎Service/Service.rc

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
2525
//
2626

2727
VS_VERSION_INFO VERSIONINFO
28-
FILEVERSION 2,9,2,0
29-
PRODUCTVERSION 2,9,2,0
28+
FILEVERSION 2,10,0,0
29+
PRODUCTVERSION 2,10,0,0
3030
FILEFLAGSMASK 0x17L
3131
#ifdef _DEBUG
3232
FILEFLAGS 0x1L
@@ -44,13 +44,13 @@ BEGIN
4444
VALUE "Comments", "OCS Inventory Service"
4545
VALUE "CompanyName", "OCS Inventory"
4646
VALUE "FileDescription", "OCS Inventory Service"
47-
VALUE "FileVersion", "2.9.2.0"
47+
VALUE "FileVersion", "2.10.0.0"
4848
VALUE "InternalName", "OcsService.exe"
4949
VALUE "LegalCopyright", "Open Source Software released under GNU General Public License V2"
5050
VALUE "LegalTrademarks", "http://www.ocsinventory-ng.org"
5151
VALUE "OriginalFilename", "OcsService.exe"
5252
VALUE "ProductName", "OCS Inventory Windows Agent"
53-
VALUE "ProductVersion", "2.9.2.0"
53+
VALUE "ProductVersion", "2.10.0.0"
5454
END
5555
END
5656
BLOCK "VarFileInfo"

0 commit comments

Comments
 (0)