bugfix: fsm: PPM_NO_MESSAGE was set too early

commit 168655e6 fsm: when no frame, set msgtype to PPM_NO_MESSAGE was good, but I didn't notice that pp_packet_prefilter() may force a packet drop. This moves the assignemento of PPM_NO_MESSAGE to a later place, just before calling the state machine. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

bugfix: fsm: PPM_NO_MESSAGE was set too early
commit 168655e6 fsm: when no frame, set msgtype to PPM_NO_MESSAGE was good, but I didn't notice that pp_packet_prefilter() may force a packet drop. This moves the assignemento of PPM_NO_MESSAGE to a later place, just before calling the state machine. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
12514c7c · Alessandro Rubini · dd97c99a · 12514c7c
Commit 12514c7c authored Dec 03, 2016 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

fsm.c fsm.c +2 -2

No files found.
--- a/fsm.c
+++ b/fsm.c
@@ -228,8 +228,6 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
 		plen = 0;
 		packet = NULL;
 	}
-	if (!plen)
-		ppi->received_ptp_header.messageType = PPM_NO_MESSAGE;

 	state = ppi->state;

@@ -257,6 +255,8 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
 	if (ppi->state != ppi->next_state)
 		return leave_current_state(ppi);

+	if (!plen)
+		ppi->received_ptp_header.messageType = PPM_NO_MESSAGE;
 	err = ip->f1(ppi, packet, plen);
 	if (err)
 		pp_printf("fsm for %s: Error %i in %s\n",