diff options
Diffstat (limited to 'src/libstrongswan/settings.h')
| -rw-r--r-- | src/libstrongswan/settings.h | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/src/libstrongswan/settings.h b/src/libstrongswan/settings.h index bc3df3706..9da217630 100644 --- a/src/libstrongswan/settings.h +++ b/src/libstrongswan/settings.h @@ -1,5 +1,8 @@ /* +<<<<<<< HEAD +======= * Copyright (C) 2010 Tobias Brunner +>>>>>>> upstream/4.5.1 * Copyright (C) 2008 Martin Willi * Hochschule fuer Technik Rapperswil * @@ -28,6 +31,16 @@ typedef struct settings_t settings_t; #include "utils/enumerator.h" /** +<<<<<<< HEAD + * Generic configuration options read from a config file. + * + * The syntax is quite simple: + * + * settings := (section|keyvalue)* + * section := name { settings } + * keyvalue := key = value\n + * +======= * Convert a string value returned by a key/value enumerator to a boolean. * * @see settings_t.create_key_value_enumerator() @@ -76,6 +89,7 @@ u_int32_t settings_value_as_time(char *value, u_int32_t def); * section := name { settings } * keyvalue := key = value\n * @endcode +>>>>>>> upstream/4.5.1 * E.g.: * @code a = b @@ -95,6 +109,8 @@ u_int32_t settings_value_as_time(char *value, u_int32_t def); * * Currently only a limited set of printf format specifiers are supported * (namely %s, %d and %N, see implementation for details). +<<<<<<< HEAD +======= * * \section includes Including other files * Other files can be included, using the include statement e.g. @@ -140,6 +156,7 @@ u_int32_t settings_value_as_time(char *value, u_int32_t def); section-two { } @endcode +>>>>>>> upstream/4.5.1 */ struct settings_t { @@ -194,6 +211,8 @@ struct settings_t { u_int32_t (*get_time)(settings_t *this, char *key, u_int32_t def, ...); /** +<<<<<<< HEAD +======= * Set a string value. * * @param key key including sections, printf style format @@ -239,6 +258,7 @@ struct settings_t { void (*set_time)(settings_t *this, char *key, u_int32_t value, ...); /** +>>>>>>> upstream/4.5.1 * Create an enumerator over subsection names of a section. * * @param section section including parents, printf style format @@ -252,13 +272,19 @@ struct settings_t { * Create an enumerator over key/value pairs in a section. * * @param section section name to list key/value pairs of, printf style +<<<<<<< HEAD + * @param ... argmuent list for section +======= * @param ... argument list for section +>>>>>>> upstream/4.5.1 * @return enumerator over (char *key, char *value) */ enumerator_t* (*create_key_value_enumerator)(settings_t *this, char *section, ...); /** +<<<<<<< HEAD +======= * Load settings from the files matching the given pattern. * * Existing sections are extended, existing values replaced, by those found @@ -293,6 +319,7 @@ struct settings_t { char *section, ...); /** +>>>>>>> upstream/4.5.1 * Destroy a settings instance. */ void (*destroy)(settings_t *this); |