Merge 0b263bc766 into 3d08b0fee8

wgpeerselector: fix undefined variable peer
Signed-off-by: Florian Maurer <f.maurer@outlook.de>
2024-01-22 23:26:18 +01:00 · 2024-01-22 23:22:23 +01:00 · 2023-12-19 18:40:02 +01:00 · 2023-12-19 18:40:02 +01:00
3 changed files with 2 additions and 3 deletions
--- a/libs/libplatforminfo/src/targets/ar71xx-mikrotik.c
+++ b/libs/libplatforminfo/src/targets/ar71xx-mikrotik.c
@ -1 +0,0 @@
-template/nosysupgrade.c
--- a/libs/libplatforminfo/src/targets/brcm2708.c
+++ b/libs/libplatforminfo/src/targets/brcm2708.c
--- a/net/wgpeerselector/files/usr/bin/wgpeerselector
+++ b/net/wgpeerselector/files/usr/bin/wgpeerselector
@ -380,7 +380,7 @@ function WGPeerSelector:main()

 			if self:try_connect_to_peer(peer, timeout) then
 				connected_peer = peer
-				log(syslog.LOG_INFO, 'Connection established with '..peer.name..'.')
+				log(syslog.LOG_INFO, 'Connection established with '..connected_peer.name..'.')
 			end

 		elseif state == 'established' then
@ -388,8 +388,8 @@ function WGPeerSelector:main()

 			if not connected_peer:has_recent_handshake() then
 				connected_peer:uninstall_from_kernel()
+				log(syslog.LOG_INFO, 'Connection to '..connected_peer.name..' lost.')
 				connected_peer = nil
-				log(syslog.LOG_INFO, 'Connection to '..peer.name..' lost.')
 			else
 				-- check connections every 5 seconds
 				sleep(5)
Author	SHA1	Message	Date
lemoer	827569aaeb	Merge `0b263bc766` into `3d08b0fee8`	2024-01-22 23:26:18 +01:00
Florian Maurer	3d08b0fee8	wgpeerselector: fix undefined variable peer Signed-off-by: Florian Maurer <f.maurer@outlook.de>	2024-01-22 23:22:23 +01:00
Matthias Schiffer	53ea3b8977	libplatforminfo: update bcm27xx target name The RPi targets were renamed in OpenWrt 21.02 (Gluon 2022.1). As libplatforminfo was not adjusted, image names were using autodetected model names including a revision number again, requiring additional manifest aliases.	2023-12-19 18:40:02 +01:00
Matthias Schiffer	28a35ea2c9	libplatforminfo: drop obsolete ar71xx-mikrotik target The obsolete ar71xx-mikrotik.c was symlinked to template/nosysupgrade.c. As all new mikrotik targets have sysupgrade support, we can just remove the symlink and use the default handling of libplatforminfo. nosysupgrade.c becomes unused, but it left in the repository for future experimental targets without sysupgrade support.	2023-12-19 18:40:02 +01:00