New web_interface folder

app/goahead-5.1.0/build/linux-arm-static/inc/goahead.h

@@ -4180,9 +4180,6 @@ PUBLIC void personInfoAction(Webs *wp);
  #include "customize.h"
 #endif
 
-
-void getDeviceInfo(Webs *wp);
-
 #ifdef __cplusplus
 }
 #endif

app/goahead-5.1.0/projects/goahead-linux-static.mk

@@ -144,6 +144,14 @@ clean:
 	rm -f "$(BUILD)/bin/libipmi_session.o"
 	rm -f "$(BUILD)/bin/libipmi_uds_session.o"
 	rm -f "$(BUILD)/bin/libipmi_IPM.o"
+	rm -f "$(BUILD)/bin/dashboard.o
+	rm -f "$(BUILD)/bin/config.o
+	rm -f "$(BUILD)/bin/fan.o
+	rm -f "$(BUILD)/bin/fru.o
+	rm -f "$(BUILD)/bin/fw_update.o
+	rm -f "$(BUILD)/bin/remote_control.o
+	rm -f "$(BUILD)/bin/sel.o
+	rm -f "$(BUILD)/bin/server_health.o
 clobber: clean
 	rm -fr ./$(BUILD)
 
@@ -279,6 +287,7 @@ $(BUILD)/inc/com_IPMI_App.h: $(DEPS_USER_H2)
 	mkdir -p "$(BUILD)/inc"
 	cp ../common_include/com_IPMI_App.h $(BUILD)/inc/com_IPMI_App.h
 
+
 DEPS_USER_C2 += $(BUILD)/inc/libipmi_session.h
 DEPS_USER_C2 += $(BUILD)/inc/libipmi.h
 DEPS_USER_C2 += $(BUILD)/inc/libipmi_errorcodes.h
@@ -322,6 +331,126 @@ $(BUILD)/obj/ResultUtils.o: \
 	$(CC) -c -o $(BUILD)/obj/ResultUtils.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" -DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) "-I$(ME_COM_OPENSSL_PATH)/include" src/utils/mine/ResultUtils.c
 
 
+#
+#   web_interface
+#
+DEPS_USER_H4 += src/web_interface/inc/config.h
+DEPS_USER_H4 += src/web_interface/inc/dashboard.h
+DEPS_USER_H4 += src/web_interface/inc/fan.h
+DEPS_USER_H4 += src/web_interface/inc/fru.h
+DEPS_USER_H4 += src/web_interface/inc/fw_update.h
+DEPS_USER_H4 += src/web_interface/inc/remote_control.h
+DEPS_USER_H4 += src/web_interface/inc/sel.h
+DEPS_USER_H4 += src/web_interface/inc/server_health.h
+DEPS_USER_H4 += $(BUILD)/inc/goahead.h
+
+$(BUILD)/inc/config.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/config.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/config.h $(BUILD)/inc/config.h
+$(BUILD)/inc/dashboard.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/dashboard.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/dashboard.h $(BUILD)/inc/dashboard.h
+$(BUILD)/inc/fan.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/fan.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/fan.h $(BUILD)/inc/fan.h
+$(BUILD)/inc/fru.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/fru.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/fru.h $(BUILD)/inc/fru.h
+$(BUILD)/inc/fw_update.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/fw_update.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/fw_update.h $(BUILD)/inc/fw_update.h
+$(BUILD)/inc/remote_control.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/remote_control.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/remote_control.h $(BUILD)/inc/remote_control.h
+$(BUILD)/inc/sel.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/sel.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/sel.h $(BUILD)/inc/sel.h
+$(BUILD)/inc/server_health.h: $(DEPS_USER_H4)
+	@echo '      [Copy] $(BUILD)/inc/server_health.h'
+	mkdir -p "$(BUILD)/inc"
+	cp src/web_interface/inc/server_health.h $(BUILD)/inc/server_health.h
+
+DEPS_USER_C4 += $(BUILD)/inc/goahead.h
+DEPS_USER_C4 += $(BUILD)/inc/config.h
+DEPS_USER_C4 += $(BUILD)/inc/dashboard.h
+DEPS_USER_C4 += $(BUILD)/inc/fan.h
+DEPS_USER_C4 += $(BUILD)/inc/fru.h
+DEPS_USER_C4 += $(BUILD)/inc/fw_update.h
+DEPS_USER_C4 += $(BUILD)/inc/remote_control.h
+DEPS_USER_C4 += $(BUILD)/inc/sel.h
+DEPS_USER_C4 += $(BUILD)/inc/server_health.h
+
+$(BUILD)/obj/config.o: \
+    src/web_interface/src/config.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/config.o'
+	$(CC) -c -o $(BUILD)/obj/config.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/config.c
+$(BUILD)/obj/dashboard.o: \
+    src/web_interface/src/dashboard.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/dashboard.o'
+	$(CC) -c -o $(BUILD)/obj/dashboard.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/dashboard.c
+$(BUILD)/obj/fan.o: \
+    src/web_interface/src/fan.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/fan.o'
+	$(CC) -c -o $(BUILD)/obj/fan.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/fan.c
+$(BUILD)/obj/fru.o: \
+    src/web_interface/src/fru.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/fru.o'
+	$(CC) -c -o $(BUILD)/obj/fru.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/fru.c
+$(BUILD)/obj/fw_update.o: \
+    src/web_interface/src/fw_update.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/fw_update.o'
+	$(CC) -c -o $(BUILD)/obj/fw_update.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/fw_update.c
+$(BUILD)/obj/remote_control.o: \
+    src/web_interface/src/remote_control.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/remote_control.o'
+	$(CC) -c -o $(BUILD)/obj/remote_control.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/remote_control.c
+$(BUILD)/obj/sel.o: \
+    src/web_interface/src/sel.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/sel.o'
+	$(CC) -c -o $(BUILD)/obj/sel.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/sel.c
+$(BUILD)/obj/server_health.o: \
+    src/web_interface/src/server_health.c $(DEPS_USER_C4)
+	@echo '   [Compile] $(BUILD)/obj/server_health.o'
+	$(CC) -c -o $(BUILD)/obj/server_health.o $(LDFLAGS) $(CFLAGS) $(DFLAGS) -D_FILE_OFFSET_BITS=64 \
+		-D_FILE_OFFSET_BITS=64 -DMBEDTLS_USER_CONFIG_FILE=\"embedtls.h\" \
+		-DME_COM_OPENSSL_PATH=$(ME_COM_OPENSSL_PATH) $(IFLAGS) \
+		"-I$(ME_COM_OPENSSL_PATH)/include" \
+		src/web_interface/src/server_health.c
 
 
 
@@ -657,7 +786,14 @@ DEPS_36 += $(BUILD)/obj/upload.o
 DEPS_36 += $(BUILD)/obj/libipmi_session.o
 DEPS_36 += $(BUILD)/obj/libipmi_uds_session.o
 DEPS_36 += $(BUILD)/obj/libipmi_IPM.o
-
+DEPS_36 += $(BUILD)/obj/config.o
+DEPS_36 += $(BUILD)/obj/dashboard.o
+DEPS_36 += $(BUILD)/obj/fan.o
+DEPS_36 += $(BUILD)/obj/fru.o
+DEPS_36 += $(BUILD)/obj/fw_update.o
+DEPS_36 += $(BUILD)/obj/remote_control.o
+DEPS_36 += $(BUILD)/obj/sel.o
+DEPS_36 += $(BUILD)/obj/server_health.o
 
 
 $(BUILD)/bin/libgo.a: $(DEPS_36)
@@ -668,7 +804,9 @@ $(BUILD)/bin/libgo.a: $(DEPS_36)
 		"$(BUILD)/obj/jst.o" "$(BUILD)/obj/options.o" "$(BUILD)/obj/osdep.o" "$(BUILD)/obj/rom.o" \
 		"$(BUILD)/obj/route.o" "$(BUILD)/obj/runtime.o" "$(BUILD)/obj/socket.o" "$(BUILD)/obj/time.o" \
 		"$(BUILD)/obj/upload.o" "$(BUILD)/obj/cJSON.o" "$(BUILD)/obj/libipmi_session.o" \
-		"$(BUILD)/obj/libipmi_uds_session.o" "$(BUILD)/obj/libipmi_IPM.o"
+		"$(BUILD)/obj/libipmi_uds_session.o" "$(BUILD)/obj/libipmi_IPM.o" \
+		"$(BUILD)/obj/config.o" "$(BUILD)/obj/dashboard.o" "$(BUILD)/obj/fan.o" "$(BUILD)/obj/fru.o" \
+		"$(BUILD)/obj/fw_update.o" "$(BUILD)/obj/remote_control.o" "$(BUILD)/obj/sel.o" "$(BUILD)/obj/server_health.o" 
 
 #
 #   install-certs

app/goahead-5.1.0/src/goahead.h

@@ -4180,9 +4180,6 @@ PUBLIC void personInfoAction(Webs *wp);
  #include "customize.h"
 #endif
 
-
-void getDeviceInfo(Webs *wp);
-
 #ifdef __cplusplus
 }
 #endif

app/goahead-5.1.0/src/route.c

@@ -84,31 +84,6 @@ void personInfoAction(Webs *wp)
 
 
 
-/*获取设备信息*/
-void getDeviceInfo(Webs *wp){
-    uint16_t    wRet = LIBIPMI_E_SUCCESS;
-    GetDevIDRes_T   DeviceID;
-    char BuildTime[30] = {0};
-    char FwVersion[10] = {0};
-
-    //Create session
-    LIBIPMI_CreateSession(&wp->ipmi_session, 10);
-
-    sprintf(BuildTime, "%s %s", __DATE__, __TIME__);
-    wRet = IPMICMD_GetDeviceID( &wp->ipmi_session, &DeviceID, DEFAULT_TIMEOUT);
-    if (wRet == LIBIPMI_E_SUCCESS)
-    {
-        sprintf(FwVersion, "%d.%d", DeviceID.FirmwareRevision1, DeviceID.FirmwareRevision2);
-    }
-
-    printf("BuildTime: %s\n", BuildTime);
-    printf("FwVersion: %s\n", FwVersion);
-
-    //Close session
-    LIBIPMI_CloseSession(&wp->ipmi_session );
-}
-
-
 /************************************ Code ************************************/
 /*
     Route the request. If wp->route is already set, test routes after that route

app/goahead-5.1.0/src/web_interface/dashboard.c

@@ -0,0 +1,29 @@
+#include    "goahead.h"
+#include    "libipmi_IPM.h"
+#include    "com_IPMIDefs.h"
+
+
+
+/*获取设备信息*/
+void getDeviceInfo(Webs *wp){
+    uint16_t    wRet = LIBIPMI_E_SUCCESS;
+    GetDevIDRes_T   DeviceID;
+    char BuildTime[30] = {0};
+    char FwVersion[10] = {0};
+
+    //Create session
+    LIBIPMI_CreateSession(&wp->ipmi_session, 10);
+
+    sprintf(BuildTime, "%s %s", __DATE__, __TIME__);
+    wRet = IPMICMD_GetDeviceID( &wp->ipmi_session, &DeviceID, DEFAULT_TIMEOUT);
+    if (wRet == LIBIPMI_E_SUCCESS)
+    {
+        sprintf(FwVersion, "%d.%d", DeviceID.FirmwareRevision1, DeviceID.FirmwareRevision2);
+    }
+
+    printf("BuildTime: %s\n", BuildTime);
+    printf("FwVersion: %s\n", FwVersion);
+
+    //Close session
+    LIBIPMI_CloseSession(&wp->ipmi_session );
+}

app/goahead-5.1.0/src/web_interface/inc/dashboard.h

@@ -0,0 +1,11 @@
+#ifndef __DASHBOARD_H__
+#define __DASHBOARD_H__
+
+void getDeviceInfo(Webs *wp)；
+
+
+
+
+
+
+#endif /* __DASHBOARD_H__ */

app/goahead-5.1.0/src/web_interface/src/dashboard.c

@@ -0,0 +1,27 @@
+#include    "goahead.h"
+#include    "libipmi_IPM.h"
+#include    "com_IPMIDefs.h"
+
+/*获取设备信息*/
+void getDeviceInfo(Webs *wp){
+    uint16_t    wRet = LIBIPMI_E_SUCCESS;
+    GetDevIDRes_T   DeviceID;
+    char BuildTime[30] = {0};
+    char FwVersion[10] = {0};
+
+    //Create session
+    LIBIPMI_CreateSession(&wp->ipmi_session, 10);
+
+    sprintf(BuildTime, "%s %s", __DATE__, __TIME__);
+    wRet = IPMICMD_GetDeviceID( &wp->ipmi_session, &DeviceID, DEFAULT_TIMEOUT);
+    if (wRet == LIBIPMI_E_SUCCESS)
+    {
+        sprintf(FwVersion, "%d.%d", DeviceID.FirmwareRevision1, DeviceID.FirmwareRevision2);
+    }
+
+    printf("BuildTime: %s\n", BuildTime);
+    printf("FwVersion: %s\n", FwVersion);
+
+    //Close session
+    LIBIPMI_CloseSession(&wp->ipmi_session );
+}