use super::*;
#[derive(Debug)]
-pub struct Client {
+pub struct User {
pub ic: Arc<InstanceConfig>,
pub web: mpsc::Sender<WebRequest>,
pub route: mpsc::Sender<RoutedPacket>,
target_requests_outstanding: u32,
}
let mut outstanding: VecDeque<Outstanding> = default();
- let downbound: VecDeque<(/*xxx*/)> = default();
+ let mut downbound: PacketQueue<RoutedPacketData> = default();
let try_send_response = |
reply_to: oneshot::Sender<WebResponse>,
}
select!{
+ biased;
+
+
+ // xxx something something routed something
+
req = web.recv() =>
{
let WebRequest {
initial, initial_remaining, length_hint, mut body,
boundary_finder,
- reply_to, conn, mut warnings,
+ reply_to, conn, mut warnings, may_route,
} = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
match async {
//dbg!(&$v);
}
}
-
meta!{
target_requests_outstanding, ( != ), client,
let server, client: u32 = meta.need_parse()?;
}
-
meta!{
http_timeout, ( > ), client,
let server, client = Duration::from_secs(meta.need_parse()?);
}
-
meta!{
mtu, ( != ), client,
let server, client: u32 = meta.parse()?.unwrap_or(server);
}
-
meta!{
max_batch_down, (), min(client, server),
let server, client: u32 = meta.parse()?.unwrap_or(server);
}
-
meta!{
max_batch_up, ( > ), client,
let server, client = meta.parse()?.unwrap_or(server);
if comp.name != PartName::d {
warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
}
- checkn(Mime2Slip, mtu, comp.payload, |header| {
+ slip::processn(Mime2Slip, mtu, comp.payload, |header| {
let saddr = ip_packet_addr::<false>(header)?;
if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
let daddr = ip_packet_addr::<true>(header)?;
Ok(daddr)
}, |(daddr,packet)| route_packet(
- &global, &conn, &ic.link.client, daddr,packet
- ),
+ &global, &conn, Some(&ic.link.client), daddr,
+ packet, may_route.clone(),
+ ).map(Ok),
|e| Ok::<_,SlipFramesError<_>>({ warnings.add(&e)?; })
).await?;
}