diff --git a/CHANGELOG.md b/CHANGELOG.md index 667b726..52e0b1a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,15 @@ Versions after 2.17 are `MAJOR.MINOR.PATCH` (2.17 is followed by 2.17.1 or 2.18. `docs/testing.md`, "Versions and releases"); the headings below keep the numbers as they were released. +## 2.23.0 — 2026-11-17 + +- **Network** takes camex 3.19.0 (`bundles/camex` moves to the 3.19.0 release): two optional + fields, **Server timeout** (5 to 3600 seconds, empty: 20; seconds without an answer before the + tunnel reconnects) and **Web port** (1 to 65535, empty: none; the port of the box's web page + for nginx on the server, needs a camex server 3.19.0 or later). The tunnel no longer takes a + route or a subnet wider than a /8 from the server, so a server cannot send all of the box's + traffic through it: the tunnel only reaches the cameras. + ## 2.22.0 — 2026-11-17 - **Network**: a tunnel to the cameras, OpenIPC camex 3.18.0 built in (#272). A row under the diff --git a/README.md b/README.md index e4333c6..ccdf7e6 100644 --- a/README.md +++ b/README.md @@ -89,7 +89,7 @@ Every item, the remote, sharing a URL from another app and **Reset**: [Usage](do ## Network (a tunnel to the cameras) -Decoder has a tunnel built in, [OpenIPC camex](https://github.com/OpenIPC/camex) 3.18.0: cameras that are clients of the same camex server are watched from anywhere, without a separate VPN app. **Network** in the menu (a row under the grid) holds the server (`host:port`), the client name (the box's ID on the server), UDP or TCP, the server's public key, the pre-shared key and **On**: connect now and at every start. Off by default. The server gives the address, MTU and routes; only the tunnel network and the server's routes go through it, the local network is reached as before. The state is shown in the dialog (Connecting, Connected with the address, VPN consent needed, Failed) and in a notification. A camera reached through the tunnel plays over TCP with Auto. +Decoder has a tunnel built in, [OpenIPC camex](https://github.com/OpenIPC/camex) 3.19.0: cameras that are clients of the same camex server are watched from anywhere, without a separate VPN app. **Network** in the menu (a row under the grid) holds the server (`host:port`), the client name (the box's ID on the server), UDP or TCP, the server's public key, the pre-shared key, the server timeout, the web port for nginx on the server (a camex server 3.19.0 or later) and **On**: connect now and at every start. Off by default. The server gives the address, MTU and routes; only the tunnel network and the server's routes (none wider than a /8) go through it, the local network is reached as before. The state is shown in the dialog (Connecting, Connected with the address, VPN consent needed, Failed) and in a notification. A camera reached through the tunnel plays over TCP with Auto.
diff --git a/README.ru.md b/README.ru.md
index 24a1488..72f8f70 100644
--- a/README.ru.md
+++ b/README.ru.md
@@ -89,7 +89,7 @@
## Network (туннель к камерам)
-В Decoder встроен туннель [OpenIPC camex](https://github.com/OpenIPC/camex) 3.18.0: камеры, подключённые клиентами к тому же серверу camex, видны откуда угодно, без отдельного VPN-приложения. Пункт **Network** в меню (ряд под сеткой): сервер (`host:port`), имя клиента (идентификатор приставки на сервере), UDP или TCP, открытый ключ сервера, общий ключ (psk) и **On** — подключиться сейчас и при каждом запуске. По умолчанию выключено. Адрес, MTU и маршруты выдаёт сервер; через туннель идут только его сеть и маршруты сервера, локальная сеть доступна как прежде. Состояние видно в окне (Connecting, Connected с адресом, VPN consent needed, Failed) и в уведомлении. Камера за туннелем в режиме Auto идёт по TCP.
+В Decoder встроен туннель [OpenIPC camex](https://github.com/OpenIPC/camex) 3.19.0: камеры, подключённые клиентами к тому же серверу camex, видны откуда угодно, без отдельного VPN-приложения. Пункт **Network** в меню (ряд под сеткой): сервер (`host:port`), имя клиента (идентификатор приставки на сервере), UDP или TCP, открытый ключ сервера, общий ключ (psk), таймаут сервера, веб-порт для nginx на сервере (сервер camex 3.19.0 или новее) и **On** — подключиться сейчас и при каждом запуске. По умолчанию выключено. Адрес, MTU и маршруты выдаёт сервер; через туннель идут только его сеть и маршруты сервера (не шире /8), локальная сеть доступна как прежде. Состояние видно в окне (Connecting, Connected с адресом, VPN consent needed, Failed) и в уведомлении. Камера за туннелем в режиме Auto идёт по TCP.
diff --git a/README.zh-CN.md b/README.zh-CN.md
index d207540..d7de156 100644
--- a/README.zh-CN.md
+++ b/README.zh-CN.md
@@ -89,7 +89,7 @@
## Network(通往摄像头的隧道)
-Decoder 内置 [OpenIPC camex](https://github.com/OpenIPC/camex) 3.18.0 隧道:作为客户端接入同一台 camex 服务器的摄像头,可以在任何地方观看,无需另装 VPN 应用。菜单中的 **Network**(网格下方一行)包含:服务器(`host:port`)、客户端名称(设备在服务器上的 ID)、UDP 或 TCP、服务器公钥、预共享密钥,以及 **On**:立即连接并在每次启动时连接。默认关闭。地址、MTU 和路由由服务器下发;只有隧道网络和服务器的路由经过隧道,本地网络照常访问。状态显示在对话框(Connecting、Connected 及地址、VPN consent needed、Failed)和通知中。经隧道访问的摄像头在 Auto 模式下走 TCP。
+Decoder 内置 [OpenIPC camex](https://github.com/OpenIPC/camex) 3.19.0 隧道:作为客户端接入同一台 camex 服务器的摄像头,可以在任何地方观看,无需另装 VPN 应用。菜单中的 **Network**(网格下方一行)包含:服务器(`host:port`)、客户端名称(设备在服务器上的 ID)、UDP 或 TCP、服务器公钥、预共享密钥、服务器超时、供服务器上 nginx 使用的 Web 端口(需 camex 服务器 3.19.0 或更新版本),以及 **On**:立即连接并在每次启动时连接。默认关闭。地址、MTU 和路由由服务器下发;只有隧道网络和服务器的路由(不宽于 /8)经过隧道,本地网络照常访问。状态显示在对话框(Connecting、Connected 及地址、VPN consent needed、Failed)和通知中。经隧道访问的摄像头在 Auto 模式下走 TCP。
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 9f0181a..f7e9b32 100755
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -26,8 +26,8 @@ android {
applicationId "com.openipc.decoder"
minSdk 21
targetSdk 36
- versionCode 55
- versionName "2.22.0"
+ versionCode 56
+ versionName "2.23.0"
// Keep only these locales of the libraries' resources, as in the other OpenIPC apps
resourceConfigurations += ['en', 'ru', 'zh-rCN']
diff --git a/bundles/camex b/bundles/camex
index 6220a01..4c2626f 160000
--- a/bundles/camex
+++ b/bundles/camex
@@ -1 +1 @@
-Subproject commit 6220a01cd53f5de72872f4cc45994f78e464d091
+Subproject commit 4c2626f9b1df6701664bcd8d27ac3081b38ebfb2