X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fipmi.c;h=66b465e8f830d10db5d44155c04091b453fd3e03;hb=9e869ebe3a5127575105d82c4d289d95cbed2db9;hp=840fdee5d6dada2e2bc959aaec340fefaa891040;hpb=0e8f8a64666558ed53bf25788bcce2167ff97890;p=petitboot

diff --git a/discover/ipmi.c b/discover/ipmi.c
index 840fdee..66b465e 100644
--- a/discover/ipmi.c
+++ b/discover/ipmi.c
@@ -306,7 +306,6 @@ int parse_ipmi_interface_override(struct config *config, uint8_t *buf,
 			return -1;
 		}
 		ifconf->static_config.gateway = gatewaystr;
-		i += ipsize;
 	}
 
 	ifconf->override = true;
@@ -326,6 +325,7 @@ void ipmi_get_bmc_mac(struct ipmi *ipmi, uint8_t *buf)
 	uint16_t resp_len = 8;
 	uint8_t resp[8];
 	uint8_t req[] = { 0x1, 0x5, 0x0, 0x0 };
+	char *debug_buf;
 	int i, rc;
 
 	rc = ipmi_transaction(ipmi, IPMI_NETFN_TRANSPORT,
@@ -334,14 +334,15 @@ void ipmi_get_bmc_mac(struct ipmi *ipmi, uint8_t *buf)
 			resp, &resp_len,
 			ipmi_timeout);
 
-	pb_debug_fn("BMC MAC resp [%d][%d]:\n", rc, resp_len);
+	debug_buf = format_buffer(ipmi, resp, resp_len);
+	pb_debug_fn("BMC MAC resp [%d][%d]:\n%s\n",
+			rc, resp_len, debug_buf);
+	talloc_free(debug_buf);
 
 	if (rc == 0 && resp_len > 0) {
 		for (i = 2; i < resp_len; i++) {
-		        pb_debug(" %x", resp[i]);
 			buf[i - 2] = resp[i];
 		}
-		pb_debug("\n");
 	}
 
 }
@@ -354,7 +355,8 @@ void ipmi_get_bmc_versions(struct ipmi *ipmi, struct system_info *info)
 {
 	uint16_t resp_len = 16;
 	uint8_t resp[16], bcd;
-	int i, rc;
+	char *debug_buf;
+	int rc;
 
 	/* Retrieve info from current side */
 	rc = ipmi_transaction(ipmi, IPMI_NETFN_APP,
@@ -363,13 +365,10 @@ void ipmi_get_bmc_versions(struct ipmi *ipmi, struct system_info *info)
 			resp, &resp_len,
 			ipmi_timeout);
 
-	pb_debug_fn("BMC version resp [%d][%d]:\n", rc, resp_len);
-	if (resp_len > 0) {
-		for (i = 0; i < resp_len; i++) {
-		        pb_debug(" %x", resp[i]);
-		}
-		pb_debug("\n");
-	}
+	debug_buf = format_buffer(ipmi, resp, resp_len);
+	pb_debug_fn("BMC version resp [%d][%d]:\n%s\n",
+			rc, resp_len, debug_buf);
+	talloc_free(debug_buf);
 
 	if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
 		info->bmc_current = talloc_array(info, char *, 4);
@@ -407,13 +406,10 @@ void ipmi_get_bmc_versions(struct ipmi *ipmi, struct system_info *info)
 			resp, &resp_len,
 			ipmi_timeout);
 
-	pb_debug_fn("BMC golden resp [%d][%d]:\n", rc, resp_len);
-	if (resp_len > 0) {
-		for (i = 0; i < resp_len; i++) {
-		        pb_debug(" %x", resp[i]);
-		}
-		pb_debug("\n");
-	}
+	debug_buf = format_buffer(ipmi, resp, resp_len);
+	pb_debug_fn("BMC golden resp [%d][%d]:\n%s\n",
+			rc, resp_len, debug_buf);
+	talloc_free(debug_buf);
 
 	if (rc == 0 && (resp_len == 12 || resp_len == 16)) {
 		info->bmc_golden = talloc_array(info, char *, 4);