From: Harlan Stenn Date: Thu, 17 Aug 2006 05:29:37 +0000 (-0400) Subject: [Bug 685] cleanup X-Git-Tag: NTP_4_2_3P33~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb332d9065c7b714497e6ee99ac014ba2664fdac;p=thirdparty%2Fntp.git [Bug 685] cleanup bk: 44e3fec1bVAeztbZMQD64rR-CWZXaA --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 6040fed62..e08c891cb 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.c) * - * It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:17 AM EDT + * It has been AutoGen-ed Thursday August 17, 2006 at 01:08:01 AM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -225,6 +225,24 @@ tSCC zNovirtualips_NAME[] = "NOVIRTUALIPS"; tSCC zNovirtualips_Name[] = "novirtualips"; #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) +/* + * Enablemmtimer option description: + */ +#ifdef SYS_WINNT +tSCC zEnablemmtimerText[] = + "Enable Multimedia Timer (Windows only)"; +tSCC zEnablemmtimer_NAME[] = "ENABLEMMTIMER"; +tSCC zEnablemmtimer_Name[] = "enablemmtimer"; +#define ENABLEMMTIMER_FLAGS (OPTST_DISABLED) + +#else /* disable Enablemmtimer */ +#define VALUE_OPT_ENABLEMMTIMER NO_EQUIVALENT +#define ENABLEMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zEnablemmtimerText NULL +#define zEnablemmtimer_NAME NULL +#define zEnablemmtimer_Name NULL +#endif /* SYS_WINNT */ + /* * Nofork option description: */ @@ -608,8 +626,20 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 15, VALUE_OPT_NOFORK, - /* equiv idx, value */ 15, VALUE_OPT_NOFORK, + { /* entry idx, value */ 15, VALUE_OPT_ENABLEMMTIMER, + /* equiv idx, value */ 15, VALUE_OPT_ENABLEMMTIMER, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ ENABLEMMTIMER_FLAGS, 0, + /* last opt argumnt */ NULL, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ zEnablemmtimerText, zEnablemmtimer_NAME, zEnablemmtimer_Name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 16, VALUE_OPT_NOFORK, + /* equiv idx, value */ 16, VALUE_OPT_NOFORK, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOFORK_FLAGS, 0, @@ -620,8 +650,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 16, VALUE_OPT_NICE, - /* equiv idx, value */ 16, VALUE_OPT_NICE, + { /* entry idx, value */ 17, VALUE_OPT_NICE, + /* equiv idx, value */ 17, VALUE_OPT_NICE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NICE_FLAGS, 0, @@ -632,8 +662,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 17, VALUE_OPT_PIDFILE, - /* equiv idx, value */ 17, VALUE_OPT_PIDFILE, + { /* entry idx, value */ 18, VALUE_OPT_PIDFILE, + /* equiv idx, value */ 18, VALUE_OPT_PIDFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PIDFILE_FLAGS, 0, @@ -644,8 +674,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 18, VALUE_OPT_PRIORITY, - /* equiv idx, value */ 18, VALUE_OPT_PRIORITY, + { /* entry idx, value */ 19, VALUE_OPT_PRIORITY, + /* equiv idx, value */ 19, VALUE_OPT_PRIORITY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, @@ -656,8 +686,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 19, VALUE_OPT_QUIT, - /* equiv idx, value */ 19, VALUE_OPT_QUIT, + { /* entry idx, value */ 20, VALUE_OPT_QUIT, + /* equiv idx, value */ 20, VALUE_OPT_QUIT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ QUIT_FLAGS, 0, @@ -668,8 +698,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 20, VALUE_OPT_PROPAGATIONDELAY, - /* equiv idx, value */ 20, VALUE_OPT_PROPAGATIONDELAY, + { /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, + /* equiv idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, @@ -680,8 +710,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 21, VALUE_OPT_UPDATEINTERVAL, - /* equiv idx, value */ 21, VALUE_OPT_UPDATEINTERVAL, + { /* entry idx, value */ 22, VALUE_OPT_UPDATEINTERVAL, + /* equiv idx, value */ 22, VALUE_OPT_UPDATEINTERVAL, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, @@ -692,8 +722,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 22, VALUE_OPT_STATSDIR, - /* equiv idx, value */ 22, VALUE_OPT_STATSDIR, + { /* entry idx, value */ 23, VALUE_OPT_STATSDIR, + /* equiv idx, value */ 23, VALUE_OPT_STATSDIR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ STATSDIR_FLAGS, 0, @@ -704,8 +734,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 23, VALUE_OPT_TRUSTEDKEY, - /* equiv idx, value */ 23, VALUE_OPT_TRUSTEDKEY, + { /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY, + /* equiv idx, value */ 24, VALUE_OPT_TRUSTEDKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ TRUSTEDKEY_FLAGS, 0, @@ -716,8 +746,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 24, VALUE_OPT_USER, - /* equiv idx, value */ 24, VALUE_OPT_USER, + { /* entry idx, value */ 25, VALUE_OPT_USER, + /* equiv idx, value */ 25, VALUE_OPT_USER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ USER_FLAGS, 0, @@ -728,8 +758,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_VAR, - /* equiv idx, value */ 25, VALUE_OPT_VAR, + { /* entry idx, value */ 26, VALUE_OPT_VAR, + /* equiv idx, value */ 26, VALUE_OPT_VAR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ VAR_FLAGS, 0, @@ -740,8 +770,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_DVAR, - /* equiv idx, value */ 26, VALUE_OPT_DVAR, + { /* entry idx, value */ 27, VALUE_OPT_DVAR, + /* equiv idx, value */ 27, VALUE_OPT_DVAR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DVAR_FLAGS, 0, @@ -752,8 +782,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 27, VALUE_OPT_SLEW, - /* equiv idx, value */ 27, VALUE_OPT_SLEW, + { /* entry idx, value */ 28, VALUE_OPT_SLEW, + /* equiv idx, value */ 28, VALUE_OPT_SLEW, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SLEW_FLAGS, 0, @@ -884,7 +914,7 @@ tOptions ntpdOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 28 /* user option count */ + OPTION_CT, 29 /* user option count */ }; /* diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 14d6011fc..a599602a0 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.h) * - * It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:16 AM EDT + * It has been AutoGen-ed Thursday August 17, 2006 at 01:08:01 AM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -66,27 +66,28 @@ typedef enum { INDEX_OPT_KEYFILE = 12, INDEX_OPT_LOGFILE = 13, INDEX_OPT_NOVIRTUALIPS = 14, - INDEX_OPT_NOFORK = 15, - INDEX_OPT_NICE = 16, - INDEX_OPT_PIDFILE = 17, - INDEX_OPT_PRIORITY = 18, - INDEX_OPT_QUIT = 19, - INDEX_OPT_PROPAGATIONDELAY = 20, - INDEX_OPT_UPDATEINTERVAL = 21, - INDEX_OPT_STATSDIR = 22, - INDEX_OPT_TRUSTEDKEY = 23, - INDEX_OPT_USER = 24, - INDEX_OPT_VAR = 25, - INDEX_OPT_DVAR = 26, - INDEX_OPT_SLEW = 27, - INDEX_OPT_VERSION = 28, - INDEX_OPT_HELP = 29, - INDEX_OPT_MORE_HELP = 30, - INDEX_OPT_SAVE_OPTS = 31, - INDEX_OPT_LOAD_OPTS = 32 + INDEX_OPT_ENABLEMMTIMER = 15, + INDEX_OPT_NOFORK = 16, + INDEX_OPT_NICE = 17, + INDEX_OPT_PIDFILE = 18, + INDEX_OPT_PRIORITY = 19, + INDEX_OPT_QUIT = 20, + INDEX_OPT_PROPAGATIONDELAY = 21, + INDEX_OPT_UPDATEINTERVAL = 22, + INDEX_OPT_STATSDIR = 23, + INDEX_OPT_TRUSTEDKEY = 24, + INDEX_OPT_USER = 25, + INDEX_OPT_VAR = 26, + INDEX_OPT_DVAR = 27, + INDEX_OPT_SLEW = 28, + INDEX_OPT_VERSION = 29, + INDEX_OPT_HELP = 30, + INDEX_OPT_MORE_HELP = 31, + INDEX_OPT_SAVE_OPTS = 32, + INDEX_OPT_LOAD_OPTS = 33 } teOptIndex; -#define OPTION_CT 33 +#define OPTION_CT 34 #define NTPD_VERSION "4.2.3p31" #define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p31" @@ -135,6 +136,9 @@ typedef enum { #define VALUE_OPT_KEYFILE 'k' #define VALUE_OPT_LOGFILE 'l' #define VALUE_OPT_NOVIRTUALIPS 'L' +#ifdef SYS_WINNT +#define VALUE_OPT_ENABLEMMTIMER 'M' +#endif /* SYS_WINNT */ #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_NICE 'N' #define VALUE_OPT_PIDFILE 'p' diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index bf398d87e..ed95c9c62 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpd-opts.texi) # -# It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:19 AM EDT +# It has been AutoGen-ed Thursday August 17, 2006 at 01:08:04 AM EDT # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -29,6 +29,7 @@ This software is released under a specialized copyright license. * ntpd debug-level:: debug-level option (-d) * ntpd driftfile:: driftfile option (-f) * ntpd dvar:: dvar option (-V) +* ntpd enablemmtimer:: enablemmtimer option (-M) * ntpd interface:: interface option (-I) * ntpd ipv4:: ipv4 option (-4) * ntpd ipv6:: ipv6 option (-6) @@ -328,6 +329,20 @@ configuration file directive. This is the ``do not listen to virtual ips'' option. Do not listen to virtual IPs. The default is to listen. +@node ntpd enablemmtimer +@subsection enablemmtimer option (-M) +@cindex ntpd-enablemmtimer + +This is the ``enable multimedia timer (windows only)'' option. + +This option has some usage constraints. It: +@itemize @bullet +@item +must be compiled in by defining @code{SYS_WINNT} during the compilation. +@end itemize + +Enable the Multimedia Timer for Windows. + @node ntpd nofork @subsection nofork option (-n) @cindex ntpd-nofork diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 46a4919af..69a325985 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2006-08-15 "( 4.2.3p31)" "Programmer's Manual" +.TH NTPD 1 2006-08-17 "( 4.2.3p31)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:18 AM EDT +.\" It has been AutoGen-ed Thursday August 17, 2006 at 01:08:02 AM EDT .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" @@ -144,6 +144,11 @@ Do not listen to virtual IPs. .sp Do not listen to virtual IPs. The default is to listen. .TP +.BR \-M ", " \--enablemmtimer +Enable Multimedia Timer (Windows only). +.sp +Enable the Multimedia Timer for Windows. +.TP .BR \-n ", " \--nofork Do not fork. .sp diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index 21fc4ac1c..be0d145dd 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.c) * - * It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:21 AM EDT + * It has been AutoGen-ed Thursday August 17, 2006 at 01:08:06 AM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -255,6 +255,24 @@ tSCC zNovirtualips_NAME[] = "NOVIRTUALIPS"; tSCC zNovirtualips_Name[] = "novirtualips"; #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) +/* + * Enablemmtimer option description: + */ +#ifdef SYS_WINNT +tSCC zEnablemmtimerText[] = + "Enable Multimedia Timer (Windows only)"; +tSCC zEnablemmtimer_NAME[] = "ENABLEMMTIMER"; +tSCC zEnablemmtimer_Name[] = "enablemmtimer"; +#define ENABLEMMTIMER_FLAGS (OPTST_DISABLED) + +#else /* disable Enablemmtimer */ +#define VALUE_OPT_ENABLEMMTIMER NO_EQUIVALENT +#define ENABLEMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zEnablemmtimerText NULL +#define zEnablemmtimer_NAME NULL +#define zEnablemmtimer_Name NULL +#endif /* SYS_WINNT */ + /* * Nofork option description: */ @@ -734,8 +752,20 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 18, VALUE_OPT_NOFORK, - /* equiv idx, value */ 18, VALUE_OPT_NOFORK, + { /* entry idx, value */ 18, VALUE_OPT_ENABLEMMTIMER, + /* equiv idx, value */ 18, VALUE_OPT_ENABLEMMTIMER, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ ENABLEMMTIMER_FLAGS, 0, + /* last opt argumnt */ NULL, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ zEnablemmtimerText, zEnablemmtimer_NAME, zEnablemmtimer_Name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 19, VALUE_OPT_NOFORK, + /* equiv idx, value */ 19, VALUE_OPT_NOFORK, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOFORK_FLAGS, 0, @@ -746,8 +776,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 19, VALUE_OPT_NICE, - /* equiv idx, value */ 19, VALUE_OPT_NICE, + { /* entry idx, value */ 20, VALUE_OPT_NICE, + /* equiv idx, value */ 20, VALUE_OPT_NICE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NICE_FLAGS, 0, @@ -758,8 +788,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 20, VALUE_OPT_SERVERTIME, - /* equiv idx, value */ 20, VALUE_OPT_SERVERTIME, + { /* entry idx, value */ 21, VALUE_OPT_SERVERTIME, + /* equiv idx, value */ 21, VALUE_OPT_SERVERTIME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SERVERTIME_FLAGS, 0, @@ -770,8 +800,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zServertimeText, zServertime_NAME, zServertime_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 21, VALUE_OPT_PIDFILE, - /* equiv idx, value */ 21, VALUE_OPT_PIDFILE, + { /* entry idx, value */ 22, VALUE_OPT_PIDFILE, + /* equiv idx, value */ 22, VALUE_OPT_PIDFILE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PIDFILE_FLAGS, 0, @@ -782,8 +812,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 22, VALUE_OPT_PRIORITY, - /* equiv idx, value */ 22, VALUE_OPT_PRIORITY, + { /* entry idx, value */ 23, VALUE_OPT_PRIORITY, + /* equiv idx, value */ 23, VALUE_OPT_PRIORITY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, @@ -794,8 +824,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 23, VALUE_OPT_QUIT, - /* equiv idx, value */ 23, VALUE_OPT_QUIT, + { /* entry idx, value */ 24, VALUE_OPT_QUIT, + /* equiv idx, value */ 24, VALUE_OPT_QUIT, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ QUIT_FLAGS, 0, @@ -806,8 +836,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 24, VALUE_OPT_PROPAGATIONDELAY, - /* equiv idx, value */ 24, VALUE_OPT_PROPAGATIONDELAY, + { /* entry idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY, + /* equiv idx, value */ 25, VALUE_OPT_PROPAGATIONDELAY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, @@ -818,8 +848,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, - /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL, + { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, + /* equiv idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, @@ -830,8 +860,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 26, VALUE_OPT_STATSDIR, - /* equiv idx, value */ 26, VALUE_OPT_STATSDIR, + { /* entry idx, value */ 27, VALUE_OPT_STATSDIR, + /* equiv idx, value */ 27, VALUE_OPT_STATSDIR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ STATSDIR_FLAGS, 0, @@ -842,8 +872,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 27, VALUE_OPT_ENDSIMTIME, - /* equiv idx, value */ 27, VALUE_OPT_ENDSIMTIME, + { /* entry idx, value */ 28, VALUE_OPT_ENDSIMTIME, + /* equiv idx, value */ 28, VALUE_OPT_ENDSIMTIME, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ENDSIMTIME_FLAGS, 0, @@ -854,8 +884,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zEndsimtimeText, zEndsimtime_NAME, zEndsimtime_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 28, VALUE_OPT_TRUSTEDKEY, - /* equiv idx, value */ 28, VALUE_OPT_TRUSTEDKEY, + { /* entry idx, value */ 29, VALUE_OPT_TRUSTEDKEY, + /* equiv idx, value */ 29, VALUE_OPT_TRUSTEDKEY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ TRUSTEDKEY_FLAGS, 0, @@ -866,8 +896,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 29, VALUE_OPT_FREQERR, - /* equiv idx, value */ 29, VALUE_OPT_FREQERR, + { /* entry idx, value */ 30, VALUE_OPT_FREQERR, + /* equiv idx, value */ 30, VALUE_OPT_FREQERR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ FREQERR_FLAGS, 0, @@ -878,8 +908,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zFreqerrText, zFreqerr_NAME, zFreqerr_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 30, VALUE_OPT_WALKNOISE, - /* equiv idx, value */ 30, VALUE_OPT_WALKNOISE, + { /* entry idx, value */ 31, VALUE_OPT_WALKNOISE, + /* equiv idx, value */ 31, VALUE_OPT_WALKNOISE, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ WALKNOISE_FLAGS, 0, @@ -890,8 +920,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zWalknoiseText, zWalknoise_NAME, zWalknoise_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 31, VALUE_OPT_USER, - /* equiv idx, value */ 31, VALUE_OPT_USER, + { /* entry idx, value */ 32, VALUE_OPT_USER, + /* equiv idx, value */ 32, VALUE_OPT_USER, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ USER_FLAGS, 0, @@ -902,8 +932,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 32, VALUE_OPT_VAR, - /* equiv idx, value */ 32, VALUE_OPT_VAR, + { /* entry idx, value */ 33, VALUE_OPT_VAR, + /* equiv idx, value */ 33, VALUE_OPT_VAR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ VAR_FLAGS, 0, @@ -914,8 +944,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 33, VALUE_OPT_DVAR, - /* equiv idx, value */ 33, VALUE_OPT_DVAR, + { /* entry idx, value */ 34, VALUE_OPT_DVAR, + /* equiv idx, value */ 34, VALUE_OPT_DVAR, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DVAR_FLAGS, 0, @@ -926,8 +956,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 34, VALUE_OPT_SLEW, - /* equiv idx, value */ 34, VALUE_OPT_SLEW, + { /* entry idx, value */ 35, VALUE_OPT_SLEW, + /* equiv idx, value */ 35, VALUE_OPT_SLEW, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SLEW_FLAGS, 0, @@ -938,8 +968,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 35, VALUE_OPT_NDELAY, - /* equiv idx, value */ 35, VALUE_OPT_NDELAY, + { /* entry idx, value */ 36, VALUE_OPT_NDELAY, + /* equiv idx, value */ 36, VALUE_OPT_NDELAY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NDELAY_FLAGS, 0, @@ -950,8 +980,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNdelayText, zNdelay_NAME, zNdelay_Name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 36, VALUE_OPT_PDELAY, - /* equiv idx, value */ 36, VALUE_OPT_PDELAY, + { /* entry idx, value */ 37, VALUE_OPT_PDELAY, + /* equiv idx, value */ 37, VALUE_OPT_PDELAY, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PDELAY_FLAGS, 0, @@ -1082,7 +1112,7 @@ tOptions ntpdsimOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 37 /* user option count */ + OPTION_CT, 38 /* user option count */ }; /* diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index d54b6f412..11797c05e 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.h) * - * It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:20 AM EDT + * It has been AutoGen-ed Thursday August 17, 2006 at 01:08:05 AM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -69,33 +69,34 @@ typedef enum { INDEX_OPT_KEYFILE = 15, INDEX_OPT_LOGFILE = 16, INDEX_OPT_NOVIRTUALIPS = 17, - INDEX_OPT_NOFORK = 18, - INDEX_OPT_NICE = 19, - INDEX_OPT_SERVERTIME = 20, - INDEX_OPT_PIDFILE = 21, - INDEX_OPT_PRIORITY = 22, - INDEX_OPT_QUIT = 23, - INDEX_OPT_PROPAGATIONDELAY = 24, - INDEX_OPT_UPDATEINTERVAL = 25, - INDEX_OPT_STATSDIR = 26, - INDEX_OPT_ENDSIMTIME = 27, - INDEX_OPT_TRUSTEDKEY = 28, - INDEX_OPT_FREQERR = 29, - INDEX_OPT_WALKNOISE = 30, - INDEX_OPT_USER = 31, - INDEX_OPT_VAR = 32, - INDEX_OPT_DVAR = 33, - INDEX_OPT_SLEW = 34, - INDEX_OPT_NDELAY = 35, - INDEX_OPT_PDELAY = 36, - INDEX_OPT_VERSION = 37, - INDEX_OPT_HELP = 38, - INDEX_OPT_MORE_HELP = 39, - INDEX_OPT_SAVE_OPTS = 40, - INDEX_OPT_LOAD_OPTS = 41 + INDEX_OPT_ENABLEMMTIMER = 18, + INDEX_OPT_NOFORK = 19, + INDEX_OPT_NICE = 20, + INDEX_OPT_SERVERTIME = 21, + INDEX_OPT_PIDFILE = 22, + INDEX_OPT_PRIORITY = 23, + INDEX_OPT_QUIT = 24, + INDEX_OPT_PROPAGATIONDELAY = 25, + INDEX_OPT_UPDATEINTERVAL = 26, + INDEX_OPT_STATSDIR = 27, + INDEX_OPT_ENDSIMTIME = 28, + INDEX_OPT_TRUSTEDKEY = 29, + INDEX_OPT_FREQERR = 30, + INDEX_OPT_WALKNOISE = 31, + INDEX_OPT_USER = 32, + INDEX_OPT_VAR = 33, + INDEX_OPT_DVAR = 34, + INDEX_OPT_SLEW = 35, + INDEX_OPT_NDELAY = 36, + INDEX_OPT_PDELAY = 37, + INDEX_OPT_VERSION = 38, + INDEX_OPT_HELP = 39, + INDEX_OPT_MORE_HELP = 40, + INDEX_OPT_SAVE_OPTS = 41, + INDEX_OPT_LOAD_OPTS = 42 } teOptIndex; -#define OPTION_CT 42 +#define OPTION_CT 43 #define NTPDSIM_VERSION "4.2.3p31" #define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p31" @@ -147,6 +148,9 @@ typedef enum { #define VALUE_OPT_KEYFILE 'k' #define VALUE_OPT_LOGFILE 'l' #define VALUE_OPT_NOVIRTUALIPS 'L' +#ifdef SYS_WINNT +#define VALUE_OPT_ENABLEMMTIMER 'M' +#endif /* SYS_WINNT */ #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_NICE 'N' #define VALUE_OPT_SERVERTIME 'O' diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index dfd1ce971..bd4a2124e 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdsim-opts.texi) # -# It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:24 AM EDT +# It has been AutoGen-ed Thursday August 17, 2006 at 01:08:09 AM EDT # From the definitions ntpdsim-opts.def # and the template file aginfo.tpl @end ignore @@ -29,6 +29,7 @@ This software is released under a specialized copyright license. * ntpdsim debug-level:: debug-level option (-d) * ntpdsim driftfile:: driftfile option (-f) * ntpdsim dvar:: dvar option (-V) +* ntpdsim enablemmtimer:: enablemmtimer option (-M) * ntpdsim endsimtime:: endsimtime option (-S) * ntpdsim freqerr:: freqerr option (-T) * ntpdsim interface:: interface option (-I) @@ -367,6 +368,20 @@ configuration file directive. This is the ``do not listen to virtual ips'' option. Do not listen to virtual IPs. The default is to listen. +@node ntpdsim enablemmtimer +@subsection enablemmtimer option (-M) +@cindex ntpdsim-enablemmtimer + +This is the ``enable multimedia timer (windows only)'' option. + +This option has some usage constraints. It: +@itemize @bullet +@item +must be compiled in by defining @code{SYS_WINNT} during the compilation. +@end itemize + +Enable the Multimedia Timer for Windows. + @node ntpdsim nofork @subsection nofork option (-n) @cindex ntpdsim-nofork diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1 index efe7b66ec..b8a1fca27 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2006-08-15 "( 4.2.3p31)" "Programmer's Manual" +.TH NTPDSIM 1 2006-08-17 "( 4.2.3p31)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdsim.1) .\" -.\" It has been AutoGen-ed Tuesday August 15, 2006 at 09:32:23 AM EDT +.\" It has been AutoGen-ed Thursday August 17, 2006 at 01:08:07 AM EDT .\" From the definitions ntpdsim-opts.def .\" and the template file agman1.tpl .\" @@ -159,6 +159,11 @@ Do not listen to virtual IPs. .sp Do not listen to virtual IPs. The default is to listen. .TP +.BR \-M ", " \--enablemmtimer +Enable Multimedia Timer (Windows only). +.sp +Enable the Multimedia Timer for Windows. +.TP .BR \-n ", " \--nofork Do not fork. .sp