faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

cmdmon: set certset for new sources

Browse source 
Add the new certset option to the cmdmon protocol.
This commit is contained in:
Miroslav Lichvar 2021-02-18 17:22:23 +01:00
parent cc77b0e9fd
commit ebf0ff2c0d
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
candm.h
View file

@ -292,7 +292,8 @@ typedef struct {
Float offset; Float offset;
uint32_t flags; uint32_t flags;
int32_t filter_length; int32_t filter_length;
uint32_t reserved[3]; uint32_t cert_set;
uint32_t reserved[2];
int32_t EOR; int32_t EOR;
} REQ_NTP_Source; } REQ_NTP_Source;

1
client.c
View file

@ -1100,6 +1100,7 @@ process_cmd_add_source(CMD_Request *msg, char *line)
(data.params.sel_options & SRC_SELECT_TRUST ? REQ_ADDSRC_TRUST : 0) | (data.params.sel_options & SRC_SELECT_TRUST ? REQ_ADDSRC_TRUST : 0) |
(data.params.sel_options & SRC_SELECT_REQUIRE ? REQ_ADDSRC_REQUIRE : 0)); (data.params.sel_options & SRC_SELECT_REQUIRE ? REQ_ADDSRC_REQUIRE : 0));
msg->data.ntp_source.filter_length = htonl(data.params.filter_length); msg->data.ntp_source.filter_length = htonl(data.params.filter_length);
msg->data.ntp_source.cert_set = htonl(data.params.cert_set);
memset(msg->data.ntp_source.reserved, 0, sizeof (msg->data.ntp_source.reserved)); memset(msg->data.ntp_source.reserved, 0, sizeof (msg->data.ntp_source.reserved));
result = 1; result = 1;

2
cmdmon.c
View file

@ -735,7 +735,7 @@ handle_add_source(CMD_Request *rx_message, CMD_Reply *tx_message)
params.filter_length = ntohl(rx_message->data.ntp_source.filter_length); params.filter_length = ntohl(rx_message->data.ntp_source.filter_length);
params.authkey = ntohl(rx_message->data.ntp_source.authkey); params.authkey = ntohl(rx_message->data.ntp_source.authkey);
params.nts_port = ntohl(rx_message->data.ntp_source.nts_port); params.nts_port = ntohl(rx_message->data.ntp_source.nts_port);
params.cert_set = 0; params.cert_set = ntohl(rx_message->data.ntp_source.cert_set);
params.max_delay = UTI_FloatNetworkToHost(rx_message->data.ntp_source.max_delay); params.max_delay = UTI_FloatNetworkToHost(rx_message->data.ntp_source.max_delay);
params.max_delay_ratio = params.max_delay_ratio =
UTI_FloatNetworkToHost(rx_message->data.ntp_source.max_delay_ratio); UTI_FloatNetworkToHost(rx_message->data.ntp_source.max_delay_ratio);

2
test/simulation/110-chronyc
View file

@ -101,7 +101,7 @@ limit=1
for chronyc_conf in \ for chronyc_conf in \
"accheck 1.2.3.4" \ "accheck 1.2.3.4" \
"add peer 10.0.0.0 minpoll 2 maxpoll 6" \ "add peer 10.0.0.0 minpoll 2 maxpoll 6" \
"add server 10.0.0.0 minpoll 6 maxpoll 10 iburst burst key 1 maxdelay 1e-3 maxdelayratio 10.0 maxdelaydevratio 10.0 mindelay 1e-4 asymmetry 0.5 offset 1e-5 minsamples 6 maxsamples 6 filter 3 offline auto_offline prefer noselect trust require xleave polltarget 20 port 123 presend 7 minstratum 3 version 4" \ "add server 10.0.0.0 minpoll 6 maxpoll 10 iburst burst key 1 certset 2 maxdelay 1e-3 maxdelayratio 10.0 maxdelaydevratio 10.0 mindelay 1e-4 asymmetry 0.5 offset 1e-5 minsamples 6 maxsamples 6 filter 3 offline auto_offline prefer noselect trust require xleave polltarget 20 port 123 presend 7 minstratum 3 version 4" \
"add server node1.net1.clk" \ "add server node1.net1.clk" \
"allow 1.2.3.4" \ "allow 1.2.3.4" \
"allow 1.2" \ "allow 1.2" \