Skip to content

Commit c260cfc

Browse files
committed
Fix CBMC proof for xCheckRequiresARPResolution and formatting
1 parent 5341b9b commit c260cfc

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

test/cbmc/proofs/ARP/xCheckRequiresARPResolution/xCheckRequiresARPResolution_harness.c

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -89,12 +89,10 @@ void harness()
8989
size_t xBufferLength;
9090
NetworkBufferDescriptor_t * pxNetworkBuffer;
9191
IPPacket_t * pxIPPacket;
92-
93-
const IPPacket_t * pxIPPacket;
94-
const IPHeader_t * pxIPHeader;
92+
IPHeader_t * pxIPHeader;
9593

9694
/* Make sure buffer size is enough, xCheckRequiresARPResolution is only called for
97-
IPv4 packets hence the minimum size should be sizeof( IPPacket_t ) */
95+
* IPv4 packets hence the minimum size should be sizeof( IPPacket_t ) */
9896
__CPROVER_assume( ( xBufferLength >= sizeof( IPPacket_t ) ) && ( xBufferLength < ipconfigNETWORK_MTU ) );
9997

10098
pxNetworkBuffer = ( NetworkBufferDescriptor_t * ) safeMalloc( sizeof( NetworkBufferDescriptor_t ) );
@@ -106,11 +104,12 @@ void harness()
106104
__CPROVER_assume( pxNetworkBuffer->pucEthernetBuffer != NULL );
107105

108106
/* Its asserted in the code that xCheckRequiresARPResolution is only called on IPv4 frame types */
107+
109108
/* See assertion: configASSERT( ( pxIPPacket->xEthernetHeader.usFrameType == ipIPv4_FRAME_TYPE ) || ( pxIPPacket->xEthernetHeader.usFrameType == ipARP_FRAME_TYPE ) );
110-
in xCheckRequiresARPResolution() */
109+
* in xCheckRequiresARPResolution() */
111110
pxIPPacket = ( ( const IPPacket_t * ) pxNetworkBuffer->pucEthernetBuffer );
112111
pxIPHeader = &( pxIPPacket->xIPHeader );
113-
__CPROVER_assume(pxIPPacket->xEthernetHeader.usFrameType == ipIPv4_FRAME_TYPE);
112+
__CPROVER_assume( pxIPPacket->xEthernetHeader.usFrameType == ipIPv4_FRAME_TYPE );
114113

115114
pxNetworkBuffer->pxEndPoint = ( NetworkEndPoint_t * ) safeMalloc( sizeof( NetworkEndPoint_t ) );
116115
__CPROVER_assume( pxNetworkBuffer->pxEndPoint != NULL );

0 commit comments

Comments
 (0)