From 2e24b1e4762f202e552d9891cc317ac32efc01f5 Mon Sep 17 00:00:00 2001 From: schredder Date: Wed, 5 Jun 2024 22:33:33 -0700 Subject: [PATCH 1/6] Set JEMALLOC_SYS_WITH_LG_PAGE=16 at build Support large page sizes becoming more common on arm64 systems. This is compatible with systems that use smaller page sizes --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ade1235..c3fa83e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -188,6 +188,7 @@ jobs: PKG_CONFIG_ALLOW_CROSS: 1 PKG_CONFIG_LIBDIR: /usr/lib/${{ matrix.pkgconfig }}/pkgconfig TARGET: ${{ matrix.target }} + JEMALLOC_SYS_WITH_LG_PAGE: 16 - uses: actions/upload-artifact@v4 with: name: release-${{ matrix.arch }}-bookworm From cc8a6e7e1869ca85d074374cabb5842d06a18b39 Mon Sep 17 00:00:00 2001 From: schredder Date: Thu, 6 Jun 2024 00:06:50 -0700 Subject: [PATCH 2/6] Add JEMALLOC_SYS_WITH_LG_PAGE to native build job --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c3fa83e..5123cb3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -116,6 +116,7 @@ jobs: echo "GSTREAMER_1_0_ROOT_MSVC_X86_64=${GSTREAMER_1_0_ROOT_MSVC_X86_64}" echo "PKG_CONFIG_PATH=${PKG_CONFIG_PATH}" # pkg-config --variable pc_path pkg-config + export JEMALLOC_SYS_WITH_LG_PAGE=16 cargo build --release --all-features - uses: actions/upload-artifact@v4 with: From 65725778597782d975cc4220b31043214c9b8bec Mon Sep 17 00:00:00 2001 From: Zachary Fouts Date: Fri, 7 Jun 2024 14:37:07 +0000 Subject: [PATCH 3/6] Support upgrading base upstream image. This will ensure latest available security patches are applied on each build. Some upstream images take months to be updated. --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a221725..7c8bd18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,7 @@ RUN echo "TARGETPLATFORM: ${TARGETPLATFORM}"; \ else \ echo "Building from scratch"; \ apt-get update && \ + apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ build-essential \ openssl \ @@ -58,6 +59,7 @@ LABEL maintainer="$OWNER" # hadolint ignore=DL3008 RUN apt-get update && \ + apt-get upgrade -y && \ apt-get install -y --no-install-recommends \ openssl \ dnsutils \ @@ -83,9 +85,9 @@ RUN gst-inspect-1.0; \ "/usr/local/bin/neolink" --version && \ mkdir -m 0700 /root/.config/ - ENV NEO_LINK_MODE="rtsp" NEO_LINK_PORT=8554 CMD /usr/local/bin/neolink "${NEO_LINK_MODE}" --config /etc/neolink.toml ENTRYPOINT ["/entrypoint.sh"] EXPOSE ${NEO_LINK_PORT} + From 77eeea224cfe160e028b0112b607babf213fd4f5 Mon Sep 17 00:00:00 2001 From: Patrick Plenefisch Date: Sun, 7 Jul 2024 14:25:12 -0400 Subject: [PATCH 4/6] Fix Wireshark dissector install comand --- dissector/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dissector/README.md b/dissector/README.md index 66055fb..3e5a6d1 100644 --- a/dissector/README.md +++ b/dissector/README.md @@ -13,7 +13,7 @@ make LUA_DIR=/usr The shared object library should be copied to `/usr/local/lib/lua/5.2/` ``` mkdir --parents /usr/local/lib/lua/5.2/ -cp luagcypt.so /usr/local/lib/lua/5.2/ +cp luagcrypt.so /usr/local/lib/lua/5.2/ ``` Additionally, the system where the dissector is used needs these packages installing (if not already present): `libgcrypt20 libgpg-error0` ## Install `baichuan.lua` From 684e1a9015f437e97a7a4df09db792baac19368c Mon Sep 17 00:00:00 2001 From: M-U-16 <132483300+M-U-16@users.noreply.github.com> Date: Sat, 20 Jul 2024 14:31:11 +0200 Subject: [PATCH 5/6] fixing broken 404 links in dissector markdown --- dissector/messages.md | 2 +- dissector/protocol.md | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dissector/messages.md b/dissector/messages.md index a2d28c7..0f45cdf 100644 --- a/dissector/messages.md +++ b/dissector/messages.md @@ -247,7 +247,7 @@ Message have zero to two payloads. - Payload Body is binary. This binary represents an embedded stream which should - is detailed in [mediapacket.md](dissector/mediapacket.md). + is detailed in [mediapacket.md](mediapacket.md). - 4: `` (stop) diff --git a/dissector/protocol.md b/dissector/protocol.md index 058b419..87c5cf9 100644 --- a/dissector/protocol.md +++ b/dissector/protocol.md @@ -54,7 +54,7 @@ When receiving packet these should be used to quickly discard invalid packets. Each function in BC has its own message ID. For example login is 1, video data is 3, motion detection is 33. -For a more complete list please see the [messages doc](dissector/messages.md) +For a more complete list please see the [messages doc](messages.md) #### Message length @@ -146,7 +146,7 @@ extension XML part of the message. # Login -For message details see the [docs](dissector/messages.md) +For message details see the [docs](messages.md) Clients should login by @@ -208,7 +208,7 @@ After which all message bodies of type id 3 are binary. The binary represents a stream of data that can be interrupted by packet boundaries. Clients should create a buffer and pop bytes for processing when complete media packets are received. Media packets descriptions can be found in -the [docs](dissector/mediapacket.md) +the [docs](mediapacket.md) # Other Function @@ -256,7 +256,7 @@ Which contains the plain text of the username of interest and the tokens for abilities you want to know about. Details of expected formats should be found from the -[docs](dissector/messages.md) +[docs](messages.md) #### AES Encryption From 9ace435f5f894b0216d62bf8caac7f8827975768 Mon Sep 17 00:00:00 2001 From: Kevin David Date: Sun, 21 Jul 2024 15:49:41 -0400 Subject: [PATCH 6/6] Make `resolution` optional in `DeviceInfo` `resolution` is not specified for devices without cameras (i.e. the floodlight). Without this change, an error like ``` [2024-07-21T19:26:18Z ERROR neolink_core::bc::de] e: Custom("missing field `resolution`") [2024-07-21T19:26:18Z WARN neolink::common::camthread] backyard_floodlight: Connection Lost: Nom Parsing error: Nom Error: VerboseError { errors: [([], Nom(MapRes)), ([], Context("Unable to parse Payload XML"))] } ``` occurs on startup/connection. --- crates/core/src/bc/xml.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/core/src/bc/xml.rs b/crates/core/src/bc/xml.rs index 73aae6b..762b8d6 100644 --- a/crates/core/src/bc/xml.rs +++ b/crates/core/src/bc/xml.rs @@ -228,7 +228,8 @@ pub struct DeviceInfo { #[serde(rename = "@version")] pub version: Option, /// The resolution xml block - pub resolution: Resolution, + /// Does not exist for floodlights + pub resolution: Option, } /// VersionInfo xml