Merge lp:~linux-jacekk/ocsinventory-windows-agent/motherboard-data into lp:ocsinventory-windows-agent

[Jacek Kowalski]

In OCS Unified Unix Agent (written in Perl), the following properties have been introduced: MMANUFACTURER, MMODEL, MSN. These are not currently read by OCS server, but there are patches making it possible to use those properties.

See:
https://blueprints.launchpad.net/ocsinventory-server/+spec/motherboard-info
http://forums.ocsinventory-ng.org/viewtopic.php?id=5579

[Didier Liroulet (dliroulet)]

review: Approve

[TroubleMakerDV (grayman2000)]

Are there any plans on implementing that in new agent's version? I patched the latest XAMP server, but latest windows agent does not send these fields to server.
FusionInventory agent does, BTW!

=== modified file 'OCSInventory Front/XMLInteract.cpp'
--- OCSInventory Front/XMLInteract.cpp	2013-12-30 15:13:32 +0000
+++ OCSInventory Front/XMLInteract.cpp	2014-06-25 16:43:43 +0000
@@ -44,6 +44,9 @@
 		m_pXml->AddChildElem( _T( "BMANUFACTURER"), myBios.GetBiosManufacturer());
 		m_pXml->AddChildElem( _T( "BVERSION"), myBios.GetBiosVersion());
 		m_pXml->AddChildElem( _T( "BDATE"), myBios.GetBiosDate());
+		m_pXml->AddChildElem( _T( "MMANUFACTURER"), myBios.GetMotherboardManufacturer());
+		m_pXml->AddChildElem( _T( "MMODEL"), myBios.GetMotherboardModel());
+		m_pXml->AddChildElem( _T( "MSN"), myBios.GetMotherboardSerialNumber());
 		m_pXml->AddChildElem( _T( "ASSETTAG"), myBios.GetAssetTag());
 	m_pXml->OutOfElem();
 	return TRUE;
@@ -74,6 +77,12 @@
 			myBios.SetBiosVersion( m_pXml->GetData( pXmlElement));
 			pXmlElement = m_pXml->FindFirstElem( _T( "BDATE"), pXml);
 			myBios.SetBiosDate( m_pXml->GetData( pXmlElement));
+			pXmlElement = m_pXml->FindFirstElem( _T( "MMANUFACTURER"), pXml);
+			myBios.SetMotherboardManufacturer( m_pXml->GetData( pXmlElement));
+			pXmlElement = m_pXml->FindFirstElem( _T( "MMODEL"), pXml);
+			myBios.SetMotherboardModel( m_pXml->GetData( pXmlElement));
+			pXmlElement = m_pXml->FindFirstElem( _T( "MSN"), pXml);
+			myBios.SetMotherboardSerialNumber( m_pXml->GetData( pXmlElement));
 			pXmlElement = m_pXml->FindFirstElem( _T( "ASSETTAG"), pXml);
 			myBios.SetAssetTag( m_pXml->GetData( pXmlElement));
 		}

=== modified file 'SysInfo/DMI.cpp'
--- SysInfo/DMI.cpp	2014-04-09 17:35:05 +0000
+++ SysInfo/DMI.cpp	2014-06-25 16:43:43 +0000
@@ -329,7 +329,7 @@
 			csType,
 			csAssetTag;
 
-	pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
+	pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
 	// First, get BIOS Info
 	if (!GetBios( csVendor, csVersion, csDate))
 		return FALSE;
@@ -358,10 +358,9 @@
 	{
 		if (!pMyBios->IsValidAssetTag())
 			pMyBios->SetAssetTag( csAssetTag);
-		if (!pMyBios->IsValidSystemManufacturer())
-			pMyBios->SetSystemManufacturer( csManufacturer);
-		if (!pMyBios->IsValidSystemModel())
-			pMyBios->SetSystemModel( csModel);
+		pMyBios->SetMotherboardManufacturer( csManufacturer);
+		pMyBios->SetMotherboardModel( csModel);
+		pMyBios->SetMotherboardSerialNumber( csSN);
 	}
 	return TRUE;
 }

=== modified file 'SysInfo/Registry.cpp'
--- SysInfo/Registry.cpp	2014-06-25 15:19:39 +0000
+++ SysInfo/Registry.cpp	2014-06-25 16:43:43 +0000
@@ -62,6 +62,8 @@
 #define NT_BIOS_MANUFACTURER_VALUE				_T( "BIOSName")
 #define NT_BIOS_VERSION_VALUE					_T( "SystemBiosVersion")
 #define NT_BIOS_DATE_VALUE						_T( "SystemBiosDate")
+#define NT_BASEBOARD_MANUFACTURER_VALUE			_T("BaseBoardManufacturer")
+#define NT_BASEBOARD_MODEL_VALUE			_T("BaseBoardProduct")
 
 // Defines for retrieving BIOS from Vista registry
 #define VISTA_BIOS_KEY							_T( "HARDWARE\\Description\\System\\BIOS")
@@ -460,7 +462,8 @@
 	default:
 		// Unknown
 		pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE
-					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
+					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE,
+					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
 		AddLog( _T( "Registry GetBiosInfo:\n\tFailed because unsupported or unrecognized OS !\n"));
 		return FALSE;
 	}
@@ -556,6 +559,34 @@
 		{
 			pMyBios->SetBiosDate( csValue);
 		}
+		// Get Motherboard manufacturer
+		lResult = GetValue( hKey, NT_BASEBOARD_MANUFACTURER_VALUE, csValue);
+		if (lResult != ERROR_SUCCESS)
+		{
+			AddLog( _T( "\tFailed in call to <RegQueryValueEx> function for HKLM\\%s\\%s !\n"),
+					NT_BIOS_KEY, NT_BASEBOARD_MANUFACTURER_VALUE);
+			pMyBios->SetMotherboardManufacturer( NOT_AVAILABLE);
+			bManufacturer = FALSE;
+		}
+		else
+		{
+			pMyBios->SetMotherboardManufacturer( csValue);
+			bManufacturer = TRUE;
+		}
+		// Get Motherboard model
+		lResult = GetValue( hKey, NT_BASEBOARD_MODEL_VALUE, csValue);
+		if (lResult != ERROR_SUCCESS)
+		{
+			AddLog( _T( "\tFailed in call to <RegQueryValueEx> function for HKLM\\%s\\%s !\n"),
+					NT_BIOS_KEY, NT_BASEBOARD_MODEL_VALUE);
+			pMyBios->SetMotherboardModel( NOT_AVAILABLE);
+			bModel = FALSE;
+		}
+		else
+		{
+			pMyBios->SetMotherboardModel( csValue);
+			bModel = TRUE;
+		}
 		// Get machine type
 		lResult = GetValue( hKey, NT_BIOS_MACHINE_TYPE_VALUE, csValue);
 		if (lResult != ERROR_SUCCESS)
@@ -578,7 +609,8 @@
 		AddLog( _T( "\tFailed in call to <RegOpenKeyEx> function for HKLM\\%s !\n"),
 				NT_BIOS_KEY);
 		pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE
-					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
+			      NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE,
+			      NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
 	}
 	AddLog( _T( "\tOK.\n"));
 	return TRUE;
@@ -695,7 +727,8 @@
 		AddLog( _T( "\tFailed in call to <RegOpenKeyEx> function for HKLM\\%s !\n"),
 				VISTA_BIOS_KEY);
 		pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE
-					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
+					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE,
+					  NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
 	}
 	AddLog( _T( "\tOK.\n"));
 	return TRUE;

=== modified file 'SysInfo/Wmi.cpp'
--- SysInfo/Wmi.cpp	2014-03-10 12:55:35 +0000
+++ SysInfo/Wmi.cpp	2014-06-25 16:43:43 +0000
@@ -218,7 +218,7 @@
 	if (!m_bConnected)
 		return bResult;
 
-	pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
+	pMyBios->Set( NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE, NOT_AVAILABLE);
 	// GET BIOS Informations
 	if (GetBios( csManufacturer, csBiosVer, csRdate, csSN))
 	{
@@ -245,15 +245,12 @@
 		pMyBios->SetAssetTag( csAssetTag);
 		bResult = TRUE;
 	}
+	// Try to use baseboard object to get Motherboard manufacturer, model & S/N
 	if (GetBaseBoard( csManufacturer, csModel, csSN))
 	{
-		// System enclosure not available => use mother board object
-		if (!pMyBios->IsValidSystemManufacturer())
-			pMyBios->SetSystemManufacturer( csManufacturer);
-		if (!pMyBios->IsValidSystemModel())
-			pMyBios->SetSystemModel( csModel);
-		if (!pMyBios->IsValidSystemSerialNumber())
-			pMyBios->SetSystemSerialNumber( csSN);
+		pMyBios->SetMotherboardManufacturer( csManufacturer);
+		pMyBios->SetMotherboardModel( csModel);
+		pMyBios->SetMotherboardSerialNumber( csSN);
 	}
 	return bResult;
 }
@@ -1293,7 +1290,7 @@
 				csBuffer = m_dllWMI.GetClassObjectStringValue( _T( "ShareName"));
 				myObject.SetShareName( csBuffer);
 				csBuffer = m_dllWMI.GetClassObjectStringValue( _T( "HorizontalResolution"));
-				if (!csBuffer.IsEmpty())
+				if (!csBuffer.IsEmpty())
 				{
 					csBuffer.AppendFormat( _T( " x %s"), m_dllWMI.GetClassObjectStringValue( _T( "VerticalResolution")));
 					myObject.SetResolution( csBuffer);

=== modified file 'SysInfo/bios.cpp'
--- SysInfo/bios.cpp	2012-10-25 22:48:46 +0000
+++ SysInfo/bios.cpp	2014-06-25 16:43:43 +0000
@@ -71,7 +71,9 @@
 	}
 }
 
-void CBios::Set( LPCTSTR lpstrSystemManufacturer, LPCTSTR lpstrSystemModel, LPCTSTR lpstrSystemSerialNumber, LPCTSTR lpstrMachineType, LPCTSTR lpstrBiosManufacturer, LPCTSTR lpstrBiosVersion, LPCTSTR lpstrBiosDate)
+void CBios::Set( LPCTSTR lpstrSystemManufacturer, LPCTSTR lpstrSystemModel, LPCTSTR lpstrSystemSerialNumber, LPCTSTR lpstrMachineType,
+		 LPCTSTR lpstrBiosManufacturer, LPCTSTR lpstrBiosVersion, LPCTSTR lpstrBiosDate,
+		 LPCTSTR lpstrMotherboardManufacturer, LPCTSTR lpstrMotherboardModel, LPCTSTR lpstrMotherboardSerialNumber)
 {
 	m_csSystemManufacturer = lpstrSystemManufacturer;
 	StrForSQL( m_csSystemManufacturer);
@@ -87,6 +89,12 @@
 	StrForSQL( m_csBiosVersion);
 	m_csBiosDate = lpstrBiosDate;
 	StrForSQL( m_csBiosDate);
+	m_csMotherboardManufacturer = lpstrMotherboardManufacturer;
+	StrForSQL(m_csMotherboardManufacturer);
+	m_csMotherboardModel = lpstrMotherboardModel;
+	StrForSQL(m_csMotherboardModel);
+	m_csMotherboardSerialNumber = lpstrMotherboardSerialNumber;
+	StrForSQL(m_csMotherboardSerialNumber);
 }
 
 void CBios::SetSystemManufacturer(LPCTSTR lpstrSystemManufacturer)
@@ -148,6 +156,25 @@
 	StrForSQL( m_csBiosDate);
 }
 
+void CBios::SetMotherboardManufacturer(LPCTSTR lpstrMotherboardManufacturer)
+{
+	m_csMotherboardManufacturer = lpstrMotherboardManufacturer;
+	StrForSQL( m_csMotherboardManufacturer);
+}
+
+void CBios::SetMotherboardModel(LPCTSTR lpstrMotherboardModel)
+{
+	m_csMotherboardModel = lpstrMotherboardModel;
+	StrForSQL( m_csMotherboardModel);
+}
+
+void CBios::SetMotherboardSerialNumber(LPCTSTR lpstrMotherboardSerialNumber)
+{
+	m_csMotherboardSerialNumber = lpstrMotherboardSerialNumber;
+	StrForSQL( m_csMotherboardSerialNumber);
+}
+
+
 void CBios::SetAssetTag(LPCTSTR lpstrTag)
 {
 	m_csAssetTag = lpstrTag;
@@ -189,6 +216,21 @@
 	return m_csBiosDate;
 }
 
+LPCTSTR CBios::GetMotherboardManufacturer()
+{
+	return m_csMotherboardManufacturer;
+}
+
+LPCTSTR CBios::GetMotherboardModel()
+{
+	return m_csMotherboardModel;
+}
+
+LPCTSTR CBios::GetMotherboardSerialNumber()
+{
+	return m_csMotherboardSerialNumber;
+}
+
 LPCTSTR CBios::GetAssetTag()
 {
 	return m_csAssetTag;

=== modified file 'SysInfo/bios.h'
--- SysInfo/bios.h	2010-07-07 20:56:04 +0000
+++ SysInfo/bios.h	2014-06-25 16:43:43 +0000
@@ -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
+//====================================================================================
+
 // BIOSInfo.h: interface for the CBios class.
 //
 //////////////////////////////////////////////////////////////////////
@@ -15,7 +15,7 @@
 #if !defined(AFX_BIOS_H__0769B90F_185D_424A_A8E9_121705E35122__INCLUDED_)
 #define AFX_BIOS_H__0769B90F_185D_424A_A8E9_121705E35122__INCLUDED_
 
-#pragma once
+#pragma once
 
 #include "SysInfoClasses.h"
 
@@ -49,6 +49,12 @@
 	LPCTSTR GetBiosVersion();
 	// Return the BIOS Date
 	LPCTSTR GetBiosDate();
+	// Return the Motherboard manufacturer
+	LPCTSTR GetMotherboardManufacturer();
+	// Return the Motherboard model
+	LPCTSTR GetMotherboardModel();
+	// Return the Motherboard S/N
+	LPCTSTR GetMotherboardSerialNumber();
 	// Return the Asset Tag
 	LPCTSTR GetAssetTag();
 	// Get hash code of data, to determine if changed since last inventory
@@ -66,7 +72,9 @@
 	// Clear BIOS infos
 	void Clear();
 	// Set all BIOSInfo attributes
-	void Set( LPCTSTR lpstrSystemManufacturer, LPCTSTR lpstrSystemModel, LPCTSTR lpstrSystemSerialNumber, LPCTSTR lpstrMachineType, LPCTSTR lpstrBiosManufacturer, LPCTSTR lpstrBiosVersion, LPCTSTR lpstrBiosDate);
+	void Set( LPCTSTR lpstrSystemManufacturer, LPCTSTR lpstrSystemModel, LPCTSTR lpstrSystemSerialNumber, LPCTSTR lpstrMachineType,
+		  LPCTSTR lpstrBiosManufacturer, LPCTSTR lpstrBiosVersion, LPCTSTR lpstrBiosDate,
+		  LPCTSTR lpstrMotherboardManufacturer, LPCTSTR lpstrMotherboardModel, LPCTSTR lpstrMotherboardSerialNumber);
 	// Set System manufacturer
 	void SetSystemManufacturer( LPCTSTR lpstrManufacturer);
 	// Set System model
@@ -82,6 +90,12 @@
 	// Set BIOS date
 	void SetBiosDate( LPCTSTR lpstrBiosDate);
 	void SetBiosDateFormat( LPCTSTR lpstrBiosDate);
+	// Set Motherboard manufacturer
+	void SetMotherboardManufacturer( LPCTSTR lpstrManufacturer);
+	// Set Motherboard model
+	void SetMotherboardModel( LPCTSTR lpstrModel);
+	// Set Motherboard serial number
+	void SetMotherboardSerialNumber( LPCTSTR lpstrSerialNumber);
 	// Set ASSET TAG
 	void SetAssetTag( LPCTSTR lpstrTag);
 
@@ -99,6 +113,9 @@
 	CString		m_csBiosManufacturer;	// BIOS manufacturer
 	CString		m_csBiosVersion;		// BIOS version
 	CString		m_csBiosDate;			// BIOS Date
+	CString		m_csMotherboardManufacturer;	// Motherboard manufacturer
+	CString		m_csMotherboardModel;		// Motherboard model
+	CString		m_csMotherboardSerialNumber;	// Motherboard serial number
 	CString		m_csAssetTag;			// Asset Tag
 };
 #endif // !defined(AFX_BIOS_H__0769B90F_185D_424A_A8E9_121705E35122__INCLUDED_)