fsm: when no frame, set msgtype to PPM_NO_MESSAGE

This removes a number of explicit checks in the states themselves. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

fsm: when no frame, set msgtype to PPM_NO_MESSAGE
This removes a number of explicit checks in the states themselves. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
168655e6 · Alessandro Rubini · b0797a47 · 168655e6 · 168655e6 · 168655e6
Commit 168655e6 authored Mar 04, 2016 by Alessandro Rubini
12 changed files
--- a/fsm.c
+++ b/fsm.c
@@ -198,6 +198,8 @@ int pp_state_machine(struct pp_instance *ppi, uint8_t *packet, int plen)
 		packet = NULL;
 		plen = 0;
 	}
+	if (!plen)
+		ppi->received_ptp_header.messageType = PPM_NO_MESSAGE;
 	state = ppi->state;

--- a/proto-ext-whiterabbit/hooks.c
+++ b/proto-ext-whiterabbit/hooks.c
@@ -86,7 +86,8 @@ static int wr_master_msg(struct pp_instance *ppi, unsigned char *pkt, int plen,
 	MsgSignaling wrsig_msg;
 	TimeInternal *time = &ppi->last_rcv_time;
-	pp_diag(ppi, ext, 2, "hook: %s\n", __func__);
+	if (msgtype != PPM_NO_MESSAGE)
+		pp_diag(ppi, ext, 2, "hook: %s\n", __func__);
 	switch (msgtype) {

--- a/proto-ext-whiterabbit/state-wr-calibrated.c
+++ b/proto-ext-whiterabbit/state-wr-calibrated.c
@@ -31,9 +31,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		return 0; /* non-wr */
 	}
-	if (plen == 0)
-		goto out;
 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
 		msg_unpack_wrsig(ppi, pkt, &wrsig_msg,
 			 &(wrp->msgTmpWrMessageID));
@@ -46,7 +43,6 @@ int wr_calibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			ppi->next_state = WRS_WR_LINK_ON;
 	}
-out:
 	ppi->next_delay = wrp->wrStateTimeout;
 	return 0;
 }
--- a/proto-ext-whiterabbit/state-wr-locked.c
+++ b/proto-ext-whiterabbit/state-wr-locked.c
@@ -34,9 +34,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		e = msg_issue_wrsig(ppi, LOCKED);
 	}
-	if (plen == 0)
-		goto out;
 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
 		msg_unpack_wrsig(ppi, pkt, &wrsig_msg,
@@ -46,7 +43,6 @@ int wr_locked(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			ppi->next_state = WRS_RESP_CALIB_REQ;
 	}
-out:
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;
 	ppi->next_delay = wrp->wrStateTimeout;

--- a/proto-ext-whiterabbit/state-wr-m-lock.c
+++ b/proto-ext-whiterabbit/state-wr-m-lock.c
@@ -34,9 +34,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		__pp_timeout_set(ppi, PP_TO_EXT_0, WR_M_LOCK_TIMEOUT_MS);
 	}
-	if (plen == 0)
-		goto out;
 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
 		msg_unpack_wrsig(ppi, pkt, &wrsig_msg,
@@ -46,7 +43,6 @@ int wr_m_lock(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			ppi->next_state = WRS_CALIBRATION;
 	}
-out:
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;
 	ppi->next_delay = wrp->wrStateTimeout;

--- a/proto-ext-whiterabbit/state-wr-present.c
+++ b/proto-ext-whiterabbit/state-wr-present.c
@@ -38,9 +38,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		e = msg_issue_wrsig(ppi, SLAVE_PRESENT);
 	}
-	if (plen == 0)
-		goto out;
 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
 		msg_unpack_wrsig(ppi, pkt, &wrsig_msg,
@@ -50,7 +47,6 @@ int wr_present(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			ppi->next_state = WRS_S_LOCK;
 	}
-out:
 	if (e == 0)
 		st_com_execute_slave(ppi);
 	else

--- a/proto-ext-whiterabbit/state-wr-resp-calib-req.c
+++ b/proto-ext-whiterabbit/state-wr-resp-calib-req.c
@@ -35,9 +35,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			       wrp->otherNodeCalPeriod / 1000);
 	}
-	if (plen == 0)
-		goto out;
 	if (ppi->received_ptp_header.messageType == PPM_SIGNALING) {
 		msg_unpack_wrsig(ppi, pkt, &wrsig_msg,
@@ -53,7 +50,6 @@ int wr_resp_calib_req(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		}
 	}
-out:
 	ppi->next_delay = wrp->wrStateTimeout;
 	return e;
 }
--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -22,9 +22,6 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH)
 		e  = pp_lib_may_issue_request(ppi);
-	if (plen == 0)
-		goto out;
 	switch (ppi->received_ptp_header.messageType) {
 	case PPM_ANNOUNCE:

--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -65,9 +65,6 @@ int pp_master(struct pp_instance *ppi, uint8_t *pkt, int plen)
 	else /* please check commit '6d7bf7e3' about below, I'm not sure */
 		pp_timeout_set(ppi, PP_TO_REQUEST);
-	if (plen == 0)
-		goto out;
 	/*
 	 * An extension can do special treatment of this message type,
 	 * possibly returning error or eating the message by returning
@@ -86,7 +83,7 @@ int pp_master(struct pp_instance *ppi, uint8_t *pkt, int plen)
 	/*
 	 * The management of messages is now table-driven
 	 */
-	if (plen && msgtype < ARRAY_SIZE(actions)
+	if (msgtype < ARRAY_SIZE(actions)
 	    && actions[msgtype]) {
 		e = actions[msgtype](ppi, pkt, plen);
 	} else {

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -17,9 +17,6 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH)
 		e  = pp_lib_may_issue_request(ppi);
-	if (plen == 0)
-		goto no_incoming_msg;
 	switch (ppi->received_ptp_header.messageType) {
 	case PPM_ANNOUNCE:
@@ -51,7 +48,6 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	}
-no_incoming_msg:
 	if (e == 0)
 		e = st_com_execute_slave(ppi);

--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -95,7 +95,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	/*
 	 * The management of messages is now table-driven
 	 */
-	if (plen && hdr->messageType < ARRAY_SIZE(actions)
+	if (hdr->messageType < ARRAY_SIZE(actions)
 	    && actions[hdr->messageType]) {
 		e = actions[hdr->messageType](ppi, pkt, plen);
 	} else {

--- a/proto-standard/state-uncalibrated.c
+++ b/proto-standard/state-uncalibrated.c
@@ -13,9 +13,6 @@ int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
 {
 	int e = 0; /* error var, to check errors in msg handling */
-	if (plen == 0)
-		goto no_incoming_msg;
 	switch (ppi->received_ptp_header.messageType) {
 	case PPM_ANNOUNCE:
@@ -35,7 +32,6 @@ int pp_uncalibrated(struct pp_instance *ppi, unsigned char *pkt, int plen)
 		break;
 	}
-no_incoming_msg:
 	if (e == 0)
 		e = st_com_execute_slave(ppi);