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

Close #33 增加HTTP Upgrade透明转发的功能

Browse Source
This commit is contained in:
Lu Qiuwen
2018-10-24 15:40:26 +08:00
parent c53641bc27
commit 62b8089166
4 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugin/protocol/http/src/http_entry.cpp
View File

@@ -436,8 +436,7 @@ enum tfe_stream_action __http_connection_entry_on_response(const struct tfe_stre
hf_private_set_session(hf_private_resp_in, hs_private);
/* Closure, catch stream, session and thread_id */
struct user_event_dispatch_closure * __closure = ALLOC(
struct user_event_dispatch_closure, 1);
struct user_event_dispatch_closure * __closure = ALLOC(struct user_event_dispatch_closure, 1);
__closure->thread_id = thread_id;
__closure->stream = stream;
__closure->session = to_hs_public(hs_private);
@@ -478,6 +477,13 @@ enum tfe_stream_action __http_connection_entry_on_response(const struct tfe_stre
goto __errout;
}
/* Upgrade, passthrough the connection and close this session */
if (hf_private_resp_in->is_upgrade)
{
tfe_stream_detach(stream);
hf_private_resp_in->stream_action = ACTION_FORWARD_DATA;
}
hf_private_resp_user = hs_private->hf_private_resp_user;
if (hf_private_resp_user != NULL)
{

11
plugin/protocol/http/src/http_half.cpp
View File

@@ -775,6 +775,11 @@ int hf_private_parse(struct http_half_private * hf_private, const unsigned char
__is_paused = true;
}
if (hf_private->parse_object->upgrade)
{
hf_private->is_upgrade = true;
}
if (sz_parsed == __len_with_offset)
{
hf_private->parse_cursor += sz_parsed;
@@ -1091,10 +1096,12 @@ void __write_access_log(struct http_session_private * hs_private)
const char * __str_cont_length = resp_spec ? resp_spec->content_length : "-";
/* Content Encoding */
const char * __str_cont_encoding = resp_spec ? resp_spec->content_encoding : "-";
/* Upgrade Tag */
const char * __str_upgrade = response->is_upgrade ? "UPGRADE" : "-";
char * __access_log;
asprintf(&__access_log, "%s %s %s %s %s %s", __str_method,
__str_url, __str_resp_code, __str_cont_type, __str_cont_length, __str_cont_encoding);
asprintf(&__access_log, "%s %s %s %s %s %s %s", __str_method,
__str_url, __str_resp_code, __str_cont_type, __str_cont_length, __str_cont_encoding, __str_upgrade);
const struct tfe_stream * stream = hs_private->hc_private->stream;
tfe_stream_write_access_log(stream, RLOG_LV_INFO, "%s", __access_log);