Skip to content

Commit

Permalink
Discard no tc mm (follow-up) (#2584)
Browse files Browse the repository at this point in the history
* forgot to set the flags
  • Loading branch information
rmalmain authored and riesentoaster committed Oct 4, 2024
1 parent 5149ba9 commit 1fb2c28
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions libafl/src/events/broker_hooks/centralized_multi_machine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use std::{
#[cfg(feature = "llmp_compression")]
use libafl_bolts::llmp::LLMP_FLAG_COMPRESSED;
use libafl_bolts::{
llmp::{Flags, LlmpBrokerInner, LlmpHook, LlmpMsgHookResult, Tag},
llmp::{Flags, LlmpBrokerInner, LlmpHook, LlmpMsgHookResult, Tag, LLMP_FLAG_FROM_MM},
ownedref::OwnedRef,
shmem::ShMemProvider,
ClientId, Error,
Expand Down Expand Up @@ -255,20 +255,22 @@ where
let msg = msg.into_owned().unwrap().into_vec();
#[cfg(feature = "llmp_compression")]
match state_wr_lock.compressor().maybe_compress(msg.as_ref()) {
Some(comp_buf) => {
Ok((_LLMP_TAG_TO_MAIN, LLMP_FLAG_COMPRESSED, comp_buf))
}
None => Ok((_LLMP_TAG_TO_MAIN, Flags(0), msg)),
Some(comp_buf) => Ok((
_LLMP_TAG_TO_MAIN,
LLMP_FLAG_COMPRESSED | LLMP_FLAG_FROM_MM,
comp_buf,
)),
None => Ok((_LLMP_TAG_TO_MAIN, LLMP_FLAG_FROM_MM, msg)),
}
#[cfg(not(feature = "llmp_compression"))]
Ok((_LLMP_TAG_TO_MAIN, Flags(0), msg))
Ok((_LLMP_TAG_TO_MAIN, LLMP_FLAG_FROM_MM, msg))
}
MultiMachineMsg::Event(evt) => {
let evt = evt.into_owned().unwrap();
let (inner_flags, buf) =
Self::try_compress(&mut state_wr_lock, evt.as_ref())?;

Ok((_LLMP_TAG_TO_MAIN, inner_flags, buf))
Ok((_LLMP_TAG_TO_MAIN, inner_flags | LLMP_FLAG_FROM_MM, buf))
}
})
.collect();
Expand Down

0 comments on commit 1fb2c28

Please sign in to comment.