Merge branch 'master' into extrastats

.gitlab-ci.yml

@@ -46,6 +46,28 @@ build-extrastats:       # This job runs in the build stage, which runs first.
   only:
     - extrastats
 
+build-testing:       # This job runs in the build stage, which runs first.
+  stage: build
+  tags:
+    - buildx
+  script:
+    - echo "Compiling the code..."
+    - cd docker-configs
+    - docker buildx build --no-cache -f Dockerfile-proxy -t gitlab.hacknix.net:5050/hacknix/freedmr:testing --platform linux/amd64 --push .
+  only:
+    - testing
+
+build-debug:       # This job runs in the build stage, which runs first.
+  stage: build
+  tags:
+    - buildx
+  script:
+    - echo "Compiling the code..."
+    - cd docker-configs
+    - docker buildx build --no-cache -f Dockerfile-proxy -t gitlab.hacknix.net:5050/hacknix/freedmr:debug --platform linux/amd64 --push .
+  only:
+    - debug
+
 build-release:       # This job runs in the build stage, which runs first.
   stage: build
   tags:

bridge_master.py

@@ -929,8 +929,7 @@ def options_config():
                         if _options['TS1_STATIC']:
                             ts1 = _options['TS1_STATIC'].split(',')
                             for tg in ts1:
-                                if not tg or int(tg) == 0 or int(tg) >= 16777215 or tg == _options['DEFAULT_REFLECTOR']:
-                                    logger.debug('(OPTIONS) %s not setting TS1 Static %s. Bad TG or conflict with DIAL',_system,tg)
+                                if not tg:
                                     continue
                                 tg = int(tg)
                                 make_static_tg(tg,1,_tmout,_system)
@@ -941,8 +940,7 @@ def options_config():
                         if CONFIG['SYSTEMS'][_system]['TS2_STATIC']:
                             ts2 = CONFIG['SYSTEMS'][_system]['TS2_STATIC'].split(',')
                             for tg in ts2:
-                                if not tg or int(tg) == 0 or int(tg) >= 16777215 or tg == _options['DEFAULT_REFLECTOR'] or (tg and ts1 and tg in ts1):
-                                    logger.debug('(OPTIONS) %s not setting TS2 Static %s. Bad TG or conflict with DIAL or TS1',_system,tg)
+                                if not tg or int(tg) == 0 or int(tg) >= 16777215:
                                     continue
                                 tg = int(tg)
                                 reset_static_tg(tg,2,_tmout,_system)

hblink.py

@@ -287,7 +287,9 @@ class OPENBRIDGE(DatagramProtocol):
                 if compare_digest(_hash, _ckhs) and (_sockaddr == self._config['TARGET_SOCK'] or self._config['RELAX_CHECKS']):
                     _peer_id = _data[11:15]
                     if self._config['NETWORK_ID'] != _peer_id:
+                        if _stream_id not in self._laststrid:
                             logger.error('(%s) OpenBridge packet discarded because NETWORK_ID: %s Does not match sent Peer ID: %s', self._system, int_id(self._config['NETWORK_ID']), int_id(_peer_id))
+                            self._laststrid.append(_stream_id)
                         return
                     
                     #This is a v1 packet, so all the extended stuff we can set to default
@@ -413,10 +415,14 @@ class OPENBRIDGE(DatagramProtocol):
                     
                 _ckhs = _h.digest()
                 
+                _stream_id = _data[16:20]
+
                 if compare_digest(_hash, _ckhs) and (_sockaddr == self._config['TARGET_SOCK'] or self._config['RELAX_CHECKS']):
                     _peer_id = _data[11:15]
                     if self._config['NETWORK_ID'] != _peer_id:
+                        if _stream_id not in self._laststrid:
                             logger.error('(%s) OpenBridge packet discarded because NETWORK_ID: %s Does not match sent Peer ID: %s', self._system, int_id(self._config['NETWORK_ID']), int_id(_peer_id))
+                            self._laststrid.append(_stream_id)
                         return
                     _seq = _data[4]
                     _rf_src = _data[5:8]
@@ -433,7 +439,6 @@ class OPENBRIDGE(DatagramProtocol):
                         _call_type = 'group'
                     _frame_type = (_bits & 0x30) >> 4
                     _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
-                    _stream_id = _data[16:20]
                     #logger.debug('(%s) DMRD - Seqence: %s, RF Source: %s, Destination ID: %s', self._system, int_id(_seq), int_id(_rf_src), int_id(_dst_id))
                     
                     #Don't do anything if we are STUNned
@@ -548,7 +553,9 @@ class OPENBRIDGE(DatagramProtocol):
                 if compare_digest(_hash, _ckhs) and (_sockaddr == self._config['TARGET_SOCK'] or self._config['RELAX_CHECKS']):
                     _peer_id = _data[11:15]
                     if self._config['NETWORK_ID'] != _peer_id:
+                        if _stream_id not in self._laststrid:
                             logger.error('(%s) OpenBridge packet discarded because NETWORK_ID: %s Does not match sent Peer ID: %s', self._system, int_id(self._config['NETWORK_ID']), int_id(_peer_id))
+                            self._laststrid.append(_stream_id)
                         return
                     _seq = _data[4]
                     _rf_src = _data[5:8]