Pass Candidate Protocol arounds along with Address(es) so that routing to the correct ICE route can be done cleanly.

README.md

@@ -58,7 +58,7 @@ let mut rtc = Rtc::new();
 
 //  Add some ICE candidate such as a locally bound UDP port.
 let addr = "1.2.3.4:5000".parse().unwrap();
-let candidate = Candidate::host(addr).unwrap();
+let candidate = Candidate::host(addr, "udp").unwrap();
 rtc.add_local_candidate(candidate);
 
 // Accept an incoming offer from the remote peer
@@ -83,7 +83,7 @@ let mut rtc = Rtc::new();
 
 // Add some ICE candidate such as a locally bound UDP port.
 let addr = "1.2.3.4:5000".parse().unwrap();
-let candidate = Candidate::host(addr).unwrap();
+let candidate = Candidate::host(addr, "udp").unwrap();
 rtc.add_local_candidate(candidate);
 
 // Create a `SdpApi`. The change lets us make multiple changes
@@ -176,6 +176,7 @@ loop {
             Input::Receive(
                 Instant::now(),
                 Receive {
+                    proto: Protocol::Udp,
                     source,
                     destination: socket.local_addr().unwrap(),
                     contents: buf.as_slice().try_into().unwrap(),
@@ -220,9 +221,9 @@ let writer = rtc.writer(mid).unwrap();
 let pt = writer.payload_params()[0].pt();
 
 // Write the data
-let wallclock = todo!();  // Absolute time of the data
-let media_time = todo!(); // Media time, in RTP time
-let data = todo!();       // Actual data
+let wallclock = todo!();   // Absolute time of the data
+let media_time = todo!();  // Media time, in RTP time
+let data: &[u8] = todo!(); // Actual data
 writer.write(pt, wallclock, media_time, data).unwrap();
 ```
 
@@ -486,4 +487,4 @@ when catching a panic.
 
 <a href="https://zulip.com/"><image width="70px" src="https://raw.githubusercontent.com/zulip/zulip/main/static/images/logo/zulip-icon-circle.svg" alt="Zulip logo"></image></a>
 
-License: MIT/Apache-2.0
+License: MIT OR Apache-2.0

examples/chat.rs

@@ -17,8 +17,8 @@ use str0m::change::{SdpAnswer, SdpOffer, SdpPendingOffer};
 use str0m::channel::{ChannelData, ChannelId};
 use str0m::media::MediaKind;
 use str0m::media::{Direction, KeyframeRequest, MediaData, Mid, Rid};
-use str0m::Event;
-use str0m::{net::Receive, Candidate, IceConnectionState, Input, Output, Rtc, RtcError};
+use str0m::net::Protocol;
+use str0m::{net::Receive, Candidate, Event, IceConnectionState, Input, Output, Rtc, RtcError};
 
 mod util;
 
@@ -87,7 +87,7 @@ fn web_request(request: &Request, addr: SocketAddr, tx: SyncSender<Rtc>) -> Resp
         .build();
 
     // Add the shared UDP socket as a host candidate
-    let candidate = Candidate::host(addr).expect("a host candidate");
+    let candidate = Candidate::host(addr, "udp").expect("a host candidate");
     rtc.add_local_candidate(candidate);
 
     // Create an SDP Answer.
@@ -240,6 +240,7 @@ fn read_socket_input<'a>(socket: &UdpSocket, buf: &'a mut Vec<u8>) -> Option<Inp
             return Some(Input::Receive(
                 Instant::now(),
                 Receive {
+                    proto: Protocol::Udp,
                     source,
                     destination: socket.local_addr().unwrap(),
                     contents,

examples/http-post.rs

@@ -11,9 +11,9 @@ use rouille::Server;
 use rouille::{Request, Response};
 
 use str0m::change::SdpOffer;
+use str0m::net::Protocol;
 use str0m::net::Receive;
-use str0m::IceConnectionState;
-use str0m::{Candidate, Event, Input, Output, Rtc, RtcError};
+use str0m::{Candidate, Event, IceConnectionState, Input, Output, Rtc, RtcError};
 
 mod util;
 
@@ -62,7 +62,7 @@ fn web_request(request: &Request) -> Response {
     // Spin up a UDP socket for the RTC
     let socket = UdpSocket::bind(format!("{addr}:0")).expect("binding a random UDP port");
     let addr = socket.local_addr().expect("a local socket adddress");
-    let candidate = Candidate::host(addr).expect("a host candidate");
+    let candidate = Candidate::host(addr, "udp").expect("a host candidate");
     rtc.add_local_candidate(candidate);
 
     // Create an SDP Answer.
@@ -124,6 +124,7 @@ fn run(mut rtc: Rtc, socket: UdpSocket) -> Result<(), RtcError> {
                 Input::Receive(
                     Instant::now(),
                     Receive {
+                        proto: Protocol::Udp,
                         source,
                         destination: socket.local_addr().unwrap(),
                         contents: buf.as_slice().try_into()?,