|
|
@ -13,12 +13,12 @@ use super::{MidHandshake, HandshakeRole, ProcessingResult, convert_key}; |
|
|
|
use super::machine::{HandshakeMachine, StageResult, TryParse}; |
|
|
|
use super::machine::{HandshakeMachine, StageResult, TryParse}; |
|
|
|
|
|
|
|
|
|
|
|
/// Client request.
|
|
|
|
/// Client request.
|
|
|
|
pub struct Request { |
|
|
|
pub struct Request<'t> { |
|
|
|
pub url: Url, |
|
|
|
pub url: Url, |
|
|
|
// TODO extra headers
|
|
|
|
pub extra_headers: Option<&'t [(&'t str, &'t str)]>, |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
impl Request { |
|
|
|
impl<'t> Request<'t> { |
|
|
|
/// The GET part of the request.
|
|
|
|
/// The GET part of the request.
|
|
|
|
fn get_path(&self) -> String { |
|
|
|
fn get_path(&self) -> String { |
|
|
|
if let Some(query) = self.url.query() { |
|
|
|
if let Some(query) = self.url.query() { |
|
|
@ -56,9 +56,14 @@ impl ClientHandshake { |
|
|
|
Connection: upgrade\r\n\ |
|
|
|
Connection: upgrade\r\n\ |
|
|
|
Upgrade: websocket\r\n\ |
|
|
|
Upgrade: websocket\r\n\ |
|
|
|
Sec-WebSocket-Version: 13\r\n\ |
|
|
|
Sec-WebSocket-Version: 13\r\n\ |
|
|
|
Sec-WebSocket-Key: {key}\r\n\ |
|
|
|
Sec-WebSocket-Key: {key}\r\n", |
|
|
|
\r\n", host = request.get_host(), path = request.get_path(), key = key) |
|
|
|
host = request.get_host(), path = request.get_path(), key = key).unwrap(); |
|
|
|
.unwrap(); |
|
|
|
if let Some(eh) = request.extra_headers { |
|
|
|
|
|
|
|
for &(k, v) in eh { |
|
|
|
|
|
|
|
write!(req, "{}: {}\r\n", k, v).unwrap(); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
write!(req, "\r\n").unwrap(); |
|
|
|
HandshakeMachine::start_write(stream, req) |
|
|
|
HandshakeMachine::start_write(stream, req) |
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|