configuration.h (hitch-1.6.1) | : | configuration.h (hitch-1.7.0) | ||
---|---|---|---|---|
skipping to change at line 41 | skipping to change at line 41 | |||
# ifndef MAX_SHCUPD_PEERS | # ifndef MAX_SHCUPD_PEERS | |||
# define MAX_SHCUPD_PEERS 15 | # define MAX_SHCUPD_PEERS 15 | |||
# endif | # endif | |||
typedef struct shcupd_peer_opt { | typedef struct shcupd_peer_opt { | |||
char *ip; | char *ip; | |||
char *port; | char *port; | |||
} shcupd_peer_opt; | } shcupd_peer_opt; | |||
#endif | #endif | |||
typedef enum { | typedef enum { | |||
SSLv3_PROTO = 0x01, | #define TLS_PROTO(e, n, s) \ | |||
TLSv1_0_PROTO = 0x02, | e = n, | |||
TLSv1_1_PROTO = 0x04, | #include "tls_proto_tbl.h" | |||
TLSv1_2_PROTO = 0x08, | ||||
TLSv1_3_PROTO = 0x10 | ||||
} TLS_PROTOCOL; | } TLS_PROTOCOL; | |||
#define DEFAULT_TLS_PROTOS (TLSv1_2_PROTO | TLSv1_3_PROTO) | #define DEFAULT_TLS_PROTOS (TLSv1_2_PROTO | TLSv1_3_PROTO) | |||
#define TLS_OPTION_PROTOS \ | #define TLS_OPTION_PROTOS \ | |||
(TLSv1_0_PROTO | TLSv1_1_PROTO | DEFAULT_TLS_PROTOS) | (TLSv1_0_PROTO | TLSv1_1_PROTO | DEFAULT_TLS_PROTOS) | |||
#define SSL_OPTION_PROTOS (SSLv3_PROTO | TLS_OPTION_PROTOS) | #define SSL_OPTION_PROTOS (SSLv3_PROTO | TLS_OPTION_PROTOS) | |||
typedef enum { | typedef enum { | |||
SSL_SERVER, | SSL_SERVER, | |||
SSL_CLIENT | SSL_CLIENT | |||
skipping to change at line 100 | skipping to change at line 99 | |||
/* configuration structure */ | /* configuration structure */ | |||
struct __hitch_config { | struct __hitch_config { | |||
PROXY_MODE PMODE; | PROXY_MODE PMODE; | |||
int SELECTED_TLS_PROTOS; | int SELECTED_TLS_PROTOS; | |||
int WRITE_IP_OCTET; | int WRITE_IP_OCTET; | |||
int WRITE_PROXY_LINE_V1; | int WRITE_PROXY_LINE_V1; | |||
int WRITE_PROXY_LINE_V2; | int WRITE_PROXY_LINE_V2; | |||
int PROXY_PROXY_LINE; | int PROXY_PROXY_LINE; | |||
unsigned PROXY_TLV; | unsigned PROXY_TLV; | |||
unsigned PROXY_AUTHORITY; | unsigned PROXY_AUTHORITY; | |||
unsigned PROXY_CLIENT_CERT; | ||||
char *ALPN_PROTOS; | char *ALPN_PROTOS; | |||
unsigned char *ALPN_PROTOS_LV; | unsigned char *ALPN_PROTOS_LV; | |||
unsigned ALPN_PROTOS_LV_LEN; | unsigned ALPN_PROTOS_LV_LEN; | |||
char *CHROOT; | char *CHROOT; | |||
int UID; | int UID; | |||
int GID; | int GID; | |||
struct front_arg *LISTEN_ARGS; | struct front_arg *LISTEN_ARGS; | |||
struct front_arg *LISTEN_DEFAULT; | struct front_arg *LISTEN_DEFAULT; | |||
char *BACK_IP; | char *BACK_IP; | |||
char *BACK_PORT; | char *BACK_PORT; | |||
skipping to change at line 153 | skipping to change at line 153 | |||
int SNI_NOMATCH_ABORT; | int SNI_NOMATCH_ABORT; | |||
int TEST; | int TEST; | |||
char *PEM_DIR; | char *PEM_DIR; | |||
char *PEM_DIR_GLOB; | char *PEM_DIR_GLOB; | |||
char *ECDH_CURVE; | char *ECDH_CURVE; | |||
int OCSP_VFY; | int OCSP_VFY; | |||
char *OCSP_DIR; | char *OCSP_DIR; | |||
double OCSP_RESP_TMO; | double OCSP_RESP_TMO; | |||
double OCSP_CONN_TMO; | double OCSP_CONN_TMO; | |||
int OCSP_REFRESH_INTERVAL; | int OCSP_REFRESH_INTERVAL; | |||
char *DEBUG_LISTEN_ADDR; | ||||
#ifdef TCP_FASTOPEN_WORKS | #ifdef TCP_FASTOPEN_WORKS | |||
int TFO; | int TFO; | |||
#endif | #endif | |||
}; | }; | |||
typedef struct __hitch_config hitch_config; | typedef struct __hitch_config hitch_config; | |||
const char * config_error_get (void); | const char * config_error_get (void); | |||
hitch_config * config_new (void); | hitch_config * config_new (void); | |||
void config_destroy (hitch_config *cfg); | void config_destroy (hitch_config *cfg); | |||
End of changes. 3 change blocks. | ||||
5 lines changed or deleted | 6 lines changed or added |