Resolve OMPUB-1493 "Fix "

.gitlab-ci.yml

@@ -1,6 +1,5 @@
 variables:
   GIT_STRATEGY: "clone"
-  BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
   BUILD_IMAGE_CENTOS8: "git.mesalab.cn:7443/mesa_platform/build-env:rockylinux"
   BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
   INSTALL_DEPENDENCY_PLATFORM:  sapp-devel libasan systemd-devel libnsl glib2-devel
@@ -22,18 +21,6 @@ stages:
   - yum install -y elfutils-libelf-devel
 
 
-.build_by_travis_for_centos7:
-  stage: build
-  image: $BUILD_IMAGE_CENTOS7
-  extends: .build_before_script
-  script:
-    - yum install -y libmnl-devel
-    - yum install -y libnfnetlink-devel
-    - ./ci/travis.sh
-      - cd build
-  tags:
-  - share
-
 .build_by_travis_for_centos8:
   stage: build
   image: $BUILD_IMAGE_CENTOS8
@@ -45,15 +32,6 @@ stages:
   tags:
     - share
 
-run_test_for_centos7:
-  stage: test
-  extends: .build_by_travis_for_centos7
-  script:
-    - yum makecache
-    - ./ci/travis.sh
-    - cd build
-    - ctest --verbose
-
 run_test_for_centos8:
   stage: test
   extends: .build_by_travis_for_centos8
@@ -63,98 +41,6 @@ run_test_for_centos8:
     - cd build
     - ctest3 --verbose
 
-branch_build_debug_for_centos7:
-  stage: build
-  extends: .build_by_travis_for_centos7
-  variables:
-    BUILD_TYPE: Debug
-  except:
-    - /^develop.*$/i
-    - /^master.*$/i
-    - tags
-
-branch_build_release_for_centos7:
-  stage: build
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-  extends: .build_by_travis_for_centos7
-  except:
-    - /^develop.*$/i
-    - /^master.*$/i
-    - tags
-
-develop_build_debug_for_centos7:
-  stage: build
-  extends: .build_by_travis_for_centos7
-  variables:
-    BUILD_TYPE: Debug
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
-    TESTING_VERSION_BUILD: 1
-    PULP3_REPO_NAME: protocol-testing-x86_64.el7
-    PULP3_DIST_NAME: protocol-testing-x86_64.el7
-  artifacts:
-    name: "quic-$CI_COMMIT_REF_NAME-debug"
-    paths:
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-develop_build_release_for_centos7:
-  stage: build
-  extends: .build_by_travis_for_centos7
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    TESTING_VERSION_BUILD: 1
-    PULP3_REPO_NAME: protocol-testing-x86_64.el7
-    PULP3_DIST_NAME: protocol-testing-x86_64.el7
-  artifacts:
-    name: "quic-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - /^develop.*$/i
-    - /^master.*$/i
-
-release_build_debug_for_centos7:
-  stage: package
-  variables:
-    BUILD_TYPE: Debug
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    ASAN_OPTION: ADDRESS
-    PULP3_REPO_NAME: protocol-stable-x86_64.el7
-    PULP3_DIST_NAME: protocol-stable-x86_64.el7
-  extends: .build_by_travis_for_centos7
-  artifacts:
-    name: "quic-$CI_COMMIT_REF_NAME-debug"
-    paths:
-      - build/*.rpm
-  only:
-    - tags
-
-release_build_release_for_centos7:
-  stage: package
-  variables:
-    BUILD_TYPE: RelWithDebInfo
-    PACKAGE: 1
-    UPLOAD_RPM: 1
-    UPLOAD_SYMBOL_FILES: 1
-    SYMBOL_TARGET: quic
-    PULP3_REPO_NAME: protocol-stable-x86_64.el7
-    PULP3_DIST_NAME: protocol-stable-x86_64.el7
-  extends: .build_by_travis_for_centos7
-  artifacts:
-    name: "quic-$CI_COMMIT_REF_NAME-release"
-    paths:
-      - build/*.rpm
-  only:
-    - tags
-
 branch_build_debug_for_centos8:
   stage: build
   extends: .build_by_travis_for_centos8

src/quic_entry.cpp

@@ -208,7 +208,7 @@ extern "C" int QUIC_INIT(void)
 	MESA_load_profile_int_def(g_quic_proto_conffile, "QUIC", "DECRYPTED_SWITCH", &g_quic_param.decrypted_switch, 2);
 	MESA_load_profile_int_def(g_quic_proto_conffile, "QUIC", "MAX_PARSE_PKT_NUM", &g_quic_param.max_parse_pkt_num, 3);
 
-	MESA_load_profile_string_def(g_quic_proto_conffile, "QUIC", "QUIC_PORT_LIST", buff, sizeof(buff), "443;8443;");
+	MESA_load_profile_string_def(g_quic_proto_conffile, "QUIC", "QUIC_PORT_LIST", buff, sizeof(buff), "");
 	g_quic_param.quic_port_num=parse_quic_port(buff, g_quic_param.quic_port_list, SUPPORT_QUIC_PORT_NUM);
 
 	g_quic_param.logger=MESA_create_runtime_log_handle(g_quic_param.log_path, g_quic_param.level);

src/quic_process.cpp

@@ -56,7 +56,7 @@ int check_port(unsigned short port)
 int is_quic_port(const struct streaminfo *pstream)
 {
 	unsigned short source=0, dest=0;
-	
+	if(g_quic_param.quic_port_num==0)return 1;
 	switch(pstream->addr.addrtype)
 	{
 		case	ADDR_TYPE_IPV4: