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

修正typos。

Browse Source
This commit is contained in:
zhengchao
2018-12-01 13:38:23 +08:00
parent 5b4729d00b
commit 37f32d59f0
3 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
kni_entry.c
View File

@@ -1009,7 +1009,7 @@ extern "C" char kni_http_entry(stSessionInfo* session_info, void **pme, int thr
{ {
char ret=PROT_STATE_DROPME; char ret=PROT_STATE_DROPME;
int host_len=session_info->buflen>KNI_DEFAULT_MTU?KNI_DEFAULT_MTU:session_info->buflen; int host_len=MIN(session_info->buflen, KNI_DEFAULT_MTU);
struct kni_http_project* host_info=ALLOC(struct kni_http_project, 1); struct kni_http_project* host_info=ALLOC(struct kni_http_project, 1);
host_info->host_len=host_len; host_info->host_len=host_len;
memcpy(host_info->host,session_info->buf,host_len); memcpy(host_info->host,session_info->buf,host_len);
@@ -1377,17 +1377,17 @@ int init_kni_static_maat_info()
char inc_cfg_dir[KNI_CONF_MAXLEN]={0}; char inc_cfg_dir[KNI_CONF_MAXLEN]={0};
MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"maat_readconf_mode",&maat_readconf_mode,KNI_READCONF_IRIS); MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"maat_readconf_mode",&maat_readconf_mode,KNI_READCONF_IRIS);
MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"scandir_interval",&scandir_interval,KNI_SCANDIR_INTERVAL); MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"scandir_interval",&scandir_interval,KNI_SCANDIR_INTERVAL);
MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"effect_interval",&effect_interval,KNI_EFFECT_INTERVAL); MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"effect_interval",&effect_interval,KNI_EFFECT_INTERVAL);
MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"redis_db_index",&redis_db_index,0); MESA_load_profile_int_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"redis_db_index",&redis_db_index,0);
MESA_load_profile_int_nodef((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"redis_port",(int*)&redis_port); MESA_load_profile_int_nodef((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"redis_port",(int*)&redis_port);
MESA_load_profile_string_nodef((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"redis_server",redis_ip,INET_ADDRSTRLEN); MESA_load_profile_string_nodef((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"redis_server",redis_ip,INET_ADDRSTRLEN);
MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"table_info_path",table_info_path,KNI_CONF_MAXLEN,KNI_TABLEINFO_PATH); MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"table_info_path",table_info_path,KNI_CONF_MAXLEN,KNI_TABLEINFO_PATH);
MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"inc_cfg_dir",inc_cfg_dir,KNI_CONF_MAXLEN,KNI_INCCFG_FILEPATH); MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"inc_cfg_dir",inc_cfg_dir,KNI_CONF_MAXLEN,KNI_INCCFG_FILEPATH);
MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"stat_file_path",stat_file_dir,KNI_CONF_MAXLEN,KNI_STAT_FILEPATH); MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"stat_file_path",stat_file_dir,KNI_CONF_MAXLEN,KNI_STAT_FILEPATH);
MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STICMAAT_MODE,(char*)"full_cfg_dir",full_cfg_dir,KNI_CONF_MAXLEN,KNI_FULLCFG_FILEPATH); MESA_load_profile_string_def((char*)KNI_CONF_FILENAME,(char*)KNI_STATIC_MAAT_MODE,(char*)"full_cfg_dir",full_cfg_dir,KNI_CONF_MAXLEN,KNI_FULLCFG_FILEPATH);
g_kni_maatinfo.maat_feather=Maat_feather(g_iThreadNum,table_info_path,g_kni_comminfo.logger); g_kni_maatinfo.maat_feather=Maat_feather(g_iThreadNum,table_info_path,g_kni_comminfo.logger);
@@ -1480,7 +1480,7 @@ int init_kni_sendpkt()
kni_read_cardname(); kni_read_cardname();
g_kni_comminfo.fd_sendpkt=(int*)malloc(g_kni_comminfo.thread_num*sizeof(int)); g_kni_comminfo.fd_sendpkt= ALLOC(int, g_kni_comminfo.thread_num);
for(i=0;i<g_kni_comminfo.thread_num;i++) for(i=0;i<g_kni_comminfo.thread_num;i++)
{ {
// g_kni_comminfo.ipv4_fd[i]=socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL)); // g_kni_comminfo.ipv4_fd[i]=socket(AF_PACKET, SOCK_RAW, htons(ETH_P_ALL));

2
kni_entry.h
View File

@@ -75,7 +75,7 @@
#define KNI_MAIN_MODE "main" #define KNI_MAIN_MODE "main"
#define KNI_FS_MODE "field_stat" #define KNI_FS_MODE "field_stat"
#define KNI_DYNMAAT_MODE "dynmic_maat" #define KNI_DYNMAAT_MODE "dynmic_maat"
#define KNI_STICMAAT_MODE "static_maat" #define KNI_STATIC_MAAT_MODE "static_maat"
#define KNI_TUN_MODE "tun" #define KNI_TUN_MODE "tun"
#define KNI_CONF_MODE "Module" #define KNI_CONF_MODE "Module"
#define KNI_CONF_FILENAME_MAIN "./conf/main.conf" #define KNI_CONF_FILENAME_MAIN "./conf/main.conf"

8
kni_intercept.c
View File

@@ -376,7 +376,7 @@ char kni_add_lqueue(int addrtype,int thread_seq,char* send_buf,int send_buflen,c
to_inject.addr_type = addrtype; to_inject.addr_type = addrtype;
to_inject.buflen = send_buflen; to_inject.buflen = send_buflen;
to_inject.buf = ALLOC(char, 1); to_inject.buf = ALLOC(char, send_buflen);
memcpy(to_inject.buf,send_buf,send_buflen); memcpy(to_inject.buf,send_buf,send_buflen);
clock_gettime(CLOCK_MONOTONIC, &(to_inject.start)); clock_gettime(CLOCK_MONOTONIC, &(to_inject.start));
@@ -949,7 +949,7 @@ char tun_write_data_listq(int fd,char* send_buf,int send_buflen,int thread_seq)
char tun_write_data(int fd,char* send_buf,int send_buflen,struct streaminfo* pstream,int thread_seq) char tun_write_data(int fd, const char* send_buf, size_t send_buflen,struct streaminfo* pstream,int thread_seq)
{ {
char ret=APP_STATE_DROPPKT|APP_STATE_GIVEME; char ret=APP_STATE_DROPPKT|APP_STATE_GIVEME;
int succ_sendlen=0; int succ_sendlen=0;
@@ -1167,6 +1167,10 @@ int tcprepair_get_state(int curdir,const struct layer_addr* addr,struct kni_tcp_
{ {
tcphdr = (struct kni_tcp_hdr*)((unsigned char*)a_packet + sizeof(struct kni_ipv6_hdr)); tcphdr = (struct kni_tcp_hdr*)((unsigned char*)a_packet + sizeof(struct kni_ipv6_hdr));
} }
else
{
assert(0);
}
fake_client->seq=ntohl(tcphdr->th_seq); fake_client->seq=ntohl(tcphdr->th_seq);
fake_client->ack=ntohl(tcphdr->th_ack); fake_client->ack=ntohl(tcphdr->th_ack);