From d3ca3d0e0f6e85078a1f2e48540623df4bed0326 Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Mon, 13 Mar 2023 00:35:35 +0000
Subject: [PATCH] Add blacklist on rate drop Fix es_ES voices

---
 bridge_master.py |  1 +
 hblink.py        |  4 ++++
 i8n_voice_map.py | 42 +-----------------------------------------
 3 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/bridge_master.py b/bridge_master.py
index 68fb1f6..82b1df0 100644
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -1499,6 +1499,7 @@ class routerOBP(OPENBRIDGE):
                 #Rate drop
                 if self.STATUS[_stream_id]['packets'] > 18 and (self.STATUS[_stream_id]['packets'] / self.STATUS[_stream_id]['START'] > 25):
                     logger.warning("(%s) *PacketControl* RATE DROP! Stream ID:, %s TGID: %s",self._system,int_id(_stream_id),int_id(_dst_id))
+                    self.proxy_BadPeer()
                     return
                 
                 #Duplicate handling#
diff --git a/hblink.py b/hblink.py
index dc5aafc..7e03f2e 100755
--- a/hblink.py
+++ b/hblink.py
@@ -802,6 +802,10 @@ class HBSYSTEM(DatagramProtocol):
         _bltime = str(_bltime)
         _prpacket = b''.join([PRBL,peer_id,_bltime.encode('UTF-8')])
         self.transport.write(_prpacket,sockaddr)
+
+    def proxy_BadPeer(self):
+        for _pi in self._peers:
+            self.proxy_IPBlackList(_pi,self._peers[_pi]['SOCKADDR'])
         
     def validate_id(self,_peer_id):
         
diff --git a/i8n_voice_map.py b/i8n_voice_map.py
index 894de65..cd215b9 100644
--- a/i8n_voice_map.py
+++ b/i8n_voice_map.py
@@ -121,47 +121,7 @@ voiceMap = {
     },
     
     'es_ES': {
-                '1': 'one',
-                '2': 'two',
-                '3': 'three',
-                '4': 'four',
-                '5': 'five',
-                '6': 'six',
-                '7': 'seven',
-                '8': 'eight',
-                '9': 'nine',
-                'A': 'alfa',
-                'B': 'bravo',
-                'C': 'charlie',
-                'D': 'delta',
-                'E': 'echo',
-                'F': 'foxtrot',
-                'G': 'golf',
-                'H': 'hotel',
-                'I': 'india',
-                'J': 'juliet',
-                'K': 'kilo',
-                'L': 'lima',
-                'M': 'mike',
-                'N': 'november',
-                'O': 'oscar',
-                'P': 'papa',
-                'Q': 'quebec',
-                'R': 'romeo',
-                'S': 'sierra',
-                'T': 'tango',
-                'U': 'uniform',
-                'V': 'victor',
-                'W': 'whiskey',
-                'X': 'x-ray',
-                'Y': 'yankee',
-                'Z': 'zulu',
-                'to': 'silence',
-                'notlinked': 'not-linked',
-                'linkedto': 'linked-to',
-                'allstar-link-mode': 'alfa'
-    },
-    'es_ES_2': {
+		'0': 'zero',
                 '1': 'one',
                 '2': 'two',
                 '3': 'three',