switch to iputils ping

Author: maybe-hello-world

tasks/measurements/ping.py

@@ -43,7 +43,7 @@ def dispatch(self, node: Node) -> Task:
 
 
 class PingLinuxImplementation(Task):
-    requirements = ["sudo apt-get install -y inetutils-ping"]
+    requirements = ["sudo apt-get install -y iputils-ping"]
 
     def __init__(self, address: str, count: int = 1, *args, **kwargs):
         self.address = address.strip()
@@ -57,47 +57,56 @@ def run(self):
 
     def _format(self, output: str) -> PingResult:
         raw_output = output[:]
-        lines = [x for x in output.split("\n") if x]
-        if not lines[-1].startswith("round-trip"):
+
+        try:
+            lines = [x for x in output.split("\n") if x]
+
+            # parse rtt statistics
+            rtts, unit = lines[-1].split("=")[1].strip().split(" ")
+            rtt_min, rtt_avg, rtt_max, rtt_stddev = [float(x) for x in rtts.split("/")]
+            lines = lines[:-1]
+
+            # take packet_loss line and packets received
+            _, packets_received, packet_loss, _ = lines[-1].split(",")
+            packets_received = int(packets_received.strip().split(" ")[0])
+            packet_loss = float(
+                packet_loss.removesuffix("packet loss").strip().split("%")[0]
+            )
+            lines = lines[:-1]
+
+            # remove first and last line
+            lines = lines[1:-1]
+
+            # parse received packets
+            packets = []
+            for packet in lines[:packets_received]:
+                packet = packet.split(":")[1]
+                seq, ttl, time, unit = [x.strip() for x in packet.split(" ") if x]
+                seq = int(seq.split("=")[1])
+                ttl = int(ttl.split("=")[1])
+                time = float(time.split("=")[1])
+                packets.append(PacketResult(seq, ttl, time, unit))
+            lines = lines[packets_received:]
+
+            # theoretically, here should be 0 lines left
+            unparsed_output = lines
+
+            return PingResult(
+                self.address,
+                packets,
+                packet_loss,
+                rtt_min,
+                rtt_avg,
+                rtt_max,
+                rtt_stddev,
+                unit,
+                unparsed_output,
+                raw_output,
+            )
+        except Exception:
             return PingResult(self.address, [], 100, 0, 0, 0, 0, "", [], raw_output)
 
-        # parse rtt statistics
-        rtts, unit = lines[-1].split("=")[1].strip().split(" ")
-        rtt_min, rtt_avg, rtt_max, rtt_stddev = [float(x) for x in rtts.split("/")]
-        lines = lines[:-1]
-
-        # take packet_loss line and packets received
-        packets_received, packet_loss = lines[-1].split(",")[1:]
-        packets_received = int(packets_received.strip().split(" ")[0])
-        packet_loss = float(packet_loss.strip().split("%")[0])
-        lines = lines[:-1]
-
-        # remove first and last line
-        lines = lines[1:-1]
-
-        # parse received packets
-        packets = []
-        for packet in lines[:packets_received]:
-            packet = packet.split(":")[1]
-            seq, ttl, time, unit = [x.strip() for x in packet.split(" ") if x]
-            seq = int(seq.split("=")[1])
-            ttl = int(ttl.split("=")[1])
-            time = float(time.split("=")[1])
-            packets.append(PacketResult(seq, ttl, time, unit))
-        lines = lines[packets_received:]
-
-        # theoretically, here should be 0 lines left
-        unparsed_output = lines
-
-        return PingResult(
-            self.address,
-            packets,
-            packet_loss,
-            rtt_min,
-            rtt_avg,
-            rtt_max,
-            rtt_stddev,
-            unit,
-            unparsed_output,
-            raw_output,
-        )
+
+if __name__ == "__main__":
+    ping = PingLinuxImplementation("8.8.8.8", count=10)
+    print(ping.run())