Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<p align="center">
<img src="screenshots/network.jpg" alt="The Network dialog on a TV box: connected, the server and the client name" width="400">
Expand Down
2 changes: 1 addition & 1 deletion README.ru.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

<p align="center">
<img src="screenshots/network.jpg" alt="Окно Network на ТВ-приставке: подключено, сервер и имя клиента" width="400">
Expand Down
2 changes: 1 addition & 1 deletion README.zh-CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -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。

<p align="center">
<img src="screenshots/network.jpg" alt="电视盒子上的 Network 对话框:已连接、服务器和客户端名称" width="400">
Expand Down
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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']

Expand Down
2 changes: 1 addition & 1 deletion bundles/camex
Submodule camex updated 44 files
+23 −0 CHANGELOG.md
+2 −10 android/app/build.gradle.kts
+1 −12 android/app/src/main/AndroidManifest.xml
+0 −241 android/app/src/main/java/org/openipc/camex/ConnectLink.java
+68 −70 android/app/src/main/java/org/openipc/camex/MainActivity.java
+47 −46 android/app/src/main/java/org/openipc/camex/SettingsActivity.java
+0 −333 android/app/src/main/java/org/openipc/camex/TunnelService.java
+0 −25 android/app/src/main/jni/CMakeLists.txt
+0 −180 android/app/src/main/jni/camex-jni.c
+0 −7 android/app/src/main/res/layout/activity_settings.xml
+4 −2 android/app/src/main/res/values/strings.xml
+0 −197 android/app/src/test/java/org/openipc/camex/ConnectLinkTest.java
+3 −3 android/camex-sources.cmake
+13 −3 android/tunnel/src/androidTest/java/org/openipc/camex/tunnel/TunnelE2eTest.java
+7 −0 android/tunnel/src/main/java/org/openipc/camex/tunnel/CamexTunnel.java
+8 −3 android/tunnel/src/main/java/org/openipc/camex/tunnel/CamexVpnService.java
+14 −5 android/tunnel/src/main/java/org/openipc/camex/tunnel/ConnectLink.java
+37 −3 android/tunnel/src/main/java/org/openipc/camex/tunnel/Values.java
+10 −1 android/tunnel/src/test/java/org/openipc/camex/tunnel/ConnectLinkTest.java
+204 −0 android/tunnel/src/test/java/org/openipc/camex/tunnel/LinkCasesTest.java
+24 −1 android/tunnel/src/test/java/org/openipc/camex/tunnel/ValuesTest.java
+40 −0 docker/test-e2e-nginx-map.sh
+49 −39 docs/android-library.md
+18 −15 docs/android.md
+6 −5 docs/connect/index.html
+11 −1 docs/nginx.md
+7 −4 docs/security.md
+6 −1 docs/server.md
+1 −0 docs/usage.md
+1 −0 src/camex.h
+42 −0 src/config.c
+7 −0 src/config.h
+37 −8 src/control.c
+25 −0 src/main.c
+16 −5 src/nginxmap.c
+26 −1 src/proto.c
+1 −1 src/proto.h
+42 −3 src/server.c
+4 −2 src/server.h
+1 −1 src/version.h
+23 −8 tests/android/device-test.sh
+2 −2 tests/android/tunnel-e2e.sh
+16 −0 tests/test_nginxmap.c
+109 −0 tests/test_proto.c
Loading