embedded/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2026-07-27 08:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaned up report_builder in defender_demo_json (#644)

Browse Source
This commit is contained in:
tianmc1
2021-07-14 14:12:23 -07:00
committed by GitHub
parent 5a4fe788d7
commit 096824515f
2 changed files with 53 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/report_builder.c
View File

@@ -53,61 +53,61 @@
/* Formats used to generate the JSON report. */
#define reportbuilderJSON_PORT_OBJECT_FORMAT \
"{" \
"\"%s\": %u" \
"\""DEFENDER_REPORT_PORT_KEY"\": %u" \
"},"
#define reportbuilderJSON_CONNECTION_OBJECT_FORMAT \
"{" \
"\"%s\": %u," \
"\"%s\": \"%u.%u.%u.%u:%u\"" \
#define reportbuilderJSON_CONNECTION_OBJECT_FORMAT \
"{" \
"\""DEFENDER_REPORT_LOCAL_PORT_KEY"\": %u," \
"\""DEFENDER_REPORT_REMOTE_ADDR_KEY"\": \"%u.%u.%u.%u:%u\"" \
"},"
#define reportbuilderJSON_REPORT_FORMAT_PART1 \
"{" \
"\"%s\": {" \
"\"%s\": %u," \
"\"%s\": \"%u.%u\"" \
"}," \
"\"%s\": {" \
"\"%s\": {" \
"\"%s\": "
#define reportbuilderJSON_REPORT_FORMAT_PART1 \
"{" \
"\""DEFENDER_REPORT_HEADER_KEY"\": {" \
"\""DEFENDER_REPORT_ID_KEY"\": %u," \
"\""DEFENDER_REPORT_VERSION_KEY"\": \"%u.%u\"" \
"}," \
"\""DEFENDER_REPORT_METRICS_KEY"\": {" \
"\""DEFENDER_REPORT_TCP_LISTENING_PORTS_KEY"\": {" \
"\""DEFENDER_REPORT_PORTS_KEY"\": "
#define reportbuilderJSON_REPORT_FORMAT_PART2 \
"," \
"\"%s\": %u" \
"}," \
"\"%s\": {" \
"\"%s\": "
#define reportbuilderJSON_REPORT_FORMAT_PART2 \
"," \
"\""DEFENDER_REPORT_TOTAL_KEY"\": %u" \
"}," \
"\""DEFENDER_REPORT_UDP_LISTENING_PORTS_KEY"\": {" \
"\""DEFENDER_REPORT_PORTS_KEY"\": "
#define reportbuilderJSON_REPORT_FORMAT_PART3 \
"," \
"\"%s\": %u" \
"}," \
"\"%s\": {" \
"\"%s\": %u," \
"\"%s\": %u," \
"\"%s\": %u," \
"\"%s\": %u" \
"}," \
"\"%s\": {" \
"\"%s\": {" \
"\"%s\": "
#define reportbuilderJSON_REPORT_FORMAT_PART3 \
"," \
"\""DEFENDER_REPORT_TOTAL_KEY"\": %u" \
"}," \
"\""DEFENDER_REPORT_NETWORK_STATS_KEY"\": {" \
"\""DEFENDER_REPORT_BYTES_IN_KEY"\": %u," \
"\""DEFENDER_REPORT_BYTES_OUT_KEY"\": %u," \
"\""DEFENDER_REPORT_PKTS_IN_KEY"\": %u," \
"\""DEFENDER_REPORT_PKTS_OUT_KEY"\": %u" \
"}," \
"\""DEFENDER_REPORT_TCP_CONNECTIONS_KEY"\": {" \
"\""DEFENDER_REPORT_ESTABLISHED_CONNECTIONS_KEY"\": {" \
"\""DEFENDER_REPORT_CONNECTIONS_KEY"\": "
#define reportbuilderJSON_REPORT_FORMAT_PART4 \
"," \
"\"%s\": %u" \
"}" \
"}" \
"}," \
"\"%s\": {" \
"\"stack_high_water_mark\": [" \
"{" \
"\"%s\": %u" \
"}" \
"]," \
"\"task_numbers\": [" \
"{" \
"\"%s\": "
#define reportbuilderJSON_REPORT_FORMAT_PART4 \
"," \
"\""DEFENDER_REPORT_TOTAL_KEY"\": %u" \
"}" \
"}" \
"}," \
"\""DEFENDER_REPORT_CUSTOM_METRICS_KEY"\": {" \
"\"stack_high_water_mark\": [" \
"{" \
"\""DEFENDER_REPORT_NUMBER_KEY"\": %u" \
"}" \
"]," \
"\"task_numbers\": [" \
"{" \
"\""DEFENDER_REPORT_NUMBER_LIST_KEY"\": "
#define reportbuilderJSON_REPORT_FORMAT_PART5 \
"}" \
@@ -229,7 +229,6 @@ static eReportBuilderStatus prvWritePortsArray( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_PORT_OBJECT_FORMAT,
DEFENDER_REPORT_PORT_KEY,
pusOpenPortsArray[ i ] );
if( !reportbuilderSNPRINTF_SUCCESS( lCharactersWritten, ulRemainingBufferLength ) )
@@ -305,9 +304,7 @@ static eReportBuilderStatus prvWriteConnectionsArray( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_CONNECTION_OBJECT_FORMAT,
DEFENDER_REPORT_LOCAL_PORT_KEY,
pxConn->usLocalPort,
DEFENDER_REPORT_REMOTE_ADDR_KEY,
( pxConn->ulRemoteIp >> 24 ) & 0xFF,
( pxConn->ulRemoteIp >> 16 ) & 0xFF,
( pxConn->ulRemoteIp >> 8 ) & 0xFF,
@@ -464,16 +461,9 @@ eReportBuilderStatus eGenerateJsonReport( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_REPORT_FORMAT_PART1,
DEFENDER_REPORT_HEADER_KEY,
DEFENDER_REPORT_ID_KEY,
ulReportId,
DEFENDER_REPORT_VERSION_KEY,
ulMajorReportVersion,
ulMinorReportVersion,
DEFENDER_REPORT_METRICS_KEY,
DEFENDER_REPORT_TCP_LISTENING_PORTS_KEY,
DEFENDER_REPORT_PORTS_KEY
);
ulMinorReportVersion );
if( !reportbuilderSNPRINTF_SUCCESS( lCharactersWritten, ulRemainingBufferLength ) )
{
@@ -513,11 +503,7 @@ eReportBuilderStatus eGenerateJsonReport( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_REPORT_FORMAT_PART2,
DEFENDER_REPORT_TOTAL_KEY,
pxMetrics->ulOpenTcpPortsArrayLength,
DEFENDER_REPORT_UDP_LISTENING_PORTS_KEY,
DEFENDER_REPORT_PORTS_KEY
);
pxMetrics->ulOpenTcpPortsArrayLength );
if( !reportbuilderSNPRINTF_SUCCESS( lCharactersWritten, ulRemainingBufferLength ) )
{
@@ -557,21 +543,12 @@ eReportBuilderStatus eGenerateJsonReport( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_REPORT_FORMAT_PART3,
DEFENDER_REPORT_TOTAL_KEY,
pxMetrics->ulOpenUdpPortsArrayLength,
DEFENDER_REPORT_NETWORK_STATS_KEY,
DEFENDER_REPORT_BYTES_IN_KEY,
pxMetrics->pxNetworkStats->ulBytesReceived,
DEFENDER_REPORT_BYTES_OUT_KEY,
pxMetrics->pxNetworkStats->ulBytesSent,
DEFENDER_REPORT_PKTS_IN_KEY,
pxMetrics->pxNetworkStats->ulPacketsReceived,
DEFENDER_REPORT_PKTS_OUT_KEY,
pxMetrics->pxNetworkStats->ulPacketsSent,
DEFENDER_REPORT_TCP_CONNECTIONS_KEY,
DEFENDER_REPORT_ESTABLISHED_CONNECTIONS_KEY,
DEFENDER_REPORT_CONNECTIONS_KEY
);
DEFENDER_REPORT_ESTABLISHED_CONNECTIONS_KEY );
if( !reportbuilderSNPRINTF_SUCCESS( lCharactersWritten, ulRemainingBufferLength ) )
{
@@ -611,13 +588,8 @@ eReportBuilderStatus eGenerateJsonReport( char * pcBuffer,
lCharactersWritten = snprintf( pcCurrentWritePos,
ulRemainingBufferLength,
reportbuilderJSON_REPORT_FORMAT_PART4,
DEFENDER_REPORT_TOTAL_KEY,
pxMetrics->ulEstablishedConnectionsArrayLength,
DEFENDER_REPORT_CUSTOM_METRICS_KEY,
DEFENDER_REPORT_NUMBER_KEY,
pxMetrics->ulStackHighWaterMark,
DEFENDER_REPORT_NUMBER_LIST_KEY
);
pxMetrics->ulStackHighWaterMark );
if( !reportbuilderSNPRINTF_SUCCESS( lCharactersWritten, ulRemainingBufferLength ) )
{

2
FreeRTOS-Plus/Source/AWS/device-defender

Submodule FreeRTOS-Plus/Source/AWS/device-defender updated: 548b4688b2...5a6199abda