Update -I documentation

bk: 472fff8bDPVfmGI2Y1ozqpUO1s5tpg

diff --git a/ChangeLog b/ChangeLog
index f31f36a5104c947e79570617fecd43aad216bcc3..b1c4d59a726cb56d31b4f5659e454494560ecadc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* Update -I documentation.
 * [Bug 713] Fix bug reporting information.
 * A bug in the application of the negative-sawtooth for 12 channel receivers. 
 * The removal of unneeded startup code used for the original LinuxPPS, it now

diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index 4d9a2193d4c87464eec6d67cee516201b2524d87..73d2dd30c3e3787181e18826a24ef96a49cb6270 100644 (file)
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Monday November  5, 2007 at 06:36:57 AM EST
+ *  It has been AutoGen-ed  Tuesday November  6, 2007 at 12:26:48 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -112,6 +112,25 @@ tSCC    zBcastsync_NAME[]          = "BCASTSYNC";
 tSCC    zBcastsync_Name[]          = "bcastsync";
 #define BCASTSYNC_FLAGS       (OPTST_DISABLED)
 
+/*
+ *  Simbroadcastdelay option description:
+ */
+#ifdef SIM
+tSCC    zSimbroadcastdelayText[] =
+        "Simulator broadcast delay";
+tSCC    zSimbroadcastdelay_NAME[]  = "SIMBROADCASTDELAY";
+tSCC    zSimbroadcastdelay_Name[]  = "simbroadcastdelay";
+#define SIMBROADCASTDELAY_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Simbroadcastdelay */
+#define VALUE_OPT_SIMBROADCASTDELAY NO_EQUIVALENT
+#define SIMBROADCASTDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSimbroadcastdelayText       NULL
+#define zSimbroadcastdelay_NAME      NULL
+#define zSimbroadcastdelay_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Configfile option description:
  */
@@ -122,6 +141,25 @@ tSCC    zConfigfile_Name[]         = "configfile";
 #define CONFIGFILE_FLAGS       (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+/*
+ *  Phasenoise option description:
+ */
+#ifdef SIM
+tSCC    zPhasenoiseText[] =
+        "Phase noise level";
+tSCC    zPhasenoise_NAME[]         = "PHASENOISE";
+tSCC    zPhasenoise_Name[]         = "phasenoise";
+#define PHASENOISE_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Phasenoise */
+#define VALUE_OPT_PHASENOISE NO_EQUIVALENT
+#define PHASENOISE_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zPhasenoiseText       NULL
+#define zPhasenoise_NAME      NULL
+#define zPhasenoise_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Debug_Level option description:
  */
@@ -178,6 +216,25 @@ tSCC    zPanicgate_NAME[]          = "PANICGATE";
 tSCC    zPanicgate_Name[]          = "panicgate";
 #define PANICGATE_FLAGS       (OPTST_DISABLED)
 
+/*
+ *  Simslew option description:
+ */
+#ifdef SIM
+tSCC    zSimslewText[] =
+        "Simuator slew";
+tSCC    zSimslew_NAME[]            = "SIMSLEW";
+tSCC    zSimslew_Name[]            = "simslew";
+#define SIMSLEW_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Simslew */
+#define VALUE_OPT_SIMSLEW NO_EQUIVALENT
+#define SIMSLEW_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSimslewText       NULL
+#define zSimslew_NAME      NULL
+#define zSimslew_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Jaildir option description:
  */
@@ -201,7 +258,7 @@ tSCC    zJaildir_Name[]            = "jaildir";
  *  Interface option description:
  */
 tSCC    zInterfaceText[] =
-        "Listen on interface";
+        "Listen on the specified interface or IP";
 tSCC    zInterface_NAME[]          = "INTERFACE";
 tSCC    zInterface_Name[]          = "interface";
 #define INTERFACE_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
@@ -272,6 +329,25 @@ tSCC    zNice_NAME[]               = "NICE";
 tSCC    zNice_Name[]               = "nice";
 #define NICE_FLAGS       (OPTST_DISABLED)
 
+/*
+ *  Servertime option description:
+ */
+#ifdef SIM
+tSCC    zServertimeText[] =
+        "Server time";
+tSCC    zServertime_NAME[]         = "SERVERTIME";
+tSCC    zServertime_Name[]         = "servertime";
+#define SERVERTIME_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Servertime */
+#define VALUE_OPT_SERVERTIME NO_EQUIVALENT
+#define SERVERTIME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zServertimeText       NULL
+#define zServertime_NAME      NULL
+#define zServertime_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Pidfile option description:
  */
@@ -321,6 +397,25 @@ tSCC    zStatsdir_Name[]           = "statsdir";
 #define STATSDIR_FLAGS       (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+/*
+ *  Endsimtime option description:
+ */
+#ifdef SIM
+tSCC    zEndsimtimeText[] =
+        "Simulation end time";
+tSCC    zEndsimtime_NAME[]         = "ENDSIMTIME";
+tSCC    zEndsimtime_Name[]         = "endsimtime";
+#define ENDSIMTIME_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Endsimtime */
+#define VALUE_OPT_ENDSIMTIME NO_EQUIVALENT
+#define ENDSIMTIME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zEndsimtimeText       NULL
+#define zEndsimtime_NAME      NULL
+#define zEndsimtime_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Trustedkey option description:
  */
@@ -331,6 +426,25 @@ tSCC    zTrustedkey_Name[]         = "trustedkey";
 #define TRUSTEDKEY_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+/*
+ *  Freqerr option description:
+ */
+#ifdef SIM
+tSCC    zFreqerrText[] =
+        "Simulation frequency error";
+tSCC    zFreqerr_NAME[]            = "FREQERR";
+tSCC    zFreqerr_Name[]            = "freqerr";
+#define FREQERR_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Freqerr */
+#define VALUE_OPT_FREQERR NO_EQUIVALENT
+#define FREQERR_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zFreqerrText       NULL
+#define zFreqerr_NAME      NULL
+#define zFreqerr_Name      NULL
+#endif  /* SIM */
+
 /*
  *  User option description:
  */
@@ -380,6 +494,25 @@ tSCC    zDvar_Name[]               = "dvar";
 #define DVAR_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+/*
+ *  Walknoise option description:
+ */
+#ifdef SIM
+tSCC    zWalknoiseText[] =
+        "Simulation random walk noise";
+tSCC    zWalknoise_NAME[]          = "WALKNOISE";
+tSCC    zWalknoise_Name[]          = "walknoise";
+#define WALKNOISE_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Walknoise */
+#define VALUE_OPT_WALKNOISE NO_EQUIVALENT
+#define WALKNOISE_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zWalknoiseText       NULL
+#define zWalknoise_NAME      NULL
+#define zWalknoise_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Slew option description:
  */
@@ -389,6 +522,44 @@ tSCC    zSlew_NAME[]               = "SLEW";
 tSCC    zSlew_Name[]               = "slew";
 #define SLEW_FLAGS       (OPTST_DISABLED)
 
+/*
+ *  Ndelay option description:
+ */
+#ifdef SIM
+tSCC    zNdelayText[] =
+        "Simulation network delay";
+tSCC    zNdelay_NAME[]             = "NDELAY";
+tSCC    zNdelay_Name[]             = "ndelay";
+#define NDELAY_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Ndelay */
+#define VALUE_OPT_NDELAY NO_EQUIVALENT
+#define NDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zNdelayText       NULL
+#define zNdelay_NAME      NULL
+#define zNdelay_Name      NULL
+#endif  /* SIM */
+
+/*
+ *  Pdelay option description:
+ */
+#ifdef SIM
+tSCC    zPdelayText[] =
+        "Simulation processing delay";
+tSCC    zPdelay_NAME[]             = "PDELAY";
+tSCC    zPdelay_Name[]             = "pdelay";
+#define PDELAY_FLAGS       (OPTST_DISABLED \
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+
+#else   /* disable Pdelay */
+#define VALUE_OPT_PDELAY NO_EQUIVALENT
+#define PDELAY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zPdelayText       NULL
+#define zPdelay_NAME      NULL
+#define zPdelay_Name      NULL
+#endif  /* SIM */
+
 /*
  *  Help/More_Help/Version option descriptions:
  */
@@ -512,8 +683,20 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zBcastsyncText, zBcastsync_NAME, zBcastsync_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 5, VALUE_OPT_CONFIGFILE,
-     /* equiv idx, value */ 5, VALUE_OPT_CONFIGFILE,
+  {  /* entry idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
+     /* equiv idx, value */ 5, VALUE_OPT_SIMBROADCASTDELAY,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ SIMBROADCASTDELAY_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zSimbroadcastdelayText, zSimbroadcastdelay_NAME, zSimbroadcastdelay_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 6, VALUE_OPT_CONFIGFILE,
+     /* equiv idx, value */ 6, VALUE_OPT_CONFIGFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CONFIGFILE_FLAGS, 0,
@@ -524,8 +707,20 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zConfigfileText, zConfigfile_NAME, zConfigfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
-     /* equiv idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
+  {  /* entry idx, value */ 7, VALUE_OPT_PHASENOISE,
+     /* equiv idx, value */ 7, VALUE_OPT_PHASENOISE,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ PHASENOISE_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zPhasenoiseText, zPhasenoise_NAME, zPhasenoise_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
+     /* equiv idx, value */ 8, VALUE_OPT_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ DEBUG_LEVEL_FLAGS, 0,
@@ -536,8 +731,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
-     /* equiv idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL,
+  {  /* entry idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
+     /* equiv idx, value */ 9, VALUE_OPT_SET_DEBUG_LEVEL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ SET_DEBUG_LEVEL_FLAGS, 0,
@@ -548,8 +743,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 8, VALUE_OPT_DRIFTFILE,
-     /* equiv idx, value */ 8, VALUE_OPT_DRIFTFILE,
+  {  /* entry idx, value */ 10, VALUE_OPT_DRIFTFILE,
+     /* equiv idx, value */ 10, VALUE_OPT_DRIFTFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ DRIFTFILE_FLAGS, 0,
@@ -560,8 +755,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDriftfileText, zDriftfile_NAME, zDriftfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 9, VALUE_OPT_PANICGATE,
-     /* equiv idx, value */ 9, VALUE_OPT_PANICGATE,
+  {  /* entry idx, value */ 11, VALUE_OPT_PANICGATE,
+     /* equiv idx, value */ 11, VALUE_OPT_PANICGATE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ PANICGATE_FLAGS, 0,
@@ -572,8 +767,20 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPanicgateText, zPanicgate_NAME, zPanicgate_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 10, VALUE_OPT_JAILDIR,
-     /* equiv idx, value */ 10, VALUE_OPT_JAILDIR,
+  {  /* entry idx, value */ 12, VALUE_OPT_SIMSLEW,
+     /* equiv idx, value */ 12, VALUE_OPT_SIMSLEW,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ SIMSLEW_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zSimslewText, zSimslew_NAME, zSimslew_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 13, VALUE_OPT_JAILDIR,
+     /* equiv idx, value */ 13, VALUE_OPT_JAILDIR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ JAILDIR_FLAGS, 0,
@@ -584,8 +791,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zJaildirText, zJaildir_NAME, zJaildir_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 11, VALUE_OPT_INTERFACE,
-     /* equiv idx, value */ 11, VALUE_OPT_INTERFACE,
+  {  /* entry idx, value */ 14, VALUE_OPT_INTERFACE,
+     /* equiv idx, value */ 14, VALUE_OPT_INTERFACE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ INTERFACE_FLAGS, 0,
@@ -596,8 +803,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zInterfaceText, zInterface_NAME, zInterface_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 12, VALUE_OPT_KEYFILE,
-     /* equiv idx, value */ 12, VALUE_OPT_KEYFILE,
+  {  /* entry idx, value */ 15, VALUE_OPT_KEYFILE,
+     /* equiv idx, value */ 15, VALUE_OPT_KEYFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ KEYFILE_FLAGS, 0,
@@ -608,8 +815,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 13, VALUE_OPT_LOGFILE,
-     /* equiv idx, value */ 13, VALUE_OPT_LOGFILE,
+  {  /* entry idx, value */ 16, VALUE_OPT_LOGFILE,
+     /* equiv idx, value */ 16, VALUE_OPT_LOGFILE,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ LOGFILE_FLAGS, 0,
@@ -620,8 +827,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zLogfileText, zLogfile_NAME, zLogfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
-     /* equiv idx, value */ 14, VALUE_OPT_NOVIRTUALIPS,
+  {  /* entry idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
+     /* equiv idx, value */ 17, VALUE_OPT_NOVIRTUALIPS,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NOVIRTUALIPS_FLAGS, 0,
@@ -632,8 +839,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
-     /* equiv idx, value */ 15, VALUE_OPT_MODIFYMMTIMER,
+  {  /* entry idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
+     /* equiv idx, value */ 18, VALUE_OPT_MODIFYMMTIMER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ MODIFYMMTIMER_FLAGS, 0,
@@ -644,8 +851,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 16, VALUE_OPT_NOFORK,
-     /* equiv idx, value */ 16, VALUE_OPT_NOFORK,
+  {  /* 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,
@@ -656,8 +863,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 17, VALUE_OPT_NICE,
-     /* equiv idx, value */ 17, 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,
@@ -668,8 +875,20 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 18, VALUE_OPT_PIDFILE,
-     /* equiv idx, value */ 18, VALUE_OPT_PIDFILE,
+  {  /* 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,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zServertimeText, zServertime_NAME, zServertime_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* 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,
@@ -680,8 +899,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 19, VALUE_OPT_PRIORITY,
-     /* equiv idx, value */ 19, 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,
@@ -692,8 +911,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 20, VALUE_OPT_QUIT,
-     /* equiv idx, value */ 20, 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,
@@ -704,8 +923,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY,
-     /* equiv idx, value */ 21, 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,
@@ -716,8 +935,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 22, VALUE_OPT_STATSDIR,
-     /* equiv idx, value */ 22, VALUE_OPT_STATSDIR,
+  {  /* entry idx, value */ 26, VALUE_OPT_STATSDIR,
+     /* equiv idx, value */ 26, VALUE_OPT_STATSDIR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ STATSDIR_FLAGS, 0,
@@ -728,8 +947,20 @@ 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 */ 27, VALUE_OPT_ENDSIMTIME,
+     /* equiv idx, value */ 27, VALUE_OPT_ENDSIMTIME,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ ENDSIMTIME_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* 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,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ TRUSTEDKEY_FLAGS, 0,
@@ -740,8 +971,20 @@ 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 */ 29, VALUE_OPT_FREQERR,
+     /* equiv idx, value */ 29, VALUE_OPT_FREQERR,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ FREQERR_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zFreqerrText, zFreqerr_NAME, zFreqerr_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* entry idx, value */ 30, VALUE_OPT_USER,
+     /* equiv idx, value */ 30, VALUE_OPT_USER,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ USER_FLAGS, 0,
@@ -752,8 +995,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
-     /* equiv idx, value */ 25, VALUE_OPT_UPDATEINTERVAL,
+  {  /* entry idx, value */ 31, VALUE_OPT_UPDATEINTERVAL,
+     /* equiv idx, value */ 31, VALUE_OPT_UPDATEINTERVAL,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ UPDATEINTERVAL_FLAGS, 0,
@@ -764,8 +1007,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 26, VALUE_OPT_VAR,
-     /* equiv idx, value */ 26, VALUE_OPT_VAR,
+  {  /* entry idx, value */ 32, VALUE_OPT_VAR,
+     /* equiv idx, value */ 32, VALUE_OPT_VAR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ VAR_FLAGS, 0,
@@ -776,8 +1019,8 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 27, VALUE_OPT_DVAR,
-     /* equiv idx, value */ 27, VALUE_OPT_DVAR,
+  {  /* entry idx, value */ 33, VALUE_OPT_DVAR,
+     /* equiv idx, value */ 33, VALUE_OPT_DVAR,
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ DVAR_FLAGS, 0,
@@ -788,8 +1031,20 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name,
      /* disablement strs */ NULL, NULL },
 
-  {  /* entry idx, value */ 28, VALUE_OPT_SLEW,
-     /* equiv idx, value */ 28, VALUE_OPT_SLEW,
+  {  /* entry idx, value */ 34, VALUE_OPT_WALKNOISE,
+     /* equiv idx, value */ 34, VALUE_OPT_WALKNOISE,
+     /* equivalenced to  */ NO_EQUIVALENT,
+     /* min, max, act ct */ 0, 1, 0,
+     /* opt state flags  */ WALKNOISE_FLAGS, 0,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zWalknoiseText, zWalknoise_NAME, zWalknoise_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* 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,
@@ -800,6 +1055,30 @@ static tOptDesc optDesc[ OPTION_CT ] = {
      /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name,
      /* disablement strs */ NULL, NULL },
 
+  {  /* 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,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zNdelayText, zNdelay_NAME, zNdelay_Name,
+     /* disablement strs */ NULL, NULL },
+
+  {  /* 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,
+     /* last opt argumnt */ { NULL },
+     /* arg list/cookie  */ NULL,
+     /* must/cannot opts */ NULL, NULL,
+     /* option proc      */ NULL,
+     /* desc, NAME, name */ zPdelayText, zPdelay_NAME, zPdelay_Name,
+     /* disablement strs */ NULL, NULL },
+
 #ifdef NO_OPTIONAL_OPT_ARGS
 #  define VERSION_OPT_FLAGS     OPTST_IMM | OPTST_NO_INIT
 #else
@@ -899,7 +1178,7 @@ tOptions ntpdOptions = {
       NO_EQUIVALENT /* index of '-#' option */,
       NO_EQUIVALENT /* index of default opt */
     },
-    32 /* full option count */, 29 /* user option count */
+    41 /* full option count */, 38 /* user option count */
 };
 
 /*

diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index bc0dcf30f25477c1c27449f39c2fe59fad52ea56..f2e2613b6f04f5a39f8a6d8b6068e593f112977e 100644 (file)
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Monday November  5, 2007 at 06:36:56 AM EST
+ *  It has been AutoGen-ed  Tuesday November  6, 2007 at 12:26:48 AM EST
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -57,36 +57,45 @@ typedef enum {
         INDEX_OPT_AUTHREQ          =  2,
         INDEX_OPT_AUTHNOREQ        =  3,
         INDEX_OPT_BCASTSYNC        =  4,
-        INDEX_OPT_CONFIGFILE       =  5,
-        INDEX_OPT_DEBUG_LEVEL      =  6,
-        INDEX_OPT_SET_DEBUG_LEVEL  =  7,
-        INDEX_OPT_DRIFTFILE        =  8,
-        INDEX_OPT_PANICGATE        =  9,
-        INDEX_OPT_JAILDIR          = 10,
-        INDEX_OPT_INTERFACE        = 11,
-        INDEX_OPT_KEYFILE          = 12,
-        INDEX_OPT_LOGFILE          = 13,
-        INDEX_OPT_NOVIRTUALIPS     = 14,
-        INDEX_OPT_MODIFYMMTIMER    = 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_STATSDIR         = 22,
-        INDEX_OPT_TRUSTEDKEY       = 23,
-        INDEX_OPT_USER             = 24,
-        INDEX_OPT_UPDATEINTERVAL   = 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_SIMBROADCASTDELAY =  5,
+        INDEX_OPT_CONFIGFILE       =  6,
+        INDEX_OPT_PHASENOISE       =  7,
+        INDEX_OPT_DEBUG_LEVEL      =  8,
+        INDEX_OPT_SET_DEBUG_LEVEL  =  9,
+        INDEX_OPT_DRIFTFILE        = 10,
+        INDEX_OPT_PANICGATE        = 11,
+        INDEX_OPT_SIMSLEW          = 12,
+        INDEX_OPT_JAILDIR          = 13,
+        INDEX_OPT_INTERFACE        = 14,
+        INDEX_OPT_KEYFILE          = 15,
+        INDEX_OPT_LOGFILE          = 16,
+        INDEX_OPT_NOVIRTUALIPS     = 17,
+        INDEX_OPT_MODIFYMMTIMER    = 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_STATSDIR         = 26,
+        INDEX_OPT_ENDSIMTIME       = 27,
+        INDEX_OPT_TRUSTEDKEY       = 28,
+        INDEX_OPT_FREQERR          = 29,
+        INDEX_OPT_USER             = 30,
+        INDEX_OPT_UPDATEINTERVAL   = 31,
+        INDEX_OPT_VAR              = 32,
+        INDEX_OPT_DVAR             = 33,
+        INDEX_OPT_WALKNOISE        = 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
 } teOptIndex;
 
-#define OPTION_CT    32
+#define OPTION_CT    41
 #define NTPD_VERSION       "4.2.5p94"
 #define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.5p94"
 
@@ -135,10 +144,18 @@ typedef enum {
 #  warning undefining BCASTSYNC due to option name conflict
 #  undef   BCASTSYNC
 # endif
+# ifdef    SIMBROADCASTDELAY
+#  warning undefining SIMBROADCASTDELAY due to option name conflict
+#  undef   SIMBROADCASTDELAY
+# endif
 # ifdef    CONFIGFILE
 #  warning undefining CONFIGFILE due to option name conflict
 #  undef   CONFIGFILE
 # endif
+# ifdef    PHASENOISE
+#  warning undefining PHASENOISE due to option name conflict
+#  undef   PHASENOISE
+# endif
 # ifdef    DEBUG_LEVEL
 #  warning undefining DEBUG_LEVEL due to option name conflict
 #  undef   DEBUG_LEVEL
@@ -155,6 +172,10 @@ typedef enum {
 #  warning undefining PANICGATE due to option name conflict
 #  undef   PANICGATE
 # endif
+# ifdef    SIMSLEW
+#  warning undefining SIMSLEW due to option name conflict
+#  undef   SIMSLEW
+# endif
 # ifdef    JAILDIR
 #  warning undefining JAILDIR due to option name conflict
 #  undef   JAILDIR
@@ -187,6 +208,10 @@ typedef enum {
 #  warning undefining NICE due to option name conflict
 #  undef   NICE
 # endif
+# ifdef    SERVERTIME
+#  warning undefining SERVERTIME due to option name conflict
+#  undef   SERVERTIME
+# endif
 # ifdef    PIDFILE
 #  warning undefining PIDFILE due to option name conflict
 #  undef   PIDFILE
@@ -207,10 +232,18 @@ typedef enum {
 #  warning undefining STATSDIR due to option name conflict
 #  undef   STATSDIR
 # endif
+# ifdef    ENDSIMTIME
+#  warning undefining ENDSIMTIME due to option name conflict
+#  undef   ENDSIMTIME
+# endif
 # ifdef    TRUSTEDKEY
 #  warning undefining TRUSTEDKEY due to option name conflict
 #  undef   TRUSTEDKEY
 # endif
+# ifdef    FREQERR
+#  warning undefining FREQERR due to option name conflict
+#  undef   FREQERR
+# endif
 # ifdef    USER
 #  warning undefining USER due to option name conflict
 #  undef   USER
@@ -227,21 +260,36 @@ typedef enum {
 #  warning undefining DVAR due to option name conflict
 #  undef   DVAR
 # endif
+# ifdef    WALKNOISE
+#  warning undefining WALKNOISE due to option name conflict
+#  undef   WALKNOISE
+# endif
 # ifdef    SLEW
 #  warning undefining SLEW due to option name conflict
 #  undef   SLEW
 # endif
+# ifdef    NDELAY
+#  warning undefining NDELAY due to option name conflict
+#  undef   NDELAY
+# endif
+# ifdef    PDELAY
+#  warning undefining PDELAY due to option name conflict
+#  undef   PDELAY
+# endif
 #else  /* NO_OPTION_NAME_WARNINGS */
 # undef IPV4
 # undef IPV6
 # undef AUTHREQ
 # undef AUTHNOREQ
 # undef BCASTSYNC
+# undef SIMBROADCASTDELAY
 # undef CONFIGFILE
+# undef PHASENOISE
 # undef DEBUG_LEVEL
 # undef SET_DEBUG_LEVEL
 # undef DRIFTFILE
 # undef PANICGATE
+# undef SIMSLEW
 # undef JAILDIR
 # undef INTERFACE
 # undef KEYFILE
@@ -250,17 +298,23 @@ typedef enum {
 # undef MODIFYMMTIMER
 # undef NOFORK
 # undef NICE
+# undef SERVERTIME
 # undef PIDFILE
 # undef PRIORITY
 # undef QUIT
 # undef PROPAGATIONDELAY
 # undef STATSDIR
+# undef ENDSIMTIME
 # undef TRUSTEDKEY
+# undef FREQERR
 # undef USER
 # undef UPDATEINTERVAL
 # undef VAR
 # undef DVAR
+# undef WALKNOISE
 # undef SLEW
+# undef NDELAY
+# undef PDELAY
 #endif  /*  NO_OPTION_NAME_WARNINGS */
 
 /*
@@ -273,7 +327,13 @@ typedef enum {
 #define VALUE_OPT_AUTHREQ        'a'
 #define VALUE_OPT_AUTHNOREQ      'A'
 #define VALUE_OPT_BCASTSYNC      'b'
+#ifdef SIM
+#define VALUE_OPT_SIMBROADCASTDELAY 'B'
+#endif /* SIM */
 #define VALUE_OPT_CONFIGFILE     'c'
+#ifdef SIM
+#define VALUE_OPT_PHASENOISE     'C'
+#endif /* SIM */
 #ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #endif /* DEBUG */
@@ -282,6 +342,9 @@ typedef enum {
 #endif /* DEBUG */
 #define VALUE_OPT_DRIFTFILE      'f'
 #define VALUE_OPT_PANICGATE      'g'
+#ifdef SIM
+#define VALUE_OPT_SIMSLEW        'H'
+#endif /* SIM */
 #ifdef HAVE_DROPROOT
 #define VALUE_OPT_JAILDIR        'i'
 #endif /* HAVE_DROPROOT */
@@ -294,21 +357,39 @@ typedef enum {
 #endif /* SYS_WINNT */
 #define VALUE_OPT_NOFORK         'n'
 #define VALUE_OPT_NICE           'N'
+#ifdef SIM
+#define VALUE_OPT_SERVERTIME     'O'
+#endif /* SIM */
 #define VALUE_OPT_PIDFILE        'p'
 #define VALUE_OPT_PRIORITY       'P'
 #define OPT_VALUE_PRIORITY       (DESC(PRIORITY).optArg.argInt)
 #define VALUE_OPT_QUIT           'q'
 #define VALUE_OPT_PROPAGATIONDELAY 'r'
 #define VALUE_OPT_STATSDIR       's'
+#ifdef SIM
+#define VALUE_OPT_ENDSIMTIME     'S'
+#endif /* SIM */
 #define VALUE_OPT_TRUSTEDKEY     't'
+#ifdef SIM
+#define VALUE_OPT_FREQERR        'T'
+#endif /* SIM */
 #ifdef HAVE_DROPROOT
 #define VALUE_OPT_USER           'u'
 #endif /* HAVE_DROPROOT */
 #define VALUE_OPT_UPDATEINTERVAL 'U'
 #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt)
-#define VALUE_OPT_VAR            26
-#define VALUE_OPT_DVAR           27
+#define VALUE_OPT_VAR            32
+#define VALUE_OPT_DVAR           129
+#ifdef SIM
+#define VALUE_OPT_WALKNOISE      'W'
+#endif /* SIM */
 #define VALUE_OPT_SLEW           'x'
+#ifdef SIM
+#define VALUE_OPT_NDELAY         'Y'
+#endif /* SIM */
+#ifdef SIM
+#define VALUE_OPT_PDELAY         'Z'
+#endif /* SIM */
 
 #define VALUE_OPT_VERSION       INDEX_OPT_VERSION
 #define VALUE_OPT_HELP          '?'

diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index 1aa9933eaca588e9aecf3e7c5030c5e65b36d22a..322ab176b2e7310e21e9749a75da93612d3181d6 100644 (file)
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Monday November  5, 2007 at 06:37:00 AM EST
+# It has been AutoGen-ed  Tuesday November  6, 2007 at 12:26:51 AM EST
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -28,6 +28,8 @@ 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
+* ntpd endsimtime::             endsimtime option (-S)
+* ntpd freqerr::                freqerr option (-T)
 * ntpd interface::              interface option (-I)
 * ntpd ipv4::                   ipv4 option (-4)
 * ntpd ipv6::                   ipv6 option (-6)
@@ -35,21 +37,28 @@ This software is released under a specialized copyright license.
 * ntpd keyfile::                keyfile option (-k)
 * ntpd logfile::                logfile option (-l)
 * ntpd modifymmtimer::          modifymmtimer option (-M)
+* ntpd ndelay::                 ndelay option (-Y)
 * ntpd nice::                   nice option (-N)
 * ntpd nofork::                 nofork option (-n)
 * ntpd novirtualips::           novirtualips option (-L)
 * ntpd panicgate::              panicgate option (-g)
+* ntpd pdelay::                 pdelay option (-Z)
+* ntpd phasenoise::             phasenoise option (-C)
 * ntpd pidfile::                pidfile option (-p)
 * ntpd priority::               priority option (-P)
 * ntpd propagationdelay::       propagationdelay option (-r)
 * ntpd quit::                   quit option (-q)
+* ntpd servertime::             servertime option (-O)
 * ntpd set-debug-level::        set-debug-level option (-D)
+* ntpd simbroadcastdelay::      simbroadcastdelay option (-B)
+* ntpd simslew::                simslew option (-H)
 * ntpd slew::                   slew option (-x)
 * ntpd statsdir::               statsdir option (-s)
 * ntpd trustedkey::             trustedkey option (-t)
 * ntpd updateinterval::         updateinterval option (-U)
 * ntpd user::                   user option (-u)
 * ntpd var::                    var option
+* ntpd walknoise::              walknoise option (-W)
 @end menu
 
 @node ntpd usage
@@ -187,6 +196,20 @@ This is almost never a good idea.
 This is the ``allow us to sync to broadcast servers'' option.
 
 
+@node ntpd simbroadcastdelay
+@subsection simbroadcastdelay option (-B)
+@cindex ntpd-simbroadcastdelay
+
+This is the ``simulator broadcast delay'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd configfile
 @subsection configfile option (-c)
 @cindex ntpd-configfile
@@ -196,6 +219,20 @@ The name and path of the configuration file,
 /etc/ntp.conf
 by default.
 
+@node ntpd phasenoise
+@subsection phasenoise option (-C)
+@cindex ntpd-phasenoise
+
+This is the ``phase noise level'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd debug-level
 @subsection debug-level option (-d)
 @cindex ntpd-debug-level
@@ -261,6 +298,20 @@ See the
 tinker
 configuration file directive for other options.
 
+@node ntpd simslew
+@subsection simslew option (-H)
+@cindex ntpd-simslew
+
+This is the ``simuator slew'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd jaildir
 @subsection jaildir option (-i)
 @cindex ntpd-jaildir
@@ -285,7 +336,7 @@ option.
 @subsection interface option (-I)
 @cindex ntpd-interface
 
-This is the ``listen on interface'' option.
+This is the ``listen on the specified interface or ip'' option.
 
 This option has some usage constraints.  It:
 @itemize @bullet
@@ -355,6 +406,20 @@ To the extent permitted by the operating system, run
 ntpd
 at the highest priority.
 
+@node ntpd servertime
+@subsection servertime option (-O)
+@cindex ntpd-servertime
+
+This is the ``server time'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd pidfile
 @subsection pidfile option (-p)
 @cindex ntpd-pidfile
@@ -411,6 +476,20 @@ This is the same operation as the
 statsdir statsdir
 configuration file directive.
 
+@node ntpd endsimtime
+@subsection endsimtime option (-S)
+@cindex ntpd-endsimtime
+
+This is the ``simulation end time'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd trustedkey
 @subsection trustedkey option (-t)
 @cindex ntpd-trustedkey
@@ -425,6 +504,20 @@ may appear an unlimited number of times.
 
 Add a key number to the trusted key list.
 
+@node ntpd freqerr
+@subsection freqerr option (-T)
+@cindex ntpd-freqerr
+
+This is the ``simulation frequency error'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd user
 @subsection user option (-u)
 @cindex ntpd-user
@@ -483,6 +576,20 @@ may appear an unlimited number of times.
 
 
 
+@node ntpd walknoise
+@subsection walknoise option (-W)
+@cindex ntpd-walknoise
+
+This is the ``simulation random walk noise'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
 @node ntpd slew
 @subsection slew option (-x)
 @cindex ntpd-slew
@@ -501,3 +608,31 @@ See the
 tinker
 configuration file directive for other options.
 Note: The kernel time discipline is disabled with this option.
+
+@node ntpd ndelay
+@subsection ndelay option (-Y)
+@cindex ntpd-ndelay
+
+This is the ``simulation network delay'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+
+
+@node ntpd pdelay
+@subsection pdelay option (-Z)
+@cindex ntpd-pdelay
+
+This is the ``simulation processing delay'' option.
+
+This option has some usage constraints.  It:
+@itemize @bullet
+@item
+must be compiled in by defining @code{SIM} during the compilation.
+@end itemize
+
+

diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index 5f9e5f6ab521cb53953a8b34903b2b1b66bcee98..e51f886f5d9d4ce0c3efc9b23dce637ac38063bf 100644 (file)
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2007-11-05 "( 4.2.5p94)" "Programmer's Manual"
+.TH NTPD 1 2007-11-06 "( 4.2.5p94)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Monday November  5, 2007 at 06:36:59 AM EST
+.\"  It has been AutoGen-ed  Tuesday November  6, 2007 at 12:26:50 AM EST
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
@@ -54,6 +54,11 @@ This is almost never a good idea.
 Allow us to sync to broadcast servers.
 .sp
 
+.TP
+.BR \-B " \fIstring\fP, " \--simbroadcastdelay "=" \fIstring\fP
+Simulator broadcast delay.
+.sp
+
 .TP
 .BR \-c " \fIstring\fP, " \--configfile "=" \fIstring\fP
 configuration file name.
@@ -61,6 +66,11 @@ configuration file name.
 The name and path of the configuration file,
 /etc/ntp.conf
 by default.
+.TP
+.BR \-C " \fIstring\fP, " \--phasenoise "=" \fIstring\fP
+Phase noise level.
+.sp
+
 .TP
 .BR \-d ", " \--debug-level
 Increase output debug message level.
@@ -102,6 +112,11 @@ options.
 See the
 tinker
 configuration file directive for other options.
+.TP
+.BR \-H " \fIstring\fP, " \--simslew "=" \fIstring\fP
+Simuator slew.
+.sp
+
 .TP
 .BR \-i " \fIstring\fP, " \--jaildir "=" \fIstring\fP
 Jail directory.
@@ -115,7 +130,7 @@ You may need to also specify a
 option.
 .TP
 .BR \-I " \fIiface\fP, " \--interface "=" \fIiface\fP
-Listen on interface.
+Listen on the specified interface or IP.
 This option may appear an unlimited number of times.
 .sp
 
@@ -160,6 +175,11 @@ Run at high priority.
 To the extent permitted by the operating system, run
 ntpd
 at the highest priority.
+.TP
+.BR \-O " \fIstring\fP, " \--servertime "=" \fIstring\fP
+Server time.
+.sp
+
 .TP
 .BR \-p " \fIstring\fP, " \--pidfile "=" \fIstring\fP
 path to the PID file.
@@ -207,12 +227,22 @@ Specify the directory path for files created by the statistics facility.
 This is the same operation as the
 statsdir statsdir
 configuration file directive.
+.TP
+.BR \-S " \fIstring\fP, " \--endsimtime "=" \fIstring\fP
+Simulation end time.
+.sp
+
 .TP
 .BR \-t " \fItkey\fP, " \--trustedkey "=" \fItkey\fP
 Trusted key number.
 This option may appear an unlimited number of times.
 .sp
 Add a key number to the trusted key list.
+.TP
+.BR \-T " \fIstring\fP, " \--freqerr "=" \fIstring\fP
+Simulation frequency error.
+.sp
+
 .TP
 .BR \-u " \fIstring\fP, " \--user "=" \fIstring\fP
 Run as userid (or userid:groupid).
@@ -245,6 +275,11 @@ make ARG an ntp variable (RW|DEF).
 This option may appear an unlimited number of times.
 .sp
 
+.TP
+.BR \-W " \fIstring\fP, " \--walknoise "=" \fIstring\fP
+Simulation random walk noise.
+.sp
+
 .TP
 .BR \-x ", " \--slew
 Slew up to 600 seconds.
@@ -262,6 +297,16 @@ See the
 tinker
 configuration file directive for other options.
 Note: The kernel time discipline is disabled with this option.
+.TP
+.BR \-Y " \fIstring\fP, " \--ndelay "=" \fIstring\fP
+Simulation network delay.
+.sp
+
+.TP
+.BR \-Z " \fIstring\fP, " \--pdelay "=" \fIstring\fP
+Simulation processing delay.
+.sp
+
 .TP
 .BR \-? , " \--help"
 Display usage information and exit.

diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index 39cb81741de7e53066aed61d09564193ac2ddb6a..5110177f96590b53a721b002a4f849a1dae9d54c 100644 (file)
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -56,8 +56,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = simbroadcastdelay;
     value     = B;
     arg-type  = string;
@@ -65,7 +65,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     name      = configfile;
@@ -79,8 +78,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = phasenoise;
     value     = C;
     arg-type  = string;
@@ -88,7 +87,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 #include debug-opt.def
 
@@ -129,8 +127,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = simslew;
     value     = H;
     arg-type  = string;
@@ -138,7 +136,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     ifdef     = HAVE_DROPROOT;
@@ -161,7 +158,7 @@ flag = {
     name      = interface;
     value     = I;
     arg-type  = string;
-    descrip   = "Listen on interface";
+    descrip   = "Listen on the specified interface or IP";
     max       = NOLIMIT;
     arg-name  = iface;
     stack-arg;
@@ -236,8 +233,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = servertime;
     value     = O;
     arg-type  = string;
@@ -245,7 +242,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     name      = pidfile;
@@ -317,8 +313,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = endsimtime;
     value     = S;
     arg-type  = string;
@@ -326,7 +322,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     name      = trustedkey;
@@ -341,8 +336,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = freqerr;
     value     = T;
     arg-type  = string;
@@ -350,7 +345,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     ifdef     = HAVE_DROPROOT;
@@ -406,8 +400,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = walknoise;
     value     = W;
     arg-type  = string;
@@ -415,7 +409,6 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
 flag = {
     name      = slew;
@@ -438,8 +431,8 @@ flag = {
        _EndOfDoc_;
 };
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = ndelay;
     value     = Y;
     arg-type  = string;
@@ -447,10 +440,9 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif
 
-#ifdef SIM
 flag = {
+    ifdef     = SIM;
     name      = pdelay;
     value     = Z;
     arg-type  = string;
@@ -458,4 +450,3 @@ flag = {
     doc = <<-  _EndOfDoc_
        _EndOfDoc_;
 };
-#endif