espressif/FreeRTOS
1
0
Fork 0
mirror of https://github.com/FreeRTOS/FreeRTOS.git synced 2025-06-25 02:26:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

Have metrics collector return amount written (#428)

Browse Source
This commit is contained in:
Archit Gupta
2020-11-28 15:31:24 -08:00
committed by GitHub
parent 152b7db2c1
commit 5f72c0031d
2 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/metrics_collector.c
View File

@ -120,9 +120,6 @@ eMetricsCollectorStatus eGetOpenTcpPorts( uint16_t * pusOutTcpPortsArray,
if( eStatus == eMetricsCollectorSuccess ) if( eStatus == eMetricsCollectorSuccess )
{ {
/* Set the out value for number of open TCP ports. */
*pulOutNumTcpOpenPorts = xMetrics.xTCPPortList.uxCount;
/* Fill the output array with as many TCP ports as will fit in the /* Fill the output array with as many TCP ports as will fit in the
* given array. */ * given array. */
if( pusOutTcpPortsArray != NULL ) if( pusOutTcpPortsArray != NULL )
@ -137,6 +134,14 @@ eMetricsCollectorStatus eGetOpenTcpPorts( uint16_t * pusOutTcpPortsArray,
} }
memcpy( pusOutTcpPortsArray, &xMetrics.xTCPPortList.usTCPPortList, ulCopyAmount * sizeof( uint16_t ) ); memcpy( pusOutTcpPortsArray, &xMetrics.xTCPPortList.usTCPPortList, ulCopyAmount * sizeof( uint16_t ) );
/* Return the number of elements copied to the array. */
*pulOutNumTcpOpenPorts = ulCopyAmount;
}
else
{
/* Return the total number of open ports. */
*pulOutNumTcpOpenPorts = xMetrics.xTCPPortList.uxCount;
} }
} }
@ -169,8 +174,6 @@ eMetricsCollectorStatus eGetOpenUdpPorts( uint16_t * pusOutUdpPortsArray,
if( eStatus == eMetricsCollectorSuccess ) if( eStatus == eMetricsCollectorSuccess )
{ {
*pulOutNumUdpOpenPorts = xMetrics.xUDPPortList.uxCount;
/* Fill the output array with as many UDP ports as will fit in the /* Fill the output array with as many UDP ports as will fit in the
* given array. */ * given array. */
if( pusOutUdpPortsArray != NULL ) if( pusOutUdpPortsArray != NULL )
@ -185,6 +188,14 @@ eMetricsCollectorStatus eGetOpenUdpPorts( uint16_t * pusOutUdpPortsArray,
} }
memcpy( pusOutUdpPortsArray, &xMetrics.xUDPPortList.usUDPPortList, ulCopyAmount * sizeof( uint16_t ) ); memcpy( pusOutUdpPortsArray, &xMetrics.xUDPPortList.usUDPPortList, ulCopyAmount * sizeof( uint16_t ) );
/* Return the number of elements copied to the array. */
*pulOutNumUdpOpenPorts = ulCopyAmount;
}
else
{
/* Return the total number of open ports. */
*pulOutNumUdpOpenPorts = xMetrics.xUDPPortList.uxCount;
} }
} }
@ -220,9 +231,6 @@ eMetricsCollectorStatus eGetEstablishedConnections( Connection_t * pxOutConnecti
if( eStatus == eMetricsCollectorSuccess ) if( eStatus == eMetricsCollectorSuccess )
{ {
/* We consider only TCP sockets for open connections. */
*pulOutNumEstablishedConnections = xMetrics.xTCPSocketList.uxCount;
/* Fill the output array with as many TCP socket infos as will fit in /* Fill the output array with as many TCP socket infos as will fit in
* the given array. */ * the given array. */
if( pxOutConnectionsArray != NULL ) if( pxOutConnectionsArray != NULL )
@ -249,6 +257,14 @@ eMetricsCollectorStatus eGetEstablishedConnections( Connection_t * pxOutConnecti
pxOutConnectionsArray[ i ].usRemotePort = pxOutConnectionsArray[ i ].usRemotePort =
xMetrics.xTCPSocketList.xTCPList[ i ].usRemotePort; xMetrics.xTCPSocketList.xTCPList[ i ].usRemotePort;
} }
/* Return the number of elements copied to the array. */
*pulOutNumEstablishedConnections = ulCopyAmount;
}
else
{
/* Return the total number of established connections. */
*pulOutNumEstablishedConnections = xMetrics.xTCPSocketList.uxCount;
} }
} }

33
FreeRTOS-Plus/Demo/AWS/Device_Defender_Windows_Simulator/Device_Defender_Demo/metrics_collector.h
View File

@ -75,9 +75,9 @@ typedef struct Connection
* *
* @param[out] pxOutNetworkStats The network stats. * @param[out] pxOutNetworkStats The network stats.
* *
* @return #MetricsCollectorSuccess if the network stats are successfully obtained; * @return #eMetricsCollectorSuccess if the network stats are successfully obtained;
* #MetricsCollectorBadParameter if invalid parameters are passed; * #eMetricsCollectorBadParameter if invalid parameters are passed;
* #MetricsCollectorCollectionFailed if the collection methods failed. * #eMetricsCollectorCollectionFailed if the collection methods failed.
*/ */
eMetricsCollectorStatus eGetNetworkStats( NetworkStats_t * pxOutNetworkStats ); eMetricsCollectorStatus eGetNetworkStats( NetworkStats_t * pxOutNetworkStats );
@ -91,11 +91,12 @@ eMetricsCollectorStatus eGetNetworkStats( NetworkStats_t * pxOutNetworkStats );
* can be NULL, if only the number of open ports is needed. * can be NULL, if only the number of open ports is needed.
* @param[in] ulTcpPortsArrayLength Length of the pusOutTcpPortsArray, if it is not * @param[in] ulTcpPortsArrayLength Length of the pusOutTcpPortsArray, if it is not
* NULL. * NULL.
* @param[out] pulOutNumTcpOpenPorts Number of the open TCP ports. * @param[out] pulOutNumTcpOpenPorts Number of open TCP ports if @p
* pusOutTcpPortsArray NULL, else number of TCP ports written.
* *
* @return #MetricsCollectorSuccess if open TCP ports are successfully obtained; * @return #eMetricsCollectorSuccess if open TCP ports are successfully obtained;
* #MetricsCollectorBadParameter if invalid parameters are passed; * #eMetricsCollectorBadParameter if invalid parameters are passed;
* #MetricsCollectorCollectionFailed if the collection methods failed. * #eMetricsCollectorCollectionFailed if the collection methods failed.
*/ */
eMetricsCollectorStatus eGetOpenTcpPorts( uint16_t * pusOutTcpPortsArray, eMetricsCollectorStatus eGetOpenTcpPorts( uint16_t * pusOutTcpPortsArray,
uint32_t ulTcpPortsArrayLength, uint32_t ulTcpPortsArrayLength,
@ -111,11 +112,12 @@ eMetricsCollectorStatus eGetOpenTcpPorts( uint16_t * pusOutTcpPortsArray,
* be NULL, if only number of open ports is needed. * be NULL, if only number of open ports is needed.
* @param[in] ulUdpPortsArrayLength Length of the pusOutUdpPortsArray, if it is not * @param[in] ulUdpPortsArrayLength Length of the pusOutUdpPortsArray, if it is not
* NULL. * NULL.
* @param[out] pulOutNumUdpOpenPorts Number of the open UDP ports. * @param[out] pulOutNumUdpOpenPorts Number of open UDP ports if @p
* pusOutUdpPortsArray NULL, else number of UDP ports written.
* *
* @return #MetricsCollectorSuccess if open UDP ports are successfully obtained; * @return #eMetricsCollectorSuccess if open UDP ports are successfully obtained;
* #MetricsCollectorBadParameter if invalid parameters are passed; * #eMetricsCollectorBadParameter if invalid parameters are passed;
* #MetricsCollectorCollectionFailed if the collection methods failed. * #eMetricsCollectorCollectionFailed if the collection methods failed.
*/ */
eMetricsCollectorStatus eGetOpenUdpPorts( uint16_t * pusOutUdpPortsArray, eMetricsCollectorStatus eGetOpenUdpPorts( uint16_t * pusOutUdpPortsArray,
uint32_t ulUdpPortsArrayLength, uint32_t ulUdpPortsArrayLength,
@ -133,11 +135,12 @@ eMetricsCollectorStatus eGetOpenUdpPorts( uint16_t * pusOutUdpPortsArray,
* needed. * needed.
* @param[in] ulConnectionsArrayLength Length of the pxOutConnectionsArray, if it * @param[in] ulConnectionsArrayLength Length of the pxOutConnectionsArray, if it
* is not NULL. * is not NULL.
* @param[out] pulOutNumEstablishedConnections Number of the established connections. * @param[out] pulOutNumEstablishedConnections Number of established connections if @p
* pusOutNumEstablishedConnections NULL, else number of established connections written.
* *
* @return #MetricsCollectorSuccess if established connections are successfully obtained; * @return #eMetricsCollectorSuccess if established connections are successfully obtained;
* #MetricsCollectorBadParameter if invalid parameters are passed; * #eMetricsCollectorBadParameter if invalid parameters are passed;
* #MetricsCollectorCollectionFailed if the collection methods failed. * #eMetricsCollectorCollectionFailed if the collection methods failed.
*/ */
eMetricsCollectorStatus eGetEstablishedConnections( Connection_t * pxOutConnectionsArray, eMetricsCollectorStatus eGetEstablishedConnections( Connection_t * pxOutConnectionsArray,
uint32_t ulConnectionsArrayLength, uint32_t ulConnectionsArrayLength,