chris/mumble-web-proxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Switch to Rust 2018 edition

Browse source
This commit is contained in:
Jonas Herzig 2020-04-03 20:55:59 +02:00
parent 0949807830
commit 8bdd654952
4 changed files with 11 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/connection.rs
View file

@ -29,9 +29,9 @@ use tokio::prelude::*;
use tokio::timer::Delay;
use webrtc_sdp::attribute_type::SdpAttribute;
use error::Error;
use utils::EitherS;
use Config;
use crate::error::Error;
use crate::utils::EitherS;
use crate::Config;
type SessionId = u32;
@ -85,14 +85,14 @@ impl User {
pub struct Connection {
config: Config,
inbound_client: Box<Stream<Item = ControlPacket<Serverbound>, Error = Error>>,
outbound_client: Box<Sink<SinkItem = ControlPacket<Clientbound>, SinkError = Error>>,
inbound_server: Box<Stream<Item = ControlPacket<Clientbound>, Error = Error>>,
outbound_server: Box<Sink<SinkItem = ControlPacket<Serverbound>, SinkError = Error>>,
inbound_client: Box<dyn Stream<Item = ControlPacket<Serverbound>, Error = Error>>,
outbound_client: Box<dyn Sink<SinkItem = ControlPacket<Clientbound>, SinkError = Error>>,
inbound_server: Box<dyn Stream<Item = ControlPacket<Clientbound>, Error = Error>>,
outbound_server: Box<dyn Sink<SinkItem = ControlPacket<Serverbound>, SinkError = Error>>,
next_clientbound_frame: Option<ControlPacket<Clientbound>>,
next_serverbound_frame: Option<ControlPacket<Serverbound>>,
next_rtp_frame: Option<Vec<u8>>,
stream_to_be_sent: Option<Box<Stream<Item = Frame, Error = Error>>>,
stream_to_be_sent: Option<Box<dyn Stream<Item = Frame, Error = Error>>>,
ice: Option<(ice::Agent, ice::Stream)>,
@ -369,7 +369,7 @@ impl Connection {
fn process_packet_from_client(
&mut self,
packet: ControlPacket<Serverbound>,
) -> Box<Stream<Item = Frame, Error = Error>> {
) -> Box<dyn Stream<Item = Frame, Error = Error>> {
match packet {
ControlPacket::Authenticate(mut message) => {
println!("MSG Authenticate: {:?}", message);