gfwleak/tango-tsg-master
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59 Commits 12 Branches 296 Tags
03109fb27ef3595fd90cf17cdb9a2aa2b81908df
Commit Graph

59 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liuxueli
03109fb27e 修正配置文件 2020-01-07 10:45:47 +08:00
liuxueli
4235b37036 修复笔误，流量统计数组下标使用错误导致统计异常 2019-12-26 10:41:06 +08:00
liuxueli
ae555ab98b 增加统计功能 2019-12-25 15:27:15 +08:00
liuxueli
4ae73e796c 修复笔误，会导致获取阻断方式失败 
增加自动生成版本号
 2019-12-25 15:23:40 +08:00
liuxueli
fb1511e25c 提供阻断方式判断函数接口 
提供统计命中策略流量信息函数接口
根据sapp提供信息，实现部分统计信息
 2019-12-20 11:15:29 +08:00
liuxueli
68bc2cea5b 更新配置文件 
添加autorelease.sh文件
增加预安装脚本
 2019-12-12 15:38:14 +08:00
liuxueli
7282a23e29 build阶段添加artifacts 2019-12-11 16:38:24 +08:00
liuxueli
95de95a1e4 Merge branch 'develop' 
# Conflicts:
#	src/tsg_entry.cpp
#	src/tsg_entry.h
#	src/tsg_rule.cpp
 2019-12-11 15:26:08 +08:00
liuxueli
f7c3d2fcf7 实现subscribe_id功能 2019-12-11 15:13:27 +08:00
liuxueli
f34f50c114 Merge branch 'feature-fast-path' into develop 2019-12-11 10:12:22 +08:00
liuxueli
c200d5af71 增加Dockerfile 2019-12-11 10:03:10 +08:00
liuxueli
a27c73e2e5 Merge branch 'feature-fast-path' into develop 2019-12-11 10:01:33 +08:00
liuxueli
8cbf0f29a1 增加CI 2019-12-10 18:36:53 +08:00
杨威
64c1dcb159 Squashed commit of the following: 
commit 91574444c3
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Dec 3 11:44:16 2019 +0800

    公共字段中的通信市时长单位是：ms；转换单位
    KNI发日志需等待TFE结束，需提前构造streaminfo日志字段，调整包数字节数统计位置
    细化调整日志

commit ff053e3e2c
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:38:35 2019 +0800

    增加调试日志信息

commit 2d1a530165
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:27:06 2019 +0800

    使用前置声明结构体，修改接口函数原型

commit 27f0cfc91a
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 10:33:48 2019 +0800

    提供TLD_append_streaminfo函数接口供KNI使用
    修改配置文件

commit ed0b17a49d
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 04963fe1bf
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Tue Nov 26 17:41:43 2019 +0800

    增加http解析部分

commit 132d807af1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 26 16:58:54 2019 +0800

    调整调试日志内容

commit 8cfc6b32fd
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 19:30:08 2019 +0800

    增加调试日志信息

commit 4aef0628e5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 18:36:48 2019 +0800

    增加调试信息

commit 7c9dabdab5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 10:51:37 2019 +0800

    矫正tableinfo配置项

commit 34ec2059ea
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 27cb2ad3b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 19:21:08 2019 +0800

    获取包数、字节数与sapp头文件不一致，导致统计信息颠倒
    删除从vxlan里获取信息

commit 2b96c050d5
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 46a233b782
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 10:18:08 2019 +0800

    KNI发送日志的线程不是sapp申请的，所以不能使用dictator_malloc申请内存
    增加user_region日志字段

commit 8d954e4cc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 20 19:55:59 2019 +0800

    修改proto初始值为PROTO_UNKONWN

commit 0a11db6d2e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:02:54 2019 +0800

    增加总控配置文件

commit 5c04ba23aa
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:00:35 2019 +0800

    SSL_SNI和HTTP_HOST的deny动作由总控负责处理
    修复获取全局流ID时的错误

commit 291c05ea79
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 16:40:19 2019 +0800

    增加获取全局流ID的接口
    调整总控注册为TCP入口

commit 28da97b53b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 14:45:41 2019 +0800

    支持平台提供的APP_STATE_KILL_OTHER
    修复BUG，天剑流标签时未对协议进行赋值，导致tfe颁发证书失败

commit 7912ec54b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 18:41:31 2019 +0800

    修复BUG，命中拦截策略时未对类型进行赋值，导致KNI获取不到命中结果
    添加总控配置文件
    添加FS2统计日志
    添加错误日志
    构造适用sapp4.0的rpm

commit 484feaed94
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 13:39:37 2019 +0800

    增加获取deny结果规则的接口
    修复自测试过程中遇到的BUG

commit 5165173025
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 6b6cbeffa1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 14:50:32 2019 +0800

    修复初始化错误

commit e7532d6280
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:33:29 2019 +0800

    添加遗漏头文件tsg_entry.h

commit f33d11c50b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:29:28 2019 +0800

    修复编译错误

commit 88d9368cee
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:25:38 2019 +0800

    合并头文件，删除无用头文件

commit 382ca0a793
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:25 2019 +0800

    Delete tsg_types.h

commit ab58f918e5
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:05 2019 +0800

    Delete tsg_log_id.h

commit 3b13075701
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:20:57 2019 +0800

    Delete tsg_entry.h

commit 186e591dbf
Merge: 39f82ed 91c511c
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:44 2019 +0800

    Merge branch 'master' into feature-kni

commit 39f82ed3f7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:39 2019 +0800

    接口适配

commit 8913a7d22e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Fri Nov 15 19:29:54 2019 +0800

    规则排序功能
    统一发送日志功能

commit 1cb2358fea
Merge: c76bc55 bd65acc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Thu Nov 14 15:06:35 2019 +0800

    合并master修改

commit c76bc5534d
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:56:19 2019 +0800

    接口增加protocol参数

commit db7282dab7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:24:22 2019 +0800

    扫描接口增加domain

commit 56fadd73b2
Merge: f9aee05 9e738ae
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:08:55 2019 +0800

    Merge branch 'master' into feature-kni

commit f9aee05bcc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:17:59 2019 +0800

    修改ssl_utils文件名

commit 452a08790c
Merge: 3abe8a2 c1ffc53
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:12:14 2019 +0800

    Merge branch 'master' into feature-kni

commit 3abe8a2fc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:11:38 2019 +0800

    添加kni模块扫描部分
 2019-12-09 18:58:05 +08:00
yangwei
b7c0e88dd6 Squashed commit of the following: 
commit 91574444c3
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Dec 3 11:44:16 2019 +0800

    公共字段中的通信市时长单位是：ms；转换单位
    KNI发日志需等待TFE结束，需提前构造streaminfo日志字段，调整包数字节数统计位置
    细化调整日志

commit ff053e3e2c
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:38:35 2019 +0800

    增加调试日志信息

commit 2d1a530165
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 11:27:06 2019 +0800

    使用前置声明结构体，修改接口函数原型

commit 27f0cfc91a
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 27 10:33:48 2019 +0800

    提供TLD_append_streaminfo函数接口供KNI使用
    修改配置文件

commit ed0b17a49d
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 04963fe1bf
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Tue Nov 26 17:41:43 2019 +0800

    增加http解析部分

commit 132d807af1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 26 16:58:54 2019 +0800

    调整调试日志内容

commit 8cfc6b32fd
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 19:30:08 2019 +0800

    增加调试日志信息

commit 4aef0628e5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 18:36:48 2019 +0800

    增加调试信息

commit 7c9dabdab5
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 25 10:51:37 2019 +0800

    矫正tableinfo配置项

commit 34ec2059ea
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 27cb2ad3b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 19:21:08 2019 +0800

    获取包数、字节数与sapp头文件不一致，导致统计信息颠倒
    删除从vxlan里获取信息

commit 2b96c050d5
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 46a233b782
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Thu Nov 21 10:18:08 2019 +0800

    KNI发送日志的线程不是sapp申请的，所以不能使用dictator_malloc申请内存
    增加user_region日志字段

commit 8d954e4cc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 20 19:55:59 2019 +0800

    修改proto初始值为PROTO_UNKONWN

commit 0a11db6d2e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:02:54 2019 +0800

    增加总控配置文件

commit 5c04ba23aa
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 18:00:35 2019 +0800

    SSL_SNI和HTTP_HOST的deny动作由总控负责处理
    修复获取全局流ID时的错误

commit 291c05ea79
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 16:40:19 2019 +0800

    增加获取全局流ID的接口
    调整总控注册为TCP入口

commit 28da97b53b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Wed Nov 20 14:45:41 2019 +0800

    支持平台提供的APP_STATE_KILL_OTHER
    修复BUG，天剑流标签时未对协议进行赋值，导致tfe颁发证书失败

commit 7912ec54b2
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 18:41:31 2019 +0800

    修复BUG，命中拦截策略时未对类型进行赋值，导致KNI获取不到命中结果
    添加总控配置文件
    添加FS2统计日志
    添加错误日志
    构造适用sapp4.0的rpm

commit 484feaed94
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Tue Nov 19 13:39:37 2019 +0800

    增加获取deny结果规则的接口
    修复自测试过程中遇到的BUG

commit 5165173025
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 6b6cbeffa1
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 14:50:32 2019 +0800

    修复初始化错误

commit e7532d6280
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:33:29 2019 +0800

    添加遗漏头文件tsg_entry.h

commit f33d11c50b
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:29:28 2019 +0800

    修复编译错误

commit 88d9368cee
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:25:38 2019 +0800

    合并头文件，删除无用头文件

commit 382ca0a793
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:25 2019 +0800

    Delete tsg_types.h

commit ab58f918e5
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:21:05 2019 +0800

    Delete tsg_log_id.h

commit 3b13075701
Author: 刘学利 <liuxueli@iie.ac.cn>
Date:   Mon Nov 18 13:20:57 2019 +0800

    Delete tsg_entry.h

commit 186e591dbf
Merge: 39f82ed 91c511c
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:44 2019 +0800

    Merge branch 'master' into feature-kni

commit 39f82ed3f7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Fri Nov 15 21:22:39 2019 +0800

    接口适配

commit 8913a7d22e
Author: liuxueli <liuxueli@iie.ac.cn>
Date:   Fri Nov 15 19:29:54 2019 +0800

    规则排序功能
    统一发送日志功能

commit 1cb2358fea
Merge: c76bc55 bd65acc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Thu Nov 14 15:06:35 2019 +0800

    合并master修改

commit c76bc5534d
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:56:19 2019 +0800

    接口增加protocol参数

commit db7282dab7
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:24:22 2019 +0800

    扫描接口增加domain

commit 56fadd73b2
Merge: f9aee05 9e738ae
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 19:08:55 2019 +0800

    Merge branch 'master' into feature-kni

commit f9aee05bcc
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:17:59 2019 +0800

    修改ssl_utils文件名

commit 452a08790c
Merge: 3abe8a2 c1ffc53
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:12:14 2019 +0800

    Merge branch 'master' into feature-kni

commit 3abe8a2fc5
Author: 崔一鸣 <cuiyiming@iie.ac.cn>
Date:   Wed Nov 13 16:11:38 2019 +0800

    添加kni模块扫描部分
 2019-12-09 18:53:40 +08:00
liuxueli
91574444c3 公共字段中的通信市时长单位是：ms；转换单位 
KNI发日志需等待TFE结束，需提前构造streaminfo日志字段，调整包数字节数统计位置
细化调整日志
 2019-12-03 11:44:16 +08:00
liuxueli
ff053e3e2c 增加调试日志信息 2019-11-27 11:38:35 +08:00
liuxueli
2d1a530165 使用前置声明结构体，修改接口函数原型 2019-11-27 11:27:06 +08:00
liuxueli
27f0cfc91a 提供TLD_append_streaminfo函数接口供KNI使用 
修改配置文件
 2019-11-27 10:33:48 +08:00
崔一鸣
ed0b17a49d Merge branch 'feature-kni' into 'develop' 
增加http解析部分

See merge request tango/tsg_master!3
 2019-11-26 17:44:28 +08:00
崔一鸣
04963fe1bf 增加http解析部分 2019-11-26 17:41:43 +08:00
liuxueli
132d807af1 调整调试日志内容 2019-11-26 16:58:54 +08:00
liuxueli
8cfc6b32fd 增加调试日志信息 2019-11-25 19:30:08 +08:00
liuxueli
4aef0628e5 增加调试信息 2019-11-25 18:36:48 +08:00
liuxueli
7c9dabdab5 矫正tableinfo配置项 2019-11-25 10:51:37 +08:00
liuxueli
34ec2059ea Merge branch 'develop' of https://git.mesalab.cn/tango/tsg_master into develop 2019-11-25 10:00:18 +08:00
liuxueli
27cb2ad3b2 获取包数、字节数与sapp头文件不一致，导致统计信息颠倒 
删除从vxlan里获取信息
 2019-11-21 19:21:08 +08:00
崔一鸣
2b96c050d5 Merge branch 'feature-kni' into 'develop' 
修改proto初始值为PROTO_UNKONWN

See merge request tango/tsg_master!2
 2019-11-21 10:22:42 +08:00
liuxueli
46a233b782 KNI发送日志的线程不是sapp申请的，所以不能使用dictator_malloc申请内存 
增加user_region日志字段
 2019-11-21 10:18:08 +08:00
崔一鸣
8d954e4cc5 修改proto初始值为PROTO_UNKONWN 2019-11-20 19:56:08 +08:00
liuxueli
0a11db6d2e 增加总控配置文件 2019-11-20 18:03:15 +08:00
liuxueli
5c04ba23aa SSL_SNI和HTTP_HOST的deny动作由总控负责处理 
修复获取全局流ID时的错误
 2019-11-20 18:00:37 +08:00
liuxueli
291c05ea79 增加获取全局流ID的接口 
调整总控注册为TCP入口
 2019-11-20 16:40:22 +08:00
liuxueli
28da97b53b 支持平台提供的APP_STATE_KILL_OTHER 
修复BUG，天剑流标签时未对协议进行赋值，导致tfe颁发证书失败
 2019-11-20 14:45:41 +08:00
liuxueli
7912ec54b2 修复BUG，命中拦截策略时未对类型进行赋值，导致KNI获取不到命中结果 
添加总控配置文件
添加FS2统计日志
添加错误日志
构造适用sapp4.0的rpm
 2019-11-19 18:41:36 +08:00
liuxueli
484feaed94 增加获取deny结果规则的接口 
修复自测试过程中遇到的BUG
 2019-11-19 13:39:37 +08:00
崔一鸣
5165173025 Merge branch 'feature-fast-path' into feature-kni 2019-11-18 15:53:48 +08:00
liuxueli
6b6cbeffa1 修复初始化错误 2019-11-18 14:50:32 +08:00
liuxueli
e7532d6280 添加遗漏头文件tsg_entry.h 2019-11-18 13:33:29 +08:00
liuxueli
f33d11c50b 修复编译错误 2019-11-18 13:29:28 +08:00
liuxueli
88d9368cee 合并头文件，删除无用头文件 2019-11-18 13:25:38 +08:00
刘学利
382ca0a793 Delete tsg_types.h 2019-11-18 13:21:25 +08:00
刘学利
ab58f918e5 Delete tsg_log_id.h 2019-11-18 13:21:05 +08:00
刘学利
3b13075701 Delete tsg_entry.h 2019-11-18 13:20:57 +08:00
崔一鸣
186e591dbf Merge branch 'master' into feature-kni 2019-11-15 21:33:07 +08:00
崔一鸣
39f82ed3f7 接口适配 2019-11-15 21:22:39 +08:00
liuxueli
8913a7d22e 规则排序功能 
统一发送日志功能
 2019-11-15 19:29:54 +08:00
liuxueli
91c511c3ed 提供统一发送日志接口系列函数 2019-11-15 14:37:18 +08:00
崔一鸣
1cb2358fea 合并master修改 2019-11-14 15:10:30 +08:00
liuxueli
bd65acc17d 更新函数接口，增加传出参数，将部分参数合并为结构体 2019-11-14 11:52:40 +08:00