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

TSG-8230 PacketAdapter支持输出json格式的日志，并支持动态调整日志级别

Browse Source
This commit is contained in:
luwenpeng
2021-10-27 20:10:06 +03:00
parent f567aa1d3d
commit f934023b40
12 changed files with 132 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/decode_gtp.h
View File

@@ -27,7 +27,7 @@ extern "C"
} gtp_info_t;
int decode_gtp(gtp_info_t *packet, const uint8_t *data, uint32_t len);
void dump_gtp_info(uint32_t pkt_id, gtp_info_t *packet);
int dump_gtp_info(gtp_info_t *packet, char *buff, size_t size);
#ifdef __cpluscplus
}

2
common/include/decode_ipv4.h
View File

@@ -46,7 +46,7 @@ extern "C"
} ipv4_info_t;
int decode_ipv4(ipv4_info_t *packet, const uint8_t *data, uint32_t len);
void dump_ipv4_info(uint32_t pkt_id, ipv4_info_t *packet);
int dump_ipv4_info(ipv4_info_t *packet, char *buff, size_t size);
#ifdef __cpluscplus
}

2
common/include/decode_ipv6.h
View File

@@ -49,7 +49,7 @@ extern "C"
} ipv6_info_t;
int decode_ipv6(ipv6_info_t *packet, const uint8_t *data, uint32_t len);
void dump_ipv6_info(uint32_t pkt_id, ipv6_info_t *packet);
int dump_ipv6_info(ipv6_info_t *packet, char *buff, size_t size);
#ifdef __cpluscplus
}

2
common/include/decode_tcp.h
View File

@@ -37,7 +37,7 @@ extern "C"
} tcp_info_t;
int decode_tcp(tcp_info_t *packet, const uint8_t *data, uint32_t len);
void dump_tcp_info(uint32_t pkt_id, tcp_info_t *packet);
int dump_tcp_info(tcp_info_t *packet, char *buff, size_t size);
#ifdef __cpluscplus
}

2
common/include/decode_udp.h
View File

@@ -31,7 +31,7 @@ extern "C"
} udp_info_t;
int decode_udp(udp_info_t *packet, const uint8_t *data, uint32_t len);
void dump_udp_info(uint32_t pkt_id, udp_info_t *packet);
int dump_udp_info(udp_info_t *packet, char *buff, size_t size);
#ifdef __cpluscplus
}

25
common/include/public.h
View File

@@ -12,27 +12,24 @@ extern "C"
#include <errno.h>
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
#include <sys/stat.h>
#include <arpa/inet.h>
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#define IP_GET_RAW_VER(raw_pkt) ((((raw_pkt)[0] & 0xf0) >> 4))
#define PRINT_FILE_INFO 0
#define LOG_DEBUG(format, ...) \
{ \
fprintf(stdout, format "\n", ##__VA_ARGS__); \
fflush(stdout); \
}
#if (PRINT_FILE_INFO)
#define LOG_DEBUG(format, ...) \
fprintf(stdout, "[%s-%s()-%05d] " format "\n", __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__);
#define LOG_ERROR(format, ...) \
fprintf(stderr, "[%s-%s()-%05d] " format "\n", __FILE__, __FUNCTION__, __LINE__, ##__VA_ARGS__);
#else
#define LOG_DEBUG(format, ...) \
fprintf(stdout, format "\n", ##__VA_ARGS__);
#define LOG_ERROR(format, ...) \
fprintf(stderr, format "\n", ##__VA_ARGS__);
#endif
#define LOG_ERROR(format, ...) \
{ \
fprintf(stderr, format "\n", ##__VA_ARGS__); \
fflush(stderr); \
}
#ifdef __cpluscplus
}

10
common/src/decode_gtp.c
View File

@@ -47,10 +47,10 @@ int decode_gtp(gtp_info_t *packet, const uint8_t *data, uint32_t len)
return 0;
}
void dump_gtp_info(uint32_t pkt_id, gtp_info_t *packet)
int dump_gtp_info(gtp_info_t *packet, char *buff, size_t size)
{
LOG_DEBUG("id: %u, gtp_info: {hdr_len: %u, data_len: %u}",
pkt_id,
packet->hdr_len,
packet->payload_len);
return snprintf(buff, size,
"{\"hdr_len\":%u,\"data_len\":%u}",
packet->hdr_len,
packet->payload_len);
}

16
common/src/decode_ipv4.c
View File

@@ -56,13 +56,13 @@ int decode_ipv4(ipv4_info_t *packet, const uint8_t *data, uint32_t len)
return 0;
}
void dump_ipv4_info(uint32_t pkt_id, ipv4_info_t *packet)
int dump_ipv4_info(ipv4_info_t *packet, char *buff, size_t size)
{
LOG_DEBUG("id: %u, ipv4_info: {src_addr: %s, dst_addr: %s, hdr_len: %u, opt_len: %u, data_len: %u}",
pkt_id,
packet->src_addr,
packet->dst_addr,
packet->hdr_len,
packet->opts_len,
packet->payload_len);
return snprintf(buff, size,
"{\"src_addr\":\"%s\",\"dst_addr\":\"%s\",\"hdr_len\":%u,\"opts_len\":%u,\"data_len\":%u}",
packet->src_addr,
packet->dst_addr,
packet->hdr_len,
packet->opts_len,
packet->payload_len);
}

14
common/src/decode_ipv6.c
View File

@@ -44,12 +44,12 @@ int decode_ipv6(ipv6_info_t *packet, const uint8_t *data, uint32_t len)
return 0;
}
void dump_ipv6_info(uint32_t pkt_id, ipv6_info_t *packet)
int dump_ipv6_info(ipv6_info_t *packet, char *buff, size_t size)
{
LOG_DEBUG("id: %u, ipv6_info: {src_addr: %s, dst_addr: %s, hdr_len: %u, data_len: %u}",
pkt_id,
packet->src_addr,
packet->dst_addr,
packet->hdr_len,
packet->payload_len);
return snprintf(buff, size,
"{\"src_addr\":\"%s\",\"dst_addr\":\"%s\",\"hdr_len\":%u,\"data_len\":%u}",
packet->src_addr,
packet->dst_addr,
packet->hdr_len,
packet->payload_len);
}

16
common/src/decode_tcp.c
View File

@@ -40,13 +40,13 @@ int decode_tcp(tcp_info_t *packet, const uint8_t *data, uint32_t len)
return 0;
}
void dump_tcp_info(uint32_t pkt_id, tcp_info_t *packet)
int dump_tcp_info(tcp_info_t *packet, char *buff, size_t size)
{
LOG_DEBUG("id: %u, tcp_info: {src_port: %u, dst_port: %u, hdr_len: %u, opt_len: %u, data_len:%u}",
pkt_id,
packet->src_port,
packet->dst_port,
packet->hdr_len,
packet->opt_len,
packet->payload_len);
return snprintf(buff, size,
"{\"src_port\":%u,\"dst_port\":%u,\"hdr_len\":%u,\"opt_len\":%u,\"data_len\":%u}",
packet->src_port,
packet->dst_port,
packet->hdr_len,
packet->opt_len,
packet->payload_len);
}

14
common/src/decode_udp.c
View File

@@ -37,12 +37,12 @@ int decode_udp(udp_info_t *packet, const uint8_t *data, uint32_t len)
return 0;
}
void dump_udp_info(uint32_t pkt_id, udp_info_t *packet)
int dump_udp_info(udp_info_t *packet, char *buff, size_t size)
{
LOG_DEBUG("id: %u, udp_info: {src_port: %u, dst_port: %u, hdr_len: %u, data_len: %u}",
pkt_id,
packet->src_port,
packet->dst_port,
packet->hdr_len,
packet->payload_len);
return snprintf(buff, size,
"{\"src_port\":%u,\"dst_port\":%u,\"hdr_len\":%u,\"data_len\":%u}",
packet->src_port,
packet->dst_port,
packet->hdr_len,
packet->payload_len);
}