audit porting: ported the patches of the audit chapter 3.3

Most of them were already ported, added a check before returning next delay if a timeout for a (p)delay request has to be taken into account

audit porting: ported the patches of the audit chapter 3.3
Most of them were already ported, added a check before returning next delay if a timeout for a (p)delay request has to be taken into account
8e3dfe52 · Sven Meier · Adam Wujek · a8683138 · 8e3dfe52 · 8e3dfe52
Commit 8e3dfe52 authored Jul 12, 2017 by Sven Meier Committed by Adam Wujek Jul 12, 2017
Showing with 32 additions and 11 deletions

state-listening.c proto-standard/state-listening.c +8 -2

state-master.c proto-standard/state-master.c +15 -6

state-passive.c proto-standard/state-passive.c +8 -2

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

No files found.
--- a/proto-standard/state-listening.c
+++ b/proto-standard/state-listening.c
@@ -58,7 +58,13 @@ out:
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;

-	ppi->next_delay = pp_next_delay_1(ppi, PP_TO_ANN_RECEIPT);
-
+	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH) {
+		ppi->next_delay = pp_next_delay_2(ppi, 
+			PP_TO_ANN_RECEIPT, PP_TO_REQUEST);
+	} else {
+		ppi->next_delay = pp_next_delay_1(ppi, 
+			PP_TO_ANN_RECEIPT);
+	}
+	
 	return e;
 }
--- a/proto-standard/state-master.c
+++ b/proto-standard/state-master.c
@@ -69,8 +69,6 @@ int pp_master(struct pp_instance *ppi, void *buf, int len)
 	/* when the clock is using peer-delay, the master must send it too */
 	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH)
 		pp_lib_may_issue_request(ppi);
-	else /* please check commit '6d7bf7e3' about below, I'm not sure */
-		pp_timeout_set(ppi, PP_TO_REQUEST);

 	/*
 	 * An extension can do special treatment of this message type,
@@ -119,12 +117,23 @@ out:
 	}

 	if (pre) {
-		ppi->next_delay = pp_next_delay_2(ppi,
-			PP_TO_QUALIFICATION, PP_TO_REQUEST);
+		if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH) {
+			ppi->next_delay = pp_next_delay_2(ppi,
+				PP_TO_QUALIFICATION, PP_TO_REQUEST);
+		} else {
+			ppi->next_delay = pp_next_delay_1(ppi,
+				PP_TO_QUALIFICATION);			
+		}		
 	} else {
-		ppi->next_delay = pp_next_delay_3(ppi,
-			PP_TO_ANN_SEND, PP_TO_SYNC_SEND, PP_TO_REQUEST);
+		if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH) {
+			ppi->next_delay = pp_next_delay_3(ppi,
+				PP_TO_ANN_SEND, PP_TO_SYNC_SEND, PP_TO_REQUEST);
+		} else {
+			ppi->next_delay = pp_next_delay_2(ppi,
+				PP_TO_ANN_SEND, PP_TO_SYNC_SEND);			
+		}		
 	}
+	
 	return e;
 }

--- a/proto-standard/state-passive.c
+++ b/proto-standard/state-passive.c
@@ -80,7 +80,13 @@ int pp_passive(struct pp_instance *ppi, void *buf, int len)
 	if (e != 0)
 		ppi->next_state = PPS_FAULTY;

-	ppi->next_delay = pp_next_delay_1(ppi, PP_TO_ANN_RECEIPT);
-
+	if (CONFIG_HAS_P2P && ppi->mech == PP_P2P_MECH) {
+		ppi->next_delay = pp_next_delay_2(ppi, 
+			PP_TO_ANN_RECEIPT, PP_TO_REQUEST);
+	} else {
+		ppi->next_delay = pp_next_delay_1(ppi, 
+			PP_TO_ANN_RECEIPT);
+	}
+	
 	return e;
 }
--- a/proto-standard/state-slave.c
+++ b/proto-standard/state-slave.c
@@ -265,7 +265,7 @@ out:
 	}

 	ppi->next_delay = pp_next_delay_2(ppi,
-					  PP_TO_ANN_RECEIPT, PP_TO_REQUEST);
+		PP_TO_ANN_RECEIPT, PP_TO_REQUEST);
 	return e;
 }