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

第三方APP识别库表说明变更

Browse Source 
修复tcpall的pme为空情况使用
This commit is contained in:
liuxueli
2021-08-02 15:47:38 +08:00
parent ba7238f440
commit 930d1f701e
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
bin/tsg_static_tableinfo.conf
View File

@@ -79,5 +79,4 @@
67 TSG_FILED_GTP_IMSI virtual TSG_OBJ_IMSI -- 67 TSG_FILED_GTP_IMSI virtual TSG_OBJ_IMSI --
68 TSG_FILED_GTP_APN virtual TSG_OBJ_APN -- 68 TSG_FILED_GTP_APN virtual TSG_OBJ_APN --
69 TSG_FILED_GTP_PHONE_NUMBER virtual TSG_OBJ_PHONE_NUMBER -- 69 TSG_FILED_GTP_PHONE_NUMBER virtual TSG_OBJ_PHONE_NUMBER --
70 APP_SIGNATURE_UPDATE_PROFILE plugin {"key":1,"valid":3,"foreign":"2"} 70 APP_SIGNATURE_UPDATE_PROFILE plugin {"key":1,"valid":4,"foreign":"2"}
71 APP_LIBRARY_UPDATE_PROFILE plugin {"key":1,"valid":3,"foreign":"2"}

20
src/tsg_entry.cpp
View File

@@ -339,20 +339,20 @@ static int get_default_policy(int compile_id, struct Maat_rule_t *result)
return 0; return 0;
} }
int set_vlan_id_to_project(const struct streaminfo *a_stream, struct tcpall_context *context, int *vlan_id, int vlan_id_num, int thread_seq) int set_vlan_id_to_project(const struct streaminfo *a_stream, struct tcpall_context **context, int *vlan_id, int vlan_id_num, int thread_seq)
{ {
int num=0; int num=0;
context=(struct tcpall_context *)get_struct_project(a_stream, g_tsg_para.tcpall_project_id); (*context)=(struct tcpall_context *)get_struct_project(a_stream, g_tsg_para.tcpall_project_id);
if(context==NULL) if(*context==NULL)
{ {
context=(struct tcpall_context *)dictator_malloc(thread_seq, sizeof(struct tcpall_context)); (*context)=(struct tcpall_context *)dictator_malloc(thread_seq, sizeof(struct tcpall_context));
memset(context, 0, sizeof(struct tcpall_context)); memset((*context), 0, sizeof(struct tcpall_context));
set_struct_project(a_stream, g_tsg_para.tcpall_project_id, (void *)context); set_struct_project(a_stream, g_tsg_para.tcpall_project_id, (void *)(*context));
} }
num=MIN(vlan_id_num, MAX_RESULT_NUM-context->vlan_id_num); num=MIN(vlan_id_num, MAX_RESULT_NUM-(*context)->vlan_id_num);
memcpy(context->vlan_id+context->vlan_id_num, vlan_id, num); memcpy((*context)->vlan_id+(*context)->vlan_id_num, vlan_id, num);
context->vlan_id_num+=num; (*context)->vlan_id_num+=num;
return 0; return 0;
} }
@@ -1517,7 +1517,7 @@ extern "C" unsigned char TSG_MASTER_TCPALL_ENTRY(const struct streaminfo *a_tcp,
break; break;
} }
set_vlan_id_to_project(a_tcp, context, vlan_id, vlan_id_num, thread_seq); set_vlan_id_to_project(a_tcp, &context, vlan_id, vlan_id_num, thread_seq);
*pme=(void *)(context); *pme=(void *)(context);
tsg_send_raw_packet(a_tcp, context->vlan_id, context->vlan_id_num, thread_seq); tsg_send_raw_packet(a_tcp, context->vlan_id, context->vlan_id_num, thread_seq);

2
src/tsg_entry.h
View File

@@ -308,7 +308,7 @@ void ASN_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
void subscribe_id_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp); void subscribe_id_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
void app_id_dict_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp); void app_id_dict_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
void http_response_pages_free(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp); void http_response_pages_free(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
int set_vlan_id_to_project(const struct streaminfo *a_stream, struct tcpall_context *context, int *vlan_id, int vlan_id_num, int thread_seq); int set_vlan_id_to_project(const struct streaminfo *a_stream, struct tcpall_context **context, int *vlan_id, int vlan_id_num, int thread_seq);
void security_compile_free(int idx, const struct Maat_rule_t* rule, const char* srv_def_large, MAAT_RULE_EX_DATA* ad, long argl, void *argp); void security_compile_free(int idx, const struct Maat_rule_t* rule, const char* srv_def_large, MAAT_RULE_EX_DATA* ad, long argl, void *argp);
struct Maat_rule_t *tsg_policy_decision_criteria(struct streaminfo *a_stream, Maat_rule_t *result, int result_num, int thread_seq); struct Maat_rule_t *tsg_policy_decision_criteria(struct streaminfo *a_stream, Maat_rule_t *result, int result_num, int thread_seq);

2
src/tsg_send_raw_packet.cpp
View File

@@ -84,7 +84,7 @@ int tsg_notify_hited_monitor_result(const struct streaminfo *a_stream, struct Ma
return 0; return 0;
} }
set_vlan_id_to_project(a_stream, context, vlan_id, vlan_id_num, thread_seq); set_vlan_id_to_project(a_stream, &context, vlan_id, vlan_id_num, thread_seq);
return 1; return 1;
} }