jimbo for sync

app/goahead-5.1.0/build/linux-arm-static/.makeflags

@@ -1 +1 @@
- --no-print-directory -s
+s --no-print-directory

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

@@ -3993,10 +3993,10 @@ PUBLIC int websSetSessionVar(Webs *wp, cchar *name, cchar *value);
 ////////////////////////////////////add by lusa///////////////////////////
 PUBLIC void personInfoAction(Webs *wp);
 
-PUBLIC void getDeviceInfo(Webs *wp);
+//PUBLIC void getDeviceInfo(Webs *wp);
 
 
-PUBLIC void getDeviceInfoBak(Webs *wp);
+//PUBLIC void getDeviceInfoBak(Webs *wp);
 
 
 PUBLIC void actionTest(Webs *wp);

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

@@ -108,50 +108,7 @@ prep:
 	@echo "$(MAKEFLAGS)" >$(BUILD)/.makeflags
 
 clean:
-	rm -f "$(BUILD)/obj/action.o"
-	rm -f "$(BUILD)/obj/alloc.o"
-	rm -f "$(BUILD)/obj/auth.o"
-	rm -f "$(BUILD)/obj/cgi.o"
-	rm -f "$(BUILD)/obj/cgitest.o"
-	rm -f "$(BUILD)/obj/crypt.o"
-	rm -f "$(BUILD)/obj/file.o"
-	rm -f "$(BUILD)/obj/fs.o"
-	rm -f "$(BUILD)/obj/goahead-mbedtls.o"
-	rm -f "$(BUILD)/obj/goahead-openssl.o"
-	rm -f "$(BUILD)/obj/goahead.o"
-	rm -f "$(BUILD)/obj/gopass.o"
-	rm -f "$(BUILD)/obj/http.o"
-	rm -f "$(BUILD)/obj/js.o"
-	rm -f "$(BUILD)/obj/jst.o"
-	rm -f "$(BUILD)/obj/mbedtls.o"
-	rm -f "$(BUILD)/obj/options.o"
-	rm -f "$(BUILD)/obj/osdep.o"
-	rm -f "$(BUILD)/obj/rom.o"
-	rm -f "$(BUILD)/obj/route.o"
-	rm -f "$(BUILD)/obj/runtime.o"
-	rm -f "$(BUILD)/obj/socket.o"
-	rm -f "$(BUILD)/obj/test.o"
-	rm -f "$(BUILD)/obj/time.o"
-	rm -f "$(BUILD)/obj/upload.o"
-	rm -f "$(BUILD)/bin/goahead"
-	rm -f "$(BUILD)/bin/goahead-test"
-	rm -f "$(BUILD)/bin/gopass"
-	rm -f "$(BUILD)/.install-certs-modified"
-	rm -f "$(BUILD)/bin/libgo.a"
-	rm -f "$(BUILD)/bin/libgoahead-mbedtls.a"
-	rm -f "$(BUILD)/bin/libmbedtls.a"
-
-	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"
+	rm -rf $(BUILD)/*
 clobber: clean
 	rm -fr ./$(BUILD)
 

app/goahead-5.1.0/src/goahead.h

@@ -3993,10 +3993,10 @@ PUBLIC int websSetSessionVar(Webs *wp, cchar *name, cchar *value);
 ////////////////////////////////////add by lusa///////////////////////////
 PUBLIC void personInfoAction(Webs *wp);
 
-PUBLIC void getDeviceInfo(Webs *wp);
+//PUBLIC void getDeviceInfo(Webs *wp);
 
 
-PUBLIC void getDeviceInfoBak(Webs *wp);
+//PUBLIC void getDeviceInfoBak(Webs *wp);
 
 
 PUBLIC void actionTest(Webs *wp);

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

@@ -4,7 +4,7 @@
 #include "goahead.h"
 
 void getDeviceInfo(Webs *wp);
-
+void getDeviceInfoBak(Webs *wp);
 
 
 

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

@@ -3,11 +3,12 @@
 #include    "com_IPMIDefs.h"
 #include    "ResultUtils.h"
 #include    "cJSON.h"
+#include    <string.h>
 /*获取设备信息*/
 
 /*获取设备信息*/
 void getDeviceInfo(Webs *wp){
-    logmsg(2, "--------------------ggggggggg----------------");
+    // logmsg(2, "--------------------ggggggggg----------------");
 
     uint16_t    wRet = LIBIPMI_E_SUCCESS;
     GetDevIDRes_T   DeviceID;
@@ -15,91 +16,93 @@ void getDeviceInfo(Webs *wp){
     int sock;
     struct sockaddr_in *myaddr;
 
-    char BuildTime[30] = {0};
-    char FwVersion[10] = {0};
+    char BuildTime[30] = "2020-111";
+    char FwVersion[10] = "1.1111";
     char MacAddr[18] = {0};
     char IpAddr[16] = {0};
     
 
-    //Create session
-    LIBIPMI_CreateSession(&wp->ipmi_session, 10);
-
-    //get build time
-    sprintf(BuildTime, "%s %s", __DATE__, __TIME__);
-
-    //get firmware version
-    wRet = IPMICMD_GetDeviceID( &wp->ipmi_session, &DeviceID, DEFAULT_TIMEOUT);
-    if (wRet == LIBIPMI_E_SUCCESS)
-    {
-        sprintf(FwVersion, "%d.%d", DeviceID.FirmwareRevision1, DeviceID.FirmwareRevision2);
-    }
-
-    //get mac address
-    if((sock=socket(AF_INET,SOCK_STREAM,0))<0)
-    {
-        printf("Get mac address socket fail!\n");
-    }
-    else
-    {
-        strcpy(ifreq.ifr_name,"eth0");
-        if(ioctl(sock,SIOCGIFHWADDR,&ifreq)<0)
-        {
-            printf("Get mac address ioctl fail!\n");
-        }
-        else
-        {
-            sprintf(MacAddr, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[0],
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[1],
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[2],
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[3],
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[4],
-                    (unsigned char)ifreq.ifr_hwaddr.sa_data[5]);
-        }
-    }
-    close(sock);
-
-    //get ip address
-    strcpy(ifreq.ifr_name, "eth0");
-    if((sock=socket(AF_INET, SOCK_STREAM, 0))<0)
-    {
-        printf("Get ip address socket fail!\n");
-    }
-    else
-    {
-        wRet = ioctl(sock, SIOCGIFADDR, &ifreq);
-        if(wRet < 0)
-        {
-            printf("Get ip address ioctl fail!\n");
-        }
-        else
-        {
-            myaddr = (struct sockaddr_in *)&(ifreq.ifr_addr);
-            strcpy(IpAddr, inet_ntoa(myaddr->sin_addr));   
-        }
-    }
-    close(sock);
+    // //Create session
+    // LIBIPMI_CreateSession(&wp->ipmi_session, 10);
+
+    // //get build time
+    // sprintf(BuildTime, "%s %s", __DATE__, __TIME__);
+
+    // //get firmware version
+    // wRet = IPMICMD_GetDeviceID( &wp->ipmi_session, &DeviceID, DEFAULT_TIMEOUT);
+    // if (wRet == LIBIPMI_E_SUCCESS)
+    // {
+    //     sprintf(FwVersion, "%d.%d", DeviceID.FirmwareRevision1, DeviceID.FirmwareRevision2);
+    // }
+
+    // //get mac address
+    // if((sock=socket(AF_INET,SOCK_STREAM,0))<0)
+    // {
+    //     printf("Get mac address socket fail!\n");
+    // }
+    // else
+    // {
+    //     strcpy(ifreq.ifr_name,"eth0");
+    //     if(ioctl(sock,SIOCGIFHWADDR,&ifreq)<0)
+    //     {
+    //         printf("Get mac address ioctl fail!\n");
+    //     }
+    //     else
+    //     {
+    //         sprintf(MacAddr, "%02x:%02x:%02x:%02x:%02x:%02x\n",
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[0],
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[1],
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[2],
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[3],
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[4],
+    //                 (unsigned char)ifreq.ifr_hwaddr.sa_data[5]);
+    //     }
+    // }
+    // close(sock);
+
+    // //get ip address
+    // strcpy(ifreq.ifr_name, "eth0");
+    // if((sock=socket(AF_INET, SOCK_STREAM, 0))<0)
+    // {
+    //     printf("Get ip address socket fail!\n");
+    // }
+    // else
+    // {
+    //     wRet = ioctl(sock, SIOCGIFADDR, &ifreq);
+    //     if(wRet < 0)
+    //     {
+    //         printf("Get ip address ioctl fail!\n");
+    //     }
+    //     else
+    //     {
+    //         myaddr = (struct sockaddr_in *)&(ifreq.ifr_addr);
+    //         strcpy(IpAddr, inet_ntoa(myaddr->sin_addr));   
+    //     }
+    // }
+    // close(sock);
     
-    //Close session
-    LIBIPMI_CloseSession(&wp->ipmi_session );
+    // //Close session
+    // LIBIPMI_CloseSession(&wp->ipmi_session );
 
     printf("BuildTime: %s\n", BuildTime);
     printf("FwVersion: %s\n", FwVersion);
     printf("MacAddr: %s\n", MacAddr);
     printf("IpAddr: %s\n", IpAddr);
 
-    cchar *pStr;
-    int code = 200;
-    cJSON * root =  cJSON_CreateObject();
-    cJSON * data =  cJSON_CreateObject();
-    // cJSON * next =  cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "data", data);//根节点下添加
-    cJSON_AddItemToObject(root, "msg", cJSON_CreateString(""));
-    cJSON_AddItemToObject(root, "code", cJSON_CreateString("200"));
-    cJSON_AddStringToObject(data, "BuildTime", BuildTime);
-    cJSON_AddStringToObject(data, "FwVersion", FwVersion);
-
-    pStr = cJSON_Print(root);
+    char *pStr;
+    pStr = malloc(200);
+    sprintf(pStr, "{\n\"data\": {\n},\n\"msg\": %s\n%s \"Not Found\",\n \"code\": 404\n}", BuildTime, FwVersion);
+    // int code = 200;
+    // cJSON * root =  cJSON_CreateObject();
+    // cJSON * data =  cJSON_CreateObject();
+    // // cJSON * next =  cJSON_CreateObject();
+    // cJSON_AddItemToObject(root, "data", data);//根节点下添加
+    // cJSON_AddItemToObject(root, "msg", cJSON_CreateString(""));
+    // cJSON_AddItemToObject(root, "code", cJSON_CreateString("200"));
+    // cJSON_AddStringToObject(data, "BuildTime", BuildTime);
+    // cJSON_AddStringToObject(data, "FwVersion", FwVersion);
+
+    // pStr = cJSON_Print(root);
 
     printf("first json:\n%s\n", pStr);
     logmsg(2, "-----------------------jso1n----------------------%s", pStr);
@@ -108,7 +111,7 @@ void getDeviceInfo(Webs *wp){
     websWriteHeaders(wp, -1, 0);
     websWriteEndHeaders(wp); 
     //websWrite(wp, "[");
-    websWrite(wp, " {\"name\":\"jimbo\"}");
+    websWrite(wp, pStr);
     //websWrite(wp, "]");
     //websFlush(wp, 0);
     websDone(wp);
@@ -120,39 +123,38 @@ void getDeviceInfo(Webs *wp){
 
 /*获取设备信息*/
 void getDeviceInfoBak(Webs *wp){
-    logmsg(2, "--------------------ggggggggg----------------");
-
-    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 );
-    cchar *pStr;
-    int code = 200;
-    cJSON * root =  cJSON_CreateObject();
-    cJSON * data =  cJSON_CreateObject();
-    // cJSON * next =  cJSON_CreateObject();
-    cJSON_AddItemToObject(root, "data", data);//根节点下添加
-    cJSON_AddItemToObject(root, "msg", cJSON_CreateString(""));
-    cJSON_AddItemToObject(root, "code", cJSON_CreateString("200"));
-    cJSON_AddStringToObject(data, "BuildTime", BuildTime);
-    cJSON_AddStringToObject(data, "FwVersion", FwVersion);
-
-    pStr = cJSON_Print(root);
-
-    printf("first json:\n%s\n", pStr);
-    logmsg(2, "-----------------------jso1n----------------------%s", pStr);
+    // logmsg(2, "--------------------ggggggggg----------------");
+
+    // uint16_t    wRet = LIBIPMI_E_SUCCESS;
+    // GetDevIDRes_T   DeviceID;
+    char BuildTime[30] = "2020-3-10";
+     char FwVersion[10] = "1.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 );
+    // cchar *pStr;
+    // int code = 200;
+    // cJSON * root =  cJSON_CreateObject();
+    // cJSON * data =  cJSON_CreateObject();
+    // // cJSON * next =  cJSON_CreateObject();
+    // cJSON_AddItemToObject(root, "data", data);//根节点下添加
+    // cJSON_AddItemToObject(root, "msg", cJSON_CreateString(""));
+    // cJSON_AddItemToObject(root, "code", cJSON_CreateString("200"));
+    // cJSON_AddStringToObject(data, "BuildTime", BuildTime);
+    // cJSON_AddStringToObject(data, "FwVersion", FwVersion);
+
+    // pStr = cJSON_Print(root);
+
+    //printf("first json:\n%s\n", pStr);
 
     websSetStatus(wp, 200);
     websWriteHeaders(wp, -1, 0);

gd32450i-eval.initramfs

@@ -126,8 +126,8 @@ dir /var/www/goahead/static 755 0 0
 dir /var/www/goahead/static/css 755 0 0
 dir /var/www/goahead/static/img 755 0 0
 dir /var/www/goahead/static/js 755 0 0 
-file /etc/goahead/self.crt ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/build/linux-arm-static/bin/self.crt 755 0 0
-file /etc/goahead/self.key ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/build/linux-arm-static/bin/self.key 755 0 0
+file /etc/goahead/self.crt ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/self.crt 755 0 0
+file /etc/goahead/self.key ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/self.key 755 0 0
 file /etc/goahead/auth.txt ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/auth.txt 755 0 0
 file /etc/goahead/route.txt ${INSTALL_ROOT}/projects/${SAMPLE}/app/goahead-5.1.0/src/route.txt 755 0 0
 

local/rc

@@ -34,6 +34,6 @@ mknod /dev/adc1 c 105 0
 ################### run app ####################
 /bin/telnetd
 /usr/bin/bmc_app & 
-sleep 10
+sleep 3
 #/usr/bin/test_app 
 /usr/bin/goahead -v --home /etc/goahead /var/www/goahead &