mirror of
https://gitee.com/xia-chu/ZLMediaKit.git
synced 2026-05-06 10:57:50 +08:00
a9e0e1a81e
Some checks failed
Android / build (push) Has been cancelled
CodeQL / Analyze (cpp) (push) Has been cancelled
CodeQL / Analyze (javascript) (push) Has been cancelled
Docker / build (push) Has been cancelled
DockerPy / build (push) Has been cancelled
Linux / build (push) Has been cancelled
Linux_Python / build (push) Has been cancelled
macOS / build (push) Has been cancelled
macOS_Python / build (push) Has been cancelled
Windows / build (push) Has been cancelled
Windows_Python / build (push) Has been cancelled
## Summary This PR fixes GStreamer interoperability issues during WebRTC/WHEP negotiation with ZLMediaServer. GStreamer could fail to establish the connection for two separate reasons: 1. ZLMediaServer generated a non-compliant ICE `ufrag`. The generated value contained `_`, which is not a valid ICE character, so GStreamer rejected the SDP. 2. ZLMediaServer did not correctly handle `bundle-only` offers and could answer an accepted bundled m-line with `port=0`, which caused the later WHEP negotiation to fail. ## Changes - Generate ICE `ufrag` values using ICE-compliant characters only. - Preserve and handle `a=bundle-only` correctly during SDP parsing and answer generation. - Return `port=9` instead of `port=0` for accepted bundled m-lines. - Add regression coverage for `bundle-only` SDP handling. - URL-encode `delete_webrtc` query parameters in the returned `Location` header so ICE-safe identifiers remain round-trippable over HTTP. ## Validation - Built with WebRTC and SCTP enabled. - Added regression test: `test_webrtc_regression` - Verified: - ICE-safe identifier round-trip through `delete_webrtc` - `bundle-only` SDP answer generation
69 lines
2.4 KiB
CMake
69 lines
2.4 KiB
CMake
# MIT License
|
|
#
|
|
# Copyright (c) 2016-present The ZLMediaKit project authors. All Rights Reserved.
|
|
#
|
|
# Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
# of this software and associated documentation files (the "Software"), to deal
|
|
# in the Software without restriction, including without limitation the rights
|
|
# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
# copies of the Software, and to permit persons to whom the Software is
|
|
# furnished to do so, subject to the following conditions:
|
|
#
|
|
# The above copyright notice and this permission notice shall be included in all
|
|
# copies or substantial portions of the Software.
|
|
#
|
|
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
# SOFTWARE.
|
|
#
|
|
|
|
aux_source_directory(. TEST_SRC_LIST)
|
|
|
|
find_package(PCAP QUIET)
|
|
|
|
foreach(TEST_SRC ${TEST_SRC_LIST})
|
|
get_filename_component(TEST_EXE_NAME ${TEST_SRC} NAME_WE)
|
|
|
|
if(NOT PCAP_FOUND)
|
|
# message(WARNING "PCAP 未找到")
|
|
if("${TEST_EXE_NAME}" MATCHES "test_rtp_pcap")
|
|
continue()
|
|
endif()
|
|
endif()
|
|
|
|
if(NOT TARGET ZLMediaKit::WebRTC)
|
|
# 暂时过滤掉依赖 WebRTC 的测试模块
|
|
if("${TEST_EXE_NAME}" MATCHES "test_rtcp_nack|test_webrtc_regression")
|
|
continue()
|
|
endif()
|
|
endif()
|
|
|
|
message(STATUS "add test: ${TEST_EXE_NAME}")
|
|
add_executable(${TEST_EXE_NAME} ${TEST_SRC})
|
|
target_compile_options(${TEST_EXE_NAME}
|
|
PRIVATE ${COMPILE_OPTIONS_DEFAULT})
|
|
|
|
target_compile_definitions(${TEST_EXE_NAME}
|
|
PRIVATE ${MK_COMPILE_DEFINITIONS})
|
|
|
|
if(USE_SOLUTION_FOLDERS)
|
|
SET_PROPERTY(TARGET ${TEST_EXE_NAME} PROPERTY FOLDER "test")
|
|
endif()
|
|
|
|
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
|
|
|
|
target_link_libraries(${TEST_EXE_NAME} -Wl,--start-group ${MK_LINK_LIBRARIES} -Wl,--end-group)
|
|
else()
|
|
target_link_libraries(${TEST_EXE_NAME} ${MK_LINK_LIBRARIES})
|
|
endif()
|
|
endforeach()
|
|
|
|
if(TARGET test_rtp_pcap)
|
|
target_include_directories(test_rtp_pcap SYSTEM PRIVATE ${PCAP_INCLUDE_DIRS})
|
|
target_link_libraries(test_rtp_pcap ${PCAP_LIBRARIES})
|
|
endif()
|