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

Merge branch 'master' into feature-kni

Browse Source
This commit is contained in:
崔一鸣
2019-11-15 21:22:44 +08:00
parent 39f82ed3f7 91c511c3ed
commit 186e591dbf
5 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/CMakeLists.txt
View File

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
add_definitions(-fPIC)
set(SRC tsg_entry.cpp tsg_rule.cpp ssl_utils.cpp tsg_send_log.cpp)
set(SRC tsg_entry.cpp tsg_rule.cpp tsg_ssl_utils.cpp tsg_send_log.cpp)
include_directories(${CMAKE_SOURCE_DIR}/inc)
include_directories(/opt/MESA/include/MESA/)

10
src/tsg_rule.cpp
View File

@@ -2,7 +2,7 @@
#include "MESA/MESA_handle_logger.h"
#include "Maat_rule.h"
#include "Maat_command.h"
#include "ssl_utils.h"
#include "tsg_ssl_utils.h"
#include "tsg_rule.h"
enum kni_scan_table{
@@ -16,7 +16,7 @@ const char *g_kni_scan_table_name[SCAN_TABLE_MAX];
int g_kni_scan_tableid[SCAN_TABLE_MAX] = {0};
static void protocol_identify(char *buff, int buff_len, struct _identify_info *result){
result->protocol = -1;
result->proto = PROTO_MAX;
//TODO: http: get from http protocol plugin
/*
if(is_http){
@@ -29,7 +29,7 @@ static void protocol_identify(char *buff, int buff_len, struct _identify_info *r
struct ssl_chello *chello = NULL;
chello = ssl_chello_parse((const unsigned char*)buff, buff_len, &chello_status);
if(chello_status == CHELLO_PARSE_SUCCESS){
result->protocol = PROTO_SSL;
result->proto = PROTO_SSL;
if(chello->sni == NULL){
result->domain_len = 0;
}
@@ -66,11 +66,11 @@ int tsg_scan_shared_policy(Maat_feather_t maat_feather, void *pkt, int pkt_len,
struct _identify_info *identify_info, scan_status_t *mid, void *logger, int thread_seq){
memset(identify_info, 0, sizeof(*identify_info));
protocol_identify((char*)pkt, pkt_len, identify_info);
if(identify_info->protocol != TSG_PROTOCOL_SSL && identify_info->protocol != TSG_PROTOCOL_HTTP){
if(identify_info->proto != PROTO_SSL && identify_info->proto != PROTO_HTTP){
return -1;
}
int tableid;
if(identify_info->protocol == TSG_PROTOCOL_SSL){
if(identify_info->proto == PROTO_SSL){
tableid = g_kni_scan_tableid[TSG_FIELD_SSL_SNI];
}
else{

2
src/tsg_ssl_utils.cpp
View File

@@ -2,7 +2,7 @@
#include <stdlib.h>
#include <stdint.h>
#include <string.h>
#include "ssl_utils.h"
#include "tsg_ssl_utils.h"
#define ALLOC(type, number) ((type *)calloc(sizeof(type), number))
#define FREE(p) {free(*p);*p=NULL;}