aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorin Coras <fcoras@cisco.com>2021-05-28 09:06:51 -0700
committerDave Barach <openvpp@barachs.net>2021-06-01 18:19:02 +0000
commit427feb6fdd8aee373405dbd3a59f69440107b046 (patch)
treee91bd007ca347e3285377286f5b9a1b6535ca2bf
parent7aeb647c69d5d583d6df319ee7eac7a32bc9fced (diff)
srtp: cleanup build and default to disabled
Type: fix Signed-off-by: Florin Coras <fcoras@cisco.com> Change-Id: I62fb56257445a05105e556d1ea6cc6280b5eeccc
-rw-r--r--src/plugins/srtp/CMakeLists.txt11
-rw-r--r--src/plugins/srtp/srtp.c2
2 files changed, 1 insertions, 12 deletions
diff --git a/src/plugins/srtp/CMakeLists.txt b/src/plugins/srtp/CMakeLists.txt
index acbdf3177d8..5771ad2dc36 100644
--- a/src/plugins/srtp/CMakeLists.txt
+++ b/src/plugins/srtp/CMakeLists.txt
@@ -11,15 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-include (CheckFunctionExists)
-
vpp_plugin_find_library(srtp SRTP_LIB libsrtp2.a)
-
-if (NOT SRTP_LIB)
- message(WARNING "srtp plugin - srtp2 lib not found - plugin disabled")
- return()
-endif()
-
vpp_find_path(SRTP_INCLUDE_DIR NAMES srtp2/srtp.h)
if (NOT SRTP_INCLUDE_DIR)
@@ -29,9 +21,6 @@ endif()
include_directories (${SRTP_INCLUDE_DIR})
-set(CMAKE_REQUIRED_FLAGS "-fPIC -shared -pthread -Wno-unused-command-line-argument ${SRTP_LIB}")
-set(CMAKE_REQUIRED_INCLUDES "${SRTP_INCLUDE_DIR}")
-
add_vpp_plugin(srtp
SOURCES
srtp.c
diff --git a/src/plugins/srtp/srtp.c b/src/plugins/srtp/srtp.c
index 98bf9085da3..58a35c31606 100644
--- a/src/plugins/srtp/srtp.c
+++ b/src/plugins/srtp/srtp.c
@@ -982,7 +982,7 @@ VLIB_INIT_FUNCTION (srtp_transport_init);
VLIB_PLUGIN_REGISTER () = {
.version = VPP_BUILD_VER,
.description = "Secure Real-time Transport Protocol (SRTP)",
- /* .default_disabled = 1, */
+ .default_disabled = 1,
};
/*