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>
2026-02-05 20:21:06 +00:00
parent dde37c7a7b
commit 968f90611e
3 changed files with 286 additions and 89 deletions
--- a/files/etc/uci-defaults/99-parahub-mesh
+++ b/files/etc/uci-defaults/99-parahub-mesh
@@ -2,9 +2,16 @@
 # Parahub Mesh Node — Zero-Touch First Boot Configuration
 # 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.
+#
+# Roles:
+#   bumblebee (L3 Gateway) — full stack: yggdrasil, GRE6, VPN, guest isolation, SQM, DoH
+#   bee (L2 Transport)     — minimal: batman-adv mesh relay, heartbeat

 set -e

+# Read firmware role (written by build.sh)
+ROLE=$(cat /etc/parahub/role 2>/dev/null || echo "bumblebee")
+
 # ============================================================================
 # 1. IDENTITY GENERATION
 # ============================================================================
@@ -55,6 +62,7 @@ mkdir -p /etc/parahub
 cat > /etc/parahub/keys <<KEYS_EOF
 # Parahub Mesh Node Keys — Generated at first boot
 # Node: ${HOSTNAME}
+# Role: ${ROLE}
 # Date: $(date -u +%Y-%m-%dT%H:%M:%SZ)
 PRIVATE_WIFI_KEY=${PRIVATE_KEY}
 MESH_SAE_KEY=${MESH_KEY}
@@ -69,8 +77,9 @@ chmod 600 /etc/parahub/keys
 # 4. NETWORK CONFIGURATION
 # ============================================================================

-# Clean existing network config (preserve wan)
-uci batch <<-NET_EOF
+if [ "$ROLE" = "bee" ]; then
+    # --- Bee: minimal network (bat0 gw_mode=client, no GRE6, no guest, no policy routing) ---
+    uci batch <<-NET_EOF
 # --- loopback ---
 set network.loopback=interface
 set network.loopback.device='lo'
@@ -78,14 +87,65 @@ set network.loopback.proto='static'
 set network.loopback.ipaddr='127.0.0.1'
 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.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='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.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].priority='100'
 NET_EOF
+fi
+
 uci commit network

 # ============================================================================
@@ -202,9 +264,20 @@ set wireless.mesh_2g.key='${MESH_KEY}'
 set wireless.mesh_2g.network='bat0_hardif_mesh0'
 WIFI_2G_MESH

-    # Public AP on 2.4GHz (better range) — OWE transition mode
-    # Devices that support OWE get encrypted; legacy devices fall back to open
-    uci batch <<-WIFI_2G_PUB
+    if [ "$ROLE" = "bee" ]; then
+        # 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
 set wireless.public_2g=wifi-iface
 set wireless.public_2g.device='${RADIO_2G}'
 set wireless.public_2g.mode='ap'
@@ -214,6 +287,7 @@ set wireless.public_2g.owe_transition='1'
 set wireless.public_2g.isolate='1'
 set wireless.public_2g.network='guest'
 WIFI_2G_PUB
+    fi
 fi

 # --- 5GHz radio: mesh backhaul + Private AP ---
@@ -254,7 +328,52 @@ while uci -q delete firewall.@forwarding[0]; do :; done
 while uci -q delete firewall.@rule[0]; do :; done
 while uci -q delete firewall.@redirect[0]; do :; done

-uci batch <<-FW_EOF
+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
 # --- Zone: lan (private network) ---
 add firewall zone
 set firewall.@zone[-1].name='lan'
@@ -363,6 +482,8 @@ set firewall.@rule[-1].proto='icmp'
 set firewall.@rule[-1].icmp_type='echo-request'
 set firewall.@rule[-1].target='ACCEPT'
 FW_EOF
+fi
+
 uci commit firewall

 # ============================================================================
@@ -373,7 +494,18 @@ uci commit firewall
 uci -q delete dhcp.lan 2>/dev/null || true
 uci -q delete dhcp.guest 2>/dev/null || true

-uci batch <<-DHCP_EOF
+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
 # --- Private DHCP ---
 set dhcp.private=dhcp
 set dhcp.private.interface='private'
@@ -388,16 +520,16 @@ set dhcp.guest.start='100'
 set dhcp.guest.limit='50'
 set dhcp.guest.leasetime='1h'
 DHCP_EOF
+fi
+
 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)
-# SQM watches the interface name from the network config
-
-uci batch <<-SQM_EOF
+if [ "$ROLE" != "bee" ]; then
+    uci batch <<-SQM_EOF
 set sqm.guest=queue
 set sqm.guest.enabled='1'
 set sqm.guest.interface='br-guest'
@@ -408,15 +540,15 @@ set sqm.guest.script='piece_of_cake.qos'
 set sqm.guest.linklayer='ethernet'
 set sqm.guest.overhead='44'
 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
-# Guest DNS is hijacked via firewall redirect to this resolver
-uci batch <<-DOH_EOF
+if [ "$ROLE" != "bee" ]; then
+    uci batch <<-DOH_EOF
 set https-dns-proxy.main=main
 set https-dns-proxy.main.doh_paramters='-4'
 set https-dns-proxy.main.listen_addr='0.0.0.0'
@@ -427,16 +559,17 @@ set https-dns-proxy.cloudflare.resolver_url='https://1.1.1.1/dns-query'
 set https-dns-proxy.cloudflare.listen_addr='127.0.0.1'
 set https-dns-proxy.cloudflare.listen_port='5053'
 DOH_EOF
-uci commit https-dns-proxy
+    uci commit https-dns-proxy

-# Configure dnsmasq to use DoH for upstream
-uci -q delete dhcp.@dnsmasq[0].server 2>/dev/null || true
-uci add_list dhcp.@dnsmasq[0].server='127.0.0.1#5053'
-uci set dhcp.@dnsmasq[0].noresolv='1'
-uci commit dhcp
+    # Configure dnsmasq to use DoH for upstream
+    uci -q delete dhcp.@dnsmasq[0].server 2>/dev/null || true
+    uci add_list dhcp.@dnsmasq[0].server='127.0.0.1#5053'
+    uci set dhcp.@dnsmasq[0].noresolv='1'
+    uci commit dhcp

-# Enable https-dns-proxy service
-/etc/init.d/https-dns-proxy enable 2>/dev/null || true
+    # Enable https-dns-proxy service
+    /etc/init.d/https-dns-proxy enable 2>/dev/null || true
+fi

 # ============================================================================
 # 10. SYSTEM SETTINGS
@@ -453,33 +586,37 @@ SYS_EOF
 uci commit system

 # ============================================================================
-# 11. YGGDRASIL OVERLAY NETWORK
+# 11. YGGDRASIL OVERLAY NETWORK (Bumblebee only)
 # ============================================================================

-# Generate unique keys for this node
-yggdrasil -genconf | sed 's/IfName: .*/IfName: ygg0/' > /etc/yggdrasil.conf
+if [ "$ROLE" != "bee" ]; then
+    # Generate unique keys for this node
+    yggdrasil -genconf | sed 's/IfName: .*/IfName: ygg0/' > /etc/yggdrasil.conf

-# Add VPS gateway as static Yggdrasil peer (for GRE6 tunnel)
-sed -i 's|Peers: \[\]|Peers: ["tls://91.98.123.238:443"]|' /etc/yggdrasil.conf
+    # Add VPS gateway as static Yggdrasil peer (for GRE6 tunnel)
+    sed -i 's|Peers: \[\]|Peers: ["tls://91.98.123.238:443"]|' /etc/yggdrasil.conf

-# UCI network interface for yggdrasil TUN
-uci batch <<-YGG_EOF
+    # UCI network interface for yggdrasil TUN
+    uci batch <<-YGG_EOF
 set network.yggdrasil=interface
 set network.yggdrasil.device='ygg0'
 set network.yggdrasil.proto='none'
 YGG_EOF
-uci commit network
+    uci commit network

-# Add yggdrasil to LAN zone (mesh nodes trust each other)
-uci add_list firewall.@zone[0].network='yggdrasil'
-uci commit firewall
+    # Add yggdrasil to LAN zone (mesh nodes trust each other)
+    uci add_list firewall.@zone[0].network='yggdrasil'
+    uci commit firewall

-# Enable yggdrasil service
-/etc/init.d/yggdrasil enable
+    # Enable yggdrasil service
+    /etc/init.d/yggdrasil enable

-# Save yggdrasil address to node keys file
-YGG_ADDR=$(yggdrasil -address -useconffile /etc/yggdrasil.conf 2>/dev/null || echo "unknown")
-echo "YGGDRASIL_ADDRESS=${YGG_ADDR}" >> /etc/parahub/keys
+    # Save yggdrasil address to node keys file
+    YGG_ADDR=$(yggdrasil -address -useconffile /etc/yggdrasil.conf 2>/dev/null || echo "unknown")
+    echo "YGGDRASIL_ADDRESS=${YGG_ADDR}" >> /etc/parahub/keys
+else
+    YGG_ADDR="none"
+fi

 # ============================================================================
 # 12. HEARTBEAT (phone-home to Parahub cloud)
@@ -496,13 +633,21 @@ echo "*/5 * * * * /usr/bin/parahub-heartbeat" >> /etc/crontabs/root
 # ============================================================================

 # 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 "Role: ${ROLE}"
 logger -t parahub-mesh "Private: ${PRIVATE_SSID} @ ${PRIV_IP}/24"
-logger -t parahub-mesh "Guest: ${PUBLIC_SSID} @ ${GUEST_IP}/24"
-logger -t parahub-mesh "Mesh ID: ${MESH_ID}"
-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 "Kill switch: guest→vpn_tunnel only (no wan)"
+
+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 "Mesh ID: ${MESH_ID}"
+    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 "Kill switch: guest→vpn_tunnel only (no wan)"
+    logger -t parahub-mesh "bat0 gw_mode: server (gateway for Bee nodes)"
+fi

 exit 0