YGGverse/aquatic
1
0
Fork 0
mirror of https://github.com/YGGverse/aquatic.git synced 2026-03-31 17:55:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ws: require offer/answer sdp field to be String, fix related code

Browse source
This commit is contained in:
Joakim Frostegård 2023-10-30 19:37:25 +01:00
parent c37bf89650
commit d94936a50b
5 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/ws_load_test/src/network.rs
View file

@ -135,9 +135,7 @@ impl Connection {
r.answer_offer_id = Some(offer_id); r.answer_offer_id = Some(offer_id);
r.answer = Some(RtcAnswer { r.answer = Some(RtcAnswer {
t: RtcAnswerType::Answer, t: RtcAnswerType::Answer,
sdp: ::serde_json::json!( sdp: "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-".into()
{"sdp": "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-"}
),
}); });
r.event = None; r.event = None;
r.offers = None; r.offers = None;

4
crates/ws_load_test/src/utils.rs
View file

@ -52,9 +52,7 @@ fn create_announce_request(
offer_id: OfferId(rng.gen()), offer_id: OfferId(rng.gen()),
offer: RtcOffer { offer: RtcOffer {
t: RtcOfferType::Offer, t: RtcOfferType::Offer,
sdp: ::serde_json::json!( sdp: "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-".into()
{"sdp": "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-"}
)
}, },
}) })
} }

4
crates/ws_protocol/benches/bench_deserialize_announce_request.rs
View file

@ -17,7 +17,7 @@ pub fn bench(c: &mut Criterion) {
AnnounceRequestOffer { AnnounceRequestOffer {
offer: RtcOffer { offer: RtcOffer {
t: RtcOfferType::Offer, t: RtcOfferType::Offer,
sdp: ::serde_json::json!({ "sdp": "abcdef" }), sdp: "abcdef".into(),
}, },
offer_id, offer_id,
} }
@ -35,7 +35,7 @@ pub fn bench(c: &mut Criterion) {
numwant: Some(offers_len), numwant: Some(offers_len),
answer: Some(RtcAnswer { answer: Some(RtcAnswer {
t: RtcAnswerType::Answer, t: RtcAnswerType::Answer,
sdp: ::serde_json::json!({ "sdp": "abcdef" }), sdp: "abcdef".into(),
}), }),
answer_to_peer_id: Some(peer_id), answer_to_peer_id: Some(peer_id),
answer_offer_id: Some(OfferId(info_hash.0)), answer_offer_id: Some(OfferId(info_hash.0)),

4
crates/ws_protocol/src/common.rs
View file

@ -50,7 +50,7 @@ pub struct RtcOffer {
/// Always "offer" /// Always "offer"
#[serde(rename = "type")] #[serde(rename = "type")]
pub t: RtcOfferType, pub t: RtcOfferType,
pub sdp: ::serde_json::Value, pub sdp: String,
} }
/// Nested structure with SDP answer from https://www.npmjs.com/package/simple-peer /// Nested structure with SDP answer from https://www.npmjs.com/package/simple-peer
@ -61,7 +61,7 @@ pub struct RtcAnswer {
/// Always "answer" /// Always "answer"
#[serde(rename = "type")] #[serde(rename = "type")]
pub t: RtcAnswerType, pub t: RtcAnswerType,
pub sdp: ::serde_json::Value, pub sdp: String,
} }
#[derive(Debug, Clone, Copy, PartialEq, Eq)] #[derive(Debug, Clone, Copy, PartialEq, Eq)]

4
crates/ws_protocol/src/lib.rs
View file

@ -38,13 +38,13 @@ mod tests {
fn rtc_offer() -> RtcOffer { fn rtc_offer() -> RtcOffer {
RtcOffer { RtcOffer {
t: RtcOfferType::Offer, t: RtcOfferType::Offer,
sdp: ::serde_json::json!({ "sdp": "test" }), sdp: "test".into(),
} }
} }
fn rtc_answer() -> RtcAnswer { fn rtc_answer() -> RtcAnswer {
RtcAnswer { RtcAnswer {
t: RtcAnswerType::Answer, t: RtcAnswerType::Answer,
sdp: ::serde_json::json!({ "sdp": "test" }), sdp: "test".into(),
} }
} }