gfwleak/tango-tfe
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加在流结束时调用cmsg发送接口的实现

Browse Source
This commit is contained in:
luqiuwen
2019-06-02 17:52:48 +08:00
parent 5679dc9d11
commit 306dcc6ce0
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/include/internal/sender_scm.h
View File

@@ -3,3 +3,4 @@
struct sender_scm; struct sender_scm;
void send_scm_destroy(struct sender_scm *sender); void send_scm_destroy(struct sender_scm *sender);
struct sender_scm* sender_scm_init(const char *profile, const char *section, void *logger); struct sender_scm* sender_scm_init(const char *profile, const char *section, void *logger);
int sender_scm_cmsg_send(struct sender_scm *sender, struct tfe_cmsg *cmsg);

13
platform/src/tcp_stream.cpp
View File

@@ -1027,6 +1027,7 @@ void __stream_close_stat(struct tfe_stream_private * stream)
void tfe_stream_destory(struct tfe_stream_private * stream) void tfe_stream_destory(struct tfe_stream_private * stream)
{ {
struct tfe_proxy * proxy = stream->proxy_ref;
struct tfe_thread_ctx * thread = stream->thread_ref; struct tfe_thread_ctx * thread = stream->thread_ref;
struct event_base * ev_base = thread->evbase; struct event_base * ev_base = thread->evbase;
@@ -1084,8 +1085,18 @@ void tfe_stream_destory(struct tfe_stream_private * stream)
{ {
future_destroy(stream->future_upstream_create); future_destroy(stream->future_upstream_create);
} }
FREE(&(stream->plugin_ctxs));
if (proxy->scm_sender && stream->cmsg)
{
sender_scm_cmsg_send(proxy->scm_sender, stream->cmsg);
}
if (stream->cmsg)
{
tfe_cmsg_destroy(stream->cmsg);
}
FREE(&(stream->plugin_ctxs));
tfe_proxy_thread_ctx_release(stream->thread_ref); tfe_proxy_thread_ctx_release(stream->thread_ref);
stream->proxy_ref = NULL; stream->proxy_ref = NULL;
FREE(&(stream)); FREE(&(stream));