Commit Graph

431 Commits

Author SHA1 Message Date
Cort Buffington
574a89e7f9 Remove JSON Reporting
It has a major problem with byte strings in the dictionaries… this may
never work
2015-06-20 19:57:07 -05:00
Cort Buffington
31223a846d Work on reporting options 2015-06-12 08:28:48 -05:00
Cort Buffington
b8bd3da8db Add IPSC Trunk Flag
Trunk flag will (not yet) byass IPSC TS loading checks so that 2 or
more DMRlinks may join an IPSC that moves streams between them. It will
be possible to bridge an arbitrary number of streams since there’s no 2
TS restriction on a DMRlink to DMRlink IPSC
2015-06-07 21:06:30 -05:00
Cort Buffington
10a21ed118 Word on data reporting options
in the process of adding several ways to dump the data structure from
each IPSC for processing by some external program.
2015-06-07 20:54:21 -05:00
Cort Buffington
ec9c20d5ee *NOT_BACKWARD_COMPATIBLE* changes
Changes to the REPORTS section of the config and dmrlink.py to pave the
way for more flexible reporting types.
2015-06-07 15:46:29 -05:00
Cort Buffington
d2a73a044e log "ID, IP:PORT" instead of just "ID" 2015-06-07 13:19:32 -05:00
Cort Buffington
ea0188002a Add IP:Port to logging for some messages 2015-06-07 11:47:07 -05:00
Cort Buffington
9265ebaa9b Update 2015-06-03 14:38:58 -05:00
Cort Buffington
29789acfd9 Internal Diagnostics (Timing)
Added some stuff for measuring timing. Must be uncommented to work.
2015-05-28 09:58:06 -05:00
Cort Buffington
707d9cc1f6 Internal Diagnostics
Added pieces for timing run times. No functional change unless you go
uncomment stuff to turn it on.
2015-05-28 09:42:58 -05:00
Cort Buffington
bacb063121 Work on Data Packet Types 2015-05-28 09:42:14 -05:00
Cort Buffington
38b6e955a7 TXT Messages WORK! 2015-05-23 09:03:06 -05:00
Cort Buffington
ea5141684b Work on TXT Messaging 2015-05-23 08:54:46 -05:00
Cort Buffington
e2f596f311 DNS resolution
use gethostbyname when we parse the config, once, rather than leave it
to twisted to do when we send packets.
2015-05-21 09:45:24 -05:00
Cort Buffington
679038face Prepare for Data 2015-05-21 09:39:43 -05:00
Cort Buffington
dd4dee21c4 Move gethostbyname
don’t rely on Twisted to do this on packet write, just translate once
when we read the config.
2015-05-21 09:39:42 -05:00
Cort Buffington
d4b51fd08f Prepare for Dynamic Rule Changes
Change the name of the rules read from the file, then copy it to
“RULES” after processing. This will allow us to modify RULES on the
fly, while keeping the “original” - This is a hook to add dynamic rule
changes.
2015-05-17 11:19:19 -05:00
Cort Buffington
b7f6b62993 bridge_rules.py and dmrlink.cfg checking
exit if the IPSCs in dmrlink.cfg (or specified file) don’t match the
IPSCs specified in bridge_rules.py
2015-05-17 08:14:29 -05:00
Cort Buffington
6612ba70ef Group hangtime added
new value, per IPSC, added for call contention handling.
2015-05-14 23:00:47 -05:00
Cort Buffington
e2c47ed6ca Call contention handler reliable
MANY changes to make the call contention handler reliable. I’m ready to
say this works pretty well.
2015-05-14 23:00:19 -05:00
Cort Buffington
3cfc058468 CALL CONTENTION WORKING!
minor cleanup
2015-05-14 09:31:33 -05:00
Cort Buffington
66ae5fa873 Call Contention WORKING!
Not saying we won’t find a problem, but it looks pretty solid right
now!!!
2015-05-13 20:35:18 -05:00
Cort Buffington
ffe5a61463 Call Contention Handling
NOT THOROUGHLY TESTED: Code added to avoid bridging when a valid rule
exists, but the target IPSC/TS appears to be busy, either in group
hang-time, or already in a call on the same TGID (not likely).
2015-05-13 12:33:47 -05:00
Cort Buffington
7937071930 Trivial Change 2015-05-13 10:01:02 -05:00
Cort Buffington
4047e08a7e Call Contention Feature
Working to add a call contention feature that does not bridge into an
IPSC with an active call
2015-05-13 09:40:57 -05:00
Cort Buffington
50e9e8ecba Slow progress...
Getting closer to sending data to an AMBE decoder.
2015-05-13 09:40:57 -05:00
Cort Buffington
84b45cac26 Merge pull request #15 from KD8EYF/master
fix exit program via CTRL-C
2015-04-10 07:47:56 -05:00
David Kierzkowski
d83fbba277 fix exit program via CTRL-C 2015-04-10 01:41:44 -04:00
Cort Buffington
52793877e1 AMBE Audio Dumping 2015-03-24 14:22:03 -05:00
Cort Buffington
fb72151c8f work on AMBE dump 2015-03-24 13:28:56 -05:00
Cort Buffington
b9b21ebebf Begin AMBE Data Dump 2015-03-24 11:06:42 -05:00
Cort Buffington
5c27ce4d52 See last two changes (this is a clean-up commit) 2014-12-20 10:05:03 -06:00
Cort Buffington
06c9ed48b4 SEE LAST UPDATE (bug fix from it) 2014-12-20 09:56:15 -06:00
Cort Buffington
16e7d2aaeb send_to_ipsc moved into IPSC class
send_to_ipsc moved into the IPSC class, as well as a new class function
for the single line to write the socket. This allows for inserting a
debug logger line to dump EVERY packet transmitted on a per-IPSC basis.
2014-12-20 09:14:54 -06:00
Cort Buffington
1b99f2bfa6 Minor updates 2014-12-05 14:26:47 -06:00
Cort Buffington
acfb4700e5 NEW APPLICATION
logs RCM status messages to a MySQL database
2014-12-05 14:25:29 -06:00
Cort Buffington
5a5ecb322b IP Interface may be specified now
This is useful when using multiple interfaces and bridge.py is employed
as an application gateway between multiple un-connected networks (like
VPNs to the real world).
2014-10-31 10:30:18 -05:00
Cort Buffington
626cc3674b Messing around... 2014-10-06 08:18:06 -05:00
Cort Buffington
aed10e1d4e Messing around... 2014-10-06 08:17:48 -05:00
Cort Buffington
91a7e773b2 Don't import config for IPSC not enabled 2014-10-06 08:17:39 -05:00
Cort Buffington
e02c03a099 publish data structure to file 2014-10-05 22:11:56 -05:00
Cort Buffington
6e8292d5f1 Use Warning Added 2014-09-27 10:40:50 -05:00
Cort Buffington
d10f33a325 Update README.md 2014-09-18 20:13:26 -05:00
Cort Buffington
648569eb91 TIMESLOT TRANSLATION WORKS! 2014-09-18 20:08:54 -05:00
Cort Buffington
324c16660c Corrected MASTER_PEER Comment
Forgot to change this once DMRlink became capable of being a master.
2014-09-18 18:54:26 -05:00
Cort Buffington
f2148ab05f Formatting & Documentation 2014-09-05 19:35:37 -05:00
Cort Buffington
1457d34e21 improve debugging 2014-09-05 16:02:30 -05:00
Cort Buffington
140818bcb2 add debugging 2014-09-05 15:59:55 -05:00
Cort Buffington
549b8d62bb improve unknown packet type debugging 2014-09-05 15:57:08 -05:00
Cort Buffington
a4461d3de1 logger typo 2014-09-05 14:17:29 -05:00