Close #48 增加从KNI读取KEYRING-ID的功能

This commit is contained in:
Lu Qiuwen
2018-10-19 19:50:27 +08:00
parent 8a0f3c8c3c
commit 213924e77e
7 changed files with 143 additions and 30 deletions

View File

@@ -132,7 +132,7 @@ void tfe_stream_resume(const struct tfe_stream * stream)
bufferevent_enable(_stream->conn_upstream->bev, EV_READ | EV_WRITE);
bufferevent_enable(_stream->conn_downstream->bev, EV_READ | EV_WRITE);
if(_stream->suspended_by == CONN_DIR_DOWNSTREAM)
if (_stream->suspended_by == CONN_DIR_DOWNSTREAM)
{
bufferevent_trigger(_stream->conn_downstream->bev, EV_READ, BEV_OPT_DEFER_CALLBACKS);
}
@@ -745,7 +745,7 @@ void ssl_upstream_create_on_success(future_result_t * result, void * user)
ssl_downstream_create_on_fail, _stream);
ssl_async_downstream_create(_stream->future_downstream_create, _stream->ssl_mgr,
_stream->ssl_upstream, _stream->defer_fd_downstream, /* KEYRING ID */ 0, ev_base);
_stream->ssl_upstream, _stream->defer_fd_downstream, _stream->keyring_id, ev_base);
}
void ssl_upstream_create_on_fail(enum e_future_error err, const char * what, void * user)
@@ -1034,6 +1034,11 @@ int tfe_stream_option_set(struct tfe_stream * stream, enum tfe_stream_option opt
assert(sz_arg == sizeof(bool));
_stream->passthough = *(bool *) arg;
}
else if (opt == TFE_STREAM_OPT_KEYRING_ID)
{
assert(sz_arg == sizeof(unsigned int));
_stream->keyring_id = *(unsigned int *) arg;
}
return 0;
}