Issue 120 #413
Merged
Issue 120 #413
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
|
It looks like this change should still merge cleanly against master. I think it is ready to be. |
jheretic
added a commit
that referenced
this pull request
Mar 10, 2015
Issue 120. Tested by @jheretic. Works, but room for future improvements.
This was referenced Mar 10, 2015
Open
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.
This resolves Issue #120 in an OLSR specific way. If you add an ethernet device as a mesh interface, the IP will be added with a ", " to the existing mesh IP, or just be displayed if there isn't one.
You can test by building an image with this branch, or just copying 'luasrc/view/themes/commotion/header.htm' from this branch to '/usr/lib/lua/luci/view/themes/commotion/header.htm' of a running node that is configured to mesh over ethernet.
The reason that this is OLSR specific is that 'uci show network' only knows that that the ethernet interface is set to 'static' and there are many configurations where that is the case and the interface will not be meshing. OLSR however knows what interfaces it is meshing on.
Since we are currently only support OLSR this should be okay for now.
However it raises a larger UI question of whether we should just be showing the WAN IP, and figuring out a protocol agnostic way to determine if it is a mesh interface. I suspect that commotiond might be the place to look for, or write such a thing.