From 85bbf9d9191bc66cc969cb4fb25377bca6632b90 Mon Sep 17 00:00:00 2001 From: Richard Cochran Date: Wed, 12 Aug 2015 18:47:00 +0200 Subject: [PATCH] config: convert the 'assume_two_step' option to the new scheme. Signed-off-by: Richard Cochran --- config.c | 7 +------ config.h | 1 - ptp4l.c | 5 ++++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/config.c b/config.c index d3c19e5..871e277 100644 --- a/config.c +++ b/config.c @@ -77,6 +77,7 @@ struct config_item { CONFIG_ITEM_INT(label, 1, _default, min, max) struct config_item config_tab[] = { + GLOB_ITEM_INT("assume_two_step", 0, 0, 1), PORT_ITEM_INT("udp_ttl", 1, 1, 255), }; @@ -518,12 +519,6 @@ static enum parser_result parse_global_setting(const char *option, cfg->dds.freq_est_interval = val; pod->freq_est_interval = val; - } else if (!strcmp(option, "assume_two_step")) { - r = get_ranged_int(value, &val, 0, 1); - if (r != PARSED_OK) - return r; - *cfg->assume_two_step = val; - } else if (!strcmp(option, "tx_timestamp_timeout")) { r = get_ranged_int(value, &val, 1, INT_MAX); if (r != PARSED_OK) diff --git a/config.h b/config.h index f722ea6..9811ebe 100644 --- a/config.h +++ b/config.h @@ -70,7 +70,6 @@ struct config { struct default_ds dds; struct port_defaults pod; - int *assume_two_step; int *tx_timestamp_timeout; int *check_fup_sync; diff --git a/ptp4l.c b/ptp4l.c index e2482c8..f52963e 100644 --- a/ptp4l.c +++ b/ptp4l.c @@ -102,7 +102,6 @@ static struct config cfg_settings = { .dm = DM_E2E, .transport = TRANS_UDP_IPV4, - .assume_two_step = &assume_two_step, .tx_timestamp_timeout = &sk_tx_timeout, .check_fup_sync = &sk_check_fupsync, @@ -176,6 +175,7 @@ int main(int argc, char *argv[]) enum transport_type *transport = &cfg_settings.transport; enum timestamp_type *timestamping = &cfg_settings.timestamping; struct clock *clock; + struct config *cfg = &cfg_settings; struct defaultDS *ds = &cfg_settings.dds.dds; int phc_index = -1, required_modes = 0; @@ -279,6 +279,9 @@ int main(int argc, char *argv[]) if (config && (c = config_read(config, &cfg_settings))) { return c; } + + assume_two_step = config_get_int(cfg, NULL, "assume_two_step"); + if (!cfg_settings.dds.grand_master_capable && ds->flags & DDS_SLAVE_ONLY) { fprintf(stderr,