Commit Graph

98 Commits

Author SHA1 Message Date
Jonathan Naylor
cf170a571c Convert the relink code to using the Timer class. 2017-06-23 20:57:50 +01:00
Jonathan Naylor
cc6e8b21f3 Merge pull request #27 from phl0/fix
Fix reformatting mistake
2017-06-23 11:24:22 +01:00
phl0
5e1a084790 Fix reformatting mistake 2017-06-23 12:19:38 +02:00
Jonathan Naylor
bee2f21184 Reformat the code. 2017-06-23 09:07:50 +01:00
Jonathan Naylor
c568739305 Merge pull request #25 from hacknix/master
XLX: add unlink before re-link
2017-06-22 20:45:11 +01:00
Simon
9a5a4a1b69 XLX: add unlink before re-link 2017-06-22 19:16:44 +01:00
Jonathan Naylor
8b73781714 Merge pull request #23 from hacknix/master
XLX: Implement re-connect to startup reflector on period of RF inactivity.
2017-06-20 22:38:23 +01:00
hacknix
c29143c259 Merge pull request #1 from phl0/FixRelinkTimer
Make Relink timer disabled if set to 0
2017-06-20 19:44:53 +01:00
phl0
1002f399ea Make Relink timer disabled if set to 0 2017-06-20 16:22:30 +02:00
Simon
982faf30ef XLX: Add connected check to relink code. 2017-06-20 14:00:54 +01:00
Simon
7f4c586036 Add configuration option "Relink" to specify re-link timeout for XLX 2017-06-20 13:50:23 +01:00
Simon
6050be6406 Timeout XLX reflectors and return to startup after period of inactivity 2017-06-19 18:50:36 +01:00
Jonathan Naylor
048abc0888 Optimise the tracing to remove duplicate traces. 2017-06-09 20:14:26 +01:00
Jonathan Naylor
db417dfa78 Merge pull request #21 from g0wfv/develop
Changes to handing of repeater and master disconnects
2017-06-08 12:00:53 +01:00
g0wfv
fc4d79abe9 Alter MSTNAK responses to differentiate stages of retry 2017-06-08 10:31:08 +01:00
g0wfv
2c94d8a6c2 Alter log messages to differentiate between DMR and MMDVM networks 2017-06-08 10:29:36 +01:00
Tony Corbett G0WFV
706d30303e Respond to MMDVM closing down 2017-06-08 10:15:00 +01:00
g0wfv
4c64d3a8f7 Send MSTCL instead of MSTNAK 2017-06-08 09:43:30 +01:00
Jonathan Naylor
87bee93b2b First stage of rationalising the rule tracing code. 2017-06-07 21:22:01 +01:00
Jonathan Naylor
06a8b203ce Move the RF passall processing after all of the other rewrites are done. 2017-06-07 20:40:51 +01:00
Jonathan Naylor
60a95881ca Merge pull request #20 from g0wfv/develop
Alert connected host of gateway shutdown
2017-06-07 20:31:44 +01:00
g0wfv
e1d0a469eb Alert the host of shutdown by sending MSTNAK on network close 2017-06-07 20:10:23 +01:00
g0wfv
64b3f0848c Add SIGINT handling and alter termination signal logging 2017-06-07 19:35:48 +01:00
Jonathan Naylor
1b96901f88 Merge pull request #19 from g0wfv/develop
Alterations to rule tracing
2017-06-07 15:31:52 +01:00
g0wfv
e4b3f2b6cb Add an extra trace line when matched to say where rewritten to 2017-06-07 13:15:44 +01:00
Tony Corbett G0WFV
2d670d330b Alter rewrite ranges so they appear correctly in tracing 2017-06-07 10:38:53 +01:00
Jonathan Naylor
7cd557de8a Fix bug in tracing code, now enabled correctly. 2017-06-04 19:12:16 +01:00
Jonathan Naylor
2e257da997 Add basic rule tracing. 2017-06-04 15:17:43 +01:00
Jonathan Naylor
efbf42ff83 Allow for passing of beacon requests from the networks to the repeater. 2017-06-02 16:29:01 +01:00
Jonathan Naylor
c70e35d5b7 Merge pull request #16 from g0wfv/develop
Stop gateway bombing out when MMDVMHost stops after the gateway has restarted
2017-06-02 11:53:19 +01:00
Tony Corbett G0WFV
fc70b6813c Stop gateway bombing out when MMDVMHost stops after the gateway has restarted 2017-06-02 11:42:54 +01:00
Jonathan Naylor
a232addbde Merge pull request #15 from g0wfv/develop
Add status message to XLX via PC to 5000 +/- base
2017-06-01 22:38:36 +01:00
g0wfv
b92b119e8d Satisfying my CDO 2017-06-01 18:18:30 +01:00
Tony Corbett G0WFV
c8fbef1051 Cleanup 2017-06-01 17:41:16 +01:00
Tony Corbett G0WFV
d9b0410fa0 Add status when connected or disconnected via PC to 5000 +/- base! 2017-06-01 17:34:51 +01:00
g0wfv
61e21d4eb5 Merge remote-tracking branch 'upstream/master' 2017-06-01 16:40:51 +01:00
g0wfv
9914c43e1a Add status request (while connected only I think) to XLX - PC to 5000 (plus base!) 2017-06-01 16:40:14 +01:00
Jonathan Naylor
f90dbb5874 Add informative messages at startup. 2017-05-30 21:52:44 +01:00
Jonathan Naylor
8bc79767c5 Allow for a startup XLX reflector. 2017-05-30 13:42:30 +01:00
Jonathan Naylor
b10d482b75 Merge pull request #13 from hacknix/master
Fixed typo that stopped PassAll options from working with net. DMR-1
2017-05-30 13:19:25 +01:00
Simon
63310e3401 Fixed typo that stopped PassAll options from working with net. DMR-1 2017-05-30 12:13:17 +01:00
Jonathan Naylor
8861ff6dfe Allow for direct linking from one reflector to another. 2017-05-29 19:24:13 +01:00
Jonathan Naylor
8830141c4d Allow for a clean exit when waiting for the MMDVM connect. 2017-05-29 18:52:36 +01:00
Jonathan Naylor
8703366a9c Merge pull request #11 from g0wfv/default_ini
Remove duplicate redirects in default ini that may be the root of som…
2017-05-28 22:14:24 +01:00
Jonathan Naylor
54bd487b4e Merge pull request #12 from dg9vh/patch-1
fixed bug with XLX
2017-05-28 22:13:50 +01:00
Kim - DG9VH
77af11886c fixed bug with XLX
Added correct data-Channel (Talkgroup) for XLX-connections
2017-05-28 21:49:34 +02:00
Tony Corbett
580510086b Remove duplicate redirects in default ini that may be the root of some folks' problems
XLX Network 1 is now on TG6 with commands base 64000
XLX Network 2 remains on TG7 with commands base 74000
DMR Network 1 remains on TG9
DMR Network 2 remains on TG8
2017-05-28 02:30:30 +01:00
Jonathan Naylor
6f0c543ab0 Wrong test being used, fixed. 2017-05-27 17:11:43 +01:00
Jonathan Naylor
0446acc6c4 Remove compiler warnings. 2017-05-27 16:55:39 +01:00
Jonathan Naylor
a4cff2f3d7 Add Pass All parameters for TGs and Private Calls. 2017-05-27 16:50:34 +01:00