Browse Source
Format per v4 addr: family(1) + socketId(1) + proto(1) + addr(4) + port(2) = 9 bytes (was 8) Proto values: 0x01=UDP, 0x02=TCP, 0x03=BOTH Affects: invite_link_c.h/c (Android), invite_link.h/cpp (desktop), chat_sync.c, conn_mgr.c, joindialog.cpp, utun_node.cpptopo_upd
evgeny
2 months ago
23 changed files with 329 additions and 61 deletions
@ -0,0 +1,54 @@
|
||||
# Сборка uTun под OpenWRT |
||||
|
||||
## Быстрый старт |
||||
|
||||
```bash |
||||
cd ~/utun2 |
||||
./build_openwrt.sh # ASUS RT-AX53U (по умолчанию) |
||||
``` |
||||
|
||||
Первый запуск соберёт toolchain (30-120 минут), последующие — только пакет. |
||||
|
||||
## Другие платформы |
||||
|
||||
```bash |
||||
./build_openwrt.sh ramips/mt7621 asus_rt-ax54 # ASUS RT-AX54 |
||||
./build_openwrt.sh ramips/mt7621 xiaomi_mi-router-4a-gigabit |
||||
./build_openwrt.sh ath79/generic tplink_archer-c7-v2 |
||||
./build_openwrt.sh x86/64 # x86_64 PC |
||||
./build_openwrt.sh --list # список целей |
||||
``` |
||||
|
||||
## Ручная сборка (menuconfig) |
||||
|
||||
```bash |
||||
cd /home/user/openwrt |
||||
make menuconfig # Target System → MediaTek Ralink MIPS |
||||
# Subtarget → MT7621 based boards |
||||
# Target Profile → ASUS RT-AX53U |
||||
# Network → utun (M) |
||||
make -j$(nproc) # полная сборка прошивки |
||||
# или только пакет: |
||||
make package/utun2/compile -j$(nproc) V=s |
||||
``` |
||||
|
||||
Пакет: `bin/packages/*/base/utun_*.ipk` |
||||
|
||||
## Структура |
||||
|
||||
- `~/openwrt/package/utun2/Makefile` — OpenWRT-пакет |
||||
- `~/openwrt/` — клон buildroot (main, https://github.com/openwrt/openwrt) |
||||
- `~/utun2/build_openwrt.sh` — скрипт сборки |
||||
|
||||
## Зависимости (host) |
||||
|
||||
```bash |
||||
apt-get install -y build-essential git subversion libncurses-dev \ |
||||
libssl-dev ccache xsltproc gawk gettext unzip python3 libtool |
||||
``` |
||||
|
||||
## Примечания |
||||
|
||||
- `configure` генерируется через `autoreconf -fi` (уже сделан) |
||||
- Пакет использует `USE_SOURCE_DIR` — билд из /home/user/utun2 напрямую |
||||
- Для чистой пересборки: `make package/utun2/clean && make package/utun2/compile -j$(nproc)` |
||||
@ -0,0 +1,124 @@
|
||||
#!/bin/bash |
||||
# OpenWRT build script for uTun |
||||
# Usage: ./build_openwrt.sh [TARGET] [PROFILE] |
||||
# |
||||
# Examples: |
||||
# ./build_openwrt.sh # ASUS RT-AX53U (default) |
||||
# ./build_openwrt.sh ramips/mt7621 asus_rt-ax53u |
||||
# ./build_openwrt.sh ath79/generic tplink_archer-c7-v2 |
||||
# ./build_openwrt.sh x86/64 |
||||
# ./build_openwrt.sh --list # list available targets |
||||
# |
||||
# First run builds the full toolchain (30-120 min). |
||||
# Subsequent runs only rebuild the utun package. |
||||
|
||||
set -e |
||||
|
||||
OPENWRT_ROOT=/home/user/openwrt |
||||
|
||||
# --- Default target: ASUS RT-AX53U --- |
||||
TARGET="${1:-ramips/mt7621}" |
||||
PROFILE="${2:-asus_rt-ax53u}" |
||||
J="${J:-$(nproc)}" |
||||
|
||||
# --- Help / list --- |
||||
if [ "$1" = "--list" ] || [ "$1" = "-l" ]; then |
||||
echo "=== Predefined targets ===" |
||||
echo " ramips/mt7621 asus_rt-ax53u ASUS RT-AX53U (default)" |
||||
echo " ramips/mt7621 asus_rt-ax54 ASUS RT-AX54" |
||||
echo " ramips/mt7621 xiaomi_mi-router-4a-gigabit Xiaomi Mi Router 4A" |
||||
echo " ath79/generic tplink_archer-c7-v2 TP-Link Archer C7 v2" |
||||
echo " x86/64 Generic x86_64 PC" |
||||
echo " x86/generic Generic x86 PC" |
||||
echo "" |
||||
echo "Full target list: grep 'TARGET_DEVICES' $OPENWRT_ROOT/target/linux/*/image/*.mk" |
||||
exit 0 |
||||
fi |
||||
|
||||
# --- Check OpenWRT exists --- |
||||
if [ ! -d "$OPENWRT_ROOT" ]; then |
||||
echo "ERROR: OpenWRT not found at $OPENWRT_ROOT" |
||||
echo "Clone: git clone --depth 1 https://github.com/openwrt/openwrt.git $OPENWRT_ROOT" |
||||
exit 1 |
||||
fi |
||||
|
||||
# --- Check utun package exists --- |
||||
if [ ! -f "$OPENWRT_ROOT/package/utun2/Makefile" ]; then |
||||
echo "ERROR: utun package not found in OpenWRT" |
||||
echo "Expected: $OPENWRT_ROOT/package/utun2/Makefile" |
||||
exit 1 |
||||
fi |
||||
|
||||
echo "============================================" |
||||
echo " uTun OpenWRT Build" |
||||
echo " Target: $TARGET" |
||||
echo " Profile: $PROFILE" |
||||
echo " Jobs: $J" |
||||
echo "============================================" |
||||
|
||||
cd "$OPENWRT_ROOT" |
||||
|
||||
# --- Select target --- |
||||
TARGET_NAME=$(echo "$TARGET" | cut -d/ -f1) |
||||
SUBTARGET_NAME=$(echo "$TARGET" | cut -d/ -f2) |
||||
|
||||
echo "" |
||||
echo "[1/3] Configuring target..." |
||||
|
||||
# Write .config |
||||
cat > .config << EOF |
||||
CONFIG_TARGET_${TARGET_NAME}=y |
||||
CONFIG_TARGET_${TARGET_NAME}_${SUBTARGET_NAME}=y |
||||
CONFIG_TARGET_${TARGET_NAME}_${SUBTARGET_NAME}_DEVICE_${PROFILE}=y |
||||
CONFIG_PACKAGE_utun=m |
||||
# Basic system |
||||
CONFIG_PACKAGE_libc=y |
||||
CONFIG_PACKAGE_libopenssl=y |
||||
CONFIG_PACKAGE_libpthread=y |
||||
CONFIG_ALL_NONSHARED=n |
||||
CONFIG_ALL_KMODS=n |
||||
CONFIG_ALL=n |
||||
CONFIG_DEVEL=y |
||||
CONFIG_CCACHE=y |
||||
# Build options |
||||
CONFIG_BUILD_LOG=y |
||||
EOF |
||||
|
||||
echo " Target: ${TARGET_NAME}/${SUBTARGET_NAME} Device: ${PROFILE}" |
||||
|
||||
# Expand config |
||||
make defconfig V=s 2>/dev/null || true |
||||
|
||||
echo "" |
||||
echo "[2/3] Building toolchain (if needed)..." |
||||
if [ ! -f "staging_dir/toolchain-*/bin/mips-openwrt-linux-gcc" ] && \ |
||||
[ ! -f "staging_dir/toolchain-*/bin/mipsel-openwrt-linux-gcc" ] && \ |
||||
[ ! -f "staging_dir/toolchain-*/bin/x86_64-openwrt-linux-gcc" ]; then |
||||
echo " Toolchain not found. Building... (this may take 30-120 min)" |
||||
make tools/install -j$J V=s 2>&1 | tail -5 |
||||
make toolchain/install -j$J V=s 2>&1 | tail -5 |
||||
echo " Toolchain built." |
||||
else |
||||
echo " Toolchain already built. Skipping." |
||||
fi |
||||
|
||||
echo "" |
||||
echo "[3/3] Building utun package..." |
||||
make package/utun2/compile -j$J V=s 2>&1 | tail -10 |
||||
|
||||
# --- Show result --- |
||||
IPK=$(find bin/packages -name "utun_*.ipk" 2>/dev/null | head -1) |
||||
if [ -n "$IPK" ]; then |
||||
echo "" |
||||
echo "============================================" |
||||
echo " BUILD SUCCESS!" |
||||
echo " Package: $IPK" |
||||
echo " Size: $(du -h "$IPK" | cut -f1)" |
||||
echo "============================================" |
||||
else |
||||
echo "" |
||||
echo "ERROR: Package not found. Check build log above." |
||||
# Try to find any built binary |
||||
find bin -name "utun*" 2>/dev/null |
||||
exit 1 |
||||
fi |
||||
@ -0,0 +1,11 @@
|
||||
{ |
||||
"$schema": "https://opencode.ai/config.json", |
||||
"plugin": ["@isac322/kwin-mcp-opencode"], |
||||
"mcp": { |
||||
"kwin-mcp": { |
||||
"type": "local", |
||||
"command": ["/home/user/.local/bin/uvx", "kwin-mcp"], |
||||
"enabled": true |
||||
} |
||||
} |
||||
} |
||||
Loading…
Reference in new issue