Removes all WCCP code and utilities, updates docs (#10763)

apache · Nov 11, 2023 · 9e60127 · 9e60127
1 parent e4ff6ca
commit 9e60127
Show file tree

Hide file tree

Showing 51 changed files with 5 additions and 10,589 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,7 +79,6 @@ src/traffic_quic/traffic_quic
 src/traffic_server/traffic_server
 src/traffic_top/traffic_top
 src/traffic_via/traffic_via
-src/traffic_wccp/traffic_wccp
 
 include/stamp-h1
 include/ink_autoconf.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -178,7 +178,6 @@ set(ENABLE_TPROXY
 )
 option(ENABLE_QUICHE "Use quiche (default OFF)")
 
-option(ENABLE_WCCP "Use WCCP v2 (default OFF)")
 option(ENABLE_EXAMPLE "Build example directory (default OFF)")
 set(TS_MAX_HOST_NAME_LEN
     256
@@ -204,7 +203,6 @@ option(ENABLE_CRIPTS "Build and install the Cripts library and headers  (default
 
 set(TS_USE_FAST_SDK ${ENABLE_FAST_SDK})
 
-set(TS_HAS_WCCP ${ENABLE_WCCP})
 set(TS_MAX_NUMBER_EVENT_THREADS ${MAX_EVENT_THREADS})
 set(TS_MAX_THREADS_IN_EACH_THREAD_TYPE ${MAX_THREADS_PER_TYPE})
 
@@ -596,10 +594,6 @@ if(CURSES_FOUND)
   add_subdirectory(src/traffic_top)
 endif()
 add_subdirectory(src/traffic_via)
-if(ENABLE_WCCP)
-  add_subdirectory(src/wccp)
-  add_subdirectory(src/traffic_wccp)
-endif()
 if(ENABLE_CRIPTS)
   add_subdirectory(src/cripts)
 endif()

diff --git a/README.md b/README.md
@@ -174,10 +174,8 @@ trafficserver ............. Top src dir
 │   ├── traffic_server .... Main proxy server
 │   ├── traffic_top ....... Top like tool for viewing Traffic Server statistics
 │   ├── traffic_via ....... Tool for decoding the Traffic Server Via header codes
-│   ├── traffic_wccp ...... Program speaking the client side of the WCCP
 │   ├── tscore ............ Base / core library
 │   ├── tscpp ............. C++ api wrapper for plugin developers
-│   └── wccp .............. WCCP implementation
 ├── tests ................. Different tests for Traffic Server
 ├── tools ................. Directory of various tools
 ├── INSTALL ............... Build and installation guide
@@ -211,7 +209,6 @@ pcre-devel
 ncurses-devel and libcurl-devel(optional, needed for traffic_top)
 libcap-devel (optional, highly recommended)
 hwloc-devel (optional, highly recommended)
-flex (optional, needed for e.g. WCCP)
 ```
 
 ### Ubuntu / Debian
@@ -228,7 +225,6 @@ libcap-dev (optional, highly recommended)
 libhwloc-dev (optional, highly recommended)
 libncurses5-dev (optional, required for e.g.: traffic_top)
 libcurl4-openssl-dev (optional, required for e.g.: traffic_top)
-flex (optional, required for e.g. WCCP)
 ```
 
 ### Alpine Linux

diff --git a/ci/jenkins/bin/autest.sh b/ci/jenkins/bin/autest.sh
@@ -54,7 +54,6 @@ PROXY_VERIFIER_PREPARE="tests/prepare_proxy_verifier.sh"
 CCACHE=""
 WERROR=""
 DEBUG=""
-WCCP=""
 QUIC=""
 CURL=""
 AUTEST_DEBUG=""
@@ -64,7 +63,6 @@ PROXY_VERIFIER_ARGUMENT=""
 [ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache"
 [ "1" == "$enable_werror" ] && WERROR="--enable-werror"
 [ "1" == "$enable_debug" ] && DEBUG="--enable-debug"
-[ "1" == "$enable_wccp" ] && WCCP="--enable-wccp"
 [ "1" == "$enable_quic" ] && QUIC="--with-openssl=/opt/openssl-quic"
 [ "1" == "$disable_curl" ] && CURL="--disable-curl"
 [ "1" == "$enable_autest_debug" ] && AUTEST_DEBUG="--debug"
@@ -78,7 +76,6 @@ mkdir -p ${INSTALL}
 echo "CCACHE: $CCACHE"
 echo "WERROR: $WERROR"
 echo "DEBUG: $DEBUG"
-echo "WCCP: $WCCP"
 echo "QUIC: $QUIC"
 echo "CURL: $CURL"
 
@@ -93,7 +90,6 @@ autoreconf -if
     --enable-experimental-plugins \
     --enable-example-plugins \
     ${CCACHE} \
-    ${WCCP} \
     ${QUIC} \
     ${WERROR} \
     ${DEBUG} \

diff --git a/ci/jenkins/bin/coverity.sh b/ci/jenkins/bin/coverity.sh
@@ -26,7 +26,7 @@ COV_TARBALL=/tmp/trafficserver-${TODAY}.tgz
 COV_VERSION=$(git rev-parse --short HEAD)
 
 autoreconf -fi
-./configure --enable-experimental-plugins --enable-wccp
+./configure --enable-experimental-plugins
 
 cov-build --dir cov-int ${ATS_MAKE} -j4 V=1
 tar czvf ${COV_TARBALL} cov-int

diff --git a/ci/jenkins/bin/github.sh b/ci/jenkins/bin/github.sh
@@ -24,12 +24,10 @@ INSTALL="${ATS_BUILD_BASEDIR}/install"
 CCACHE=""
 WERROR=""
 DEBUG=""
-WCCP=""
 QUIC=""
 [ "1" == "$enable_ccache" ] && CCACHE="--enable-ccache"
 [ "1" == "$enable_werror" ] && WERROR="--enable-werror"
 [ "1" == "$enable_debug" ] && DEBUG="--enable-debug"
-[ "1" == "$enable_wccp" ] && WCCP="--enable-wccp"
 [ "1" == "$enable_quic" ] && QUIC="--with-openssl=/opt/openssl-quic"
 
 mkdir -p ${INSTALL}
@@ -38,7 +36,6 @@ cd src
 echo "CCACHE: $CCACHE"
 echo "WERROR: $WERROR"
 echo "DEBUG: $DEBUG"
-echo "WCCP: $WCCP"
 echo "QUIC: $QUIC"
 
 # Restore verbose shell output
@@ -52,7 +49,6 @@ autoreconf -if
     --enable-experimental-plugins \
     --enable-example-plugins \
     ${CCACHE} \
-    ${WCCP} \
     ${QUIC} \
     ${WERROR} \
     ${DEBUG}

diff --git a/ci/jenkins/bin/in_tree.sh b/ci/jenkins/bin/in_tree.sh
@@ -26,8 +26,7 @@ autoreconf -fi
     --enable-ccache \
     --enable-werror \
     --enable-experimental-plugins \
-    --enable-example-plugins \
-    --enable-wccp
+    --enable-example-plugins
 
 ${ATS_MAKE} -j5 V=1
 #${ATS_MAKE} check VERBOSE=Y

diff --git a/ci/jenkins/bin/out_of_tree.sh b/ci/jenkins/bin/out_of_tree.sh
@@ -27,8 +27,7 @@ mkdir -p BUILDS && cd BUILDS
     --enable-ccache \
     --enable-werror \
     --enable-experimental-plugins \
-    --enable-example-plugins \
-    --enable-wccp
+    --enable-example-plugins
 
 ${ATS_MAKE} -j5 V=1
 #${ATS_MAKE} check VERBOSE=Y

diff --git a/ci/jenkins/jobs.yaml b/ci/jenkins/jobs.yaml
@@ -48,7 +48,7 @@
         - shell: |
             cd "${WORKSPACE}/build/${JOB_NAME}.${BUILD_NUMBER}"
             export DEB_BUILD_HARDENING
-            "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --enable-test-tools $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+            "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --enable-test-tools $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
             make -j2 V=1
             make check
             make install
@@ -71,7 +71,7 @@
             export CXX=clang++
             export CXXFLAGS="-Qunused-arguments -std=c++11"
             export WITH_LIBCPLUSPLUS=yes
-            "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --enable-test-tools $ENABLE_WCCP $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
+            "${WORKSPACE}"/src/configure --prefix="${WORKSPACE}/install/${JOB_NAME}.${BUILD_NUMBER}" --enable-werror --enable-experimental-plugins --enable-example-plugins --enable-test-tools $ENABLE_DEBUG $ENABLE_EXPERIMENTAL
             make -j2 V=1
             make check
             make install
@@ -137,10 +137,6 @@
             name: ENABLE_DEBUG
             default: '{debug}'
             description: enable runtime debug checks
-        - string:
-            name: ENABLE_WCCP
-            default: '{wccp}'
-            description: enable WCCP support
         - string:
             # Standard regression tests with Debian build hardening compiler flags.
             # See https://wiki.ubuntu.com/Security/HardeningWrapper
@@ -169,10 +165,6 @@
             name: ENABLE_DEBUG
             default: '{debug}'
             description: enable runtime debug checks
-        - string:
-            name: ENABLE_WCCP
-            default: '{wccp}'
-            description: enable WCCP support
         - string:
             # Standard regression tests with Debian build hardening compiler flags.
             # See https://wiki.ubuntu.com/Security/HardeningWrapper
@@ -198,7 +190,6 @@
     node: centos_5_x64
     builder: linux
     tag: normal
-    wccp: --disable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -234,7 +225,6 @@
     node: centos_5_x86
     builder: linux
     tag: normal
-    wccp: --disable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -269,7 +259,6 @@
     node: centos_6.4_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -309,7 +298,6 @@
     node: centos_6.4_x86
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -344,7 +332,6 @@
     node: fedora_15_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -379,7 +366,6 @@
     node: fedora_15_x86
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -414,7 +400,6 @@
     node: fedora_18_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -449,7 +434,6 @@
     node: fedora_18_x86
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -484,7 +468,6 @@
     node: fedora_rawhide_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -530,7 +513,6 @@
     node: fedora_rawhide_x86
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -565,7 +547,6 @@
     node: freebsd_9.1_x64
     builder: bsd
     tag: normal
-    wccp: --disable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -600,7 +581,6 @@
     node: omnios_x64
     builder: omnios
     tag: normal
-    wccp: --disable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -635,7 +615,6 @@
     node: opensuse_12_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -670,7 +649,6 @@
     node: ubuntu_10.04_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -710,7 +688,6 @@
     node: ubuntu_12.04_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -760,7 +737,6 @@
     node: debian_6_x64
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''
@@ -800,7 +776,6 @@
     node: mac_os_x
     builder: linux
     tag: normal
-    wccp: --enable-wccp
     debug: --disable-debug
     hardening: '0'
     experimental: ''

diff --git a/configure.ac b/configure.ac
@@ -387,19 +387,6 @@ AC_MSG_RESULT([Will build documentation: $enable_doc_build])
 AM_CONDITIONAL([BUILD_DOCS], [test "xyes" = "x$enable_doc_build"])
 AM_CONDITIONAL([BUILD_MANPAGES], [test "xtrue" = "x$build_manpages"])
 
-#
-# WCCP
-#
-AC_MSG_CHECKING([whether to enable WCCP v2 support])
-AC_ARG_ENABLE([wccp],
-  [AS_HELP_STRING([--enable-wccp],[enable WCCP v2])],
-  [],
-  [enable_wccp=no]
-)
-AC_MSG_RESULT([$enable_wccp])
-TS_ARG_ENABLE_VAR([has],[wccp])
-AM_CONDITIONAL([BUILD_WCCP], [test 0 -ne $has_wccp])
-
 #
 # Cripts
 #
@@ -2391,7 +2378,6 @@ AC_CONFIG_FILES([
   iocore/utils/Makefile
   lib/Makefile
   src/tscpp/api/Makefile
-  src/wccp/Makefile
   src/cripts/Makefile
   lib/fastlz/Makefile
   lib/swoc/Makefile