Skip to content
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

Jump to bottom

Support mode w/o quotes in the transport header and made it case-insensitive #19

Merged
merged 1 commit into from
Apr 24, 2023
Merged

Support mode w/o quotes in the transport header and made it case-insensitive #19

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
57 changes: 48 additions & 9 deletions src/headers/transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,13 +211,11 @@ impl TryFrom<TransportParameters> for RtpTransportParameters {
}
"mode" => {
let modes = value.ok_or(HeaderParseError)?;

if !modes.starts_with('"') || !modes.ends_with('"') {
return Err(HeaderParseError);
}

let modes = &modes[1..(modes.len() - 1)];

let modes = match (modes.starts_with('"'), modes.ends_with('"')) {
(true, true) => &modes[1..(modes.len() - 1)],
(false, false) => &modes,
_ => return Err(HeaderParseError),
};
let modes = modes
.split(',')
.map(TransportMode::from)
Expand Down Expand Up @@ -364,8 +362,8 @@ pub enum TransportMode {
impl<'a> From<&'a str> for TransportMode {
fn from(transport_mode: &'a str) -> TransportMode {
match transport_mode {
"PLAY" => TransportMode::Play,
"RECORD" => TransportMode::Record,
"PLAY" | "play" => TransportMode::Play,
"RECORD" | "record" => TransportMode::Record,
r4v3n6101 marked this conversation as resolved.
Show resolved Hide resolved
other => TransportMode::Other(other.into()),
}
}
Expand Down Expand Up @@ -913,4 +911,45 @@ mod tests {

assert_eq!(request, request2);
}

#[test]
fn test_transport_mode_no_quotes() {
let header = "RTP/AVP;multicast;mode=PLAY,RTP/AVP;unicast;dest_addr=\"192.0.2.5:3456\"/\"192.0.2.5:3457\";mode=\"play\"";
let request = crate::Request::builder(crate::Method::Setup, crate::Version::V2_0)
.header(crate::headers::TRANSPORT, header)
.empty();

let transports = request
.typed_header::<super::Transports>()
.unwrap()
.unwrap();

assert_eq!(
transports,
vec![
Transport::Rtp(RtpTransport {
profile: super::RtpProfile::Avp,
lower_transport: None,
params: RtpTransportParameters {
multicast: true,
unicast: false,
mode: vec![TransportMode::Play],
..Default::default()
},
}),
Transport::Rtp(RtpTransport {
profile: super::RtpProfile::Avp,
lower_transport: None,
params: RtpTransportParameters {
unicast: true,
multicast: false,
dest_addr: vec!["192.0.2.5:3456".into(), "192.0.2.5:3457".into()],
mode: vec![TransportMode::Play],
..Default::default()
},
})
]
.into()
);
}
}