From a7c7470d46891438fe631d82119382dd89e9396d Mon Sep 17 00:00:00 2001 From: xiongguangjie Date: Wed, 8 Mar 2023 19:33:52 +0800 Subject: [PATCH] compitable for rtc ipv6 candidate and ice-lite sdp global session --- webrtc/Sdp.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/webrtc/Sdp.cpp b/webrtc/Sdp.cpp index 90618c0a..a796ca99 100644 --- a/webrtc/Sdp.cpp +++ b/webrtc/Sdp.cpp @@ -680,11 +680,11 @@ string SdpAttrSctpMap::toString() const { void SdpAttrCandidate::parse(const string &str) { char foundation_buf[40] = {0}; char transport_buf[16] = {0}; - char address_buf[32] = {0}; + char address_buf[8*4+7+1] = {0}; char type_buf[16] = {0}; // https://datatracker.ietf.org/doc/html/rfc5245#section-15.1 - CHECK_SDP(sscanf(str.data(), "%32[^ ] %" SCNu32 " %15[^ ] %" SCNu32 " %31[^ ] %" SCNu16 " typ %15[^ ]", + CHECK_SDP(sscanf(str.data(), "%32[^ ] %" SCNu32 " %15[^ ] %" SCNu32 " %39[^ ] %" SCNu16 " typ %15[^ ]", foundation_buf, &component, transport_buf, &priority, address_buf, &port, type_buf) == 7); foundation = foundation_buf; transport = transport_buf; @@ -1064,6 +1064,9 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const{ } sdp.addAttr(std::make_shared(group)); sdp.addAttr(std::make_shared(msid_semantic)); + + bool ice_lite = false; + for (auto &m : media) { sdp.medias.emplace_back(); auto &sdp_media = sdp.medias.back(); @@ -1099,6 +1102,7 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const{ sdp_media.addAttr(std::make_shared(m.mid)); if (m.ice_lite) { sdp_media.addAttr(std::make_shared("ice-lite")); + ice_lite = true; } for (auto &ext : m.extmap) { sdp_media.addAttr(std::make_shared(ext)); @@ -1210,6 +1214,9 @@ RtcSessionSdp::Ptr RtcSession::toRtcSessionSdp() const{ } } } + if(ice_lite) + sdp.addAttr(std::make_shared("ice-lite")); + return ret; }