This commit is contained in:
Andrea Fioraldi 2021-02-11 14:52:23 +01:00
parent 583508c4d9
commit 98601d6c02
2 changed files with 6 additions and 7 deletions

View File

@ -941,7 +941,7 @@ where
let mut mgr; let mut mgr;
// We start ourself as child process to actually fuzz // We start ourself as child process to actually fuzz
if std::env::var(ENV_FUZZER_SENDER).is_err() { if std::env::var(_ENV_FUZZER_SENDER).is_err() {
mgr = LlmpEventManager::<I, SH, ST>::new_on_port(stats, broker_port)?; mgr = LlmpEventManager::<I, SH, ST>::new_on_port(stats, broker_port)?;
if mgr.is_broker() { if mgr.is_broker() {
@ -950,17 +950,17 @@ where
mgr.broker_loop()?; mgr.broker_loop()?;
} else { } else {
mgr.to_env(ENV_FUZZER_BROKER_CLIENT_INITIAL); mgr.to_env(_ENV_FUZZER_BROKER_CLIENT_INITIAL);
// First, create a channel from the fuzzer (sender) to us (receiver) to report its state for restarts. // First, create a channel from the fuzzer (sender) to us (receiver) to report its state for restarts.
let sender = LlmpSender::new(0, false)?; let sender = LlmpSender::new(0, false)?;
let receiver = LlmpReceiver::on_existing_map( let receiver = LlmpReceiver::on_existing_map(
AflShmem::clone_ref(&sender.out_maps.last().unwrap().shmem)?, SH::clone_ref(&sender.out_maps.last().unwrap().shmem)?,
None, None,
)?; )?;
// Store the information to a map. // Store the information to a map.
sender.to_env(ENV_FUZZER_SENDER)?; sender.to_env(_ENV_FUZZER_SENDER)?;
receiver.to_env(ENV_FUZZER_RECEIVER)?; receiver.to_env(_ENV_FUZZER_RECEIVER)?;
let mut ctr = 0; let mut ctr = 0;
// Client->parent loop // Client->parent loop

View File

@ -4,12 +4,11 @@
#[macro_use] #[macro_use]
extern crate clap; extern crate clap;
use afl::shmem::AflShmem;
use clap::{App, Arg}; use clap::{App, Arg};
use std::{env, path::PathBuf}; use std::{env, path::PathBuf};
use afl::{ use afl::{
bolts::tuples::tuple_list, bolts::{tuples::tuple_list, shmem::AflShmem},
corpus::{Corpus, InMemoryCorpus}, corpus::{Corpus, InMemoryCorpus},
events::setup_restarting_mgr, events::setup_restarting_mgr,
events::{SimpleStats}, events::{SimpleStats},