Move default source parameters to macros

This commit is contained in:
Miroslav Lichvar 2010-10-13 12:58:26 +02:00
parent 16676ae726
commit d9596334c3
4 changed files with 16 additions and 9 deletions

View file

@ -931,7 +931,7 @@ process_cmd_add_server_or_peer(CMD_Request *msg, char *line)
break;
}
if (data.params.min_stratum) {
if (data.params.min_stratum != SRC_DEFAULT_MINSTRATUM) {
fprintf(stderr, "Option minstratum not supported\n");
break;
}

View file

@ -1250,7 +1250,7 @@ handle_add_source(NTP_Source_Type type, CMD_Request *rx_message, CMD_Reply *tx_m
params.max_delay_ratio = UTI_FloatNetworkToHost(rx_message->data.ntp_source.max_delay_ratio);
/* not transmitted in cmdmon protocol yet */
params.min_stratum = 0;
params.min_stratum = SRC_DEFAULT_MINSTRATUM;
status = NSR_AddSource(&rem_addr, type, &params);
switch (status) {

View file

@ -49,17 +49,17 @@ CPS_ParseNTPSourceAdd(const char *line, CPS_NTP_Source *src)
CPS_Status result;
DNS_Status s;
src->port = 123;
src->params.minpoll = 6;
src->params.maxpoll = 10;
src->params.presend_minpoll = 0;
src->port = SRC_DEFAULT_PORT;
src->params.minpoll = SRC_DEFAULT_MINPOLL;
src->params.maxpoll = SRC_DEFAULT_MAXPOLL;
src->params.presend_minpoll = SRC_DEFAULT_PRESEND_MINPOLL;
src->params.authkey = INACTIVE_AUTHKEY;
src->params.max_delay = 16.0;
src->params.max_delay_ratio = 16384.0;
src->params.max_delay = SRC_DEFAULT_MAXDELAY;
src->params.max_delay_ratio = SRC_DEFAULT_MAXDELAYRATIO;
src->params.online = 1;
src->params.auto_offline = 0;
src->params.iburst = 0;
src->params.min_stratum = 0;
src->params.min_stratum = SRC_DEFAULT_MINSTRATUM;
src->params.sel_option = SRC_SelectNormal;
result = CPS_Success;

View file

@ -47,6 +47,13 @@ typedef struct {
SRC_SelectOption sel_option;
} SourceParameters;
#define SRC_DEFAULT_PORT 123
#define SRC_DEFAULT_MINPOLL 6
#define SRC_DEFAULT_MAXPOLL 10
#define SRC_DEFAULT_PRESEND_MINPOLL 0
#define SRC_DEFAULT_MAXDELAY 16.0
#define SRC_DEFAULT_MAXDELAYRATIO 16384.0
#define SRC_DEFAULT_MINSTRATUM 0
#define INACTIVE_AUTHKEY 0UL
#endif /* GOT_SRCPARAMS_H */