renamed b2b to remote_broker_addr

Author: domenukk

fuzzers/frida_libpng/src/fuzzer.rs

@@ -426,7 +426,7 @@ unsafe fn fuzz(
         .run_client(&mut run_client)
         .cores(cores)
         .stdout_file(stdout_file)
-        .b2b_addr(broker_addr)
+        .remote_broker_addr(broker_addr)
         .build()
         .unwrap()
         .launch()

libafl/src/events/llmp.rs

@@ -554,9 +554,6 @@ pub enum ManagerKind {
     Client { cpu_core: Option<CoreId> },
     /// A [`LlmpBroker`], forwarding the packets of local clients.
     Broker,
-    #[cfg(feature = "std")]
-    /// A [`LlmpBroker`] that establishes a Broker 2 Broker communication before starting up.
-    ConnectedBroker { connect_to: SocketAddr },
 }
 
 /// Sets up a restarting fuzzer, using the [`StdShMemProvider`], and standard features.
@@ -614,6 +611,9 @@ where
     /// The broker port to use
     #[builder(default = "1337")]
     broker_port: u16,
+    /// The address to connect to
+    #[builder(default = "Option::None")]
+    remote_broker_addr: Option<SocketAddr>,
     /// The type of manager to build
     #[builder(default = "ManagerKind::Any")]
     kind: ManagerKind,
@@ -654,17 +654,15 @@ where
                         println!(
                             "Doing broker things. Run this tool again to start fuzzing in a client."
                         );
-                        mgr.broker_loop()?;
-                        return Err(Error::ShuttingDown);
-                    }
-                    ManagerKind::ConnectedBroker { connect_to } => {
-                        // Yep, broker. Just loop here.
-                        // But first, connect to another broker :)
-                        println!("Connecting to remote broker at {:?}...", connect_to);
-                        mgr.connect_b2b(connect_to)?;
-                        println!(
-                            "Doing broker things. Run this tool again to start fuzzing in a client."
-                        );
+
+                        match self.remote_broker_addr {
+                            Some(remote_broker_addr) => {
+                                println!("B2b: Connecting to {:?}", &remote_broker_addr);
+                                mgr.connect_b2b(remote_broker_addr)?;
+                            }
+                            None => (),
+                        };
+
                         mgr.broker_loop()?;
                         return Err(Error::ShuttingDown);
                     }
@@ -676,7 +674,7 @@ where
                 }
             } else {
                 match self.kind {
-                    ManagerKind::Broker | ManagerKind::ConnectedBroker { connect_to: _ } => {
+                    ManagerKind::Broker => {
                         return Err(Error::IllegalState(
                             "Tried to start a broker, but got a client".to_string(),
                         ));

libafl/src/utils.rs

@@ -631,7 +631,7 @@ where
     /// The `ip:port` address of another broker to connect our new broker to for multi-machine
     /// clusters.
     #[builder(default = "None")]
-    b2b_addr: Option<SocketAddr>,
+    remote_broker_addr: Option<SocketAddr>,
 }
 
 #[cfg(feature = "std")]
@@ -698,13 +698,13 @@ where
         #[cfg(feature = "std")]
         println!("I am broker!!.");
 
-        if let Some(b2b_addr) = self.b2b_addr {
+        if let Some(remote_broker_addr) = self.remote_broker_addr {
             RestartingMgrBuilder::<I, S, SP, ST>::default()
                 .shmem_provider(self.shmem_provider.clone())
                 .stats(self.stats.clone())
                 .broker_port(self.broker_port)
                 .kind(ManagerKind::ConnectedBroker {
-                    connect_to: b2b_addr,
+                    connect_to: remote_broker_addr,
                 })
                 .build()
                 .unwrap()
@@ -800,27 +800,15 @@ where
         #[cfg(feature = "std")]
         println!("I am broker!!.");
 
-        if let Some(b2b_addr) = self.b2b_addr {
-            RestartingMgrBuilder::<I, S, SP, ST>::default()
-                .shmem_provider(self.shmem_provider.clone())
-                .stats(self.stats.clone())
-                .broker_port(self.broker_port)
-                .kind(ManagerKind::ConnectedBroker {
-                    connect_to: b2b_addr,
-                })
-                .build()
-                .unwrap()
-                .launch()?;
-        } else {
-            RestartingMgrBuilder::<I, S, SP, ST>::default()
-                .shmem_provider(self.shmem_provider.clone())
-                .stats(self.stats.clone())
-                .broker_port(self.broker_port)
-                .kind(ManagerKind::Broker)
-                .build()
-                .unwrap()
-                .launch()?;
-        }
+        RestartingMgrBuilder::<I, S, SP, ST>::default()
+            .shmem_provider(self.shmem_provider.clone())
+            .stats(self.stats.clone())
+            .broker_port(self.broker_port)
+            .kind(ManagerKind::Broker)
+            .remote_broker_addr(self.remote_broker_addr)
+            .build()
+            .unwrap()
+            .launch()?;
 
         //broker exited. kill all clients.
         for handle in &mut handles {