summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Pueyo Centelles <roger.pueyo@guifi.net>2023-02-26 17:18:19 +0100
committerRoger Pueyo Centelles <roger.pueyo@guifi.net>2023-03-08 22:19:17 +0100
commitb1882bc9a4236aefcc460293767c4e7141e5f898 (patch)
treede843b5c49fe3dd2894aadade7feadf4c56283c3
parent258826e83a18046ec9cd78e6d6abb34c784bc3c2 (diff)
bird1: fix "Form token mismatch" errors in luci-app-bird1-ipv{4,6}
The "Filters", "Functions" and "Status" sections of the web interfaces for both Bird4 and Bird6 threw the following error upon performing any action: Form token mismatch The submitted security token is invalid or already expired! Changing their entry types from "cbi" to "form" fixes them. Fixes #922. Signed-off-by: Roger Pueyo Centelles <roger.pueyo@guifi.net> (cherry picked from commit c37fbab8f5e3af0843cf1bef5aa199a0c0db245b)
-rw-r--r--bird1-openwrt/Makefile2
-rw-r--r--bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua6
-rw-r--r--bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua6
3 files changed, 7 insertions, 7 deletions
diff --git a/bird1-openwrt/Makefile b/bird1-openwrt/Makefile
index c04919f..1c8d58e 100644
--- a/bird1-openwrt/Makefile
+++ b/bird1-openwrt/Makefile
@@ -16,7 +16,7 @@ PKG_NAME := $(BIRD1_PKG)-openwrt
PKG_IPV4_NAME := $(BIRD1_IPV4_PKG)-openwrt
PKG_IPV6_NAME := $(BIRD1_IPV6_PKG)-openwrt
PKG_VERSION := 0.3
-PKG_RELEASE := 4
+PKG_RELEASE := 5
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_LICENSE := GPL-3.0-or-later
diff --git a/bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua b/bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua
index d12803a..07d0dd2 100644
--- a/bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua
+++ b/bird1-openwrt/bird1-ipv4-openwrt/src/controller/bird4.lua
@@ -23,7 +23,7 @@ function index()
_("Bird4"), 0)
entry({"admin", "network", "bird4", "status"},
- cbi("bird4/status"),
+ form("bird4/status"),
_("Status"), 0).leaf = true
entry({"admin","network","bird4","log"},
@@ -43,10 +43,10 @@ function index()
_("BGP Protocol"), 4).leaf = true
entry({"admin","network","bird4","filters"},
- cbi("bird4/filters"),
+ form("bird4/filters"),
_("Filters"), 5).leaf = true
entry({"admin","network","bird4","functions"},
- cbi("bird4/functions"),
+ form("bird4/functions"),
_("Functions"), 6).leaf = true
end
diff --git a/bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua b/bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua
index e8ad175..d955e1f 100644
--- a/bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua
+++ b/bird1-openwrt/bird1-ipv6-openwrt/src/controller/bird6.lua
@@ -23,7 +23,7 @@ function index()
_("Bird6"), 0)
entry({"admin", "network", "bird6", "status"},
- cbi("bird6/status"),
+ form("bird6/status"),
_("Status"), 0).leaf = true
entry({"admin","network","bird6","log"},
@@ -43,10 +43,10 @@ function index()
_("BGP Protocol"), 4).leaf = true
entry({"admin","network","bird6","filters"},
- cbi("bird6/filters"),
+ form("bird6/filters"),
_("Filters"), 5).leaf = true
entry({"admin","network","bird6","functions"},
- cbi("bird6/functions"),
+ form("bird6/functions"),
_("Functions"), 6).leaf = true
end