Fix formatting

Author: tony-josi-aws

source/FreeRTOS_IPv6.c

@@ -506,8 +506,8 @@ eFrameProcessingResult_t prvAllowIPPacketIPv6( const IPHeader_IPv6_t * const pxI
         }
         /* Is the packet for this IP address? */
         else if( ( xHasUnspecifiedAddress == pdFALSE ) &&
-            ( pxNetworkBuffer->pxEndPoint != NULL ) &&
-            ( memcmp( pxDestinationIPAddress->ucBytes, pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( IPv6_Address_t ) ) == 0 ) )
+                 ( pxNetworkBuffer->pxEndPoint != NULL ) &&
+                 ( memcmp( pxDestinationIPAddress->ucBytes, pxNetworkBuffer->pxEndPoint->ipv6_settings.xIPAddress.ucBytes, sizeof( IPv6_Address_t ) ) == 0 ) )
         {
             eReturn = eProcessBuffer;
         }

source/FreeRTOS_IPv6_Utils.c

@@ -107,6 +107,7 @@ BaseType_t prvChecksumIPv6Checks( uint8_t * pucEthernetBuffer,
             /* coverity[misra_c_2012_rule_11_3_violation] */
             pxSet->pxProtocolHeaders = ( ( ProtocolHeaders_t * ) &( pucEthernetBuffer[ ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + uxExtensionHeaderLength ] ) );
             pxSet->usPayloadLength = FreeRTOS_ntohs( pxSet->pxIPPacket_IPv6->usPayloadLength );
+
             /* For IPv6, the number of bytes in the protocol is indicated. */
             if( pxSet->usPayloadLength < uxExtensionHeaderLength )
             {

source/FreeRTOS_ND.c

@@ -132,7 +132,7 @@
 struct xNetworkEndPoint;
 struct xNetworkInterface;
 
-#define ipICMPv6_GENERAL_FIELD_SIZE             (4U)
+#define ipICMPv6_GENERAL_FIELD_SIZE    ( 4U )
 
 #include "pack_struct_start.h"
 struct xIP_HEADER_IPv6

source/include/FreeRTOS_IPv6_Private.h

@@ -137,7 +137,7 @@ void harness()
     uint16_t usEthernetBufferSize;
     NetworkBufferDescriptor_t * pxLocalARPWaitingNetworkBuffer;
 
-    /* Following assumption is to make sure ulLen doesn't go 
+    /* Following assumption is to make sure ulLen doesn't go
      * beyond CBMC_MAX_OBJECT_SIZE */
     __CPROVER_assume( ulLen < ( CBMC_MAX_OBJECT_SIZE - ipBUFFER_PADDING ) );
 

test/cbmc/proofs/ND/prvProcessICMPMessage_IPv6/ProcessICMPMessage_IPv6_harness.c

@@ -36,12 +36,11 @@ void harness()
     xSet.pxIPPacket_IPv6 = ( const IPHeader_IPv6_t * ) ( pucEthernetBuffer + ipSIZE_OF_ETH_HEADER );
 
     xReturn = prvChecksumIPv6Checks( pucEthernetBuffer,
-                           uxBufferSize,
-                           &xSet );
+                                     uxBufferSize,
+                                     &xSet );
 
     if( xReturn == 0 )
     {
         __CPROVER_assert( ( xSet.usProtocolBytes <= FreeRTOS_ntohs( xSet.pxIPPacket_IPv6->usPayloadLength ) ), "xSet.usProtocolBytes shouldn't be greater than IPv6 usPayloadLength" );
     }
-
 }

test/cbmc/proofs/prvChecksumIPv6Checks/prvChecksumIPv6Checks_harness.c

@@ -87,7 +87,7 @@ void test_prvAllowIPPacketIPv6_DestinationUnspecifiedAddress()
     memcpy( xIPv6Address.xDestinationAddress.ucBytes, FreeRTOS_in6addr_any.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
     memcpy( xIPv6Address.xSourceAddress.ucBytes, xIPAddressFive.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
     xIPv6Address.ucVersionTrafficClass = 0x60U;
-    
+
     eResult = prvAllowIPPacketIPv6( &xIPv6Address, NULL, 0U );
     TEST_ASSERT_EQUAL( eReleaseBuffer, eResult );
 }

test/unit-test/FreeRTOS_IPv6/FreeRTOS_IPv6_utest.c

@@ -229,10 +229,10 @@ void test_prvChecksumIPv6Checks_IncorrectPayloadLength( void )
     uxIndex += 8;
 
     xSet.pxIPPacket_IPv6 = ( ( const IPHeader_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer );
-    IPHeader_IPv6_t * pxIPPacket_IPv6 = (IPHeader_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer;
+    IPHeader_IPv6_t * pxIPPacket_IPv6 = ( IPHeader_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer;
 
     /* Incorrect payload length */
-    pxIPPacket_IPv6->usPayloadLength = FreeRTOS_ntohs(20);
+    pxIPPacket_IPv6->usPayloadLength = FreeRTOS_ntohs( 20 );
 
     xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_HOP_BY_HOP, 0U, 1 );
     xGetExtensionOrder_ExpectAndReturn( ipIPv6_EXT_HEADER_HOP_BY_HOP, ipIPv6_EXT_HEADER_ROUTING_HEADER, 1 );

test/unit-test/FreeRTOS_IPv6_Utils/FreeRTOS_IPv6_Utils_utest.c

@@ -202,7 +202,7 @@ void test_eNDGetCacheEntry_Multicast_InvalidEndPoint( void )
     MACAddress_t xMACAddress;
     IPv6_Address_t xIPAddress;
     NetworkEndPoint_t xEndPoint, * pxEndPoint = &xEndPoint;
-    
+
     ( void ) memcpy( xIPAddress.ucBytes, xMultiCastIPAddress.ucBytes, ipSIZE_OF_IPv6_ADDRESS );
 
     xIsIPv6AllowedMulticast_ExpectAnyArgsAndReturn( pdTRUE );
@@ -1530,7 +1530,7 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_IncorrectSize( void
 
     pxNetworkBuffer->pxEndPoint = &xEndPoint;
     pxNetworkBuffer->pucEthernetBuffer = ( uint8_t * ) &ucBuffer;
-    pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER +5 ;
+    pxNetworkBuffer->xDataLength = ipSIZE_OF_ETH_HEADER + ipSIZE_OF_IPv6_HEADER + 5;
     pxICMPPacket = ( ( ICMPPacket_IPv6_t * ) pxNetworkBuffer->pucEthernetBuffer );
     pxICMPPacket->xICMPHeaderIPv6.ucTypeOfMessage = ipICMP_PING_REPLY_IPv6;
     pxICMPPacket->xIPHeader.usPayloadLength = FreeRTOS_ntohs( ipBUFFER_PADDING );
@@ -1545,7 +1545,7 @@ void test_prvProcessICMPMessage_IPv6_ipICMP_PING_REPLY_IPv6_IncorrectSize( void
 
     ( void ) memset( pucByte, ipECHO_DATA_FILL_BYTE, uxDataLength );
 
-    // vApplicationPingReplyHook_Expect( eSuccess, pxICMPEchoHeader->usIdentifier );
+    /* vApplicationPingReplyHook_Expect( eSuccess, pxICMPEchoHeader->usIdentifier ); */
 
     eReturn = prvProcessICMPMessage_IPv6( pxNetworkBuffer );