This repository has been archived on 2025-09-14. You can view files and clone it, but cannot push or open issues or pull requests.
Files
tango-tsg-master/src/tsg_send_log_internal.h

149 lines
3.3 KiB
C
Raw Normal View History

2019-11-12 13:35:19 +08:00
#ifndef __TSG_SEND_LOG_INTERNAL_H__
#define __TSG_SEND_LOG_INTERNAL_H__
#include <librdkafka/rdkafka.h>
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
#include <MESA/cJSON.h>
#include <time.h>
2020-11-14 15:50:44 +06:00
#define MIN_L7_PROTO_ID 100
#define MAX_L7_PROTO_ID 150
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
#define MAX_IPV4_LEN 16
#define MAX_STRING_LEN 32
enum _SEND_MODE
{
CLOSE=0,
KAFKA=1,
};
enum _DO_LOG
{
LOG_ABORT=0,
LOG_NOFILE=1,
LOG_ALL=2
};
typedef enum _tsg_log_field_id
{
LOG_COMMON_POLICY_ID=1,
LOG_COMMON_SERVICE,
LOG_COMMON_ACTION,
LOG_COMMON_START_TIME,
LOG_COMMON_END_TIME,
LOG_COMMON_L4_PROTOCOL,
LOG_COMMON_ADDRESS_TYPE,
LOG_COMMON_SERVER_IP,
LOG_COMMON_CLIENT_IP,
LOG_COMMON_SERVER_PORT,
LOG_COMMON_CLIENT_PORT,
LOG_COMMON_STREAM_DIR,
LOG_COMMON_ADDRESS_LIST,
LOG_COMMON_ENTRANCE_ID,
LOG_COMMON_DEVICE_ID,
LOG_COMMON_LINK_ID,
LOG_COMMON_ISP,
LOG_COMMON_ENCAPSULATION,
LOG_COMMON_DIRECTION,
LOG_COMMON_SLED_IP,
LOG_COMMON_USER_TAG,
LOG_COMMON_USER_REGION,
LOG_COMMON_APP_LABEL,
LOG_COMMON_APP_ID,
LOG_COMMON_PROTOCOL_ID,
LOG_COMMON_C2S_PKT_NUM,
LOG_COMMON_S2C_PKT_NUM,
LOG_COMMON_C2S_BYTE_NUM,
LOG_COMMON_S2C_BYTE_NUM,
LOG_COMMON_CON_DURATION_MS,
LOG_COMMON_HAS_DUP_TRAFFIC,
LOG_COMMON_STREAM_ERROR,
LOG_COMMON_STREAM_TRACE_ID,
LOG_COMMON_SCHAME_TYPE,
LOG_HTTP_HOST,
LOG_SSL_SNI,
LOG_COMMON_ESTABLISH_LATENCY_MS,
LOG_COMMON_SUB_ACTION,
2020-05-14 15:52:54 +08:00
LOG_COMMON_CLINET_ASN,
LOG_COMMON_SERVER_ASN,
LOG_COMMON_CLINET_LOCATION,
LOG_COMMON_SERVER_LOCATION,
LOG_QUIC_SNI,
2020-09-11 18:06:09 +08:00
LOG_SSL_JA3_FINGERPRINT,
2020-09-23 16:51:25 +08:00
LOG_COMMON_DATA_CENTER,
LOG_COMMON_L7_PROTOCOL,
2021-01-28 17:20:44 +08:00
LOG_COMMON_TCP_CLIENT_ISN,
LOG_COMMON_TCP_SERVER_ISN,
2021-03-02 10:39:33 +08:00
LOG_COMMON_APP_SURROGATE_ID,
2021-04-07 02:36:51 +00:00
LOG_COMMON_SIP_FROM,
LOG_COMMON_SIP_TO,
LOG_COMMON_TUNNELS,
LOG_COMMON_TUNNELS_SCHEMA_TYPE,
LOG_COMMON_TUNNELS_GTP_SGW_IP,
LOG_COMMON_TUNNELS_GTP_PGW_IP,
LOG_COMMON_TUNNELS_GTP_SGW_PORT,
LOG_COMMON_TUNNELS_GTP_PGW_PORT,
LOG_COMMON_TUNNELS_GTP_UPLINK_TEID,
LOG_COMMON_TUNNELS_GTP_DOWNLINK_TEID,
LOG_COMMON_TUNNELS_MPLS_SRC_LABEL,
LOG_COMMON_TUNNELS_MPLS_DST_LABEL,
LOG_COMMON_TUNNELS_VLAN_SRC_ID,
LOG_COMMON_TUNNELS_VLAN_DST_ID,
LOG_COMMON_TUNNELS_MAC_SOURCE,
LOG_COMMON_TUNNELS_MAC_DEST,
LOG_COMMON_TUNNELS_CLIENT_IP,
LOG_COMMON_TUNNELS_SERVER_IP,
LOG_COMMON_TUNNELS_PPTP_C2S_ID,
LOG_COMMON_TUNNELS_PPTP_S2C_ID,
LOG_COMMON_FQDN_CATEGORY,
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
LOG_COMMON_MAX
}tsg_log_field_id_t;
typedef struct _id2field
{
int type;
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
int id;
char name[MAX_STRING_LEN];
}id2field_t;
struct TLD_handle_t
{
int thread_id;
cJSON *object;
};
struct tsg_log_instance_t
2019-11-12 13:35:19 +08:00
{
int mode;
2020-09-28 17:13:39 +08:00
int level;
int max_service;
int send_user_region;
int recovery_interval;
2020-05-14 15:52:54 +08:00
int internal_project_id;
int tcp_flow_project_id;
int udp_flow_project_id;
int *send_log_percent;
int *fs_status_ids;
struct timespec *drop_start;
2020-09-28 17:13:39 +08:00
char log_path[MAX_STRING_LEN*2];
char tcp_label[MAX_STRING_LEN];
char udp_label[MAX_STRING_LEN];
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
char common_field_file[MAX_STRING_LEN*4];
char broker_list[MAX_STRING_LEN*4];
char send_queue_max_msg[MAX_STRING_LEN];
char require_ack[MAX_STRING_LEN];
char refresh_interval_ms[MAX_STRING_LEN];
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
char local_ip_str[MAX_IPV4_LEN];
2020-11-14 15:50:44 +06:00
char l7_proto_id_file[MAX_STRING_LEN*4];
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
id2field_t id2field[LOG_COMMON_MAX];
rd_kafka_topic_t **topic_rkt;
id2field_t *service2topic;
void *logger;
Squashed commit of the following: commit 91574444c3950c37b0147ad923f8eef08e029ca8 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Dec 3 11:44:16 2019 +0800 公共字段中的通信市时长单位是:ms;转换单位 KNI发日志需等待TFE结束,需提前构造streaminfo日志字段,调整包数字节数统计位置 细化调整日志 commit ff053e3e2cad06804f852e8b46275865f4e85b0c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:38:35 2019 +0800 增加调试日志信息 commit 2d1a530165be653f5ee3ee41bc89521e1be830f4 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 11:27:06 2019 +0800 使用前置声明结构体,修改接口函数原型 commit 27f0cfc91a6d85c0460d87e3e3ee05e4df02dc3c Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 27 10:33:48 2019 +0800 提供TLD_append_streaminfo函数接口供KNI使用 修改配置文件 commit ed0b17a49d4cf01294240265b5c3a907d763418d Merge: 132d807 04963fe Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:44:28 2019 +0800 Merge branch 'feature-kni' into 'develop' 增加http解析部分 See merge request tango/tsg_master!3 commit 04963fe1bfb56ce4712817d2683796d8833362e3 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Tue Nov 26 17:41:43 2019 +0800 增加http解析部分 commit 132d807af17882081510ce8af05bdd9706eac52e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 26 16:58:54 2019 +0800 调整调试日志内容 commit 8cfc6b32fd40a21062a3f2e9cf23d34bb4a66f3a Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 19:30:08 2019 +0800 增加调试日志信息 commit 4aef0628e541ea2616f24d62cc2748474c2d8edc Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 18:36:48 2019 +0800 增加调试信息 commit 7c9dabdab58db3405cbb86d0e98694ad38e8b26c Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:51:37 2019 +0800 矫正tableinfo配置项 commit 34ec2059ea017cad0dfc1ef02b16c0c01924b738 Merge: 27cb2ad 2b96c05 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 25 10:00:18 2019 +0800 Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop commit 27cb2ad3b2da0d9ce7307513f0e119b181ad13b6 Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 19:21:08 2019 +0800 获取包数、字节数与sapp头文件不一致,导致统计信息颠倒 删除从vxlan里获取信息 commit 2b96c050d50561a4c1f1f042904e81f8bdb93cec Merge: 0a11db6 8d954e4 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 21 10:22:42 2019 +0800 Merge branch 'feature-kni' into 'develop' 修改proto初始值为PROTO_UNKONWN See merge request tango/tsg_master!2 commit 46a233b78242f6515963c8235d4ac0702492f32b Author: liuxueli <liuxueli@iie.ac.cn> Date: Thu Nov 21 10:18:08 2019 +0800 KNI发送日志的线程不是sapp申请的,所以不能使用dictator_malloc申请内存 增加user_region日志字段 commit 8d954e4cc58c9e10ef917eb6cad480a9a0a599e9 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 20 19:55:59 2019 +0800 修改proto初始值为PROTO_UNKONWN commit 0a11db6d2eee3e187a4242abce9f2e66b02b30ce Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:02:54 2019 +0800 增加总控配置文件 commit 5c04ba23aa312b174e6707d2cf62b4b7e48f7a03 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 18:00:35 2019 +0800 SSL_SNI和HTTP_HOST的deny动作由总控负责处理 修复获取全局流ID时的错误 commit 291c05ea79fe3eda8fdef68079808e321cf2d1f5 Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 16:40:19 2019 +0800 增加获取全局流ID的接口 调整总控注册为TCP入口 commit 28da97b53b7777a3a024a0df191fe3239c0e981a Author: liuxueli <liuxueli@iie.ac.cn> Date: Wed Nov 20 14:45:41 2019 +0800 支持平台提供的APP_STATE_KILL_OTHER 修复BUG,天剑流标签时未对协议进行赋值,导致tfe颁发证书失败 commit 7912ec54b2669ca7aa84a1885dcca025135c7d0e Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 18:41:31 2019 +0800 修复BUG,命中拦截策略时未对类型进行赋值,导致KNI获取不到命中结果 添加总控配置文件 添加FS2统计日志 添加错误日志 构造适用sapp4.0的rpm commit 484feaed94006226f610ef68015c4a38ac150054 Author: liuxueli <liuxueli@iie.ac.cn> Date: Tue Nov 19 13:39:37 2019 +0800 增加获取deny结果规则的接口 修复自测试过程中遇到的BUG commit 5165173025f7dd9d6719475b7b586fb470840d1d Merge: 186e591 6b6cbef Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Mon Nov 18 15:46:03 2019 +0800 Merge branch 'feature-fast-path' into feature-kni commit 6b6cbeffa1469becf9cbeea927102067eb9fad08 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 14:50:32 2019 +0800 修复初始化错误 commit e7532d6280c71ec79dc535eacb5e151ee25dfd45 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:33:29 2019 +0800 添加遗漏头文件tsg_entry.h commit f33d11c50b01db96f7df652cd0f1dd314a71939e Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:29:28 2019 +0800 修复编译错误 commit 88d9368cee4afac762f5be1f786a74a259c09e85 Author: liuxueli <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:25:38 2019 +0800 合并头文件,删除无用头文件 commit 382ca0a7932bbda8bbb735cd9d71e4984af0c145 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:25 2019 +0800 Delete tsg_types.h commit ab58f918e5ff3f6c22c1403a303c06653c3b3b3d Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:21:05 2019 +0800 Delete tsg_log_id.h commit 3b13075701f1459f4bf24cb173ceb5c20a5857a8 Author: 刘学利 <liuxueli@iie.ac.cn> Date: Mon Nov 18 13:20:57 2019 +0800 Delete tsg_entry.h commit 186e591dbffea44b5f01d1a3e5de8bf226746f6c Merge: 39f82ed 91c511c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:44 2019 +0800 Merge branch 'master' into feature-kni commit 39f82ed3f70718b975ca215c486fbe736f6a06b1 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Fri Nov 15 21:22:39 2019 +0800 接口适配 commit 8913a7d22eacccc639fe6ae2fd21f21b269b9b18 Author: liuxueli <liuxueli@iie.ac.cn> Date: Fri Nov 15 19:29:54 2019 +0800 规则排序功能 统一发送日志功能 commit 1cb2358fea5ad03fddb7f69c062bcebe3821073e Merge: c76bc55 bd65acc Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Thu Nov 14 15:06:35 2019 +0800 合并master修改 commit c76bc5534dcc4128b1e9b73e8fc25d981056411c Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:56:19 2019 +0800 接口增加protocol参数 commit db7282dab7f157bb3fd82f1843f7d953d2dbc1ec Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:24:22 2019 +0800 扫描接口增加domain commit 56fadd73b2560fcea04a30a60bae9fa1c9ed4d72 Merge: f9aee05 9e738ae Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 19:08:55 2019 +0800 Merge branch 'master' into feature-kni commit f9aee05bcc1b87e8c9dfd9f6deeedd3570a9905f Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:17:59 2019 +0800 修改ssl_utils文件名 commit 452a08790cbe91e4e854e72778816cb9137a4605 Merge: 3abe8a2 c1ffc53 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:12:14 2019 +0800 Merge branch 'master' into feature-kni commit 3abe8a2fc5a3acacb29ddfa1b3be8ad9771d4324 Author: 崔一鸣 <cuiyiming@iie.ac.cn> Date: Wed Nov 13 16:11:38 2019 +0800 添加kni模块扫描部分
2019-12-09 18:58:05 +08:00
};
char *log_field_id2name(struct tsg_log_instance_t *instance, tsg_log_field_id_t id);
struct tsg_log_instance_t *tsg_sendlog_init(const char *filename);
2019-11-12 13:35:19 +08:00
#endif