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_rule.cpp

1198 lines
37 KiB
C++
Raw Normal View History

2019-11-12 13:35:19 +08:00
#include <stdio.h>
#include <string.h>
#include <stdlib.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
#include <assert.h>
#include <time.h>
2019-12-11 15:13:27 +08:00
#include <arpa/inet.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
#include <MESA/stream.h>
#include <MESA/MESA_prof_load.h>
2019-11-12 13:35:19 +08:00
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
#include "MESA/MESA_handle_logger.h"
#include "Maat_rule.h"
#include "Maat_command.h"
#include "MESA/http.h"
2019-11-12 13:35:19 +08:00
#include "tsg_rule.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
#include "tsg_entry.h"
2019-11-12 13:35:19 +08:00
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
Maat_feather_t g_tsg_maat_feather;
2019-12-11 15:13:27 +08:00
Maat_feather_t g_tsg_dynamic_maat_feather;
2019-11-12 13:35:19 +08:00
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
#define MAX_PATH_LEN 1024
2019-12-11 15:13:27 +08:00
#define MAX_IPV6_ADDR_LEN 128
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 kni_scan_table{
TSG_FIELD_SSL_SNI,
TSG_FIELD_HTTP_HOST,
SCAN_TABLE_MAX
};
const char *g_kni_scan_table_name[SCAN_TABLE_MAX];
int g_kni_scan_tableid[SCAN_TABLE_MAX] = {0};
const struct _str2index method2index[TSG_METHOD_TYPE_MAX]={ {TSG_METHOD_TYPE_UNKNOWN, 7, (char *)"unknown"},
{TSG_METHOD_TYPE_DROP, 4, (char *)"drop"},
{TSG_METHOD_TYPE_REDIRECTION, 8, (char *)"redirect"},
{TSG_METHOD_TYPE_BLOCK, 5, (char *)"block"},
{TSG_METHOD_TYPE_RESET, 3, (char *)"rst"},
{TSG_METHOD_TYPE_ALERT, 5, (char *)"alert"}
};
2020-01-10 17:26:33 +08:00
const struct _str2index g_tsg_proto_string[PROTO_MAX+1]={{PROTO_UNKONWN, 0, (char *)""},
{PROTO_IPv4, 5, (char *)"IPv4."},
{PROTO_IPv6, 5, (char *)"IPv6."},
{PROTO_TCP, 4, (char *)"TCP."},
{PROTO_UDP, 4, (char *)"UDP."},
{PROTO_HTTP, 5, (char *)"HTTP."},
{PROTO_MAIL, 5, (char *)"MAIL."},
{PROTO_DNS, 4, (char *)"DNS."},
{PROTO_FTP, 4, (char *)"FTP."},
{PROTO_SSL, 4, (char *)"SSL."},
{PROTO_SIP, 4, (char *)"SIP."},
{PROTO_BGP, 4, (char *)"BGP."},
{PROTO_STREAMING_MEDIA, 16, (char *)"STREAMING_MEDIA."},
{PROTO_QUIC, 5, (char *)"QUIC."},
2020-01-10 17:26:33 +08:00
{PROTO_MAX, 0, (char *)""}
};
2020-05-14 15:52:54 +08:00
void ASN_dup_data(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT_PLUGIN_EX_DATA *from, long argl, void* argp)
{
void *logger=argp;
struct _asn_info *asn=(struct _asn_info *)(*from);
atomic_inc(&asn->ref_cnt);
*to=*from;
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_ASN",
2020-05-19 10:02:31 +08:00
"Dup(table_id: %d) ip ASN: start_ip: %s end_ip: %s asn: %s organization: %s ref_cnt: %d",
table_id,
2020-05-14 15:52:54 +08:00
asn->start_ip,
asn->end_ip,
asn->asn,
asn->organization,
2020-05-19 10:02:31 +08:00
asn->ref_cnt
2020-05-14 15:52:54 +08:00
);
return;
}
void ASN_new_data(int table_id, const char* key, const char* table_line, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
int ret=0,id=0,is_valid=0;
struct _asn_info *asn=NULL;
asn=(struct _asn_info *)calloc(1, sizeof(struct _asn_info));
ret=sscanf(table_line, "%d\t%d\t%s\t%s\t%s\t%s\t%d", &id, &asn->addr_type, asn->start_ip, asn->end_ip, asn->asn, asn->organization, &is_valid);
if(ret!=7)
{
free(asn);
asn=NULL;
MESA_handle_runtime_log(logger,
RLOG_LV_FATAL,
"IP_ASN",
"Parse ip ASN failed, ret: %d table_id: %d table_line: %s",
ret,
table_id,
table_line
);
return;
}
atomic_inc(&asn->ref_cnt);
2020-05-19 10:02:31 +08:00
asn->table_id=table_id;
2020-05-14 15:52:54 +08:00
*ad=(MAAT_PLUGIN_EX_DATA)asn;
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_ASN",
2020-05-19 10:02:31 +08:00
"Add(table_id: %d) ip ASN: start_ip: %s end_ip: %s asn: %s organization: %s ref_cnt: %d",
table_id,
2020-05-14 15:52:54 +08:00
asn->start_ip,
asn->end_ip,
asn->asn,
asn->organization,
2020-05-19 10:02:31 +08:00
asn->ref_cnt
2020-05-14 15:52:54 +08:00
);
return;
}
void ASN_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
struct _asn_info *asn=(struct _asn_info *)(*ad);
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_ASN",
2020-05-19 10:02:31 +08:00
"Delate(table_id: %d) ip ASN: start_ip: %s end_ip: %s asn: %s organization: %s ref_cnt: %d",
table_id,
2020-05-14 15:52:54 +08:00
asn->start_ip,
asn->end_ip,
asn->asn,
asn->organization,
2020-05-19 10:02:31 +08:00
asn->ref_cnt
2020-05-14 15:52:54 +08:00
);
2020-05-19 10:02:31 +08:00
atomic_dec(&asn->ref_cnt);
if(asn->ref_cnt<=0)
{
free(*ad);
*ad=NULL;
}
2020-05-14 15:52:54 +08:00
return;
}
void location_dup_data(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT_PLUGIN_EX_DATA *from, long argl, void* argp)
{
void *logger=argp;
struct _location_info *location=(struct _location_info *)(*from);
atomic_inc(&location->ref_cnt);
*to=*from;
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_LOCATION",
2020-05-19 10:02:31 +08:00
"Dup(table_id: %d) location: geoname_id: %d start_ip: %s end_ip: %s continent: %s country: %s city: %s ref_cnt: %d",
table_id,
location->geoname_id,
2020-05-14 15:52:54 +08:00
location->start_ip,
location->end_ip,
location->continent_full,
location->country_full,
location->city_full,
2020-05-19 10:02:31 +08:00
location->ref_cnt
);
2020-05-14 15:52:54 +08:00
return;
}
void location_new_data(int table_id, const char* key, const char* table_line, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
int ret=0,id=0,is_valid=0;
struct _location_info *location=NULL;
location=(struct _location_info *)calloc(1, sizeof(struct _location_info));
ret=sscanf(table_line,
2020-05-19 10:02:31 +08:00
"%d\t%d\t%d\t%s\t%s\t%lf\t%lf\t%lf\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%s\t%d",
2020-05-14 15:52:54 +08:00
&id,
2020-05-19 10:02:31 +08:00
&location->geoname_id,
2020-05-14 15:52:54 +08:00
&location->addr_type,
location->start_ip,
location->end_ip,
&location->latitude,
&location->longitude,
&location->coords,
location->language,
location->continent_abbr,
location->continent_full,
location->country_abbr,
location->country_full,
location->province_abbr,
location->province_full,
location->city_full,
location->time_zone,
&is_valid);
if(ret!=18)
{
free(location);
location=NULL;
MESA_handle_runtime_log(logger,
RLOG_LV_FATAL,
"IP_LOCATION",
"Parse ip location failed, ret: %d table_id: %d table_line: %s",
ret,
table_id,
table_line
);
return;
}
atomic_inc(&location->ref_cnt);
location->table_id=table_id;
*ad=(MAAT_PLUGIN_EX_DATA)location;
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_LOCATION",
2020-05-19 10:02:31 +08:00
"Add(table_id: %d) ip location: geoname_id: %d start_ip: %s end_ip: %s continent: %s country: %s city: %s ref_cnt: %d",
table_id,
location->geoname_id,
2020-05-14 15:52:54 +08:00
location->start_ip,
location->end_ip,
location->continent_full,
location->country_full,
location->city_full,
2020-05-19 10:02:31 +08:00
location->ref_cnt
2020-05-14 15:52:54 +08:00
);
return;
}
void location_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
struct _location_info *location=(struct _location_info *)(*ad);
MESA_handle_runtime_log(logger,
RLOG_LV_DEBUG,
"IP_LOCATION",
2020-05-19 10:02:31 +08:00
"Delete(table_id: %d) location: geoname_id: %d start_ip: %s end_ip: %s continent: %s country: %s city: %s ref_cnt: %d",
table_id,
location->geoname_id,
2020-05-14 15:52:54 +08:00
location->start_ip,
location->end_ip,
location->continent_full,
location->country_full,
location->city_full,
2020-05-19 10:02:31 +08:00
location->ref_cnt
2020-05-14 15:52:54 +08:00
);
2020-05-19 10:02:31 +08:00
atomic_dec(&location->ref_cnt);
if(location->ref_cnt<=0)
{
free(*ad);
*ad=NULL;
}
2020-05-14 15:52:54 +08:00
return;
}
2019-12-11 15:13:27 +08:00
void subscribe_id_dup_data(int table_id, MAAT_PLUGIN_EX_DATA *to, MAAT_PLUGIN_EX_DATA *from, long argl, void* argp)
{
void *logger=argp;
2020-05-14 15:52:54 +08:00
struct _subscribe_id_info *subscribe_id=(struct _subscribe_id_info *)(*from);
atomic_inc(&subscribe_id->ref_cnt);
*to=*from;
2019-12-11 15:13:27 +08:00
2020-05-19 10:02:31 +08:00
MESA_handle_runtime_log(logger, RLOG_LV_DEBUG, "SUBSCRIBE_ID", "Dup(table_id: %d ) subscribe_id: %s ref_cnt: %d", table_id, subscribe_id->subscribe_id, subscribe_id->ref_cnt);
2019-12-11 15:13:27 +08:00
return;
}
void subscribe_id_new_data(int table_id, const char* key, const char* table_line, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
int ret=0,id=0,type=0,is_valid=0;
char ip_addr[MAX_IPV6_ADDR_LEN]={0};
2020-05-14 15:52:54 +08:00
struct _subscribe_id_info *subscribe_id=NULL;
subscribe_id=(struct _subscribe_id_info *)calloc(1, sizeof(struct _subscribe_id_info));
2019-12-11 15:13:27 +08:00
2020-05-14 15:52:54 +08:00
ret=sscanf(table_line, "%d\t%d\t%s\t%s\t%d", &id, &type, ip_addr, subscribe_id->subscribe_id, &is_valid);
2019-12-11 15:13:27 +08:00
if(ret!=5)
{
2020-05-14 15:52:54 +08:00
free(subscribe_id);
subscribe_id=NULL;
2019-12-11 15:13:27 +08:00
MESA_handle_runtime_log(logger,
RLOG_LV_FATAL,
"SUBSCRIBE_ID",
2020-05-14 15:52:54 +08:00
"Parse subscribe_id failed, ret: %d table_id: %d table_line: %s",
2019-12-11 15:13:27 +08:00
ret,
table_id,
table_line
);
return;
}
2020-05-14 15:52:54 +08:00
atomic_inc(&subscribe_id->ref_cnt);
2020-05-19 10:02:31 +08:00
subscribe_id->table_id=table_id;
2020-05-14 15:52:54 +08:00
*ad=(MAAT_PLUGIN_EX_DATA)subscribe_id;
2019-12-11 15:13:27 +08:00
MESA_handle_runtime_log(logger,
2020-01-16 16:20:35 +08:00
RLOG_LV_DEBUG,
2019-12-11 15:13:27 +08:00
"SUBSCRIBE_ID",
2020-05-19 10:02:31 +08:00
"Add(table_id: %d ) subscribe_id: %s ref_cnt: %d",
2019-12-11 15:13:27 +08:00
table_id,
2020-05-19 10:02:31 +08:00
subscribe_id->subscribe_id,
subscribe_id->ref_cnt
2019-12-11 15:13:27 +08:00
);
return;
}
void subscribe_id_free_data(int table_id, MAAT_PLUGIN_EX_DATA* ad, long argl, void* argp)
{
void *logger=argp;
2020-05-14 15:52:54 +08:00
struct _subscribe_id_info *subscribe_id=(struct _subscribe_id_info *)(*ad);
2020-05-19 10:02:31 +08:00
MESA_handle_runtime_log(logger, RLOG_LV_DEBUG, "SUBSCRIBE_ID", "Delete(table_id: %d ) subscribe_id: %s ref_cnt: %d", table_id, subscribe_id->subscribe_id, subscribe_id->ref_cnt);
2020-05-14 15:52:54 +08:00
atomic_dec(&subscribe_id->ref_cnt);
if(subscribe_id->ref_cnt<=0)
{
free(*ad);
*ad=NULL;
}
2019-12-11 15:13:27 +08:00
return;
}
static Maat_feather_t init_maat_feather(const char* conffile, char* instance_name, char *module, void *logger)
2019-11-12 13:35:19 +08:00
{
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
unsigned short redis_port = 0;
int ret=0,scan_detail=0,effect_interval=60;
2019-12-11 15:13:27 +08:00
Maat_feather_t _maat_feather=NULL;
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 factor=0, redis_port_num=0,redis_index=0;
char redis_ip[16]={0}, effective_flag[1024]={0};
int maat_mode=0,maat_stat_on=0,maat_perf_on=0,thread_max=0;
char json_cfg_file[MAX_PATH_LEN]={0},maat_stat_file[MAX_PATH_LEN]={0};
char table_info[MAX_PATH_LEN]={0},inc_cfg_dir[MAX_PATH_LEN]={0},ful_cfg_dir[MAX_PATH_LEN]={0};
memset(effective_flag, 0, sizeof(effective_flag));
MESA_load_profile_string_def(conffile,module,"EFFECTIVE_FLAG",effective_flag, sizeof(effective_flag),"");
MESA_load_profile_int_def(conffile, module,"MAAT_MODE", &(maat_mode),0);
MESA_load_profile_int_def(conffile, module,"STAT_SWITCH", &(maat_stat_on),1);
MESA_load_profile_int_def(conffile, module,"PERF_SWITCH", &(maat_perf_on),1);
MESA_load_profile_string_def(conffile,module,"TABLE_INFO",table_info, sizeof(table_info), "");
MESA_load_profile_string_def(conffile,module,"STAT_FILE",maat_stat_file, sizeof(maat_stat_file), "");
MESA_load_profile_int_def(conffile, module,"EFFECT_INTERVAL_S", &(effect_interval), 60);
effect_interval*=1000;//convert s to ms
thread_max=get_thread_count();
2019-12-11 15:13:27 +08:00
_maat_feather=Maat_feather(thread_max, table_info, 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:53:40 +08:00
if(maat_mode==2)
{
MESA_load_profile_string_def(conffile,module,"REDIS_IP", redis_ip, sizeof(redis_ip),"");
MESA_load_profile_int_def(conffile, module,"REDIS_PORT_NUM", &(redis_port_num), 1);
MESA_load_profile_short_def(conffile, module,"REDIS_PORT", (short*)&(redis_port), 6379);
MESA_load_profile_int_def(conffile, module,"REDIS_INDEX", &redis_index, 0);
if(strlen(effective_flag)!=0)
{
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather,MAAT_OPT_ACCEPT_TAGS,effective_flag, strlen(effective_flag)+1);
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
}
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_EFFECT_INVERVAL_MS, &effect_interval, sizeof(effect_interval));
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
srand((unsigned int)time(NULL));
factor = rand()%redis_port_num;
redis_port = redis_port+factor;
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_REDIS_IP, redis_ip, strlen(redis_ip)+1);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_REDIS_PORT, (void *)&redis_port, sizeof(redis_port));
Maat_set_feather_opt(_maat_feather, MAAT_OPT_STAT_FILE_PATH, maat_stat_file, strlen(maat_stat_file)+1);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_STAT_ON, NULL, 0);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_PERF_ON, NULL, 0);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_REDIS_INDEX, &redis_index, sizeof(redis_index));
Maat_set_feather_opt(_maat_feather, MAAT_OPT_SCAN_DETAIL, &scan_detail, sizeof(scan_detail));
Maat_set_feather_opt(_maat_feather, MAAT_OPT_FOREIGN_CONT_DIR, "./alerts_files", strlen("./alerts_files")+1);
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
}
else
{
if(strlen(effective_flag)!=0)
{
2019-12-11 15:13:27 +08:00
ret=Maat_set_feather_opt(_maat_feather,MAAT_OPT_ACCEPT_TAGS,effective_flag, strlen(effective_flag)+1);
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
assert(ret>=0);
}
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather,MAAT_OPT_INSTANCE_NAME,instance_name, strlen(instance_name)+1);
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
if(maat_mode==1)
{
MESA_load_profile_string_def(conffile,module,"JSON_CFG_FILE",json_cfg_file, sizeof(json_cfg_file),"");
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_JSON_FILE_PATH, json_cfg_file, strlen(json_cfg_file)+1);
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
}
else
{
MESA_load_profile_string_def(conffile,module,"INC_CFG_DIR",inc_cfg_dir, sizeof(inc_cfg_dir),"");
MESA_load_profile_string_def(conffile,module,"FULL_CFG_DIR",ful_cfg_dir, sizeof(ful_cfg_dir),"");
assert(strlen(inc_cfg_dir)!=0&&strlen(ful_cfg_dir)!=0);
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_FULL_CFG_DIR, ful_cfg_dir, strlen(ful_cfg_dir)+1);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_INC_CFG_DIR, inc_cfg_dir, strlen(inc_cfg_dir)+1);
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
}
if(maat_stat_on)
{
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_STAT_FILE_PATH, maat_stat_file, strlen(maat_stat_file)+1);
Maat_set_feather_opt(_maat_feather, MAAT_OPT_STAT_ON, NULL, 0);
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
if(maat_perf_on)
{
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_PERF_ON, NULL, 0);
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
}
}
2019-12-11 15:13:27 +08:00
Maat_set_feather_opt(_maat_feather, MAAT_OPT_EFFECT_INVERVAL_MS, &effect_interval, sizeof(effect_interval));
Maat_set_feather_opt(_maat_feather, MAAT_OPT_SCAN_DETAIL, &scan_detail, sizeof(scan_detail));
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
}
2019-12-11 15:13:27 +08:00
ret=Maat_initiate_feather(_maat_feather);
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
if(ret<0)
{
2019-12-11 15:13:27 +08:00
return NULL;
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
}
2019-12-11 15:13:27 +08:00
return _maat_feather;
}
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
2019-12-11 15:13:27 +08:00
int tsg_rule_init(const char* conffile, void *logger)
{
2020-01-10 17:26:33 +08:00
int i=0,ret=0;
2019-12-11 15:13:27 +08:00
char maat_conffile[256]={0};
char cb_subscriber_ip_table[32]={0};
MESA_load_profile_string_def(conffile, "MAAT", "PROFILE", maat_conffile, sizeof(maat_conffile), "./tsgconf/maat_profile.conf");
MESA_load_profile_string_def(conffile, "MAAT", "IP_ADDR_TABLE", g_tsg_para.table_name[TABLE_IP_ADDR], _MAX_TABLE_NAME_LEN, "TSG_SECURITY_ADDR");
2020-01-10 17:26:33 +08:00
MESA_load_profile_string_def(conffile, "MAAT", "SUBSCRIBER_ID_TABLE", g_tsg_para.table_name[TABLE_SUBSCRIBER_ID], _MAX_TABLE_NAME_LEN, "TSG_OBJ_SUBSCRIBER_ID");
MESA_load_profile_string_def(conffile, "MAAT", "APP_ID_TABLE", g_tsg_para.table_name[TABLE_APP_ID], _MAX_TABLE_NAME_LEN, "TSG_OBJ_APP_ID");
MESA_load_profile_string_def(conffile, "MAAT", "HTTP_HOST_TABLE", g_tsg_para.table_name[TABLE_HTTP_HOST], _MAX_TABLE_NAME_LEN, "TSG_FIELD_HTTP_HOST");
MESA_load_profile_string_def(conffile, "MAAT", "SSL_SNI_TABLE", g_tsg_para.table_name[TABLE_SSL_SNI], _MAX_TABLE_NAME_LEN, "TSG_FIELD_SSL_SNI");
MESA_load_profile_string_def(conffile, "MAAT", "DECYPTION_EXCLUSION_SSL_SNI", g_tsg_para.table_name[TABLE_EXCLUSION_SSL_SNI], _MAX_TABLE_NAME_LEN, "TSG_DECYPTION_EXCLUSION_SSL_SNI");
2019-12-11 15:13:27 +08:00
MESA_load_profile_string_def(conffile, "MAAT", "SRC_ASN_TABLE", g_tsg_para.table_name[TABLE_SRC_ASN], _MAX_TABLE_NAME_LEN, "TSG_SECURITY_SOURCE_ASN");
MESA_load_profile_string_def(conffile, "MAAT", "DST_ASN_TABLE", g_tsg_para.table_name[TABLE_DST_ASN], _MAX_TABLE_NAME_LEN, "TSG_SECURITY_DESTINATION_ASN");
MESA_load_profile_string_def(conffile, "MAAT", "SRC_LOCATION_TABLE", g_tsg_para.table_name[TABLE_SRC_LOCATION], _MAX_TABLE_NAME_LEN, "TSG_SECURITY_SOURCE_LOCATION");
MESA_load_profile_string_def(conffile, "MAAT", "DST_LOCATION_TABLE", g_tsg_para.table_name[TABLE_DST_LOCATION], _MAX_TABLE_NAME_LEN, "TSG_SECURITY_DESTINATION_LOCATION");
2020-05-14 15:52:54 +08:00
MESA_load_profile_string_def(conffile, "MAAT", "ASN_BUILT_IN_TABLE", g_tsg_para.table_name[TABLE_ASN_BUILT_IN], _MAX_TABLE_NAME_LEN, "TSG_IP_ASN_BUILT_IN");
MESA_load_profile_string_def(conffile, "MAAT", "ASN_USER_DEFINED_TABLE", g_tsg_para.table_name[TABLE_ASN_USER_DEFINED], _MAX_TABLE_NAME_LEN, "TSG_IP_ASN_USER_DEFINED");
MESA_load_profile_string_def(conffile, "MAAT", "LOCATION_BUILT_IN_TABLE", g_tsg_para.table_name[TABLE_LOCATION_BUILT_IN], _MAX_TABLE_NAME_LEN, "TSG_IP_LOCATION_BUILT_IN");
MESA_load_profile_string_def(conffile, "MAAT", "LOCATION_USER_DEFINED_TABLE", g_tsg_para.table_name[TABLE_LOCATION_USER_DEFINED], _MAX_TABLE_NAME_LEN, "TSG_IP_LOCATION_USER_DEFINED");
//init static maat feather
2019-12-11 15:13:27 +08:00
g_tsg_maat_feather=init_maat_feather(maat_conffile, (char *)"TSG_STATIC", (char *)"STATIC", logger);
if(g_tsg_maat_feather==NULL)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, "init_maat_feather failed, instance_name: %s module: %s", "TSG_STATIC", "STATIC");
return -1;
}
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
for(i=0; i<TABLE_MAX; i++)
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
g_tsg_para.table_id[i]=Maat_table_register(g_tsg_maat_feather, g_tsg_para.table_name[i]);
if(g_tsg_para.table_id[i]<0)
{
MESA_handle_runtime_log(logger,
RLOG_LV_FATAL,
"Maat_table_register %s failed, Please check tsgconf/tsg_static_tableinfo.conf",
g_tsg_para.table_name[i]
);
2020-01-10 17:26:33 +08:00
return -1;
}
}
2019-12-11 15:13:27 +08:00
2020-05-14 15:52:54 +08:00
for(i=TABLE_ASN_USER_DEFINED; i<=TABLE_ASN_BUILT_IN; i++)
{
ret=Maat_ip_plugin_EX_register(g_tsg_maat_feather,
g_tsg_para.table_id[i],
ASN_new_data,
ASN_free_data,
ASN_dup_data,
0,
logger);
if(ret<0)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL,
"RULE_INIT",
"Maat_ip_plugin_EX_register failed, table_name: %s table_id: %d",
g_tsg_para.table_name[i],
g_tsg_para.table_id[i]
);
return -1;
}
}
for(i=TABLE_LOCATION_USER_DEFINED; i<=TABLE_LOCATION_BUILT_IN; i++)
{
ret=Maat_ip_plugin_EX_register(g_tsg_maat_feather,
g_tsg_para.table_id[i],
location_new_data,
location_free_data,
location_dup_data,
0,
logger);
if(ret<0)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL,
"RULE_INIT",
"Maat_ip_plugin_EX_register failed, table_name: %s table_id: %d",
g_tsg_para.table_name[i],
g_tsg_para.table_id[i]
);
return -1;
}
}
2019-12-11 15:13:27 +08:00
//init dynamic maat feather
g_tsg_dynamic_maat_feather=init_maat_feather(maat_conffile, (char *)"TSG_DYNAMIC", (char *)"DYNAMIC", logger);
if(g_tsg_maat_feather==NULL)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, "init_maat_feather failed, instance_name: %s module: %s", "TSG_DYNAMIC", "DYNAMIC");
return -1;
}
MESA_load_profile_string_def(conffile, "MAAT", "CB_SUBSCRIBER_IP_TABLE", cb_subscriber_ip_table, sizeof(cb_subscriber_ip_table), "TSG_DYN_SUBSCRIBER_IP");
g_tsg_para.dyn_subscribe_ip_table_id=Maat_table_register(g_tsg_dynamic_maat_feather, cb_subscriber_ip_table);
if(g_tsg_para.dyn_subscribe_ip_table_id<0)
{
MESA_handle_runtime_log(logger,
RLOG_LV_FATAL,
"RULE_INIT",
"Maat_table_register %s failed, Please check tsgconf/tsg_static_tableinfo.conf",
cb_subscriber_ip_table
);
2019-12-11 15:13:27 +08:00
return -1;
}
ret=Maat_plugin_EX_register(g_tsg_dynamic_maat_feather,
g_tsg_para.dyn_subscribe_ip_table_id,
subscribe_id_new_data,
subscribe_id_free_data,
subscribe_id_dup_data,
NULL,
0,
logger);
if(ret<0)
{
MESA_handle_runtime_log(logger, RLOG_LV_FATAL, "RULE_INIT", "Maat_plugin_EX_register failed, table_name: %s table_id: %d", cb_subscriber_ip_table, g_tsg_para.dyn_subscribe_ip_table_id);
return -1;
}
2019-11-12 13:35:19 +08:00
return 0;
}
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 tsg_pull_policy_result(struct streaminfo *a_stream, PULL_RESULT_TYPE pull_result_type, Maat_rule_t*result, int result_num, struct _identify_info *identify_info)
2019-11-12 13:35:19 +08:00
{
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 num=0;
policy_priority_label_t *label=NULL;
label=(policy_priority_label_t *)project_req_get_struct(a_stream, g_tsg_para.priority_project_id);
if(label!=NULL && result!=NULL && result_num>0 && identify_info!=NULL)
{
if(label->result_type==pull_result_type)
{
num=(label->result_num>result_num) ? result_num : label->result_num;
memcpy(result, label->result, num*sizeof(Maat_rule_t));
memcpy(identify_info->domain, label->domain, label->domain_len);
identify_info->domain_len=label->domain_len;
identify_info->proto = label->proto;
return num;
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_DEBUG, "PULL_RESULT",
"pull policy failed, hit: %s %s: %s policy_id: %d service: %d action: %d addr: %s",
(label->result_type==PULL_KNI_RESULT) ? "KNI" : "FW",
label->proto==PROTO_HTTP ? "host" : "sni",
label->domain,
label->result->config_id,
label->result->service_id,
label->result->action,
printaddr(&a_stream->addr, a_stream->threadnum));
}
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger, RLOG_LV_DEBUG, "PULL_RESULT",
"pull policy failed, Not hit, label is %s addr: %s",
(label==NULL) ? "NULL" : label->domain,
printaddr(&a_stream->addr, a_stream->threadnum));
}
2019-11-12 13:35:19 +08:00
return 0;
}
2020-05-14 15:52:54 +08:00
int tsg_get_ip_asn(const struct streaminfo *a_stream, int table_id, MAAT_PLUGIN_EX_DATA* client_asn, MAAT_PLUGIN_EX_DATA* server_asn)
{
struct ip_address dest_ip={0}, source_ip={0};
switch(a_stream->addr.addrtype)
{
case ADDR_TYPE_IPV4:
source_ip.ip_type=4;
source_ip.ipv4=a_stream->addr.tuple4_v4->saddr;
dest_ip.ip_type=4;
dest_ip.ipv4=a_stream->addr.tuple4_v4->daddr;
break;
case ADDR_TYPE_IPV6:
source_ip.ip_type=6;
memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN);
dest_ip.ip_type=6;
memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN);
break;
default:
return 0;
break;
}
if(*client_asn==NULL)
{
Maat_ip_plugin_get_EX_data(g_tsg_maat_feather, table_id, &source_ip, client_asn, 1);
}
2019-12-11 15:13:27 +08:00
2020-05-14 15:52:54 +08:00
if(*server_asn==NULL)
{
Maat_ip_plugin_get_EX_data(g_tsg_maat_feather, table_id, &dest_ip, server_asn, 1);
}
return 0;
}
int tsg_get_ip_location(const struct streaminfo *a_stream, int table_id, MAAT_PLUGIN_EX_DATA *client_location, MAAT_PLUGIN_EX_DATA *server_location)
{
struct ip_address dest_ip={0}, source_ip={0};
switch(a_stream->addr.addrtype)
{
case ADDR_TYPE_IPV4:
source_ip.ip_type=4;
source_ip.ipv4=a_stream->addr.tuple4_v4->saddr;
dest_ip.ip_type=4;
dest_ip.ipv4=a_stream->addr.tuple4_v4->daddr;
break;
case ADDR_TYPE_IPV6:
source_ip.ip_type=6;
memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->saddr, IPV6_ADDR_LEN);
dest_ip.ip_type=6;
memcpy((char *)(source_ip.ipv6), a_stream->addr.tuple4_v6->daddr, IPV6_ADDR_LEN);
break;
default:
return 0;
break;
}
if(*client_location==NULL)
{
Maat_ip_plugin_get_EX_data(g_tsg_maat_feather, table_id, &source_ip, client_location, 1);
}
if(*server_location==NULL)
{
Maat_ip_plugin_get_EX_data(g_tsg_maat_feather, table_id, &dest_ip, server_location, 1);
}
return 0;
}
int tsg_get_subscribe_id(const struct streaminfo *a_stream, struct _subscribe_id_info **source_subscribe_id, struct _subscribe_id_info **dest_subscribe_id)
2019-12-11 15:13:27 +08:00
{
char source_ip[MAX_IPV6_ADDR_LEN]={0};
char dest_ip[MAX_IPV6_ADDR_LEN]={0};
struct stream_tuple4_v4 *v4=NULL;
struct stream_tuple4_v6 *v6=NULL;
switch(a_stream->addr.addrtype)
{
case ADDR_TYPE_IPV4:
v4=a_stream->addr.tuple4_v4;
inet_ntop(AF_INET, &(v4->saddr), source_ip, MAX_IPV6_ADDR_LEN);
inet_ntop(AF_INET, &(v4->daddr), dest_ip, MAX_IPV6_ADDR_LEN);
break;
case ADDR_TYPE_IPV6:
v6=a_stream->addr.tuple4_v6;
inet_ntop(AF_INET6, v6->saddr, source_ip, MAX_IPV6_ADDR_LEN);
inet_ntop(AF_INET6, v6->daddr, dest_ip, MAX_IPV6_ADDR_LEN);
break;
default:
break;
}
2020-05-14 15:52:54 +08:00
if(strlen(dest_ip)>0 && *dest_subscribe_id==NULL)
2019-12-11 15:13:27 +08:00
{
2020-05-14 15:52:54 +08:00
*dest_subscribe_id = (struct _subscribe_id_info *)Maat_plugin_get_EX_data(g_tsg_dynamic_maat_feather, g_tsg_para.dyn_subscribe_ip_table_id, dest_ip);
2019-12-11 15:13:27 +08:00
}
2020-05-14 15:52:54 +08:00
if(strlen(source_ip)>0 && *source_subscribe_id==NULL)
2019-12-11 15:13:27 +08:00
{
2020-05-14 15:52:54 +08:00
*source_subscribe_id = (struct _subscribe_id_info *)Maat_plugin_get_EX_data(g_tsg_dynamic_maat_feather, g_tsg_para.dyn_subscribe_ip_table_id, source_ip);
2019-12-11 15:13:27 +08:00
}
return 0;
}
int tsg_scan_ip_asn(Maat_feather_t maat_feather, const struct streaminfo *a_stream, struct _asn_info *asn, enum MASTER_TABLE idx, scan_status_t *mid, Maat_rule_t*result, int result_num)
2020-05-14 15:52:54 +08:00
{
int ret=0;
if(asn!=NULL)
{
ret=Maat_full_scan_string(maat_feather,
g_tsg_para.table_id[idx],
2020-05-14 15:52:54 +08:00
CHARSET_GBK,
asn->asn,
strlen(asn->asn),
result,
NULL,
result_num,
mid,
a_stream->threadnum);
if(ret > 0)
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_ASN",
"Hit IP_ASN: %s scan ret: %d table_name: %s policy_id: %d service: %d action: %d addr: %s",
2020-05-14 15:52:54 +08:00
asn->asn,
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
result[0].config_id,
result[0].service_id,
(unsigned char)result[0].action,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_ASN",
"No hit IP_ASN: %s scan ret: %d table_name: %s addr: %s",
2020-05-14 15:52:54 +08:00
asn->asn,
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_ASN",
"IP_ASN is NULL scan ret: %d table_name: %s addr: %s",
2020-05-14 15:52:54 +08:00
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
2020-05-19 10:02:31 +08:00
return (ret>0 ? ret : 0);
2020-05-14 15:52:54 +08:00
}
int tsg_scan_ip_location(Maat_feather_t maat_feather, const struct streaminfo *a_stream, struct _location_info *location, enum MASTER_TABLE idx, scan_status_t *mid, Maat_rule_t*result, int result_num)
2020-05-14 15:52:54 +08:00
{
int ret=0;
char buff[1024]={0};
2020-05-14 15:52:54 +08:00
if(location!=NULL)
{
snprintf(buff, sizeof(buff), "%s.%s.", location->country_full, location->city_full);
2020-05-14 15:52:54 +08:00
ret=Maat_full_scan_string(maat_feather,
g_tsg_para.table_id[idx],
2020-05-14 15:52:54 +08:00
CHARSET_GBK,
buff,
strlen(buff),
2020-05-14 15:52:54 +08:00
result,
NULL,
result_num,
mid,
a_stream->threadnum);
if(ret > 0)
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_LOCATION",
"Hit IP_LOCATION: %s scan ret: %d table_name: %d policy_id: %d service: %d action: %d addr: %s",
buff,
2020-05-14 15:52:54 +08:00
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
result[0].config_id,
result[0].service_id,
(unsigned char)result[0].action,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_LOCATION",
"No hit IP_LOCATION: %s scan ret: %d table_name: %s addr: %s",
buff,
2020-05-14 15:52:54 +08:00
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
}
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP_LOCATION",
"IP_LOCATION is NULL scan ret: %d table_name: %s addr: %s",
2020-05-14 15:52:54 +08:00
ret,
g_tsg_para.table_name[idx],
2020-05-14 15:52:54 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
2020-05-19 10:02:31 +08:00
return (ret>0 ? ret : 0);
2020-05-14 15:52:54 +08:00
}
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 tsg_scan_nesting_addr(Maat_feather_t maat_feather, const struct streaminfo *a_stream, tsg_protocol_t proto, scan_status_t *mid, Maat_rule_t*result, int result_num)
{
2020-05-14 15:52:54 +08:00
int ret=0;
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
struct ipaddr t_addr;
2019-12-11 15:13:27 +08:00
struct ipaddr* p_addr=NULL;
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 hit_num=0,tans_proto=0;
int is_scan_addr=1, maat_ret=0,found_pos=0;
const struct streaminfo *cur_stream = a_stream;
2020-05-14 15:52:54 +08:00
struct _internal_label *internal_label=NULL;
2019-12-11 15:13:27 +08:00
2020-01-16 16:20:35 +08:00
if(result==NULL || result_num<=0 || a_stream==NULL || maat_feather==NULL)
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-16 16:20:35 +08:00
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_FATAL,
"SCAN_NESTING_ADDR",
"result==NULL || result_num<=0 || maat_feather==NULL || a_stream==%s",
(a_stream!=NULL) ? printaddr(&a_stream->addr, a_stream->threadnum) : "NULL");
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
return -1;
}
do
{
if(cur_stream->addr.addrtype == __ADDR_TYPE_IP_PAIR_V4 || cur_stream->addr.addrtype == ADDR_TYPE_IPV4 || cur_stream->addr.addrtype == __ADDR_TYPE_IP_PAIR_V6 || cur_stream->addr.addrtype == ADDR_TYPE_IPV6)
{
is_scan_addr = 1;
if(cur_stream->addr.addrtype == __ADDR_TYPE_IP_PAIR_V4 || cur_stream->addr.addrtype == __ADDR_TYPE_IP_PAIR_V6)
{
memcpy(&t_addr, &cur_stream->addr, sizeof(t_addr));
if(cur_stream->addr.addrtype == __ADDR_TYPE_IP_PAIR_V4)
t_addr.addrtype = ADDR_TYPE_IPV4;
else
t_addr.addrtype = ADDR_TYPE_IPV6;
p_addr = &t_addr;
}
else
{
p_addr = (struct ipaddr *)&cur_stream->addr;
}
}
else
{
is_scan_addr = 0;
p_addr = NULL;
}
if(is_scan_addr==1 && p_addr!=NULL)
{
switch(cur_stream->type)
{
case STREAM_TYPE_TCP:
tans_proto=6;
break;
case STREAM_TYPE_UDP:
tans_proto=17;
break;
default:
tans_proto=255;
break;
}
maat_ret=Maat_scan_proto_addr(maat_feather,
2020-01-10 17:26:33 +08:00
g_tsg_para.table_id[TABLE_IP_ADDR],
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
p_addr,
tans_proto,
result+hit_num,
result_num-hit_num,
mid,
cur_stream->threadnum);
2020-01-16 16:20:35 +08:00
if(maat_ret>0)
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-16 16:20:35 +08:00
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP",
"Hit addr: %s scan ret: %d policy_id: %d service: %d action: %d",
printaddr(&cur_stream->addr, cur_stream->threadnum),
maat_ret,
result[hit_num].config_id,
result[hit_num].service_id,
(unsigned char)result[hit_num].action
2020-01-16 16:20:35 +08:00
);
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
hit_num+=maat_ret;
}
2020-01-16 16:20:35 +08:00
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_IP",
"No hit addr: %s scan ret: %d",
printaddr(&cur_stream->addr, cur_stream->threadnum),
maat_ret
);
}
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
}
cur_stream = cur_stream->pfather;
}while(cur_stream != NULL && hit_num < result_num);
2020-01-10 17:26:33 +08:00
if(hit_num<result_num && proto>PROTO_UNKONWN && proto<PROTO_MAX)
{
maat_ret=Maat_full_scan_string(maat_feather,
g_tsg_para.table_id[TABLE_APP_ID],
CHARSET_GBK,
g_tsg_proto_string[proto].type,
strlen(g_tsg_proto_string[proto].type),
result+hit_num,
&found_pos,
result_num-hit_num,
mid,
a_stream->threadnum);
if(maat_ret > 0)
{
2020-01-16 16:20:35 +08:00
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_PROTO",
"Hit PROTO: %s scan ret: %d policy_id: %d service: %d action: %d addr: %s",
g_tsg_proto_string[proto].type,
maat_ret,
result[hit_num].config_id,
result[hit_num].service_id,
(unsigned char)result[hit_num].action,
2020-01-16 16:20:35 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
2020-01-10 17:26:33 +08:00
hit_num+=maat_ret;
}
2020-01-16 16:20:35 +08:00
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_PROTO",
"No hit PROTO: %s scan ret: %d addr: %s",
g_tsg_proto_string[proto].type,
maat_ret,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
2020-01-10 17:26:33 +08:00
}
2020-05-14 15:52:54 +08:00
internal_label=(struct _internal_label *)project_req_get_struct(a_stream, g_tsg_para.internal_project_id);
if(internal_label==NULL)
{
internal_label=(struct _internal_label *)calloc(1, sizeof(struct _internal_label));
memset(internal_label, 0, sizeof(struct _internal_label));
}
if(hit_num<result_num)
{
tsg_get_ip_location(a_stream, g_tsg_para.table_id[TABLE_LOCATION_USER_DEFINED], (void **)&(internal_label->client_location), (void **)&(internal_label->server_location));
tsg_get_ip_location(a_stream, g_tsg_para.table_id[TABLE_LOCATION_BUILT_IN], (void **)&(internal_label->client_location), (void **)&(internal_label->server_location));
hit_num+=tsg_scan_ip_location(maat_feather, a_stream, internal_label->client_location, TABLE_SRC_LOCATION, mid, result+hit_num, result_num-hit_num);
hit_num+=tsg_scan_ip_location(maat_feather, a_stream, internal_label->server_location, TABLE_DST_LOCATION, mid, result+hit_num, result_num-hit_num);
2020-05-14 15:52:54 +08:00
}
if(hit_num<result_num)
{
tsg_get_ip_asn(a_stream, g_tsg_para.table_id[TABLE_ASN_USER_DEFINED], (void **)&(internal_label->client_asn), (void **)&(internal_label->server_asn));
tsg_get_ip_asn(a_stream, g_tsg_para.table_id[TABLE_ASN_BUILT_IN], (void **)&(internal_label->client_asn), (void **)&(internal_label->server_asn));
hit_num+=tsg_scan_ip_asn(maat_feather, a_stream, internal_label->client_asn, TABLE_SRC_ASN, mid, result+hit_num, result_num-hit_num);
hit_num+=tsg_scan_ip_asn(maat_feather, a_stream, internal_label->server_asn, TABLE_DST_ASN, mid, result+hit_num, result_num-hit_num);
2020-05-14 15:52:54 +08:00
}
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
2019-12-11 15:13:27 +08:00
if(hit_num<result_num)
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
tsg_get_subscribe_id(a_stream, &internal_label->client_subscribe_id, &internal_label->server_subscribe_id);
2019-12-11 15:13:27 +08:00
2020-05-14 15:52:54 +08:00
if(internal_label->client_subscribe_id!=NULL)
2019-12-11 15:13:27 +08:00
{
maat_ret=Maat_full_scan_string(maat_feather,
2020-01-10 17:26:33 +08:00
g_tsg_para.table_id[TABLE_SUBSCRIBER_ID],
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
CHARSET_GBK,
2020-05-14 15:52:54 +08:00
internal_label->client_subscribe_id->subscribe_id,
strlen(internal_label->client_subscribe_id->subscribe_id),
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
result+hit_num,
&found_pos,
result_num-hit_num,
mid,
a_stream->threadnum);
2019-12-11 15:13:27 +08:00
if(maat_ret > 0)
2020-01-16 16:20:35 +08:00
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_SUBSCRIBER",
"Hit source subscribe id: %s scan ret: %d policy_id: %d service: %d action: %d addr: %s",
2020-05-14 15:52:54 +08:00
internal_label->client_subscribe_id->subscribe_id,
2020-01-16 16:20:35 +08:00
maat_ret,
result[hit_num].config_id,
result[hit_num].service_id,
(unsigned char)result[hit_num].action,
2020-01-16 16:20:35 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
2019-12-11 15:13:27 +08:00
hit_num+=maat_ret;
}
2020-01-16 16:20:35 +08:00
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_SUBSCRIBER",
"No hit source subscribe id: %s scan ret: %d addr: %s",
2020-05-14 15:52:54 +08:00
internal_label->client_subscribe_id->subscribe_id,
2020-01-16 16:20:35 +08:00
maat_ret,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
2019-12-11 15:13:27 +08:00
}
2020-05-14 15:52:54 +08:00
if(internal_label->server_subscribe_id!=NULL)
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
{
2019-12-11 15:13:27 +08:00
maat_ret=Maat_full_scan_string(maat_feather,
2020-01-10 17:26:33 +08:00
g_tsg_para.table_id[TABLE_SUBSCRIBER_ID],
2019-12-11 15:13:27 +08:00
CHARSET_GBK,
2020-05-14 15:52:54 +08:00
internal_label->server_subscribe_id->subscribe_id,
strlen(internal_label->server_subscribe_id->subscribe_id),
2019-12-11 15:13:27 +08:00
result+hit_num,
&found_pos,
result_num-hit_num,
mid,
a_stream->threadnum);
if(maat_ret > 0)
{
2020-01-16 16:20:35 +08:00
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_SUBSCRIBER",
"Hit dest subscribe id: %s scan ret: %d policy_id: %d service: %d action: %d addr: %s",
2020-05-14 15:52:54 +08:00
internal_label->server_subscribe_id->subscribe_id,
2020-01-16 16:20:35 +08:00
maat_ret,
result[hit_num].config_id,
result[hit_num].service_id,
(unsigned char)result[hit_num].action,
2020-01-16 16:20:35 +08:00
printaddr(&a_stream->addr, a_stream->threadnum)
);
2019-12-11 15:13:27 +08:00
hit_num+=maat_ret;
}
2020-01-16 16:20:35 +08:00
else
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_DEBUG,
"SCAN_SUBSCRIBER",
"No hit dest subscribe id: %s scan ret: %d addr: %s",
2020-05-14 15:52:54 +08:00
internal_label->server_subscribe_id->subscribe_id,
2020-01-16 16:20:35 +08:00
maat_ret,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
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
ret=project_req_add_struct((struct streaminfo *)a_stream, g_tsg_para.internal_project_id, (void *)internal_label);
if(ret<0)
{
MESA_handle_runtime_log(g_tsg_para.logger,
RLOG_LV_FATAL,
"ADD_INTERNAL_LABEL",
"Add internal label failed, ret: %d addr: %s",
ret,
printaddr(&a_stream->addr, a_stream->threadnum)
);
}
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
return hit_num;
}
//return value: -1: failed, 0: not hit, >0: hit count
2020-01-10 17:26:33 +08:00
int tsg_scan_shared_policy(Maat_feather_t maat_feather, struct _identify_info *identify_info, Maat_rule_t *result, int result_num, scan_status_t *mid, int thread_seq)
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
int ret=0,idx=0;
if(identify_info->proto!=PROTO_UNKONWN && identify_info->domain_len>0)
{
switch(identify_info->proto)
{
case PROTO_HTTP:
idx=TABLE_HTTP_HOST;
break;
case PROTO_SSL:
idx=TABLE_SSL_SNI;
break;
case PROTO_QUIC:
idx=TABLE_SSL_SNI;
break;
2020-01-10 17:26:33 +08:00
default:
return 0;
break;
}
ret=Maat_full_scan_string(g_tsg_maat_feather,
g_tsg_para.table_id[idx],
CHARSET_UTF8,
identify_info->domain,
identify_info->domain_len,
result,
NULL,
result_num,
mid,
thread_seq
);
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
return ret;
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
}
struct Maat_rule_t *tsg_fetch_deny_rule(Maat_rule_t *result, int result_num)
{
int i=0;
Maat_rule_t *p_result=NULL;
for(i=0; i< result_num; i++)
{
if(result[i].action==TSG_ACTION_DENY || result[i].action==TSG_ACTION_BYPASS)
{
if(p_result==NULL)
{
p_result=&result[i];
continue;
}
if(result[i].action > p_result->action)
{
p_result=&result[i];
continue;
}
if((result[i].action==p_result->action) && (result[i].config_id > p_result->config_id))
{
p_result=&result[i];
}
}
}
return p_result;
}
int tsg_get_method_id(char *method)
{
int i=0;
for(i=0; i<TSG_METHOD_TYPE_MAX; i++)
{
if(method2index[i].len==(int)strlen(method) && (strncasecmp(method2index[i].type, method, method2index[i].len))==0)
{
return method2index[i].index;
}
}
return -1;
}