{}
{}
{}
+ {}
{}"#),
&c.ic.link.client,
token,
c.ic.target_requests_outstanding,
show_timeout,
+ c.ic.mtu,
c.ic.max_batch_down,
c.ic.max_batch_up,
);
//eprintln!("data={:?}", DumpHex(&data));
match check1(Slip2Mime, ic.mtu, &data, |header| {
- let addr = ip_packet_addr::<false>(header)?;
- if addr != ic.link.client.0 { throw!(PE::Src(addr)) }
+ let saddr = ip_packet_addr::<false>(header)?;
+ if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
Ok(())
}) {
- Ok(data) => tx_queue.push_back(TxQueued {
+ Ok((data, ())) => tx_queue.push_back(TxQueued {
data,
expires: Instant::now() + ic.max_queue_time
}),
let addr = ip_packet_addr::<true>(header)?;
if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
Ok(())
- }, |o| rx_queue.push(o),
- |e| error!("{} #{}: rx discarding: {}", &ic, req_num, e))
+ },
+ |(o,())| Ok({ rx_queue.push(o); }),
+ |e| Ok::<_,SlipFramesError<Void>>( {
+ error!("{} #{}: rx discarding: {}", &ic, req_num, e);
+ }))
{
Ok(()) => reporter.lock().success(),
- Err(ErrorOnlyBad) => {
+ Err(SlipFramesError::ErrorOnlyBad) => {
reqs.push(Box::pin(async {
tokio::time::sleep(ic.http_retry).await;
None
}));
},
+ Err(SlipFramesError::Other(v)) => unreachable!(v),
}
}
},