Skip to content

Fix #172, restore call to CF_CFDP_RecvNak #176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
astrogeco merged 1 commit into from
Jan 18, 2022
Merged

Fix #172, restore call to CF_CFDP_RecvNak #176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion fsw/src/cf_cfdp_s.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ void CF_CFDP_S2_Nak(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph)
/* this function is only invoked for NAK PDU types */
nak = &ph->int_header.nak;

if (nak->segment_list.num_segments > 0)
if (CF_CFDP_RecvNak(t, ph) == 0 && nak->segment_list.num_segments > 0)
{
for (counter = 0; counter < nak->segment_list.num_segments; ++counter)
{
Expand Down
9 changes: 9 additions & 0 deletions unit-test/cf_cfdp_s_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -777,6 +777,15 @@ void Test_CF_CFDP_S2_Nak(void)
UtAssert_VOIDCALL(CF_CFDP_S2_Nak(t, ph));
UtAssert_UINT32_EQ(CF_AppData.hk.channel_hk[t->chan_num].counters.recv.nak_segment_requests, 6);
UT_CF_AssertEventID(CF_EID_ERR_CFDP_S_INVALID_SR);

/* bad decode */
UT_CFDP_S_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL);
UT_SetDeferredRetcode(UT_KEY(CF_CFDP_RecvNak), 1, -1);
nak = &ph->int_header.nak;
nak->segment_list.num_segments = 1;
UtAssert_VOIDCALL(CF_CFDP_S2_Nak(t, ph));
UtAssert_UINT32_EQ(CF_AppData.hk.channel_hk[t->chan_num].counters.recv.error, 2);
UT_CF_AssertEventID(CF_EID_ERR_CFDP_S_PDU_NAK);
}

void Test_CF_CFDP_S2_Nak_Arm(void)
Expand Down