gluon-respondd: fix missing section "wifi" for request type "neighbours" #2599
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The below mentioned commit introduced a regression, that the "wifi"
section of the request type "neighbours" was empty:
~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json
{
"wifi": [
],
...
}
After this commit, the section (correctly) looks like this:
root@UFU-FWH-A272-Tresckowstr-GemR-vorne:~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json
{
"wifi": {
"ca:38:7e:42:5f:21": {
"neighbours": {
"fe:9f:4d:01:ea:e1": {
"noise": -102,
"inactive": 50,
"signal": -84
},
"fe:df:b9:84:37:51": {
"noise": -102,
"inactive": 20,
"signal": -73
}
}
}
},
...
}
The issue was due to the fact, that the iteration over the (mesh) wifi interfaces
was broken. The code was assuming, that the section
config interface 'mesh_radio0'
option proto 'gluon_mesh'
in /etc/config/network contains an option "ifname", which it does not.
The ifname property is only stored in the corresponding section in
/etc/config/wireless:
config wifi-iface 'mesh_radio0'
option ifname 'mesh0'
option network 'mesh_radio0'
option mode 'mesh'
...
Therefore, we now iterate over wifi-ifaces in /etc/config/wireless, that
have the mode 'mesh' instead. This resolves the issue.
Fixes 0f1fa24
github-actions
bot
added
3. topic: package
lemoer
added
0. type: bugfix
|
This PR is not yet tested. |
|
This can be reviewed already. It only needs testing. |
|
This is now tested. It works well! 👍 |
JayBraker
pushed a commit
to JayBraker/gluon
that referenced
this pull request
Apr 12, 2023
…rs" (freifunk-gluon#2599) The below mentioned commit introduced a regression, that the "wifi" section of the request type "neighbours" was empty: ~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json { "wifi": [ ], ... } After this commit, the section (correctly) looks like this: root@UFU-FWH-A272-Tresckowstr-GemR-vorne:~# gluon-neighbour-info -d ::1 -r neighbours | ffh_pretty_json { "wifi": { "ca:38:7e:42:5f:21": { "neighbours": { "fe:9f:4d:01:ea:e1": { "noise": -102, "inactive": 50, "signal": -84 }, "fe:df:b9:84:37:51": { "noise": -102, "inactive": 20, "signal": -73 } } } }, ... } The issue was due to the fact, that the iteration over the (mesh) wifi interfaces was broken. The code was assuming, that the section config interface 'mesh_radio0' option proto 'gluon_mesh' in /etc/config/network contains an option "ifname", which it does not. The ifname property is only stored in the corresponding section in /etc/config/wireless: config wifi-iface 'mesh_radio0' option ifname 'mesh0' option network 'mesh_radio0' option mode 'mesh' ... Therefore, we now iterate over wifi-ifaces in /etc/config/wireless, that have the mode 'mesh' instead. This resolves the issue. Fixes 0f1fa24
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The below mentioned commit introduced a regression, that the "wifi"
section of the request type "neighbours" was empty:
After this commit, the section (correctly) looks like this:
The issue was due to the fact, that the iteration over the (mesh) wifi interfaces
was broken. The code was assuming, that the section
in /etc/config/network contains an option "ifname", which it does not.
The ifname property is only stored in the corresponding section in
/etc/config/wireless:
Therefore, we now iterate over wifi-ifaces in /etc/config/wireless, that
have the mode 'mesh' instead. This resolves the issue.
Fixes 0f1fa24