diff options
| author | luwenpeng <[email protected]> | 2024-06-12 15:54:22 +0800 |
|---|---|---|
| committer | luwenpeng <[email protected]> | 2024-06-12 17:57:54 +0800 |
| commit | b17ece25739b4d65b74114ea827dcb4a84364f2b (patch) | |
| tree | 1dbd3fc7b4f4f41944d423b51e39f0a8bb6a7b7f | |
| parent | 745187d0a3ef278348bb1dbe8d3ec2c69819c082 (diff) | |
netfilter bypass no cmsg packetv4.9.3-20240614
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | ci/travis.sh | 4 | ||||
| -rw-r--r-- | platform/src/acceptor_kni_v3.cpp | 6 |
3 files changed, 12 insertions, 8 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0b17169..19b07a3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,7 @@ develop_build_debug: extends: .build_by_travis variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 + # UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug ASAN_OPTION: ADDRESS PACKAGE: 1 @@ -64,8 +64,8 @@ develop_build_release: extends: .build_by_travis variables: TESTING_VERSION_BUILD: 1 - UPLOAD_SYMBOL_FILES: 1 - # ASAN_OPTION: ADDRESS + # UPLOAD_SYMBOL_FILES: 1 + # ASAN_OPTION: ADDRESS BUILD_TYPE: RelWithDebInfo PACKAGE: 1 PULP3_REPO_NAME: tfe-testing-x86_64.el7 @@ -81,7 +81,7 @@ develop_build_release: release_build_debug: stage: build variables: - UPLOAD_SYMBOL_FILES: 1 + # UPLOAD_SYMBOL_FILES: 1 BUILD_TYPE: Debug PACKAGE: 1 PULP3_REPO_NAME: tfe-stable-x86_64.el7 @@ -98,7 +98,7 @@ release_build_release: stage: build variables: BUILD_TYPE: RelWithDebInfo - UPLOAD_SYMBOL_FILES: 1 + # UPLOAD_SYMBOL_FILES: 1 PACKAGE: 1 PULP3_REPO_NAME: tfe-stable-x86_64.el7 PULP3_DIST_NAME: tfe-stable-x86_64.el7 diff --git a/ci/travis.sh b/ci/travis.sh index 19470d9..ccc7cd5 100644 --- a/ci/travis.sh +++ b/ci/travis.sh @@ -33,8 +33,8 @@ env | sort : "${COMPILER_IS_GNUCXX:=OFF}" # Install dependency from YUM -yum install -y mrzcpd numactl-devel zlib-devel librdkafka-devel systemd-devel -yum install -y libcjson-devel libmaatframe-devel libMESA_field_stat2-devel libMESA_handle_logger-devel +yum install -y mrzcpd-4.4.8.566081c numactl-devel zlib-devel librdkafka-devel systemd-devel +yum install -y libcjson-devel libmaatframe-3.4.8.c84fb97 libmaatframe-devel-3.4.8.c84fb97 libMESA_field_stat2-devel libMESA_handle_logger-devel yum install -y libMESA_htable-devel libMESA_prof_load-devel librulescan-devel libwiredcfg-devel libWiredLB-devel sapp-devel libbreakpad_mini-devel yum install -y libasan yum install -y libmnl-devel libnfnetlink-devel diff --git a/platform/src/acceptor_kni_v3.cpp b/platform/src/acceptor_kni_v3.cpp index 290167f..194a031 100644 --- a/platform/src/acceptor_kni_v3.cpp +++ b/platform/src/acceptor_kni_v3.cpp @@ -371,6 +371,11 @@ static int payload_handler_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg, s cmsg_offset = ntohs(cmsg_offset); cmsg_payload = (char *)(pktinfo.data + cmsg_offset); cmsg_payload_len = pktinfo.data_len - cmsg_offset; + if (cmsg_payload_len == 0) + { + TFE_LOG_DEBUG(g_default_logger, "cmsg payload len is 0, no need to restore, just pass"); + goto end; + } // 从 cmsg 中解析信息存储到 restore_info 中 ret = tcp_restore_info_parse_from_cmsg(cmsg_payload, cmsg_payload_len, &restore_info); @@ -449,7 +454,6 @@ static int payload_handler_cb(struct nfq_q_handle *qh, struct nfgenmsg *nfmsg, s // nfq_set_verdict_batch() // nfq_set_verdict_batch2() // nfq_set_verdict_mark() - return nfq_set_verdict(qh, id, NF_ACCEPT, pktinfo.ip_totlen, raw_payload); end: |