diff --git a/config.c b/config.c index 4ebe1b8..0cd26e2 100644 --- a/config.c +++ b/config.c @@ -96,6 +96,7 @@ struct config_item config_tab[] = { PORT_ITEM_INT("delayAsymmetry", 0, INT_MIN, INT_MAX), GLOB_ITEM_DBL("first_step_threshold", 0.00002, 0.0, DBL_MAX), PORT_ITEM_INT("logAnnounceInterval", 1, INT8_MIN, INT8_MAX), + PORT_ITEM_INT("logSyncInterval", 0, INT8_MIN, INT8_MAX), GLOB_ITEM_INT("logging_level", LOG_INFO, PRINT_LEVEL_MIN, PRINT_LEVEL_MAX), GLOB_ITEM_INT("max_frequency", 900000000, 0, INT_MAX), GLOB_ITEM_INT("ntpshm_segment", 0, INT_MIN, INT_MAX), @@ -264,13 +265,7 @@ static enum parser_result parse_pod_setting(const char *option, enum parser_result r; - if (!strcmp(option, "logSyncInterval")) { - r = get_ranged_int(value, &val, INT8_MIN, INT8_MAX); - if (r != PARSED_OK) - return r; - pod->logSyncInterval = val; - - } else if (!strcmp(option, "logMinDelayReqInterval")) { + if (!strcmp(option, "logMinDelayReqInterval")) { r = get_ranged_int(value, &val, INT8_MIN, INT8_MAX); if (r != PARSED_OK) return r; diff --git a/ds.h b/ds.h index 156eea6..58451d8 100644 --- a/ds.h +++ b/ds.h @@ -125,7 +125,6 @@ struct portDS { #define FRI_ASAP (-128) struct port_defaults { - Integer8 logSyncInterval; Integer8 logMinDelayReqInterval; Integer8 logMinPdelayReqInterval; UInteger8 announceReceiptTimeout; diff --git a/port.c b/port.c index 2527055..a941cb7 100644 --- a/port.c +++ b/port.c @@ -1450,7 +1450,7 @@ static int port_initialize(struct port *p) p->announceReceiptTimeout = p->pod.announceReceiptTimeout; p->syncReceiptTimeout = p->pod.syncReceiptTimeout; p->transportSpecific = p->pod.transportSpecific; - p->logSyncInterval = p->pod.logSyncInterval; + p->logSyncInterval = config_get_int(cfg, p->name, "logSyncInterval"); p->logMinPdelayReqInterval = p->pod.logMinPdelayReqInterval; p->neighborPropDelayThresh = p->pod.neighborPropDelayThresh; p->min_neighbor_prop_delay = p->pod.min_neighbor_prop_delay; diff --git a/ptp4l.c b/ptp4l.c index c633495..911baca 100644 --- a/ptp4l.c +++ b/ptp4l.c @@ -80,7 +80,6 @@ static struct config cfg_settings = { }, .pod = { - .logSyncInterval = 0, .logMinDelayReqInterval = 0, .logMinPdelayReqInterval = 0, .announceReceiptTimeout = 3,