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_entry.h

254 lines
6.5 KiB
C
Raw Normal View History

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:53:40 +08:00
#ifndef __TSG_ENTRY_H__
#define __TSG_ENTRY_H__
#include <MESA/Maat_rule.h>
#include <MESA/field_stat2.h>
#include "tsg_rule.h"
#include "tsg_label.h"
2020-05-15 17:41:26 +08:00
#include "tsg_statistic.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:53:40 +08:00
2020-05-14 15:52:54 +08:00
#if(__GNUC__ * 100 + __GNUC_MINOR__ * 10 + __GNUC_PATCHLEVEL__ >= 411)
#define atomic_inc(x) __sync_add_and_fetch((x),1)
#define atomic_dec(x) __sync_sub_and_fetch((x),1)
#define atomic_add(x,y) __sync_add_and_fetch((x),(y))
#define atomic_sub(x,y) __sync_sub_and_fetch((x),(y))
typedef int atomic_t;
#define ATOMIC_INIT(i) { (i) }
#define atomic_read(x) __sync_add_and_fetch((x),0)
#define atomic_set(x,y) __sync_lock_test_and_set((x),y)
#else
#include <alsa/iatomic.h>
#endif
2020-01-10 17:26:33 +08:00
#ifndef MIN
#define MIN(a, b) (((a) < (b)) ? (a) : (b))
#endif
#ifndef PRINTADDR
#define PRINTADDR(a, b) ((b)<RLOG_LV_FATAL ? printaddr(&(a->addr), a->threadnum) : "")
#endif
2021-03-02 10:39:33 +08:00
#define DNS_PROTO_ID 103
#define FTP_PROTO_ID 104
#define HTTP_PROTO_ID 106
#define MAIL_PROTO_ID 110
#define QUIC_PROTO_ID 119
#define SIP_PROTO_ID 120
#define SSL_PROTO_ID 126
#define RTP_PROTO_ID 142
#define APP_SCAN_FLAG_STOP 0
#define APP_SCAN_FLAG_CONTINUE 1
2020-01-10 17:26:33 +08:00
enum MASTER_TABLE{
2021-03-02 10:39:33 +08:00
TABLE_SECURITY_COMPILE=0,
TABLE_IP_ADDR,
2020-01-10 17:26:33 +08:00
TABLE_SUBSCRIBER_ID,
TABLE_APP_ID,
TABLE_HTTP_HOST,
TABLE_SSL_SNI,
TABLE_EXCLUSION_SSL_SNI,
TABLE_SRC_ASN,
TABLE_DST_ASN,
TABLE_SRC_LOCATION,
TABLE_DST_LOCATION,
2020-05-14 15:52:54 +08:00
TABLE_ASN_USER_DEFINED,
TABLE_ASN_BUILT_IN,
TABLE_LOCATION_USER_DEFINED,
TABLE_LOCATION_BUILT_IN,
TABLE_QUIC_SNI,
2020-09-28 17:13:39 +08:00
TABLE_FQDN_CAT_ID,
TABLE_FQDN_CAT_USER_DEFINED,
TABLE_FQDN_CAT_BUILT_IN,
2021-03-02 10:39:33 +08:00
TABLE_APP_ID_DICT,
TABLE_SELECTOR_ID,
TABLE_SELECTOR_PROPERTIES,
2020-01-10 17:26:33 +08:00
TABLE_MAX
};
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:53:40 +08:00
enum TSG_FS2_TYPE{
TSG_FS2_TCP_LINKS=0,
TSG_FS2_UDP_LINKS,
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:53:40 +08:00
TSG_FS2_BYPASS,
TSG_FS2_HIT_ADDR,
TSG_FS2_HIT_SHARE,
TSG_FS2_INTERCEPT,
2021-03-09 10:36:34 +00:00
TSG_FS2_EXCLUSION,
TSG_FS2_SUCCESS_LOG,
TSG_FS2_FAILED_LOG,
TSG_FS2_DROP_LOG,
TSG_FS2_ABORT_ALLOW,
TSG_FS2_ABORT_DENY,
TSG_FS2_ABORT_MONITOR,
TSG_FS2_ABORT_INTERCEPT,
TSG_FS2_ABORT_UNKNOWN,
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:53:40 +08:00
TSG_FS2_MAX
};
2021-03-02 10:39:33 +08:00
enum TSG_ATTRIBUTE_TYPE
{
TSG_ATTRIBUTE_TYPE_ESTABLISH_LATECY=0,
TSG_ATTRIBUTE_TYPE_PROTOCOL,
TSG_ATTRIBUTE_TYPE_JA3_HASH,
_MAX_TSG_ATTRIBUTE_TYPE
};
struct _str2index
{
int index;
int len;
char *type;
};
2020-09-28 17:13:39 +08:00
struct _fqdn_category_t
{
int ref_cnt;
unsigned int category_id;
int match_method;
char fqdn[MAX_DOAMIN_LEN/8];
};
2021-03-02 10:39:33 +08:00
struct master_context
{
tsg_protocol_t proto;
int hit_cnt;
2021-03-02 10:39:33 +08:00
int app_id;
2021-03-15 01:15:23 +00:00
int is_default_policy;
2021-03-02 10:39:33 +08:00
char continue_scan_app_id;
char continue_scan_proto_id;
unsigned short basic_proto_id;
2021-03-15 01:15:23 +00:00
int domain_len;
char domain[MAX_DOAMIN_LEN];
struct Maat_rule_t *result;
2021-03-02 10:39:33 +08:00
scan_status_t mid;
};
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:53:40 +08:00
2020-01-10 17:26:33 +08:00
#define _MAX_TABLE_NAME_LEN 64
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:53:40 +08:00
typedef struct _tsg_para
{
2021-03-02 10:39:33 +08:00
int level;
int mail_proto_id;
unsigned short timeout;
2021-03-02 10:39:33 +08:00
unsigned short depolyment_mode;
2020-09-02 19:44:15 +08:00
int app_id_table_type;
int device_id;
int entrance_id;
2021-03-15 01:15:23 +00:00
int default_compile_switch;
int default_compile_id;
2020-01-10 17:26:33 +08:00
int table_id[TABLE_MAX];
2019-12-11 15:13:27 +08:00
int dyn_subscribe_ip_table_id; //TSG_DYN_SUBSCRIBER_IP
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:53:40 +08:00
int priority_project_id;
2020-05-14 15:52:54 +08:00
int internal_project_id;
2021-03-02 10:39:33 +08:00
int l7_proto_project_id;
int app_id_project_id;
int proto_flag; //tsg_protocol_t
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:53:40 +08:00
int fs2_field_id[TSG_FS2_MAX];
char device_sn[MAX_DOAMIN_LEN/8];
2020-09-28 17:13:39 +08:00
char log_path[MAX_DOAMIN_LEN/8];
char device_id_command[MAX_DOAMIN_LEN/8];
2020-09-23 16:51:25 +08:00
char data_center[_MAX_TABLE_NAME_LEN];
2020-01-10 17:26:33 +08:00
char table_name[TABLE_MAX][_MAX_TABLE_NAME_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:53:40 +08:00
void *logger;
screen_stat_handle_t fs2_handle;
}g_tsg_para_t;
extern g_tsg_para_t g_tsg_para;
typedef enum _tsg_statis_field_id
{
STATIS_UNKNOWN=0,
STATIS_ENTRANCE_ID=1,
STATIS_TOTAL_CON_NUM,
STATIS_NEW_CON_NUM,
STATIS_ESTABLISHED_CON_NUM,
STATIS_CLOSE_CON_NUM,
STATIS_TOTAL_IN_BYTES,
STATIS_TOTAL_OUT_BYTES,
STATIS_TOTAL_IN_PACKETS,
STATIS_TOTAL_OUT_PACKETS,
STATIS_DEFAULT_CON_NUM,
STATIS_DEFAULT_IN_BYTES,
STATIS_DEFAULT_OUT_BYTES,
STATIS_DEFAULT_IN_PACKETS,
STATIS_DEFAULT_OUT_PACKETS,
STATIS_ALLOW_CON_NUM,
STATIS_ALLOW_IN_BYTES,
STATIS_ALLOW_OUT_BYTES,
STATIS_ALLOW_IN_PACKETS,
STATIS_ALLOW_OUT_PACKETS,
STATIS_DENY_CON_NUM,
STATIS_DENY_IN_BYTES,
STATIS_DENY_OUT_BYTES,
STATIS_DENY_IN_PACKETS,
STATIS_DENY_OUT_PACKETS,
STATIS_MONITOR_CON_NUM,
STATIS_MONITOR_IN_BYTES,
STATIS_MONITOR_OUT_BYTES,
STATIS_MONITOR_IN_PACKETS,
STATIS_MONITOR_OUT_PACKETS,
STATIS_INTERCEPT_CON_NUM,
STATIS_INTERCEPT_IN_BYTES,
STATIS_INTERCEPT_OUT_BYTES,
STATIS_INTERCEPT_IN_PACKETS,
STATIS_INTERCEPT_OUT_PACKETS,
STATIS_IPV4_IN_BYTES,
STATIS_IPV4_OUT_BYTES,
STATIS_IPV4_IN_PACKETS,
STATIS_IPV4_OUT_PACKETS,
STATIS_IPV6_IN_BYTES,
STATIS_IPV6_OUT_BYTES,
STATIS_IPV6_IN_PACKETS,
STATIS_IPV6_OUT_PACKETS,
STATIS_TCP_NEW_CON_NUM,
STATIS_TCP_IN_BYTES,
STATIS_TCP_OUT_BYTES,
STATIS_TCP_IN_PACKETS,
STATIS_TCP_OUT_PACKETS,
STATIS_UDP_NEW_CON_NUM,
STATIS_UDP_IN_BYTES,
STATIS_UDP_OUT_BYTES,
STATIS_UDP_IN_PACKETS,
STATIS_UDP_OUT_PACKETS,
STATIS_ALERT_BYTES,
STATIS_BLOCK_BYTES,
STATIS_PINNING_NUM,
STATIS_MAYBE_PINNING_NUM,
STATIS_NOT_PINNING_NUM,
STATIS_MAX
}tsg_statis_field_id_t;
enum TRAFFIC_INFO_IDX
{
TRAFFIC_INFO_ALLOW=0,
TRAFFIC_INFO_DENY,
TRAFFIC_INFO_MONITOR,
TRAFFIC_INFO_INTERCEPT,
TRAFFIC_INFO_MAX
};
typedef struct _tsg_statistic
{
int cycle;
int fs_line_id;
int fs_field_id[STATIS_MAX];
long long statistic_opt[_OPT_TYPE_MAX];
struct _traffic_info *traffic_info[TSG_ACTION_MAX+1];
struct _traffic_info default_total_info;
screen_stat_handle_t fs2_handle;
}tsg_statis_para_t;
int tsg_statistic_init(const char *conffile, void *logger);
2020-05-14 15:52:54 +08:00
void location_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
void ASN_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
2020-05-19 10:02:31 +08:00
void subscribe_id_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp);
2021-03-15 01:15:23 +00:00
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);
char *tsg_schema_index2string(tsg_protocol_t proto);
2021-03-02 10:39:33 +08:00
struct Maat_rule_t *tsg_policy_decision_criteria(struct streaminfo *a_stream, Maat_rule_t *result, int result_num, struct _identify_info *identify_info, int thread_seq);
int tsg_scan_shared_policy(Maat_feather_t maat_feather, struct streaminfo *a_stream, struct identify_info *identify_info, Maat_rule_t *result, int result_num, scan_status_t *mid, int thread_seq);
int tsg_scan_app_id_policy(Maat_feather_t maat_feather, struct streaminfo *a_stream, struct Maat_rule_t *result, int result_num, scan_status_t *mid, char *name, unsigned int id, int thread_seq);
int tsg_scan_app_properties_policy(Maat_feather_t maat_feather, struct streaminfo *a_stream, struct Maat_rule_t *result, int result_num, scan_status_t *mid, char *property, char *district, int thread_seq);
2020-05-14 15:52:54 +08:00
#endif