Browse Source

[Improve][AW-CCS][Module_CCS]

2021.10.23 / Folus Wen

Actions:
1. Each session capture slac packets to log file.

Files:
1. As follow commit history

Image version: D0.55.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX
FolusWen 3 years ago
parent
commit
e61d7fb4fe

+ 18 - 18
EVSE/Projects/AW-CCS/Apps/CCS/Module_CCS.c

@@ -470,23 +470,23 @@ int Sniffer_Tcpdump(char cmd)
         struct tm *tm;
         struct timeval tv;
 
-        memset(buf, 0, sizeof(buf));
+        memset(cmdBuf, 0, sizeof(cmdBuf));
         CurrentTime = time(NULL);
         tm = localtime(&CurrentTime);
         gettimeofday(&tv, NULL); // get microseconds, 10^-6
-        sprintf((char*)cmdBuf,
-                "tcpdump -i eth1 -w /mnt/tcpdump/[%s][%04d%02d%02d-%02d:%02d:%02d.%06d]packets.pcap&",
-                FIRMWARE_VERSION,
-                tm->tm_year + 1900,
-                tm->tm_mon + 1,
-                tm->tm_mday,
-                tm->tm_hour,
-                tm->tm_min,
-                tm->tm_sec,
-                tv.tv_usec
-                );
+        sprintf((char*)cmdBuf, "tcpdump -i eth1 -p \"udp or ether proto 0x88e1\" -w /mnt/tcpdump/[%04d.%02d]CCS_SlacPackets_%02X%02X%02X%02X%02X%02X%02X%02X.log &",
+								(tm->tm_year+1900),
+								(tm->tm_mon+1),
+								EVCOMM_SYS_INFO.SessionID[0],
+								EVCOMM_SYS_INFO.SessionID[1],
+								EVCOMM_SYS_INFO.SessionID[2],
+								EVCOMM_SYS_INFO.SessionID[3],
+								EVCOMM_SYS_INFO.SessionID[4],
+								EVCOMM_SYS_INFO.SessionID[5],
+								EVCOMM_SYS_INFO.SessionID[6],
+								EVCOMM_SYS_INFO.SessionID[7]);
         DEBUG_INFO("Tcpdump on\n");
-        system(cmdBuf);
+        system((char*)cmdBuf);
 
         return 0;
     }
@@ -500,8 +500,8 @@ int Sniffer_Tcpdump(char cmd)
 			sleep(1);
         }
         DEBUG_INFO("Tcpdump save\n");
-        system("cd /;cp -rfv /mnt/tcpdump /Storage/SystemLog/");
-
+        system("cd /;cp -rfv /mnt/tcpdump/* /Storage/SystemLog/");
+        system("cd /mnt/;rm -rf tcpdump/");
         return 0;
     }
     else
@@ -514,7 +514,6 @@ int Sniffer_Tcpdump(char cmd)
 
     return 0;
 }
-
 /**
  *
  * @param state_new
@@ -14472,8 +14471,8 @@ int main(int argc, char *argv[])
             {
                 if(SdpUdpConnected() == 1)
                 {
-                    Update_V2G_Status(SLACC_SDP_TCP_Connection);
-                    continue;
+                	Update_V2G_Status(SLACC_SDP_TCP_Connection);
+                	continue;
                 }
                 SlacComm(); //TC_SECC_VTB_CmSlacMatch_004
                 ftime(&timerStart.SeqEnd);
@@ -14499,6 +14498,7 @@ int main(int argc, char *argv[])
                 {
                     Update_V2G_Status(SupportedAppProtocolRequest);
                     ftime(&EVCOMM_SYS_INFO.V2G_SECC_Sequence_Timer_Start);
+
                     continue;
                 }
                 SlacComm();

+ 1 - 1
EVSE/Projects/AW-CCS/Apps/CCS/define_ccs.h

@@ -95,7 +95,7 @@ enum V2GT_MSG_PROTOCOL
 #define CAN_RX_TIMEOUT_MECHANISM                            DISABLE	//defualt: ENABLE
 #define SLAC_FIRST_RESPONSE_METHOD                          SET_5_PWM_ONCE_GET_PERMISSION_IN_AUTHORIZATIONRES
 
-#define TCPDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE	//default: DISABLE
+#define TCPDUMP_PACKETS_SNIFFER_SWITCH                      ENABLE	//default: DISABLE
 #define CANDUMP_PACKETS_SNIFFER_SWITCH                      DISABLE	//default: DISABLE
 
 #define DYNAMIC_ETH0_IP_MECHANISM                           ENABLE	//default: DISABLE