temp submit

app/goahead-5.1.0/src/goahead.c

@@ -78,7 +78,7 @@ MAIN(goahead, int argc, char **argv, char **envp)
 
 
 /********************* jimbo test code **************************/
- 
+ cJSON_InitHooks(NULL);
 
 /********************* jimbo test end **************************/    
 

app/goahead-5.1.0/src/socket.c

@@ -908,6 +908,7 @@ PUBLIC int socketAlloc(cchar *ip, int port, SocketAccept accept, int flags)
     WebsSocket    *sp;
     int         sid;
 
+    printf("---> socketAlloc, socketMax= %d\n", socketMax);
     if (socketMax >= FD_SETSIZE) {
         return -1;
     }
@@ -937,6 +938,7 @@ PUBLIC void socketFree(int sid)
     char        buf[256];
     int         i;
 
+    printf("---> socketFree\n");
     if ((sp = socketPtr(sid)) == NULL) {
         return;
     }

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

@@ -26,6 +26,7 @@ void getDeviceInfo(Webs *wp){
     char FwVersion[10] = {0};
     char MacAddr[18] = {0};
     char IpAddr[16] = {0};
+
     
 
     //Create session
@@ -89,23 +90,21 @@ void getDeviceInfo(Webs *wp){
     //     }
     // }
     // close(sock);
-    
-    
 
-    printf("BuildTime: %s\n", BuildTime);
-    printf("FwVersion: %s\n", FwVersion);
-    printf("MacAddr: %s\n", MacAddr);
-    printf("IpAddr: %s\n", IpAddr);
-
-    char *pStr;
+    char *pStr = malloc(500);
+    char *dataStr = malloc(200);
+    char msgStr[10] = "\"\"";
+    char codeStr[10] = "200";
+    
+    sprintf(dataStr, "{\"buildTime\":\"%s\",\"fwVersion\":\"%s\",\"macAddr\":\"%s\",\"ipAddr\":\"%s\"}", \
+        BuildTime, FwVersion, MacAddr, IpAddr);
 
-    char *testStr;
-    testStr = malloc(200); 
-    sprintf(testStr, "%s", "jimbo is very confused!");
+    sprintf(pStr, "{\"data\": %s,\"msg\":%s,\"code\": %s}", \
+         dataStr, msgStr, codeStr);
 
-    int code = 200;
-    cJSON * root =  cJSON_CreateObject();
-    cJSON * data =  cJSON_CreateObject();
+    // 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(""));
@@ -116,20 +115,17 @@ void getDeviceInfo(Webs *wp){
     // cJSON_AddStringToObject(data, "ipAddr", IpAddr);
 
     //pStr = cJSON_Print(root);
-    pStr = testStr;
 
-    printf("first json:\n%s\n", pStr);
-    logmsg(2, "-----------------------jso1n----------------------%s", pStr);
-    logmsg(2, "--------------------ccccccccccsscc----------------");
-    websSetStatus(wp, WEBS_KEEP_ALIVE);
+    printf("json str:\n%s\n", pStr);
+    websSetStatus(wp, 200);
     websWriteHeaders(wp, -1, 0);
     websWriteEndHeaders(wp); 
     websWrite(wp, "%s", pStr);
     websFlush(wp, 0);
     websDone(wp);
 
-    if(pStr)
-        free(pStr);
+    free(pStr);
+    free(dataStr);
     
 }
 
@@ -201,6 +197,10 @@ sys_info_end:
     if(sysInfo.text)
         free(sysInfo.text);
 
+    free(pStr);
+    cJSON_Delete(root);
+    cJSON_Delete(data);
+
 }