diff --git a/repeater/data_acquisition/letsmesh_handler.py b/repeater/data_acquisition/letsmesh_handler.py index da67b9c..a49ec65 100644 --- a/repeater/data_acquisition/letsmesh_handler.py +++ b/repeater/data_acquisition/letsmesh_handler.py @@ -33,12 +33,6 @@ LETSMESH_BROKERS = [ "port": 443, "audience": "mqtt-us-v1.letsmesh.net", }, - { - "name": "Europe (LetsMesh v1)", - "host": "mqtt-eu-v1.letsmesh.net", - "port": 443, - "audience": "mqtt-eu-v1.letsmesh.net", - }, ] diff --git a/repeater/engine.py b/repeater/engine.py index f439c47..fc1f9a1 100644 --- a/repeater/engine.py +++ b/repeater/engine.py @@ -184,7 +184,7 @@ class RepeaterHandler(BaseHandler): ) # Check if this is a duplicate - pkt_hash = packet.calculate_packet_hash().hex() + pkt_hash = packet.calculate_packet_hash().hex().upper() is_dupe = pkt_hash in self.seen_packets and not transmitted # Set drop reason for duplicates @@ -418,14 +418,14 @@ class RepeaterHandler(BaseHandler): def is_duplicate(self, packet: Packet) -> bool: - pkt_hash = packet.calculate_packet_hash().hex() + pkt_hash = packet.calculate_packet_hash().hex().upper() if pkt_hash in self.seen_packets: return True return False def mark_seen(self, packet: Packet): - pkt_hash = packet.calculate_packet_hash().hex() + pkt_hash = packet.calculate_packet_hash().hex().upper() self.seen_packets[pkt_hash] = time.time() if len(self.seen_packets) > self.max_cache_size: diff --git a/repeater/main.py b/repeater/main.py index c979518..d497c1e 100644 --- a/repeater/main.py +++ b/repeater/main.py @@ -194,7 +194,7 @@ class RepeaterDaemon: "tx_delay_ms": 0, "transmitted": False, "is_duplicate": False, - "packet_hash": packet.calculate_packet_hash().hex()[:16], + "packet_hash": packet.calculate_packet_hash().hex().upper()[:16], "drop_reason": "trace_received", "path_hash": path_hash, "src_hash": None, @@ -235,7 +235,7 @@ class RepeaterDaemon: self.repeater_handler and not self.repeater_handler.is_duplicate(packet)): if self.repeater_handler and hasattr(self.repeater_handler, 'recent_packets'): - packet_hash = packet.calculate_packet_hash().hex()[:16] + packet_hash = packet.calculate_packet_hash().hex().upper()[:16] for record in reversed(self.repeater_handler.recent_packets): if record.get("packet_hash") == packet_hash: record["transmitted"] = True