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

Fix Chrome connection issue introduced with switch to tungstenite

Browse source 
Chrome requires the subprotocol to be "binary", FF doesn't seem to care (for
some reason?).
This commit is contained in:
Jonas Herzig 2019-02-05 04:21:56 +01:00
parent b630d7b584
commit 1d6d986e13
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/main.rs
View file

@ -35,7 +35,8 @@ use tokio::net::TcpStream;
use tokio_codec::Decoder; use tokio_codec::Decoder;
use tokio_core::reactor::Core; use tokio_core::reactor::Core;
use tokio_tls::TlsConnector; use tokio_tls::TlsConnector;
use tokio_tungstenite::accept_async_with_config; use tokio_tungstenite::accept_hdr_async_with_config;
use tungstenite::handshake::server::Request;
use tungstenite::protocol::Message; use tungstenite::protocol::Message;
use tungstenite::protocol::WebSocketConfig; use tungstenite::protocol::WebSocketConfig;
@ -110,7 +111,16 @@ fn main() {
max_message_size: Some(0x7f_ffff), // maximum size accepted by Murmur max_message_size: Some(0x7f_ffff), // maximum size accepted by Murmur
max_frame_size: Some(0x7f_ffff), // maximum size accepted by Murmur max_frame_size: Some(0x7f_ffff), // maximum size accepted by Murmur
}; };
let client = accept_async_with_config(client, Some(websocket_config)).from_err(); fn header_callback(
_req: &Request,
) -> tungstenite::error::Result<Option<Vec<(String, String)>>> {
Ok(Some(vec![(
"Sec-WebSocket-Protocol".to_string(),
"binary".to_string(),
)]))
}
let client = accept_hdr_async_with_config(client, header_callback, Some(websocket_config))
.from_err();
// Once both are done, begin proxy duty // Once both are done, begin proxy duty
let f = client let f = client