From 74cbd2939ccfbc8b5e9c5fe9fbad7c708efb6aae Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 1 May 2016 14:12:23 +0200 Subject: [PATCH] gluon-mesh-batman-adv-core: move config not specific to batman-adv to gluon-core --- .../luasrc/lib/gluon/upgrade/200-wireless | 205 ++++++++++++++++-- .../lib/gluon/upgrade/210-interface-wan | 17 ++ .../lib/gluon/upgrade/220-interface-lan} | 2 - .../luasrc/lib/lua/gluon/network.lua | 0 .../320-gluon-mesh-batman-adv-core-wireless | 159 -------------- ...330-gluon-mesh-batman-adv-core-mesh-on-wan | 19 -- ...sh => 350-gluon-mesh-batman-adv-core-mesh} | 0 .../350-gluon-mesh-batman-adv-core-rssid | 13 -- ...-gluon-mesh-batman-adv-core-mac-addresses} | 4 +- 9 files changed, 202 insertions(+), 217 deletions(-) create mode 100755 package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan rename package/{gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan => gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan} (93%) rename package/{gluon-mesh-batman-adv-core => gluon-core}/luasrc/lib/lua/gluon/network.lua (100%) delete mode 100755 package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless delete mode 100755 package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan rename package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/{310-gluon-mesh-batman-adv-core-mesh => 350-gluon-mesh-batman-adv-core-mesh} (100%) delete mode 100755 package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid rename package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/{300-gluon-mesh-batman-adv-core-wan => 360-gluon-mesh-batman-adv-core-mac-addresses} (61%) diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless index 2760fae7..b4f15d71 100755 --- a/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/200-wireless @@ -1,10 +1,12 @@ #!/usr/bin/lua +local mesh = require 'gluon.mesh' local util = require 'gluon.util' -local uci = require('luci.model.uci').cursor() local site = require 'gluon.site_config' local sysconfig = require 'gluon.sysconfig' +local uci = require('luci.model.uci').cursor() + -- Initial if not sysconfig.gluon_version then uci:delete_all('wireless', 'wifi-iface') @@ -18,30 +20,189 @@ local function get_channel(radio, config) end end -local function configure_radio(radio, index, config) - if config then - local channel = get_channel(radio, config) - - uci:delete('wireless', radio, 'disabled') - - uci:set('wireless', radio, 'channel', channel) - uci:set('wireless', radio, 'htmode', 'HT20') - uci:set('wireless', radio, 'country', site.regdom) - - if config.supported_rates then - uci:set_list('wireless', radio, 'supported_rates', config.supported_rates) - else - uci:delete('wireless', radio, 'supported_rates') - end - - if config.basic_rate then - uci:set_list('wireless', radio, 'basic_rate', config.basic_rate) - else - uci:delete('wireless', radio, 'basic_rate') - end +local function is_disabled(name) + if uci:get('wireless', name) then + return uci:get_bool('wireless', name, 'disabled') end end +-- Returns the first argument that is not nil; don't call without any non-nil arguments! +local function first_non_nil(first, ...) + if first ~= nil then + return first + else + return first_non_nil(...) + end +end + + +local function configure_ibss(config, radio, index, suffix, disabled) + local name = 'ibss_' .. radio + local ifname = 'ibss' .. suffix + + uci:delete('network', name) + uci:delete('network', name .. '_vlan') + uci:delete('wireless', name) + + if not config then + return + end + + local macaddr = util.get_wlan_mac(radio, index, 3) + if not macaddr then + return + end + + if config.vlan then + uci:section('network', 'interface', name, + { + proto = 'none', + } + ) + + uci:section('network', 'interface', name .. '_vlan', + { + ifname = '@' .. name .. '.' .. config.vlan, + proto = 'none', + auto = 1, + } + ) + + mesh.register_interface(ifname .. '.' .. config.vlan) + else + uci:section('network', 'interface', name, + { + proto = 'none', + auto = 1, + } + ) + + mesh.register_interface(ifname) + end + + uci:section('wireless', 'wifi-iface', name, + { + device = radio, + network = name, + mode = 'adhoc', + ssid = config.ssid, + bssid = config.bssid, + macaddr = macaddr, + mcast_rate = config.mcast_rate, + ifname = ifname, + disabled = disabled and 1 or 0, + } + ) +end + +local function configure_mesh(config, radio, index, suffix, disabled) + local name = 'mesh_' .. radio + local ifname = 'mesh' .. suffix + local macfilter = uci:get('wireless', name, 'macfilter') + local maclist = uci:get('wireless', name, 'maclist') + + uci:delete('network', name) + uci:delete('wireless', name) + + if not config then + return + end + + local macaddr = util.get_wlan_mac(radio, index, 2) + if not macaddr then + return + end + + mesh.register_interface(ifname) + + uci:section('network', 'interface', name, + { + proto = 'none', + auto = 1, + } + ) + + uci:section('wireless', 'wifi-iface', name, + { + device = radio, + network = name, + mode = 'mesh', + mesh_id = config.id, + mesh_fwding = 0, + macaddr = macaddr, + mcast_rate = config.mcast_rate, + ifname = ifname, + disabled = disabled and 1 or 0, + macfilter = macfilter, + maclist = maclist, + } + ) +end + +local function configure_radio(radio, index, config) + if not config then + return + end + + local suffix = radio:match('^radio(%d+)$') + if not suffix then + return + end + + local channel = get_channel(radio, config) + + uci:delete('wireless', radio, 'disabled') + + uci:set('wireless', radio, 'channel', channel) + uci:set('wireless', radio, 'htmode', 'HT20') + uci:set('wireless', radio, 'country', site.regdom) + + if config.supported_rates then + uci:set_list('wireless', radio, 'supported_rates', config.supported_rates) + else + uci:delete('wireless', radio, 'supported_rates') + end + + if config.basic_rate then + uci:set_list('wireless', radio, 'basic_rate', config.basic_rate) + else + uci:delete('wireless', radio, 'basic_rate') + end + + + local ibss_disabled = is_disabled('ibss_' .. radio) + local mesh_disabled = is_disabled('mesh_' .. radio) + + configure_ibss(config.ibss, radio, index, suffix, + first_non_nil( + ibss_disabled, + mesh_disabled, + (config.ibss or {}).disabled, -- will be nil if config.ibss or config.ibss.disabled is unset + false + ) + ) + configure_mesh(config.mesh, radio, index, suffix, + first_non_nil( + mesh_disabled, + ibss_disabled, + (config.mesh or {}).disabled, -- will be nil if config.mesh or config.mesh.disabled is unset + false + ) + ) +end + util.iterate_radios(configure_radio) + +if uci:get('system', 'rssid_wlan0') then + if uci:get('wireless', 'mesh_radio0') then + uci:set('system', 'rssid_wlan0', 'dev', 'mesh0') + else + uci:set('system', 'rssid_wlan0', 'dev', 'ibss0') + end + + uci:save('system') +end + uci:save('wireless') +uci:save('network') diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan b/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan new file mode 100755 index 00000000..a772d464 --- /dev/null +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/210-interface-wan @@ -0,0 +1,17 @@ +#!/usr/bin/lua + +local network = require 'gluon.network' +local site = require 'gluon.site_config' +local uci = require('luci.model.uci').cursor() + +if not uci:get('network', 'mesh_wan') then + uci:section('network', 'interface', 'mesh_wan', { + ifname = 'br-wan', + proto = 'none', + auto = site.mesh_on_wan and 1 or 0, + }) +end + +c:save('network') + +network.update_mesh_on_wan() diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan similarity index 93% rename from package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan rename to package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan index dc3a4f42..8f1cb796 100755 --- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/340-gluon-mesh-batman-adv-core-mesh-on-lan +++ b/package/gluon-core/luasrc/lib/gluon/upgrade/220-interface-lan @@ -2,7 +2,6 @@ local mesh = require 'gluon.mesh' local site = require 'gluon.site_config' -local util = require 'gluon.util' local sysconfig = require 'gluon.sysconfig' local uci = require('luci.model.uci').cursor() @@ -17,7 +16,6 @@ uci:section('network', 'interface', 'mesh_lan', { type = 'bridge', igmp_snooping = 0, proto = 'none', - macaddr = util.get_mac(3), }) if uci:get('network', 'mesh_lan', 'auto') == nil then diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/lua/gluon/network.lua b/package/gluon-core/luasrc/lib/lua/gluon/network.lua similarity index 100% rename from package/gluon-mesh-batman-adv-core/luasrc/lib/lua/gluon/network.lua rename to package/gluon-core/luasrc/lib/lua/gluon/network.lua diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless deleted file mode 100755 index ea6580a9..00000000 --- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/320-gluon-mesh-batman-adv-core-wireless +++ /dev/null @@ -1,159 +0,0 @@ -#!/usr/bin/lua - -local mesh = require 'gluon.mesh' -local site = require 'gluon.site_config' -local util = require 'gluon.util' - -local uci = require('luci.model.uci').cursor() - - -local function is_disabled(name) - if uci:get('wireless', name) then - return uci:get_bool('wireless', name, 'disabled') - end -end - --- Returns the first argument that is not nil; don't call without any non-nil arguments! -local function first_non_nil(first, ...) - if first ~= nil then - return first - else - return first_non_nil(...) - end -end - - -local function configure_ibss(config, radio, index, suffix, disabled) - local name = 'ibss_' .. radio - local ifname = 'ibss' .. suffix - - uci:delete('network', name) - uci:delete('network', name .. '_vlan') - uci:delete('wireless', name) - - if not config then - return - end - - local macaddr = util.get_wlan_mac(radio, index, 3) - if not macaddr then - return - end - - if config.vlan then - uci:section('network', 'interface', name, - { - proto = 'none', - } - ) - - uci:section('network', 'interface', name .. '_vlan', - { - ifname = '@' .. name .. '.' .. config.vlan, - proto = 'none', - auto = 1, - } - ) - - mesh.register_interface(ifname .. '.' .. config.vlan) - else - uci:section('network', 'interface', name, - { - proto = 'none', - auto = 1, - } - ) - - mesh.register_interface(ifname) - end - - uci:section('wireless', 'wifi-iface', name, - { - device = radio, - network = name, - mode = 'adhoc', - ssid = config.ssid, - bssid = config.bssid, - macaddr = macaddr, - mcast_rate = config.mcast_rate, - ifname = ifname, - disabled = disabled and 1 or 0, - } - ) -end - -local function configure_mesh(config, radio, index, suffix, disabled) - local name = 'mesh_' .. radio - local ifname = 'mesh' .. suffix - local macfilter = uci:get('wireless', name, 'macfilter') - local maclist = uci:get('wireless', name, 'maclist') - - uci:delete('network', name) - uci:delete('wireless', name) - - if not config then - return - end - - local macaddr = util.get_wlan_mac(radio, index, 2) - if not macaddr then - return - end - - mesh.register_interface(ifname) - - uci:section('network', 'interface', name, - { - proto = 'none', - auto = 1, - } - ) - - uci:section('wireless', 'wifi-iface', name, - { - device = radio, - network = name, - mode = 'mesh', - mesh_id = config.id, - mesh_fwding = 0, - macaddr = macaddr, - mcast_rate = config.mcast_rate, - ifname = ifname, - disabled = disabled and 1 or 0, - macfilter = macfilter, - maclist = maclist, - } - ) -end - -local function configure_radio(radio, index, config) - local suffix = radio:match('^radio(%d+)$') - if not suffix then - return - end - - local ibss_disabled = is_disabled('ibss_' .. radio) - local mesh_disabled = is_disabled('mesh_' .. radio) - - configure_ibss(config.ibss, radio, index, suffix, - first_non_nil( - ibss_disabled, - mesh_disabled, - (config.ibss or {}).disabled, -- will be nil if config.ibss or config.ibss.disabled is unset - false - ) - ) - configure_mesh(config.mesh, radio, index, suffix, - first_non_nil( - mesh_disabled, - ibss_disabled, - (config.mesh or {}).disabled, -- will be nil if config.mesh or config.mesh.disabled is unset - false - ) - ) -end - -util.iterate_radios(configure_radio) - -uci:save('wireless') -uci:save('network') diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan deleted file mode 100755 index 9272196f..00000000 --- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/330-gluon-mesh-batman-adv-core-mesh-on-wan +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/lua - -local network = require 'gluon.network' -local site = require 'gluon.site_config' -local uci = require 'luci.model.uci' - -local c = uci.cursor() - -if not c:get('network', 'mesh_wan') then - c:section('network', 'interface', 'mesh_wan', - { ifname = 'br-wan' - , proto = 'none' - , auto = site.mesh_on_wan and 1 or 0 - }) -end - -c:save('network') - -network.update_mesh_on_wan() diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-mesh similarity index 100% rename from package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/310-gluon-mesh-batman-adv-core-mesh rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-mesh diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid deleted file mode 100755 index b6b16574..00000000 --- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/350-gluon-mesh-batman-adv-core-rssid +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/lua - -local uci = require('luci.model.uci').cursor() - -if uci:get('system', 'rssid_wlan0') then - if uci:get('wireless', 'mesh_radio0') then - uci:set('system', 'rssid_wlan0', 'dev', 'mesh0') - else - uci:set('system', 'rssid_wlan0', 'dev', 'ibss0') - end - - uci:save('system') -end diff --git a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/360-gluon-mesh-batman-adv-core-mac-addresses similarity index 61% rename from package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan rename to package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/360-gluon-mesh-batman-adv-core-mac-addresses index eafadb71..07667c29 100755 --- a/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/300-gluon-mesh-batman-adv-core-wan +++ b/package/gluon-mesh-batman-adv-core/luasrc/lib/gluon/upgrade/360-gluon-mesh-batman-adv-core-mac-addresses @@ -3,7 +3,7 @@ local util = require 'gluon.util' local uci = require('luci.model.uci').cursor() - --- fix up duplicate mac addresses (for mesh-on-WAN) +-- fix up duplicate mac addresses (for meshing) uci:set('network', 'wan', 'macaddr', util.get_mac(2)) +uci:set('network', 'mesh_lan', 'macaddr', util.get_mac(3)) uci:save('network')