Kaynağa Gözat

temporary backup

zhangbo 3 yıl önce
ebeveyn
işleme
81916edcb6

+ 1 - 1
app/goahead-3.6.5/paks/goahead-mbedtls/goahead-mbedtls.c

@@ -61,7 +61,7 @@ PUBLIC int sslOpen()
     mbedtls_ssl_config  *conf;
     int                 rc;
 
-    printf( "Initializing MbedTLS SSL"); 
+//    printf( "Initializing MbedTLS SSL"); 
 
     mbedtls_entropy_init(&cfg.entropy);
 

+ 1 - 1
app/goahead-3.6.5/src/goahead-mbedtls/goahead-mbedtls.c

@@ -61,7 +61,7 @@ PUBLIC int sslOpen()
     mbedtls_ssl_config  *conf;
     int                 rc;
 
-    printf( "Initializing MbedTLS SSL"); 
+//    printf( "Initializing MbedTLS SSL"); 
 
     mbedtls_entropy_init(&cfg.entropy);
 

+ 1 - 1
app/goahead-3.6.5/src/http.c

@@ -2391,7 +2391,7 @@ static int setLocalHost()
     get_local_ip("eth0", ipaddr);
     websSetIpAddr(ipaddr);
     websSetHost(ipaddr);
-    printf("---> setLocalHost, ip = %s\n", ipaddr);
+    //printf("---> setLocalHost, ip = %s\n", ipaddr);
     return 0;
 }
 

+ 8 - 7
app/goahead-3.6.5/src/socket.c

@@ -49,13 +49,14 @@ PUBLIC int socketOpen()
     socketList = NULL;
     socketMax = 0;
     socketHighestFd = -1;
-    if ((fd = socket(AF_INET6, SOCK_STREAM, 0)) != -1) {
-        hasIPv6 = 1;
-        printf("%s %d ---> closesocket\n", __FILE__, __LINE__);
-        closesocket(fd);
-    } else {
-        printf("This system does not have IPv6 support");
-    }
+    //这个系统不支持IPv6
+    // if ((fd = socket(AF_INET6, SOCK_STREAM, 0)) != -1) {
+    //     hasIPv6 = 1;
+    //     //printf("%s %d ---> closesocket\n", __FILE__, __LINE__);
+    //     closesocket(fd);
+    // } else {
+    //     printf("This system does not have IPv6 support");
+    // }
     return 0;
 }
 

+ 1 - 1
app/goahead-3.6.5/src/upload.c

@@ -472,7 +472,7 @@ PUBLIC void websUploadOpen()
         uploadDir = "/tmp";
 #endif
     }
-    printf( "Upload directory is %s", uploadDir);
+//    printf( "Upload directory is %s", uploadDir);
     websDefineHandler("upload", 0, uploadHandler, 0, 0);
 }
 

+ 1 - 22
app/goahead-3.6.5/src/web_interface/src/sel.c

@@ -22,7 +22,6 @@ void Web_ClearSEL(Webs *wp)
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
 
-//    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {
@@ -57,7 +56,6 @@ void Web_ClearSEL(Webs *wp)
     websWrite(wp, "%s", pStr);
     websFlush(wp, 0);
     websDone(wp);
-    //printf("cJSON:%s\n", pStr);
 
     if(pStr)
         wfree(pStr);
@@ -104,7 +102,6 @@ void GetAllSELEntriesSorted(Webs *wp)
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
 
-//    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {
@@ -123,7 +120,6 @@ void GetAllSELEntriesSorted(Webs *wp)
     }
     else
     {
-        //printf("---> nEntries %d\n", nEntries);
         if(nEntries > MAX_SEL_RECORD)   nEntries = MAX_SEL_RECORD;  //最大只能显示这么多日志
         if(nEntries == 0)
         {
@@ -137,7 +133,6 @@ void GetAllSELEntriesSorted(Webs *wp)
             websWrite(wp, pStr);
             websFlush(wp, 0);
             websDone(wp);
-            //printf("cJSON:%s\n", pStr);
             
             if(root)
                 cJSON_Delete(root);
@@ -199,19 +194,7 @@ void GetAllSELEntriesSorted(Webs *wp)
                 cJSON_AddNumberToObject(pJsonsub, "D9", SELEventData.EvtData1);      //EventData1    -> D9
                 cJSON_AddNumberToObject(pJsonsub, "D10", SELEventData.EvtData2);     //EventData2    -> D10
                 cJSON_AddNumberToObject(pJsonsub, "D11", SELEventData.EvtData3);     //EventData3    -> D11
-                
-                // cJSON_AddNumberToObject(pJsonsub, "RecordID", SELEventData.hdr.ID);
-                // cJSON_AddNumberToObject(pJsonsub, "RecordType", SELEventData.hdr.Type);
-                // cJSON_AddNumberToObject(pJsonsub, "TimeStamp", SELEventData.hdr.TimeStamp);
-                // cJSON_AddNumberToObject(pJsonsub, "GenID1", SELEventData.GenID[0]);
-                // cJSON_AddNumberToObject(pJsonsub, "GenID2", SELEventData.GenID[1]);
-                // cJSON_AddNumberToObject(pJsonsub, "EvmRev", SELEventData.EvMRev);
-                // cJSON_AddNumberToObject(pJsonsub, "SensorType", SELEventData.SensorType);
-                // cJSON_AddNumberToObject(pJsonsub, "EventDirType", SELEventData.EvtDirType);
-                // cJSON_AddNumberToObject(pJsonsub, "EventData1", SELEventData.EvtData1);
-                // cJSON_AddNumberToObject(pJsonsub, "EventData2", SELEventData.EvtData2);
-                // cJSON_AddNumberToObject(pJsonsub, "EventData3", SELEventData.EvtData3);
-
+                            
                 //获取传感器名称
                 //printf("sensor number %d\n", SELEventData.SensorNum);
                 if((SELEventData.SensorNum != 0xff) && (SELEventData.hdr.Type == 0x02))
@@ -242,7 +225,6 @@ void GetAllSELEntriesSorted(Webs *wp)
                         {
                             wRet = IPMC_GetSensorName(&UDSSession, target_addr,SELEventData.SensorNum, sensorName, DEFAULT_TIMEOUT);
                         }
-                        //cJSON_AddStringToObject(pJsonsub, "c", sensorName);
                         cJSON_AddStringToObject(pJsonsub, "D12", senNumNameTab[i].sensor_name);     //SensorName->D12
                         if(wRet == 0)
                         {
@@ -251,7 +233,6 @@ void GetAllSELEntriesSorted(Webs *wp)
                             {
                                 if(senNumNameTab[i].sensor_number == 0xff)
                                 {
-                                    //printf("---> keep sensor name\n");
                                     senNumNameTab[i].sensor_number = SELEventData.SensorNum;
                                     strcpy(senNumNameTab[i].sensor_name, sensorName);                                
                                     break;
@@ -331,7 +312,6 @@ void SetTime(Webs *wp)
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
     
-//    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {
@@ -403,7 +383,6 @@ void GetTime(Webs *wp)
     //Create session
     LIBIPMI_CreateSession(&UDSSession, DEFAULT_TIMEOUT);
 
-//    wp->index = TEST_INDEX;
     target_addr = gIPMBAddr[wp->index];
     if(target_addr == 0x20)
     {