aboutsummaryrefslogtreecommitdiffstats
path: root/ntpq/ntpq-opts.h
diff options
context:
space:
mode:
authorOllivier Robert <roberto@FreeBSD.org>2013-12-04 21:33:17 +0000
committerOllivier Robert <roberto@FreeBSD.org>2013-12-04 21:33:17 +0000
commit2b45e011ca352ce509bc83ae148230aeee0c7e0d (patch)
treea618007bb41d13153794a598e3d904ace2976324 /ntpq/ntpq-opts.h
parent9b5bd0a264b0a21eefac2b929b574c73bd601507 (diff)
downloadsrc-2b45e011ca352ce509bc83ae148230aeee0c7e0d.tar.gz
src-2b45e011ca352ce509bc83ae148230aeee0c7e0d.zip
Virgin import of ntpd 4.2.6p5.vendor/ntp/4.2.6p5
When the series of commits is complete, things like https://cert.litnet.lt/en/docs/ntp-distributed-reflection-dos-attacks should be fixed. PR: bin/148836 (except that we import a newer version) Asked by: Too many MFC after: 2 weeks
Notes
Notes: svn path=/vendor/ntp/dist/; revision=258945 svn path=/vendor/ntp/4.2.6p5/; revision=258946; tag=vendor/ntp/4.2.6p5
Diffstat (limited to 'ntpq/ntpq-opts.h')
-rw-r--r--ntpq/ntpq-opts.h155
1 files changed, 90 insertions, 65 deletions
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 2badce79077b..06abfa96a075 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,27 +1,24 @@
/*
* EDIT THIS FILE WITH CAUTION (ntpq-opts.h)
*
- * It has been AutoGen-ed Tuesday December 8, 2009 at 08:14:26 AM EST
+ * It has been AutoGen-ed December 24, 2011 at 06:34:27 PM by AutoGen 5.12
* From the definitions ntpq-opts.def
* and the template file options
*
- * Generated from AutoOpts 29:0:4 templates.
- */
-
-/*
- * This file was produced by an AutoOpts template. AutoOpts is a
- * copyrighted work. This header file is not encumbered by AutoOpts
- * licensing, but is provided under the licensing terms chosen by the
- * ntpq author or copyright holder. AutoOpts is licensed under
- * the terms of the LGPL. The redistributable library (``libopts'') is
- * licensed under the terms of either the LGPL or, at the users discretion,
- * the BSD license. See the AutoOpts and/or libopts sources for details.
+ * Generated from AutoOpts 35:0:10 templates.
*
- * This source file is copyrighted and licensed under the following terms:
+ * AutoOpts is a copyrighted work. This header file is not encumbered
+ * by AutoOpts licensing, but is provided under the licensing terms chosen
+ * by the ntpq author or copyright holder. AutoOpts is
+ * licensed under the terms of the LGPL. The redistributable library
+ * (``libopts'') is licensed under the terms of either the LGPL or, at the
+ * users discretion, the BSD license. See the AutoOpts and/or libopts sources
+ * for details.
*
- * ntpq copyright 1970-2009 David L. Mills and/or others - all rights reserved
+ * This source file is copyrighted and licensed under the following terms:
*
- * see html/copyright.html
+ * see html/copyright.html
+ *
*/
/*
* This file contains the programmatic interface to the Automated
@@ -30,7 +27,7 @@
* "AutoOpts" chapter. Please refer to that doc for usage help.
*/
#ifndef AUTOOPTS_NTPQ_OPTS_H_GUARD
-#define AUTOOPTS_NTPQ_OPTS_H_GUARD
+#define AUTOOPTS_NTPQ_OPTS_H_GUARD 1
#include "config.h"
#include <autoopts/options.h>
@@ -41,7 +38,7 @@
* tolerable version is at least as old as what was current when the header
* template was released.
*/
-#define AO_TEMPLATE_VERSION 118784
+#define AO_TEMPLATE_VERSION 143360
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
@@ -52,29 +49,30 @@
* Enumeration of each option:
*/
typedef enum {
- INDEX_OPT_IPV4 = 0,
- INDEX_OPT_IPV6 = 1,
- INDEX_OPT_COMMAND = 2,
- INDEX_OPT_DEBUG_LEVEL = 3,
- INDEX_OPT_SET_DEBUG_LEVEL = 4,
- INDEX_OPT_PEERS = 5,
- INDEX_OPT_INTERACTIVE = 6,
- INDEX_OPT_NUMERIC = 7,
- INDEX_OPT_VERSION = 8,
- INDEX_OPT_HELP = 9,
- INDEX_OPT_MORE_HELP = 10,
- INDEX_OPT_SAVE_OPTS = 11,
- INDEX_OPT_LOAD_OPTS = 12
+ INDEX_OPT_IPV4 = 0,
+ INDEX_OPT_IPV6 = 1,
+ INDEX_OPT_COMMAND = 2,
+ INDEX_OPT_DEBUG_LEVEL = 3,
+ INDEX_OPT_SET_DEBUG_LEVEL = 4,
+ INDEX_OPT_PEERS = 5,
+ INDEX_OPT_INTERACTIVE = 6,
+ INDEX_OPT_NUMERIC = 7,
+ INDEX_OPT_OLD_RV = 8,
+ INDEX_OPT_VERSION = 9,
+ INDEX_OPT_HELP = 10,
+ INDEX_OPT_MORE_HELP = 11,
+ INDEX_OPT_SAVE_OPTS = 12,
+ INDEX_OPT_LOAD_OPTS = 13
} teOptIndex;
-#define OPTION_CT 13
-#define NTPQ_VERSION "4.2.4p8"
-#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p8"
+#define OPTION_CT 14
+#define NTPQ_VERSION "4.2.6p5"
+#define NTPQ_FULL_VERSION "ntpq 4.2.6p5"
/*
* Interface defines for all options. Replace "n" with the UPPER_CASED
* option name (as in the teOptIndex enumeration above).
- * e.g. HAVE_OPT( IPV4 )
+ * e.g. HAVE_OPT(IPV4)
*/
#define DESC(n) (ntpqOptions.pOptDesc[INDEX_OPT_## n])
#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
@@ -88,10 +86,18 @@ typedef enum {
#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs)
#define CLEAR_OPT(n) STMTS( \
DESC(n).fOptState &= OPTST_PERSISTENT_MASK; \
- if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \
+ if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
DESC(n).fOptState |= OPTST_DISABLED; \
DESC(n).optCookie = NULL )
+/* * * * * *
+ *
+ * Enumeration of ntpq exit codes
+ */
+typedef enum {
+ NTPQ_EXIT_SUCCESS = 0,
+ NTPQ_EXIT_FAILURE = 1
+} ntpq_exit_code_t;
/*
* Make sure there are no #define name conflicts with the option names
*/
@@ -128,6 +134,10 @@ typedef enum {
# warning undefining NUMERIC due to option name conflict
# undef NUMERIC
# endif
+# ifdef OLD_RV
+# warning undefining OLD_RV due to option name conflict
+# undef OLD_RV
+# endif
#else /* NO_OPTION_NAME_WARNINGS */
# undef IPV4
# undef IPV6
@@ -137,29 +147,25 @@ typedef enum {
# undef PEERS
# undef INTERACTIVE
# undef NUMERIC
+# undef OLD_RV
#endif /* NO_OPTION_NAME_WARNINGS */
-/*
+/* * * * * *
+ *
* Interface defines for specific options.
*/
#define VALUE_OPT_IPV4 '4'
-#define WHICH_OPT_IPV4 (DESC(IPV4).optActualValue)
-#define WHICH_IDX_IPV4 (DESC(IPV4).optActualIndex)
#define VALUE_OPT_IPV6 '6'
#define VALUE_OPT_COMMAND 'c'
-#ifdef DEBUG
#define VALUE_OPT_DEBUG_LEVEL 'd'
-#endif /* DEBUG */
-#ifdef DEBUG
#define VALUE_OPT_SET_DEBUG_LEVEL 'D'
-#endif /* DEBUG */
#define VALUE_OPT_PEERS 'p'
#define VALUE_OPT_INTERACTIVE 'i'
#define VALUE_OPT_NUMERIC 'n'
-
-#define VALUE_OPT_VERSION 'v'
+#define VALUE_OPT_OLD_RV 8
#define VALUE_OPT_HELP '?'
#define VALUE_OPT_MORE_HELP '!'
+#define VALUE_OPT_VERSION INDEX_OPT_VERSION
#define VALUE_OPT_SAVE_OPTS '>'
#define VALUE_OPT_LOAD_OPTS '<'
#define SET_OPT_SAVE_OPTS(a) STMTS( \
@@ -169,37 +175,56 @@ typedef enum {
/*
* Interface defines not associated with particular options
*/
-#define ERRSKIP_OPTERR STMTS( ntpqOptions.fOptSet &= ~OPTPROC_ERRSTOP )
-#define ERRSTOP_OPTERR STMTS( ntpqOptions.fOptSet |= OPTPROC_ERRSTOP )
+#define ERRSKIP_OPTERR STMTS(ntpqOptions.fOptSet &= ~OPTPROC_ERRSTOP)
+#define ERRSTOP_OPTERR STMTS(ntpqOptions.fOptSet |= OPTPROC_ERRSTOP)
#define RESTART_OPT(n) STMTS( \
ntpqOptions.curOptIdx = (n); \
- ntpqOptions.pzCurOpt = NULL )
+ ntpqOptions.pzCurOpt = NULL)
#define START_OPT RESTART_OPT(1)
-#define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, c )
-/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */
+#define USAGE(c) (*ntpqOptions.pUsageProc)(&ntpqOptions, c)
+/* extracted from opthead.tlib near line 451 */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
/* * * * * *
*
* Declare the ntpq option descriptor.
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
+extern tOptions ntpqOptions;
-extern tOptions ntpqOptions;
+#if defined(ENABLE_NLS)
+# ifndef _
+# include <stdio.h>
+static inline char* aoGetsText(char const* pz) {
+ if (pz == NULL) return NULL;
+ return (char*)gettext(pz);
+}
+# define _(s) aoGetsText(s)
+# endif /* _() */
-#ifndef _
-# if ENABLE_NLS
-# include <stdio.h>
- static inline char* aoGetsText( char const* pz ) {
- if (pz == NULL) return NULL;
- return (char*)gettext( pz );
- }
-# define _(s) aoGetsText(s)
-# else /* ENABLE_NLS */
-# define _(s) s
-# endif /* ENABLE_NLS */
-#endif
+# define OPT_NO_XLAT_CFG_NAMES STMTS(ntpqOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT_CFG;)
+# define OPT_NO_XLAT_OPT_NAMES STMTS(ntpqOptions.fOptSet |= \
+ OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG;)
+
+# define OPT_XLAT_CFG_NAMES STMTS(ntpqOptions.fOptSet &= \
+ ~(OPTPROC_NXLAT_OPT|OPTPROC_NXLAT_OPT_CFG);)
+# define OPT_XLAT_OPT_NAMES STMTS(ntpqOptions.fOptSet &= \
+ ~OPTPROC_NXLAT_OPT;)
+
+#else /* ENABLE_NLS */
+# define OPT_NO_XLAT_CFG_NAMES
+# define OPT_NO_XLAT_OPT_NAMES
+
+# define OPT_XLAT_CFG_NAMES
+# define OPT_XLAT_OPT_NAMES
+
+# ifndef _
+# define _(_s) _s
+# endif
+#endif /* ENABLE_NLS */
#ifdef __cplusplus
}