Commit Graph
432 Commits
Author SHA1 Message Date
Sebastian Wagner 04e44b3703 use new command 'neolink rtsp' in docs
on some places in the docs the old command 'neolink ...' was used.
that raises a warning, so refer to 'neolink rtsp' where apropriate
2022-03-26 19:15:58 +01:00
George Hilliard 23a4790b8d Merge pull request #247 from QuantumEntangledAndy/argus2_media
Newer iframe and pframe format
2022-03-01 21:38:54 -06:00
QuantumEntangledAndy 50b12bd124 Condense unknowns in iframe deser 2022-02-26 15:22:27 +07:00
George Hilliard 6747edf2c7 Merge pull request #233 from QuantumEntangledAndy/readme_update
Update readme to signify that debian can run the ubuntu x86_64
2022-02-24 14:01:22 -06:00
George Hilliard 57c55e4121 Merge pull request #232 from QuantumEntangledAndy/keep_alive
Limit UDP keep alive
2021-12-12 14:40:25 -06:00
QuantumEntangledAndy ff76e4d2d7 Handle (optional) larger iframe headers in bcmedia 2021-12-03 16:57:16 +07:00
QuantumEntangledAndy 624fd72939 Handle (optional) larger pframe headers in bcmedia
Including samples for test
2021-11-27 13:34:29 +07:00
QuantumEntangledAndy 0f40722e33 Use nom's verbose error in deser so we can add context 2021-11-27 13:32:09 +07:00
QuantumEntangledAndy 04a779ad14 Update readme to signify that debian can run the ubuntu x86_64 2021-11-25 10:59:03 +07:00
QuantumEntangledAndy 0145983198 Only enable keep alive during UDP connection 2021-11-25 10:36:56 +07:00
QuantumEntangledAndy 9021acf6d6 Stop sending keep alive messages if the camera responses with an error code to them 2021-11-24 17:12:02 +07:00
QuantumEntangledAndy 039edfc18e Limit sending keep alive packets 2021-11-02 13:40:43 +07:00
George Hilliard 324d14e3f2 Merge pull request #217 from thirtythreeforty/unify-structs
Re-unify single-camera command structs and code
2021-11-01 10:04:08 -05:00
George Hilliard 81b148f6cd Allow --config anywhere in CLI
Since clap doesn't support required + global, do our own insisting.
2021-10-29 01:24:02 -05:00
George Hilliard fdd50f9dc0 Refactor: move single-camera boilerplate to utils.rs 2021-10-29 01:09:09 -05:00
George Hilliard de39e7ed2a Re-unify configuration files
Unfortunately the grammar of the --config parameter is a bit of a
football right now; previously you were allowed to specify it anywhere
because there wasn't much in the way of a CLI, then when subcommands
were added it became required to specify it after the subcommand.

This change makes it so that it must be specified *before* the
subcommand.  Ideally it would just be required *somewhere* in the
command line but clap doesn't support "global" for required arguments
(and it is indeed required).

On the whole, I'm okay with the change - the net win of having a unified
config struct makes up for the ergonomics hit in my opinion, and it
unlocks some further refactoring I will do next.
2021-10-29 00:25:54 -05:00
Andrew King f10f9f9706 Merge pull request #199 from QuantumEntangledAndy/udp_proto 2021-10-29 09:41:23 +07:00
George Hilliard e194d8dc02 Merge pull request #198 from QuantumEntangledAndy/newer_enc
Disable Support for 03 Encryption
2021-10-27 10:56:00 -05:00
QuantumEntangledAndy f70a93ac56 Register the default ip address during the remote discovery 2021-09-08 17:02:19 +07:00
Andrew King a301944298 Apply suggestions from code review 2021-09-08 16:29:03 +07:00
QuantumEntangledAndy 79e012647a Read me updates 2021-09-08 15:19:42 +07:00
QuantumEntangledAndy ad0b79eec5 Add comments to the udp crc 2021-09-08 11:50:53 +07:00
QuantumEntangledAndy 9b23d8dbfc Add Uid as a seperate field into the config 2021-09-08 11:45:37 +07:00
QuantumEntangledAndy 8327a8348b Reference battery before udp in the readme 2021-09-06 20:31:55 +07:00
QuantumEntangledAndy 7d95663d90 Remove ping every 2021-09-06 20:30:52 +07:00
QuantumEntangledAndy 8b85042fe8 Removed unneeded code in the udp description 2021-09-06 20:26:01 +07:00
QuantumEntangledAndy 6c69acf0cb Use fastcrc crate for udp crc 2021-09-06 18:31:40 +07:00
Andrew KingandGeorge Hilliard f07d3ce318 Update sample_config.toml
Co-authored-by: George Hilliard <thirtythreeforty@gmail.com>
2021-09-04 09:23:34 +07:00
Andrew KingandGeorge Hilliard 162bdf85cc Update crates/core/src/bcudp/model.rs
Co-authored-by: George Hilliard <thirtythreeforty@gmail.com>
2021-09-04 09:20:07 +07:00
Andrew KingandGeorge Hilliard 3516af13ba Typo in BcUdp
Co-authored-by: George Hilliard <thirtythreeforty@gmail.com>
2021-09-04 09:19:39 +07:00
Andrew King cf54129b5c Merge pull request #206 from troyrollo/swann-channel-fix
Fix IFrame and PFrame identification for Swann DVRs
2021-09-03 12:52:57 +07:00
Troy Rollo 1094cdf713 Fix IFrame and PFrame identification for Swann DVRs 2021-09-01 22:30:14 +10:00
QuantumEntangledAndy 2dcb807b74 Update lock file 2021-08-31 20:56:50 +07:00
QuantumEntangledAndy a036c38b1b Merge branch 'master' of github.com:thirtythreeforty/neolink into udp_proto 2021-08-31 20:56:29 +07:00
QuantumEntangledAndy 7ab46e4273 Clean up files 2021-08-31 20:55:12 +07:00
QuantumEntangledAndy af1e52b850 Send UDP disconnect when UDP is finished 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 08d174a89d Fix to the more complex udp ack 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 0fbde1f5f9 Attempt to handle more complex udp acknoledgements 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 1d841714c1 Use correct body size on dissector 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy f2a6349203 Adjust how neoliknk handles udp resend 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy dae1fd3761 Update udp doc 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy b8cab8f68d Make dissector add the ports table upon detection for udp too 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 4b8d16d028 Add luacheck and make dissector compilent 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy ea4de74e8d Readded Bc<->Bc messages to dissector
Also added them to the heurestic check
2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 73204acf52 Added payload to udpack in dissector 2021-08-31 20:47:34 +07:00
QuantumEntangledAndy 33a227420a Udp Layer rewrite
Using a keep alive message

Restructed udp into modules

Using all interfaces broadcast address (ipv4)

Using remote discovery if local fails
2021-08-31 20:47:34 +07:00
QuantumEntangledAndy d432f7862d Update to the udp dissector 2021-08-31 20:47:23 +07:00
QuantumEntangledAndy 884b7c600d Handle camera hang up on udp 2021-08-31 20:47:23 +07:00
QuantumEntangledAndy 7a5def551d Use ports 2015 and 2018 for UDP discovery
Also add remote discovery but it is disabled for now
2021-08-31 20:47:23 +07:00
QuantumEntangledAndy 643953845a Doc update to include battery cameras and doc fixes 2021-08-31 20:46:47 +07:00