Skip to content

bmx7: add new package #30167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BKPepe wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bmx7: add new package #30167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
164 changes: 164 additions & 0 deletions net/bmx7/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,164 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=bmx7
PKG_VERSION:=2024.06.11
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/bmx-routing/bmx7.git
PKG_SOURCE_VERSION:=9020896f89006bc5d3487222eefc7ddea9e8b2bd
PKG_MIRROR_HASH:=a085904a48544d71ec815fa61c329925d89aca72a051941551290d292a6150d7

PKG_MAINTAINER:=Axel Neumann <axel@notmail.org>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=LICENSE

PKG_BUILD_PARALLEL:=1

include $(INCLUDE_DIR)/package.mk

TARGET_CFLAGS += $(FPIC)

MAKE_ARGS += EXTRA_CFLAGS="$(TARGET_CFLAGS) \
-I. \
-I$(STAGING_DIR)/usr/include \
-DCORE_LIMIT=20000 \
-DTRAFFIC_DUMP \
-DNO_TRACE_FUNCTION_CALLS \
-DBMX7_LIB_IWINFO" \
EXTRA_LDFLAGS="$(TARGET_LDFLAGS) \
-L$(STAGING_DIR)/usr/lib -liwinfo" \
CC="$(TARGET_CC)" \
INSTALL_DIR="$(PKG_INSTALL_DIR)" \
build_all

MAKE_PATH:=src

define Package/bmx7/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=Routing and Redirection
TITLE:=BMX7 layer 3 routing daemon
URL:=https://github.com/bmx-routing/bmx7
DEPENDS:=+zlib +libmbedtls +libiwinfo
endef

define Package/bmx7/description
BMX7 routing daemon supporting securely-entrusted IPv6 (and IPv4in6) routing
endef

define Package/bmx7
$(call Package/bmx7/Default)
MENU:=1
endef

define Package/bmx7-uci-config
$(call Package/bmx7/Default)
DEPENDS:=bmx7 +libuci
TITLE:=configuration plugin based on uci (recommended!)
endef

define Package/bmx7-iwinfo
$(call Package/bmx7/Default)
DEPENDS:=bmx7 +libiwinfo
TITLE:=link characteristics plugin via libiwinfo (recommended!)
endef

define Package/bmx7-topology
$(call Package/bmx7/Default)
DEPENDS:=bmx7
TITLE:=topology plugin
endef

define Package/bmx7-json
$(call Package/bmx7/Default)
DEPENDS:=bmx7 +libjson-c
TITLE:=json plugin based on json-c
endef

define Package/bmx7-sms
$(call Package/bmx7/Default)
DEPENDS:=bmx7
TITLE:=sms plugin
endef

define Package/bmx7-tun
$(call Package/bmx7/Default)
DEPENDS:=bmx7 +kmod-ip6-tunnel +kmod-iptunnel6 +kmod-tun
TITLE:=ipip-based tunnel plugin (recommended!)
endef

define Package/bmx7-table
$(call Package/bmx7/Default)
DEPENDS:=bmx7 +bmx7-tun
TITLE:=plugin to announce routes from tables via tunnels
endef

define Package/bmx7/install
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/bmx7 $(1)/usr/sbin/bmx7
endef

define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS)
endef
Comment on lines +104 to +106

@openwrt-ai openwrt-ai Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PKG_BUILD_PARALLEL:=1 on line 18 has no effect as written. This custom Build/Compile invokes $(MAKE) without $(PKG_JOBS) and without the + jobserver prefix, unlike Build/Compile/Default in package-defaults.mk:145, which passes both. PKG_JOBS in package.mk:24 is the variable that turns PKG_BUILD_PARALLEL into $(MAKE_J), so bmx7 is currently built serially and the flag is dead weight.

Suggested change
define Build/Compile
$(MAKE) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS)
endef
define Build/Compile
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) $(MAKE_ARGS)
endef

Generated by Claude Code


define Package/bmx7-uci-config/conffiles
/etc/config/bmx7
/etc/bmx7/

@openwrt-ai openwrt-ai Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correcting my own earlier comment, which this commit was written to address: the trailing slash is the right spelling per the project's conffiles rule, so keep the line — but the mechanism I described, and which 2cf6a71's message now records, does not hold. Two things I got wrong:

  1. The slash makes no difference to upgrade preservation here. /etc/bmx7 is not installed by Package/bmx7-uci-config/install — the recipe only creates /usr/lib, /etc/config and /etc/init.d. Because the path is absent from IDIR, the KEEP_ block in package-pack.mk:491-501 routes it to /lib/upgrade/keep.d/bmx7-uci-config instead of the package's Conffiles field, and list_static_conffiles in sysupgrade:165-171 then runs find over that path recursively. find /etc/bmx7 and find /etc/bmx7/ yield the same file list, so anything under the directory was already being backed up before this commit. That block is outside the CONFIG_USE_APK conditional, so it applies to both apk and ipk; the opkg-side resolver at ipkg-build:53 is a no-op for both spellings since the path does not exist in the package payload.

  2. The sample config does not point trustedNodesDir anywhere. files/etc/config/bmx7:7 has that option commented out, so the /etc/bmx7/trustedNodes path only comes into play if a user enables it. Both the commit body and my original comment state it as shipped configuration.

Nothing to change in the diff — but the commit body asserts a bug that was not there and a config default that does not exist, and it will outlive this PR in git log. Worth rewording it to what the change actually is (a conffiles formatting fix so the directory entry matches the documented convention), or dropping the commit into the parent one.

Generated by Claude Code

endef

define Package/bmx7-uci-config/install
$(INSTALL_DIR) $(1)/usr/lib $(1)/etc/config $(1)/etc/init.d
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_uci_config/bmx7_config.so \
$(1)/usr/lib/bmx7_config.so
$(INSTALL_BIN) ./files/etc/init.d/bmx7 $(1)/etc/init.d/bmx7
$(INSTALL_CONF) ./files/etc/config/bmx7 $(1)/etc/config/bmx7
endef

define Package/bmx7-iwinfo/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_iwinfo/bmx7_iwinfo.so \
$(1)/usr/lib/bmx7_iwinfo.so
endef

define Package/bmx7-topology/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_topology/bmx7_topology.so \
$(1)/usr/lib/bmx7_topology.so
endef

define Package/bmx7-json/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_json/bmx7_json.so \
$(1)/usr/lib/bmx7_json.so
endef

define Package/bmx7-sms/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_sms/bmx7_sms.so \
$(1)/usr/lib/bmx7_sms.so
endef

define Package/bmx7-tun/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_tun/bmx7_tun.so \
$(1)/usr/lib/bmx7_tun.so
endef

define Package/bmx7-table/install
$(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(MAKE_PATH)/lib/bmx7_table/bmx7_table.so \
$(1)/usr/lib/bmx7_table.so
endef

$(eval $(call BuildPackage,bmx7))
$(eval $(call BuildPackage,bmx7-uci-config))
$(eval $(call BuildPackage,bmx7-iwinfo))
$(eval $(call BuildPackage,bmx7-topology))
$(eval $(call BuildPackage,bmx7-json))
$(eval $(call BuildPackage,bmx7-sms))
$(eval $(call BuildPackage,bmx7-table))
$(eval $(call BuildPackage,bmx7-tun))
47 changes: 47 additions & 0 deletions net/bmx7/files/etc/config/bmx7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
# for more information:
# https://github.com/bmx-routing/bmx7/
# options execute: bmx7 --help

config 'bmx7' 'general'
# option 'runtimeDir' '/var/run/bmx7'
# option 'trustedNodesDir' '/etc/bmx7/trustedNodes'

#config 'plugin'
# option 'plugin' 'bmx7_config.so'

#config 'plugin'
# option 'plugin' 'bmx7_json.so'

#config 'plugin'
# option 'plugin' 'bmx7_sms.so'

#config 'plugin'
# option 'plugin' 'bmx7_iwinfo.so'

config 'dev' 'mesh_1'
option 'dev' 'br-lan'

config 'dev' 'mesh_2'
option 'dev' 'wlan0'

#config 'plugin'
# option 'plugin' 'bmx7_tun.so'

#config 'plugin'
# option 'plugin' 'bmx7_table.so'

#config 'tunDev' default
# option 'tunDev' 'default'
# option 'tun6Address' '2012:0:0:6666::1/64'
# option 'tun4Address' '10.66.66.1/24'


#config 'tunOut'
# option 'tunOut' 'ip6'
# option 'network' '2012::/16'
# option 'exportDistance' '0'

#config 'tunOut'
# option 'tunOut' 'ip4'
# option 'network' '10.0.0.0/9'
# option 'minPrefixLen' '27'
28 changes: 28 additions & 0 deletions net/bmx7/files/etc/init.d/bmx7
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
#!/bin/sh /etc/rc.common
START=91
USE_PROCD=1

BIN=/usr/sbin/bmx7
CONF=/etc/config/bmx7

start_service() {
cd /root/ || return
while pgrep -f mac80211.sh ; do sleep 1; done
Comment on lines +9 to +10

@openwrt-ai openwrt-ai Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

start_service() runs synchronously in the rc process, so this unbounded while loop stalls boot for as long as any mac80211.sh is running. There is no timeout and no iteration cap, so a wifi script that hangs blocks S91bmx7 — and everything ordered after it — indefinitely. pgrep's matched lines are also printed to the console on every pass, since the loop uses its output as the condition without redirecting it.

Is this wait still needed at all? If it is, a bounded retry count plus pgrep -f mac80211.sh >/dev/null would keep the failure mode contained.

Line 9 has a related sharp edge: cd /root/ || return aborts start_service silently when /root is absent, so the daemon never starts and nothing is logged. Since the cd only exists to place core dumps (matching limits core=20000 below), failing to change directory probably shouldn't prevent the service from running.

Generated by Claude Code


procd_open_instance "bmx7"
procd_set_param command "$BIN"
procd_append_param command -f "$CONF" -d0
procd_set_param limits core=20000
procd_set_param stdout 1
procd_set_param stderr 1
procd_set_param respawn
procd_close_instance
}

reload_service() {
"$BIN" -c configReload
}

service_triggers() {
procd_add_reload_trigger "bmx7"
}
Comment on lines +22 to +28

@openwrt-ai openwrt-ai Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: these two function bodies are indented with four spaces while start_service() above uses tabs. Optional, but since the file is new to this repo it may as well be consistent.

Suggested change
reload_service() {
"$BIN" -c configReload
}
service_triggers() {
procd_add_reload_trigger "bmx7"
}
reload_service() {
"$BIN" -c configReload
}
service_triggers() {
procd_add_reload_trigger "bmx7"
}

Generated by Claude Code

45 changes: 45 additions & 0 deletions net/bmx7/patches/020-siocgstamp.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Sun, 30 Aug 2020 14:09:17 -0700
Subject: [PATCH] fix compilation with uClibc-ng
Comment on lines +1 to +4

@BKPepe BKPepe Aug 6, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@neheb Can you please reach @axn to have this upstreamed or even in better way... Can you please submit pull request https://github.com/bmx-routing/bmx7/pulls ? :)


---

--- a/src/schedule.c
+++ b/src/schedule.c
@@ -376,7 +376,9 @@ loop4Event:
continue;
}

+#ifdef SIOCGSTAMP
ioctl(pb.i.iif->rx_mcast_sock, SIOCGSTAMP, &(pb.i.tv_stamp));
+#endif

rx_packet(&pb);

@@ -402,7 +404,9 @@ loop4Event:
continue;
}

+#ifdef SIOCGSTAMP
ioctl(pb.i.iif->rx_fullbrc_sock, SIOCGSTAMP, &(pb.i.tv_stamp));
+#endif

rx_packet(&pb);

@@ -452,10 +456,15 @@ loop4Event:
}
}
#endif
+#ifdef SIOCGSTAMP
if (tv_stamp == NULL)
ioctl(pb.i.iif->unicast_sock, SIOCGSTAMP, &(pb.i.tv_stamp));
else
timercpy(&(pb.i.tv_stamp), tv_stamp);
+#else
+ if (tv_stamp)
+ timercpy(&(pb.i.tv_stamp), tv_stamp);
+#endif

rx_packet(&pb);

24 changes: 24 additions & 0 deletions net/bmx7/test-version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#!/bin/sh

# shellcheck shell=busybox

case "$PKG_NAME" in
bmx7)
# The version of bmx7 is derived from the source date, which the
# binary does not report. `bmx7 -v` is not an alternative: the
# key path option is applied before the version option, so a
# missing node key gets generated first - "Creating RSA2048
# private key. This can take a while", as bmx7 puts it.
Comment on lines +8 to +11

@openwrt-ai openwrt-ai Aug 6, 2026

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: series hygiene — this is the third commit in the PR that only fixes something introduced by 6da310e ("add new package"), alongside 2cf6a71 (conffiles) and c5f15e0 (parallel build). Here the entire change is rewording a comment that the first commit added hours earlier.

Since bmx7 does not exist in this repo yet, there is no intermediate state worth preserving in history — the fixups only record that the first draft was wrong. Squashing all four into a single bmx7: add new package commit would leave a cleaner import, and would also drop the Reported-by: openwrt-ai[bot] trailers, which point at review comments rather than a reporter.

Not blocking, and up to you if you prefer keeping the audit trail while the PR is open.

Generated by Claude Code

exit 0
;;

bmx7-*)
# Plugins are libraries and do not provide version information
exit 0
;;

*)
echo "Untested package: $PKG_NAME" >&2
exit 1
;;
esac