From caeb31db2f78e5be90ba06d8a3871371b20a4c1f Mon Sep 17 00:00:00 2001 From: fumingwei Date: Mon, 9 Nov 2020 14:19:15 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9versrion.cmake=20VERSION?= =?UTF-8?q?=5FDATE=20=E4=B8=BA=20KNI=5FVERSION=5FDATE=202.=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9cmsg=20=E8=8E=B7=E5=8F=96=20scr=20mac=20=E5=92=8Cdst?= =?UTF-8?q?=20mac=20=E7=9A=84=E6=9E=9A=E4=B8=BE=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cmake/Version.cmake | 4 ++-- entry/src/kni_entry.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 5854564..56db972 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -18,10 +18,10 @@ include(${__VERSION_CONFIG}) string(REGEX REPLACE "^v([0-9]+)\\..*" "\\1" KNI_VERSION_MAJOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.([0-9]+).*" "\\1" KNI_VERSION_MINOR "${VCS_TAG}") string(REGEX REPLACE "^v[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" KNI_VERSION_PATCH "${VCS_TAG}") -string(REGEX REPLACE "[T\\:\\+\\-]" "" VERSION_DATE "${VCS_DATE}") +string(REGEX REPLACE "[T\\:\\+\\-]" "" KNI_VERSION_DATE "${VCS_DATE}") if(VERSION_DAILY_BUILD) - set(VERSION_PATCH ${VERSION_PATCH}.${VERSION_DATE}) + set(KNI_VERSION_PATCH ${KNI_VERSION_PATCH}.${KNI_VERSION_DATE}) endif() diff --git a/entry/src/kni_entry.cpp b/entry/src/kni_entry.cpp index 8a065a9..58750a5 100644 --- a/entry/src/kni_entry.cpp +++ b/entry/src/kni_entry.cpp @@ -529,7 +529,7 @@ static unsigned char* kni_cmsg_serialize_header_new(struct pme_info *pmeinfo, st } //src mac - ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_VXLAN_OUTER_GDEV_MAC, src_mac); + ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_ORIGINAL_LOWEST_ETH_SMAC, src_mac); if(ret < 0){ KNI_LOG_DEBUG(logger, "Failed at get src mac from rawpkt, ret = %d, maybe two-arm mode", ret); } @@ -538,7 +538,7 @@ static unsigned char* kni_cmsg_serialize_header_new(struct pme_info *pmeinfo, st 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 - ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_VXLAN_OUTER_LOCAL_MAC, dst_mac); + ret = get_rawpkt_opt_from_streaminfo(stream, RAW_PKT_GET_ORIGINAL_LOWEST_ETH_DMAC, dst_mac); if(ret < 0){ KNI_LOG_DEBUG(logger, "Failed at get dst mac from rawpkt, ret = %d, maybe two-arm mode", ret); }