Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: rename tls_mode into tls

This commit is contained in:
Dmitry Simonenko 2017-06-24 16:04:20 +03:00
parent 2dcc2e55ef
commit 08c22a085d
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
odissey.conf
View File

@ -21,7 +21,7 @@ listen {
nodelay yes
# backlog 16
# keepalive 7200
tls_mode "disable"
tls "disable"
# tls_cert_file ""
# tls_key_file ""
# tls_ca_file ""
@ -32,7 +32,7 @@ storage "pg_server" {
type "remote"
host "127.0.0.1"
port 5432
tls_mode "disable"
tls "disable"
# tls_ca_file ""
# tls_key_file ""
# tls_cert_file ""

14
src/od_config.c
View File

@ -58,7 +58,7 @@ static od_keyword_t od_config_keywords[] =
od_keyword("pipelining", OD_LPIPELINING),
od_keyword("workers", OD_LWORKERS),
od_keyword("client_max", OD_LCLIENT_MAX),
od_keyword("tls_mode", OD_LTLS_MODE),
od_keyword("tls", OD_LTLS),
od_keyword("tls_ca_file", OD_LTLS_CA_FILE),
od_keyword("tls_key_file", OD_LTLS_KEY_FILE),
od_keyword("tls_cert_file", OD_LTLS_CERT_FILE),
@ -231,11 +231,11 @@ od_config_parse_listen(od_config_t *config)
return -1;
config->scheme->keepalive = tk->v.num;
continue;
/* tls_mode */
case OD_LTLS_MODE:
/* tls */
case OD_LTLS:
if (od_config_next(config, OD_LSTRING, &tk) == -1)
return -1;
config->scheme->tls_mode = tk->v.string;
config->scheme->tls = tk->v.string;
continue;
/* tls_ca_file */
case OD_LTLS_CA_FILE:
@ -313,11 +313,11 @@ od_config_parse_storage(od_config_t *config)
return -1;
storage->port = tk->v.num;
continue;
/* tls_mode */
case OD_LTLS_MODE:
/* tls */
case OD_LTLS:
if (od_config_next(config, OD_LSTRING, &tk) == -1)
return -1;
storage->tls_mode = tk->v.string;
storage->tls = tk->v.string;
continue;
/* tls_ca_file */
case OD_LTLS_CA_FILE:

2
src/od_config.h
View File

@ -32,7 +32,7 @@ enum
OD_LPIPELINING,
OD_LWORKERS,
OD_LCLIENT_MAX,
OD_LTLS_MODE,
OD_LTLS,
OD_LTLS_CA_FILE,
OD_LTLS_KEY_FILE,
OD_LTLS_CERT_FILE,

42
src/od_scheme.c
View File

@ -44,7 +44,7 @@ void od_scheme_init(od_scheme_t *scheme)
scheme->client_max_set = 0;
scheme->client_max = 0;
scheme->tls_verify = OD_TDISABLE;
scheme->tls_mode = NULL;
scheme->tls = NULL;
scheme->tls_ca_file = NULL;
scheme->tls_key_file = NULL;
scheme->tls_cert_file = NULL;
@ -189,20 +189,20 @@ int od_scheme_validate(od_scheme_t *scheme, od_log_t *log)
scheme->host = "*";
/* tls */
if (scheme->tls_mode) {
if (strcmp(scheme->tls_mode, "disable") == 0) {
if (scheme->tls) {
if (strcmp(scheme->tls, "disable") == 0) {
scheme->tls_verify = OD_TDISABLE;
} else
if (strcmp(scheme->tls_mode, "allow") == 0) {
if (strcmp(scheme->tls, "allow") == 0) {
scheme->tls_verify = OD_TALLOW;
} else
if (strcmp(scheme->tls_mode, "require") == 0) {
if (strcmp(scheme->tls, "require") == 0) {
scheme->tls_verify = OD_TREQUIRE;
} else
if (strcmp(scheme->tls_mode, "verify_ca") == 0) {
if (strcmp(scheme->tls, "verify_ca") == 0) {
scheme->tls_verify = OD_TVERIFY_CA;
} else
if (strcmp(scheme->tls_mode, "verify_full") == 0) {
if (strcmp(scheme->tls, "verify_full") == 0) {
scheme->tls_verify = OD_TVERIFY_FULL;
} else {
od_error(log, "config", "unknown tls mode");
@ -238,20 +238,20 @@ int od_scheme_validate(od_scheme_t *scheme, od_log_t *log)
storage->name);
return -1;
}
if (storage->tls_mode) {
if (strcmp(storage->tls_mode, "disable") == 0) {
if (storage->tls) {
if (strcmp(storage->tls, "disable") == 0) {
storage->tls_verify = OD_TDISABLE;
} else
if (strcmp(storage->tls_mode, "allow") == 0) {
if (strcmp(storage->tls, "allow") == 0) {
storage->tls_verify = OD_TALLOW;
} else
if (strcmp(storage->tls_mode, "require") == 0) {
if (strcmp(storage->tls, "require") == 0) {
storage->tls_verify = OD_TREQUIRE;
} else
if (strcmp(storage->tls_mode, "verify_ca") == 0) {
if (strcmp(storage->tls, "verify_ca") == 0) {
storage->tls_verify = OD_TVERIFY_CA;
} else
if (strcmp(storage->tls_mode, "verify_full") == 0) {
if (strcmp(storage->tls, "verify_full") == 0) {
storage->tls_verify = OD_TVERIFY_FULL;
} else {
od_error(log, "config", "unknown storage tls mode");
@ -399,16 +399,16 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
od_log(log, " backlog %d", scheme->backlog);
od_log(log, " nodelay %d", scheme->nodelay);
od_log(log, " keepalive %d", scheme->keepalive);
if (scheme->tls_mode)
od_log(log, " tls_mode %s", scheme->tls_mode);
if (scheme->tls)
od_log(log, " tls %s", scheme->tls);
if (scheme->tls_ca_file)
od_log(log, " tls_ca_file %s", scheme->tls_ca_file);
od_log(log, " tls_ca_file %s", scheme->tls_ca_file);
if (scheme->tls_key_file)
od_log(log, " tls_key_file %s", scheme->tls_key_file);
od_log(log, " tls_key_file %s", scheme->tls_key_file);
if (scheme->tls_cert_file)
od_log(log, " tls_cert_file %s", scheme->tls_cert_file);
od_log(log, " tls_cert_file %s", scheme->tls_cert_file);
if (scheme->tls_protocols)
od_log(log, " tls_protocols %s", scheme->tls_protocols);
od_log(log, " tls_protocols %s", scheme->tls_protocols);
od_log(log, "");
od_list_t *i;
@ -422,8 +422,8 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
od_log(log, " type %s", storage->type);
od_log(log, " host %s", storage->host);
od_log(log, " port %d", storage->port);
if (storage->tls_mode)
od_log(log, " tls_mode %s", storage->tls_mode);
if (storage->tls)
od_log(log, " tls %s", storage->tls);
if (storage->tls_ca_file)
od_log(log, " tls_ca_file %s", storage->tls_ca_file);
if (storage->tls_key_file)

4
src/od_scheme.h
View File

@ -50,7 +50,7 @@ struct od_schemestorage
char *host;
int port;
od_tls_t tls_verify;
char *tls_mode;
char *tls;
char *tls_ca_file;
char *tls_key_file;
char *tls_cert_file;
@ -120,7 +120,7 @@ struct od_scheme
int client_max_set;
int client_max;
od_tls_t tls_verify;
char *tls_mode;
char *tls;
char *tls_ca_file;
char *tls_key_file;
char *tls_cert_file;