const METADATA_MAX_LEN: usize = MAX_OVERHEAD;
+type AllClients = HashMap<ClientName, ClientHandles>;
+
+struct ClientHandles {
+ ic: Arc<InstanceConfig>,
+ web: tokio::sync::mpsc::Sender<WebRequest>,
+}
+
+struct WebRequest {
+ reply: tokio::sync::oneshot::Sender<()>,
+}
+
async fn handle(
-// context: (),
-// addr: SocketAddr,
- req: hyper::Request<hyper::Body>
-) -> Result<hyper::Response<hyper::Body>, Infallible> {
-
- let mkboundary = |b: &'_ _| format!("\n--{}", b).into_bytes();
- let (boundary, warning) = (||{
- 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: mime::Mime = t.parse().context("parse Content-Type")?;
- if t.type_() != "multipart" { throw!(anyhow!("not multipart/")) }
- let b = mime::BOUNDARY;
- let b = t.get_param(b).ok_or_else(|| anyhow!("missing boundary=..."))?;
- let warning = (||{
- if t.subtype() != "form-data" { throw!(anyhow!("not /form-data"))}
- Ok::<_,AE>(())
- })();
- let b = mkboundary(b.as_str());
- Ok::<_,AE>((b, warning))
- })().unwrap_or_else(|e| {
- (mkboundary("b"), Err(e.wrap_err("guessing boundary")))
- });
+ _all_clients: Arc<AllClients>,
+ req: hyper::Request<hyper::Body>
+) -> Result<hyper::Response<hyper::Body>, Void> {
+ if req.method() == Method::GET {
+ let mut resp = hyper::Response::new(hyper::Body::from("hippotat\r\n"));
+ resp.headers_mut().insert(
+ "Content-Type",
+ "text/plain; charset=US-ASCII".try_into().unwrap()
+ );
+ return Ok(resp)
+ }
- if let Err(w) = &warning { eprintln!("warning={}", w); }
+ let mut warnings: Warnings = default();
match async {
+
+ 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: mime::Mime = t.parse().context("parse Content-Type")?;
+ if t.type_() != "multipart" { throw!(anyhow!("not multipart/")) }
+ let b = mime::BOUNDARY;
+ let b = t.get_param(b).ok_or_else(|| anyhow!("missing boundary=..."))?;
+ if t.subtype() != "form-data" {
+ warnings.add(&"Content-Type not /form-data")?;
+ }
+ let b = mkboundary(b.as_str());
+ Ok::<_,AE>(b)
+ })() {
+ Ok(y) => y,
+ Err(e) => {
+ warnings.add(&e.wrap_err("guessing boundary"))?;
+ mkboundary("b")
+ },
+ };
+
let mut body = req.into_body();
let initial = match read_limited_bytes(METADATA_MAX_LEN, &mut body).await {
Ok(all) => all,
Err(ReadLimitedError::Hyper(e)) => throw!(e),
};
- eprintln!("boundary={:?} initial={:?}", boundary, initial);
+ let finder = memmem::Finder::new(&boundary);
+ let mut find_iter = 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 { throw!(anyhow!("initial boundary not found")) };
+
+ let comp = multipart::process_component
+ (&mut warnings, &initial[start..], PartName::m)?
+ .ok_or_else(|| anyhow!(r#"no "m" component"#))?;
+
+ if comp.name != PartName::m { throw!(anyhow!(
+ r#"first multipart component must be name="m""#
+ )) }
+
+ let nl = memchr::memchr2(b'\r', b'\n', comp.payload_start)
+ .ok_or_else(|| anyhow!("no newline in first metadata line?"))?;
+
+ let client = &comp.payload_start[0..nl];
+ let client = str::from_utf8(client).context("client addr utf-8")?;
+ let client: IpAddr = client.parse().context("client address")?;
+// let client = all_clients.get(&client).ok_or_else(|| anyhow!(BAD_CLIENT))?;
+
+ eprintln!("boundary={:?} start={} name={:?} client={}",
+ boundary, start, &comp.name, client);
Ok::<_,AE>(())
}.await {
}
}
+ eprintln!("warnings={:?}", &warnings);
+
Ok(hyper::Response::new(hyper::Body::from("Hello World")))
}
+async fn run_client(_ic: Arc<InstanceConfig>, _web: mpsc::Receiver<WebRequest>)
+ -> Result<Void, AE>
+{
+ Err(anyhow!("xxx"))
+}
#[tokio::main]
async fn main() {
let opts = Opts::from_args();
- let mut hservers = vec![];
- let (ics,(global,ipif)) = config::startup(
+ let mut tasks: Vec<(
+ JoinHandle<AE>,
+ String,
+ )> = vec![];
+
+ let (global, ipif) = config::startup(
"hippotatd", LinkEnd::Server,
&opts.config, &opts.log, |ics|
{
let global = config::InstanceConfigGlobal::from(&ics);
let ipif = Ipif::start(&global.ipif, None)?;
- let make_service = hyper::service::make_service_fn(|_conn| async {
- Ok::<_, Infallible>(hyper::service::service_fn(handle))
- });
+ let all_clients: AllClients = ics.into_iter().map(|ic| {
+ let ic = Arc::new(ic);
+
+ let (web_send, web_recv) = mpsc::channel(
+ 5 // xxx should me max_requests_outstanding but that's
+ // marked client-only so needs rework
+ );
+
+ let ic_ = ic.clone();
+ tasks.push((tokio::spawn(async move {
+ run_client(ic_, web_recv).await.void_unwrap_err()
+ }), format!("client {}", &ic)));
+
+ (ic.link.client,
+ ClientHandles {
+ ic,
+ web: web_send,
+ })
+ }).collect();
+ let all_clients = Arc::new(all_clients);
for addr in &global.addrs {
+ let all_clients_ = all_clients.clone();
+ let make_service = hyper::service::make_service_fn(move |_conn| {
+ let all_clients_ = all_clients_.clone();
+ async { Ok::<_, Void>( hyper::service::service_fn(move |req| {
+ handle(all_clients_.clone(), req)
+ }) ) } }
+ );
+
let addr = SocketAddr::new(*addr, global.port);
let server = hyper::Server::try_bind(&addr)
.context("bind")?
.http1_preserve_header_case(true)
.serve(make_service);
info!("listening on {}", &addr);
- let task = tokio::task::spawn(server);
- hservers.push(task);
+ let task = tokio::task::spawn(async move {
+ match server.await {
+ Ok(()) => anyhow!("shut down?!"),
+ Err(e) => e.into(),
+ }
+ });
+ tasks.push((task, format!("http server {}", addr)));
}
-
+
Ok((global, ipif))
});
- let x = future::select_all(&mut hservers).await;
- error!("xxx hserver {:?}", &x);
+ let died = future::select_all(
+ tasks.iter_mut().map(|e| &mut e.0)
+ ).await;
+ error!("xxx {:?}", &died);
ipif.quitting(None).await;
- dbg!(ics, global);
+ dbg!(global);
}
~ian / hippotat.git / blobdiff