Commit Graph

275 Commits

Author SHA1 Message Date
Cort Buffington d1af0560c4 INITIAL BRANCH COMMIT
0) CONFIGURATION FILES WILL NEED UPDATED TO CHANGE NAMING
CONFIGURATIONS!

1) Updated use of socket address instead of discrete IP/port. This will
be needed for socket address based validation and is faster… duh…
should have done this in the beginning.

2) Changed all references to “clients” as HBP systems to “peers”. This
sets the stage for having a peer_id and an originator_id for DMRD
packets.

3) Found and squashed a number of other random bugs, including the
registration ACL not working in confbridge or bridge_all.

4) router is now retired. confbridge is the future.
2018-08-07 16:05:27 -06:00
Cort Buffington d7f7288b81
Merge pull request #24 from marrold/master
Update hblink.cfg to use ham-digital DMR ID CSVs
2018-08-05 12:37:27 -05:00
Matthew Harrold 749e1c53e6
Update hblink.cfg to use ham-digital DMR ID CSVs
DMRMarc no longer supply DMR ID CSVs, I've updated to use Ham-Digital instead. Testing and working
2018-08-05 17:47:08 +01:00
Cort Buffington d633595d5e DMRD "repeater id" field always set to the "client"
If Master -> Client, it is the client’s radio ID, if it is Client ->
Master, it is the client radio ID. This appears to be the most correct
way, though admittedly not enforced, and might be better to use the
originating repeater/hotspot radio ID, but that’s for another day.
2018-08-02 14:21:51 -05:00
Cort Buffington 1bf629db2d Make it client/master agnostic
changed HBSYSTEM class method call to reference “send_system”, not
“send_clients”. This allows underlying hblink.py to decide if the
system is a master or client and work appropriately.
2018-08-01 11:59:20 -05:00
Cort Buffington 506c69008c Startup with no ACL defined 2018-07-29 18:09:44 -05:00
Cort Buffington 30ec74e68d
Don't track sub_acl.py and reg_acl.py – SAMPLES are now included. 2018-07-12 19:57:36 -05:00
Cort Buffington 4d41be3d2c
Update and rename sub_acl.py to sub_acl-SAMPLE.py 2018-07-12 19:56:35 -05:00
Cort Buffington 10f968080a
Update and rename reg_acl.py to reg_acl-SAMPLE.py 2018-07-12 19:55:17 -05:00
Cort Buffington bbf1e68099 Added HBP Registration ACL
Works like the ACL in hb_confbridge.py
2018-07-11 18:55:45 -05:00
Cort Buffington 9210053572
Merge pull request #22 from krippendorf/patch-1
Missing config/logger args for class AMBE
2018-07-09 13:53:53 -05:00
Cort Buffington 18f9613a90
Merge pull request #23 from krippendorf/patch-2
AMBE frame logger local var init
2018-07-09 13:53:20 -05:00
Frank Werner-Krippendorf 2659ac06c6
Update hblink.py 2018-07-09 20:39:13 +02:00
Frank Werner-Krippendorf 57aeccce8a
Missing config/logger args for class AMBE 2018-07-09 19:12:57 +02:00
Cort Buffington 416ab12c5f Updated all applications to support socket reporting 2018-07-03 21:51:20 -05:00
Cort Buffington d256efc9e1
Merge pull request #21 from marrold/Toggle_validation
Adds comment for "Loose" config option.
2018-06-25 16:17:17 -05:00
Matthew Harrold c4375eacb2
Adds comment for "Loose" config option. 2018-06-25 22:15:51 +01:00
Cort Buffington 290cfa2ac0
Merge pull request #20 from marrold/Toggle_validation
Refactor validation to optimise code
2018-06-25 12:40:02 -05:00
Matthew 39b3950af8 Refactor validation to optimise code 2018-06-25 18:23:56 +01:00
Cort Buffington dfe8667560
Merge pull request #17 from marrold/Toggle_validation
Allows user to disable strict validation when connecting to master
2018-06-25 12:11:58 -05:00
Matthew 8558bbcaa3 Allows user to disable strict validation when connecting to master 2018-06-23 20:25:19 +01:00
Cort Buffington e6b99c3d2b Call Monitoring FULLY FUNCTIONAL 2018-06-22 15:11:25 -05:00
Cort Buffington 2a4295743a Continued work on socket-based reporting
Status table and bridge table now work. Log messages are sending, but
formatting isn’t right yet, so they present as unknown messages.
2018-06-22 09:28:31 -05:00
Cort Buffington cff902d3f9 Fixed missing ping count in master stats from clients 2018-06-21 11:45:37 -05:00
Cort Buffington e8ef79bab0 Fixed subscriber ID display in 1 logging message 2018-06-20 16:21:06 -05:00
Cort Buffington 20b1c03d17
Merge pull request #16 from hamidzr/master
fixed minor typos
2018-06-20 15:54:14 -05:00
Hamid Zare 7555bded68 fixed typos/capitalization 2018-06-20 15:51:38 -05:00
Cort Buffington 4fd6c8b600 add triggering features of DMRlink version
add resets, timeslot specification and not taking actions if they don’t
change anything.
2018-06-20 15:41:37 -05:00
Cort Buffington 17e028700f Update hb_confbridge.py to work like the DMRlink equivalent
Improved rule activation to include timeslot and resets, as well as not
activating rules already activated, etc.
2018-06-20 15:34:19 -05:00
Cort Buffington dc826bac59 Added per-timeslot ACLs
WILL BREAK OLD CONFIGURATIONS!!!
2018-06-19 16:03:08 -05:00
Cort Buffington df264042d6 Adding hooks for socket reporting.
NOT WORKING YET… but it is a start
2018-06-19 16:02:38 -05:00
Cort Buffington f9c4b78b45
Fixing MORE DMR-MARC database changes
....how many more without warning?
2018-04-16 09:10:58 -05:00
Cort Buffington 26db5270e7 Revert "Accommodate DMR-MARC JSON only database dumps."
This reverts commit 31d8d50358.
2018-04-16 08:46:58 -05:00
Cort Buffington 31d8d50358 Accommodate DMR-MARC JSON only database dumps.
Talkgroup files are samples – pick one format or the other if you want
those aliases. this changes the type of dump you do with DMR-MARC and
the way you save files locally. CSV still works, but DMR-MARC will stop
supporting it!!! DO NOT mix .csv filenames and .json downloads. The
extension must match the file data type.
2018-03-16 20:30:03 -05:00
Cort Buffington 12f9e0af42
Delete peer_ids.csv 2018-03-16 16:19:41 -05:00
Cort Buffington cf0fcedbf8
Delete talkgroup_ids.csv 2018-03-16 16:19:19 -05:00
Cort Buffington bb8ee043fe
Delete subscriber_ids.csv 2018-03-16 16:19:04 -05:00
Cort Buffington f0ebecffd4
Update .gitignore 2018-03-16 16:16:46 -05:00
Cort Buffington 76daa63bd0 Fixing the WRONG commit. 2018-03-08 11:53:53 -06:00
Cort Buffington ef0778f16e Verifying local changes 2018-03-08 11:42:44 -06:00
Cort Buffington cae890522a Local commit for verification 2018-03-08 11:29:50 -06:00
Cort Buffington d4c312eaee Fixed logging problem from previous updates 2018-02-13 19:16:45 -06:00
Cort Buffington bb0e2c5020 Fix Log Message 2018-02-13 19:02:41 -06:00
Cort Buffington 06c611005e it updates sometimes 2018-02-13 18:59:56 -06:00
Cort Buffington 119f43cd59 ACL Features Added
This makes hb_bridge_all a more capable program with multiple ingress
and egress ACLs for SID and TGID filtering. It’s not as simple as
“blacklist” and “whitelist” since MULTIPLE endpoints exist, unlike an
MMDVM that has only one connection.
2018-02-13 18:59:44 -06:00
Cort Buffington a62630211f Bug Fix - Master -> Client
Was not re-writing the destination Radio ID on egress packets
2018-02-13 18:58:20 -06:00
Cort Buffington afd1370143 Fix "limbo" state in the re-connection cycle
Changed the logic for determining when to “re-connect” to the master.
This will break if the ping timeout is set too low. Recommend keeping
it at 4-5 seconds.
2018-02-12 12:16:56 -06:00
Cort Buffington fbe7862faa Added min & max DMR IDs
precursor to sanity checks on ACL improvements and additions.
2018-02-06 16:06:01 -08:00
Cort Buffington 050aad7cb3 HIGH PROFILE FIXES - Addresses Brandmeister disconnects.
Random:
  * Commented out per-packet debug logger lines (uncomment locally when needed)

Problems Fixed:

CLIENT MODE: hblink.py

hblink.py did not properly parse the radio_id in a MSTNAK message. We searched for
"MSTN" - 4 characters, and neglected to parse the radio ID at offset 6, after "MSTNAK"
instead of after 4, "MSTN".... rookie mistake:

  elif _command == 'MSTN':    # Actually MSTNAK -- a NACK from the master
  -                _radio_id = _data[4:8]
  +                _radio_id = _data[6:10]

hblink.py did not actually keep track of missed keep-alives correctly to reset a connection.
This has probably been fixed. At worst, no more broken than it was. Would like to have
some folks test it by breaking connectivty froma client to master and watch what happens.

Appears to work now.
2018-02-02 14:14:30 -06:00
Steve Zingman 382d594adf
Fix typo
SOFTWARE_ID and PACKAGE_ID values were reversed. DOH!
2017-11-09 06:17:36 -05:00