/// Sent from hyper worker pool task to client task
#[allow(dead_code)] // xxx
+#[derive(Debug)]
struct WebRequest {
// initial part of body
// used up to and including first 2 lines of metadata
// end delimiter for the metadata not yet located, but in here somewhere
initial: Box<[u8]>,
initial_remaining: usize,
+ length_hint: usize,
body: hyper::body::Body,
+ boundary_finder: multipart::BoundaryFinder,
reply_to: tokio::sync::oneshot::Sender<WebResponse>,
warnings: Warnings,
}
/// Reply from client task to hyper worker pool task
#[allow(dead_code)] // xxx
+#[derive(Debug)]
struct WebResponse {
warnings: Warnings,
data: Result<WebResponseData, AE>,
type WebResponseData = ();
+#[throws(PacketError)]
+pub fn route_packet(packet: Box<[u8]>, daddr: IpAddr) {
+ trace!("xxx discarding packet daddr={:?} len={}", daddr, packet.len());
+}
+
async fn handle(
all_clients: Arc<AllClients>,
req: hyper::Request<hyper::Body>
match async {
+ let get_header = |hn: &str| {
+ let mut values = req.headers().get_all(hn).iter();
+ let v = values.next().ok_or_else(|| anyhow!("missing {}", hn))?;
+ if values.next().is_some() { throw!(anyhow!("multiple {}!", hn)); }
+ let v = v.to_str().context(anyhow!("interpret {} as UTF-8", hn))?;
+ Ok::<_,AE>(v)
+ };
+
let mkboundary = |b: &'_ _| format!("\n--{}", b).into_bytes();
let boundary = match (||{
- let mut ctypes = req.headers().get_all("Content-Type").iter();
- let t = ctypes.next().ok_or_else(|| anyhow!("missing Content-Type"))?;
- if ctypes.next().is_some() { throw!(anyhow!("several Content-Type")) }
- let t = t.to_str().context("interpret Content-Type as utf-8")?;
+ let t = get_header("Content-Type")?;
let t: mime::Mime = t.parse().context("parse Content-Type")?;
if t.type_() != "multipart" { throw!(anyhow!("not multipart/")) }
let b = mime::BOUNDARY;
},
};
+ let length_hint: usize = (||{
+ let clength = get_header("Content-Length")?;
+ let clength = clength.parse().context("parse Content-Length")?;
+ Ok::<_,AE>(clength)
+ })().unwrap_or_else(
+ |e| { let _ = warnings.add(&e.wrap_err("parsing Content-Length")); 0 }
+ );
+
let mut body = req.into_body();
let initial = match read_limited_bytes(
- METADATA_MAX_LEN, default(), &mut body
+ METADATA_MAX_LEN, default(), length_hint, &mut body
).await {
Ok(all) => all,
Err(ReadLimitedError::Truncated { sofar,.. }) => sofar,
Err(ReadLimitedError::Hyper(e)) => throw!(e),
};
- let finder = memmem::Finder::new(&boundary);
- let mut find_iter = finder.find_iter(&initial);
+ let boundary_finder = memmem::Finder::new(&boundary);
+ let mut boundary_iter = boundary_finder.find_iter(&initial);
let start = if initial.starts_with(&boundary[1..]) { boundary.len()-1 }
- else if let Some(start) = find_iter.next() { start + boundary.len() }
+ else if let Some(start) = boundary_iter.next() { start + boundary.len() }
else { throw!(anyhow!("initial boundary not found")) };
- let comp = multipart::process_component
+ let comp = multipart::process_boundary
(&mut warnings, &initial[start..], PartName::m)?
.ok_or_else(|| anyhow!(r#"no "m" component"#))?;
r#"first multipart component must be name="m""#
)) }
- let mut meta = MetadataFieldIterator::new(comp.payload_start);
+ let mut meta = MetadataFieldIterator::new(comp.payload);
let client: ClientName = meta.need_parse().context("client addr")?;
// boundary, start, &comp.name, &client.ic);
let (reply_to, reply_recv) = tokio::sync::oneshot::channel();
+ trace!("{} request xxx={}", &client.ic, initial.len());
let wreq = WebRequest {
initial,
initial_remaining,
+ length_hint,
+ boundary_finder: boundary_finder.into_owned(),
body,
warnings: mem::take(&mut warnings),
reply_to
};
- trace!("{} request", &client.ic);
client.web.try_send(wreq)
.map_err(|_| anyhow!("client task shut down!"))?;
}
#[allow(unused_variables)] // xxx
-async fn run_client(_ic: Arc<InstanceConfig>,
+#[allow(unused_mut)] // xxx
+async fn run_client(ic: Arc<InstanceConfig>,
mut web: mpsc::Receiver<WebRequest>)
-> Result<Void, AE>
{
struct Outstanding {
reply_to: tokio::sync::oneshot::Sender<WebResponse>,
- max_requests_outstanding: u32,
+ oi: OutstandingInner,
+ }
+ #[derive(Debug)]
+ struct OutstandingInner {
+ target_requests_outstanding: u32,
}
let mut outstanding: VecDeque<Outstanding> = default();
let downbound: VecDeque<(/*xxx*/)> = default();
if ! downbound.is_empty() {
outstanding.pop_front()
} else if let Some((i,_)) = outstanding.iter().enumerate().find({
- |(_,o)| outstanding.len() > o.max_requests_outstanding.sat()
+ |(_,o)| outstanding.len() > o.oi.target_requests_outstanding.sat()
}) {
Some(outstanding.remove(i).unwrap())
} else {
warnings: default(),
};
+ dbg!(&response);
try_send_response(ret.reply_to, response);
}
req = web.recv() =>
{
let WebRequest {
- initial, initial_remaining, body,
- reply_to, warnings,
+ initial, initial_remaining, length_hint, mut body,
+ boundary_finder,
+ reply_to, mut warnings,
} = req.ok_or_else(|| anyhow!("webservers all shut down!"))?;
match async {
- // xxx size limit
+ let initial_used = initial.len() - initial_remaining;
- let whole_request = body.try_fold(
- initial.into_vec(),
- |mut w, by| async move { w.extend_from_slice(&by); Ok(w) },
+ let whole_request = read_limited_bytes(
+ ic.max_batch_up.sat(),
+ initial,
+ length_hint,
+ &mut body
).await.context("read request body")?;
- dbg!(whole_request.len());
-
-/*
-
- multipart::ComponentIterator::resume_mid_component(
- &initial[initial_remaining..],
- */
-
- Ok::<_,AE>(())
+ let (meta, mut comps) =
+ multipart::ComponentIterator::resume_mid_component(
+ &whole_request[initial_used..],
+ boundary_finder
+ ).context("resume parsing body, after auth checks")?;
+
+ let mut meta = MetadataFieldIterator::new(&meta);
+
+ macro_rules! meta {
+ { $v:ident, ( $( $badcmp:tt )? ), $ret:expr,
+ let $server:ident, $client:ident $($code:tt)*
+ } => {
+ let $v = (||{
+ let $server = ic.$v;
+ let $client $($code)*
+ $(
+ if $client $badcmp $server {
+ throw!(anyhow!("mismatch: client={:?} {} server={:?}",
+ $client, stringify!($badcmp), $server));
+ }
+ )?
+ Ok::<_,AE>($ret)
+ })().context(stringify!($v))?;
+ 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);
+ }
+
+ while let Some(comp) = comps.next(&mut warnings, PartName::d)? {
+ if comp.name != PartName::d {
+ warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
+ }
+ checkn(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(daddr,packet),
+ |e| { let _xxx = warnings.add(&e); }
+ )?;
+ }
+
+ let oi = OutstandingInner {
+ target_requests_outstanding,
+ };
+ Ok::<_,AE>(oi)
}.await {
- Ok(()) => outstanding.push_back(Outstanding {
- reply_to: reply_to,
- max_requests_outstanding: 42, // xxx
- }),
+ Ok(oi) => outstanding.push_back(Outstanding { reply_to, oi }),
Err(e) => {
try_send_response(reply_to, WebResponse {
data: Err(e),
~ian / hippotat.git / blobdiff