TSG-8583,TSG-8577: 支持输出L2TP协议详细信息

3 files changed, 109 insertions, 32 deletions

diff --git a/bin/tsg_log_field.conf b/bin/tsg_log_field.conf
index 7764b26..748a156 100644
--- a/bin/tsg_log_field.conf
+++ b/bin/tsg_log_field.conf
@@ -97,4 +97,13 @@ STRING		common_link_info_c2s	84
 STRING		common_link_info_s2c	85
 STRING		quic_version		86
 STRING		quic_user_agent		87
-STRING		common_device_tag		88
\ No newline at end of file
+STRING		common_device_tag		88
+LONG		l2tp_lac2lns_tunnel_id	89
+LONG		l2tp_lns2lac_tunnel_id	90
+LONG		l2tp_lac2lns_session_id	91
+LONG		l2tp_lns2lac_session_id	92
+STRING		l2tp_access_concentrator_ip	93
+STRING		l2tp_network_server_ip	94
+LONG		l2tp_access_concentrator_port	95
+LONG		l2tp_network_server_port	96
+STRING		l2tp_version		97
diff --git a/src/tsg_send_log.cpp b/src/tsg_send_log.cpp
index 90c7512..8f2944a 100644
--- a/src/tsg_send_log.cpp
+++ b/src/tsg_send_log.cpp
@@ -743,6 +743,35 @@ static int set_mpls(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_
 	return 1;
 }
 
+static int set_l2tp(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct layer_addr_l2tp *l2tp_addr, Value *object)
+{
+	if(l2tp_addr==NULL || object==NULL)
+	{
+		return 0;
+	}
+
+	struct layer_addr_l2tp_v2_t *l2tp_v2=NULL;
+	
+	switch(l2tp_addr->version)
+	{
+		case	2:
+			l2tp_v2=&(l2tp_addr->l2tpun.l2tp_addr_v2);			
+			add_str_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_VERSION].name, "v2");
+			add_number_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_LAC2LNS_TUNNEL_ID].name, ntohs(l2tp_v2->tunnelid_C2S));			
+			add_number_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_LNS2LAC_TUNNEL_ID].name, ntohs(l2tp_v2->tunnelid_S2C));
+			add_number_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_LAC2LNS_SESSION_ID].name, ntohs(l2tp_v2->sessionid_C2S));			
+			add_number_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_LNS2LAC_SESSION_ID].name, ntohs(l2tp_v2->sessionid_S2C));
+			break;
+		case	3:
+			add_str_member(_handle, object, _instance->id2field[LOG_COMMON_L2TP_VERSION].name, "v3");
+			break;
+		default:
+			return 0;	
+	}
+	
+	return 1;
+}
+
 static int mac_to_string(unsigned char *mac, char *buff)
 {
 	int i=0,len=0;
@@ -975,41 +1004,64 @@ int set_nat_linkinfo(struct tsg_log_instance_t *_instance, struct TLD_handle_t *
 	return 0;
 }
 
-static int get_gtp_ipv4v6_port(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream, Value *object)
+static int set_tunnel_ipv4v6_port(struct tsg_log_instance_t *_instance, struct TLD_handle_t *_handle, struct streaminfo *a_stream, Value *object, enum addr_type_t up_layer_type)
 {
 	char ip_buff[64]={0};
-	if(a_stream!=NULL)
+	if(a_stream==NULL)
+	{		
+		return 0;
+	}
+
+	tsg_log_field_id_t s_ip_idx, d_ip_idx, s_port_idx, d_port_idx;
+
+	switch(up_layer_type)
 	{
-		switch(a_stream->addr.addrtype)
-		{
-			case	ADDR_TYPE_IPV4:
-					inet_ntop(AF_INET, (const void *)&(a_stream->addr.ipv4->saddr), ip_buff, sizeof(ip_buff));
-					add_str_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_SGW_IP].name, ip_buff);
-
-					inet_ntop(AF_INET, (const void *)&(a_stream->addr.ipv4->daddr), ip_buff, sizeof(ip_buff));	
-					add_str_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_PGW_IP].name, ip_buff);
-					
-					add_number_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_SGW_PORT].name, ntohs(a_stream->addr.ipv4->source));
-					add_number_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_PGW_PORT].name, ntohs(a_stream->addr.ipv4->dest));
-					return 1;
-				break;
-			case	ADDR_TYPE_IPV6:
-					inet_ntop(AF_INET6, (const void *)(a_stream->addr.ipv6->saddr), ip_buff, sizeof(ip_buff));
-					add_str_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_SGW_IP].name, ip_buff);
-	
-					inet_ntop(AF_INET6, (const void *)(a_stream->addr.ipv6->daddr), ip_buff, sizeof(ip_buff));
-					add_str_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_PGW_IP].name, ip_buff);
-					
-					add_number_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_SGW_PORT].name, ntohs(a_stream->addr.ipv6->source));
-					add_number_member(_handle, object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_PGW_PORT].name, ntohs(a_stream->addr.ipv6->dest));
-					return 1;
-				break;
-			default:
-				break;
-				
-		}
+		case	ADDR_TYPE_L2TP:
+			s_ip_idx=LOG_COMMON_L2TP_ACCESS_CONCENTRATOR_IP;
+			d_ip_idx=LOG_COMMON_L2TP_NETWORK_SERVER_IP;
+			s_port_idx=LOG_COMMON_L2TP_ACCESS_CONCENTRATOR_PORT;
+			d_port_idx=LOG_COMMON_L2TP_NETWORK_SERVER_PORT;
+			break;
+		case	ADDR_TYPE_GPRS_TUNNEL:
+			s_ip_idx=LOG_COMMON_TUNNELS_GTP_SGW_IP;
+			d_ip_idx=LOG_COMMON_TUNNELS_GTP_PGW_IP;
+			s_port_idx=LOG_COMMON_TUNNELS_GTP_SGW_PORT;
+			d_port_idx=LOG_COMMON_TUNNELS_GTP_PGW_PORT;			
+			break;
+		default:
+			return 0;
+			break;
 	}
+		
+	switch(a_stream->addr.addrtype)
+	{
+		case	ADDR_TYPE_IPV4:
+				inet_ntop(AF_INET, (const void *)&(a_stream->addr.ipv4->saddr), ip_buff, sizeof(ip_buff));
+				add_str_member(_handle, object, _instance->id2field[s_ip_idx].name, ip_buff);
+
+				inet_ntop(AF_INET, (const void *)&(a_stream->addr.ipv4->daddr), ip_buff, sizeof(ip_buff));	
+				add_str_member(_handle, object, _instance->id2field[d_ip_idx].name, ip_buff);
+				
+				add_number_member(_handle, object, _instance->id2field[s_port_idx].name, ntohs(a_stream->addr.ipv4->source));
+				add_number_member(_handle, object, _instance->id2field[d_port_idx].name, ntohs(a_stream->addr.ipv4->dest));
+				return 1;
+			break;
+		case	ADDR_TYPE_IPV6:
+				inet_ntop(AF_INET6, (const void *)(a_stream->addr.ipv6->saddr), ip_buff, sizeof(ip_buff));
+				add_str_member(_handle, object, _instance->id2field[s_ip_idx].name, ip_buff);
 
+				inet_ntop(AF_INET6, (const void *)(a_stream->addr.ipv6->daddr), ip_buff, sizeof(ip_buff));
+				add_str_member(_handle, object, _instance->id2field[d_ip_idx].name, ip_buff);
+				
+				add_number_member(_handle, object, _instance->id2field[s_port_idx].name, ntohs(a_stream->addr.ipv6->source));
+				add_number_member(_handle, object, _instance->id2field[d_port_idx].name, ntohs(a_stream->addr.ipv6->dest));
+				return 1;
+			break;
+		default:
+			break;
+			
+	}
+	
 	return 0;
 }
 
@@ -1050,6 +1102,13 @@ static int set_common_tunnels(struct tsg_log_instance_t *_instance, struct TLD_h
 				break;
 			case	ADDR_TYPE_L2TP:
 				add_str_member(_handle, &tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "L2TP");
+				set_l2tp(_instance, _handle, ptmp->addr.l2tp, &tunnel_object);
+
+				ret=set_tunnel_ipv4v6_port(_instance, _handle, ptmp->pfather, &tunnel_object, ADDR_TYPE_L2TP);
+				if(ret==1)
+				{
+					ptmp=pfather->pfather;
+				}
 				break;
 			case	__ADDR_TYPE_IP_PAIR_V4:
 				add_str_member(_handle, &tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_SCHEMA_TYPE].name, "IPv4");
@@ -1079,7 +1138,7 @@ static int set_common_tunnels(struct tsg_log_instance_t *_instance, struct TLD_h
 				add_number_member(_handle, &tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_UPLINK_TEID].name, ntohl(ptmp->addr.gtp->teid_c2s));
 				add_number_member(_handle, &tunnel_object, _instance->id2field[LOG_COMMON_TUNNELS_GTP_DOWNLINK_TEID].name, ntohl(ptmp->addr.gtp->teid_s2c));
 
-				ret=get_gtp_ipv4v6_port(_instance, _handle, ptmp->pfather, &tunnel_object);
+				ret=set_tunnel_ipv4v6_port(_instance, _handle, ptmp->pfather, &tunnel_object, ADDR_TYPE_GPRS_TUNNEL);
 				if(ret==1)
 				{
 					ptmp=pfather->pfather;
diff --git a/src/tsg_send_log_internal.h b/src/tsg_send_log_internal.h
index 83e4bd2..f786eaf 100644
--- a/src/tsg_send_log_internal.h
+++ b/src/tsg_send_log_internal.h
@@ -114,6 +114,15 @@ typedef enum _tsg_log_field_id
 	LOG_QUIC_VERSION,
 	LOG_QUIC_USER_AGENT,
 	LOG_COMMON_DEVICE_TAG,
+	LOG_COMMON_L2TP_LAC2LNS_TUNNEL_ID,
+	LOG_COMMON_L2TP_LNS2LAC_TUNNEL_ID,
+	LOG_COMMON_L2TP_LAC2LNS_SESSION_ID,
+	LOG_COMMON_L2TP_LNS2LAC_SESSION_ID, 
+	LOG_COMMON_L2TP_ACCESS_CONCENTRATOR_IP,	
+	LOG_COMMON_L2TP_NETWORK_SERVER_IP,
+	LOG_COMMON_L2TP_ACCESS_CONCENTRATOR_PORT,
+	LOG_COMMON_L2TP_NETWORK_SERVER_PORT,	
+	LOG_COMMON_L2TP_VERSION,
 	LOG_COMMON_MAX
 }tsg_log_field_id_t;