config: port: convert 'syncReceiptTimeout' to the new scheme.

Signed-off-by: Richard Cochran <[email protected]>
zcgecho · Aug 23, 2015 · fffb6a5 · fffb6a5
1 parent 35227f2
commit fffb6a5
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 10 deletions.
diff --git a/config.c b/config.c
@@ -112,6 +112,7 @@ struct config_item config_tab[] = {
 	GLOB_ITEM_DBL("pi_proportional_norm_max", 0.7, DBL_MIN, 1.0),
 	GLOB_ITEM_DBL("pi_proportional_scale", 0.0, 0.0, DBL_MAX),
 	GLOB_ITEM_DBL("step_threshold", 0.0, 0.0, DBL_MAX),
+	PORT_ITEM_INT("syncReceiptTimeout", 0, 0, UINT8_MAX),
 	GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX),
 	PORT_ITEM_INT("udp_ttl", 1, 1, 255),
 	GLOB_ITEM_INT("use_syslog", 1, 0, 1),
@@ -268,13 +269,7 @@ static enum parser_result parse_pod_setting(const char *option,
 
 	enum parser_result r;
 
-	if (!strcmp(option, "syncReceiptTimeout")) {
-		r = get_ranged_uint(value, &uval, 0, UINT8_MAX);
-		if (r != PARSED_OK)
-			return r;
-		pod->syncReceiptTimeout = uval;
-
-	} else if (!strcmp(option, "transportSpecific")) {
+	if (!strcmp(option, "transportSpecific")) {
 		r = get_ranged_uint(value, &uval, 0, 0x0F);
 		if (r != PARSED_OK)
 			return r;

diff --git a/ds.h b/ds.h
@@ -125,7 +125,6 @@ struct portDS {
 #define FRI_ASAP (-128)
 
 struct port_defaults {
-	UInteger8 syncReceiptTimeout;
 	UInteger8 transportSpecific;
 	int announce_span;
 	int path_trace_enabled;

diff --git a/port.c b/port.c
@@ -1448,7 +1448,7 @@ static int port_initialize(struct port *p)
 	p->peerMeanPathDelay       = 0;
 	p->logAnnounceInterval     = config_get_int(cfg, p->name, "logAnnounceInterval");
 	p->announceReceiptTimeout  = config_get_int(cfg, p->name, "announceReceiptTimeout");
-	p->syncReceiptTimeout      = p->pod.syncReceiptTimeout;
+	p->syncReceiptTimeout      = config_get_int(cfg, p->name, "syncReceiptTimeout");
 	p->transportSpecific       = p->pod.transportSpecific;
 	p->logSyncInterval         = config_get_int(cfg, p->name, "logSyncInterval");
 	p->logMinPdelayReqInterval = config_get_int(cfg, p->name, "logMinPdelayReqInterval");

diff --git a/ptp4l.c b/ptp4l.c
@@ -80,7 +80,6 @@ static struct config cfg_settings = {
 	},
 
 	.pod = {
-		.syncReceiptTimeout = 0,
 		.transportSpecific = 0,
 		.announce_span = 1,
 		.path_trace_enabled = 0,