Merge branch 'master' of github.com:QuantumEntangledAndy/neolink
This commit is contained in:
6 files changed
+13
-8
No files matched your search
@@ -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:
|
||||
@@ -188,6 +189,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
|
||||
|
||||
+3
-1
@@ -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}
|
||||
|
||||
@@ -228,7 +228,8 @@ pub struct DeviceInfo {
|
||||
#[serde(rename = "@version")]
|
||||
pub version: Option<String>,
|
||||
/// The resolution xml block
|
||||
pub resolution: Resolution,
|
||||
/// Does not exist for floodlights
|
||||
pub resolution: Option<Resolution>,
|
||||
}
|
||||
|
||||
/// VersionInfo xml
|
||||
|
||||
+1
-1
@@ -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`
|
||||
|
||||
@@ -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: `<Preview>` (stop)
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user