Skip to content

P
PPSi
Commit 07e328e3 authored by Davide Ciminaghi's avatar Davide Ciminaghi Committed by Alessandro Rubini
Browse files
Options

fsm: simplify msg header unpacking code

parent d444b632
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 9 deletions
fsm.c
View file @ 07e328e3
...@@ -83,20 +83,22 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen) ...@@ -83,20 +83,22 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
(int)ppi->last_rcv_time.nanoseconds, (int)ppi->last_rcv_time.nanoseconds,
packet[0] & 0xf, pp_msg_names[packet[0] & 0xf]); packet[0] & 0xf, pp_msg_names[packet[0] & 0xf]);
/*
* Discard too short packets
*/
if (plen < PP_HEADER_LENGTH) {
plen = 0;
packet = NULL;
}
/* /*
* Since all ptp frames have the same header, parse it now. * Since all ptp frames have the same header, parse it now.
* In case of error continue without a frame, so the current * In case of error continue without a frame, so the current
* ptp state can update ppi->next_delay and return a proper value * ptp state can update ppi->next_delay and return a proper value
*/ */
if (plen) { if (plen && msg_unpack_header(ppi, packet, plen)) {
if (plen >= PP_HEADER_LENGTH) packet = NULL;
err = msg_unpack_header(ppi, packet, plen); plen = 0;
else
err = 1;
if (err) {
plen = 0;
packet = NULL;
}
} }
state = ppi->state; state = ppi->state;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment