Commit Graph

300 Commits

Author SHA1 Message Date
Simon def3e27e82 XLX working 2021-02-28 23:04:45 +00:00
Simon ed7c371966 XLX work 2021-02-28 12:05:03 +00:00
Simon 638e585a46 Take callsign for voice ident from callsign sent in connection
rather than from system name. Now it will work with proxy setups too!
2021-02-26 19:13:58 +00:00
Simon 668d52c2ba We need to deepcopy() when using GENERATE 2021-02-24 22:24:19 +00:00
Simon 6ad5af1b2b Don't allow decimal point / full stop in TG in options 2021-02-23 15:31:58 +00:00
Simon a4fe1995d2 Fix voice - again 2021-02-21 18:52:37 +00:00
Simon b719a55e4c Add GENERATOR: N in MASTER deifnition
If GENERATOR is set to more than 1, the master definiton
is used as a template to generate N systems with sequential ports,
starting at the port listed in the defintion.

For example:

for N = 2:

G7RZU-0 - port 54000
G7RZU-1 - port 54001
2021-02-21 14:33:53 +00:00
Simon 2e3806cf4e Only process type MASTER in options config.
This should enable type PEER and type XLXPEER to be used
2021-02-21 12:35:04 +00:00
Simon 91dc7129bb Fix voices 2021-02-20 21:18:08 +00:00
Simon 0600332980 Internationalisation map 2021-02-14 15:42:43 +00:00
Simon 116a904d9f further typo 2021-02-14 13:20:51 +00:00
Simon ed85784edf typo 2021-02-14 13:19:28 +00:00
Simon acab830ef9 Only update UA timer when it's acptually changed ! 2021-02-14 13:18:26 +00:00
Simon 72fe31509b More fixes on options default timer handling 2021-02-14 13:13:12 +00:00
Simon 41d24ddec2 Options UA TIMER handling fix 2021-02-14 12:07:06 +00:00
Simon fb45584aab Revert "Remove "to" from linked messages so it at least makes sense"
This reverts commit e882b4226b.
2021-02-09 09:37:44 +00:00
Simon e882b4226b Remove "to" from linked messages so it at least makes sense
for all languages and doesn't cause to - two confusion
2021-02-08 14:41:23 +00:00
Simon 0b1015b5af Tidy up announcement voice sending
Including setting streamid variables within main reactor thread for consistency
2021-01-28 01:27:10 +00:00
Simon 23ac74dfdf Explicit returns in SQL thread 2021-01-27 21:30:37 +00:00
Simon 75bbc8baad Fix voice file support 2021-01-27 21:08:46 +00:00
Simon a74c02d28c Change language of voice announcements in config file
(See ./Audio/ )
2021-01-27 19:55:09 +00:00
Simon 67db3f1acd Outline of language file support
Move sql.close() into SQL thread
2021-01-27 19:49:02 +00:00
Simon 91fe2e6f9d Get rid of Semaphores completely. 2021-01-27 18:54:31 +00:00
Simon d3bc7fe5d8 All blocking code removed from main thread
What was I actually thinking ?!?!?
2021-01-27 18:47:55 +00:00
Simon 799a48b91d Indent error in sendspeec logging 2021-01-25 13:30:21 +00:00
Simon d209f5b368 Move voice logging into INFO logs 2021-01-25 13:21:02 +00:00
Simon 4e64e5f740 a 2021-01-25 00:48:37 +00:00
Simon 8116fe38e1 Add handling of occasional exception in dmrbits.tobytes() in HBP class 2021-01-24 18:56:33 +00:00
Simon 95037683b7 Exclude decimal point from options TG string 2021-01-23 12:01:35 +00:00
Simon ca054d5cd6 Add ability to specify table to SQL config 2021-01-22 13:09:28 +00:00
Simon e7dca90355 Loads of threads! 2021-01-19 23:54:09 +00:00
Simon e7b1c24ed9 Send announcements from ID 5000 2021-01-19 19:42:46 +00:00
Simon 586a9246b7 Fix possible semaphore bug in bridge table 2021-01-18 21:11:40 +00:00
Simon f52e63cb77 More stream logging 2021-01-18 17:04:29 +00:00
Simon 4fa05fb503 tidy up stream trimmer logging 2021-01-18 17:02:09 +00:00
Simon f87534f69c Streamy 2021-01-18 16:50:27 +00:00
Simon 77bfacf2e5 Bug in stream trimmer 2021-01-18 15:04:00 +00:00
Simon 76927ebf95 Proper debug for streamtrimmer problem 2021-01-18 12:31:56 +00:00
Simon e6edd4c16b Debugging for stream problems 2021-01-18 11:09:05 +00:00
Simon 8f5bdceec8 Except 2021-01-17 22:54:44 +00:00
Simon f05d192a1b Handle keyerror in stream trimmer 2021-01-17 22:45:45 +00:00
Simon 4626917326 It doesn't make sense to be able to link #9 to TG9 ! 2021-01-17 12:59:40 +00:00
Simon 3889eabda7 Another indent problem 2021-01-16 16:19:12 +00:00
Simon 8010a7aad3 Fix indent 2021-01-16 16:16:05 +00:00
Simon 9a719489c5 Target active 2021-01-16 16:14:51 +00:00
Simon f83d092b1c Reinstate old TG9 code for HBP only 2021-01-16 15:54:52 +00:00
Simon 31e9432063 Set stat trimmer back to once an hour 2021-01-16 13:05:53 +00:00
Simon d9e42685cc Make stat trimmer handle active and inactive correctly 2021-01-16 13:03:20 +00:00
Simon 6064be77d7 Run stat trimmer every hour 2021-01-16 12:13:47 +00:00
Simon 117ab55358 Fix statTrimmer 2021-01-16 12:05:09 +00:00
Simon a355f5bf3b Revert "Single mode changes"
This reverts commit 585e50ad9e.
2021-01-10 21:08:20 +00:00
Simon 585e50ad9e Single mode changes 2021-01-10 21:06:48 +00:00
Simon ac0de92e5a Revert "Revert "Revert "Revert "Try another method to match all for dial bridges""""
This reverts commit f28ef3eb16.
2021-01-10 20:48:45 +00:00
Simon f28ef3eb16 Revert "Revert "Revert "Try another method to match all for dial bridges"""
This reverts commit 2f38da5ba8.
2021-01-10 20:46:53 +00:00
Simon 71f1f5e83d Revert "Revert "Revert "Try another method to match all for dial bridges"""
This reverts commit 2f38da5ba8.
2021-01-10 20:44:26 +00:00
Simon 2f38da5ba8 Revert "Revert "Try another method to match all for dial bridges""
This reverts commit 2ce31622be.
2021-01-10 20:41:17 +00:00
Simon 2ce31622be Revert "Try another method to match all for dial bridges"
This reverts commit 7272289a23.
2021-01-10 20:12:35 +00:00
Simon 7272289a23 Try another method to match all for dial bridges 2021-01-10 20:10:17 +00:00
Simon e2b137d6aa This reverts commit 176009a323. 2021-01-10 19:56:59 +00:00
Simon 176009a323 Change bridge selection logic in HBP class to match via bridge number 2021-01-10 19:54:40 +00:00
Simon 71d35eb26d Locking in bridge table when trimming STAT bridges 2021-01-10 14:03:45 +00:00
Simon 4682ad2228 On-the-fly generation of static bridges 2021-01-10 13:50:37 +00:00
Simon 79a2dd1099 Fix missing master maintainance loop bug (peers not timing out) 2021-01-06 01:38:09 +00:00
Simon d7e9ae9a4a OPtions - preserve peers 2021-01-05 17:18:02 +00:00
Simon e4f1a932c0 Add some locking around peers 2021-01-04 23:09:48 +00:00
Simon 287ebc49cb needs int() if default reflector 2020-12-28 00:07:28 +00:00
Simon 11df210f8a there is a better way 2020-12-27 21:03:41 +00:00
Simon 6155507644 Quote removal from options 2020-12-27 21:01:37 +00:00
Simon 023d2f98af Wrong var 2020-12-27 18:55:22 +00:00
Simon c49a7cb279 fix vauleerror 2020-12-27 17:44:10 +00:00
Simon 0e5e91850c Add support for HBP options line 2020-12-27 17:32:38 +00:00
Simon 28e4800283 Add HBP Options (RPTO) handling 2020-12-23 00:31:27 +00:00
Simon b782748944 fix seq rollover 2020-12-21 17:16:50 +00:00
Simon 5e24fea463 Seq > 1 2020-12-21 17:07:05 +00:00
Simon 6f1254ac9a Add handling of:
Duplicate packet
missing packet(s)
out-of-order packets

by using the Seqeunce number the the OBP packet
2020-12-21 15:19:41 +00:00
Simon 11cc0f59f3 remove dedup logging 2020-12-20 23:28:13 +00:00
Simon 32c25e306c Revert "Back off logging for dedup code"
This reverts commit 4a2bdaf80f.
2020-12-20 21:48:48 +00:00
Simon 4a2bdaf80f Back off logging for dedup code 2020-12-20 21:25:34 +00:00
Simon b56b73f763 Show source in debug log 2020-12-20 18:23:19 +00:00
Simon f4c17e9540 Only ignore openbridge (again) 2020-12-20 18:05:19 +00:00
Simon 7ed54e09ae ia 2020-12-20 17:17:07 +00:00
Simon 7086174e34 Only avoid openbridge for dups 2020-12-20 17:10:13 +00:00
Simon 90409a5e25 Allow relfectors over openbridge 2020-12-19 19:04:07 +00:00
Simon afbf8c4239 Does refl work without dupes this time
Reworked it

Added some logging
2020-12-19 18:51:52 +00:00
Simon 26eeb9fbba Another try at reflectors 2020-12-13 18:35:23 +00:00
Simon 9fb429c2e3 try again 2020-12-13 15:53:37 +00:00
Simon a3c1f1182f Fix for packet dupes (currently debugging enabled) 2020-12-13 15:17:35 +00:00
Simon 7b4795e560 still 2020-12-09 17:20:28 +00:00
Simon 39009a37b6 got last change slightly wrong 2020-12-09 16:55:32 +00:00
Simon 83cb446835 Create bridges for TGs 5 and over 2020-12-09 16:30:20 +00:00
Simon 9750df7beb Disable reflectors 2020-12-06 13:34:27 +00:00
Simon 79e75ccd79 Revert "Revert the ability to activate the same TG on two slots (why would you want to?)"
This reverts commit b19a5be6b0.
2020-12-06 13:18:10 +00:00
Simon b19a5be6b0 Revert the ability to activate the same TG on two slots (why would you want to?) 2020-12-06 12:27:44 +00:00
Simon 6b76c0cea6 same as before but on obp 2020-12-05 21:47:51 +00:00
Simon 6982978651 Move ignore to outside for 2020-12-05 21:46:48 +00:00
Simon 634e9fdd67 Typos - getting code blind now! 2020-12-05 21:22:47 +00:00
Simon f02f7f3069 it's append not push in python! 2020-12-05 21:12:13 +00:00
Simon 0eb6876f0b helps if I make change to both obp and hbp 2020-12-05 21:03:44 +00:00
Simon c810bd4339 indent issue - damn python ;-) 2020-12-05 20:58:40 +00:00
Simon 01917ff5da bridge2 2020-12-05 20:49:35 +00:00
Simon 6130170f36 Does it really work now? 2020-12-05 20:27:54 +00:00
Simon d474ab1023 I hope this fixes the openspot issue! 2020-12-05 20:06:38 +00:00
Simon bd6715566b Fix multiple packets being sent on OBP connections 2020-12-03 20:28:23 +00:00
Simon b251cee899 Add new TO_TYPE - STAT 2020-11-30 22:09:51 +00:00
Simon d8c1f40bc3 Add support for multiple upstream bridges 2020-11-28 15:56:02 +00:00
Simon 806e8566de Fix bug where you can't use the same TG on both slots simultaneously
Well, I thought this might well be a feature, but it was an easy fix so...
2020-11-24 11:33:11 +00:00
Simon 0aa3f57a08 Preserve peers in config dict 2020-11-16 20:45:02 +00:00
Simon 057318ef44 bracketing 2020-11-14 16:40:04 +00:00
Simon 4aae0302e0 Fix timer on reflectors 2020-11-14 10:45:45 +00:00
Simon d076096faa Route between TGs / |Reflectors on HBP systems 2020-11-13 22:24:31 +00:00
Simon 18ae439125 Don't try and kill master maintenance loop if it isn't actually running! 2020-11-08 20:12:53 +00:00
Simon e7b13ef19a Fix error in re-activation of default reflector because reflector brdige was being incorrectly deleted 2020-11-08 14:52:16 +00:00
Simon bb449d2436 timer on reflectors now fixed 2020-11-07 17:36:15 +00:00
Simon c521e4d513 try again 2020-11-07 17:20:03 +00:00
Simon 4261604981 fix timer for single reflector 2020-11-07 17:14:49 +00:00
Simon f5f87d540b Add more silence padding to voice 2020-11-07 17:03:40 +00:00
Simon bdad00ffdc Check master maintenance loop is running before we try and stop it to avoid exception 2020-11-07 16:01:41 +00:00
Simon a1bf50e698 remove some unneeded debugging 2020-11-07 14:59:53 +00:00
Simon f0d1e8ed8a Fix error in reset_default_reflector 2020-11-07 14:58:46 +00:00
Simon 851b7c1d12 Fix timer error 2020-11-07 14:57:32 +00:00
Simon d9bf484bc0 Delete unused bridges now works 2020-10-25 23:40:54 +00:00
Simon 052f3d58d0 more work in unused bridge logic 2020-10-24 23:50:31 +01:00
Simon ac157b0f86 bridge used logic 2020-10-24 23:43:08 +01:00
Simon 09737dd2d8 Exclude OBP link to master 2020-10-24 23:38:42 +01:00
Simon 694c38d1be automatically remove unused bridges 2020-10-24 23:35:54 +01:00
Simon a555f075a1 arggh - branch bleed 2020-10-24 00:07:28 +01:00
Simon a1e14af0e4 Fix minor bug in timer switches 2020-10-24 00:04:45 +01:00
Simon ef5cd26def more work on tg bridge creation 2020-10-22 21:31:15 +01:00
Simon 0f0dc820af create bridge logic fix 2020-10-22 21:21:45 +01:00
Simon 70f25744c3 tidy up ident 2020-10-19 22:45:28 +01:00
Simon d8d2a55eab Fix ident 2020-10-19 22:41:44 +01:00
Simon 7bc15c6dd3 More error debugging in mysql
Handle changes to ACLs in DB
2020-10-19 21:02:04 +01:00
Simon a307898bea Enable and disable bridges when repeater is enabled and disabled 2020-10-18 13:41:38 +01:00
Simon bce34ccb2c more fixes and tuning to voice 2020-10-12 16:30:32 +01:00
Simon efb341ac76 fix 2020-10-12 16:18:35 +01:00
Simon db5ea4f937 slot 2020-10-12 16:17:36 +01:00
Simon 57d80fe621 Add streamid to voice to stop clash
Semaphore control for bridge dict
Semaphore control for MySQL
2020-10-12 16:04:01 +01:00
Simon 4cd3ce6780 static tgs work and various other tidying up 2020-10-06 22:20:57 +01:00
Simon 7b91306e36 update static TGS when updated in the db 2020-10-06 12:12:49 +01:00
Simon 1a719a7bcd preparation to static tgs to mysql thread 2020-10-05 23:32:36 +01:00
Simon e62e9bab0d Static TGs on startup 2020-10-05 23:29:00 +01:00
Simon a7de755223 take out print 2020-10-04 16:18:08 +01:00
Simon b472f01f34 revert openbridge stuff as for some reason it does not work 2020-10-04 16:16:48 +01:00
Simon 6c119315aa test 2 2020-10-04 16:14:18 +01:00
Simon b02b485ca0 test 2020-10-04 16:11:43 +01:00
Simon c43f3772cf discconected voice fix 2020-10-04 16:05:13 +01:00
Simon f20e3cfcbc logic master 2020-10-04 15:50:13 +01:00
Simon c4e1376aae tidy up special openbridge handling 2020-10-04 15:42:52 +01:00
Simon 63195f928e openbridg 2020-10-04 15:29:10 +01:00
Simon 92dab73400 Default reflectors now working 2020-10-04 15:19:46 +01:00