summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author崔一鸣 <[email protected]>2019-09-24 17:15:13 +0800
committer崔一鸣 <[email protected]>2019-09-24 17:15:13 +0800
commite65880ab16398ee4eff62d88f9a64647b43c3800 (patch)
treef5be1baee58dfd41d351e66a150f8d172949d1c4
parent92436d0c1b34c08fa59f55c0019665bc7025922a (diff)
修改ip转换时笔误v2.1.1-20190924
-rw-r--r--entry/src/kni_entry.cpp8
-rw-r--r--entry/src/kni_maat.cpp4
2 files changed, 6 insertions, 6 deletions
diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp
index 496d4c2..12ea48d 100644
--- a/entry/src/kni_entry.cpp
+++ b/entry/src/kni_entry.cpp
@@ -352,8 +352,8 @@ static int log_generate(struct pme_info *pmeinfo, void *local_logger){
switch(addr->addrtype){
case ADDR_TYPE_IPV4:
cJSON_AddNumberToObject(log_obj, "addr_type", 4);
- inet_ntop(AF_INET, &addr->tuple4_v4->saddr, client_ip_str, sizeof(client_ip_str));
- inet_ntop(AF_INET, &addr->tuple4_v4->daddr, server_ip_str, sizeof(server_ip_str));
+ inet_ntop(AF_INET, &(addr->tuple4_v4->saddr), client_ip_str, sizeof(client_ip_str));
+ inet_ntop(AF_INET, &(addr->tuple4_v4->daddr), server_ip_str, sizeof(server_ip_str));
cJSON_AddStringToObject(log_obj, "client_ip", client_ip_str);
cJSON_AddStringToObject(log_obj, "server_ip", server_ip_str);
cJSON_AddNumberToObject(log_obj, "client_port", ntohs(addr->tuple4_v4->source));
@@ -362,8 +362,8 @@ static int log_generate(struct pme_info *pmeinfo, void *local_logger){
break;
case ADDR_TYPE_IPV6:
cJSON_AddNumberToObject(log_obj, "addr_type", 6);
- inet_ntop(AF_INET6, &addr->tuple4_v6->saddr, client_ip_str, sizeof(client_ip_str));
- inet_ntop(AF_INET6, &addr->tuple4_v6->daddr, server_ip_str, sizeof(server_ip_str));
+ inet_ntop(AF_INET6, addr->tuple4_v6->saddr, client_ip_str, sizeof(client_ip_str));
+ inet_ntop(AF_INET6, addr->tuple4_v6->daddr, server_ip_str, sizeof(server_ip_str));
cJSON_AddStringToObject(log_obj, "client_ip", client_ip_str);
cJSON_AddStringToObject(log_obj, "server_ip", server_ip_str);
cJSON_AddNumberToObject(log_obj, "client_port", ntohs(addr->tuple4_v6->source));
diff --git a/entry/src/kni_maat.cpp b/entry/src/kni_maat.cpp
index cb9c5a2..ca88fcf 100644
--- a/entry/src/kni_maat.cpp
+++ b/entry/src/kni_maat.cpp
@@ -310,8 +310,8 @@ enum kni_action intercept_policy_scan(struct kni_maat_handle* handle, struct ipa
scan_status_t scan_mid = NULL;
int scan_ret = 0, hit_policy_cnt = 0, enforced_policy_idx = 0;
//scan subscribe_id
- char sip[INET6_ADDRSTRLEN];
- char dip[INET6_ADDRSTRLEN];
+ char sip[INET6_ADDRSTRLEN] = "";
+ char dip[INET6_ADDRSTRLEN] = "";
get_ip_from_ipaddr(addr, sip, 0);
get_ip_from_ipaddr(addr, dip, 1);
char* source_subscribe_id = NULL, *dest_subscribe_id = NULL;