Move default source parameters to macros

diff --git a/client.c b/client.c
index f2b195ad79f476318b4a8bc923eab5fe9e636ba1..2b7164e9fe9a59b30deeba23430f7ebdbc442732 100644 (file)
--- a/client.c
+++ b/client.c
@@ -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;
       }

diff --git a/cmdmon.c b/cmdmon.c
index 598998b249620598b11274bcb503ec04eb1814e4..1a1c10ea1c330bf6e79ff309d82bd7eefe393614 100644 (file)
--- a/cmdmon.c
+++ b/cmdmon.c
@@ -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) {

diff --git a/cmdparse.c b/cmdparse.c
index 2d7c5437d044c7610822d121b7e4d6ab6f13e6f7..dca477f9956bae6f80b6007d545d4962f2b8e4b9 100644 (file)
--- a/cmdparse.c
+++ b/cmdparse.c
@@ -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;

diff --git a/srcparams.h b/srcparams.h
index 1b52369a5acea9fc655012075520ce75794c77a6..9db3806a26385af48e4cf2b71d34d30a08f53df4 100644 (file)
--- a/srcparams.h
+++ b/srcparams.h
@@ -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 */