Bump version to 0.18

makeding · makeding · commit af93fa3b00c0 · 2026-03-23T23:33:13.000+09:00
implement Uplink Client ID Fix feature
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=luci-app-fleth
 LUCI_TITLE:=LuCI Support for Flet'h
 LUCI_DESCRIPTION:=luci-app-fleth is a helper that can configure IPv4 over IPv6 tunnel automatically in Japan.
-PKG_VERSION:=0.17
+PKG_VERSION:=0.18
 PKG_RELEASE:=1
 
 LUCI_PKGARCH:=all
diff --git a/htdocs/luci-static/resources/view/fleth.js b/htdocs/luci-static/resources/view/fleth.js
@@ -9,7 +9,7 @@
 // fix css paading (kusa
 const fleth_style = document.createElement("style");
 fleth_style.innerHTML = `
-  .cbi-value-field { padding-top: 6px; }
+  .cbi-value-title { padding-top: 6px !important; }
   .port-highlight {
     background-color: rgb(207, 226, 255);
     padding: 1px 4px;
@@ -103,6 +103,7 @@ return view.extend({
 
   render: async function (data) {
     let m, s, o;
+    let wan6FixMode;
 
     // Show notification for pending service status (fiber construction completed but ISP setup not ready)
     if (data.isPending) {
@@ -339,6 +340,30 @@ return view.extend({
       return this.setupIPv6PD(m);
     }, this, m);
 
+    // Uplink Client ID Fix section in Tools tab
+    o = s.taboption("tools", form.DummyValue, "_wan6_clientid_fix_desc");
+    o.title = _("Uplink Client ID Fix");
+    o.cfgvalue = function () {
+      return _("OpenWrt 25.10 and later dynamically generates the Default DUID. Because the format does not meet NGN requirements, IPv6 address assignment will fail. Choose one of the following fixes (either one is sufficient).");
+    };
+
+    wan6FixMode = s.taboption("tools", form.ListValue, "_wan6_clientid_fix_mode", _("Choose Fix"));
+    wan6FixMode.value("clear_duid", _("Clear DHCPv6 DUID"));
+    wan6FixMode.value("set_clientid", _("Set Uplink Client ID (00030001 + Interface MAC)"));
+    wan6FixMode.default = "clear_duid";
+    wan6FixMode.write = function () {};
+
+    o = s.taboption("tools", form.Button, "_apply_wan6_clientid_fix");
+    o.title = "&#160;";
+    o.inputtitle = _("Apply Selected Fix");
+    o.inputstyle = "cbi-button-apply";
+    o.onclick = L.bind(function (m) {
+      const mode = wan6FixMode.formvalue("global") || "clear_duid";
+      const command = mode === "set_clientid" ? "set_wan6_clientid" : "clear_dhcp6c_duid";
+      const busyText = mode === "set_clientid" ? _("Setting Uplink Client ID...") : _("Clearing DHCPv6 DUID...");
+      return this.applyWan6ClientIdFix(m, command, busyText);
+    }, this, m);
+
     // map.sh Management section in Tools tab
     o = s.taboption("tools", form.DummyValue, "_mapsh_description");
     o.title = _("map.sh Management");
@@ -464,6 +489,41 @@ return view.extend({
     return this.setupIPv6Config(mapObj, 'pd');
   },
 
+  applyWan6ClientIdFix: function (mapObj, command, busyText) {
+    return new Promise(function (resolve, reject) {
+      mapObj.save()
+        .then(function () {
+          ui.showModal(_('Applying Fix'), [
+            E('p', { 'class': 'spinning' }, busyText)
+          ]);
+
+          return fs.exec('/usr/sbin/fleth', [command]);
+        })
+        .then(function (result) {
+          ui.hideModal();
+
+          if (result.code === 0 && result.stdout.trim() === 'SUCCESS') {
+            ui.addNotification(null, E('p', _('Fix applied successfully. Uplink has been restarted.')), 'info');
+          } else {
+            ui.addNotification(null, E('div', [
+              E('p', _('Failed to apply fix:')),
+              E('pre', result.stdout || result.stderr || 'Unknown error')
+            ]), 'error');
+          }
+
+          resolve();
+        })
+        .catch(function (error) {
+          ui.hideModal();
+          ui.addNotification(null, E('div', [
+            E('p', _('Error applying fix:')),
+            E('pre', error.message || error)
+          ]), 'error');
+          reject(error);
+        });
+    });
+  },
+
   manageMapSh: function (mapObj, action) {
     const actionConfig = {
       patch: { verb: _('Patching'), gerund: _('Downloading...') },
@@ -518,4 +578,4 @@ return view.extend({
   restoreMapSh: function (mapObj) {
     return this.manageMapSh(mapObj, 'restore');
   },
-});
+});
diff --git a/po/ja/fleth.po b/po/ja/fleth.po
@@ -201,6 +201,42 @@ msgstr "パッチする"
 msgid "Restore"
 msgstr "復元"
 
+msgid "Uplink Client ID Fix"
+msgstr "アップリンク クライアントID 修正"
+
+msgid "OpenWrt 25.10 and later dynamically generates the Default DUID. Because the format does not meet NGN requirements, IPv6 address assignment will fail. Choose one of the following fixes (either one is sufficient)."
+msgstr "OpenWrt 25.10 以降では Default DUID が動的に生成されます。形式が NGN の要件を満たさないため IPv6 アドレスの取得に失敗します。以下のいずれかの修正を選択してください（どちらか一方で十分です）。"
+
+msgid "Choose Fix"
+msgstr "修正方法を選択"
+
+msgid "Clear DHCPv6 DUID"
+msgstr "DHCPv6 DUID を削除"
+
+msgid "Set Uplink Client ID (00030001 + Interface MAC)"
+msgstr "アップリンク クライアントID を設定 (00030001 + インターフェース MAC)"
+
+msgid "Apply Selected Fix"
+msgstr "選択した修正を適用"
+
+msgid "Applying Fix"
+msgstr "修正を適用中"
+
+msgid "Clearing DHCPv6 DUID..."
+msgstr "DHCPv6 DUID を削除中..."
+
+msgid "Setting Uplink Client ID..."
+msgstr "アップリンク クライアントID を設定中..."
+
+msgid "Fix applied successfully. Uplink has been restarted."
+msgstr "修正が適用されました。アップリンクを再起動しました。"
+
+msgid "Failed to apply fix:"
+msgstr "修正の適用に失敗しました:"
+
+msgid "Error applying fix:"
+msgstr "修正の適用中にエラー:"
+
 msgid "Patching"
 msgstr "パッチ中"
 
diff --git a/po/zh_Hans/fleth.po b/po/zh_Hans/fleth.po
@@ -201,6 +201,42 @@ msgstr "修补"
 msgid "Restore"
 msgstr "恢复"
 
+msgid "Uplink Client ID Fix"
+msgstr "Uplink Client ID 修复"
+
+msgid "OpenWrt 25.10 and later dynamically generates the Default DUID. Because the format does not meet NGN requirements, IPv6 address assignment will fail. Choose one of the following fixes (either one is sufficient)."
+msgstr "在 OpenWrt 25.10 及以后，会动态生成 Default DUID。由于格式不符合 NGN 要求，将无法获取 IPv6 地址。请选择以下任一修复方案（任选其一即可）。"
+
+msgid "Choose Fix"
+msgstr "选择修复方案"
+
+msgid "Clear DHCPv6 DUID"
+msgstr "清除 DHCPv6 DUID"
+
+msgid "Set Uplink Client ID (00030001 + Interface MAC)"
+msgstr "设置 Uplink Client ID（00030001 + 接口 MAC）"
+
+msgid "Apply Selected Fix"
+msgstr "应用所选修复"
+
+msgid "Applying Fix"
+msgstr "正在应用修复"
+
+msgid "Clearing DHCPv6 DUID..."
+msgstr "正在清除 DHCPv6 DUID..."
+
+msgid "Setting Uplink Client ID..."
+msgstr "正在设置 Uplink Client ID..."
+
+msgid "Fix applied successfully. Uplink has been restarted."
+msgstr "修复已应用。Uplink 已重新启动。"
+
+msgid "Failed to apply fix:"
+msgstr "应用修复失败："
+
+msgid "Error applying fix:"
+msgstr "应用修复时出错："
+
 msgid "Patching"
 msgstr "修补中"
 
diff --git a/po/zh_Hant/fleth.po b/po/zh_Hant/fleth.po
@@ -201,6 +201,42 @@ msgstr "修補"
 msgid "Restore"
 msgstr "恢復"
 
+msgid "Uplink Client ID Fix"
+msgstr "Uplink Client ID 修復"
+
+msgid "OpenWrt 25.10 and later dynamically generates the Default DUID. Because the format does not meet NGN requirements, IPv6 address assignment will fail. Choose one of the following fixes (either one is sufficient)."
+msgstr "在 OpenWrt 25.10 及以後，會動態生成 Default DUID，由於格式不滿足 NGN 要求將導致拿不到 IPv6 地址，請選擇以下任一修復方案（任選其一即可）。"
+
+msgid "Choose Fix"
+msgstr "選擇修復方案"
+
+msgid "Clear DHCPv6 DUID"
+msgstr "清除 DHCPv6 DUID"
+
+msgid "Set Uplink Client ID (00030001 + Interface MAC)"
+msgstr "設定 Uplink Client ID（00030001 + 介面 MAC）"
+
+msgid "Apply Selected Fix"
+msgstr "套用所選修復"
+
+msgid "Applying Fix"
+msgstr "正在套用修復"
+
+msgid "Clearing DHCPv6 DUID..."
+msgstr "正在清除 DHCPv6 DUID..."
+
+msgid "Setting Uplink Client ID..."
+msgstr "正在設定 Uplink Client ID..."
+
+msgid "Fix applied successfully. Uplink has been restarted."
+msgstr "修復已套用。Uplink 已重新啟動。"
+
+msgid "Failed to apply fix:"
+msgstr "套用修復失敗："
+
+msgid "Error applying fix:"
+msgstr "套用修復時出錯："
+
 msgid "Patching"
 msgstr "修補中"
 
diff --git a/root/etc/uci-defaults/luci-app-fleth b/root/etc/uci-defaults/luci-app-fleth
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-chmod +x /usr/sbin/fleth /etc/init.d/fleth /etc/hotplug.d/iface/70-fleth
+chmod +x /usr/sbin/fleth /etc/init.d/fleth /lib/netifd/proto/ipip6h.sh
 
 if [ ! -f /etc/config/fleth ]; then
     cat <<EOF > /etc/config/fleth
@@ -28,5 +28,4 @@ else
         uci commit fleth
     fi
 fi
-fleth hook_none.js
 exit 0
diff --git a/root/usr/sbin/fleth b/root/usr/sbin/fleth
@@ -178,6 +178,49 @@ get_uplink_prefix_length() {
     fi
 }
 
+get_uplink_device() {
+    local status
+    local dev=""
+
+    status=$(ifstatus ${h_UPLINK_INTERFACE} 2>/dev/null)
+    if [ -n "$status" ]; then
+        dev=$(echo "$status" | jsonfilter -e '@.l3_device' 2>/dev/null)
+        if [ -z "$dev" ]; then
+            dev=$(echo "$status" | jsonfilter -e '@.device' 2>/dev/null)
+        fi
+    fi
+
+    if [ -z "$dev" ]; then
+        dev=$(uci get network.${h_UPLINK_INTERFACE}.device 2>/dev/null)
+    fi
+    if [ -z "$dev" ]; then
+        dev=$(uci get network.${h_UPLINK_INTERFACE}.ifname 2>/dev/null)
+    fi
+
+    echo "$dev"
+}
+
+get_device_mac() {
+    local dev="$1"
+    local mac=""
+
+    if [ -z "$dev" ]; then
+        return 1
+    fi
+
+    mac=$(cat /sys/class/net/$dev/address 2>/dev/null)
+    if [ -n "$mac" ]; then
+        echo "$mac" | tr -d ':' | tr '[:lower:]' '[:upper:]'
+    fi
+}
+
+restart_uplink_interface() {
+    logger -t fleth "Restarting ${h_UPLINK_INTERFACE} interface"
+    ifdown ${h_UPLINK_INTERFACE} >/dev/null 2>&1
+    sleep 2
+    ifup ${h_UPLINK_INTERFACE} >/dev/null 2>&1
+}
+
 check_prefix_alignment() {
     # Check if IPv6 prefix is aligned for MAP-E/IPIP6 usage
     # Skips /56 (ISP-assigned, always aligned) and /64 (SLAAC mode)
@@ -595,6 +638,39 @@ EOF
     /etc/init.d/odhcpd restart
 
     logger -t fleth "IPv6 PD configuration completed successfully"
+    echo "SUCCESS"
+elif [ "$1" = "clear_dhcp6c_duid" ]; then
+    logger -t fleth "Clearing DHCPv6 default DUID (network.globals.dhcp_default_duid)"
+
+    uci -q delete network.globals.dhcp_default_duid
+    uci commit network
+
+    restart_uplink_interface
+
+    logger -t fleth "DHCPv6 default DUID cleared and ${h_UPLINK_INTERFACE} restarted"
+    echo "SUCCESS"
+elif [ "$1" = "set_wan6_clientid" ]; then
+    logger -t fleth "Setting uplink client ID for ${h_UPLINK_INTERFACE}"
+
+    uplink_dev=$(get_uplink_device)
+    if [ -z "$uplink_dev" ]; then
+        echo "ERROR: Unable to determine uplink device"
+        exit 1
+    fi
+
+    uplink_mac=$(get_device_mac "$uplink_dev")
+    if [ -z "$uplink_mac" ]; then
+        echo "ERROR: Unable to read MAC address for $uplink_dev"
+        exit 1
+    fi
+
+    clientid="00030001${uplink_mac}"
+    uci set network.${h_UPLINK_INTERFACE}.clientid="$clientid"
+    uci commit network
+
+    logger -t fleth "Set ${h_UPLINK_INTERFACE} clientid to $clientid (device: $uplink_dev)"
+    restart_uplink_interface
+
     echo "SUCCESS"
 elif [ "$1" = "patch_map.sh" ]; then
     MAPSH_URL="https://raw.githubusercontent.com/fakemanhk/openwrt-jp-ipoe/345b1d9add58cf84c3eebe235f695607a78ebcd9/map.sh.new"
@@ -675,6 +751,8 @@ else
     echo "  auto_setup_ipv6       Auto-detect prefix and configure PD (/56) or SLAAC (/64) mode."
     echo "  setup_ipv6_slaac      Configure IPv6 SLAAC for NEXT(1Gbps) without Hikari Denwa (/64)."
     echo "  setup_ipv6_pd         Configure IPv6 PD for CROSS(10Gbps) or with Hikari Denwa (/56)."
+    echo "  clear_dhcp6c_duid     Clear DHCPv6 DUID files and restart uplink."
+    echo "  set_wan6_clientid     Set uplink client ID to 00030001\$MAC and restart uplink."
     echo ""
     echo "File Patches:"
     echo "  patch_map.sh          Patch map.sh with fixed version (backup created if not exists)."
