[Bug 1374] Support SO_TIMESTAMPNS

bk: 5074e95f5nCCmJimO0aLIneU3YYQlw

diff --git a/ChangeLog b/ChangeLog
index 6eb8697ba9d5a7124f7665c63225d82602644a1a..4f01c8758016faa3f2ccca943a0cc8779d5e483a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 1374] Support SO_TIMESTAMPNS.
 * [Bug 1013] ntpdate's HTML page claims wrong default version.
 * [Bug 1374] Support SO_TIMESTAMPNS.
 * [Bug 2266] Remove deprecated refclock_trak.c from Windows Makefile

diff --git a/ntpd/ntpd.c b/ntpd/ntpd.c
index 2bc6b38f611b57afb1f2b9bca1d45e10a5dd91b4..e58a1dbce7a0c6bf5885ba54c5be2dded0001442 100644 (file)
--- a/ntpd/ntpd.c
+++ b/ntpd/ntpd.c
@@ -255,7 +255,7 @@ main(
        progname = argv[0];
        parse_cmdline_opts(&argc, &argv);
 #ifdef DEBUG
-       debug = DESC(DEBUG_LEVEL).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
        DPRINTF(1, ("%s\n", Version));
 #endif
 
@@ -453,7 +453,7 @@ ntpdmain(
        initializing = TRUE;            /* mark that we are initializing */
        parse_cmdline_opts(&argc, &argv);
 # ifdef DEBUG
-       debug = DESC(DEBUG_LEVEL).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
 # endif
 
        if (HAVE_OPT(NOFORK) || HAVE_OPT(QUIT)

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index caa352c89537b8a36c6ef76f786c9c470f69193e..8388334e5f3e901fc3e7c96410f5c23a7e2c68e1 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -76,33 +76,7 @@ flag = {
        _EndOfDoc_;
 };
 
-flag = {
-    name      = debug-level;
-    value     = d;
-    max       = NOLIMIT;
-    ifdef     = DEBUG;
-    nopreset;
-    descrip   = "Increase output debug message level";
-    omitted-usage = "this package was built using 'configure --disable--debug'";
-    doc = <<-  _EndOfDoc_
-       Increase the debugging message output level.
-       _EndOfDoc_;
-};
-
-flag = {
-    name      = set-debug-level;
-    value     = D;
-    arg-type  = string;
-    max       = NOLIMIT;
-    ifdef     = DEBUG;
-    descrip   = "Set the output debug message level";
-    omitted-usage = "this package was built using 'configure --disable--debug'";
-    flag-code = 'DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );';
-    doc = <<-  _EndOfDoc_
-       Set the output debugging level.  Can be supplied multiple times,
-       but each overrides the previous value(s).
-       _EndOfDoc_;
-};
+#include debug-opt.def
 
 flag = {
     name      = driftfile;

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index cc459a5d2a6839a87ee1c4f191ccae86fbefb135..35951841e81af53d315bf5804044f2d1f4a0075e 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -313,7 +313,7 @@ ntpdcmain(
                }
        }
 
-       debug = DESC(DEBUG_LEVEL).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
 
        if (HAVE_OPT(INTERACTIVE)) {
                interactive = 1;

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index c21c8a0d1bfd1c5a029e2b70289d9e96c55b45fa..4583dccbc24a5cf7ff1049b93385f90948f4c989 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -459,7 +459,7 @@ ntpqmain(
         * handled by ntpq_custom_opt_handler().
         */
 
-       debug = DESC(DEBUG_LEVEL).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
 
        if (HAVE_OPT(IPV4))
                ai_fam_templ = AF_INET;

diff --git a/ports/winnt/ntpd/ntservice.c b/ports/winnt/ntpd/ntservice.c
index fb6b1c169dcaafaab9a44970ab0514aec4e57edf..f0840bdb9d6a833247c2f1dfd2066ff711b939e0 100644 (file)
--- a/ports/winnt/ntpd/ntservice.c
+++ b/ports/winnt/ntpd/ntservice.c
@@ -109,7 +109,7 @@ int main(
            || HAVE_OPT(SAVECONFIGQUIT)
            || HAVE_OPT(HELP)
 #ifdef DEBUG
-           || DESC(DEBUG_LEVEL).optOccCt != 0
+           || OPT_VALUE_SET_DEBUG_LEVEL != 0
 #endif
            || HAVE_OPT(NOFORK))
                foreground = TRUE;

diff --git a/sntp/include/debug-opt.def b/sntp/include/debug-opt.def
index c11fd753ea46a5ee69c77b1a6e61c2dcc2bf0adc..516163d6ec0c1c6c49a3466b27334ffafeb9c9ec 100644 (file)
--- a/sntp/include/debug-opt.def
+++ b/sntp/include/debug-opt.def
@@ -12,6 +12,7 @@ flag = {
     value     = d;
     max       = NOLIMIT;
     nopreset;
+    flag-code = 'OPT_VALUE_SET_DEBUG_LEVEL++;';
     descrip   = "Increase debug verbosity level";
     doc                = <<-  _EndOfDoc_
        _EndOfDoc_;
@@ -22,8 +23,7 @@ flag = {
     value     = D;
     max       = NOLIMIT;
     descrip   = "Set the debug verbosity level";
-    arg-type  = string;
-    flag-code = 'DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );';
+    arg-type  = number;
     doc                = <<-  _EndOfDoc_
        _EndOfDoc_;
 };

diff --git a/sntp/main.c b/sntp/main.c
index 32d9d79f1ad6a6935631250cd461084f8c2ea4ef..3084b0060112da1e11e710c8185aef0ef4d1a257 100644 (file)
--- a/sntp/main.c
+++ b/sntp/main.c
@@ -150,7 +150,12 @@ sntp_main (
        argv += optct;
 
 
-       debug = DESC(DEBUG_LEVEL).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
+
+printf("sntp: DEBUG_LEVEL is %d\n", debug);
+// OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
+printf("sntp: SET_DEBUG_LEVEL is %d\n", OPT_VALUE_SET_DEBUG_LEVEL);
+exit(0);
 
        TRACE(2, ("init_lib() done, %s%s\n",
                  (ipv4_works)

diff --git a/util/ntp-keygen.c b/util/ntp-keygen.c
index 0827cff360fa66ec298d28ad4aacda451dc18bac..b8f09b4e4440a04411796862f0897d30ef194090 100644 (file)
--- a/util/ntp-keygen.c
+++ b/util/ntp-keygen.c
@@ -366,7 +366,7 @@ main(
                        OPENSSL_VERSION_TEXT, SSLeay_version(SSLEAY_VERSION));
 #endif /* OPENSSL */
 
-       debug = DESC( DEBUG_LEVEL ).optOccCt;
+       debug = OPT_VALUE_SET_DEBUG_LEVEL;
 
        if (HAVE_OPT( MD5KEY ))
                md5key++;