feat: Split firmware into Bee (L2 transport) and Bumblebee (L3 gateway) roles
Bee (wr3000, ar300m16): minimal batman-adv mesh relay with gw_mode=client, no yggdrasil/GRE6/VPN/SQM/DoH, Parahub_Free bridged to private network. Bumblebee (axt1800, mt3000, mt6000, ax6s, ax53u): full stack with gw_mode=server, yggdrasil overlay, GRE6 tunnel, guest isolation, SQM, DoH. Build creates /etc/parahub/role marker; heartbeat reports firmware_role and mesh_ip; Bee uses public URL, Bumblebee tries yggdrasil with fallback. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -2,9 +2,16 @@
|
|||||||
# Parahub Mesh Node — Zero-Touch First Boot Configuration
|
# Parahub Mesh Node — Zero-Touch First Boot Configuration
|
||||||
# This script runs once on first boot via uci-defaults mechanism.
|
# This script runs once on first boot via uci-defaults mechanism.
|
||||||
# It configures: batman-adv mesh, dual-band WiFi (private+public), firewall zones, SQM shaping.
|
# It configures: batman-adv mesh, dual-band WiFi (private+public), firewall zones, SQM shaping.
|
||||||
|
#
|
||||||
|
# Roles:
|
||||||
|
# bumblebee (L3 Gateway) — full stack: yggdrasil, GRE6, VPN, guest isolation, SQM, DoH
|
||||||
|
# bee (L2 Transport) — minimal: batman-adv mesh relay, heartbeat
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
|
# Read firmware role (written by build.sh)
|
||||||
|
ROLE=$(cat /etc/parahub/role 2>/dev/null || echo "bumblebee")
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 1. IDENTITY GENERATION
|
# 1. IDENTITY GENERATION
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
@@ -55,6 +62,7 @@ mkdir -p /etc/parahub
|
|||||||
cat > /etc/parahub/keys <<KEYS_EOF
|
cat > /etc/parahub/keys <<KEYS_EOF
|
||||||
# Parahub Mesh Node Keys — Generated at first boot
|
# Parahub Mesh Node Keys — Generated at first boot
|
||||||
# Node: ${HOSTNAME}
|
# Node: ${HOSTNAME}
|
||||||
|
# Role: ${ROLE}
|
||||||
# Date: $(date -u +%Y-%m-%dT%H:%M:%SZ)
|
# Date: $(date -u +%Y-%m-%dT%H:%M:%SZ)
|
||||||
PRIVATE_WIFI_KEY=${PRIVATE_KEY}
|
PRIVATE_WIFI_KEY=${PRIVATE_KEY}
|
||||||
MESH_SAE_KEY=${MESH_KEY}
|
MESH_SAE_KEY=${MESH_KEY}
|
||||||
@@ -69,7 +77,8 @@ chmod 600 /etc/parahub/keys
|
|||||||
# 4. NETWORK CONFIGURATION
|
# 4. NETWORK CONFIGURATION
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
# Clean existing network config (preserve wan)
|
if [ "$ROLE" = "bee" ]; then
|
||||||
|
# --- Bee: minimal network (bat0 gw_mode=client, no GRE6, no guest, no policy routing) ---
|
||||||
uci batch <<-NET_EOF
|
uci batch <<-NET_EOF
|
||||||
# --- loopback ---
|
# --- loopback ---
|
||||||
set network.loopback=interface
|
set network.loopback=interface
|
||||||
@@ -78,14 +87,65 @@ set network.loopback.proto='static'
|
|||||||
set network.loopback.ipaddr='127.0.0.1'
|
set network.loopback.ipaddr='127.0.0.1'
|
||||||
set network.loopback.netmask='255.0.0.0'
|
set network.loopback.netmask='255.0.0.0'
|
||||||
|
|
||||||
# --- bat0 (batman-adv virtual interface) ---
|
# --- bat0 (batman-adv, client mode — uses Bumblebee as gateway) ---
|
||||||
set network.bat0=interface
|
set network.bat0=interface
|
||||||
set network.bat0.proto='batadv'
|
set network.bat0.proto='batadv'
|
||||||
set network.bat0.routing_algo='BATMAN_V'
|
set network.bat0.routing_algo='BATMAN_V'
|
||||||
set network.bat0.aggregated_ogms='1'
|
set network.bat0.aggregated_ogms='1'
|
||||||
set network.bat0.bridge_loop_avoidance='1'
|
set network.bat0.bridge_loop_avoidance='1'
|
||||||
set network.bat0.distributed_arp_table='1'
|
set network.bat0.distributed_arp_table='1'
|
||||||
set network.bat0.gw_mode='off'
|
set network.bat0.gw_mode='client'
|
||||||
|
set network.bat0.hop_penalty='15'
|
||||||
|
set network.bat0.orig_interval='1000'
|
||||||
|
|
||||||
|
# --- bat0 hardif for mesh0 (2.4GHz mesh) ---
|
||||||
|
set network.bat0_hardif_mesh0=interface
|
||||||
|
set network.bat0_hardif_mesh0.proto='batadv_hardif'
|
||||||
|
set network.bat0_hardif_mesh0.master='bat0'
|
||||||
|
|
||||||
|
# --- bat0 hardif for mesh1 (5GHz mesh) ---
|
||||||
|
set network.bat0_hardif_mesh1=interface
|
||||||
|
set network.bat0_hardif_mesh1.proto='batadv_hardif'
|
||||||
|
set network.bat0_hardif_mesh1.master='bat0'
|
||||||
|
|
||||||
|
# --- private bridge (bat0 + LAN ethernet) ---
|
||||||
|
set network.private_dev=device
|
||||||
|
set network.private_dev.type='bridge'
|
||||||
|
set network.private_dev.name='br-private'
|
||||||
|
delete network.private_dev.ports
|
||||||
|
add_list network.private_dev.ports='bat0'
|
||||||
|
add_list network.private_dev.ports='eth0'
|
||||||
|
|
||||||
|
set network.private=interface
|
||||||
|
set network.private.device='br-private'
|
||||||
|
set network.private.proto='static'
|
||||||
|
set network.private.ipaddr='${PRIV_IP}'
|
||||||
|
set network.private.netmask='255.255.255.0'
|
||||||
|
|
||||||
|
# --- wan (DHCP, create if missing) ---
|
||||||
|
set network.wan=interface
|
||||||
|
set network.wan.device='eth1'
|
||||||
|
set network.wan.proto='dhcp'
|
||||||
|
NET_EOF
|
||||||
|
|
||||||
|
else
|
||||||
|
# --- Bumblebee: full network (gw_mode=server, GRE6, guest, policy routing) ---
|
||||||
|
uci batch <<-NET_EOF
|
||||||
|
# --- loopback ---
|
||||||
|
set network.loopback=interface
|
||||||
|
set network.loopback.device='lo'
|
||||||
|
set network.loopback.proto='static'
|
||||||
|
set network.loopback.ipaddr='127.0.0.1'
|
||||||
|
set network.loopback.netmask='255.0.0.0'
|
||||||
|
|
||||||
|
# --- bat0 (batman-adv, server mode — acts as gateway for Bee nodes) ---
|
||||||
|
set network.bat0=interface
|
||||||
|
set network.bat0.proto='batadv'
|
||||||
|
set network.bat0.routing_algo='BATMAN_V'
|
||||||
|
set network.bat0.aggregated_ogms='1'
|
||||||
|
set network.bat0.bridge_loop_avoidance='1'
|
||||||
|
set network.bat0.distributed_arp_table='1'
|
||||||
|
set network.bat0.gw_mode='server'
|
||||||
set network.bat0.hop_penalty='15'
|
set network.bat0.hop_penalty='15'
|
||||||
set network.bat0.orig_interval='1000'
|
set network.bat0.orig_interval='1000'
|
||||||
|
|
||||||
@@ -140,6 +200,8 @@ set network.@rule[-1].src='${GUEST_SUBNET}/24'
|
|||||||
set network.@rule[-1].lookup='100'
|
set network.@rule[-1].lookup='100'
|
||||||
set network.@rule[-1].priority='100'
|
set network.@rule[-1].priority='100'
|
||||||
NET_EOF
|
NET_EOF
|
||||||
|
fi
|
||||||
|
|
||||||
uci commit network
|
uci commit network
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
@@ -202,8 +264,19 @@ set wireless.mesh_2g.key='${MESH_KEY}'
|
|||||||
set wireless.mesh_2g.network='bat0_hardif_mesh0'
|
set wireless.mesh_2g.network='bat0_hardif_mesh0'
|
||||||
WIFI_2G_MESH
|
WIFI_2G_MESH
|
||||||
|
|
||||||
# Public AP on 2.4GHz (better range) — OWE transition mode
|
if [ "$ROLE" = "bee" ]; then
|
||||||
# Devices that support OWE get encrypted; legacy devices fall back to open
|
# Bee: Parahub_Free on private bridge (no guest isolation)
|
||||||
|
uci batch <<-WIFI_2G_PUB
|
||||||
|
set wireless.public_2g=wifi-iface
|
||||||
|
set wireless.public_2g.device='${RADIO_2G}'
|
||||||
|
set wireless.public_2g.mode='ap'
|
||||||
|
set wireless.public_2g.ssid='${PUBLIC_SSID}'
|
||||||
|
set wireless.public_2g.encryption='owe'
|
||||||
|
set wireless.public_2g.owe_transition='1'
|
||||||
|
set wireless.public_2g.network='private'
|
||||||
|
WIFI_2G_PUB
|
||||||
|
else
|
||||||
|
# Bumblebee: Parahub_Free on guest network (isolated)
|
||||||
uci batch <<-WIFI_2G_PUB
|
uci batch <<-WIFI_2G_PUB
|
||||||
set wireless.public_2g=wifi-iface
|
set wireless.public_2g=wifi-iface
|
||||||
set wireless.public_2g.device='${RADIO_2G}'
|
set wireless.public_2g.device='${RADIO_2G}'
|
||||||
@@ -215,6 +288,7 @@ set wireless.public_2g.isolate='1'
|
|||||||
set wireless.public_2g.network='guest'
|
set wireless.public_2g.network='guest'
|
||||||
WIFI_2G_PUB
|
WIFI_2G_PUB
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# --- 5GHz radio: mesh backhaul + Private AP ---
|
# --- 5GHz radio: mesh backhaul + Private AP ---
|
||||||
if [ -n "$RADIO_5G" ]; then
|
if [ -n "$RADIO_5G" ]; then
|
||||||
@@ -254,6 +328,51 @@ while uci -q delete firewall.@forwarding[0]; do :; done
|
|||||||
while uci -q delete firewall.@rule[0]; do :; done
|
while uci -q delete firewall.@rule[0]; do :; done
|
||||||
while uci -q delete firewall.@redirect[0]; do :; done
|
while uci -q delete firewall.@redirect[0]; do :; done
|
||||||
|
|
||||||
|
if [ "$ROLE" = "bee" ]; then
|
||||||
|
# --- Bee: minimal firewall (lan + wan only) ---
|
||||||
|
uci batch <<-FW_EOF
|
||||||
|
# --- Zone: lan (private network) ---
|
||||||
|
add firewall zone
|
||||||
|
set firewall.@zone[-1].name='lan'
|
||||||
|
set firewall.@zone[-1].input='ACCEPT'
|
||||||
|
set firewall.@zone[-1].output='ACCEPT'
|
||||||
|
set firewall.@zone[-1].forward='ACCEPT'
|
||||||
|
add_list firewall.@zone[-1].network='private'
|
||||||
|
|
||||||
|
# --- Zone: wan ---
|
||||||
|
add firewall zone
|
||||||
|
set firewall.@zone[-1].name='wan'
|
||||||
|
set firewall.@zone[-1].input='REJECT'
|
||||||
|
set firewall.@zone[-1].output='ACCEPT'
|
||||||
|
set firewall.@zone[-1].forward='REJECT'
|
||||||
|
set firewall.@zone[-1].masq='1'
|
||||||
|
set firewall.@zone[-1].mtu_fix='1'
|
||||||
|
add_list firewall.@zone[-1].network='wan'
|
||||||
|
|
||||||
|
# --- Forwarding: lan → wan ---
|
||||||
|
add firewall forwarding
|
||||||
|
set firewall.@forwarding[-1].src='lan'
|
||||||
|
set firewall.@forwarding[-1].dest='wan'
|
||||||
|
|
||||||
|
# --- Standard WAN input rules ---
|
||||||
|
add firewall rule
|
||||||
|
set firewall.@rule[-1].name='Allow-DHCP-Renew'
|
||||||
|
set firewall.@rule[-1].src='wan'
|
||||||
|
set firewall.@rule[-1].proto='udp'
|
||||||
|
set firewall.@rule[-1].dest_port='68'
|
||||||
|
set firewall.@rule[-1].target='ACCEPT'
|
||||||
|
set firewall.@rule[-1].family='ipv4'
|
||||||
|
|
||||||
|
add firewall rule
|
||||||
|
set firewall.@rule[-1].name='Allow-Ping'
|
||||||
|
set firewall.@rule[-1].src='wan'
|
||||||
|
set firewall.@rule[-1].proto='icmp'
|
||||||
|
set firewall.@rule[-1].icmp_type='echo-request'
|
||||||
|
set firewall.@rule[-1].target='ACCEPT'
|
||||||
|
FW_EOF
|
||||||
|
|
||||||
|
else
|
||||||
|
# --- Bumblebee: full firewall (4 zones, guest isolation, kill switch) ---
|
||||||
uci batch <<-FW_EOF
|
uci batch <<-FW_EOF
|
||||||
# --- Zone: lan (private network) ---
|
# --- Zone: lan (private network) ---
|
||||||
add firewall zone
|
add firewall zone
|
||||||
@@ -363,6 +482,8 @@ set firewall.@rule[-1].proto='icmp'
|
|||||||
set firewall.@rule[-1].icmp_type='echo-request'
|
set firewall.@rule[-1].icmp_type='echo-request'
|
||||||
set firewall.@rule[-1].target='ACCEPT'
|
set firewall.@rule[-1].target='ACCEPT'
|
||||||
FW_EOF
|
FW_EOF
|
||||||
|
fi
|
||||||
|
|
||||||
uci commit firewall
|
uci commit firewall
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
@@ -373,6 +494,17 @@ uci commit firewall
|
|||||||
uci -q delete dhcp.lan 2>/dev/null || true
|
uci -q delete dhcp.lan 2>/dev/null || true
|
||||||
uci -q delete dhcp.guest 2>/dev/null || true
|
uci -q delete dhcp.guest 2>/dev/null || true
|
||||||
|
|
||||||
|
if [ "$ROLE" = "bee" ]; then
|
||||||
|
# Bee: private DHCP only (no guest pool)
|
||||||
|
uci batch <<-DHCP_EOF
|
||||||
|
set dhcp.private=dhcp
|
||||||
|
set dhcp.private.interface='private'
|
||||||
|
set dhcp.private.start='100'
|
||||||
|
set dhcp.private.limit='150'
|
||||||
|
set dhcp.private.leasetime='12h'
|
||||||
|
DHCP_EOF
|
||||||
|
else
|
||||||
|
# Bumblebee: private + guest DHCP
|
||||||
uci batch <<-DHCP_EOF
|
uci batch <<-DHCP_EOF
|
||||||
# --- Private DHCP ---
|
# --- Private DHCP ---
|
||||||
set dhcp.private=dhcp
|
set dhcp.private=dhcp
|
||||||
@@ -388,15 +520,15 @@ set dhcp.guest.start='100'
|
|||||||
set dhcp.guest.limit='50'
|
set dhcp.guest.limit='50'
|
||||||
set dhcp.guest.leasetime='1h'
|
set dhcp.guest.leasetime='1h'
|
||||||
DHCP_EOF
|
DHCP_EOF
|
||||||
|
fi
|
||||||
|
|
||||||
uci commit dhcp
|
uci commit dhcp
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 8. SQM TRAFFIC SHAPING (guest 512 kbps limit)
|
# 8. SQM TRAFFIC SHAPING (Bumblebee only — guest 512 kbps limit)
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
# Find the guest interface device name (will be set after network restart)
|
if [ "$ROLE" != "bee" ]; then
|
||||||
# SQM watches the interface name from the network config
|
|
||||||
|
|
||||||
uci batch <<-SQM_EOF
|
uci batch <<-SQM_EOF
|
||||||
set sqm.guest=queue
|
set sqm.guest=queue
|
||||||
set sqm.guest.enabled='1'
|
set sqm.guest.enabled='1'
|
||||||
@@ -409,13 +541,13 @@ set sqm.guest.linklayer='ethernet'
|
|||||||
set sqm.guest.overhead='44'
|
set sqm.guest.overhead='44'
|
||||||
SQM_EOF
|
SQM_EOF
|
||||||
uci commit sqm
|
uci commit sqm
|
||||||
|
fi
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 9. DNS-OVER-HTTPS (guest DNS privacy)
|
# 9. DNS-OVER-HTTPS (Bumblebee only — guest DNS privacy)
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
# https-dns-proxy: local DoH resolver for guest DNS queries
|
if [ "$ROLE" != "bee" ]; then
|
||||||
# Guest DNS is hijacked via firewall redirect to this resolver
|
|
||||||
uci batch <<-DOH_EOF
|
uci batch <<-DOH_EOF
|
||||||
set https-dns-proxy.main=main
|
set https-dns-proxy.main=main
|
||||||
set https-dns-proxy.main.doh_paramters='-4'
|
set https-dns-proxy.main.doh_paramters='-4'
|
||||||
@@ -437,6 +569,7 @@ uci commit dhcp
|
|||||||
|
|
||||||
# Enable https-dns-proxy service
|
# Enable https-dns-proxy service
|
||||||
/etc/init.d/https-dns-proxy enable 2>/dev/null || true
|
/etc/init.d/https-dns-proxy enable 2>/dev/null || true
|
||||||
|
fi
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 10. SYSTEM SETTINGS
|
# 10. SYSTEM SETTINGS
|
||||||
@@ -453,9 +586,10 @@ SYS_EOF
|
|||||||
uci commit system
|
uci commit system
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 11. YGGDRASIL OVERLAY NETWORK
|
# 11. YGGDRASIL OVERLAY NETWORK (Bumblebee only)
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
|
if [ "$ROLE" != "bee" ]; then
|
||||||
# Generate unique keys for this node
|
# Generate unique keys for this node
|
||||||
yggdrasil -genconf | sed 's/IfName: .*/IfName: ygg0/' > /etc/yggdrasil.conf
|
yggdrasil -genconf | sed 's/IfName: .*/IfName: ygg0/' > /etc/yggdrasil.conf
|
||||||
|
|
||||||
@@ -480,6 +614,9 @@ uci commit firewall
|
|||||||
# Save yggdrasil address to node keys file
|
# Save yggdrasil address to node keys file
|
||||||
YGG_ADDR=$(yggdrasil -address -useconffile /etc/yggdrasil.conf 2>/dev/null || echo "unknown")
|
YGG_ADDR=$(yggdrasil -address -useconffile /etc/yggdrasil.conf 2>/dev/null || echo "unknown")
|
||||||
echo "YGGDRASIL_ADDRESS=${YGG_ADDR}" >> /etc/parahub/keys
|
echo "YGGDRASIL_ADDRESS=${YGG_ADDR}" >> /etc/parahub/keys
|
||||||
|
else
|
||||||
|
YGG_ADDR="none"
|
||||||
|
fi
|
||||||
|
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
# 12. HEARTBEAT (phone-home to Parahub cloud)
|
# 12. HEARTBEAT (phone-home to Parahub cloud)
|
||||||
@@ -496,13 +633,21 @@ echo "*/5 * * * * /usr/bin/parahub-heartbeat" >> /etc/crontabs/root
|
|||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
# Log completion
|
# Log completion
|
||||||
logger -t parahub-mesh "First boot configuration complete"
|
logger -t parahub-mesh "First boot configuration complete (role: ${ROLE})"
|
||||||
logger -t parahub-mesh "Hostname: ${HOSTNAME}"
|
logger -t parahub-mesh "Hostname: ${HOSTNAME}"
|
||||||
|
logger -t parahub-mesh "Role: ${ROLE}"
|
||||||
logger -t parahub-mesh "Private: ${PRIVATE_SSID} @ ${PRIV_IP}/24"
|
logger -t parahub-mesh "Private: ${PRIVATE_SSID} @ ${PRIV_IP}/24"
|
||||||
|
|
||||||
|
if [ "$ROLE" = "bee" ]; then
|
||||||
|
logger -t parahub-mesh "Parahub_Free: bridged to private (no guest isolation)"
|
||||||
|
logger -t parahub-mesh "bat0 gw_mode: client (uses Bumblebee as gateway)"
|
||||||
|
else
|
||||||
logger -t parahub-mesh "Guest: ${PUBLIC_SSID} @ ${GUEST_IP}/24"
|
logger -t parahub-mesh "Guest: ${PUBLIC_SSID} @ ${GUEST_IP}/24"
|
||||||
logger -t parahub-mesh "Mesh ID: ${MESH_ID}"
|
logger -t parahub-mesh "Mesh ID: ${MESH_ID}"
|
||||||
logger -t parahub-mesh "Yggdrasil: ${YGG_ADDR}"
|
logger -t parahub-mesh "Yggdrasil: ${YGG_ADDR}"
|
||||||
logger -t parahub-mesh "GRE tunnel: 172.16.0.2 → VPS gateway (Mullvad Portugal)"
|
logger -t parahub-mesh "GRE tunnel: 172.16.0.2 → VPS gateway (Mullvad Portugal)"
|
||||||
logger -t parahub-mesh "Kill switch: guest→vpn_tunnel only (no wan)"
|
logger -t parahub-mesh "Kill switch: guest→vpn_tunnel only (no wan)"
|
||||||
|
logger -t parahub-mesh "bat0 gw_mode: server (gateway for Bee nodes)"
|
||||||
|
fi
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
# Phone-home heartbeat to Parahub cloud via Yggdrasil
|
# Phone-home heartbeat to Parahub cloud
|
||||||
PARAHUB_API="http://[200:abb9:5810:37d3:8a4c:98a6:b82b:969a]/api/v1/iot/mesh/heartbeat"
|
PARAHUB_API_YGG="http://[200:abb9:5810:37d3:8a4c:98a6:b82b:969a]/api/v1/iot/mesh/heartbeat"
|
||||||
|
PARAHUB_API_PUBLIC="https://parahub.io/api/v1/iot/mesh/heartbeat"
|
||||||
HEARTBEAT_KEY="IqPosrcpTQKSbLHxOG3iLTl_K2MsDxvd"
|
HEARTBEAT_KEY="IqPosrcpTQKSbLHxOG3iLTl_K2MsDxvd"
|
||||||
|
|
||||||
# Check Yggdrasil connectivity first
|
# Read firmware role
|
||||||
ping6 -c 1 -W 3 200:abb9:5810:37d3:8a4c:98a6:b82b:969a >/dev/null 2>&1 || exit 0
|
ROLE=$(cat /etc/parahub/role 2>/dev/null || echo "unknown")
|
||||||
|
|
||||||
# Read identity from /etc/parahub/keys
|
# Read identity from /etc/parahub/keys
|
||||||
. /etc/parahub/keys 2>/dev/null
|
. /etc/parahub/keys 2>/dev/null
|
||||||
@@ -14,18 +15,45 @@ YGG_ADDR="${YGGDRASIL_ADDRESS:-unknown}"
|
|||||||
SSID="${PRIVATE_SSID:-unknown}"
|
SSID="${PRIVATE_SSID:-unknown}"
|
||||||
UPTIME="$(cut -d. -f1 /proc/uptime)"
|
UPTIME="$(cut -d. -f1 /proc/uptime)"
|
||||||
|
|
||||||
|
# Get mesh IP (br-private address)
|
||||||
|
MESH_IP=$(ip -4 addr show br-private 2>/dev/null | grep -o 'inet [0-9.]*' | cut -d' ' -f2)
|
||||||
|
MESH_IP="${MESH_IP:-unknown}"
|
||||||
|
|
||||||
# Detect hardware from board_name
|
# Detect hardware from board_name
|
||||||
HW=$(cat /tmp/sysinfo/board_name 2>/dev/null)
|
HW=$(cat /tmp/sysinfo/board_name 2>/dev/null)
|
||||||
case "$HW" in
|
case "$HW" in
|
||||||
glinet,gl-axt1800) HW="axt1800" ;;
|
glinet,gl-axt1800) HW="axt1800" ;;
|
||||||
glinet,gl-mt3000) HW="mt3000" ;;
|
glinet,gl-mt3000) HW="mt3000" ;;
|
||||||
glinet,gl-mt6000) HW="mt6000" ;;
|
glinet,gl-mt6000) HW="mt6000" ;;
|
||||||
|
xiaomi,redmi-router-ax6s) HW="ax6s" ;;
|
||||||
asus,rt-ax53u) HW="ax53u" ;;
|
asus,rt-ax53u) HW="ax53u" ;;
|
||||||
|
glinet,gl-ar300m16) HW="ar300m16" ;;
|
||||||
|
cudy,wr3000-v1) HW="wr3000" ;;
|
||||||
*) HW="${HW:-unknown}" ;;
|
*) HW="${HW:-unknown}" ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
PAYLOAD="{\"mac\":\"${MAC}\",\"hostname\":\"${HOSTNAME}\",\"yggdrasil_address\":\"${YGG_ADDR}\",\"firmware_version\":\"25.12.0-rc4\",\"hardware_profile\":\"${HW}\",\"uptime\":${UPTIME},\"private_ssid\":\"${SSID}\",\"firmware_role\":\"${ROLE}\",\"mesh_ip\":\"${MESH_IP}\"}"
|
||||||
|
|
||||||
|
if [ "$ROLE" = "bee" ]; then
|
||||||
|
# Bee: no yggdrasil, use public URL only
|
||||||
curl -s -m 10 -X POST \
|
curl -s -m 10 -X POST \
|
||||||
-H "Content-Type: application/json" \
|
-H "Content-Type: application/json" \
|
||||||
-H "Authorization: Bearer ${HEARTBEAT_KEY}" \
|
-H "Authorization: Bearer ${HEARTBEAT_KEY}" \
|
||||||
-d "{\"mac\":\"${MAC}\",\"hostname\":\"${HOSTNAME}\",\"yggdrasil_address\":\"${YGG_ADDR}\",\"firmware_version\":\"25.12.0-rc4\",\"hardware_profile\":\"${HW}\",\"uptime\":${UPTIME},\"private_ssid\":\"${SSID}\"}" \
|
-d "$PAYLOAD" \
|
||||||
"${PARAHUB_API}" >/dev/null 2>&1
|
"${PARAHUB_API_PUBLIC}" >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
# Bumblebee: try yggdrasil first, fallback to public
|
||||||
|
if ping6 -c 1 -W 3 200:abb9:5810:37d3:8a4c:98a6:b82b:969a >/dev/null 2>&1; then
|
||||||
|
curl -s -m 10 -X POST \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: Bearer ${HEARTBEAT_KEY}" \
|
||||||
|
-d "$PAYLOAD" \
|
||||||
|
"${PARAHUB_API_YGG}" >/dev/null 2>&1
|
||||||
|
else
|
||||||
|
curl -s -m 10 -X POST \
|
||||||
|
-H "Content-Type: application/json" \
|
||||||
|
-H "Authorization: Bearer ${HEARTBEAT_KEY}" \
|
||||||
|
-d "$PAYLOAD" \
|
||||||
|
"${PARAHUB_API_PUBLIC}" >/dev/null 2>&1
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|||||||
@@ -22,26 +22,37 @@ device_config() {
|
|||||||
axt1800)
|
axt1800)
|
||||||
OPENWRT_TARGET="qualcommax/ipq60xx"
|
OPENWRT_TARGET="qualcommax/ipq60xx"
|
||||||
PROFILE="glinet_gl-axt1800"
|
PROFILE="glinet_gl-axt1800"
|
||||||
|
FIRMWARE_ROLE="bumblebee"
|
||||||
;;
|
;;
|
||||||
mt3000)
|
mt3000)
|
||||||
OPENWRT_TARGET="mediatek/filogic"
|
OPENWRT_TARGET="mediatek/filogic"
|
||||||
PROFILE="glinet_gl-mt3000"
|
PROFILE="glinet_gl-mt3000"
|
||||||
|
FIRMWARE_ROLE="bumblebee"
|
||||||
;;
|
;;
|
||||||
mt6000)
|
mt6000)
|
||||||
OPENWRT_TARGET="mediatek/filogic"
|
OPENWRT_TARGET="mediatek/filogic"
|
||||||
PROFILE="glinet_gl-mt6000"
|
PROFILE="glinet_gl-mt6000"
|
||||||
|
FIRMWARE_ROLE="bumblebee"
|
||||||
;;
|
;;
|
||||||
ax6s)
|
ax6s)
|
||||||
OPENWRT_TARGET="mediatek/filogic"
|
OPENWRT_TARGET="mediatek/filogic"
|
||||||
PROFILE="xiaomi_redmi-router-ax6s"
|
PROFILE="xiaomi_redmi-router-ax6s"
|
||||||
|
FIRMWARE_ROLE="bumblebee"
|
||||||
;;
|
;;
|
||||||
ax53u)
|
ax53u)
|
||||||
OPENWRT_TARGET="ramips/mt7621"
|
OPENWRT_TARGET="ramips/mt7621"
|
||||||
PROFILE="asus_rt-ax53u"
|
PROFILE="asus_rt-ax53u"
|
||||||
|
FIRMWARE_ROLE="bumblebee"
|
||||||
;;
|
;;
|
||||||
ar300m16)
|
ar300m16)
|
||||||
OPENWRT_TARGET="ath79/generic"
|
OPENWRT_TARGET="ath79/generic"
|
||||||
PROFILE="glinet_gl-ar300m16"
|
PROFILE="glinet_gl-ar300m16"
|
||||||
|
FIRMWARE_ROLE="bee"
|
||||||
|
;;
|
||||||
|
wr3000)
|
||||||
|
OPENWRT_TARGET="mediatek/filogic"
|
||||||
|
PROFILE="cudy_wr3000-v1"
|
||||||
|
FIRMWARE_ROLE="bee"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
return 1
|
return 1
|
||||||
@@ -53,42 +64,32 @@ device_config() {
|
|||||||
# Packages
|
# Packages
|
||||||
# ============================================================================
|
# ============================================================================
|
||||||
|
|
||||||
PACKAGES_CORE=(
|
# Bee (L2 Transport): minimal mesh relay — no overlay, no guest isolation
|
||||||
# batman-adv mesh
|
PACKAGES_BEE=(
|
||||||
kmod-batman-adv
|
kmod-batman-adv
|
||||||
batctl-full
|
batctl-full
|
||||||
|
|
||||||
# 802.11s mesh support (replace basic wpad, includes OWE)
|
|
||||||
wpad-mesh-mbedtls
|
wpad-mesh-mbedtls
|
||||||
-wpad-basic-mbedtls
|
-wpad-basic-mbedtls
|
||||||
|
luci
|
||||||
|
curl
|
||||||
|
)
|
||||||
|
|
||||||
# Yggdrasil overlay network
|
# Bumblebee (L3 Gateway): full stack — overlay, VPN, guest isolation, diagnostics
|
||||||
|
PACKAGES_BUMBLEBEE=(
|
||||||
|
kmod-batman-adv
|
||||||
|
batctl-full
|
||||||
|
wpad-mesh-mbedtls
|
||||||
|
-wpad-basic-mbedtls
|
||||||
yggdrasil
|
yggdrasil
|
||||||
|
|
||||||
# GRE6 tunnel (guest traffic → VPS gateway)
|
|
||||||
kmod-gre6
|
kmod-gre6
|
||||||
|
|
||||||
# WireGuard (optional local Mullvad via parahub-mullvad script)
|
|
||||||
kmod-wireguard
|
kmod-wireguard
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
luci-proto-wireguard
|
luci-proto-wireguard
|
||||||
|
|
||||||
# DNS-over-HTTPS for guest privacy
|
|
||||||
https-dns-proxy
|
https-dns-proxy
|
||||||
|
|
||||||
# SQM traffic shaping
|
|
||||||
sqm-scripts
|
sqm-scripts
|
||||||
kmod-sched-cake
|
kmod-sched-cake
|
||||||
|
|
||||||
# Management
|
|
||||||
luci
|
luci
|
||||||
luci-app-sqm
|
luci-app-sqm
|
||||||
)
|
|
||||||
|
|
||||||
PACKAGES_FULL=(
|
|
||||||
"${PACKAGES_CORE[@]}"
|
|
||||||
|
|
||||||
# Diagnostics
|
|
||||||
tcpdump
|
tcpdump
|
||||||
iperf3
|
iperf3
|
||||||
iwinfo
|
iwinfo
|
||||||
@@ -102,13 +103,18 @@ PACKAGES_FULL=(
|
|||||||
usage() {
|
usage() {
|
||||||
echo "Usage: $0 <device>"
|
echo "Usage: $0 <device>"
|
||||||
echo ""
|
echo ""
|
||||||
echo "Devices:"
|
echo "Devices: Role"
|
||||||
echo " axt1800 GL.iNet GL-AXT1800 (Slate AX) qualcommax/ipq60xx"
|
echo " axt1800 GL.iNet GL-AXT1800 (Slate AX) qualcommax/ipq60xx Bumblebee"
|
||||||
echo " mt3000 GL.iNet GL-MT3000 (Beryl AX) mediatek/filogic"
|
echo " mt3000 GL.iNet GL-MT3000 (Beryl AX) mediatek/filogic Bumblebee"
|
||||||
echo " mt6000 GL.iNet GL-MT6000 (Flint 2) mediatek/filogic"
|
echo " mt6000 GL.iNet GL-MT6000 (Flint 2) mediatek/filogic Bumblebee"
|
||||||
echo " ax6s Xiaomi Redmi AX6S mediatek/filogic"
|
echo " ax6s Xiaomi Redmi AX6S mediatek/filogic Bumblebee"
|
||||||
echo " ax53u Asus RT-AX53U ramips/mt7621"
|
echo " ax53u Asus RT-AX53U ramips/mt7621 Bumblebee"
|
||||||
echo " ar300m16 GL.iNet GL-AR300M16-EXT (16MB) ath79/generic"
|
echo " ar300m16 GL.iNet GL-AR300M16-EXT (16MB) ath79/generic Bee"
|
||||||
|
echo " wr3000 Cudy AX3000 (WR3000) mediatek/filogic Bee"
|
||||||
|
echo ""
|
||||||
|
echo "Roles:"
|
||||||
|
echo " Bumblebee L3 Gateway — full stack (yggdrasil, VPN, guest isolation, SQM, DoH)"
|
||||||
|
echo " Bee L2 Transport — minimal mesh relay (batman-adv, luci, heartbeat)"
|
||||||
echo ""
|
echo ""
|
||||||
echo "OpenWrt version: ${OPENWRT_VERSION} (override with OPENWRT_VERSION env var)"
|
echo "OpenWrt version: ${OPENWRT_VERSION} (override with OPENWRT_VERSION env var)"
|
||||||
echo ""
|
echo ""
|
||||||
@@ -146,18 +152,35 @@ download_builder() {
|
|||||||
build_firmware() {
|
build_firmware() {
|
||||||
local dir
|
local dir
|
||||||
dir="$(builder_dir)"
|
dir="$(builder_dir)"
|
||||||
local packages="${PACKAGES_FULL[*]} ${PACKAGES_EXTRA:-}"
|
|
||||||
|
# Select package list by role
|
||||||
|
local packages
|
||||||
|
if [ "$FIRMWARE_ROLE" = "bee" ]; then
|
||||||
|
packages="${PACKAGES_BEE[*]} ${PACKAGES_EXTRA:-}"
|
||||||
|
else
|
||||||
|
packages="${PACKAGES_BUMBLEBEE[*]} ${PACKAGES_EXTRA:-}"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Create temp FILES dir with role marker
|
||||||
|
local tmpfiles
|
||||||
|
tmpfiles=$(mktemp -d)
|
||||||
|
cp -a "${PROJECT_DIR}/files/"* "$tmpfiles/"
|
||||||
|
mkdir -p "$tmpfiles/etc/parahub"
|
||||||
|
echo "$FIRMWARE_ROLE" > "$tmpfiles/etc/parahub/role"
|
||||||
|
|
||||||
echo "Building firmware for profile: ${PROFILE}"
|
echo "Building firmware for profile: ${PROFILE}"
|
||||||
|
echo "Role: ${FIRMWARE_ROLE}"
|
||||||
echo "Packages: ${packages}"
|
echo "Packages: ${packages}"
|
||||||
echo "Custom files: ${PROJECT_DIR}/files"
|
echo "Custom files: ${tmpfiles}"
|
||||||
|
|
||||||
make -C "$dir" image \
|
make -C "$dir" image \
|
||||||
PROFILE="$PROFILE" \
|
PROFILE="$PROFILE" \
|
||||||
PACKAGES="$packages" \
|
PACKAGES="$packages" \
|
||||||
FILES="${PROJECT_DIR}/files" \
|
FILES="$tmpfiles" \
|
||||||
BIN_DIR="${PROJECT_DIR}/output"
|
BIN_DIR="${PROJECT_DIR}/output"
|
||||||
|
|
||||||
|
rm -rf "$tmpfiles"
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
echo "Build complete! Firmware images:"
|
echo "Build complete! Firmware images:"
|
||||||
ls -lh "${PROJECT_DIR}/output/"*.bin 2>/dev/null || true
|
ls -lh "${PROJECT_DIR}/output/"*.bin 2>/dev/null || true
|
||||||
@@ -183,6 +206,7 @@ fi
|
|||||||
|
|
||||||
echo "=== Parahub Mesh Firmware Builder ==="
|
echo "=== Parahub Mesh Firmware Builder ==="
|
||||||
echo "Device: ${INPUT}"
|
echo "Device: ${INPUT}"
|
||||||
|
echo "Role: ${FIRMWARE_ROLE}"
|
||||||
echo "OpenWrt: ${OPENWRT_VERSION}"
|
echo "OpenWrt: ${OPENWRT_VERSION}"
|
||||||
echo "Target: ${OPENWRT_TARGET}"
|
echo "Target: ${OPENWRT_TARGET}"
|
||||||
echo "Profile: ${PROFILE}"
|
echo "Profile: ${PROFILE}"
|
||||||
|
|||||||
Reference in New Issue
Block a user