summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndi Bräu <andibraeu@users.noreply.github.com>2023-12-21 22:48:59 +0100
committerPaul Donald <newtwen@gmail.com>2023-12-21 21:49:36 +0000
commit31e0a847e1d54d4f8839ddbabb844d8be76287f3 (patch)
tree467a95b25d0063ec9f8d9d0f157cd77c60313e57
parent6acefbc57519fd887e4402d8656473849be30cf5 (diff)
luci-app-olsr: fix null pointer exception (#6778)
for some 'virtual' interfaces, there don't seem to be network status information Signed-off-by: Andreas Bräu <ab@andi95.de> (cherry picked from commit 87da3275eaf7a388e77ad137e09b3bf6d3cf97f3)
-rw-r--r--applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js8
1 files changed, 4 insertions, 4 deletions
diff --git a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js
index 694e0a8eb8..8feabb32cd 100644
--- a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js
+++ b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/neighbors.js
@@ -198,13 +198,13 @@ return view.extend({
}
}
var hosthints = await network.getHostHints();
- var interfac = await network.getStatusByAddress(v.localIP);
+ var networkStatus = await network.getStatusByAddress(v.localIP);
var lmac = await hosthints.getMACAddrByIPAddr(v.localIP);
var rmac = await hosthints.getMACAddrByIPAddr(v.remoteIP);
for (let i = 0; i < assoclist.length; i++) {
var val = assoclist[i];
- if (val.network === interfac.interface && val.list) {
+ if (networkStatus != undefined && val.network === networkStatus.interface && val.list) {
for (var assocmac in val.list) {
var assot = val.list[assocmac];
if (rmac == assot.mac) {
@@ -216,8 +216,8 @@ return view.extend({
}
}
- if (interfac) {
- v.interface = interfac;
+ if (networkStatus) {
+ v.interface = networkStatus;
}
v.snr = snr || null;
v.signal = signal || null;