p2p: only answer peer delay messages when in p2p mode

changed peer delay handling so p2p messages are only answered when in this mode added p2p messages to some states where it was missing

p2p: only answer peer delay messages when in p2p mode
changed peer delay handling so p2p messages are only answered when in this mode added p2p messages to some states where it was missing
78f90b18 · Sven Meier · Adam Wujek · 53cb49ff · 78f90b18 · 78f90b18
Commit 78f90b18 authored Jul 05, 2017 by Sven Meier Committed by Adam Wujek Jul 12, 2017
Showing with 17 additions and 1 deletion

common-fun.c proto-standard/common-fun.c +12 -0

state-listening.c proto-standard/state-listening.c +3 -0

state-passive.c proto-standard/state-passive.c +1 -1

state-slave.c proto-standard/state-slave.c +1 -0

No files found.
--- a/proto-standard/common-fun.c
+++ b/proto-standard/common-fun.c
@@ -94,6 +94,10 @@ int st_com_peer_handle_pres(struct pp_instance *ppi, unsigned char *buf,
 	MsgHeader *hdr = &ppi->received_ptp_header;
 	int e = 0;

+	/* if not in P2P mode, just return */
+	if (!CONFIG_HAS_P2P || ppi->mech != PP_P2P_MECH)
+		return 0;
+	
 	msg_unpack_pdelay_resp(buf, &resp);

 	if ((memcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
@@ -136,6 +140,10 @@ int st_com_peer_handle_pres_followup(struct pp_instance *ppi,
 	MsgPDelayRespFollowUp respFllw;
 	int e = 0;

+	/* if not in P2P mode, just return */
+	if (!CONFIG_HAS_P2P || ppi->mech != PP_P2P_MECH)
+		return 0;
+	
 	msg_unpack_pdelay_resp_follow_up(buf, &respFllw);

 	if ((memcmp(&DSPOR(ppi)->portIdentity.clockIdentity,
@@ -164,6 +172,10 @@ int st_com_peer_handle_preq(struct pp_instance *ppi, unsigned char *buf,
 {
 	int e = 0;

+	/* if not in P2P mode, just return */
+	if (!CONFIG_HAS_P2P || ppi->mech != PP_P2P_MECH)
+		return 0;
+	
 	if (pp_hooks.handle_preq)
 		e = pp_hooks.handle_preq(ppi);
 	if (e)

--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -34,6 +34,9 @@ int pp_listening(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	if (e)
 		goto out;

+	/* when the clock is using peer-delay, listening must send it too */
+	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH)
+		e  = pp_lib_may_issue_request(ppi);
 	/*
 	 * The management of messages is now table-driven
 	 */

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -56,7 +56,7 @@ int pp_passive(struct pp_instance *ppi, unsigned char *pkt, int plen)
 	pp_timeout_set(ppi, PP_TO_FAULT); /* no fault as long as we are
 					   * passive */

-	/* when the clock is using peer-delay, listening must send it too */
+	/* when the clock is using peer-delay, passive must send it too */
 	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH)
 		e  = pp_lib_may_issue_request(ppi);


--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -227,6 +227,7 @@ int pp_slave(struct pp_instance *ppi, unsigned char *pkt, int plen)
 			goto out;
 	}

+	/* do a delay mesurement either in p2p or e2e delay mode */
 	pp_lib_may_issue_request(ppi);
 	
 	/*