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

TSG-7542: 执行RST动作之后，设置丢弃整个流的标志

Browse Source 
修复IP定位结果最后的,分割符
This commit is contained in:
liuxueli
2021-09-13 15:43:03 +08:00
parent 4578ad3200
commit 427a0d7faf
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/tsg_action.cpp
View File

@@ -25,20 +25,31 @@
extern "C" int sendpacket_do_checksum(unsigned char *buf, int protocol, int len); extern "C" int sendpacket_do_checksum(unsigned char *buf, int protocol, int len);
static int set_drop_stream(const struct streaminfo *a_stream) static int set_drop_stream(const struct streaminfo *a_stream, tsg_protocol_t protocol)
{ {
int opt_value=1; int ret=0, opt_value=1;
MESA_set_stream_opt(a_stream, MSO_DROP_STREAM, (void *)&opt_value, sizeof(opt_value)); MESA_set_stream_opt(a_stream, MSO_DROP_STREAM, (void *)&opt_value, sizeof(opt_value));
MESA_set_stream_opt(a_stream, MSO_DROP_CURRENT_PKT, (void *)&opt_value, sizeof(opt_value)); MESA_set_stream_opt(a_stream, MSO_DROP_CURRENT_PKT, (void *)&opt_value, sizeof(opt_value));
int ret=MESA_set_stream_opt(a_stream, MSO_TIMEOUT, (void *)&g_tsg_para.timeout, sizeof(g_tsg_para.timeout)); switch(protocol)
if(ret<0)
{ {
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_SET_TIMOUT_FAILED], 0, FS_OP_ADD, 1); case PROTO_MAIL:
} case PROTO_POP3:
else case PROTO_SMTP:
{ case PROTO_IMAP:
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_SET_TIMOUT_SUCCESS], 0, FS_OP_ADD, 1); case PROTO_FTP:
ret=MESA_set_stream_opt(a_stream, MSO_TIMEOUT, (void *)&g_tsg_para.timeout, sizeof(g_tsg_para.timeout));
if(ret<0)
{
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_SET_TIMOUT_FAILED], 0, FS_OP_ADD, 1);
}
else
{
FS_operate(g_tsg_para.fs2_handle, g_tsg_para.fs2_field_id[TSG_FS2_SET_TIMOUT_SUCCESS], 0, FS_OP_ADD, 1);
}
break;
default:
break;
} }
return STATE_DROPME|STATE_DROPPKT; return STATE_DROPME|STATE_DROPPKT;
@@ -512,6 +523,8 @@ static unsigned char do_action_reset(const struct streaminfo *a_stream, Maat_rul
opt_value=1; opt_value=1;
MESA_set_stream_opt(a_stream, MSO_TCP_RST_REMEDY, (void *)&opt_value, sizeof(opt_value)); MESA_set_stream_opt(a_stream, MSO_TCP_RST_REMEDY, (void *)&opt_value, sizeof(opt_value));
} }
set_drop_stream(a_stream, protocol);
} }
return STATE_DROPPKT|STATE_DROPME; return STATE_DROPPKT|STATE_DROPME;
@@ -524,7 +537,7 @@ static unsigned char do_action_drop(const struct streaminfo *a_stream, Maat_rule
case PROTO_DNS: case PROTO_DNS:
return STATE_GIVEME|STATE_DROPPKT; return STATE_GIVEME|STATE_DROPPKT;
default: default:
set_drop_stream(a_stream); set_drop_stream(a_stream, protocol);
if(g_tsg_para.deploy_mode==DEPLOY_MODE_MIRROR) if(g_tsg_para.deploy_mode==DEPLOY_MODE_MIRROR)
{ {
return do_action_reset(a_stream, p_result, protocol); return do_action_reset(a_stream, p_result, protocol);
@@ -621,7 +634,7 @@ static unsigned char do_action_block_xxx(const struct streaminfo *a_stream, Maat
break; break;
} }
set_drop_stream(a_stream); set_drop_stream(a_stream, protocol);
return STATE_DROPME|STATE_DROPPKT; return STATE_DROPME|STATE_DROPPKT;
} }
@@ -665,7 +678,7 @@ static unsigned char do_action_redirect_xxx(const struct streaminfo *a_stream, M
break; break;
case PROTO_HTTP: case PROTO_HTTP:
do_action_redirect_http(a_stream, p_result, user_region); do_action_redirect_http(a_stream, p_result, user_region);
set_drop_stream(a_stream); set_drop_stream(a_stream, protocol);
break; break;
default: default:
break; break;
@@ -698,7 +711,7 @@ unsigned char tsg_deal_deny_action(const struct streaminfo *a_stream, Maat_rule_
local_state=do_action_drop(a_stream, p_result, protocol); local_state=do_action_drop(a_stream, p_result, protocol);
if(protocol==PROTO_DNS && type==ACTION_RETURN_TYPE_APP) if(protocol==PROTO_DNS && type==ACTION_RETURN_TYPE_APP)
{ {
local_state=set_drop_stream(a_stream); local_state=set_drop_stream(a_stream, protocol);
} }
break; break;
case TSG_METHOD_TYPE_RESET: case TSG_METHOD_TYPE_RESET:

1
src/tsg_send_log.cpp
View File

@@ -239,7 +239,6 @@ static int set_location(struct TLD_handle_t *_handle, struct streaminfo *a_strea
len+=string_cat(buff+len, buff_len-len, location_info->province_full); len+=string_cat(buff+len, buff_len-len, location_info->province_full);
buff[len++]=','; buff[len++]=',';
len+=string_cat(buff+len, buff_len-len, location_info->country_full); len+=string_cat(buff+len, buff_len-len, location_info->country_full);
buff[len++]=',';
TLD_append(_handle, field_name, (void *)buff, TLD_TYPE_STRING); TLD_append(_handle, field_name, (void *)buff, TLD_TYPE_STRING);
} }