Эх сурвалжийг харах

ipmitool lan set 1 ipaddr ok, but not save when power off

zhangbo 3 жил өмнө
parent
commit
6446024779

+ 27 - 26
app/bmc/Api.c

@@ -49,32 +49,7 @@ int PlatformInit(void)
 
 	
 	
-	//LAN地址
-	LanInfo_T *pSetLanInfo = &g_BMCInfo.IpmiConfig.LanInfo[0];
-	// strcpy(pSetLanInfo->EthName, "eth0");
-	// pSetLanInfo->IPAddrSrc 	= 	0x01;	//static
-	pSetLanInfo->IPAddr[0] = 192;
-	pSetLanInfo->IPAddr[1] = 168;
-	pSetLanInfo->IPAddr[2] = 1;		//网段
-	pSetLanInfo->IPAddr[3] = 120+g_BMCInfo.SlotID; 
-	pSetLanInfo->BroadCast[0] = 192;
-	pSetLanInfo->BroadCast[1] = 168; 
-	pSetLanInfo->BroadCast[2] = 1; //网段
-	pSetLanInfo->BroadCast[3] = 255;	
-	pSetLanInfo->NetMask[0] = 255; 
-	pSetLanInfo->NetMask[1] = 255; 
-	pSetLanInfo->NetMask[2] = 255;
-	pSetLanInfo->NetMask[3] = 0;
-	pSetLanInfo->DefaultGW[0] 	= 	pSetLanInfo->IPAddr[0];
-	pSetLanInfo->DefaultGW[1] 	= 	pSetLanInfo->IPAddr[1];
-	pSetLanInfo->DefaultGW[2] 	= 	pSetLanInfo->IPAddr[2];
-	pSetLanInfo->DefaultGW[3] 	= 	1;
-	pSetLanInfo->MACAddr[0]	=	0; //no default mac
-	pSetLanInfo->MACAddr[1]	=	0;
-	pSetLanInfo->MACAddr[2]	=	0;
-	pSetLanInfo->MACAddr[3]	=	0;
-	pSetLanInfo->MACAddr[4]	=	0;
-	pSetLanInfo->MACAddr[5]	=	0;
+	
 
 	//机箱及刀片信息
 	g_BMCInfo.ChassisIdentify		=	FALSE;
@@ -345,6 +320,32 @@ int Init_IPMI_FRU_SDR_SEL(void)
 		memset(gSensorHistoryInfo, 0, sizeof(SensorHistoryInfo_T)*SENSOR_NUMBERS);
 		FlushSensorHistoryToFlash();
 
+		/**************   Lan info ********************/
+		//LAN地址
+		LanInfo_T *pSetLanInfo = &g_BMCInfo.IpmiConfig.LanInfo[0];
+		pSetLanInfo->IPAddr[0] = 192;
+		pSetLanInfo->IPAddr[1] = 168;
+		pSetLanInfo->IPAddr[2] = 1;		//网段
+		pSetLanInfo->IPAddr[3] = 120+g_BMCInfo.SlotID; 
+		pSetLanInfo->BroadCast[0] = 192;
+		pSetLanInfo->BroadCast[1] = 168; 
+		pSetLanInfo->BroadCast[2] = 1; //网段
+		pSetLanInfo->BroadCast[3] = 255;	
+		pSetLanInfo->NetMask[0] = 255; 
+		pSetLanInfo->NetMask[1] = 255; 
+		pSetLanInfo->NetMask[2] = 255;
+		pSetLanInfo->NetMask[3] = 0;
+		pSetLanInfo->DefaultGW[0] 	= 	pSetLanInfo->IPAddr[0];
+		pSetLanInfo->DefaultGW[1] 	= 	pSetLanInfo->IPAddr[1];
+		pSetLanInfo->DefaultGW[2] 	= 	pSetLanInfo->IPAddr[2];
+		pSetLanInfo->DefaultGW[3] 	= 	1;
+		pSetLanInfo->MACAddr[0]	=	0; //no default mac
+		pSetLanInfo->MACAddr[1]	=	0;
+		pSetLanInfo->MACAddr[2]	=	0;
+		pSetLanInfo->MACAddr[3]	=	0;
+		pSetLanInfo->MACAddr[4]	=	0;
+		pSetLanInfo->MACAddr[5]	=	0;
+
 		FlushUserInfoTbl();
 		UpdateFlash();
 	}

+ 4 - 4
app/bmc/msghndlr/Storlead/Storlead.c

@@ -494,10 +494,10 @@ int Storlead_getAllBladeStatus(uint8_t *pReq, uint8_t ReqLen, uint8_t *pRes)
 
             if(0 == API_BridgeInternal(&ReqPkt, &ResPkt, gChassisIPMBAddr[index], PRIMARY_IPMB_CHANNEL))
             {
-                printf("RECV: ");
-                for(i=0;i<ResPkt.Size;i++)
-                    printf("%x ", ResPkt.Data[i]);
-                printf("\n");
+                // printf("RECV: ");
+                // for(i=0;i<ResPkt.Size;i++)
+                //     printf("%x ", ResPkt.Data[i]);
+                // printf("\n");
 
                 if(ResPkt.Data[0] == 0)
                 {

+ 1 - 1
app/bmc/msghndlr/Transport/DeviceConfig.c

@@ -30,7 +30,7 @@ const CmdHndlrMap_T g_Config_CmdHndlr [] =
 {
     /*------------------------- IPM Device Commands --------------------------------------*/
     { CMD_SET_LAN_CONFIGURATION_PARAMETERS,     PRIV_ADMIN,     SET_LAN_CONFIGURATION_PARAMETERS,   0xFF,   0xAAAA  ,LAN_IFC_SUP},
-//    { CMD_GET_LAN_CONFIGURATION_PARAMETERS,     PRIV_OPERATOR,  GET_LAN_CONFIGURATION_PARAMETERS,   sizeof (GetLanConfigReq_T), 0xAAAA  ,LAN_IFC_SUP},
+    { CMD_GET_LAN_CONFIGURATION_PARAMETERS,     PRIV_OPERATOR,  GET_LAN_CONFIGURATION_PARAMETERS,   sizeof (GetLanConfigReq_T), 0xAAAA  ,LAN_IFC_SUP},
 //    { CMD_SUSPEND_BMC_ARPS,                    	PRIV_ADMIN,     SUSPEND_BMC_ARPS,                   sizeof (SuspendBMCArpsReq_T),   0xAAAA ,LAN_IFC_SUP},
 //    { CMD_GET_IP_UDP_RMCP_STATISTICS,    		PRIV_ADMIN,     GET_IP_UDP_RMCP_STATISTICS,   0xFF,   0xAAAA  ,LAN_IFC_SUP},