Skip to content

Fix #129, reject FD packets with segment_metadata flag set #151

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 12, 2022
Merged

Fix #129, reject FD packets with segment_metadata flag set #151

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
8 changes: 8 additions & 0 deletions fsw/src/cf_cfdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -839,6 +839,14 @@ int CF_CFDP_RecvFd(CF_Transaction_t *t, CF_Logical_PduBuffer_t *ph)
++CF_AppData.hk.channel_hk[t->chan_num].counters.recv.error;
ret = -1;
}
else if (ph->pdu_header.segment_meta_flag)
{
/* If recv PDU has the "segment_meta_flag" set, this is not currently handled in CF. */
CFE_EVS_SendEvent(CF_EID_ERR_PDU_FD_UNSUPPORTED, CFE_EVS_EventType_ERROR,
"CF: filedata pdu with segment metadata received");
++CF_AppData.hk.channel_hk[t->chan_num].counters.recv.error;
ret = -1;
}

return ret;
}
Expand Down
1 change: 1 addition & 0 deletions fsw/src/cf_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@
#define CF_EID_ERR_PDU_BAD_RX_MSG_SIZE 51
#define CF_EID_ERR_PDU_GET_EID_SIZE 52
#define CF_EID_ERR_PDU_GET_TSN_SIZE 53
#define CF_EID_ERR_PDU_FD_UNSUPPORTED 54

/* CF_CFDP event ids (engine) */
#define CF_EID_ERR_CFDP_RX_DROPPED 60
Expand Down
6 changes: 6 additions & 0 deletions unit-test/cf_cfdp_tests.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,12 @@ void Test_CF_CFDP_RecvFd(void)
ph->int_header.fd.data_len = sizeof(CF_CFDP_uint32_t) - 1;
UtAssert_INT32_EQ(CF_CFDP_RecvFd(t, ph), -1);
UtAssert_BOOL_FALSE(CF_CODEC_IS_OK(ph->pdec));

/* with segment metadata (unimplemented) */
UT_CFDP_SetupBasicTestState(UT_CF_Setup_RX, &ph, NULL, NULL, &t, NULL);
ph->pdu_header.segment_meta_flag = 1;
UtAssert_INT32_EQ(CF_CFDP_RecvFd(t, ph), -1);
UT_CF_AssertEventID(CF_EID_ERR_PDU_FD_UNSUPPORTED);
}

void Test_CF_CFDP_RecvEof(void)
Expand Down