summaryrefslogtreecommitdiff
path: root/platform/src/proxy.cpp
diff options
context:
space:
mode:
authorLu Qiuwen <[email protected]>2018-10-19 19:50:27 +0800
committerLu Qiuwen <[email protected]>2018-10-19 19:50:27 +0800
commit213924e77e27d474143f5f2e6e279ac4e5b88f00 (patch)
treeb7c173c7531082ef5fecf6ffaeb23d5ad29d5ca9 /platform/src/proxy.cpp
parent8a0f3c8c3c79185aa346f70f13f1f84163254b66 (diff)
Close #48 增加从KNI读取KEYRING-ID的功能
Diffstat (limited to 'platform/src/proxy.cpp')
-rw-r--r--platform/src/proxy.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/platform/src/proxy.cpp b/platform/src/proxy.cpp
index 6df17b0..e76d315 100644
--- a/platform/src/proxy.cpp
+++ b/platform/src/proxy.cpp
@@ -93,6 +93,7 @@ int tfe_proxy_fds_accept(struct tfe_proxy * ctx, const struct tfe_proxy_accept_p
struct tfe_stream * stream = tfe_stream_create(ctx, worker_thread_ctx);
tfe_stream_option_set(stream, TFE_STREAM_OPT_SESSION_TYPE, &para->session_type, sizeof(para->session_type));
+ tfe_stream_option_set(stream, TFE_STREAM_OPT_KEYRING_ID, &para->keyring_id, sizeof(para->keyring_id));
/* FOR DEBUG */
if (para->passthrough || ctx->tcp_all_passthrough)
@@ -266,10 +267,6 @@ int tfe_stat_init(struct tfe_proxy * proxy, const char * profile)
return 0;
}
-
-#define CHECK_OR_EXIT(condition, fmt, ...) \
-do { if(!(condition)) { TFE_LOG_ERROR(g_default_logger, fmt, ##__VA_ARGS__); exit(EXIT_FAILURE); } } while(0) \
-
int main(int argc, char *argv[])
{
const char* main_profile="./conf/tfe.conf";