Bug fix: master providing Dealy_Resp also in P2P mechanism

A master in P2P was responding to a Delay request message. A check for the delay mechanism has been introduced to fix this issue.

Bug fix: master providing Dealy_Resp also in P2P mechanism
A master in P2P was responding to a Delay request message. A check for the delay mechanism has been introduced to fix this issue.
442feabf · Jean-Claude BAU · 37bd125d · 442feabf
Commit 442feabf authored Sep 19, 2019 by Jean-Claude BAU
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 4 deletions

state-master.c proto-standard/state-master.c +7 -4

No files found.
--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -52,10 +52,13 @@ static int master_handle_announce(struct pp_instance *ppi, void *buf, int len)
 static int master_handle_delay_request(struct pp_instance *ppi,
 				       void *buf, int len)
 {
-	if (ppi->state == PPS_MASTER) { /* not pre-master */
-		if ( !msg_issue_delay_resp(ppi, &ppi->last_rcv_time) ) {
-			if (is_ext_hook_available(ppi,handle_dreq))
-				ppi->ext_hooks->handle_dreq(ppi);
+	/* if not in E2E mode, just return */
+	if ( is_delayMechanismE2E(ppi) ) {
+		if (ppi->state == PPS_MASTER) { /* not pre-master */
+			if ( !msg_issue_delay_resp(ppi, &ppi->last_rcv_time) ) {
+				if (is_ext_hook_available(ppi,handle_dreq))
+					ppi->ext_hooks->handle_dreq(ppi);
+			}
 		}
 	}
 	return 0;