Attachment 158871 Details for Bug 247646 – customer-provided patch said to correct problem

[patch] customer-provided patch said to correct problem

openhpi-2.8.1-snmp_bc_discover.patch (text/plain), 3.62 KB, created by Vince Worthington on 2007-07-10 17:19:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Vince Worthington

Created: 2007-07-10 17:19:42 UTC

Size: 3.62 KB

patch

obsolete

>--- openhpi-2.8.1/plugins/snmp_bc/snmp_bc_discover_bc.c.orig	2007-06-21 12:30:59.000000000 +0300
>+++ openhpi-2.8.1/plugins/snmp_bc/snmp_bc_discover_bc.c	2007-06-21 12:31:13.000000000 +0300
>@@ -399,6 +399,41 @@ char *bladeexpansiondesc[] = {
> 		"Blade PCI I/O Expansion, PEU"
> };		
> 
>+#define get_dualmode_object2(strOID, maskOID, getintvalue) \
>+do { \
>+	err = snmp_bc_snmp_get(custom_handle, maskOID, &getintvalue, SAHPI_TRUE); \
>+	if (err == SA_ERR_HPI_NOT_PRESENT) { \
>+		getintvalue.type = ASN_INTEGER; \
>+		getintvalue.integer = 0; \
>+	} else if (err != SA_OK) { \
>+		trace("Cannot get OID=%s; Received Type=%d; Error=%s.", \
>+		      maskOID, getintvalue.type, oh_lookup_error(err)); \
>+		dbg("Cannot get OID=%s ('%s' info)", maskOID, strOID); \
>+	} else { \
>+        	if (getintvalue.type == ASN_OCTET_STR) { \
>+			getintvalue.integer = atoi(getintvalue.string); \
>+        	} else if (getintvalue.type == ASN_INTEGER) { \
>+			if (getintvalue.integer == 1) getintvalue.integer = 10;  \
>+		} \
>+	} \
>+} while(0)
>+
>+#define get_installed_mask2(strOID, maskOID, getvalue) \
>+do { \
>+	err = snmp_bc_snmp_get(custom_handle, maskOID, &getvalue, SAHPI_TRUE); \
>+        if (err || getvalue.type != ASN_OCTET_STR) { \
>+		trace("Cannot get OID=%s; Received Type=%d; Error=%s.", \
>+		      maskOID, getvalue.type, oh_lookup_error(err)); \
>+		dbg("Cannot get OID=%s ('%s' info)", maskOID, strOID); \
>+	} else if (err == SA_ERR_HPI_NOT_PRESENT) { \
>+		getvalue.type = ASN_OCTET_STR; \
>+		memset(&getvalue.string, '0', SNMP_BC_MAX_RESOURCES_MASK); \
>+		getvalue.string[SNMP_BC_MAX_RESOURCES_MASK -1] = '\0'; \
>+	} else { \
>+		return(SA_ERR_HPI_INTERNAL_ERROR); \
>+	} \
>+} while(0)
>+
> /**
>  * snmp_bc_discover:
>  * @handler: Pointer to handler's data.
>@@ -468,26 +503,31 @@ SaErrorT snmp_bc_discover(struct oh_hand
> 	
> 
> 	/* Fetch filter (front bezel) installed vector */
>-	get_dualmode_object(SNMP_BC_FILTER_INSTALLED, get_value_filter);
>-		
>+	// get_dualmode_object(SNMP_BC_FILTER_INSTALLED, get_value_filter);
>+	get_dualmode_object2("FILTER", SNMP_BC_FILTER_INSTALLED, get_value_filter);
>+
> 	/* Fetch blower installed vector  */
> 	get_installed_mask(SNMP_BC_BLOWER_INSTALLED, get_value_blower);
>-	
>+
> 	/* Fetch telco-alarm-panel installed vector  */
>-	get_installed_mask(SNMP_BC_AP_INSTALLED, get_value_tap);
>-	
>+	// get_installed_mask(SNMP_BC_AP_INSTALLED, get_value_tap);
>+	get_installed_mask2("TELCO-ALARM-PANEL", SNMP_BC_AP_INSTALLED, get_value_tap);
>+
> 	/* Fetch network-clock-card installed vector  */
>-	get_installed_mask(SNMP_BC_NC_INSTALLED, get_value_nc);
>-	
>+	// get_installed_mask(SNMP_BC_NC_INSTALLED, get_value_nc);
>+	get_installed_mask2("NETWORK-CLOCK-CARD", SNMP_BC_AP_INSTALLED, get_value_tap);
>+
> 	/* Fetch mux-card installed vector  */
>-	get_installed_mask(SNMP_BC_MX_INSTALLED, get_value_mx);
>+	// get_installed_mask(SNMP_BC_MX_INSTALLED, get_value_mx);
>+	get_installed_mask2("MUX-CARD", SNMP_BC_MX_INSTALLED, get_value_mx);
> 	
> 	/* Fetch switch interposer-card installed vector  */
> 	get_installed_mask(SNMP_BC_SMI_INSTALLED, get_value_smi);
> 	
> 	/* Fetch mm interposer-card installed vector  */
>-	get_installed_mask(SNMP_BC_MMI_INSTALLED, get_value_mmi);	
>-						
>+	// get_installed_mask(SNMP_BC_MMI_INSTALLED, get_value_mmi);	
>+	get_installed_mask2("INTERPOSER-CARD", SNMP_BC_MMI_INSTALLED, get_value_mmi);	
>+
> 	if (  (g_ascii_strncasecmp(get_value_blade.string, custom_handle->installed_pb_mask, get_value_blade.str_len) == 0) &&
> 		(g_ascii_strncasecmp(get_value_blower.string, custom_handle->installed_blower_mask, get_value_blower.str_len) == 0) &&
> 		(g_ascii_strncasecmp(get_value_power_module.string, custom_handle->installed_pm_mask, get_value_power_module.str_len) == 0) &&

Actions: View | Diff

Attachments on bug 247646: 158871