From fffb6a53bd1bfda9984a6a536e2f97d2eada007e Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Sat, 15 Aug 2015 11:24:41 +0200 Subject: [PATCH] config: port: convert 'syncReceiptTimeout' to the new scheme. Signed-off-by: Richard Cochran --- config.c | 9 ++------- ds.h | 1 - port.c | 2 +- ptp4l.c | 1 - 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/config.c b/config.c index 6401e44..c17ab73 100644 --- 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 index 7652632..5f4d035 100644 --- 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 index aa8572d..9d4fe7c 100644 --- 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 index cc20236..2ceb484 100644 --- 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,