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

规范隧道协议属性ETHERNET,MULTIPATH_ETHERNET

Browse Source 
添加topic: LIVE-SESSION-RECORD-LOG,TRANSACTION-RECORD-LOG,GTPC-RECORD-LOG
This commit is contained in:
liuxueli
2021-05-08 15:32:39 +08:00
parent 52d0ba9fbb
commit 301d13a790
4 changed files with 60 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/tsg_log_field.conf
View File

@@ -6,6 +6,9 @@ TOPIC CONNECTION-RECORD-LOG 2
TOPIC CONNECTION-SKETCH 3 TOPIC CONNECTION-SKETCH 3
TOPIC INTERNAL-RTP-LOG 4 TOPIC INTERNAL-RTP-LOG 4
TOPIC VOIP-RECORD-LOG 5 TOPIC VOIP-RECORD-LOG 5
TOPIC LIVE-SESSION-RECORD-LOG 6
TOPIC TRANSACTION-RECORD-LOG 7
TOPIC GTPC-RECORD-LOG 8
#TYPE FIELD VALUE #TYPE FIELD VALUE
LONG common_policy_id 1 LONG common_policy_id 1
@@ -71,10 +74,14 @@ STRING mpls_c2s_direction_label 60
STRING mpls_s2c_direction_label 61 STRING mpls_s2c_direction_label 61
STRING vlan_c2s_direction_id 62 STRING vlan_c2s_direction_id 62
STRING vlan_s2c_direction_id 63 STRING vlan_s2c_direction_id 63
STRING source 64 STRING source_mac 64
STRING destination 65 STRING destination_mac 65
STRING client_ip 66 STRING c2s_source_mac 66
STRING server_ip 67 STRING c2s_destination_mac 67
STRING c2s_id 68 STRING s2c_source_mac 68
STRING s2c_id 69 STRING s2c_destination_mac 69
STRING common_service_category 70 STRING client_ip 70
STRING server_ip 71
STRING c2s_id 72
STRING s2c_id 73
STRING common_service_category 74

2
src/tsg_entry.cpp
View File

@@ -1074,6 +1074,8 @@ static int identify_application_protocol(const struct streaminfo *a_stream, stru
{ {
context->proto=PROTO_SIP; context->proto=PROTO_SIP;
} }
return 1;
} }
break; break;
default: default:

51
src/tsg_send_log.cpp
View File

@@ -474,32 +474,48 @@ static int mac_to_string(unsigned char *mac, char *buff)
static int set_link_mac(struct tsg_log_instance_t *_instance, struct layer_addr_mac *mac, cJSON *tunnel_object) static int set_link_mac(struct tsg_log_instance_t *_instance, struct layer_addr_mac *mac, cJSON *tunnel_object)
{ {
char buff[128]={0}; int flag=0;
cJSON *mac_object=NULL;
char default_mac[6]={0,0,0,0,0,0}; char default_mac[6]={0,0,0,0,0,0};
char c2s_source_mac[128]={0};
char c2s_dest_mac[128]={0};
char s2c_source_mac[128]={0};
char s2c_dest_mac[128]={0};
if((memcmp(mac->src_addr.h_source, default_mac, 6))) if((memcmp(mac->src_addr.h_source, default_mac, 6)))
{ {
mac_object=cJSON_CreateObject(); flag|=1;
mac_to_string(mac->src_addr.h_source, buff); mac_to_string(mac->src_addr.h_source, c2s_source_mac);
cJSON_AddStringToObject(mac_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_SOURCE].name, buff); mac_to_string(mac->src_addr.h_dest, c2s_dest_mac);
mac_to_string(mac->src_addr.h_dest, buff);
cJSON_AddStringToObject(mac_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_DEST].name, buff);
cJSON_AddItemToObject(tunnel_object, "c2s_direction_mac", mac_object);
} }
if((memcmp(mac->dst_addr.h_source, default_mac, 6))) if((memcmp(mac->dst_addr.h_source, default_mac, 6)))
{ {
mac_object=cJSON_CreateObject(); flag|=2;
mac_to_string(mac->dst_addr.h_source, buff); mac_to_string(mac->dst_addr.h_source, s2c_source_mac);
cJSON_AddStringToObject(mac_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_SOURCE].name, buff); mac_to_string(mac->dst_addr.h_dest, s2c_dest_mac);
}
mac_to_string(mac->dst_addr.h_dest, buff); switch(flag)
cJSON_AddStringToObject(mac_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_DEST].name, buff); {
case 1:
cJSON_AddItemToObject(tunnel_object, "s2c_direction_mac", mac_object); cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "ETHERNET");
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_SOURCE].name, c2s_source_mac);
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_DEST].name, c2s_dest_mac);
break;
case 2:
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "ETHERNET");
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_SOURCE].name, s2c_source_mac);
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_MAC_DEST].name, s2c_dest_mac);
break;
case 3:
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "MULTIPATH_ETHERNET");
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_C2S_MAC_SOURCE].name, c2s_source_mac);
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_C2S_MAC_DEST].name, c2s_dest_mac);
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_S2C_MAC_SOURCE].name, s2c_source_mac);
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_S2C_MAC_DEST].name, s2c_dest_mac);
break;
default:
break;
} }
return 1; return 1;
@@ -655,7 +671,6 @@ static int set_common_tunnels(struct tsg_log_instance_t *_instance, struct TLD_h
{ {
case ADDR_TYPE_MAC: case ADDR_TYPE_MAC:
tunnel_object=cJSON_CreateObject(); tunnel_object=cJSON_CreateObject();
cJSON_AddStringToObject(tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "ETHERNET");
set_link_mac(_instance, (ptmp->addr.mac), tunnel_object); set_link_mac(_instance, (ptmp->addr.mac), tunnel_object);
break; break;
case ADDR_TYPE_VLAN: case ADDR_TYPE_VLAN:

4
src/tsg_send_log_internal.h
View File

@@ -91,6 +91,10 @@ typedef enum _tsg_log_field_id
LOG_COMMON_TUNNELS_VLAN_DST_ID, LOG_COMMON_TUNNELS_VLAN_DST_ID,
LOG_COMMON_TUNNELS_MAC_SOURCE, LOG_COMMON_TUNNELS_MAC_SOURCE,
LOG_COMMON_TUNNELS_MAC_DEST, LOG_COMMON_TUNNELS_MAC_DEST,
LOG_COMMON_TUNNELS_C2S_MAC_SOURCE,
LOG_COMMON_TUNNELS_C2S_MAC_DEST,
LOG_COMMON_TUNNELS_S2C_MAC_SOURCE,
LOG_COMMON_TUNNELS_S2C_MAC_DEST,
LOG_COMMON_TUNNELS_CLIENT_IP, LOG_COMMON_TUNNELS_CLIENT_IP,
LOG_COMMON_TUNNELS_SERVER_IP, LOG_COMMON_TUNNELS_SERVER_IP,
LOG_COMMON_TUNNELS_PPTP_C2S_ID, LOG_COMMON_TUNNELS_PPTP_C2S_ID,