summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ddfab91)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
let data = data?;
//eprintln!("data={:?}", DumpHex(&data));
let data = data?;
//eprintln!("data={:?}", DumpHex(&data));
- match check1(Slip2Mime, ic.mtu, &data, |header| {
+ match slip::process1(Slip2Mime, ic.mtu, &data, |header| {
let saddr = ip_packet_addr::<false>(header)?;
if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
Ok(())
let saddr = ip_packet_addr::<false>(header)?;
if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
Ok(())
if let Some(got) = got {
//eprintln!("got={:?}", DumpHex(&got));
if let Some(got) = got {
//eprintln!("got={:?}", DumpHex(&got));
- match checkn(SlipNoConv,ic.mtu, &got, |header| {
+ match slip::processn(SlipNoConv,ic.mtu, &got, |header| {
let addr = ip_packet_addr::<true>(header)?;
if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
Ok(())
let addr = ip_packet_addr::<true>(header)?;
if addr != ic.link.client.0 { throw!(PE::Dst(addr)) }
Ok(())
goodness -= goodness >> GOODNESS_SHIFT;
goodness -= goodness >> GOODNESS_SHIFT;
- match checkn(SlipNoConv, global.config.mtu, &data, |header|{
+ // xxx should be process1
+ match slip::processn(SlipNoConv, global.config.mtu, &data, |header|{
let saddr = ip_packet_addr::<false>(header)?;
let daddr = ip_packet_addr::<true>(header)?;
Ok((saddr,daddr))
let saddr = ip_packet_addr::<false>(header)?;
let daddr = ip_packet_addr::<true>(header)?;
Ok((saddr,daddr))
if comp.name != PartName::d {
warnings.add(&format_args!("unexpected part {:?}", comp.name))?;
}
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)?;
let saddr = ip_packet_addr::<false>(header)?;
if saddr != ic.link.client.0 { throw!(PE::Src(saddr)) }
let daddr = ip_packet_addr::<true>(header)?;
pub use crate::queue::*;
pub use crate::reporter::*;
pub use crate::types::*;
pub use crate::queue::*;
pub use crate::reporter::*;
pub use crate::types::*;
+pub use crate::slip::{self, *};
}
#[throws(SlipFramesError<EHE>)]
}
#[throws(SlipFramesError<EHE>)]
-pub async fn checkn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
+pub async fn processn<AC, EH, EHE, OUT, FOUT, ACR, M: SlipMime+Copy>(
mime: M,
mtu: u32,
data: &[u8],
mime: M,
mtu: u32,
data: &[u8],
let mut err = false;
for packet in data.split(|&c| c == SLIP_END) {
match async {
let mut err = false;
for packet in data.split(|&c| c == SLIP_END) {
match async {
- let checked = check1(mime, mtu, packet, addr_chk);
+ let checked = process1(mime, mtu, packet, addr_chk);
if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
out(checked?).await?;
ok = true;
if matches!(checked, Err(PacketError::Empty)) { return Ok::<_,PE>(()) }
out(checked?).await?;
ok = true;
-pub fn check1<AC, M: SlipMime, ACR>(
+pub fn process1<AC, M: SlipMime, ACR>(
_mime: M,
mtu: u32,
packet: &[u8],
_mime: M,
mtu: u32,
packet: &[u8],