读取本地json配置文件,可以进行SNAT的IP替换;DNAT暂未测试;未进行回归测试;
This commit is contained in:
60
kni_comm.c
60
kni_comm.c
@@ -14,54 +14,6 @@
|
||||
#include "kni_comm.h"
|
||||
|
||||
|
||||
/*
|
||||
const char *g_kni_fs2_name[FS2_COLUMN_NUM] =
|
||||
{
|
||||
"TCPALL",
|
||||
"UDP",
|
||||
"IP",
|
||||
"WHITE_IP",
|
||||
"WHITE_DOMAIN",
|
||||
"INTERCEPT",
|
||||
"RATELIMIT",
|
||||
"REPLACE",
|
||||
"HTTP",
|
||||
"SSL",
|
||||
"NOT_PROC",
|
||||
"TUN_WRITE",
|
||||
"TUN_READ",
|
||||
"SEND_MARSIO",
|
||||
"CLIENT_HELLO",
|
||||
"SSL_SNI(P)",
|
||||
"D_IPV6_OPT",
|
||||
"D_NOT_HTABLE",
|
||||
"D_NOT_IPV4/6_S",
|
||||
"D_NOT_IPV4/6_T",
|
||||
"D_E_ADDHTABLE",
|
||||
"D_OTHER",
|
||||
"REPR_TOTAL",
|
||||
"REPR_E_SOCK",
|
||||
"REPR_E_SET",
|
||||
"REPR_E_QIN",
|
||||
"REPR_E_QOUT",
|
||||
"REPR_SND",
|
||||
"REPR_E_SND",
|
||||
"PKT_QIN",
|
||||
"PKT_E_QIN",
|
||||
"PKT_QOUT",
|
||||
"PKT_E_QOUT",
|
||||
"PKT_WR",
|
||||
"PKT_E_WR",
|
||||
"LINK_OPENED",
|
||||
"LINK_CLS_TO",
|
||||
"LINK_CLS_FIN",
|
||||
"LINK_CLS_DROPME",
|
||||
"PME_NUM",
|
||||
"WINPROB_REPLY",
|
||||
"HTABLE_ADD",
|
||||
"HTABLE_DEL"
|
||||
};
|
||||
*/
|
||||
|
||||
char* kni_memncasemem(const char *strsrc,int len1,const char *substr,int len2)
|
||||
{
|
||||
@@ -509,12 +461,6 @@ int kni_filestate2_init()
|
||||
FS_set_para(g_kni_fs2_info.handler, STATS_SERVER_IP, fs2_sip, strlen(fs2_sip)+1);
|
||||
FS_set_para(g_kni_fs2_info.handler, STATS_SERVER_PORT,&fs2_sport,sizeof(int));
|
||||
}
|
||||
/*
|
||||
for(i=0;i<FS2_COLUMN_NUM;i++)
|
||||
{
|
||||
g_kni_fs2_info.column_id[i]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,g_kni_fs2_name[i]);
|
||||
}
|
||||
*/
|
||||
|
||||
|
||||
g_kni_fs2_info.field_id[FS_PENDING]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_pending");
|
||||
@@ -528,6 +474,8 @@ int kni_filestate2_init()
|
||||
g_kni_fs2_info.field_id[FS_NOT_HTTP_SSL]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_not_identify");
|
||||
g_kni_fs2_info.field_id[FS_WHITELIST]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_whitelist");
|
||||
g_kni_fs2_info.field_id[FS_INTERCEPT]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_intercept");
|
||||
g_kni_fs2_info.field_id[FS_REDIRECT]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_redirect");
|
||||
g_kni_fs2_info.field_id[FS_REDIRECT_REPLY]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_redirect_reply");
|
||||
g_kni_fs2_info.field_id[FS_RATELIMIT]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_ratelimit");
|
||||
g_kni_fs2_info.field_id[FS_NOT_HIT]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"link_not_hit");
|
||||
g_kni_fs2_info.field_id[FS_RATELIMIT_UDP]=FS_register(g_kni_fs2_info.handler, FS_STYLE_FIELD, FS_CALC_CURRENT,"ratelimit_udp_pkt");
|
||||
@@ -624,6 +572,10 @@ int kni_order_action(int old_action,int new_action)
|
||||
{
|
||||
return KNI_ACTION_MONITOR;
|
||||
}
|
||||
else if((old_action == KNI_ACTION_REDIRECT) || (new_action == KNI_ACTION_REDIRECT))
|
||||
{
|
||||
return KNI_ACTION_REDIRECT;
|
||||
}
|
||||
else if((old_action == KNI_ACTION_REPLACE) || (new_action == KNI_ACTION_REPLACE))
|
||||
{
|
||||
return KNI_ACTION_REPLACE;
|
||||
|
||||
Reference in New Issue
Block a user