From b7a0b7ef9f4e0597d06e3cbe56b994ef387662ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B4=94=E4=B8=80=E9=B8=A3?= Date: Mon, 2 Dec 2019 16:52:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=8F=8C=E8=87=82=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=B8=8B=E6=B2=A1=E6=9C=89=E5=8E=9F=E5=A7=8Bmac?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- entry/src/kni_entry.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp index 2266e87..34f4090 100644 --- a/entry/src/kni_entry.cpp +++ b/entry/src/kni_entry.cpp @@ -554,6 +554,8 @@ static unsigned char* kni_cmsg_serialize_header_new(struct pme_info *pmeinfo, st uint16_t server_mss = htons(pmeinfo->server_tcpopt.mss); uint16_t client_window = htons(pmeinfo->client_window); uint16_t server_window = htons(pmeinfo->server_window); + char src_mac[6] = {0}; + char dst_mac[6] = {0}; //seq int ret = wrapped_kni_cmsg_set(cmsg, TFE_CMSG_TCP_RESTORE_SEQ, (const unsigned char*)&seq, 4, pmeinfo); if(ret < 0) goto error_out; @@ -606,22 +608,18 @@ static unsigned char* kni_cmsg_serialize_header_new(struct pme_info *pmeinfo, st strnlen(pmeinfo->stream_traceid, sizeof(pmeinfo->stream_traceid)), pmeinfo); if(ret < 0) goto error_out; //src mac - char src_mac[6]; ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_VXLAN_OUTER_GDEV_MAC, src_mac); if(ret < 0){ - KNI_LOG_ERROR(logger, "Failed at get src mac from rawpkt, ret = %d", ret); - goto error_out; + KNI_LOG_DEBUG(logger, "Failed at get src mac from rawpkt, ret = %d, maybe two-arm mode", ret); } KNI_LOG_DEBUG(logger, "Succeed at get src mac from rawpkt, addr = %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", src_mac[0], src_mac[1], src_mac[2], src_mac[3], src_mac[4], src_mac[5]); ret = wrapped_kni_cmsg_set(cmsg, TFE_CMSG_SRC_MAC, (const unsigned char*)src_mac, sizeof(src_mac), pmeinfo); if(ret < 0) goto error_out; //dst mac - char dst_mac[6]; ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_VXLAN_OUTER_LOCAL_MAC, dst_mac); if(ret < 0){ - KNI_LOG_ERROR(logger, "Failed at get dst mac from rawpkt, ret = %d", ret); - goto error_out; + KNI_LOG_DEBUG(logger, "Failed at get dst mac from rawpkt, ret = %d, maybe two-arm mode", ret); } KNI_LOG_DEBUG(logger, "Succeed at get dst mac from rawpkt, addr = %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", dst_mac[0], dst_mac[1], dst_mac[2], dst_mac[3], dst_mac[4], dst_mac[5]);