mirror/openwrt
1
0
Fork 1
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2026-02-20 12:14:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

unetmsg: fix publish notification timing around remote auth

Browse source 
When a remote peer's publish registrations arrive via RX before the
local TX connection is authenticated, handle_publish fires but the
subscriber can't reach the remote publisher yet since the TX channel
isn't ready.

Suppress publish notifications on the RX side when no authenticated TX
channel exists for the remote host. After TX authentication completes,
re-trigger handle_publish only for topics that the specific peer
publishes and that have local subscribers.

Signed-off-by: John Crispin <john@phrozen.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
(cherry picked from commit 3efcf444a1)
This commit is contained in:
Felix Fietkau 2026-02-06 09:22:30 +00:00
parent 535403297e
commit ef79f65981
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package/network/services/unetmsg/files/usr/share/ucode/unetmsg/unetmsgd-remote.uc
View file

@ -93,6 +93,8 @@ function network_socket_handle_request(sock_data, req)
let host = sock_data.name;
let network = sock_data.network;
let args = { ...req.args, host, network };
let tx_chan = net.tx_channels[host];
let tx_auth = tx_chan && tx_chan.auth;
switch (msgtype) {
case "publish":
case "subscribe":
@ -102,7 +104,8 @@ function network_socket_handle_request(sock_data, req)
return;
if (args.enabled) {
if (list[name]) {
core.handle_publish(null, name);
if (tx_auth)
core.handle_publish(null, name);
return 0;
}
@ -121,7 +124,8 @@ function network_socket_handle_request(sock_data, req)
network: sock_data.network,
name: host,
}, pubsub_proto);
core.handle_publish(null, name);
if (tx_auth)
core.handle_publish(null, name);
list[name] = true;
} else {
if (!list[name])
@ -318,6 +322,11 @@ function network_open_channel(net, name, peer)
data: { name, enabled: true },
return: "ignore",
});
let rx_chan = net.rx_channels[name];
if (rx_chan)
for (let sub_name in rx_chan.publish)
core.handle_publish(null, sub_name);
};
let auth_cb = () => {
if (!sock_data.auth)