[Openhpi-svn] SF.net SVN: openhpi: [5895] openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c

[<pd...@us...>]

Revision: 5895
Author:   pdphan
Date:     2006-06-29 11:55:27 -0700 (Thu, 29 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/openhpi/?rev=5895&view=rev

Log Message:
-----------
Incorrectly remove Virtual Management Module, bug 1514565

Modified Paths:
--------------
    openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c
Modified: openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c
===================================================================
--- openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c	2006-06-29 18:55:16 UTC (rev 5894)
+++ openhpi/trunk/plugins/snmp_bc/snmp_bc_discover_bc.c	2006-06-29 18:55:27 UTC (rev 5895)
@@ -556,7 +556,7 @@
 	/*********************************** 
 	 * Discover Management Modules (MMs)
 	 ***********************************/
-	err = snmp_bc_discover_mm(handle, ep_root, get_value_mm.string);
+	err = snmp_bc_discover_mm(handle, ep_root, get_value_mm.string, SAHPI_TRUE);
 	if (err != SA_OK) return(err);
 
 	return(SA_OK);
@@ -1477,6 +1477,7 @@
  * @handler: Pointer to handler's data.
  * @ep_root: Pointer to chassis Root Entity Path which comes from openhpi.conf.
  * @mm_vector: Bitmap vector of installed MMs.
+ * @global_discovery: Also include Virtual MM in the discovery
  *
  * Discovers management module (MM) resources and their RDRs.
  *
@@ -1486,7 +1487,7 @@
  * SA_ERR_HPI_INVALID_PARAMS - Pointer parameter(s) NULL.
  **/
 SaErrorT snmp_bc_discover_mm(struct oh_handler_state *handle,
-			  SaHpiEntityPathT *ep_root, char *mm_vector)
+			  SaHpiEntityPathT *ep_root, char *mm_vector, SaHpiBoolT global_discovery)
 {
 
 	int i;
@@ -1512,8 +1513,8 @@
 	e = NULL;
 	res_info_ptr = NULL;
 	
-	/* Discover Virtual MM at time T0 */
-	if (custom_handle->isFirstDiscovery == SAHPI_TRUE)
+	/* Discover Virtual MM */
+	if (global_discovery == SAHPI_TRUE)
 	{			
 		e = (struct oh_event *)g_malloc0(sizeof(struct oh_event));
                 if (e == NULL) {
@@ -2091,7 +2092,7 @@
 				// get_installed_mask(SNMP_BC_MGMNT_VECTOR, get_value);
 				get_installed_mask(SNMP_BC_MM_INSTALLED, get_value);
 				strcpy(custom_handle->installed_mm_mask, get_value.string);
-				err = snmp_bc_discover_mm(handle, &ep_root, resource_mask);
+				err = snmp_bc_discover_mm(handle, &ep_root, resource_mask, SAHPI_FALSE);
 				break;
 			case SAHPI_ENT_PERIPHERAL_BAY:
 				// get_integer_object(custom_handle,SNMP_BC_MEDIATRAY_EXISTS, get_value);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.