From 5e73f4ff938cb919b16fd0f180ef01d1914ea413 Mon Sep 17 00:00:00 2001 From: fisheryhe Date: Mon, 12 Jun 2023 16:49:47 +0800 Subject: [PATCH] support ice configuration in global --- sdpinfo.go | 6 ++++++ transform/sdpstruct.go | 10 ++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/sdpinfo.go b/sdpinfo.go index 4af38d6..fcae6ba 100644 --- a/sdpinfo.go +++ b/sdpinfo.go @@ -846,6 +846,12 @@ func Parse(sdp string) (*SDPInfo, error) { ufrag := md.IceUfrag pwd := md.IcePwd + if ufrag == "" && sdpMap.IceUfrag != "" { + ufrag = sdpMap.IceUfrag + } + if pwd == "" && sdpMap.IcePwd != "" { + pwd = sdpMap.IcePwd + } sdpInfo.SetICE(NewICEInfo(ufrag, pwd)) diff --git a/transform/sdpstruct.go b/transform/sdpstruct.go index 71198cb..d65452c 100644 --- a/transform/sdpstruct.go +++ b/transform/sdpstruct.go @@ -77,7 +77,7 @@ type SsrcGroupStruct struct { } type SsrcStruct struct { - Id uint `json:"id,omitempty"` + Id uint `json:"id,omitempty"` Attribute string `json:"attribute,omitempty"` Value string `json:"value,omitempty"` } @@ -158,11 +158,13 @@ type SdpStruct struct { Media []*MediaStruct `json:"media,omitempty"` Fingerprint *FingerprintStruct `json:"fingerprint,omitempty"` Connection *ConnectionStruct `json:"connection,omitempty"` + IceUfrag string `json:"iceUfrag,omitempty"` + IcePwd string `json:"icePwd,omitempty"` Icelite string `json:"icelite,omitempty"` } type SctpMapStuct struct { - Port int `json:"sctpmapNumber"` - App string `json:"app"` - MessageSize int `json:"maxMessageSize"` + Port int `json:"sctpmapNumber"` + App string `json:"app"` + MessageSize int `json:"maxMessageSize"` }