From ac6062f705e582b7533a22c3b74e0d0ae0e95f1a Mon Sep 17 00:00:00 2001 From: hh1209 Date: Sat, 18 Jul 2020 19:29:48 -0500 Subject: [PATCH 01/12] Add Task Scheduling Guide and Add section for 400 series cams --- ...tting Up Neolink For Use With Blue Iris.md | 88 ++++++++++++++++++ docs/screenshots/taskfinishwindow.JPG | Bin 0 -> 47714 bytes docs/screenshots/tasksettingstab.JPG | Bin 0 -> 52466 bytes 3 files changed, 88 insertions(+) create mode 100644 docs/screenshots/taskfinishwindow.JPG create mode 100644 docs/screenshots/tasksettingstab.JPG diff --git a/docs/Setting Up Neolink For Use With Blue Iris.md b/docs/Setting Up Neolink For Use With Blue Iris.md index 8bbfc52..ac34698 100644 --- a/docs/Setting Up Neolink For Use With Blue Iris.md +++ b/docs/Setting Up Neolink For Use With Blue Iris.md @@ -65,11 +65,18 @@ The config file tells Neolink how to connect to your camera and serve the video stream = "both" 2. Change `cameraname` to a legible, phonetic name that describes your camera. Leave the quotes around the name. + 3. The default username is `admin`; leave this unless you've created another user. + 4. Replace `password` with the password you set on the camera. If you chose to not use a password, remove this line from the config file. Again, leave the quotes. + 5. Replace `192.168.1.10:9000` with the IP address you set for your camera. Note: The port, `:9000`, should remain at the end of your IP address. This is the proprietary "media port" that Reolink uses. + 6. The `stream` line allows you to choose which stream type to use. Neolink supports streaming two streams, the main-stream, and the sub-stream. It can stream either one, or both. If you wish to stream both streams, leave this line as is. If you wish to stream _only_ the main-stream, change `both` to `mainStream`. If you wish to stream only the sub-stream, change `both` to `subStream`. + + Note: Reolink D400/B400 Cameras **_do not support serving both streams at once_**, so you must manually choose which stream type to use. For best quality, choose the main stream. + 7. For multiple cameras, copy and paste the entire `[[cameras]]` block below the first. Each camera entry must begin with `[[cameras]]`. ### 3. Start Neolink @@ -123,3 +130,84 @@ _Once you click "OK" on the "New Camera" window, Blue Iris should dump you direc ![](docs/screenshots/new_camera_config.JPG) **Congrats, you have set up your first camera!** + +## Step Four: Run Everything at Startup + +_In the future, Neolink will support being a Windows Service. For now, you must manually set up Neolink to run at startup._ + +### 1. Enable Blue Iris as a Windows service + +_Blue Iris natively supports running as a Windows service._ + +1. In Blue Iris, click the "Main Menu" button, then click "Settings/Info." +2. In the "Startup" tab, under "Operating System," check "Run as a Windows Service (no UI, run again for console)." +3. Type in the username and password. +4. Once you click OK, you should see a popup window that says "Service has been installed..." + +5. Restart Blue Iris or your computer to start the Blue Iris service. + +### 2. Create a Scheduled Task that starts Neolink + +_The best way to have Neolink run at startup is create a Scheduled Task that starts the Neolink process at computer startup._ + +1. Create a simple bash file that starts Neolink. + + _For the Task Scheduler to successfully start Neolink, you must run the start commands in the same directory that contains Neolink and its config files. This is best accomplished by creating a bash file that "changes directories" to the directory that contains Neolink._ + 1. Navigate in Windows Explorer to the directory in which you placed Neolink and its config files. + + 2. Create a file with a `.cmd` file extension (e.g. `neolink.cmd`). + + _Note: You may need to create a text (`.txt`) file and run `ren neolink.txt neolink.cmd` in a command prompt to obtain the correct file extension._ + + 3. Edit the file. Copy the commands below, changing your respective directories and file names. + + `cd C:\Path\to\Neolink\Folder` + + `neolink --config config.toml` + + 4. Save the file and run it. Make sure Neolink successfully starts. + +2. Create Scheduled Task + + 1. Open the Task Scheduler + + 2. In the "Actions" pane, click "Create Basic Task." + + 3. Name and describe the task and click "Next." + + 4. Select "When the Computer Starts" in the trigger settings. Click "Next." + + 5. Select "Start a Program" in the action settings. Click "Next." + + 6. Under "Program/script:," navigate to the `.cmd` file that you created and select it. Click "Next." + + 7. Check "Open the properties dialog for this task when I click finish." Click "Finish." + + _Your Finish windows should look something like this:_ + + ![](/docs/screenshots/taskfinishwindow.JPG) + + 8. In the "Properties" window, in the "General" tab, select "Run whether or not the User is logged on." + + 9. Also check "Run with highest privileges." + + 10. In the "Settings tab," **_uncheck "Stop the task if it is running longer than:"_** + + 11. Check "Run Task as soon as possible..." + + 12. Check "If the task fails, restart every:" + + 13. For redundancy, enter `999` into the number of restart tries. + + _The Settings tab should look something like this:_ + + ![](/docs/screenshots/tasksettingstab.JPG) + + 14. In the "Conditions" tab, you may want to uncheck "Start the task only if the computer is on AC Power." + 15. You may also want to check "Start only if the following network connection is available." This may prevent Neolink from retrying to connect many times if your computer takes a long time to connect to its network. + + 16. Click "OK," and enter the Username and Password. + +### 3. Test everything. + +You have now completed all the setup steps! Restart your computer and check if all the programs start as desired. \ No newline at end of file diff --git a/docs/screenshots/taskfinishwindow.JPG b/docs/screenshots/taskfinishwindow.JPG new file mode 100644 index 0000000000000000000000000000000000000000..129154569033563d68f0971ef99132ef46e022aa GIT binary patch literal 47714 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 MSnYA0ATD+P9SQOa(f|Me literal 0 HcmV?d00001 From fc29372e040a20009be83a5722168d262f5fabd0 Mon Sep 17 00:00:00 2001 From: hh1209 Date: Sun, 19 Jul 2020 13:58:21 -0500 Subject: [PATCH 02/12] Add camera type and E1 note for format changing --- docs/Setting Up Neolink For Use With Blue Iris.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/Setting Up Neolink For Use With Blue Iris.md b/docs/Setting Up Neolink For Use With Blue Iris.md index ac34698..a373738 100644 --- a/docs/Setting Up Neolink For Use With Blue Iris.md +++ b/docs/Setting Up Neolink For Use With Blue Iris.md @@ -4,6 +4,7 @@ Stock Reolink cameras do not support use with non-proprietary surveillance softw **This guide applies to the following camera models:** - B800/D800 +- B400/D400 - E1 @@ -79,6 +80,8 @@ The config file tells Neolink how to connect to your camera and serve the video 7. For multiple cameras, copy and paste the entire `[[cameras]]` block below the first. Each camera entry must begin with `[[cameras]]`. +Note: For **E1 Cameras**, refer to [the readme](https://github.com/thirtythreeforty/neolink/#configuration) for instructions on adding the `format =` line. This configuration will be done automatically in the future. + ### 3. Start Neolink 1. Open a command prompt in the directory that contains Neolink and your config file. 2. Run the following command (with your correct config file name): From e7a87ed3ee66ff4396dd9cc61c744bb5e93ffa97 Mon Sep 17 00:00:00 2001 From: hh1209 Date: Mon, 20 Jul 2020 08:26:36 -0500 Subject: [PATCH 03/12] Fix the screenshots --- docs/Setting Up Neolink For Use With Blue Iris.md | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/Setting Up Neolink For Use With Blue Iris.md b/docs/Setting Up Neolink For Use With Blue Iris.md index a373738..da9fe39 100644 --- a/docs/Setting Up Neolink For Use With Blue Iris.md +++ b/docs/Setting Up Neolink For Use With Blue Iris.md @@ -90,7 +90,7 @@ Note: For **E1 Cameras**, refer to [the readme](https://github.com/thirtythreefo You should get login messages that look something like this: -![Login Messages](docs/screenshots/login_messages.JPG) +![Login Messages](screenshots/login_messages.JPG) Note: Neolink hosts all streams on localhost port 8554. Each camera has a designated path for the sub-stream and the main-stream. Neolink gets the name of the path from the name of the camera you set in the config file. So the path to the sample camera's main-stream would be `127.0.0.1:8554/cameraname/mainStream` and the path to the sample camera's sub-stream would be `127.0.0.1:8554/cameraname/subStream`. @@ -107,7 +107,7 @@ _There are a few tricks to getting Blue Iris to work properly with Neolink's RTS 3. Uncheck "Enable Motion Detector." 4. Enable "Direct to disc recording." -![New Camera Window](docs/screenshots/new_camera.JPG) +![New Camera Window](screenshots/new_camera.JPG) 5. Click "OK." @@ -130,7 +130,7 @@ _Once you click "OK" on the "New Camera" window, Blue Iris should dump you direc 7. Click "OK." -![](docs/screenshots/new_camera_config.JPG) +![](screenshots/new_camera_config.JPG) **Congrats, you have set up your first camera!** @@ -188,7 +188,7 @@ _The best way to have Neolink run at startup is create a Scheduled Task that sta _Your Finish windows should look something like this:_ - ![](/docs/screenshots/taskfinishwindow.JPG) + ![](screenshots/taskfinishwindow.JPG) 8. In the "Properties" window, in the "General" tab, select "Run whether or not the User is logged on." @@ -204,7 +204,7 @@ _The best way to have Neolink run at startup is create a Scheduled Task that sta _The Settings tab should look something like this:_ - ![](/docs/screenshots/tasksettingstab.JPG) + ![](screenshots/tasksettingstab.JPG) 14. In the "Conditions" tab, you may want to uncheck "Start the task only if the computer is on AC Power." 15. You may also want to check "Start only if the following network connection is available." This may prevent Neolink from retrying to connect many times if your computer takes a long time to connect to its network. From 60fb3c02001d5e9b30e51b4e5c717c2361d3fd2e Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 29 Jul 2020 16:23:34 +0700 Subject: [PATCH 04/12] Add armhf github action --- .github/workflows/armhf.yml | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 .github/workflows/armhf.yml diff --git a/.github/workflows/armhf.yml b/.github/workflows/armhf.yml new file mode 100644 index 0000000..9df0098 --- /dev/null +++ b/.github/workflows/armhf.yml @@ -0,0 +1,51 @@ +name: Build ARMHF + +on: [push, pull_request] + +jobs: + armhfbuild: + name: build-armhf + runs-on: ubuntu-latest + container: node:current-buster-slim + steps: + - uses: actions/checkout@v2 + - name: Install basic tools + run: | + apt-get update + apt-get install --assume-yes --no-install-recommends sudo curl ca-certificates build-essential + - name: Add armhf as a foreign architecture + run: | + sudo dpkg --add-architecture armhf + - name: Install cross compile tools + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends gcc-arm-linux-gnueabihf + - name: Install armhf gstreamer + run: | + sudo apt-get update + sudo apt-get install --assume-yes --no-install-recommends \ + libgstrtspserver-1.0-dev:armhf \ + libgstreamer1.0-dev:armhf \ + libgtk2.0-dev:armhf + - name: Install rustup armv7 + uses: actions-rs/toolchain@v1 + with: + toolchain: stable + override: true + target: armv7-unknown-linux-gnueabihf + - name: Build armfh + uses: actions-rs/cargo@v1 + with: + command: build + args: --release --all-features --target=armv7-unknown-linux-gnueabihf + env: + CARGO_TARGET_ARMV7_UNKNOWN_LINUX_GNUEABIHF_LINKER: arm-linux-gnueabihf-gcc + CC_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-gcc + CXX_armv7_unknown_linux_gnueabihf: arm-linux-gnueabihf-g++ + PKG_CONFIG_ALLOW_CROSS: 1 + PKG_CONFIG_PATH: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ + PKG_CONFIG_LIBDIR: /usr/lib/arm-linux-gnueabihf/pkgconfig:/usr/share/pkgconfig/ + - uses: actions/upload-artifact@v2 + with: + name: release-armhf + path: "target/armv7-unknown-linux-gnueabihf/release/neolink*" From 1416ee678c921a753c55e8bd5862d49072f99174 Mon Sep 17 00:00:00 2001 From: Andrew King Date: Thu, 30 Jul 2020 21:53:12 +0700 Subject: [PATCH 05/12] Add more documentation for linux (#52) * Add a documentation for creating a service on linux * Added a bit about the groups into the linux service doc * Started unix setup doc * Added more information to the unix_setup doc * Copy pasta in unix_setup doc title correction * More typo fixes in the docs --- docs/unix_service.md | 102 +++++++++++++++ docs/unix_setup.md | 291 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 393 insertions(+) create mode 100644 docs/unix_service.md create mode 100644 docs/unix_setup.md diff --git a/docs/unix_service.md b/docs/unix_service.md new file mode 100644 index 0000000..514cdd2 --- /dev/null +++ b/docs/unix_service.md @@ -0,0 +1,102 @@ +# Creating a Service for Neolink + +This will guide you through creating a service for neolink that +can be used on linux machines such as ubuntu and debian +buster/stetch or any other os that uses systemd. + +The general steps are: + +1. Create an unprivileged user to run neolink +2. Setting up neolink somewhere the unprivileged user can run it +3. Creating the service file + +## Creating the unprivileged user + +For this I will use the username neolinker. Any unused name would be fine. + +``` +sudo adduser --system --no-create-home --shell /bin/false neolinker +``` + +Depending on your flavour of linux `adduser` may have also created +a group of the same name. If it did not, you can create a group with: + +``` +sudo addgroup --system neolinker +``` + +## Setting up neolink + +For this we will put neolink in `/usr/local/bin` and the config in `/usr/local/etc` but any directory readable by the `neolinker` user would be fine. + +We will also secure the config file so that only neolinker (and root) can read it. We want to do this because it contains passwords. + +``` +sudo cp neolink /usr/local/bin/neolink +sudo cp my_config.toml /usr/local/etc/neolink_config.toml +sudo chmod 755 /usr/local/bin/neolink +sudo chown neolinker:neolinker /usr/local/etc/neolink_config.toml +sudo chmod 600 /usr/local/etc/neolink_config.toml +``` + +## Creating the service + +We will create a systemd service. This service will need to point to our files for using neolink and also instruct it to start with our unprivileged user. + +Create a file here `/etc/systemd/system/neolink.service` with the following contents: + +``` +[Install] +WantedBy=multi-user.target + +[Unit] +Description=Neolink service + +[Service] +Type=simple +ExecStart=/usr/local/bin/neolink --config /usr/local/etc/neolink_config.toml +Restart=on-failure +User=neolinker +Group=neolinker + +``` + +And that's it + +## Controlling the Service + +You can now control the service with the usual commands + +To start it use: + +``` +systemctl start neolink +``` + +To stop it use: + +``` +systemctl stop neolink +``` + +To check it's running use: + +``` + +systemctl status neolink + +``` + +To make it run at startup from now on: + +``` + +systemctl enable neolink + +``` + +You can check it's log file with + +``` +journalctl -xeu neolink +``` diff --git a/docs/unix_setup.md b/docs/unix_setup.md new file mode 100644 index 0000000..2daf311 --- /dev/null +++ b/docs/unix_setup.md @@ -0,0 +1,291 @@ +# Setting up Neolink on Linux + +This will go through the first steps of adding neolink onto a +linux based computer. + +There are many flavours of linux so the name of some packages +may not exactly match. You are expected to be able to find the +correct names yourselves. + +1. Install dependancies + +2. Download neolink + +3. Setup the config + +4. Run neolink + +## Installing the Dependencies + +The dependencies for neolink include: + +- Gstreamer RTSP server + +- Gstreamer good plugin set + +- Gstreamer bad plugin set + +- glib 2.0 + +Glib2.0 is usually already installed on most modern unix flavours. +But the others will likely need to be installed via your package +manager. + +Here are some examples for command packages that work on some distros + +- ubuntu, buster, stretch + + ```bash + sudo apt install \ + libgstrtspserver-1.0-0 \ + libgstreamer1.0-0 \ + libgstreamer-plugins-bad1.0-0 \ + libgstreamer-plugins-good1.0-0 \ + gstreamer1.0-plugins-good \ + gstreamer1.0-plugins-bad + ``` + +- arch, manjaro + + ```bash + sudo pacman -S \ + gstreamer \ + gst-plugins-bad \ + gst-plugins-good \ + + # You will need this from AUR, and therefore need to install + # yay first (see below if you haven't done this yet) + sudo yay -S \ + gst-rtsp-server + ``` + + If your on archlinux or manjaro and you need to install yay do this: + + ```bash + git clone https://aur.archlinux.org/yay.git + cd yay + makepkg -si + ``` + +## Downloading neolink + +You now need to get a copy of neolink. You can get that from this +github [under the CI assets](https://github.com/thirtythreeforty/neolink/actions?query=branch%3Amaster+workflow%3ACI). + +Currently only amd64 is officially released, but armv7 will soon +be available too. + +If you are installing on a raspberry pi, you will need to compile +from source until the official armv7 builds are available. + +You will get a zip file called `release-ubuntu-18.04.zip`, unzip it with + +```bash +unzip "release-ubuntu-18.04.zip" +``` + +This will extract two files called `neolink` and `neolink.d`. These are +the binaries we will be using. + +## Setting up the Configuration File + +Neolink uses a toml file for configuration. A sample toml can be found in the +source code called `sample_config.toml`. + +You can download it with + +```bash +curl -LJO 'https://github.com/thirtythreeforty/neolink/raw/master/sample_config.toml' +``` + +Open up the file in your favourite text editor. + +For the most basic setup you need to change only the parts in `[[ cameras ]]`. +Neolink can connect to any number of supported reolink cameras at once. Each +camera requires its own `[[ cameras ]]` block. Here is the example one: + +```toml +[[cameras]] +name = "driveway" +username = "admin" +password = "12345678" +address = "192.168.1.187:9000" +``` + +Set the `name` to any value you want, this will be the name of the rtsp stream. +In this tutorial I will assume you leave as "driveway". + +The username and password are the ones that are used to connect to the camera +and are the same ones used in the official reolink app. + +The address is the ip address of the camera. You should set and use a fixed ip +for your camera. There are many ways to get a fixed ip address for your camera +including changing the settings in the reolink app. +Or my personal favourite assigning I fixed DHCP address from your router. How +to do either of these things is beyond the scope of this tutorial. + +- Note for E1 and Lumos + + If your camera is an `E1` or a `Lumos` you will need to add the `format` line + to your `[[ cameras ]]` block like this: + + ```toml + [[cameras]] + name = "driveway" + username = "admin" + password = "12345678" + address = "192.168.1.187:9000" + format = "h264" + ``` + + This will tell neolink that this camera uses the H264 format for its video. + Future version of neolink will auto detect this. + +Set up as many `[[ cameras ]]` as you want and save the file as `my_config.toml` + +## Running Neolink + +We are now ready to run neolink. Open up and terminal and navigate the the +folder where you `neolink` and `my_config.toml` are. + +Run neolink with: + +``` +./neolink --config my_config.toml +``` + +You should see a message such as: + +``` +[DATE TIME INFO neolink] Neolink 0.3.0 (unknown commit) release +[DATE TIME INFO neolink] camera: Connecting to camera at xxx.xxx.xxx.xxx:9000 +[DATE TIME INFO neolink] camera: Connecting to camera at xxx.xxx.xxx.xxx:9000 +[DATE TIME INFO neolink] camera: Connected to camera, starting video stream mainStream +[DATE TIME INFO neolink] camera: Connected to camera, starting video stream subStream +``` + +Neolink should now be running :) + + +## Testing with ffprobe + +To test neolink we will use `ffprobe`. + +If you do not have `ffmpeg` installed yet do it now through your package +manager: + +```bash +sudo apt intall ffmpeg +``` + +You must leave neolink running at the same time you run ffprobe. Neolink is a +translator and it cannot translate reolink -> rtsp if you close it. The easiest +way to do this is to open two terminals. One with neolink running and the other +we will use for running ffprobe. + +In a neo terminal run: + + +```bash +ffprobe rtsp://127.0.0.1:8554/driveway +``` + +Where you replace `driveway` with the name of your camera. + +A successful run should report something like this at the end: + +``` +Input #0, rtsp, from 'rtsp://127.0.0.1:8554/driveway': + Metadata: + title : Session streamed with GStreamer + comment : rtsp-server + Duration: N/A, start: 0.114267, bitrate: N/A + Stream #0:0: Video: h264 (High), yuv420p(progressive), 2304x1296, 90k tbr, 90k tbn, 180k tbc +``` + +You should also test the lower resolution subStream: + +```bash +ffprobe rtsp://127.0.0.1:8554/driveway/subStream +``` + +If the mainStream fails but the subStream succeeds you may need to add +`format = "h264"` to your `[[ cameras ]]` section of your config. + +## Common Errors + +- Missing dependancies + + If you get a message such as: + + ``` + libgstrtspserver-1.0.so.0: cannot open shared object file: No such file or directory + ``` + + You have not installed all of the dependencies repeat the `Installing the Dependencies` + section of this guide. + +- Not turned on + + If when using ffprobe to test you get: + + ``` + Connection to tcp://xxx.xxx.xxx.xxx:8554?timeout=0 failed: Connection refused + rtsp://xxx.xxx.xxx.xxx:8554/driveway: Connection refused ``` + ``` + + You have probably closed neolink. You should leave it running in an open + terminal window whenever you want to use it. If you want to run it in the + background, consider following the unix_service guide in the `docs/` folder + of the source code. + +- More advanced debugging required + + For other errors you will need to enable more debugging messages before + running neolink for better diagnoses. To do this stop neolink and restart it + with this command. + + ```bash + GST_DEBUG=3 ./neolink --config my_config.toml + ``` + + This will print out a lot more information to the terminal. Try to connect + to it with ffprobe and read the error messages it generates. + + - Advanced debugging: Missing plugins + + If while running advanced debugging you get the message: + + ``` + GST_ELEMENT_FACTORY gstelementfactory.c:456:gst_element_factory_make: no such element factory "h265parse"! + ``` + + This means that you are missing the gstreamer plugins. You must have both + the good and the bad set of plugins. Please repeat the + `Installing the Dependencies` section of this guide. + + - Advanced debugging: Incorrect video format + + If while running the advanced debugging you get the message: + + ``` + h265parse gsth265parse.c:1110:gst_h265_parse_handle_frame: broken/invalid nal Type: 48 Invalid, Size: 1073 will be dropped + ``` + + You have not set the format to `h264` in the `[[ cameras ]]` config while + using an E1 or Lumos. + + Change the `[[ cameras ]]` config to include `format = "h264"` and restart + neolink + + (If you are using another camera and you need to use h264 please let us + know so we can update this guide) + +- Something else + + If you still have problems open an issue on github and attach the + neolink log. You can save the log to file with the following command: + + ```bash + GST_DEBUG=3 ./neolink --config my_config.toml 2>&1 > neolink.log + ``` From e603699e45e2c1498d6bf76492887a61c49f2656 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 31 Jul 2020 00:35:51 -0500 Subject: [PATCH 06/12] Implement get/set time during camera connect --- Cargo.lock | 266 ++++++++++++++++++++++++++++++++++++---- Cargo.toml | 1 + src/bc/model.rs | 2 + src/bc/xml.rs | 35 ++++++ src/bc_protocol.rs | 1 + src/bc_protocol/time.rs | 132 ++++++++++++++++++++ src/main.rs | 27 +++- 7 files changed, 438 insertions(+), 26 deletions(-) create mode 100644 src/bc_protocol/time.rs diff --git a/Cargo.lock b/Cargo.lock index 9a3ec9b..5b07409 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -41,12 +41,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" +[[package]] +name = "base-x" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b20b618342cf9891c292c4f5ac2cde7287cc5c87e87e9c769d617793607dec1" + [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +[[package]] +name = "bumpalo" +version = "3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" + [[package]] name = "cfg-if" version = "0.1.10" @@ -90,12 +102,12 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cced8691919c02aac3cb0a1bc2e9b73d89e832bf9a06fc579d4e71b68a2da061" +checksum = "09ee0cc8804d5393478d743b035099520087a5186f3b93fa58cec08fa62407b6" dependencies = [ + "cfg-if", "crossbeam-utils", - "maybe-uninit", ] [[package]] @@ -146,6 +158,18 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "discard" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "212d0f5754cb6769937f4501cc0e67f4f4483c8d2c3e1e922ee9edbe4ab4c7c0" + +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + [[package]] name = "env_logger" version = "0.7.1" @@ -558,9 +582,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9586eedd4ce6b3c498bc3b4dd92fc9f11166aa908a914071953768066c67909" +checksum = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" dependencies = [ "libc", ] @@ -614,6 +638,15 @@ dependencies = [ "unindent", ] +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.6" @@ -641,15 +674,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.71" +version = "0.2.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9457b06509d27052635f90d6466700c65095fdf75409b3fbdd903e988b886f49" +checksum = "a2f02823cf78b754822df5f7f268fb59822e7296276d3e069d8e8cb26a14bd10" [[package]] name = "log" -version = "0.4.8" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7" +checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" dependencies = [ "cfg-if", ] @@ -701,12 +734,14 @@ dependencies = [ "crossbeam", "env_logger", "err-derive", + "gio", "glib", "gstreamer", "gstreamer-app", "gstreamer-rtsp", "gstreamer-rtsp-server", "indoc", + "itertools", "lazy_static", "log", "md5", @@ -715,6 +750,7 @@ dependencies = [ "serde", "socket2", "structopt", + "time", "toml", "validator", "validator_derive", @@ -797,18 +833,18 @@ checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" [[package]] name = "pin-project" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12e3a6cdbfe94a5e4572812a0201f8c0ed98c1c452c7b8563ce2276988ef9c17" +checksum = "ca4433fff2ae79342e497d9f8ee990d174071408f28f726d6d83af93e58e48aa" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "0.4.22" +version = "0.4.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a0ffd45cf79d88737d7cc85bfd5d2894bee1139b356e616fe85dc389c61aaf7" +checksum = "2c0e815c3ee9a031fdf5af21c10aa17c573c9c6a566328d99e3936c34e36461f" dependencies = [ "proc-macro2", "quote", @@ -823,9 +859,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkg-config" -version = "0.3.17" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +checksum = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" [[package]] name = "proc-macro-error" @@ -855,9 +891,9 @@ dependencies = [ [[package]] name = "proc-macro-hack" -version = "0.5.16" +version = "0.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e0456befd48169b9f13ef0f0ad46d492cf9d2dbb918bcf38e01eed4ce3ec5e4" +checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598" [[package]] name = "proc-macro-nested" @@ -867,9 +903,9 @@ checksum = "eba180dafb9038b050a4c280019bbedf9f2467b61e5d892dcad585bb57aadc5a" [[package]] name = "proc-macro2" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa" +checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" dependencies = [ "unicode-xid", ] @@ -891,9 +927,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" +checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "regex" @@ -913,6 +949,15 @@ version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver", +] + [[package]] name = "rustversion" version = "1.0.3" @@ -936,6 +981,21 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.114" @@ -958,15 +1018,21 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +checksum = "164eacbdb13512ec2745fb09d51fd5b22b0d65ed294a1dcf7285a360c80a675c" dependencies = [ "itoa", "ryu", "serde", ] +[[package]] +name = "sha1" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d" + [[package]] name = "slab" version = "0.4.2" @@ -985,12 +1051,70 @@ dependencies = [ "winapi", ] +[[package]] +name = "standback" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b0437cfb83762844799a60e1e3b489d5ceb6a650fbacb86437badc1b6d87b246" +dependencies = [ + "version_check", +] + [[package]] name = "static_assertions" version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stdweb" +version = "0.4.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d022496b16281348b52d0e30ae99e01a73d737b2f45d38fed4edf79f9325a1d5" +dependencies = [ + "discard", + "rustc_version", + "stdweb-derive", + "stdweb-internal-macros", + "stdweb-internal-runtime", + "wasm-bindgen", +] + +[[package]] +name = "stdweb-derive" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c87a60a40fccc84bef0652345bbbbbe20a605bf5d0ce81719fc476f5c03b50ef" +dependencies = [ + "proc-macro2", + "quote", + "serde", + "serde_derive", + "syn", +] + +[[package]] +name = "stdweb-internal-macros" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "58fa5ff6ad0d98d1ffa8cb115892b6e69d67799f6763e162a1c9db421dc22e11" +dependencies = [ + "base-x", + "proc-macro2", + "quote", + "serde", + "serde_derive", + "serde_json", + "sha1", + "syn", +] + +[[package]] +name = "stdweb-internal-runtime" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" + [[package]] name = "strsim" version = "0.8.0" @@ -1023,9 +1147,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.33" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd" +checksum = "4cdb98bcb1f9d81d07b536179c269ea15999b5d14ea958196413869445bb5250" dependencies = [ "proc-macro2", "quote", @@ -1082,6 +1206,44 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "time" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a51cadc5b1eec673a685ff7c33192ff7b7603d0b75446fb354939ee615acb15" +dependencies = [ + "cfg-if", + "libc", + "standback", + "stdweb", + "time-macros", + "version_check", + "winapi", +] + +[[package]] +name = "time-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9b6e9f095bc105e183e3cd493d72579be3181ad4004fceb01adbe9eecab2d" +dependencies = [ + "proc-macro-hack", + "time-macros-impl", +] + +[[package]] +name = "time-macros-impl" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5c3be1edfad6027c69f5491cf4cb310d1a71ecd6af742788c6ff8bced86b8fa" +dependencies = [ + "proc-macro-hack", + "proc-macro2", + "quote", + "standback", + "syn", +] + [[package]] name = "tinyvec" version = "0.3.3" @@ -1192,6 +1354,60 @@ version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" +[[package]] +name = "wasm-bindgen" +version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0563a9a4b071746dd5aedbc3a28c6fe9be4586fb3fbadb67c400d4f53c6b16c" +dependencies = [ + "cfg-if", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bc71e4c5efa60fb9e74160e89b93353bc24059999c0ae0fb03affc39770310b0" +dependencies = [ + "bumpalo", + "lazy_static", + "log", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97c57cefa5fa80e2ba15641578b44d36e7a64279bc5ed43c6dbaf329457a2ed2" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841a6d1c35c6f596ccea1f82504a192a60378f64b3bb0261904ad8f2f5657556" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.67" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93b162580e34310e5931c4b792560108b10fd14d64915d7fff8ff00180e70092" + [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index 6610062..ff4a3f7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,6 +28,7 @@ regex = "1" serde = { version = "1.0", features = ["derive"] } socket2 = "0.3" structopt = "0.3" +time = "0.2" toml = "0.5" yaserde = "0.3.16" yaserde_derive = "0.3.16" diff --git a/src/bc/model.rs b/src/bc/model.rs index e6c3115..a94da36 100644 --- a/src/bc/model.rs +++ b/src/bc/model.rs @@ -6,6 +6,8 @@ pub(super) const MAGIC_HEADER: u32 = 0xabcdef0; pub const MSG_ID_LOGIN: u32 = 1; pub const MSG_ID_VIDEO: u32 = 3; pub const MSG_ID_PING: u32 = 93; +pub const MSG_ID_GET_GENERAL: u32 = 104; +pub const MSG_ID_SET_GENERAL: u32 = 105; pub const EMPTY_LEGACY_PASSWORD: &str = "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"; diff --git a/src/bc/xml.rs b/src/bc/xml.rs index d1fc015..727ae68 100644 --- a/src/bc/xml.rs +++ b/src/bc/xml.rs @@ -37,6 +37,10 @@ pub struct BcXml { pub device_info: Option, #[yaserde(rename = "Preview")] pub preview: Option, + #[yaserde(rename = "SystemGeneral")] + pub system_general: Option, + #[yaserde(rename = "Norm")] + pub norm: Option, } impl AllTopXmls { @@ -125,6 +129,37 @@ pub struct Extension { pub binary_data: u32, } +#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +pub struct SystemGeneral { + #[yaserde(attribute)] + pub version: String, + + #[yaserde(rename = "timeZone")] + pub time_zone: Option, + pub year: Option, + pub month: Option, + pub day: Option, + pub hour: Option, + pub minute: Option, + pub second: Option, + + #[yaserde(rename = "osdFormat")] + pub osd_format: Option, + #[yaserde(rename = "timeFormat")] + pub time_format: Option, + + pub language: Option, + #[yaserde(rename = "deviceName")] + pub device_name: Option, +} + +#[derive(PartialEq, Eq, Default, Debug, YaDeserialize, YaSerialize)] +pub struct Norm { + #[yaserde(attribute)] + pub version: String, + norm: String, +} + pub fn xml_ver() -> String { "1.1".to_string() } diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index ed2029b..2c53659 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -11,6 +11,7 @@ use std::time::Duration; use Md5Trunc::*; mod connection; +mod time; pub struct BcCamera { address: SocketAddr, diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs new file mode 100644 index 0000000..32e9870 --- /dev/null +++ b/src/bc_protocol/time.rs @@ -0,0 +1,132 @@ +use super::{BcCamera, Error, Result}; +use crate::bc::{model::*, xml::*}; +use time::{date, Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset}; + +impl BcCamera { + pub fn get_time(&self) -> Result> { + let connection = self + .connection + .as_ref() + .expect("Must be connected to get time"); + let sub_get_general = connection.subscribe(MSG_ID_GET_GENERAL)?; + let get = Bc { + meta: BcMeta { + msg_id: MSG_ID_GET_GENERAL, + client_idx: 0, + encrypted: true, + class: 0x6414, + }, + body: BcBody::ModernMsg(ModernMsg::default()), + }; + + sub_get_general.send(get)?; + let msg = sub_get_general.rx.recv_timeout(self.rx_timeout)?; + + if let BcBody::ModernMsg(ModernMsg { + xml: + Some(BcXml { + system_general: + Some(SystemGeneral { + time_zone: Some(time_zone), + year: Some(year), + month: Some(month), + day: Some(day), + hour: Some(hour), + minute: Some(minute), + second: Some(second), + .. + }), + .. + }), + .. + }) = msg.body + { + let datetime = match try_build_timestamp( + time_zone, year, month, day, hour, minute, second + ) { + Ok(dt) => dt, + Err(e) => return Err(Error::UnintelligibleReply { + reply: msg, + why: "Could not parse date", + }) + }; + + // This code was written in 2020; I'm trying to catch all the possible epochs that + // cameras might reset themselves to. My B800 resets to Jan 1, 1999, but I can't + // guarantee that Reolink won't pick some newer date. Therefore, last year ought + // to be new enough, yet still distant enough that it won't interfere with anything + const BOUNDARY: Date = date!(2019-01-01); + + // detect if no time is actually set, and return Ok(None): that is, operation + // succeeded, and there is no time set + if datetime.date() < BOUNDARY { + Ok(None) + } else { + Ok(Some(datetime)) + } + } else { + Err(Error::UnintelligibleReply { + reply: msg, + why: "Reply did not contain SystemGeneral with all time fields filled out", + }) + } + } + + pub fn set_time(&self, timestamp: OffsetDateTime) -> Result<()> { + let connection = self + .connection + .as_ref() + .expect("Must be connected to set time"); + let sub_set_general = connection.subscribe(MSG_ID_SET_GENERAL)?; + let set = Bc::new_from_xml( + BcMeta { + msg_id: MSG_ID_SET_GENERAL, + client_idx: 0, + encrypted: true, + class: 0x6414, + }, + BcXml { + system_general: Some(SystemGeneral { + version: xml_ver(), + //osd_format: Some("MDY".to_string()), + time_format: Some(0), + // Reolink uses positive seconds to indicate a negative UTC offset: + time_zone: Some(-timestamp.offset().as_seconds()), + year: Some(timestamp.year()), + month: Some(timestamp.month()), + day: Some(timestamp.day()), + hour: Some(timestamp.hour()), + minute: Some(timestamp.minute()), + second: Some(timestamp.second()), + ..Default::default() + }), + ..Default::default() + }, + ); + + sub_set_general.send(set)?; + let msg = sub_set_general.rx.recv_timeout(self.rx_timeout)?; + + Ok(()) + } +} + +fn try_build_timestamp( + timezone: i32, + year: i32, + month: u8, + day: u8, + hour: u8, + minute: u8, + second: u8, +) -> std::result::Result { + let date = Date::try_from_ymd(year, month, day)?; + let time = Time::try_from_hms(hour, minute, second)?; + let offset = if timezone > 0 { + UtcOffset::west_seconds(timezone as u32) + } else { + UtcOffset::east_seconds(-timezone as u32) + }; + + Ok(PrimitiveDateTime::new(date, time).assume_offset(offset)) +} diff --git a/src/main.rs b/src/main.rs index 453f1f3..5ddae65 100644 --- a/src/main.rs +++ b/src/main.rs @@ -208,9 +208,34 @@ fn camera_main( camera.login(&camera_config.username, camera_config.password.as_deref())?; connected = true; + info!("{}: Connected and logged in", camera_config.name); + + let cam_time = camera.get_time()?; + if let Some(time) = cam_time { + info!( + "{}: Camera time is already set: {}", + camera_config.name, time + ); + } else { + let new_time = time::OffsetDateTime::now_local(); + warn!( + "{}: Camera has no time set, setting to {}", + camera_config.name, new_time + ); + camera.set_time(new_time)?; + let cam_time = camera.get_time()?; + if let Some(time) = cam_time { + info!( + "{}: Camera time is now set: {}", + camera_config.name, time + ); + } else { + error!("{}: Camera did not accept new time", camera_config.name); + } + } info!( - "{}: Connected to camera, starting video stream {}", + "{}: Starting video stream {}", camera_config.name, stream_name ); camera.start_video(output, stream_name) From 051887a7c37ff730f17605e23cdc102f1373bcd3 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 31 Jul 2020 00:40:43 -0500 Subject: [PATCH 07/12] Bump timeout to 5 seconds and remove config option This, combined with auto time set, should completely fix #14. --- ...etting Up Neolink For Use With Blue Iris.md | 12 +----------- src/bc_protocol.rs | 18 +++++++----------- src/bc_protocol/time.rs | 6 +++--- src/config.rs | 1 + src/main.rs | 5 +++-- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/docs/Setting Up Neolink For Use With Blue Iris.md b/docs/Setting Up Neolink For Use With Blue Iris.md index da9fe39..f029edd 100644 --- a/docs/Setting Up Neolink For Use With Blue Iris.md +++ b/docs/Setting Up Neolink For Use With Blue Iris.md @@ -31,17 +31,7 @@ _This is the most reliable setup since Neolink cannot autodetect when a camera's _You will have to reconnect to the camera once you have changed the IP address_ -### 3. Set the camera's time to your local network time and disable Auto Reboot -_When a camera reboots, it loses its date and time settings. If the camera's time is not set, Neolink will recursively "time out" every one second and will not stream video. Setting the time and disabling auto reboot on the camera is a workaround for [issue #14](https://github.com/thirtythreeforty/neolink/issues/14)._ -1. In the Reolink PC app, login to your camera. -2. Click "Device Settings" -> "System General" -> "Synchronize Local Time." -3. Click "Ok." - -4. Click "Device Settings" -> "Maintenance." - -5. Uncheck "Enable Auto Reboot." - -### 4. Set a Password +### 3. Set a Password _It's recommended that you set a password for each of your cameras. If you want to use the Reolink Mobile App, it makes you set a password for each camera anyway._ 1. In the Reolink PC app, login to your camera. 2. Click "Device Settings" -> "Manage User." diff --git a/src/bc_protocol.rs b/src/bc_protocol.rs index 2c53659..6803b3f 100644 --- a/src/bc_protocol.rs +++ b/src/bc_protocol.rs @@ -17,13 +17,14 @@ pub struct BcCamera { address: SocketAddr, connection: Option, logged_in: bool, - rx_timeout: Duration, } use crate::Never; type Result = std::result::Result; +const RX_TIMEOUT: Duration = Duration::from_secs(5); + #[derive(Debug, Error)] pub enum Error { #[error(display = "Communication error")] @@ -71,16 +72,11 @@ impl BcCamera { address, connection: None, logged_in: false, - rx_timeout: Duration::from_secs(1), }) } - pub fn set_rx_timeout(&mut self, timeout: Duration) { - self.rx_timeout = timeout; - } - pub fn connect(&mut self) -> Result<()> { - self.connection = Some(BcConnection::new(self.address, self.rx_timeout)?); + self.connection = Some(BcConnection::new(self.address, RX_TIMEOUT)?); Ok(()) } @@ -127,7 +123,7 @@ impl BcCamera { sub_login.send(legacy_login)?; - let legacy_reply = sub_login.rx.recv_timeout(self.rx_timeout)?; + let legacy_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let nonce; match legacy_reply.body { BcBody::ModernMsg(ModernMsg { @@ -181,7 +177,7 @@ impl BcCamera { ); sub_login.send(modern_login)?; - let modern_reply = sub_login.rx.recv_timeout(self.rx_timeout)?; + let modern_reply = sub_login.rx.recv_timeout(RX_TIMEOUT)?; let device_info; match modern_reply.body { @@ -238,7 +234,7 @@ impl BcCamera { sub_ping.send(ping)?; - sub_ping.rx.recv_timeout(self.rx_timeout)?; + sub_ping.rx.recv_timeout(RX_TIMEOUT)?; Ok(()) } @@ -272,7 +268,7 @@ impl BcCamera { loop { trace!("Getting video message..."); - let msg = sub_video.rx.recv_timeout(self.rx_timeout)?; + let msg = sub_video.rx.recv_timeout(RX_TIMEOUT)?; if let BcBody::ModernMsg(ModernMsg { binary: Some(binary), .. diff --git a/src/bc_protocol/time.rs b/src/bc_protocol/time.rs index 32e9870..7b97c20 100644 --- a/src/bc_protocol/time.rs +++ b/src/bc_protocol/time.rs @@ -1,4 +1,4 @@ -use super::{BcCamera, Error, Result}; +use super::{BcCamera, Error, Result, RX_TIMEOUT}; use crate::bc::{model::*, xml::*}; use time::{date, Date, OffsetDateTime, PrimitiveDateTime, Time, UtcOffset}; @@ -20,7 +20,7 @@ impl BcCamera { }; sub_get_general.send(get)?; - let msg = sub_get_general.rx.recv_timeout(self.rx_timeout)?; + let msg = sub_get_general.rx.recv_timeout(RX_TIMEOUT)?; if let BcBody::ModernMsg(ModernMsg { xml: @@ -105,7 +105,7 @@ impl BcCamera { ); sub_set_general.send(set)?; - let msg = sub_set_general.rx.recv_timeout(self.rx_timeout)?; + let msg = sub_set_general.rx.recv_timeout(RX_TIMEOUT)?; Ok(()) } diff --git a/src/config.rs b/src/config.rs index af9bb60..293be36 100644 --- a/src/config.rs +++ b/src/config.rs @@ -51,6 +51,7 @@ pub struct CameraConfig { pub username: String, pub password: Option, + // no longer used, but still here so we can warn users: pub timeout: Option, #[validate(regex( diff --git a/src/main.rs b/src/main.rs index 5ddae65..6e79a71 100644 --- a/src/main.rs +++ b/src/main.rs @@ -195,8 +195,9 @@ fn camera_main( let mut connected = false; (|| { let mut camera = BcCamera::new_with_addr(camera_config.camera_addr)?; - if let Some(timeout) = camera_config.timeout { - camera.set_rx_timeout(timeout); + if let Some(_) = camera_config.timeout { + warn!("The undocumented `timeout` config option has been removed and is no longer needed."); + warn!("Please update your config file."); } info!( From 8e2aa426a5fd412debfe592e247155de621fac09 Mon Sep 17 00:00:00 2001 From: QuantumEntangledAndy Date: Sun, 2 Aug 2020 19:51:20 +0700 Subject: [PATCH 08/12] Typos and doc updates --- README.md | 4 +--- docs/unix_service.md | 24 +++++++++------------ docs/unix_setup.md | 50 +++++++++++++++++++++----------------------- 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index c583af5..1915358 100644 --- a/README.md +++ b/README.md @@ -19,9 +19,7 @@ Currently it has been tested on the following cameras: - B800/D800 - B400/D400 - E1 - -It *should* support the Lumus as well, but this has not yet been tested. -Please test if you have one, and [open an issue](https://github.com/thirtythreeforty/neolink/issues/new/choose) if you encounter problems: +- Lumus Neolink does not support other cameras such as the RLC-420, since they already [provide native RTSP](https://support.reolink.com/hc/en-us/articles/360007010473-How-to-Live-View-Reolink-Cameras-via-VLC-Media-Player). diff --git a/docs/unix_service.md b/docs/unix_service.md index 514cdd2..418b24a 100644 --- a/docs/unix_service.md +++ b/docs/unix_service.md @@ -7,21 +7,21 @@ buster/stetch or any other os that uses systemd. The general steps are: 1. Create an unprivileged user to run neolink -2. Setting up neolink somewhere the unprivileged user can run it +2. Set up neolink somewhere the unprivileged user can run it 3. Creating the service file ## Creating the unprivileged user For this I will use the username neolinker. Any unused name would be fine. -``` +```bash sudo adduser --system --no-create-home --shell /bin/false neolinker ``` Depending on your flavour of linux `adduser` may have also created a group of the same name. If it did not, you can create a group with: -``` +```bash sudo addgroup --system neolinker ``` @@ -31,7 +31,7 @@ For this we will put neolink in `/usr/local/bin` and the config in `/usr/local/e We will also secure the config file so that only neolinker (and root) can read it. We want to do this because it contains passwords. -``` +```bash sudo cp neolink /usr/local/bin/neolink sudo cp my_config.toml /usr/local/etc/neolink_config.toml sudo chmod 755 /usr/local/bin/neolink @@ -43,7 +43,7 @@ sudo chmod 600 /usr/local/etc/neolink_config.toml We will create a systemd service. This service will need to point to our files for using neolink and also instruct it to start with our unprivileged user. -Create a file here `/etc/systemd/system/neolink.service` with the following contents: +Create a file here `/etc/systemd/system/neolink.service` with the following contents (you will need admin privileges to write to this location): ``` [Install] @@ -69,34 +69,30 @@ You can now control the service with the usual commands To start it use: -``` +```bash systemctl start neolink ``` To stop it use: -``` +```bash systemctl stop neolink ``` To check it's running use: -``` - +```bash systemctl status neolink - ``` To make it run at startup from now on: -``` - +```bash systemctl enable neolink - ``` You can check it's log file with -``` +```bash journalctl -xeu neolink ``` diff --git a/docs/unix_setup.md b/docs/unix_setup.md index 2daf311..40886ef 100644 --- a/docs/unix_setup.md +++ b/docs/unix_setup.md @@ -7,6 +7,8 @@ There are many flavours of linux so the name of some packages may not exactly match. You are expected to be able to find the correct names yourselves. +The general steps we will follow in this guide are as follows: + 1. Install dependancies 2. Download neolink @@ -31,7 +33,7 @@ Glib2.0 is usually already installed on most modern unix flavours. But the others will likely need to be installed via your package manager. -Here are some examples for command packages that work on some distros +Here are some examples for commands of package managers - ubuntu, buster, stretch @@ -59,7 +61,7 @@ Here are some examples for command packages that work on some distros gst-rtsp-server ``` - If your on archlinux or manjaro and you need to install yay do this: + If your on archlinux or manjaro and you need to install `yay` do this: ```bash git clone https://aur.archlinux.org/yay.git @@ -72,11 +74,9 @@ Here are some examples for command packages that work on some distros You now need to get a copy of neolink. You can get that from this github [under the CI assets](https://github.com/thirtythreeforty/neolink/actions?query=branch%3Amaster+workflow%3ACI). -Currently only amd64 is officially released, but armv7 will soon -be available too. +Currently amd64 and armv7 are officially released. -If you are installing on a raspberry pi, you will need to compile -from source until the official armv7 builds are available. +If you are installing on a raspberry pi, you will need the armv7 build. You will get a zip file called `release-ubuntu-18.04.zip`, unzip it with @@ -102,7 +102,7 @@ Open up the file in your favourite text editor. For the most basic setup you need to change only the parts in `[[ cameras ]]`. Neolink can connect to any number of supported reolink cameras at once. Each -camera requires its own `[[ cameras ]]` block. Here is the example one: +camera requires its own `[[ cameras ]]` block. Here is an example one: ```toml [[cameras]] @@ -113,20 +113,19 @@ address = "192.168.1.187:9000" ``` Set the `name` to any value you want, this will be the name of the rtsp stream. -In this tutorial I will assume you leave as "driveway". +In this tutorial I will assume you leave it as "driveway". -The username and password are the ones that are used to connect to the camera -and are the same ones used in the official reolink app. +The username and passwords are the same ones used in the official reolink app. The address is the ip address of the camera. You should set and use a fixed ip for your camera. There are many ways to get a fixed ip address for your camera including changing the settings in the reolink app. -Or my personal favourite assigning I fixed DHCP address from your router. How -to do either of these things is beyond the scope of this tutorial. +Or by assigning a fixed DHCP address from your router. How to do either of +these things is beyond the scope of this tutorial. -- Note for E1 and Lumos +- Note for E1 and Lumus - If your camera is an `E1` or a `Lumos` you will need to add the `format` line + If your camera is an E1 or a Lumus you will need to add the `format` line to your `[[ cameras ]]` block like this: ```toml @@ -145,8 +144,8 @@ Set up as many `[[ cameras ]]` as you want and save the file as `my_config.toml` ## Running Neolink -We are now ready to run neolink. Open up and terminal and navigate the the -folder where you `neolink` and `my_config.toml` are. +We are now ready to run neolink. Open up and terminal and navigate to the +folder where `neolink` and `my_config.toml` are. Run neolink with: @@ -154,7 +153,7 @@ Run neolink with: ./neolink --config my_config.toml ``` -You should see a message such as: +You should see messages such as: ``` [DATE TIME INFO neolink] Neolink 0.3.0 (unknown commit) release @@ -175,16 +174,15 @@ If you do not have `ffmpeg` installed yet do it now through your package manager: ```bash -sudo apt intall ffmpeg +sudo apt install ffmpeg ``` You must leave neolink running at the same time you run ffprobe. Neolink is a translator and it cannot translate reolink -> rtsp if you close it. The easiest way to do this is to open two terminals. One with neolink running and the other -we will use for running ffprobe. - -In a neo terminal run: +for running ffprobe. +In a new terminal run: ```bash ffprobe rtsp://127.0.0.1:8554/driveway @@ -216,7 +214,7 @@ If the mainStream fails but the subStream succeeds you may need to add - Missing dependancies - If you get a message such as: + If when start neolink you get a message such as: ``` libgstrtspserver-1.0.so.0: cannot open shared object file: No such file or directory @@ -254,7 +252,7 @@ If the mainStream fails but the subStream succeeds you may need to add - Advanced debugging: Missing plugins - If while running advanced debugging you get the message: + If while running advanced debugging you get a message like this: ``` GST_ELEMENT_FACTORY gstelementfactory.c:456:gst_element_factory_make: no such element factory "h265parse"! @@ -266,20 +264,20 @@ If the mainStream fails but the subStream succeeds you may need to add - Advanced debugging: Incorrect video format - If while running the advanced debugging you get the message: + If while running advanced debugging you get a message like this: ``` h265parse gsth265parse.c:1110:gst_h265_parse_handle_frame: broken/invalid nal Type: 48 Invalid, Size: 1073 will be dropped ``` You have not set the format to `h264` in the `[[ cameras ]]` config while - using an E1 or Lumos. + using an E1 or Lumus camera. Change the `[[ cameras ]]` config to include `format = "h264"` and restart neolink (If you are using another camera and you need to use h264 please let us - know so we can update this guide) + know via an issue so we can update this guide) - Something else From 9cc3ca856fde881142fbcd2564201fce001c1a04 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Fri, 31 Jul 2020 11:38:52 -0500 Subject: [PATCH 09/12] Update to gstreamer bindings v0.16 --- Cargo.lock | 248 +++++++++++++++++++++++++++++++++++++++++------------ Cargo.toml | 10 +-- src/gst.rs | 2 +- 3 files changed, 199 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9a3ec9b..8646343 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,6 +18,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "anyhow" +version = "1.0.32" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b602bfe940d21c130f3895acd65221e8a61270debe89d628b9cb4e3ccb8569b" + [[package]] name = "arrayvec" version = "0.5.1" @@ -146,6 +152,12 @@ dependencies = [ "lazy_static", ] +[[package]] +name = "either" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" + [[package]] name = "env_logger" version = "0.7.1" @@ -173,6 +185,21 @@ dependencies = [ "synstructure", ] +[[package]] +name = "futures" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e05b85ec287aac0dc34db7d4a569323df697f9c55b99b15d6b4ef8cde49f613" +dependencies = [ + "futures-channel", + "futures-core", + "futures-executor", + "futures-io", + "futures-sink", + "futures-task", + "futures-util", +] + [[package]] name = "futures-channel" version = "0.3.5" @@ -180,6 +207,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f366ad74c28cca6ba456d95e6422883cfb4b252a83bed929c83abfdbbf2967d5" dependencies = [ "futures-core", + "futures-sink", ] [[package]] @@ -238,9 +266,13 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8764574ff08b701a084482c3c7031349104b07ac897393010494beaa18ce32c6" dependencies = [ + "futures-channel", "futures-core", + "futures-io", "futures-macro", + "futures-sink", "futures-task", + "memchr", "pin-project", "pin-utils", "proc-macro-hack", @@ -250,11 +282,12 @@ dependencies = [ [[package]] name = "gio" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cd10f9415cce39b53f8024bf39a21f84f8157afa52da53837b102e585a296a5" +checksum = "3c5492e80b45e6c56214894a9a0cbe1340ab5066eb44a2dbe151393b6d7942c0" dependencies = [ "bitflags", + "futures", "futures-channel", "futures-core", "futures-io", @@ -263,27 +296,28 @@ dependencies = [ "glib", "glib-sys", "gobject-sys", - "lazy_static", "libc", + "once_cell", + "thiserror", ] [[package]] name = "gio-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fad225242b9eae7ec8a063bb86974aca56885014672375e5775dc0ea3533911" +checksum = "35993626299fbcaa73c0a19be8fdd01c950f9f3d3ac9cb4fb5532b924ab1a5d7" dependencies = [ "glib-sys", "gobject-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "glib" -version = "0.9.3" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40fb573a09841b6386ddf15fd4bc6655b4f5b106ca962f57ecaecde32a0061c0" +checksum = "a5e0533f48640d86e8e2f3cee778a9f97588d4a0bec8be065ee51ea52346d6c1" dependencies = [ "bitflags", "futures-channel", @@ -291,38 +325,55 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", + "glib-macros", "glib-sys", "gobject-sys", - "lazy_static", "libc", + "once_cell", +] + +[[package]] +name = "glib-macros" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41486a26d1366a8032b160b59065a59fb528530a46a49f627e7048fb8c064039" +dependencies = [ + "anyhow", + "heck", + "itertools", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn", ] [[package]] name = "glib-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95856f3802f446c05feffa5e24859fe6a183a7cb849c8449afc35c86b1e316e2" +checksum = "b6cda4af5c2f4507b7a3535b798dca2135293f4bc3a17f399ce244ef15841c4c" dependencies = [ "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gobject-sys" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31d1a804f62034eccf370006ccaef3708a71c31d561fee88564abe71177553d9" +checksum = "952133b60c318a62bf82ee75b93acc7e84028a093e06b9e27981c2b6fe68218c" dependencies = [ "glib-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer" -version = "0.15.7" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8664a114cd6ec16bece783d5eee59496919915b1f6884400ba4a953274a163" +checksum = "ce4ce1ba28d3293b8cb8c3d33f50e6da2e5cfeefa59a0d10d922ab8015791609" dependencies = [ "bitflags", "cfg-if", @@ -333,18 +384,20 @@ dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", - "lazy_static", "libc", "muldiv", "num-rational", + "once_cell", "paste", + "pretty-hex", + "thiserror", ] [[package]] name = "gstreamer-app" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789784e8d42f5add1e1e965cf9f7e2d09e21dd0756bae6148f971db9a761d6a9" +checksum = "b2e9ca4df66162132a8d0083c5c5a40dea29ac619acb02395dba09e26bc1c500" dependencies = [ "bitflags", "futures-core", @@ -356,28 +409,28 @@ dependencies = [ "gstreamer-app-sys", "gstreamer-base", "gstreamer-sys", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "gstreamer-app-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf869ce152c23bca5d761ab62146b47f750d0b28d4d499731857532897d48167" +checksum = "55d739f1289f37352884d716df1c571d365fe3eacb8164bc1996e8070053c949" dependencies = [ "glib-sys", "gstreamer-base-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-base" -version = "0.15.4" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42552f75cc6c260b0be180d5c955f4cd74bd170289c622404c25f1210b521c12" +checksum = "872893487ce8876f18c63730402822804c5762869f631d8e3e6b18aafc8399f0" dependencies = [ "bitflags", "glib", @@ -391,22 +444,22 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba384f52174b3c586593fca32642680a9e67961fea9f4cd8419f678965023bed" +checksum = "c0fd5a77d39b47568fba01274dfcb28dc32382513c697009f80b89ef63fd32fd" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-net" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac25e8d5593775b3a641a39410f9b25e460177982efd853f92d173419e91585a" +checksum = "caf6b7e17559f3afd74285d3007c9268bbd47ecb692dcb27944a2f54385aba73" dependencies = [ "gio", "glib", @@ -419,23 +472,23 @@ dependencies = [ [[package]] name = "gstreamer-net-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b454eef96c2fd27f8ea701024be277227ae1fe88042ffc60e7cc5c452a2660" +checksum = "ffc58fef62ae238322f24ca6589bf39f885888ab3c345b8ce15998f9a0f1b199" dependencies = [ "gio-sys", "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-rtsp" -version = "0.15.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "971814f153a41e9f170b30ebcfba08f13a57a03e1bfb4ac26a872577ee8bdef4" +checksum = "17c0154054089449fa595da343660d37a9241cdb8a8794a982c7dfc4a82629f1" dependencies = [ "bitflags", "gio", @@ -453,9 +506,9 @@ dependencies = [ [[package]] name = "gstreamer-rtsp-server" -version = "0.15.5" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f79512e2f481f1fd2523a3e16b94f055a17c6c68a86da3a4b868085e5ac47ec8" +checksum = "ab8e59ac0e59b7c503359d4c617d1ca447ce2d263397b80d96f66312fb75ffc4" dependencies = [ "bitflags", "gio", @@ -472,15 +525,15 @@ dependencies = [ "gstreamer-sdp", "gstreamer-sdp-sys", "gstreamer-sys", - "lazy_static", "libc", + "once_cell", ] [[package]] name = "gstreamer-rtsp-server-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17e73413368846d1a5e475fa29dd710232d5479e02c402f3bab82bcd6b9f35df" +checksum = "d09f446a03f00fe0859ca41ca6ab0150392e261eab8151c1f0e1067356e34dce" dependencies = [ "gio-sys", "glib-sys", @@ -490,14 +543,14 @@ dependencies = [ "gstreamer-sdp-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-rtsp-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed6bbda651f809e0a48500f9bde3c07d662ed688051a57501dcb5f9d7b2a5fd9" +checksum = "2e12559129061c3b4cc218ff997f42a7ba8a23f3c0db356e8f5a54e12fa7c3dd" dependencies = [ "gio-sys", "glib-sys", @@ -505,14 +558,14 @@ dependencies = [ "gstreamer-sdp-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-sdp" -version = "0.15.6" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547b3b0eb9e01e13ab5cc066c817e2ab758f83790145f80f62d3c8e43c2966af" +checksum = "6ebbe4fbea4f2c67982c667ba57b64b01d43bc3dc1dc4a8d3512cb33a2adc7c1" dependencies = [ "glib", "glib-sys", @@ -524,27 +577,27 @@ dependencies = [ [[package]] name = "gstreamer-sdp-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99e88ac4f9f20323ef3409dddcea3bbf58364ff8eea10b14da5303bfcb23347a" +checksum = "289c7f258d3387ae91c6058555922d8cf0704fc2bc870d1a03190bc81b040655" dependencies = [ "glib-sys", "gobject-sys", "gstreamer-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] name = "gstreamer-sys" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d18da01b97d0ab5896acd5151e4c155acefd0e6c03c3dd24dd133ba054053db" +checksum = "1321f34d53bb5f60ab1aaf581e29b664b8d41601714ee1bb7dbea490b5b9ff60" dependencies = [ "glib-sys", "gobject-sys", "libc", - "pkg-config", + "system-deps", ] [[package]] @@ -614,6 +667,15 @@ dependencies = [ "unindent", ] +[[package]] +name = "itertools" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "0.4.6" @@ -701,12 +763,14 @@ dependencies = [ "crossbeam", "env_logger", "err-derive", + "gio", "glib", "gstreamer", "gstreamer-app", "gstreamer-rtsp", "gstreamer-rtsp-server", "indoc", + "itertools", "lazy_static", "log", "md5", @@ -746,9 +810,9 @@ dependencies = [ [[package]] name = "num-rational" -version = "0.2.4" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +checksum = "a5b4d7360f362cfb50dde8143501e6940b22f644be75a4cc90b2d81968908138" dependencies = [ "autocfg", "num-integer", @@ -827,6 +891,21 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677" +[[package]] +name = "pretty-hex" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be91bcc43e73799dc46a6c194a55e7aae1d86cc867c860fd4a436019af21bd8c" + +[[package]] +name = "proc-macro-crate" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" +dependencies = [ + "toml", +] + [[package]] name = "proc-macro-error" version = "1.0.3" @@ -1021,6 +1100,24 @@ dependencies = [ "syn", ] +[[package]] +name = "strum" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57bd81eb48f4c437cadc685403cad539345bf703d78e63707418431cecd4522b" + +[[package]] +name = "strum_macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87c85aa3f8ea653bfd3ddf25f7ee357ee4d204731f6aa9ad04002306f6e2774c" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "syn" version = "1.0.33" @@ -1055,6 +1152,21 @@ dependencies = [ "unicode-xid", ] +[[package]] +name = "system-deps" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f3ecc17269a19353b3558b313bba738b25d82993e30d62a18406a24aba4649b" +dependencies = [ + "heck", + "pkg-config", + "strum", + "strum_macros", + "thiserror", + "toml", + "version-compare", +] + [[package]] name = "termcolor" version = "1.1.0" @@ -1073,6 +1185,26 @@ dependencies = [ "unicode-width", ] +[[package]] +name = "thiserror" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7dfdd070ccd8ccb78f4ad66bf1982dc37f620ef696c6b5028fe2ed83dd3d0d08" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd80fc12f73063ac132ac92aceea36734f04a1d93c1240c6944e23a3b8841793" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.0.1" @@ -1186,6 +1318,12 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +[[package]] +name = "version-compare" +version = "0.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d63556a25bae6ea31b52e640d7c41d1ab27faba4ccb600013837a3d0b3994ca1" + [[package]] name = "version_check" version = "0.9.2" diff --git a/Cargo.toml b/Cargo.toml index 6610062..c39da13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,11 +13,11 @@ crossbeam = "0.7" env_logger = "*" err-derive = "0.2" glib = "*" -gio = "0.8" -gstreamer = "0.15" -gstreamer-app = "0.15" -gstreamer-rtsp = "0.15" -gstreamer-rtsp-server = { version = "0.15", features = ["v1_12", "v1_14"]} +gio = "0.9" +gstreamer = "0.16" +gstreamer-app = "0.16" +gstreamer-rtsp = "0.16" +gstreamer-rtsp-server = { version = "0.16", features = ["v1_12", "v1_14"]} lazy_static = "1.4" log = { version = "0.4" } indoc = "0.3" diff --git a/src/gst.rs b/src/gst.rs index be0a0e7..0d8438a 100644 --- a/src/gst.rs +++ b/src/gst.rs @@ -165,7 +165,7 @@ impl RtspServer { // We seperate reading the file and changing to a PEM so that we get different error messages. let cert_contents = fs::read_to_string(cert_file).expect("TLS file not found"); let cert = - TlsCertificate::new_from_pem(&cert_contents).expect("Not a valid TLS certificate"); + TlsCertificate::from_pem(&cert_contents).expect("Not a valid TLS certificate"); auth.set_tls_certificate(Some(&cert)); auth.set_tls_authentication_mode(client_auth); From 8ab4ba3b3316160106ac5bea06c738e671c4ae3d Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 2 Aug 2020 12:31:47 -0500 Subject: [PATCH 10/12] Add possible reason for failure to set time --- src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main.rs b/src/main.rs index 6e79a71..abf8dfc 100644 --- a/src/main.rs +++ b/src/main.rs @@ -231,7 +231,7 @@ fn camera_main( camera_config.name, time ); } else { - error!("{}: Camera did not accept new time", camera_config.name); + error!("{}: Camera did not accept new time (is {} an admin?)", camera_config.name, camera_config.username); } } From d665b633df40163d58d9f70e8ae8ef2319fed36d Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 2 Aug 2020 12:57:40 -0500 Subject: [PATCH 11/12] Fix Docker auto-publish --- .github/workflows/docker.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 84ae5f8..0f63485 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -18,10 +18,10 @@ jobs: SECRET: "${{ secrets.DOCKER_TOKEN }}" - name: Check out the repo uses: actions/checkout@v2 - if: ${{ steps.vars.outputs.HAS_SECRET }} + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} - name: Push to Docker Hub uses: docker/build-push-action@v1 - if: ${{ steps.vars.outputs.HAS_SECRET }} + if: ${{ steps.vars.outputs.HAS_SECRET_TOKEN }} with: username: thirtythreeforty password: ${{ secrets.DOCKER_TOKEN }} From 534b8df829c2ddc68d848519781719b3e8abd932 Mon Sep 17 00:00:00 2001 From: George Hilliard Date: Sun, 2 Aug 2020 13:02:21 -0500 Subject: [PATCH 12/12] Fix another typo in Docker conditional push --- .github/workflows/docker.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml index 0f63485..2b1b1ee 100644 --- a/.github/workflows/docker.yaml +++ b/.github/workflows/docker.yaml @@ -12,7 +12,7 @@ jobs: shell: bash run: | unset HAS_SECRET - if [-n $SECRET]; then HAS_SECRET='true' ; fi + if [ -n $SECRET ]; then HAS_SECRET='true' ; fi echo ::set-output name=HAS_SECRET_TOKEN::${HAS_SECRET} env: SECRET: "${{ secrets.DOCKER_TOKEN }}"