From df3b36954c20f8303b7f6ad474abb551a0eebfad Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Tue, 28 Feb 2023 12:53:29 +0700 Subject: [PATCH] Added docuementation for discovery --- Cargo.lock | 4 ++-- Cargo.toml | 4 ++-- README.md | 1 + crates/core/Cargo.toml | 2 +- sample_config.toml | 12 ++++++++++++ 5 files changed, 18 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6368d40..7e32873 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1206,7 +1206,7 @@ dependencies = [ [[package]] name = "neolink" -version = "0.5.3" +version = "0.5.4" dependencies = [ "aes", "anyhow", @@ -1248,7 +1248,7 @@ dependencies = [ [[package]] name = "neolink_core" -version = "0.5.3" +version = "0.5.4" dependencies = [ "aes", "assert_matches", diff --git a/Cargo.toml b/Cargo.toml index 1c35861..e16da8c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "neolink" description = "A standards-compliant bridge to Reolink IP cameras" -version = "0.5.3" +version = "0.5.4" authors = ["George Hilliard ", "Andrew King "] edition = "2018" @@ -16,7 +16,7 @@ test = false bench = false [dependencies] -neolink_core = { path = "crates/core", version = "0.5.3" } +neolink_core = { path = "crates/core", version = "0.5.4" } aes = "0.6" cfb-mode = "0.6" cookie-factory = "0.3" diff --git a/README.md b/README.md index e015769..29d6115 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ with additional features not yet in upstream master. - Improved error messages when your missing gstreamer plugins - Protocol more closely follows offical reolink format - Possibly can handle more simulatenous connections +- More ways to connect to the camera. Including Relaying through reolink servers ## Installation diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml index 9cdcc85..da7e376 100644 --- a/crates/core/Cargo.toml +++ b/crates/core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "neolink_core" description = "Core services and structure for Reolink IP cameras" -version = "0.5.3" +version = "0.5.4" authors = ["George Hilliard ", "Andrew King "] edition = "2018" diff --git a/sample_config.toml b/sample_config.toml index c6193f2..7b17e02 100644 --- a/sample_config.toml +++ b/sample_config.toml @@ -51,6 +51,18 @@ address = "192.168.1.187:9000" # If your device has user connection limits try a single stream instead. # stream = "mainStream" +# By default neolink will use any means to connect to the camera +# from a UID +# This include relaying via reolink servers +# This variable `discovery` controls the method of UID discovery +# - Possible values +# "relay" # Any means including connecting and transmitting through reolink +# "map" # Register our local ip address with reolink and ask the camera to connect to us but don't relay data through reolink +# "remote" # Register our local ip address with reolink but only permit same network connections (useful if broadcast is not possible) +# "local" # Do not contact reolink servers at all. Rely soley on local UDP broadcast based discovery +# +# discovery = "relay" + [[cameras]] name = "storage shed"