GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

reorganized file generation and removed auto-generated files.

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-11-05 20:01:49 +01:00
parent 9374aa7576
commit eb36a15550
5 changed files with 635 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Makefile.am
View File

@@ -21,7 +21,9 @@ CCAN_SOURCES = ccan/build_assert/build_assert.h ccan/check_type/check_type.h \
ccan/list/list.c ccan/list/list.h
ocserv_SOURCES = main.c main-auth.c worker-vpn.c worker-auth.c tlslib.c \
ocserv_SOURCES = ocserv-args.def ocserv-args.c ocserv-args.h
ocserv_SOURCES += main.c main-auth.c worker-vpn.c worker-auth.c tlslib.c \
http-parser/http_parser.c ipc.h cookies.c worker-tun.c main-misc.c \
main-config.c ip-lease.c ip-lease.h \
vpn.h cookies.h tlslib.h http-parser/http_parser.h log.c tun.c tun.h \
@@ -33,7 +35,6 @@ ocserv_SOURCES = main.c main-auth.c worker-vpn.c worker-auth.c tlslib.c \
worker-bandwidth.c worker-bandwidth.h \
str.c str.h gettime.h $(CCAN_SOURCES)
ocserv_SOURCES += ocserv-args.def ocserv-args.c ocserv-args.h
ocserv_LDADD = ../gl/libgnu.a $(LIBOPTS)
ocserv_LDADD += $(LIBGNUTLS_LIBS) $(PAM_LIBS) $(LIBUTIL) \
@@ -50,7 +51,8 @@ endif
ocserv-args.c ocserv-args.h: $(srcdir)/ocserv-args.def
@AUTOGEN@ $<
ocpasswd_SOURCES = ocpasswd.c ocpasswd-args.def ocpasswd-args.c ocpasswd-args.h
ocpasswd_SOURCES = ocpasswd-args.def ocpasswd-args.c ocpasswd-args.h \
ocpasswd.c
ocpasswd_LDADD = ../gl/libgnu.a $(LIBOPTS)
ocpasswd_LDADD += $(LIBGNUTLS_LIBS) $(LIBCRYPT)

222
src/ocpasswd-args.c
View File

@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (ocpasswd-args.c)
*
* It has been AutoGen-ed August 1, 2013 at 05:50:01 PM by AutoGen 5.17.3
* It has been AutoGen-ed November 5, 2013 at 08:00:31 PM by AutoGen 5.18
* From the definitions ocpasswd-args.def
* and the template file options
*
* Generated from AutoOpts 38:0:13 templates.
* Generated from AutoOpts 40:0:15 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -63,7 +63,7 @@ extern FILE * option_usage_fp;
* static const strings for ocpasswd options
*/
static char const ocpasswd_opt_strs[1483] =
/* 0 */ "ocpasswd 0.1.5\n"
/* 0 */ "ocpasswd 0.2.0\n"
"Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the GNU General Public License,\n"
@@ -102,7 +102,7 @@ static char const ocpasswd_opt_strs[1483] =
/* 1238 */ "\n\0"
/* 1240 */ "This program is openconnect password (ocpasswd) utility. It allows the\n"
"generation and handling of a 'plain' password file used by ocserv.\n\0"
/* 1380 */ "ocpasswd 0.1.5\0"
/* 1380 */ "ocpasswd 0.2.0\0"
/* 1395 */ "Usage: ocpasswd -c [passwd] [options] username\n"
"ocpasswd --help for usage instructions.\n";
@@ -166,8 +166,8 @@ static char const ocpasswd_opt_strs[1483] =
#define MORE_HELP_name (ocpasswd_opt_strs+1021)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
#define MORE_HELP_name NULL
#define MORE_HELP_DESC HELP_DESC
#define MORE_HELP_name HELP_name
#define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
#endif
#ifdef NO_OPTIONAL_OPT_ARGS
@@ -302,7 +302,7 @@ static tOptDesc optDesc[OPTION_CT] = {
#define zDetail (ocpasswd_opt_strs+1240)
/** The full version string for ocpasswd. */
#define zFullVersion (ocpasswd_opt_strs+1380)
/* extracted from optcode.tlib near line 371 */
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -323,17 +323,19 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
* @param[in] pOptions the AutoOpts option description structure
* @param[in] pOptDesc the descriptor for the "help" (usage) option.
* @param[in] opts the AutoOpts option description structure
* @param[in] od the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
doUsageOpt(tOptions * opts, tOptDesc * od)
{
optionUsage(&ocpasswdOptions, OCPASSWD_EXIT_SUCCESS);
int ex_code;
ex_code = OCPASSWD_EXIT_SUCCESS;
optionUsage(&ocpasswdOptions, ex_code);
/* NOTREACHED */
(void)pOptDesc;
(void)pOptions;
(void)opts;
(void)od;
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -359,7 +361,7 @@ doOptPasswd(tOptions* pOptions, tOptDesc* pOptDesc)
*/
optionFileCheck(pOptions, pOptDesc, type, mode);
}
/* extracted from optmain.tlib near line 1254 */
/* extracted from optmain.tlib near line 1266 */
/**
* The directory containing the data associated with ocpasswd.
@@ -543,10 +545,10 @@ translate_option_strings(void)
static void bogus_function(void) {
/* TRANSLATORS:
The following dummy function was crated solely so that xgettext can extract
the correct strings. These strings are actually referenced by a field name
in the ocpasswdOptions structure noted in the comments below. The
literal text is defined in ocpasswd_opt_strs.
The following dummy function was crated solely so that xgettext can
extract the correct strings. These strings are actually referenced
by a field name in the ocpasswdOptions structure noted in the
comments below. The literal text is defined in ocpasswd_opt_strs.
NOTE: the strings below are segmented with respect to the source string
ocpasswd_opt_strs. The strings above are handed off for translation
@@ -558,7 +560,7 @@ static void bogus_function(void) {
translate option names.
*/
/* referenced via ocpasswdOptions.pzCopyright */
puts(_("ocpasswd 0.1.5\n\
puts(_("ocpasswd 0.2.0\n\
Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the GNU General Public License,\n\
@@ -608,7 +610,7 @@ Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [username]\n"));
generation and handling of a 'plain' password file used by ocserv.\n"));
/* referenced via ocpasswdOptions.pzFullVersion */
puts(_("ocpasswd 0.1.5"));
puts(_("ocpasswd 0.2.0"));
/* referenced via ocpasswdOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
@@ -617,51 +619,51 @@ generation and handling of a 'plain' password file used by ocserv.\n"));
puts(_("Usage: ocpasswd -c [passwd] [options] username\n\
ocpasswd --help for usage instructions.\n"));
/* LIBOPTS-MESSAGES: */
#line 60 "../autoopts.c"
#line 67 "../autoopts.c"
puts(_("allocation of %d bytes failed\n"));
#line 86 "../autoopts.c"
#line 93 "../autoopts.c"
puts(_("allocation of %d bytes failed\n"));
#line 53 "../init.c"
puts(_("AutoOpts function called without option descriptor\n"));
#line 89 "../init.c"
#line 90 "../init.c"
puts(_("\tThis exceeds the compiled library version: "));
#line 87 "../init.c"
#line 88 "../init.c"
puts(_("Automated Options Processing Error!\n"
"\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
#line 73 "../autoopts.c"
#line 80 "../autoopts.c"
puts(_("realloc of %d bytes at 0x%p failed\n"));
#line 91 "../init.c"
#line 92 "../init.c"
puts(_("\tThis is less than the minimum library version: "));
#line 121 "../version.c"
puts(_("Automated Options version %s\n"
"\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
#line 310 "../usage.c"
#line 82 "../makeshell.c"
puts(_("(AutoOpts bug): %s.\n"));
#line 90 "../reset.c"
puts(_("optionResetOpt() called, but reset-option not configured"));
#line 329 "../usage.c"
#line 292 "../usage.c"
puts(_("could not locate the 'help' option"));
#line 351 "../autoopts.c"
#line 336 "../autoopts.c"
puts(_("optionProcess() was called with invalid data"));
#line 783 "../usage.c"
#line 747 "../usage.c"
puts(_("invalid argument type specified"));
#line 589 "../find.c"
#line 598 "../find.c"
puts(_("defaulted to option with optional arg"));
#line 76 "../alias.c"
puts(_("aliasing option is out of range."));
#line 229 "../enum.c"
#line 234 "../enum.c"
puts(_("%s error: the keyword '%s' is ambiguous for %s\n"));
#line 108 "../find.c"
puts(_(" The following options match:\n"));
#line 290 "../find.c"
#line 293 "../find.c"
puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
#line 161 "../check.c"
puts(_("%s: Command line arguments required\n"));
#line 43 "../alias.c"
puts(_("%d %s%s options allowed\n"));
#line 81 "../makeshell.c"
#line 89 "../makeshell.c"
puts(_("%s error %d (%s) calling %s for '%s'\n"));
#line 293 "../makeshell.c"
#line 301 "../makeshell.c"
puts(_("interprocess pipe"));
#line 168 "../version.c"
puts(_("error: version option argument '%c' invalid. Use:\n"
@@ -670,48 +672,48 @@ ocpasswd --help for usage instructions.\n"));
"\t'n' - version and full copyright notice\n"));
#line 58 "../check.c"
puts(_("%s error: the '%s' and '%s' options conflict\n"));
#line 214 "../find.c"
#line 217 "../find.c"
puts(_("%s: The '%s' option has been disabled."));
#line 421 "../find.c"
#line 430 "../find.c"
puts(_("%s: The '%s' option has been disabled."));
#line 38 "../alias.c"
puts(_("-equivalence"));
#line 460 "../find.c"
#line 469 "../find.c"
puts(_("%s: illegal option -- %c\n"));
#line 110 "../reset.c"
puts(_("%s: illegal option -- %c\n"));
#line 268 "../find.c"
#line 271 "../find.c"
puts(_("%s: illegal option -- %s\n"));
#line 746 "../find.c"
#line 755 "../find.c"
puts(_("%s: illegal option -- %s\n"));
#line 118 "../reset.c"
puts(_("%s: illegal option -- %s\n"));
#line 332 "../find.c"
#line 335 "../find.c"
puts(_("%s: unknown vendor extension option -- %s\n"));
#line 154 "../enum.c"
#line 159 "../enum.c"
puts(_(" or an integer from %d through %d\n"));
#line 164 "../enum.c"
#line 169 "../enum.c"
puts(_(" or an integer from %d through %d\n"));
#line 782 "../usage.c"
#line 746 "../usage.c"
puts(_("%s error: invalid option descriptor for %s\n"));
#line 1110 "../usage.c"
#line 1080 "../usage.c"
puts(_("%s error: invalid option descriptor for %s\n"));
#line 379 "../find.c"
#line 385 "../find.c"
puts(_("%s: invalid option name: %s\n"));
#line 518 "../find.c"
#line 527 "../find.c"
puts(_("%s: The '%s' option requires an argument.\n"));
#line 171 "../autoopts.c"
#line 156 "../autoopts.c"
puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n"
"\t'%s' and '%s'."));
#line 94 "../check.c"
puts(_("%s error: The %s option is required\n"));
#line 623 "../find.c"
#line 632 "../find.c"
puts(_("%s: The '%s' option cannot have an argument.\n"));
#line 151 "../check.c"
puts(_("%s: Command line arguments are not allowed.\n"));
#line 531 "../save.c"
#line 535 "../save.c"
puts(_("error %d (%s) creating %s\n"));
#line 229 "../enum.c"
#line 234 "../enum.c"
puts(_("%s error: '%s' does not match any %s keywords.\n"));
#line 93 "../reset.c"
puts(_("%s error: The '%s' option requires an argument.\n"));
@@ -721,7 +723,7 @@ ocpasswd --help for usage instructions.\n"));
puts(_("error %d (%s) stat-ing %s\n"));
#line 143 "../restore.c"
puts(_("%s error: no saved option state\n"));
#line 246 "../autoopts.c"
#line 231 "../autoopts.c"
puts(_("'%s' is not a command line option.\n"));
#line 114 "../time.c"
puts(_("%s error: '%s' is not a recognizable date/time.\n"));
@@ -733,41 +735,41 @@ ocpasswd --help for usage instructions.\n"));
puts(_("%s error: The %s option must appear %d times.\n"));
#line 157 "../numeric.c"
puts(_("%s error: '%s' is not a recognizable number.\n"));
#line 195 "../enum.c"
#line 200 "../enum.c"
puts(_("%s error: %s exceeds %s keyword count\n"));
#line 366 "../usage.c"
#line 329 "../usage.c"
puts(_("Try '%s %s' for more information.\n"));
#line 45 "../alias.c"
puts(_("one %s%s option allowed\n"));
#line 195 "../makeshell.c"
#line 203 "../makeshell.c"
puts(_("standard output"));
#line 930 "../makeshell.c"
#line 938 "../makeshell.c"
puts(_("standard output"));
#line 304 "../usage.c"
#line 274 "../usage.c"
puts(_("standard output"));
#line 451 "../usage.c"
#line 414 "../usage.c"
puts(_("standard output"));
#line 660 "../usage.c"
#line 624 "../usage.c"
puts(_("standard output"));
#line 175 "../version.c"
puts(_("standard output"));
#line 304 "../usage.c"
#line 274 "../usage.c"
puts(_("standard error"));
#line 451 "../usage.c"
#line 414 "../usage.c"
puts(_("standard error"));
#line 660 "../usage.c"
#line 624 "../usage.c"
puts(_("standard error"));
#line 175 "../version.c"
puts(_("standard error"));
#line 195 "../makeshell.c"
#line 203 "../makeshell.c"
puts(_("write"));
#line 930 "../makeshell.c"
#line 938 "../makeshell.c"
puts(_("write"));
#line 303 "../usage.c"
#line 273 "../usage.c"
puts(_("write"));
#line 450 "../usage.c"
#line 413 "../usage.c"
puts(_("write"));
#line 659 "../usage.c"
#line 623 "../usage.c"
puts(_("write"));
#line 174 "../version.c"
puts(_("write"));
@@ -783,70 +785,70 @@ ocpasswd --help for usage instructions.\n"));
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 256 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 530 "../save.c"
#line 534 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
/* END-LIBOPTS-MESSAGES */
/* USAGE-TEXT: */
#line 908 "../usage.c"
puts(_("\t\t\t\t- an alternate for '%s'\n"));
#line 1177 "../usage.c"
puts(_("Version, usage and configuration options:"));
#line 959 "../usage.c"
puts(_("\t\t\t\t- default option for unnamed options\n"));
#line 872 "../usage.c"
puts(_("\t\t\t\t- an alternate for '%s'\n"));
#line 1147 "../usage.c"
puts(_("Version, usage and configuration options:"));
#line 923 "../usage.c"
puts(_("\t\t\t\t- default option for unnamed options\n"));
#line 836 "../usage.c"
puts(_("\t\t\t\t- disabled as '--%s'\n"));
#line 1146 "../usage.c"
#line 1116 "../usage.c"
puts(_(" --- %-14s %s\n"));
#line 1144 "../usage.c"
#line 1114 "../usage.c"
puts(_("This option has been disabled"));
#line 899 "../usage.c"
#line 863 "../usage.c"
puts(_("\t\t\t\t- enabled by default\n"));
#line 40 "../alias.c"
puts(_("%s error: only "));
#line 1221 "../usage.c"
#line 1193 "../usage.c"
puts(_(" - examining environment variables named %s_*\n"));
#line 168 "../file.c"
puts(_("\t\t\t\t- file must not pre-exist\n"));
#line 172 "../file.c"
puts(_("\t\t\t\t- file must pre-exist\n"));
#line 416 "../usage.c"
#line 379 "../usage.c"
puts(_("Options are specified by doubled hyphens and their name or by a single\n"
"hyphen and the flag character.\n"));
#line 908 "../makeshell.c"
#line 916 "../makeshell.c"
puts(_("\n"
"= = = = = = = =\n\n"
"This incarnation of genshell will produce\n"
"a shell script to parse the options for %s:\n\n"));
#line 161 "../enum.c"
#line 166 "../enum.c"
puts(_(" or an integer mask with any of the lower %d bits set\n"));
#line 932 "../usage.c"
#line 896 "../usage.c"
puts(_("\t\t\t\t- is a set membership option\n"));
#line 953 "../usage.c"
#line 917 "../usage.c"
puts(_("\t\t\t\t- must appear between %d and %d times\n"));
#line 418 "../usage.c"
#line 381 "../usage.c"
puts(_("Options are specified by single or double hyphens and their name.\n"));
#line 939 "../usage.c"
#line 903 "../usage.c"
puts(_("\t\t\t\t- may appear multiple times\n"));
#line 926 "../usage.c"
#line 890 "../usage.c"
puts(_("\t\t\t\t- may not be preset\n"));
#line 1336 "../usage.c"
#line 1308 "../usage.c"
puts(_(" Arg Option-Name Description\n"));
#line 1272 "../usage.c"
#line 1244 "../usage.c"
puts(_(" Flg Arg Option-Name Description\n"));
#line 1330 "../usage.c"
#line 1302 "../usage.c"
puts(_(" Flg Arg Option-Name Description\n"));
#line 1331 "../usage.c"
#line 1303 "../usage.c"
puts(_(" %3s %s"));
#line 1337 "../usage.c"
#line 1309 "../usage.c"
puts(_(" %3s %s"));
#line 423 "../usage.c"
#line 386 "../usage.c"
puts(_("The '-#<number>' option may omit the hash char\n"));
#line 419 "../usage.c"
#line 382 "../usage.c"
puts(_("All arguments are named options.\n"));
#line 1006 "../usage.c"
#line 970 "../usage.c"
puts(_(" - reading file %s"));
#line 445 "../usage.c"
#line 408 "../usage.c"
puts(_("\n"
"Please send bug reports to: <%s>\n"));
#line 100 "../version.c"
@@ -855,17 +857,17 @@ ocpasswd --help for usage instructions.\n"));
#line 129 "../version.c"
puts(_("\n"
"Please send bug reports to: <%s>\n"));
#line 938 "../usage.c"
#line 902 "../usage.c"
puts(_("\t\t\t\t- may NOT appear - preset only\n"));
#line 978 "../usage.c"
#line 943 "../usage.c"
puts(_("\n"
"The following option preset mechanisms are supported:\n"));
#line 1219 "../usage.c"
#line 1191 "../usage.c"
puts(_("\n"
"The following option preset mechanisms are supported:\n"));
#line 717 "../usage.c"
#line 681 "../usage.c"
puts(_("prohibits these options:\n"));
#line 712 "../usage.c"
#line 676 "../usage.c"
puts(_("prohibits the option '%s'\n"));
#line 81 "../numeric.c"
puts(_("%s%ld to %ld"));
@@ -883,28 +885,28 @@ ocpasswd --help for usage instructions.\n"));
puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
#line 77 "../numeric.c"
puts(_("%sless than or equal to %ld"));
#line 426 "../usage.c"
#line 389 "../usage.c"
puts(_("Operands and options may be intermixed. They will be reordered.\n"));
#line 687 "../usage.c"
#line 651 "../usage.c"
puts(_("requires the option '%s'\n"));
#line 690 "../usage.c"
#line 654 "../usage.c"
puts(_("requires these options:\n"));
#line 1348 "../usage.c"
#line 1320 "../usage.c"
puts(_(" Arg Option-Name Req? Description\n"));
#line 1342 "../usage.c"
#line 1314 "../usage.c"
puts(_(" Flg Arg Option-Name Req? Description\n"));
#line 162 "../enum.c"
#line 167 "../enum.c"
puts(_("or you may use a numeric representation. Preceding these with a '!'\n"
"will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
"will set them all. Multiple entries may be passed as an option\n"
"argument list.\n"));
#line 945 "../usage.c"
#line 909 "../usage.c"
puts(_("\t\t\t\t- may appear up to %d times\n"));
#line 72 "../enum.c"
#line 77 "../enum.c"
puts(_("The valid \"%s\" option keywords are:\n"));
#line 1181 "../usage.c"
#line 1151 "../usage.c"
puts(_("The next option supports vendor supported extra options:"));
#line 808 "../usage.c"
#line 772 "../usage.c"
puts(_("These additional options are:"));
/* END-USAGE-TEXT */
}

28
src/ocpasswd-args.h
View File

@@ -2,11 +2,11 @@
*
* DO NOT EDIT THIS FILE (ocpasswd-args.h)
*
* It has been AutoGen-ed August 1, 2013 at 05:50:01 PM by AutoGen 5.17.3
* It has been AutoGen-ed November 5, 2013 at 08:00:31 PM by AutoGen 5.18
* From the definitions ocpasswd-args.def
* and the template file options
*
* Generated from AutoOpts 38:0:13 templates.
* Generated from AutoOpts 40:0:15 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -55,7 +55,7 @@
* tolerable version is at least as old as what was current when the header
* template was released.
*/
#define AO_TEMPLATE_VERSION 155648
#define AO_TEMPLATE_VERSION 163840
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
@@ -77,9 +77,9 @@ typedef enum {
/** count of all options for ocpasswd */
#define OPTION_CT 7
/** ocpasswd version */
#define OCPASSWD_VERSION "0.1.5"
#define OCPASSWD_VERSION "0.2.0"
/** Full ocpasswd version text */
#define OCPASSWD_FULL_VERSION "ocpasswd 0.1.5"
#define OCPASSWD_FULL_VERSION "ocpasswd 0.2.0"
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
@@ -89,7 +89,7 @@ typedef enum {
#define DESC(n) (ocpasswdOptions.pOptDesc[INDEX_OPT_## n])
/** 'true' if an option has been specified in any way */
#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
/** The string argument to an option. The argument type must be "string". */
/** The string argument to an option. The argument type must be \"string\". */
#define OPT_ARG(n) (DESC(n).optArg.argString)
/** Mask the option state revealing how an option was specified.
* It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
@@ -116,18 +116,16 @@ typedef enum {
if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
DESC(n).fOptState |= OPTST_DISABLED; \
DESC(n).optCookie = NULL )
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Enumeration of ocpasswd exit codes
*/
typedef enum {
OCPASSWD_EXIT_SUCCESS = 0,
OCPASSWD_EXIT_FAILURE = 1,
OCPASSWD_EXIT_USAGE_ERROR = 64,
OCPASSWD_EXIT_LIBOPTS_FAILURE = 70
} ocpasswd_exit_code_t;
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
OCPASSWD_EXIT_SUCCESS = 0,
OCPASSWD_EXIT_FAILURE = 1,
OCPASSWD_EXIT_USAGE_ERROR = 64,
OCPASSWD_EXIT_LIBOPTS_FAILURE = 70
} ocpasswd_exit_code_t;
/**
* Interface defines for specific options.
* @{
@@ -149,10 +147,9 @@ typedef enum {
#define ERRSTOP_OPTERR STMTS(ocpasswdOptions.fOptSet |= OPTPROC_ERRSTOP)
#define RESTART_OPT(n) STMTS( \
ocpasswdOptions.curOptIdx = (n); \
ocpasswdOptions.pzCurOpt = NULL)
ocpasswdOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ocpasswdOptions.pUsageProc)(&ocpasswdOptions, c)
/* extracted from opthead.tlib near line 538 */
#ifdef __cplusplus
extern "C" {
@@ -207,4 +204,5 @@ static inline char* aoGetsText(char const* pz) {
}
#endif
#endif /* AUTOOPTS_OCPASSWD_ARGS_H_GUARD */
/* ocpasswd-args.h ends here */

537
src/ocserv-args.c
View File

@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
*
*
* DO NOT EDIT THIS FILE (ocserv-args.c)
*
* It has been AutoGen-ed November 3, 2013 at 05:05:30 PM by AutoGen 5.17
*
* It has been AutoGen-ed November 5, 2013 at 08:00:32 PM by AutoGen 5.18
* From the definitions ocserv-args.def
* and the template file options
*
* Generated from AutoOpts 37:0:12 templates.
* Generated from AutoOpts 40:0:15 templates.
*
* AutoOpts is a copyrighted work. This source file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,18 +21,18 @@
*
* Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.
* This is free software. It is licensed for use, modification and
* redistribution under the terms of the
* GNU General Public License, version 2 <http://gnu.org/licenses/gpl.html>
* redistribution under the terms of the GNU General Public License,
* version 2 <http://gnu.org/licenses/gpl.html>
*
* ocserv is free software: you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License,
* as published by the Free Software Foundation.
*
*
* ocserv is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License,
* version 2, along with this program.
* If not, see <http://www.gnu.org/licenses/>.
@@ -51,9 +51,6 @@
extern "C" {
#endif
extern FILE * option_usage_fp;
/* TRANSLATORS: choose the translation for option names wisely because you
cannot ever change your mind. */
#define zCopyright (ocserv_opt_strs+0)
#define zLicenseDescrip (ocserv_opt_strs+254)
@@ -62,15 +59,15 @@ extern FILE * option_usage_fp;
# define NULL 0
#endif
/*
* ocserv option static const strings
/**
* static const strings for ocserv options
*/
static char const ocserv_opt_strs[1582] =
static char const ocserv_opt_strs[1567] =
/* 0 */ "ocserv 0.2.0\n"
"Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.\n"
"This is free software. It is licensed for use, modification and\n"
"redistribution under the terms of the\n"
"GNU General Public License, version 2 <http://gnu.org/licenses/gpl.html>\n\0"
"redistribution under the terms of the GNU General Public License,\n"
"version 2 <http://gnu.org/licenses/gpl.html>\n\0"
/* 254 */ "ocserv is free software: you can redistribute it and/or modify it under the\n"
"terms of version 2 of the GNU General Public License, as published by the\n"
"Free Software Foundation.\n\n"
@@ -92,55 +89,70 @@ static char const ocserv_opt_strs[1582] =
/* 977 */ "Configuration file for the server\0"
/* 1011 */ "CONFIG\0"
/* 1018 */ "config\0"
/* 1025 */ "Display extended usage information and exit\0"
/* 1025 */ "display extended usage information and exit\0"
/* 1069 */ "help\0"
/* 1074 */ "Extended usage information passed thru pager\0"
/* 1074 */ "extended usage information passed thru pager\0"
/* 1119 */ "more-help\0"
/* 1129 */ "Output version information and exit\0"
/* 1129 */ "output version information and exit\0"
/* 1165 */ "version\0"
/* 1173 */ "OCSERV\0"
/* 1180 */ "ocserv - OpenConnect server - Ver. 0.2.0\n"
"USAGE: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 1279 */ "openconnect-devel@lists.infradead.org\0"
/* 1317 */ "\n\n\0"
/* 1320 */ "\n"
"Openconnect VPN server (ocserv) is a VPN server compatible with the\n"
/* 1180 */ "ocserv - OpenConnect server\n"
"Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
/* 1266 */ "openconnect-devel@lists.infradead.org\0"
/* 1304 */ "\n\0"
/* 1306 */ "Openconnect VPN server (ocserv) is a VPN server compatible with the\n"
"openconnect VPN client. It follows the AnyConnect VPN protocol which is\n"
"used by several CISCO routers.\n\0"
/* 1494 */ "ocserv 0.2.0\0"
/* 1507 */ "Usage: ocserv [options] -c [config]\n"
/* 1479 */ "ocserv 0.2.0\0"
/* 1492 */ "Usage: ocserv [options] -c [config]\n"
"ocserv --help for usage instructions.\n";
/*
/**
* foreground option description:
*/
/** Descriptive text for the foreground option */
#define FOREGROUND_DESC (ocserv_opt_strs+809)
/** Upper-cased name for the foreground option */
#define FOREGROUND_NAME (ocserv_opt_strs+837)
/** Name string for the foreground option */
#define FOREGROUND_name (ocserv_opt_strs+848)
/** Compiled in flag settings for the foreground option */
#define FOREGROUND_FLAGS (OPTST_DISABLED)
/*
/**
* tls-debug option description:
*/
/** Descriptive text for the tls-debug option */
#define TLS_DEBUG_DESC (ocserv_opt_strs+859)
/** Upper-cased name for the tls-debug option */
#define TLS_DEBUG_NAME (ocserv_opt_strs+900)
/** Name string for the tls-debug option */
#define TLS_DEBUG_name (ocserv_opt_strs+910)
/** Compiled in flag settings for the tls-debug option */
#define TLS_DEBUG_FLAGS (OPTST_DISABLED)
/*
/**
* debug option description:
*/
/** Descriptive text for the debug option */
#define DEBUG_DESC (ocserv_opt_strs+920)
/** Upper-cased name for the debug option */
#define DEBUG_NAME (ocserv_opt_strs+965)
/** Name string for the debug option */
#define DEBUG_name (ocserv_opt_strs+971)
/** Compiled in flag settings for the debug option */
#define DEBUG_FLAGS (OPTST_DISABLED)
/*
/**
* config option description:
*/
/** Descriptive text for the config option */
#define CONFIG_DESC (ocserv_opt_strs+977)
/** Upper-cased name for the config option */
#define CONFIG_NAME (ocserv_opt_strs+1011)
/** Name string for the config option */
#define CONFIG_name (ocserv_opt_strs+1018)
/** Compiled in flag settings for the config option */
#define CONFIG_FLAGS (OPTST_DISABLED \
| OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
@@ -154,8 +166,8 @@ static char const ocserv_opt_strs[1582] =
#define MORE_HELP_name (ocserv_opt_strs+1119)
#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
#else
#define MORE_HELP_DESC NULL
#define MORE_HELP_name NULL
#define MORE_HELP_DESC HELP_DESC
#define MORE_HELP_name HELP_name
#define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT)
#endif
#ifdef NO_OPTIONAL_OPT_ARGS
@@ -166,7 +178,7 @@ static char const ocserv_opt_strs[1582] =
#endif
#define VER_DESC (ocserv_opt_strs+1129)
#define VER_name (ocserv_opt_strs+1165)
/*
/**
* Declare option callback procedures
*/
extern tOptProc
@@ -237,7 +249,7 @@ static tOptDesc optDesc[OPTION_CT] = {
/* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_VERSION,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ VER_FLAGS, 0,
/* opt state flags */ VER_FLAGS, AOUSE_VERSION,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -251,7 +263,7 @@ static tOptDesc optDesc[OPTION_CT] = {
/* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_HELP,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0,
/* opt state flags */ OPTST_IMM | OPTST_NO_INIT, AOUSE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -263,7 +275,7 @@ static tOptDesc optDesc[OPTION_CT] = {
/* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_MORE_HELP,
/* equivalenced to */ NO_EQUIVALENT,
/* min, max, act ct */ 0, 1, 0,
/* opt state flags */ MORE_HELP_FLAGS, 0,
/* opt state flags */ MORE_HELP_FLAGS, AOUSE_MORE_HELP,
/* last opt argumnt */ { NULL },
/* arg list/cookie */ NULL,
/* must/cannot opts */ NULL, NULL,
@@ -273,19 +285,24 @@ static tOptDesc optDesc[OPTION_CT] = {
};
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
*
* Define the ocserv Option Environment
*/
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/** Reference to the upper cased version of ocserv. */
#define zPROGNAME (ocserv_opt_strs+1173)
/** Reference to the title line for ocserv usage. */
#define zUsageTitle (ocserv_opt_strs+1180)
/** There is no ocserv configuration file. */
#define zRcName NULL
/** There are no directories to search for ocserv config files. */
#define apzHomeList NULL
#define zBugsAddr (ocserv_opt_strs+1279)
#define zExplain (ocserv_opt_strs+1317)
#define zDetail (ocserv_opt_strs+1320)
#define zFullVersion (ocserv_opt_strs+1494)
/* extracted from optcode.tlib near line 353 */
/** The ocserv program bug email address. */
#define zBugsAddr (ocserv_opt_strs+1266)
/** Clarification/explanation of what ocserv does. */
#define zExplain (ocserv_opt_strs+1304)
/** Extra detail explaining what ocserv does. */
#define zDetail (ocserv_opt_strs+1306)
/** The full version string for ocserv. */
#define zFullVersion (ocserv_opt_strs+1479)
/* extracted from optcode.tlib near line 364 */
#if defined(ENABLE_NLS)
# define OPTPROC_BASE OPTPROC_TRANSLATE | OPTPROC_NXLAT_OPT
@@ -295,10 +312,8 @@ static tOptDesc optDesc[OPTION_CT] = {
# define translate_option_strings NULL
#endif /* ENABLE_NLS */
#define ocserv_full_usage (NULL)
#define ocserv_short_usage (ocserv_opt_strs+1507)
#define ocserv_short_usage (ocserv_opt_strs+1492)
#endif /* not defined __doxygen__ */
@@ -308,25 +323,27 @@ static tOptDesc optDesc[OPTION_CT] = {
/**
* The callout function that invokes the optionUsage function.
*
* @param pOptions the AutoOpts option description structure
* @param pOptDesc the descriptor for the "help" (usage) option.
* @param[in] opts the AutoOpts option description structure
* @param[in] od the descriptor for the "help" (usage) option.
* @noreturn
*/
static void
doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
doUsageOpt(tOptions * opts, tOptDesc * od)
{
optionUsage(&ocservOptions, OCSERV_EXIT_SUCCESS);
int ex_code;
ex_code = OCSERV_EXIT_SUCCESS;
optionUsage(&ocservOptions, ex_code);
/* NOTREACHED */
(void)pOptDesc;
(void)pOptions;
(void)opts;
(void)od;
}
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Code to handle the config option.
*
* @param pOptions the ocserv options data structure
* @param pOptDesc the option descriptor for this option.
* @param[in] pOptions the ocserv options data structure
* @param[in,out] pOptDesc the option descriptor for this option.
*/
static void
doOptConfig(tOptions* pOptions, tOptDesc* pOptDesc)
@@ -344,7 +361,7 @@ doOptConfig(tOptions* pOptions, tOptDesc* pOptDesc)
*/
optionFileCheck(pOptions, pOptDesc, type, mode);
}
/* extracted from optmain.tlib near line 1188 */
/* extracted from optmain.tlib near line 1266 */
/**
* The directory containing the data associated with ocserv.
@@ -360,6 +377,7 @@ doOptConfig(tOptions* pOptions, tOptDesc* pOptDesc)
#ifndef WITH_PACKAGER
# define ocserv_packager_info NULL
#else
/** Packager information for ocserv. */
static char const ocserv_packager_info[] =
"Packaged by " WITH_PACKAGER
@@ -414,6 +432,11 @@ tOptions ocservOptions = {
};
#if ENABLE_NLS
/**
* This code is designed to translate translatable option text for the
* ocserv program. These translations happen upon entry
* to optionProcess().
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -492,9 +515,8 @@ translate_option_strings(void)
* Do the translations. The first pointer follows the field count
* field. The field count field is the size of a pointer.
*/
tOptDesc * od = opts->pOptDesc;
char ** ppz = (char**)(void*)&(option_xlateable_txt);
int ix = option_xlateable_txt.field_ct;
char ** ppz = (char**)(void*)&(option_xlateable_txt);
int ix = option_xlateable_txt.field_ct;
do {
ppz++; /* skip over field_ct */
@@ -509,28 +531,387 @@ translate_option_strings(void)
coerce_it((void*)&(opts->pzUsageTitle));
coerce_it((void*)&(opts->pzExplain));
coerce_it((void*)&(opts->pzDetail));
coerce_it((void*)&(opts->pzPackager));
coerce_it((void*)&(opts->pzShortUsage));
for (ix = opts->optCt; ix > 0; ix--, od++)
coerce_it((void*)&(od->pzText));
}
if ((opts->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) {
tOptDesc * od = opts->pOptDesc;
int ix;
for (ix = opts->optCt; ix > 0; ix--, od++) {
coerce_it((void*)&(od->pz_Name));
coerce_it((void*)&(od->pz_DisableName));
coerce_it((void*)&(od->pz_DisablePfx));
{
tOptDesc * od = opts->pOptDesc;
for (ix = opts->optCt; ix > 0; ix--, od++)
coerce_it((void*)&(od->pzText));
}
ocservOptions.fOptSet |= OPTPROC_NXLAT_OPT_CFG | OPTPROC_NXLAT_OPT;
}
}
#endif /* ENABLE_NLS */
#ifdef DO_NOT_COMPILE_THIS_CODE_IT_IS_FOR_GETTEXT
/** I18N function strictly for xgettext. Do not compile. */
static void bogus_function(void) {
/* TRANSLATORS:
The following dummy function was crated solely so that xgettext can
extract the correct strings. These strings are actually referenced
by a field name in the ocservOptions structure noted in the
comments below. The literal text is defined in ocserv_opt_strs.
NOTE: the strings below are segmented with respect to the source string
ocserv_opt_strs. The strings above are handed off for translation
at run time a paragraph at a time. Consequently, they are presented here
for translation a paragraph at a time.
ALSO: often the description for an option will reference another option
by name. These are set off with apostrophe quotes (I hope). Do not
translate option names.
*/
/* referenced via ocservOptions.pzCopyright */
puts(_("ocserv 0.2.0\n\
Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.\n\
This is free software. It is licensed for use, modification and\n\
redistribution under the terms of the GNU General Public License,\n\
version 2 <http://gnu.org/licenses/gpl.html>\n"));
/* referenced via ocservOptions.pzCopyNotice */
puts(_("ocserv is free software: you can redistribute it and/or modify it under the\n\
terms of version 2 of the GNU General Public License, as published by the\n\
Free Software Foundation.\n\n"));
puts(_("ocserv is distributed in the hope that it will be useful, but WITHOUT ANY\n\
WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS\n\
FOR A PARTICULAR PURPOSE. See the GNU General Public License for more\n\
details.\n\n"));
puts(_("You should have received a copy of the GNU General Public License, version\n\
2, along with this program. If not, see <http://www.gnu.org/licenses/>.\n"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("Do not fork into background"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("Enable verbose TLS debugging information"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("Enable verbose network debugging information"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("Configuration file for the server"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("display extended usage information and exit"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("extended usage information passed thru pager"));
/* referenced via ocservOptions.pOptDesc->pzText */
puts(_("output version information and exit"));
/* referenced via ocservOptions.pzUsageTitle */
puts(_("ocserv - OpenConnect server\n\
Usage: %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n"));
/* referenced via ocservOptions.pzExplain */
puts(_("\n"));
/* referenced via ocservOptions.pzDetail */
puts(_("Openconnect VPN server (ocserv) is a VPN server compatible with the\n\
openconnect VPN client. It follows the AnyConnect VPN protocol which is\n\
used by several CISCO routers.\n"));
/* referenced via ocservOptions.pzFullVersion */
puts(_("ocserv 0.2.0"));
/* referenced via ocservOptions.pzFullUsage */
puts(_("<<<NOT-FOUND>>>"));
/* referenced via ocservOptions.pzShortUsage */
puts(_("Usage: ocserv [options] -c [config]\n\
ocserv --help for usage instructions.\n"));
/* LIBOPTS-MESSAGES: */
#line 67 "../autoopts.c"
puts(_("allocation of %d bytes failed\n"));
#line 93 "../autoopts.c"
puts(_("allocation of %d bytes failed\n"));
#line 53 "../init.c"
puts(_("AutoOpts function called without option descriptor\n"));
#line 90 "../init.c"
puts(_("\tThis exceeds the compiled library version: "));
#line 88 "../init.c"
puts(_("Automated Options Processing Error!\n"
"\t%s called AutoOpts function with structure version %d:%d:%d.\n"));
#line 80 "../autoopts.c"
puts(_("realloc of %d bytes at 0x%p failed\n"));
#line 92 "../init.c"
puts(_("\tThis is less than the minimum library version: "));
#line 121 "../version.c"
puts(_("Automated Options version %s\n"
"\tCopyright (C) 1999-2013 by Bruce Korb - all rights reserved\n"));
#line 82 "../makeshell.c"
puts(_("(AutoOpts bug): %s.\n"));
#line 90 "../reset.c"
puts(_("optionResetOpt() called, but reset-option not configured"));
#line 292 "../usage.c"
puts(_("could not locate the 'help' option"));
#line 336 "../autoopts.c"
puts(_("optionProcess() was called with invalid data"));
#line 747 "../usage.c"
puts(_("invalid argument type specified"));
#line 598 "../find.c"
puts(_("defaulted to option with optional arg"));
#line 76 "../alias.c"
puts(_("aliasing option is out of range."));
#line 234 "../enum.c"
puts(_("%s error: the keyword '%s' is ambiguous for %s\n"));
#line 108 "../find.c"
puts(_(" The following options match:\n"));
#line 293 "../find.c"
puts(_("%s: ambiguous option name: %s (matches %d options)\n"));
#line 161 "../check.c"
puts(_("%s: Command line arguments required\n"));
#line 43 "../alias.c"
puts(_("%d %s%s options allowed\n"));
#line 89 "../makeshell.c"
puts(_("%s error %d (%s) calling %s for '%s'\n"));
#line 301 "../makeshell.c"
puts(_("interprocess pipe"));
#line 168 "../version.c"
puts(_("error: version option argument '%c' invalid. Use:\n"
"\t'v' - version only\n"
"\t'c' - version and copyright\n"
"\t'n' - version and full copyright notice\n"));
#line 58 "../check.c"
puts(_("%s error: the '%s' and '%s' options conflict\n"));
#line 217 "../find.c"
puts(_("%s: The '%s' option has been disabled."));
#line 430 "../find.c"
puts(_("%s: The '%s' option has been disabled."));
#line 38 "../alias.c"
puts(_("-equivalence"));
#line 469 "../find.c"
puts(_("%s: illegal option -- %c\n"));
#line 110 "../reset.c"
puts(_("%s: illegal option -- %c\n"));
#line 271 "../find.c"
puts(_("%s: illegal option -- %s\n"));
#line 755 "../find.c"
puts(_("%s: illegal option -- %s\n"));
#line 118 "../reset.c"
puts(_("%s: illegal option -- %s\n"));
#line 335 "../find.c"
puts(_("%s: unknown vendor extension option -- %s\n"));
#line 159 "../enum.c"
puts(_(" or an integer from %d through %d\n"));
#line 169 "../enum.c"
puts(_(" or an integer from %d through %d\n"));
#line 746 "../usage.c"
puts(_("%s error: invalid option descriptor for %s\n"));
#line 1080 "../usage.c"
puts(_("%s error: invalid option descriptor for %s\n"));
#line 385 "../find.c"
puts(_("%s: invalid option name: %s\n"));
#line 527 "../find.c"
puts(_("%s: The '%s' option requires an argument.\n"));
#line 156 "../autoopts.c"
puts(_("(AutoOpts bug): Equivalenced option '%s' was equivalenced to both\n"
"\t'%s' and '%s'."));
#line 94 "../check.c"
puts(_("%s error: The %s option is required\n"));
#line 632 "../find.c"
puts(_("%s: The '%s' option cannot have an argument.\n"));
#line 151 "../check.c"
puts(_("%s: Command line arguments are not allowed.\n"));
#line 535 "../save.c"
puts(_("error %d (%s) creating %s\n"));
#line 234 "../enum.c"
puts(_("%s error: '%s' does not match any %s keywords.\n"));
#line 93 "../reset.c"
puts(_("%s error: The '%s' option requires an argument.\n"));
#line 184 "../save.c"
puts(_("error %d (%s) stat-ing %s\n"));
#line 238 "../save.c"
puts(_("error %d (%s) stat-ing %s\n"));
#line 143 "../restore.c"
puts(_("%s error: no saved option state\n"));
#line 231 "../autoopts.c"
puts(_("'%s' is not a command line option.\n"));
#line 114 "../time.c"
puts(_("%s error: '%s' is not a recognizable date/time.\n"));
#line 132 "../save.c"
puts(_("'%s' not defined\n"));
#line 53 "../time.c"
puts(_("%s error: '%s' is not a recognizable time duration.\n"));
#line 92 "../check.c"
puts(_("%s error: The %s option must appear %d times.\n"));
#line 157 "../numeric.c"
puts(_("%s error: '%s' is not a recognizable number.\n"));
#line 200 "../enum.c"
puts(_("%s error: %s exceeds %s keyword count\n"));
#line 329 "../usage.c"
puts(_("Try '%s %s' for more information.\n"));
#line 45 "../alias.c"
puts(_("one %s%s option allowed\n"));
#line 203 "../makeshell.c"
puts(_("standard output"));
#line 938 "../makeshell.c"
puts(_("standard output"));
#line 274 "../usage.c"
puts(_("standard output"));
#line 414 "../usage.c"
puts(_("standard output"));
#line 624 "../usage.c"
puts(_("standard output"));
#line 175 "../version.c"
puts(_("standard output"));
#line 274 "../usage.c"
puts(_("standard error"));
#line 414 "../usage.c"
puts(_("standard error"));
#line 624 "../usage.c"
puts(_("standard error"));
#line 175 "../version.c"
puts(_("standard error"));
#line 203 "../makeshell.c"
puts(_("write"));
#line 938 "../makeshell.c"
puts(_("write"));
#line 273 "../usage.c"
puts(_("write"));
#line 413 "../usage.c"
puts(_("write"));
#line 623 "../usage.c"
puts(_("write"));
#line 174 "../version.c"
puts(_("write"));
#line 60 "../numeric.c"
puts(_("%s error: %s option value %ld is out of range.\n"));
#line 44 "../check.c"
puts(_("%s error: %s option requires the %s option\n"));
#line 131 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 183 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 237 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 256 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
#line 534 "../save.c"
puts(_("%s warning: cannot save options - %s not regular file\n"));
/* END-LIBOPTS-MESSAGES */
/* USAGE-TEXT: */
#line 872 "../usage.c"
puts(_("\t\t\t\t- an alternate for '%s'\n"));
#line 1147 "../usage.c"
puts(_("Version, usage and configuration options:"));
#line 923 "../usage.c"
puts(_("\t\t\t\t- default option for unnamed options\n"));
#line 836 "../usage.c"
puts(_("\t\t\t\t- disabled as '--%s'\n"));
#line 1116 "../usage.c"
puts(_(" --- %-14s %s\n"));
#line 1114 "../usage.c"
puts(_("This option has been disabled"));
#line 863 "../usage.c"
puts(_("\t\t\t\t- enabled by default\n"));
#line 40 "../alias.c"
puts(_("%s error: only "));
#line 1193 "../usage.c"
puts(_(" - examining environment variables named %s_*\n"));
#line 168 "../file.c"
puts(_("\t\t\t\t- file must not pre-exist\n"));
#line 172 "../file.c"
puts(_("\t\t\t\t- file must pre-exist\n"));
#line 379 "../usage.c"
puts(_("Options are specified by doubled hyphens and their name or by a single\n"
"hyphen and the flag character.\n"));
#line 916 "../makeshell.c"
puts(_("\n"
"= = = = = = = =\n\n"
"This incarnation of genshell will produce\n"
"a shell script to parse the options for %s:\n\n"));
#line 166 "../enum.c"
puts(_(" or an integer mask with any of the lower %d bits set\n"));
#line 896 "../usage.c"
puts(_("\t\t\t\t- is a set membership option\n"));
#line 917 "../usage.c"
puts(_("\t\t\t\t- must appear between %d and %d times\n"));
#line 381 "../usage.c"
puts(_("Options are specified by single or double hyphens and their name.\n"));
#line 903 "../usage.c"
puts(_("\t\t\t\t- may appear multiple times\n"));
#line 890 "../usage.c"
puts(_("\t\t\t\t- may not be preset\n"));
#line 1308 "../usage.c"
puts(_(" Arg Option-Name Description\n"));
#line 1244 "../usage.c"
puts(_(" Flg Arg Option-Name Description\n"));
#line 1302 "../usage.c"
puts(_(" Flg Arg Option-Name Description\n"));
#line 1303 "../usage.c"
puts(_(" %3s %s"));
#line 1309 "../usage.c"
puts(_(" %3s %s"));
#line 386 "../usage.c"
puts(_("The '-#<number>' option may omit the hash char\n"));
#line 382 "../usage.c"
puts(_("All arguments are named options.\n"));
#line 970 "../usage.c"
puts(_(" - reading file %s"));
#line 408 "../usage.c"
puts(_("\n"
"Please send bug reports to: <%s>\n"));
#line 100 "../version.c"
puts(_("\n"
"Please send bug reports to: <%s>\n"));
#line 129 "../version.c"
puts(_("\n"
"Please send bug reports to: <%s>\n"));
#line 902 "../usage.c"
puts(_("\t\t\t\t- may NOT appear - preset only\n"));
#line 943 "../usage.c"
puts(_("\n"
"The following option preset mechanisms are supported:\n"));
#line 1191 "../usage.c"
puts(_("\n"
"The following option preset mechanisms are supported:\n"));
#line 681 "../usage.c"
puts(_("prohibits these options:\n"));
#line 676 "../usage.c"
puts(_("prohibits the option '%s'\n"));
#line 81 "../numeric.c"
puts(_("%s%ld to %ld"));
#line 79 "../numeric.c"
puts(_("%sgreater than or equal to %ld"));
#line 75 "../numeric.c"
puts(_("%s%ld exactly"));
#line 68 "../numeric.c"
puts(_("%sit must lie in one of the ranges:\n"));
#line 68 "../numeric.c"
puts(_("%sit must be in the range:\n"));
#line 88 "../numeric.c"
puts(_(", or\n"));
#line 66 "../numeric.c"
puts(_("%sis scalable with a suffix: k/K/m/M/g/G/t/T\n"));
#line 77 "../numeric.c"
puts(_("%sless than or equal to %ld"));
#line 389 "../usage.c"
puts(_("Operands and options may be intermixed. They will be reordered.\n"));
#line 651 "../usage.c"
puts(_("requires the option '%s'\n"));
#line 654 "../usage.c"
puts(_("requires these options:\n"));
#line 1320 "../usage.c"
puts(_(" Arg Option-Name Req? Description\n"));
#line 1314 "../usage.c"
puts(_(" Flg Arg Option-Name Req? Description\n"));
#line 167 "../enum.c"
puts(_("or you may use a numeric representation. Preceding these with a '!'\n"
"will clear the bits, specifying 'none' will clear all bits, and 'all'\n"
"will set them all. Multiple entries may be passed as an option\n"
"argument list.\n"));
#line 909 "../usage.c"
puts(_("\t\t\t\t- may appear up to %d times\n"));
#line 77 "../enum.c"
puts(_("The valid \"%s\" option keywords are:\n"));
#line 1151 "../usage.c"
puts(_("The next option supports vendor supported extra options:"));
#line 772 "../usage.c"
puts(_("These additional options are:"));
/* END-USAGE-TEXT */
}
#endif /* uncompilable code */
#ifdef __cplusplus
}
#endif

73
src/ocserv-args.h
View File

@@ -1,12 +1,12 @@
/* -*- buffer-read-only: t -*- vi: set ro:
*
*
* DO NOT EDIT THIS FILE (ocserv-args.h)
*
* It has been AutoGen-ed November 3, 2013 at 05:05:30 PM by AutoGen 5.17
*
* It has been AutoGen-ed November 5, 2013 at 08:00:32 PM by AutoGen 5.18
* From the definitions ocserv-args.def
* and the template file options
*
* Generated from AutoOpts 37:0:12 templates.
* Generated from AutoOpts 40:0:15 templates.
*
* AutoOpts is a copyrighted work. This header file is not encumbered
* by AutoOpts licensing, but is provided under the licensing terms chosen
@@ -21,23 +21,23 @@
*
* Copyright (C) 2013 Nikos Mavrogiannopoulos, all rights reserved.
* This is free software. It is licensed for use, modification and
* redistribution under the terms of the
* GNU General Public License, version 2 <http://gnu.org/licenses/gpl.html>
* redistribution under the terms of the GNU General Public License,
* version 2 <http://gnu.org/licenses/gpl.html>
*
* ocserv is free software: you can redistribute it and/or modify it
* under the terms of version 2 of the GNU General Public License,
* as published by the Free Software Foundation.
*
*
* ocserv is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
* See the GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License,
* version 2, along with this program.
* If not, see <http://www.gnu.org/licenses/>.
*/
/*
/**
* This file contains the programmatic interface to the Automated
* Options generated for the ocserv program.
* These macros are documented in the AutoGen info file in the
@@ -48,22 +48,22 @@
#include "config.h"
#include <autoopts/options.h>
/*
/**
* Ensure that the library used for compiling this generated header is at
* least as new as the version current when the header template was released
* (not counting patch version increments). Also ensure that the oldest
* tolerable version is at least as old as what was current when the header
* template was released.
*/
#define AO_TEMPLATE_VERSION 151552
#define AO_TEMPLATE_VERSION 163840
#if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
|| (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
# error option template version mismatches autoopts/options.h header
Choke Me.
#endif
/*
* Enumeration of each option:
/**
* Enumeration of each option type for ocserv
*/
typedef enum {
INDEX_OPT_FOREGROUND = 0,
@@ -74,52 +74,71 @@ typedef enum {
INDEX_OPT_HELP = 5,
INDEX_OPT_MORE_HELP = 6
} teOptIndex;
/** count of all options for ocserv */
#define OPTION_CT 7
/** ocserv version */
#define OCSERV_VERSION "0.2.0"
/** Full ocserv version text */
#define OCSERV_FULL_VERSION "ocserv 0.2.0"
/*
/**
* Interface defines for all options. Replace "n" with the UPPER_CASED
* option name (as in the teOptIndex enumeration above).
* e.g. HAVE_OPT(FOREGROUND)
*/
#define DESC(n) (ocservOptions.pOptDesc[INDEX_OPT_## n])
/** 'true' if an option has been specified in any way */
#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n)))
/** The string argument to an option. The argument type must be \"string\". */
#define OPT_ARG(n) (DESC(n).optArg.argString)
/** Mask the option state revealing how an option was specified.
* It will be one and only one of \a OPTST_SET, \a OPTST_PRESET,
* \a OPTST_DEFINED, \a OPTST_RESET or zero.
*/
#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK)
/** Count of option's occurrances *on the command line*. */
#define COUNT_OPT(n) (DESC(n).optOccCt)
/** mask of \a OPTST_SET and \a OPTST_DEFINED. */
#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n)))
/** 'true' if \a HAVE_OPT would yield 'false'. */
#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n)))
/** 'true' if OPTST_DISABLED bit not set. */
#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n)))
/** number of stacked option arguments.
* Valid only for stacked option arguments. */
#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt)
/** stacked argument vector.
* Valid only for stacked option arguments. */
#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs)
/** Reset an option. */
#define CLEAR_OPT(n) STMTS( \
DESC(n).fOptState &= OPTST_PERSISTENT_MASK; \
if ((DESC(n).fOptState & OPTST_INITENABLED) == 0) \
DESC(n).fOptState |= OPTST_DISABLED; \
DESC(n).optCookie = NULL )
/* * * * * *
*
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
/**
* Enumeration of ocserv exit codes
*/
typedef enum {
OCSERV_EXIT_SUCCESS = 0,
OCSERV_EXIT_FAILURE = 1,
OCSERV_EXIT_USAGE_ERROR = 64,
OCSERV_EXIT_LIBOPTS_FAILURE = 70
} ocserv_exit_code_t;
/* * * * * *
*
OCSERV_EXIT_SUCCESS = 0,
OCSERV_EXIT_FAILURE = 1,
OCSERV_EXIT_USAGE_ERROR = 64,
OCSERV_EXIT_LIBOPTS_FAILURE = 70
} ocserv_exit_code_t;
/**
* Interface defines for specific options.
* @{
*/
#define VALUE_OPT_FOREGROUND 'f'
#define VALUE_OPT_TLS_DEBUG 1
#define VALUE_OPT_DEBUG 'd'
#define VALUE_OPT_CONFIG 'c'
/** option flag (value) for " (get "val-name") " option */
#define VALUE_OPT_HELP 'h'
/** option flag (value) for " (get "val-name") " option */
#define VALUE_OPT_MORE_HELP '!'
/** option flag (value) for " (get "val-name") " option */
#define VALUE_OPT_VERSION 'v'
/*
* Interface defines not associated with particular options
@@ -128,10 +147,9 @@ typedef enum {
#define ERRSTOP_OPTERR STMTS(ocservOptions.fOptSet |= OPTPROC_ERRSTOP)
#define RESTART_OPT(n) STMTS( \
ocservOptions.curOptIdx = (n); \
ocservOptions.pzCurOpt = NULL)
ocservOptions.pzCurOpt = NULL )
#define START_OPT RESTART_OPT(1)
#define USAGE(c) (*ocservOptions.pUsageProc)(&ocservOptions, c)
/* extracted from opthead.tlib near line 497 */
#ifdef __cplusplus
extern "C" {
@@ -186,4 +204,5 @@ static inline char* aoGetsText(char const* pz) {
}
#endif
#endif /* AUTOOPTS_OCSERV_ARGS_H_GUARD */
/* ocserv-args.h ends here */