config: prot: convert 'transportSpecific' to the new scheme.
Signed-off-by: Richard Cochran <richardcochran@gmail.com>master
parent
fffb6a53bd
commit
8efb623f12
9
config.c
9
config.c
|
@ -113,6 +113,7 @@ struct config_item config_tab[] = {
|
||||||
GLOB_ITEM_DBL("pi_proportional_scale", 0.0, 0.0, DBL_MAX),
|
GLOB_ITEM_DBL("pi_proportional_scale", 0.0, 0.0, DBL_MAX),
|
||||||
GLOB_ITEM_DBL("step_threshold", 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),
|
PORT_ITEM_INT("syncReceiptTimeout", 0, 0, UINT8_MAX),
|
||||||
|
PORT_ITEM_INT("transportSpecific", 0, 0, 0x0F),
|
||||||
GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX),
|
GLOB_ITEM_INT("tx_timestamp_timeout", 1, 1, INT_MAX),
|
||||||
PORT_ITEM_INT("udp_ttl", 1, 1, 255),
|
PORT_ITEM_INT("udp_ttl", 1, 1, 255),
|
||||||
GLOB_ITEM_INT("use_syslog", 1, 0, 1),
|
GLOB_ITEM_INT("use_syslog", 1, 0, 1),
|
||||||
|
@ -269,13 +270,7 @@ static enum parser_result parse_pod_setting(const char *option,
|
||||||
|
|
||||||
enum parser_result r;
|
enum parser_result r;
|
||||||
|
|
||||||
if (!strcmp(option, "transportSpecific")) {
|
if (!strcmp(option, "path_trace_enabled")) {
|
||||||
r = get_ranged_uint(value, &uval, 0, 0x0F);
|
|
||||||
if (r != PARSED_OK)
|
|
||||||
return r;
|
|
||||||
pod->transportSpecific = uval << 4;
|
|
||||||
|
|
||||||
} else if (!strcmp(option, "path_trace_enabled")) {
|
|
||||||
r = get_ranged_int(value, &val, 0, 1);
|
r = get_ranged_int(value, &val, 0, 1);
|
||||||
if (r != PARSED_OK)
|
if (r != PARSED_OK)
|
||||||
return r;
|
return r;
|
||||||
|
|
1
ds.h
1
ds.h
|
@ -125,7 +125,6 @@ struct portDS {
|
||||||
#define FRI_ASAP (-128)
|
#define FRI_ASAP (-128)
|
||||||
|
|
||||||
struct port_defaults {
|
struct port_defaults {
|
||||||
UInteger8 transportSpecific;
|
|
||||||
int announce_span;
|
int announce_span;
|
||||||
int path_trace_enabled;
|
int path_trace_enabled;
|
||||||
int follow_up_info;
|
int follow_up_info;
|
||||||
|
|
3
port.c
3
port.c
|
@ -1449,7 +1449,8 @@ static int port_initialize(struct port *p)
|
||||||
p->logAnnounceInterval = config_get_int(cfg, p->name, "logAnnounceInterval");
|
p->logAnnounceInterval = config_get_int(cfg, p->name, "logAnnounceInterval");
|
||||||
p->announceReceiptTimeout = config_get_int(cfg, p->name, "announceReceiptTimeout");
|
p->announceReceiptTimeout = config_get_int(cfg, p->name, "announceReceiptTimeout");
|
||||||
p->syncReceiptTimeout = config_get_int(cfg, p->name, "syncReceiptTimeout");
|
p->syncReceiptTimeout = config_get_int(cfg, p->name, "syncReceiptTimeout");
|
||||||
p->transportSpecific = p->pod.transportSpecific;
|
p->transportSpecific = config_get_int(cfg, p->name, "transportSpecific");
|
||||||
|
p->transportSpecific <<= 4;
|
||||||
p->logSyncInterval = config_get_int(cfg, p->name, "logSyncInterval");
|
p->logSyncInterval = config_get_int(cfg, p->name, "logSyncInterval");
|
||||||
p->logMinPdelayReqInterval = config_get_int(cfg, p->name, "logMinPdelayReqInterval");
|
p->logMinPdelayReqInterval = config_get_int(cfg, p->name, "logMinPdelayReqInterval");
|
||||||
p->neighborPropDelayThresh = p->pod.neighborPropDelayThresh;
|
p->neighborPropDelayThresh = p->pod.neighborPropDelayThresh;
|
||||||
|
|
Loading…
Reference in New Issue