Skip to content

Accept any <proto> value #243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JoTurk wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Accept any <proto> value #243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 1 addition & 28 deletions unmarshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -873,34 +873,7 @@ func unmarshalMediaDescription(lex *lexer) (stateFn, error) { //nolint:cyclop
if err != nil {
return nil, err
}

// Set according to currently registered with IANA
// https://tools.ietf.org/html/rfc4566#section-5.14
// https://tools.ietf.org/html/rfc4975#section-8.1
for _, proto := range strings.Split(field, "/") {
if !anyOf(
proto,
"UDP",
"RTP",
"AVP",
"SAVP",
"SAVPF",
"TLS",
"DTLS",
"SCTP",
"AVPF",
"TCP",
"MSRP",
"BFCP",
"UDT",
"IX",
"MRCPv2",
"FEC",
) {
return nil, fmt.Errorf("%w `%v`", errSDPInvalidNumericValue, field)
}
newMediaDesc.MediaName.Protos = append(newMediaDesc.MediaName.Protos, proto)
}
newMediaDesc.MediaName.Protos = strings.Split(field, "/")

// <fmt>...
for {
Expand Down
13 changes: 0 additions & 13 deletions unmarshal_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,19 +1812,6 @@ func TestUnmarshalMediaDescription_SetsPortRange(t *testing.T) {
}
}

func TestUnmarshalMediaDescription_Error_InvalidProto(t *testing.T) {
// proto token not in the allowed list
l := &lexer{
desc: &SessionDescription{},
cache: &unmarshalCache{},
baseLexer: baseLexer{value: "audio 9 WRONG/PROTO 0\r\n"},
}

st, err := unmarshalMediaDescription(l)
assert.Nil(t, st)
assert.ErrorIs(t, err, errSDPInvalidNumericValue)
}

func TestUnmarshalMediaTitle_Error_ReadLine(t *testing.T) {
// empty input
l := &lexer{
Expand Down
Loading