' +
+ '
';
+ } else {
+ s +=
+ '
' +
+ '
';
+ }
+ if (neigh.hn) {
+ s += '
';
+ } else {
+ s += '
?
';
+ }
+ s +=
+ '
' +
+ (neigh?.ifn?.interface ?? '?') +
+ '
' +
+ '
' +
+ neigh.lip +
+ '
' +
+ '
' +
+ neigh.lq +
+ '
' +
+ '
' +
+ neigh.nlq +
+ '
' +
+ '
' +
+ neigh.cost +
+ '
' +
+ '
' +
+ (neigh.snr || '?') +
+ '
' +
+ '
';
+ }
+
+ nt.innerHTML = s;
+ }
+
+ var i = 1;
+
+ for (var k = 0; k < neigh_res.length; k++) {
+ var link = neigh_res[k];
+ link.linkCost = parseInt(link.linkCost) || 0;
+ if (link.linkCost === 4194304) {
+ link.linkCost = 0;
+ }
+
+ color = etx_color(link.linkCost);
+ snr_color = snr_colors(link.snr);
+
+ if (link.snr === 0) {
+ link.snr = '?';
+ }
+
+ var defaultgw_color = '';
+ if (link.defaultgw === 1) {
+ defaultgw_color = '#ffff99';
+ }
+
+ var tr = E(
+ 'div',
+ {
+ 'class': 'tr cbi-section-table-row cbi-rowstyle-' + i + ' proto-' + link.proto,
+ },
+ [
+ link.proto === '6'
+ ? E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ [
+ E(
+ 'a',
+ {
+ 'href': 'http://[' + link.remoteIP + ']/cgi-bin-status.html',
+ },
+ link.remoteIP
+ ),
+ ]
+ )
+ : E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ [
+ E(
+ 'a',
+ {
+ 'href': 'http://' + link.remoteIP + '/cgi-bin-status.html',
+ },
+ link.remoteIP
+ ),
+ ]
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ [E('a', { 'href': 'http://%q/cgi-bin-status.html'.format(link.hostname) }, '%h'.format(link.hostname))]
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ link?.interface?.interface ?? '?'
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ link.localIP
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ [E('div', {}, link.linkQuality.toFixed(3))]
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + defaultgw_color,
+ },
+ [E('div', {}, link.neighborLinkQuality.toFixed(3))]
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + color,
+ },
+ [E('div', {}, link.linkCost.toFixed(3))]
+ ),
+ E(
+ 'div',
+ {
+ 'class': 'td cbi-section-table-cell left',
+ 'style': 'background-color:' + snr_color,
+ 'title': 'Signal: ' + link.signal + ' Noise: ' + link.noise,
+ },
+ link.snr
+ ),
+ ]
+ );
+
+ table.appendChild(tr);
+ i = (i % 2) + 1;
+ }
+
+ var fieldset = E('fieldset', { 'class': 'cbi-section' }, [E('legend', {}, _('Overview of currently established OLSR connections')), table]);
+
+ var h2 = E('h2', { 'name': 'content' }, _('OLSR connections'));
+ var divToggleButtons = E('div', { 'id': 'togglebuttons' });
+ var statusOlsrLegend = E('div', {}, [
+ E('h3', {}, [_('Legend') + ':']),
+ E('ul', {}, [
+ E('li', {}, [E('strong', {}, [_('LQ: ')]), _('Success rate of packages received from the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('NLQ: ')]), _('Success rate of packages sent to the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('ETX: ')]), _('Expected retransmission count')]),
+ E('li', { 'style': 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (ETX < 2)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (2 < ETX < 4)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (4 < ETX < 10)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (ETX > 10)')]),
+ ]),
+ ]),
+ E('li', {}, [E('strong', {}, [_('SNR: ')]), _('Signal Noise Ratio in dB')]),
+ E('li', { 'style': 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (SNR > 30)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (30 > SNR > 20)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (20 > SNR > 5)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (SNR < 5)')]),
+ ]),
+ ]),
+ ]),
+ ]);
+
+ var statusOlsrCommonJs = null;
+
+ if (has_v4 && has_v6) {
+ statusOlsrCommonJs = E('script', {
+ type: 'text/javascript',
+ src: L.resource('common/common_js.js'),
+ });
+ }
+
+ var result = E([], {}, [h2, divToggleButtons, fieldset, statusOlsrLegend, statusOlsrCommonJs]);
+
+ return result;
+ })
+ .catch(function (error) {
+ console.error(error);
+ });
+ },
+ handleSaveApply: null,
+ handleSave: null,
+ handleReset: null,
+});
diff --git a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/routes.js b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/routes.js
new file mode 100644
index 000000000000..a202da141271
--- /dev/null
+++ b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/routes.js
@@ -0,0 +1,330 @@
+'use strict';
+'require uci';
+'require view';
+'require poll';
+'require network';
+'require rpc';
+'require ui';
+
+function etx_color(etx) {
+ let color = '#bb3333';
+ if (etx === 0) {
+ color = '#bb3333';
+ } else if (etx < 2) {
+ color = '#00cc00';
+ } else if (etx < 4) {
+ color = '#ffcb05';
+ } else if (etx < 10) {
+ color = '#ff6600';
+ }
+ return color;
+}
+
+return view.extend({
+ callGetJsonStatus: rpc.declare({
+ object: 'olsrinfo',
+ method: 'getjsondata',
+ params: ['otable', 'v4_port', 'v6_port'],
+ }),
+
+ callGetHosts: rpc.declare({
+ object: 'olsrinfo',
+ method: 'hosts',
+ }),
+
+ fetch_jsoninfo: function (otable) {
+ var jsonreq4 = '';
+ var jsonreq6 = '';
+ var v4_port = parseInt(uci.get('olsrd', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var v6_port = parseInt(uci.get('olsrd6', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var json;
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ L.resolveDefault(self.callGetJsonStatus(otable, v4_port, v6_port), {})
+ .then(function (res) {
+ json = res;
+
+ jsonreq4 = JSON.parse(json.jsonreq4);
+ jsonreq6 = json.jsonreq6 !== '' ? JSON.parse(json.jsonreq6) : [];
+ var jsondata4 = {};
+ var jsondata6 = {};
+ var data4 = [];
+ var data6 = [];
+ var has_v4 = false;
+ var has_v6 = false;
+
+ if (jsonreq4 === '' && jsonreq6 === '') {
+ window.location.href = 'error_olsr';
+ reject([null, 0, 0, true]);
+ return;
+ }
+
+ if (jsonreq4 !== '') {
+ has_v4 = true;
+ jsondata4 = jsonreq4 || {};
+ if (otable === 'status') {
+ data4 = jsondata4;
+ } else {
+ data4 = jsondata4[otable] || [];
+ }
+
+ for (var i = 0; i < data4.length; i++) {
+ data4[i]['proto'] = '4';
+ }
+ }
+
+ if (jsonreq6 !== '') {
+ has_v6 = true;
+ jsondata6 = jsonreq6 || {};
+ if (otable === 'status') {
+ data6 = jsondata6;
+ } else {
+ data6 = jsondata6[otable] || [];
+ }
+
+ for (var j = 0; j < data6.length; j++) {
+ data6[j]['proto'] = '6';
+ }
+ }
+
+ for (var k = 0; k < data6.length; k++) {
+ data4.push(data6[k]);
+ }
+
+ resolve([data4, has_v4, has_v6, false]);
+ })
+ .catch(function (err) {
+ console.error(err);
+ reject([null, 0, 0, true]);
+ });
+ });
+ },
+ action_routes: function () {
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ self
+ .fetch_jsoninfo('routes')
+ .then(function ([data, has_v4, has_v6, error]) {
+ if (error) {
+ reject(error);
+ }
+
+ var resolveVal = uci.get('luci_olsr', 'general', 'resolve');
+
+ function compare(a, b) {
+ if (a.proto === b.proto) {
+ return a.rtpMetricCost < b.rtpMetricCost;
+ } else {
+ return a.proto < b.proto;
+ }
+ }
+ var modifiedData;
+ self
+ .callGetHosts()
+ .then(function (res) {
+ function matchHostnames(ip) {
+ var lines = res.hosts.split('\n');
+ for (var i = 0; i < lines.length; i++) {
+ var ipandhostname = lines[i].trim().split(/\s+/);
+ if (ipandhostname[0] === ip) {
+ return ipandhostname[1];
+ }
+ }
+ return null;
+ }
+ modifiedData = data.map(function (v) {
+ if (resolveVal === '1') {
+ var hostname = matchHostnames(v.gateway);
+ if (hostname) {
+ v.hostname = hostname;
+ }
+ }
+ return v;
+ });
+
+ modifiedData.sort(compare);
+
+ var result = { routes: modifiedData, has_v4: has_v4, has_v6: has_v6 };
+ resolve(result);
+ })
+ .catch(function (err) {
+ modifiedData = data;
+ console.error(err);
+ });
+ })
+ .catch(function (err) {
+ reject(err);
+ });
+ });
+ },
+ load: function () {
+ var self = this;
+ poll.add(function () {
+ self.render();
+ }, 5);
+ return Promise.all([uci.load('olsrd'), uci.load('luci_olsr')]);
+ },
+ render: function () {
+ var routes_res;
+ var has_v4;
+ var has_v6;
+ var self = this;
+ return this.action_routes()
+ .then(function (result) {
+ routes_res = result.routes;
+ has_v4 = result.has_v4;
+ has_v6 = result.has_v6;
+ var table = E('div', { 'class': 'table cbi-section-table', 'id': 'olsrd_routes' }, [
+ E('div', { 'class': 'tr cbi-section-table-cell' }, [
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Announced network')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('OLSR gateway')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Interface')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Metric')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, 'ETX'),
+ ]),
+ ]);
+ var rv = [];
+ for (var k = 0; k < routes_res.length; k++) {
+ var route = routes_res[k];
+ var ETX = (parseFloat(route.etx) || 0).toFixed(3);
+ rv.push({
+ hostname: route.hostname,
+ dest: route.destination,
+ genmask: route.genmask,
+ gw: route.gateway,
+ interface: route.networkInterface,
+ metric: route.metric,
+ etx: ETX,
+ color: etx_color(parseFloat(ETX)),
+ });
+ }
+
+ var rt = document.getElementById('olsrd_routes');
+ if (rt) {
+ var s =
+ '
' +
+ '
Announced network
' +
+ '
OLSR gateway
' +
+ '
Interface
' +
+ '
Metric
' +
+ '
ETX
' +
+ '
';
+
+ for (var idx = 0; idx < rv.length; idx++) {
+ var route = rv[idx];
+
+ s +=
+ '
' +
+ '
' +
+ route.dest +
+ '/' +
+ route.genmask +
+ '
' +
+ '
' +
+ '
' +
+ route.gw +
+ '';
+
+ if (route.hostname) {
+ if (route.proto == '6') {
+ s += ' /
%h'.format(route.hostname, route.hostname || '')
+ } else {
+ s += ' /
%h'.format(route.hostname, route.hostname || '');
+ }
+ }
+
+ s +=
+ '
' +
+ '
' +
+ route.interface +
+ '
' +
+ '
' +
+ route.metric +
+ '
' +
+ '
' +
+ (route.etx || '?') +
+ '
' +
+ '
';
+ }
+
+ rt.innerHTML = s;
+ }
+
+ var i = 1;
+
+ for (var k = 0; k < routes_res.length; k++) {
+ var route = routes_res[k];
+ var ETX = parseInt(route.etx) || 0;
+ var color = etx_color(ETX);
+
+ var tr = E('div', { 'class': 'tr cbi-section-table-row cbi-rowstyle-' + i + ' proto-' + route.proto }, [
+ E('div', { 'class': 'td cbi-section-table-cell left' }, route.destination + '/' + route.genmask),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, [
+ route.proto === '6' ? E('a', { 'href': 'http://[' + route.gateway + ']/cgi-bin-status.html' }, route.gateway) : E('a', { 'href': 'http://' + route.gateway + '/cgi-bin-status.html' }, route.gateway),
+ route.hostname ? E('span', {}, [' / ', E('a', { 'href': 'http://%q/cgi-bin-status.html'.format(route.hostname) }, '%h'.format(route.hostname))]) : '',
+ ]),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, route.networkInterface),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, route.metric),
+ E('div', { 'class': 'td cbi-section-table-cell left', 'style': 'background-color:' + color }, [ETX.toFixed(3)]),
+ ]);
+
+ table.appendChild(tr);
+ i = (i % 2) + 1;
+ }
+
+ var fieldset = E('fieldset', { 'class': 'cbi-section' }, [E('legend', {}, _('Overview of currently known routes to other OLSR nodes')), table]);
+
+ var h2 = E('h2', { 'name': 'content' }, _('Known OLSR routes'));
+ var divToggleButtons = E('div', { 'id': 'togglebuttons' });
+ var statusOlsrLegend = E('div', {}, [
+ E('h3', {}, [_('Legend') + ':']),
+ E('ul', {}, [
+ E('li', {}, [E('strong', {}, [_('LQ: ')]), _('Success rate of packages received from the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('NLQ: ')]), _('Success rate of packages sent to the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('ETX: ')]), _('Expected retransmission count')]),
+ E('li', { 'style': 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (ETX < 2)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (2 < ETX < 4)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (4 < ETX < 10)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (ETX > 10)')]),
+ ]),
+ ]),
+ E('li', {}, [E('strong', {}, [_('SNR: ')]), _('Signal Noise Ratio in dB')]),
+ E('li', { 'style': 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (SNR > 30)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (30 > SNR > 20)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (20 > SNR > 5)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (SNR < 5)')]),
+ ]),
+ ]),
+ ]),
+ ]);
+
+ var statusOlsrCommonJs = null;
+
+ if (has_v4 && has_v6) {
+ statusOlsrCommonJs = E('script', { 'type': 'text/javascript', 'src': L.resource('common/common_js.js') });
+ }
+
+ var result = E([], {}, [h2, divToggleButtons, fieldset, statusOlsrLegend, statusOlsrCommonJs]);
+
+ return result;
+ })
+ .catch(function (error) {
+ console.error(error);
+ });
+ },
+ handleSaveApply: null,
+ handleSave: null,
+ handleReset: null,
+});
diff --git a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/smartgw.js b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/smartgw.js
new file mode 100644
index 000000000000..3b6ca662f91f
--- /dev/null
+++ b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/smartgw.js
@@ -0,0 +1,283 @@
+'use strict';
+'require uci';
+'require view';
+'require poll';
+'require rpc';
+'require ui';
+
+return view.extend({
+ callGetJsonStatus: rpc.declare({
+ object: 'olsrinfo',
+ method: 'getjsondata',
+ params: ['otable', 'v4_port', 'v6_port'],
+ }),
+
+ fetch_jsoninfo: function (otable) {
+ var jsonreq4 = '';
+ var jsonreq6 = '';
+ var v4_port = parseInt(uci.get('olsrd', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var v6_port = parseInt(uci.get('olsrd6', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var json;
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ L.resolveDefault(self.callGetJsonStatus(otable, v4_port, v6_port), {})
+ .then(function (res) {
+ json = res;
+
+ jsonreq4 = JSON.parse(json.jsonreq4);
+ jsonreq6 = json.jsonreq6 !== '' ? JSON.parse(json.jsonreq6) : [];
+ var jsondata4 = {};
+ var jsondata6 = {};
+ var data4 = [];
+ var data6 = [];
+ var has_v4 = false;
+ var has_v6 = false;
+
+ if (jsonreq4 === '' && jsonreq6 === '') {
+ window.location.href = 'error_olsr';
+ reject([null, 0, 0, true]);
+ return;
+ }
+
+ if (jsonreq4 !== '') {
+ has_v4 = true;
+ jsondata4 = jsonreq4 || {};
+ if (otable === 'status') {
+ data4 = jsondata4;
+ } else {
+ data4 = jsondata4[otable] || [];
+ }
+
+ for (var i = 0; i < data4.length; i++) {
+ data4[i]['proto'] = '4';
+ }
+ }
+
+ if (jsonreq6 !== '') {
+ has_v6 = true;
+ jsondata6 = jsonreq6 || {};
+ if (otable === 'status') {
+ data6 = jsondata6;
+ } else {
+ data6 = jsondata6[otable] || [];
+ }
+
+ for (var j = 0; j < data6.length; j++) {
+ data6[j]['proto'] = '6';
+ }
+ }
+
+ for (var k = 0; k < data6.length; k++) {
+ data4.push(data6[k]);
+ }
+
+ resolve([data4, has_v4, has_v6, false]);
+ })
+ .catch(function (err) {
+ console.error(err);
+ reject([null, 0, 0, true]);
+ });
+ });
+ },
+ action_smartgw: function () {
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ self
+ .fetch_jsoninfo('gateways')
+ .then(function ([data, has_v4, has_v6, error]) {
+ if (error) {
+ reject(error);
+ }
+
+ function compare(a, b) {
+ if (a.proto === b.proto) {
+ return a.cost < b.cost;
+ } else {
+ return a.proto < b.proto;
+ }
+ }
+
+ data.ipv4.sort(compare);
+ data.ipv6.sort(compare);
+
+ var result = { gws: data, has_v4: has_v4, has_v6: has_v6 };
+ resolve(result);
+ })
+ .catch(function (err) {
+ reject(err);
+ });
+ });
+ },
+ load: function () {
+ var self = this;
+ poll.add(function () {
+ self.render();
+ }, 5);
+ return Promise.all([uci.load('olsrd'), uci.load('luci_olsr')]);
+ },
+ render: function () {
+ var gws_res;
+ var has_v4;
+ var has_v6;
+ var self = this;
+ return this.action_smartgw()
+ .then(function (result) {
+ gws_res = result.gws;
+ has_v4 = result.has_v4;
+ has_v6 = result.has_v6;
+ var fieldset = E('fieldset', { 'class': 'cbi-section' }, [
+ E('legend', {}, _('Overview of smart gateways in this network')),
+ E('div', { 'class': 'table cbi-section-table', 'id': 'olsrd_smartgw' }, [
+ E('div', { 'class': 'tr cbi-section-table-titles' }, [
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Gateway')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Selected')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('ETX')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Hops')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Uplink')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Downlink')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('IPv4')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('IPv6')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Prefix')),
+ ]),
+ ]),
+ ]);
+ var has_smartgw;
+ uci.sections('olsrd', 'olsrd', function (s) {
+ if (s.SmartGateway && s.SmartGateway === 'yes') {
+ has_smartgw = true;
+ }
+ });
+
+ var rv = [];
+ for (var k = 0; k < gws_res.ipv4.length; k++) {
+ var gw = gws_res.ipv4[k];
+ gw.cost = parseFloat(gw.cost) / 1024 || 0;
+ if (gw.cost >= 100) {
+ gw.cost = 0;
+ }
+
+ rv.push({
+ proto: gw.IPv4 ? '4' : '6',
+ originator: gw.originator,
+ selected: gw.selected ? luci.i18n.translate('yes') : luci.i18n.translate('no'),
+ cost: gw.cost > 0 ? gw.cost.toFixed(3) : luci.i18n.translate('infinite'),
+ hops: gw.hops,
+ uplink: gw.uplink,
+ downlink: gw.downlink,
+ v4: gw.IPv4 ? luci.i18n.translate('yes') : luci.i18n.translate('no'),
+ v6: gw.IPv6 ? luci.i18n.translate('yes') : luci.i18n.translate('no'),
+ prefix: gw.prefix,
+ });
+ }
+
+ var smartgwdiv = document.getElementById('olsrd_smartgw');
+ if (smartgwdiv) {
+ var s =
+ '
' +
+ '
Gateway
' +
+ '
Selected
' +
+ '
ETX>
' +
+ '
Hops>
' +
+ '
Uplink
' +
+ '
Downlink
' +
+ '
IPv4
' +
+ '
IPv6
' +
+ '
Prefix
' +
+ '
';
+
+ for (var idx = 0; idx < rv.length; idx++) {
+ var smartgw = rv[idx];
+ var linkgw;
+ s += '
';
+
+ if (smartgw.proto == '6') {
+ linkgw = '
' + smartgw.originator + '';
+ } else {
+ linkgw = '
' + smartgw.originator + '';
+ }
+
+ s +=
+ '
' +
+ linkgw +
+ '
' +
+ '
' +
+ smartgw.selected +
+ '
' +
+ '
' +
+ smartgw.cost +
+ '
' +
+ '
' +
+ smartgw.hops +
+ '
' +
+ '
' +
+ smartgw.uplink +
+ '
' +
+ '
' +
+ smartgw.downlink +
+ '
' +
+ '
' +
+ smartgw.v4 +
+ '
' +
+ '
' +
+ smartgw.v6 +
+ '
' +
+ '
' +
+ smartgw.prefix +
+ '
';
+
+ s += '
';
+ }
+ smartgwdiv.innerHTML = s;
+ }
+
+ var i = 1;
+
+ if (has_smartgw) {
+ for (var k = 0; k < gws_res.ipv4.length; k++) {
+ var gw = gws_res.ipv4[k];
+ gw.cost = parseInt(gw.cost) / 1024 || 0;
+ if (gw.cost >= 100) {
+ gw.cost = 0;
+ }
+
+ var tr = E('div', { 'class': 'tr cbi-section-table-row cbi-rowstyle-' + i + ' proto-' + gw.proto }, [
+ gw.proto === '6'
+ ? E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://[' + gw.originator + ']/cgi-bin-status.html' }, gw.originator)])
+ : E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://' + gw.originator + '/cgi-bin-status.html' }, gw.originator)]),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, [gw.selected ? luci.i18n.translate('yes') : luci.i18n.translate('no')]),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, [gw.cost > 0 ? string.format('%.3f', gw.cost) : luci.i18n.translate('infinite')]),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.hops),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.uplink),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.downlink),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.IPv4 ? luci.i18n.translate('yes') : luci.i18n.translate('no')),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.IPv6 ? luci.i18n.translate('yes') : luci.i18n.translate('no')),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, gw.prefix),
+ ]);
+
+ fieldset.appendChild(tr);
+ i = (i % 2) + 1;
+ }
+
+ var h2 = E('h2', { 'name': 'content' }, _('SmartGW announcements'));
+ var divToggleButtons = E('div', { 'id': 'togglebuttons' });
+ var statusOlsrCommonJs = null;
+
+ if (has_v4 && has_v6) {
+ statusOlsrCommonJs = E('script', { 'type': 'text/javascript', 'src': L.resource('common/common_js.js') });
+ }
+
+ var result = E([], {}, [h2, divToggleButtons, fieldset, statusOlsrCommonJs]);
+
+ return result;
+ } else {
+ return E('h2', {}, _('SmartGateway is not configured on this system'));
+ }
+ })
+ .catch(function (error) {
+ console.error(error);
+ });
+ },
+ handleSaveApply: null,
+ handleSave: null,
+ handleReset: null
+});
diff --git a/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/topology.js b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/topology.js
new file mode 100644
index 000000000000..6a179e848ba4
--- /dev/null
+++ b/applications/luci-app-olsr/htdocs/luci-static/resources/view/olsr/status-olsr/topology.js
@@ -0,0 +1,218 @@
+'use strict';
+'require uci';
+'require view';
+'require poll';
+'require rpc';
+'require ui';
+
+function etx_color(etx) {
+ let color = '#bb3333';
+ if (etx === 0) {
+ color = '#bb3333';
+ } else if (etx < 2) {
+ color = '#00cc00';
+ } else if (etx < 4) {
+ color = '#ffcb05';
+ } else if (etx < 10) {
+ color = '#ff6600';
+ }
+ return color;
+}
+
+return view.extend({
+ callGetJsonStatus: rpc.declare({
+ object: 'olsrinfo',
+ method: 'getjsondata',
+ params: ['otable', 'v4_port', 'v6_port'],
+ }),
+
+ fetch_jsoninfo: function (otable) {
+ var jsonreq4 = '';
+ var jsonreq6 = '';
+ var v4_port = parseInt(uci.get('olsrd', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var v6_port = parseInt(uci.get('olsrd6', 'olsrd_jsoninfo', 'port') || '') || 9090;
+ var json;
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ L.resolveDefault(self.callGetJsonStatus(otable, v4_port, v6_port), {})
+ .then(function (res) {
+ json = res;
+
+ jsonreq4 = JSON.parse(json.jsonreq4);
+ jsonreq6 = json.jsonreq6 !== '' ? JSON.parse(json.jsonreq6) : [];
+ var jsondata4 = {};
+ var jsondata6 = {};
+ var data4 = [];
+ var data6 = [];
+ var has_v4 = false;
+ var has_v6 = false;
+
+ if (jsonreq4 === '' && jsonreq6 === '') {
+ window.location.href = 'error_olsr';
+ reject([null, 0, 0, true]);
+ return;
+ }
+
+ if (jsonreq4 !== '') {
+ has_v4 = true;
+ jsondata4 = jsonreq4 || {};
+ if (otable === 'status') {
+ data4 = jsondata4;
+ } else {
+ data4 = jsondata4[otable] || [];
+ }
+
+ for (var i = 0; i < data4.length; i++) {
+ data4[i]['proto'] = '4';
+ }
+ }
+
+ if (jsonreq6 !== '') {
+ has_v6 = true;
+ jsondata6 = jsonreq6 || {};
+ if (otable === 'status') {
+ data6 = jsondata6;
+ } else {
+ data6 = jsondata6[otable] || [];
+ }
+
+ for (var j = 0; j < data6.length; j++) {
+ data6[j]['proto'] = '6';
+ }
+ }
+
+ for (var k = 0; k < data6.length; k++) {
+ data4.push(data6[k]);
+ }
+
+ resolve([data4, has_v4, has_v6, false]);
+ })
+ .catch(function (err) {
+ console.error(err);
+ reject([null, 0, 0, true]);
+ });
+ });
+ },
+ action_topology: function () {
+ var self = this;
+ return new Promise(function (resolve, reject) {
+ self
+ .fetch_jsoninfo('topology')
+ .then(function ([data, has_v4, has_v6, error]) {
+ if (error) {
+ reject(error);
+ }
+
+ function compare(a, b) {
+ if (a.proto === b.proto) {
+ return a.tcEdgeCost < b.tcEdgeCost;
+ } else {
+ return a.proto < b.proto;
+ }
+ }
+
+ data.sort(compare);
+
+ var result = { routes: data, has_v4: has_v4, has_v6: has_v6 };
+ resolve(result);
+ })
+ .catch(function (err) {
+ reject(err);
+ });
+ });
+ },
+ load: function () {
+ return Promise.all([uci.load('olsrd'), uci.load('luci_olsr')]);
+ },
+ render: function () {
+ var routes_res;
+ var has_v4;
+ var has_v6;
+
+ return this.action_topology()
+ .then(function (result) {
+ routes_res = result.routes;
+ has_v4 = result.has_v4;
+ has_v6 = result.has_v6;
+ var table = E('div', { 'class': 'table cbi-section-table' }, [
+ E('div', { 'class': 'tr cbi-section-table-titles' }, [
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('OLSR node')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('Last hop')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('LQ')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('NLQ')),
+ E('div', { 'class': 'th cbi-section-table-cell' }, _('ETX')),
+ ]),
+ ]);
+ var i = 1;
+
+ for (var k = 0; k < routes_res.length; k++) {
+ var route = routes_res[k];
+ var cost = (parseInt(route.tcEdgeCost) || 0).toFixed(3);
+ var color = etx_color(parseInt(cost));
+ var lq = (parseInt(route.linkQuality) || 0).toFixed(3);
+ var nlq = (parseInt(route.neighborLinkQuality) || 0).toFixed(3);
+
+ var tr = E('div', { 'class': 'tr cbi-section-table-row cbi-rowstyle-' + i + ' proto-' + route.proto }, [
+ route.proto === '6'
+ ? E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://[' + route.destinationIP + ']/cgi-bin-status.html' }, route.destinationIP)])
+ : E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://' + route.destinationIP + '/cgi-bin-status.html' }, route.destinationIP)]),
+ route.proto === '6'
+ ? E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://[' + route.lastHopIP + ']/cgi-bin-status.html' }, route.lastHopIP)])
+ : E('div', { 'class': 'td cbi-section-table-cell left' }, [E('a', { 'href': 'http://' + route.lastHopIP + '/cgi-bin-status.html' }, route.lastHopIP)]),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, lq),
+ E('div', { 'class': 'td cbi-section-table-cell left' }, nlq),
+ E('div', { 'class': 'td cbi-section-table-cell left', 'style': 'background-color:' + color }, cost),
+ ]);
+
+ table.appendChild(tr);
+ i = (i % 2) + 1;
+ }
+
+ var fieldset = E('fieldset', { 'class': 'cbi-section' }, [E('legend', {}, _('Overview of currently known OLSR nodes')), table]);
+
+ var h2 = E('h2', { 'name': 'content' }, _('Active OLSR nodes'));
+ var divToggleButtons = E('div', { 'id': 'togglebuttons' });
+ var statusOlsrLegend = E('div', {}, [
+ E('h3', {}, [_('Legend') + ':']),
+ E('ul', {}, [
+ E('li', {}, [E('strong', {}, [_('LQ: ')]), _('Success rate of packages received from the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('NLQ: ')]), _('Success rate of packages sent to the neighbour')]),
+ E('li', {}, [E('strong', {}, [_('ETX: ')]), _('Expected retransmission count')]),
+ E('li', { style: 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (ETX < 2)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (2 < ETX < 4)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (4 < ETX < 10)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (ETX > 10)')]),
+ ]),
+ ]),
+ E('li', {}, [E('strong', {}, [_('SNR: ')]), _('Signal Noise Ratio in dB')]),
+ E('li', { 'style': 'list-style: none' }, [
+ E('ul', {}, [
+ E('li', {}, [E('strong', { 'style': 'color:#00cc00' }, [_('Green')]), ':', _('Very good (SNR > 30)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ffcb05' }, [_('Yellow')]), ':', _('Good (30 > SNR > 20)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#ff6600' }, [_('Orange')]), ':', _('Still usable (20 > SNR > 5)')]),
+ E('li', {}, [E('strong', { 'style': 'color:#bb3333' }, [_('Red')]), ':', _('Bad (SNR < 5)')]),
+ ]),
+ ]),
+ ]),
+ ]);
+
+ var statusOlsrCommonJs = null;
+
+ if (has_v4 && has_v6) {
+ statusOlsrCommonJs = E('script', { 'type': 'text/javascript', 'src': L.resource('common/common_js.js') });
+ }
+
+ var result = E([], {}, [h2, divToggleButtons, fieldset, statusOlsrLegend, statusOlsrCommonJs]);
+
+ return result;
+ })
+ .catch(function (error) {
+ console.error(error);
+ });
+ },
+ handleSaveApply: null,
+ handleSave: null,
+ handleReset: null,
+});
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr.lua b/applications/luci-app-olsr/luasrc/controller/olsr.lua
deleted file mode 100644
index 41897092f706..000000000000
--- a/applications/luci-app-olsr/luasrc/controller/olsr.lua
+++ /dev/null
@@ -1,412 +0,0 @@
-module("luci.controller.olsr", package.seeall)
-
-local neigh_table = nil
-local ifaddr_table = nil
-
-function index()
- local ipv4,ipv6
- if nixio.fs.access("/etc/config/olsrd") then
- ipv4 = 1
- end
- if nixio.fs.access("/etc/config/olsrd6") then
- ipv6 = 1
- end
- if not ipv4 and not ipv6 then
- return
- end
-
- require("luci.model.uci")
- local uci = luci.model.uci.cursor_state()
-
- uci:foreach("olsrd", "olsrd", function(s)
- if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw = true end
- end)
-
- local page = node("admin", "status", "olsr")
- page.target = template("status-olsr/overview")
- page.title = _("OLSR")
- page.subindex = true
- page.acl_depends = { "luci-app-olsr" }
-
- local page = node("admin", "status", "olsr", "json")
- page.target = call("action_json")
- page.title = nil
- page.leaf = true
-
- local page = node("admin", "status", "olsr", "neighbors")
- page.target = call("action_neigh")
- page.title = _("Neighbours")
- page.subindex = true
- page.order = 5
-
- local page = node("admin", "status", "olsr", "routes")
- page.target = call("action_routes")
- page.title = _("Routes")
- page.order = 10
-
- local page = node("admin", "status", "olsr", "topology")
- page.target = call("action_topology")
- page.title = _("Topology")
- page.order = 20
-
- local page = node("admin", "status", "olsr", "hna")
- page.target = call("action_hna")
- page.title = _("HNA")
- page.order = 30
-
- local page = node("admin", "status", "olsr", "mid")
- page.target = call("action_mid")
- page.title = _("MID")
- page.order = 50
-
- if has_smartgw then
- local page = node("admin", "status", "olsr", "smartgw")
- page.target = call("action_smartgw")
- page.title = _("SmartGW")
- page.order = 60
- end
-
- local page = node("admin", "status", "olsr", "interfaces")
- page.target = call("action_interfaces")
- page.title = _("Interfaces")
- page.order = 70
-
- odsp = entry(
- {"admin", "services", "olsrd", "display"},
- cbi("olsr/olsrddisplay"), _("Display")
- )
-end
-
-function action_json()
- local http = require "luci.http"
- local utl = require "luci.util"
- local uci = require "luci.model.uci".cursor()
- local jsonreq4
- local jsonreq6
-
- local v4_port = tonumber(uci:get("olsrd", "olsrd_jsoninfo", "port") or "") or 9090
- local v6_port = tonumber(uci:get("olsrd6", "olsrd_jsoninfo", "port") or "") or 9090
-
- jsonreq4 = utl.exec("(echo /all | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v4_port)
- jsonreq6 = utl.exec("(echo /all | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" % v6_port)
- http.prepare_content("application/json")
- if not jsonreq4 or jsonreq4 == "" then
- jsonreq4 = "{}"
- end
- if not jsonreq6 or jsonreq6 == "" then
- jsonreq6 = "{}"
- end
- http.write('{"v4":' .. jsonreq4 .. ', "v6":' .. jsonreq6 .. '}')
-end
-
-
-local function local_mac_lookup(ipaddr)
- local _, rt
- for _, rt in ipairs(luci.ip.routes({ type = 1, src = ipaddr })) do
- local link = rt.dev and luci.ip.link(rt.dev)
- local mac = link and luci.ip.checkmac(link.mac)
- if mac then return mac end
- end
-end
-
-local function remote_mac_lookup(ipaddr)
- local _, n
- for _, n in ipairs(luci.ip.neighbors({ dest = ipaddr })) do
- local mac = luci.ip.checkmac(n.mac)
- if mac then return mac end
- end
-end
-
-function action_neigh(json)
- local data, has_v4, has_v6, error = fetch_jsoninfo('links')
-
- if error then
- return
- end
-
- local uci = require "luci.model.uci".cursor_state()
- local resolve = uci:get("luci_olsr", "general", "resolve")
- local ntm = require "luci.model.network".init()
- local devices = ntm:get_wifidevs()
- local sys = require "luci.sys"
- local assoclist = {}
- local ntm = require "luci.model.network"
- local ipc = require "luci.ip"
- local nxo = require "nixio"
- local defaultgw
-
- ipc.routes({ family = 4, type = 1, dest_exact = "0.0.0.0/0" },
- function(rt) defaultgw = rt.gw end)
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.linkCost < b.linkCost
- else
- return a.proto < b.proto
- end
- end
-
- for _, dev in ipairs(devices) do
- for _, net in ipairs(dev:get_wifinets()) do
- local radio = net:get_device()
- assoclist[#assoclist+1] = {}
- assoclist[#assoclist]['ifname'] = net:ifname()
- assoclist[#assoclist]['network'] = net:network()[1]
- assoclist[#assoclist]['device'] = radio and radio:name() or nil
- assoclist[#assoclist]['list'] = net:assoclist()
- end
- end
-
- for k, v in ipairs(data) do
- local snr = 0
- local signal = 0
- local noise = 0
- local mac = ""
- local ip
- local neihgt = {}
-
- if resolve == "1" then
- hostname = nixio.getnameinfo(v.remoteIP, nil, 100)
- if hostname then
- v.hostname = hostname
- end
- end
-
- local interface = ntm:get_status_by_address(v.localIP)
- local lmac = local_mac_lookup(v.localIP)
- local rmac = remote_mac_lookup(v.remoteIP)
-
- for _, val in ipairs(assoclist) do
- if val.network == interface and val.list then
- local assocmac, assot
- for assocmac, assot in pairs(val.list) do
- if rmac == luci.ip.checkmac(assocmac) then
- signal = tonumber(assot.signal)
- noise = tonumber(assot.noise)
- snr = (noise*-1) - (signal*-1)
- end
- end
- end
- end
- if interface then
- v.interface = interface
- end
- v.snr = snr
- v.signal = signal
- v.noise = noise
- if rmac then
- v.remoteMAC = rmac
- end
- if lmac then
- v.localMAC = lmac
- end
-
- if defaultgw == v.remoteIP then
- v.defaultgw = 1
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/neighbors", {links=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_routes()
- local data, has_v4, has_v6, error = fetch_jsoninfo('routes')
- if error then
- return
- end
-
- local uci = require "luci.model.uci".cursor_state()
- local resolve = uci:get("luci_olsr", "general", "resolve")
-
- for k, v in ipairs(data) do
- if resolve == "1" then
- local hostname = nixio.getnameinfo(v.gateway, nil, 100)
- if hostname then
- v.hostname = hostname
- end
- end
- end
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.rtpMetricCost < b.rtpMetricCost
- else
- return a.proto < b.proto
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/routes", {routes=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_topology()
- local data, has_v4, has_v6, error = fetch_jsoninfo('topology')
- if error then
- return
- end
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.tcEdgeCost < b.tcEdgeCost
- else
- return a.proto < b.proto
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/topology", {routes=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_hna()
- local data, has_v4, has_v6, error = fetch_jsoninfo('hna')
- if error then
- return
- end
-
- local uci = require "luci.model.uci".cursor_state()
- local resolve = uci:get("luci_olsr", "general", "resolve")
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.genmask < b.genmask
- else
- return a.proto < b.proto
- end
- end
-
- for k, v in ipairs(data) do
- if resolve == "1" then
- hostname = nixio.getnameinfo(v.gateway, nil, 100)
- if hostname then
- v.hostname = hostname
- end
- end
- if v.validityTime then
- v.validityTime = tonumber(string.format("%.0f", v.validityTime / 1000))
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/hna", {hna=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_mid()
- local data, has_v4, has_v6, error = fetch_jsoninfo('mid')
- if error then
- return
- end
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.main.ipAddress < b.main.ipAddress
- else
- return a.proto < b.proto
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/mid", {mids=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_smartgw()
- local data, has_v4, has_v6, error = fetch_jsoninfo('gateways')
- if error then
- return
- end
-
- local function compare(a,b)
- if a.proto == b.proto then
- return a.cost < b.cost
- else
- return a.proto < b.proto
- end
- end
-
- table.sort(data.ipv4, compare)
- table.sort(data.ipv6, compare)
- luci.template.render("status-olsr/smartgw", {gws=data, has_v4=has_v4, has_v6=has_v6})
-end
-
-function action_interfaces()
- local data, has_v4, has_v6, error = fetch_jsoninfo('interfaces')
- local ntm = require "luci.model.network".init()
-
- if error then
- return
- end
-
- local function compare(a,b)
- return a.proto < b.proto
- end
-
- for k, v in ipairs(data) do
- local interface = ntm:get_status_by_address(v.olsrInterface.ipAddress)
- if interface then
- v.interface = interface
- end
- end
-
- table.sort(data, compare)
- luci.template.render("status-olsr/interfaces", {iface=data, has_v4=has_v4, has_v6=has_v6})
-end
-
--- Internal
-function fetch_jsoninfo(otable)
- local uci = require "luci.model.uci".cursor_state()
- local utl = require "luci.util"
- local json = require "luci.json"
- local IpVersion = uci:get_first("olsrd", "olsrd","IpVersion")
- local jsonreq4 = ""
- local jsonreq6 = ""
- local v4_port = tonumber(uci:get("olsrd", "olsrd_jsoninfo", "port") or "") or 9090
- local v6_port = tonumber(uci:get("olsrd6", "olsrd_jsoninfo", "port") or "") or 9090
-
- jsonreq4 = utl.exec("(echo /%s | nc 127.0.0.1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" %{ otable, v4_port })
- jsonreq6 = utl.exec("(echo /%s | nc ::1 %d | sed -n '/^[}{ ]/p') 2>/dev/null" %{ otable, v6_port })
- local jsondata4 = {}
- local jsondata6 = {}
- local data4 = {}
- local data6 = {}
- local has_v4 = False
- local has_v6 = False
-
- if jsonreq4 == '' and jsonreq6 == '' then
- luci.template.render("status-olsr/error_olsr")
- return nil, 0, 0, true
- end
-
- if jsonreq4 ~= "" then
- has_v4 = 1
- jsondata4 = json.decode(jsonreq4) or {}
- if otable == 'status' then
- data4 = jsondata4
- else
- data4 = jsondata4[otable] or {}
- end
-
- for k, v in ipairs(data4) do
- data4[k]['proto'] = '4'
- end
-
- end
- if jsonreq6 ~= "" then
- has_v6 = 1
- jsondata6 = json.decode(jsonreq6) or {}
- if otable == 'status' then
- data6 = jsondata6
- else
- data6 = jsondata6[otable] or {}
- end
- for k, v in ipairs(data6) do
- data6[k]['proto'] = '6'
- end
- end
-
- for k, v in ipairs(data6) do
- table.insert(data4, v)
- end
-
- return data4, has_v4, has_v6, false
-end
-
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr4.lua b/applications/luci-app-olsr/luasrc/controller/olsr4.lua
deleted file mode 100644
index 5c6d887cb2c5..000000000000
--- a/applications/luci-app-olsr/luasrc/controller/olsr4.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-module("luci.controller.olsr4", package.seeall)
-
-function index()
- if not nixio.fs.access("/etc/config/olsrd") then
- return
- end
-
- require("luci.model.uci")
- local uci = luci.model.uci.cursor_state()
-
- local ol = entry(
- {"admin", "services", "olsrd"},
- cbi("olsr/olsrd"), "OLSR IPv4"
- )
- ol.subindex = true
- ol.acl_depends = { "luci-app-olsr" }
-
- entry(
- {"admin", "services", "olsrd", "iface"},
- cbi("olsr/olsrdiface")
- ).leaf = true
-
- entry(
- {"admin", "services", "olsrd", "hna"},
- cbi("olsr/olsrdhna"), _("HNA Announcements")
- )
-
- oplg = entry(
- {"admin", "services", "olsrd", "plugins"},
- cbi("olsr/olsrdplugins"), _("Plugins")
- )
-
- oplg.leaf = true
- oplg.subindex = true
-
- local uci = require("luci.model.uci").cursor()
- uci:foreach("olsrd", "LoadPlugin",
- function (section)
- local lib = section.library
- entry(
- {"admin", "services", "olsrd", "plugins", lib },
- cbi("olsr/olsrdplugins"),
- nil --'Plugin "%s"' % lib:gsub("^olsrd_",""):gsub("%.so.+$","")
- )
- end
- )
-end
-
diff --git a/applications/luci-app-olsr/luasrc/controller/olsr6.lua b/applications/luci-app-olsr/luasrc/controller/olsr6.lua
deleted file mode 100644
index d09ad3398cc2..000000000000
--- a/applications/luci-app-olsr/luasrc/controller/olsr6.lua
+++ /dev/null
@@ -1,48 +0,0 @@
-module("luci.controller.olsr6", package.seeall)
-
-function index()
- if not nixio.fs.access("/etc/config/olsrd6") then
- return
- end
-
- require("luci.model.uci")
- local uci = luci.model.uci.cursor_state()
-
- local ol = entry(
- {"admin", "services", "olsrd6"},
- cbi("olsr/olsrd6"), "OLSR IPv6"
- )
- ol.subindex = true
- ol.acl_depends = { "luci-app-olsr" }
-
- entry(
- {"admin", "services", "olsrd6", "iface"},
- cbi("olsr/olsrdiface6")
- ).leaf = true
-
- entry(
- {"admin", "services", "olsrd6", "hna"},
- cbi("olsr/olsrdhna6"), _("HNA6 Announcements")
- )
-
- oplg = entry(
- {"admin", "services", "olsrd6", "plugins"},
- cbi("olsr/olsrdplugins6"), _("Plugins")
- )
-
- oplg.leaf = true
- oplg.subindex = true
-
- local uci = require("luci.model.uci").cursor()
- uci:foreach("olsrd6", "LoadPlugin",
- function (section)
- local lib = section.library
- entry(
- {"admin", "services", "olsrd6", "plugins", lib },
- cbi("olsr/olsrdplugins6"),
- nil --'Plugin "%s"' % lib:gsub("^olsrd_",""):gsub("%.so.+$","")
- )
- end
- )
-end
-
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
deleted file mode 100644
index bc04dbdc9f8c..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd.lua
+++ /dev/null
@@ -1,409 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2010 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-require("luci.tools.webadmin")
-local fs = require "nixio.fs"
-local util = require "luci.util"
-local ip = require "luci.ip"
-
-local has_ipip = fs.glob("/etc/modules.d/[0-9]*-ipip")()
-
-m = Map("olsrd", translate("OLSR Daemon"),
- translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
- "As such it allows mesh routing for any network equipment. "..
- "It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
- "Visit olsrd.org for help and documentation."))
-
-function m.on_parse()
- local has_defaults = false
-
- m.uci:foreach("olsrd", "InterfaceDefaults",
- function(s)
- has_defaults = true
- return false
- end)
-
- if not has_defaults then
- m.uci:section("olsrd", "InterfaceDefaults")
- end
-end
-
-function write_float(self, section, value)
- local n = tonumber(value)
- if n ~= nil then
- return Value.write(self, section, "%.1f" % n)
- end
-end
-
-s = m:section(TypedSection, "olsrd", translate("General settings"))
-s.anonymous = true
-
-s:tab("general", translate("General Settings"))
-s:tab("lquality", translate("Link Quality Settings"))
-s:tab("smartgw", translate("SmartGW"), not has_ipip and translate("Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not work, please install it."))
-s:tab("advanced", translate("Advanced Settings"))
-
-ipv = s:taboption("general", ListValue, "IpVersion", translate("Internet protocol"),
- translate("IP-version to use. If 6and4 is selected then one olsrd instance is started for each protocol."))
-ipv:value("4", "IPv4")
-ipv:value("6and4", "6and4")
-
-
-poll = s:taboption("advanced", Value, "Pollrate", translate("Pollrate"),
- translate("Polling rate for OLSR sockets in seconds. Default is 0.05."))
-poll.optional = true
-poll.datatype = "ufloat"
-poll.placeholder = "0.05"
-
-nicc = s:taboption("advanced", Value, "NicChgsPollInt", translate("Nic changes poll interval"),
- translate("Interval to poll network interfaces for configuration changes (in seconds). Default is \"2.5\"."))
-nicc.optional = true
-nicc.datatype = "ufloat"
-nicc.placeholder = "2.5"
-
-tos = s:taboption("advanced", Value, "TosValue", translate("TOS value"),
- translate("Type of service value for the IP header of control traffic. Default is \"16\"."))
-tos.optional = true
-tos.datatype = "uinteger"
-tos.placeholder = "16"
-
-fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
- translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
- "\"flat\" means that the metric value is always 2. This is the preferred value "..
- "because it helps the Linux kernel routing to clean up older routes. "..
- "\"correct\" uses the hopcount as the metric value. "..
- "\"approx\" uses the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
- "Default is \"flat\"."))
-fib:value("flat")
-fib:value("correct")
-fib:value("approx")
-
-lql = s:taboption("lquality", ListValue, "LinkQualityLevel", translate("LQ level"),
- translate("Link quality level switch between hopcount and cost-based (mostly ETX) routing.
"..
- "0 = do not use link quality
"..
- "2 = use link quality for MPR selection and routing
"..
- "Default is \"2\""))
-lql:value("2")
-lql:value("0")
-
-lqage = s:taboption("lquality", Value, "LinkQualityAging", translate("LQ aging"),
- translate("Link quality aging factor (only for lq level 2). Tuning parameter for etx_float and etx_fpm, smaller values "..
- "mean slower changes of ETX value. (allowed values are between 0.01 and 1.0)"))
-lqage.optional = true
-lqage:depends("LinkQualityLevel", "2")
-
-lqa = s:taboption("lquality", ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"),
- translate("Link quality algorithm (only for lq level 2).
"..
- "etx_float: floating point ETX with exponential aging
"..
- "etx_fpm : same as etx_float, but with integer arithmetic
"..
- "etx_ff : ETX freifunk, an etx variant which use all OLSR traffic (instead of only hellos) for ETX calculation
"..
- "etx_ffeth: incompatible variant of etx_ff that allows ethernet links with ETX 0.1.
"..
- "Defaults to \"etx_ff\""))
-lqa.optional = true
-lqa:value("etx_ff")
-lqa:value("etx_fpm")
-lqa:value("etx_float")
-lqa:value("etx_ffeth")
-lqa:depends("LinkQualityLevel", "2")
-lqa.optional = true
-
-lqfish = s:taboption("lquality", Flag, "LinkQualityFishEye", translate("LQ fisheye"),
- translate("Fisheye mechanism for TCs (checked means on). Default is \"on\""))
-lqfish.default = "1"
-lqfish.optional = true
-
-hyst = s:taboption("lquality", Flag, "UseHysteresis", translate("Use hysteresis"),
- translate("Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more robustness to the link sensing "..
- "but delays neighbor registration. Defaults is \"yes\""))
-hyst.default = "yes"
-hyst.enabled = "yes"
-hyst.disabled = "no"
-hyst:depends("LinkQualityLevel", "0")
-hyst.optional = true
-hyst.rmempty = true
-
-port = s:taboption("general", Value, "OlsrPort", translate("Port"),
- translate("The port OLSR uses. This should usually stay at the IANA assigned port 698. It can have a value between 1 and 65535."))
-port.optional = true
-port.default = "698"
-port.rmempty = true
-
-mainip = s:taboption("general", Value, "MainIp", translate("Main IP"),
- translate("Sets the main IP (originator ip) of the router. This IP will NEVER change during the uptime of olsrd. "..
- "Default is 0.0.0.0, which triggers usage of the IP of the first interface."))
-mainip.optional = true
-mainip.rmempty = true
-mainip.datatype = "ipaddr"
-mainip.placeholder = "0.0.0.0"
-
-sgw = s:taboption("smartgw", Flag, "SmartGateway", translate("Enable"), translate("Enable SmartGateway. If it is disabled, then " ..
- "all other SmartGateway parameters are ignored. Default is \"no\"."))
-sgw.default="no"
-sgw.enabled="yes"
-sgw.disabled="no"
-sgw.rmempty = true
-
-sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing IPv4 gateway with NAT"))
-sgwnat:depends("SmartGateway", "yes")
-sgwnat.default="yes"
-sgwnat.enabled="yes"
-sgwnat.disabled="no"
-sgwnat.optional = true
-sgwnat.rmempty = true
-
-sgwuplink = s:taboption("smartgw", ListValue, "SmartGatewayUplink", translate("Announce uplink"), translate("Which kind of uplink is exported to the other mesh nodes. " ..
- "An uplink is detected by looking for a local HNA of 0.0.0.0/0, ::ffff:0:0/96 or 2000::/3. Default setting is \"both\"."))
-sgwuplink:value("none")
-sgwuplink:value("ipv4")
-sgwuplink:value("ipv6")
-sgwuplink:value("both")
-sgwuplink:depends("SmartGateway", "yes")
-sgwuplink.default="both"
-sgwuplink.optional = true
-sgwuplink.rmempty = true
-
-sgwulnat = s:taboption("smartgw", Flag, "SmartGatewayUplinkNAT", translate("Uplink uses NAT"), translate("If this Node uses NAT for connections to the internet. " ..
- "Default is \"yes\"."))
-sgwulnat:depends("SmartGatewayUplink", "ipv4")
-sgwulnat:depends("SmartGatewayUplink", "both")
-sgwulnat.default="yes"
-sgwulnat.enabled="yes"
-sgwulnat.disabled="no"
-sgwnat.optional = true
-sgwnat.rmempty = true
-
-sgwspeed = s:taboption("smartgw", Value, "SmartGatewaySpeed", translate("Speed of the uplink"), translate("Specifies the speed of "..
- "the uplink in kilobits/s. First parameter is upstream, second parameter is downstream. Default is \"128 1024\"."))
-sgwspeed:depends("SmartGatewayUplink", "ipv4")
-sgwspeed:depends("SmartGatewayUplink", "ipv6")
-sgwspeed:depends("SmartGatewayUplink", "both")
-sgwspeed.optional = true
-sgwspeed.rmempty = true
-
-sgwprefix = s:taboption("smartgw", Value, "SmartGatewayPrefix", translate("IPv6-Prefix of the uplink"), translate("This can be used " ..
- "to signal the external IPv6 prefix of the uplink to the clients. This might allow a client to change it's local IPv6 address to " ..
- "use the IPv6 gateway without any kind of address translation. The maximum prefix length is 64 bits. " ..
- "Default is \"::/0\" (no prefix)."))
-sgwprefix:depends("SmartGatewayUplink", "ipv6")
-sgwprefix:depends("SmartGatewayUplink", "both")
-sgwprefix.optional = true
-sgwprefix.rmempty = true
-
-willingness = s:taboption("advanced", ListValue, "Willingness", translate("Willingness"),
- translate("The fixed willingness to use. If not set willingness will be calculated dynamically based on battery/power status. Default is \"3\"."))
-for i=0,7 do
- willingness:value(i)
-end
-willingness.optional = true
-willingness.default = "3"
-
-natthr = s:taboption("advanced", Value, "NatThreshold", translate("NAT threshold"),
- translate("If the route to the current gateway is to be changed, the ETX value of this gateway is "..
- "multiplied with this value before it is compared to the new one. "..
- "The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 if changed.
"..
- "WARNING: This parameter should not be used together with the etx_ffeth metric!
"..
- "Defaults to \"1.0\"."))
-for i=1,0.1,-0.1 do
- natthr:value(i)
-end
-natthr:depends("LinkQualityAlgorithm", "etx_ff")
-natthr:depends("LinkQualityAlgorithm", "etx_float")
-natthr:depends("LinkQualityAlgorithm", "etx_fpm")
-natthr.default = "1.0"
-natthr.optional = true
-natthr.write = write_float
-
-
-i = m:section(TypedSection, "InterfaceDefaults", translate("Interfaces Defaults"))
-i.anonymous = true
-i.addremove = false
-
-i:tab("general", translate("General Settings"))
-i:tab("addrs", translate("IP Addresses"))
-i:tab("timing", translate("Timing and Validity"))
-
-mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
-mode:value("mesh")
-mode:value("ether")
-mode.optional = true
-mode.rmempty = true
-
-
-weight = i:taboption("general", Value, "Weight", translate("Weight"),
- translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
- "Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
- "but here you can specify a fixed value. Olsrd will choose links with the lowest value.
"..
- "Note: Interface weight is used only when LinkQualityLevel is set to 0. "..
- "For any other value of LinkQualityLevel, the interface ETX value is used instead."))
-weight.optional = true
-weight.datatype = "uinteger"
-weight.placeholder = "0"
-
-lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
- translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
- "It is only used when LQ-Level is greater than 0. Examples:
"..
- "reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5
"..
- "reduce LQ to all nodes on this interface by 20%: default 0.8"))
-lqmult.optional = true
-lqmult.rmempty = true
-lqmult.cast = "table"
-lqmult.placeholder = "default 1.0"
-
-function lqmult.validate(self, value)
- for _, v in pairs(value) do
- if v ~= "" then
- local val = util.split(v, " ")
- local host = val[1]
- local mult = val[2]
- if not host or not mult then
- return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.")
- end
- if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then
- return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'")
- end
- if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
- return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
- end
- if not mult:match("[0-1]%.[0-9]+") then
- return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
- end
- end
- end
- return value
-end
-
-ip4b = i:taboption("addrs", Value, "Ip4Broadcast", translate("IPv4 broadcast"),
- translate("IPv4 broadcast address for outgoing OLSR packets. One useful example would be 255.255.255.255. "..
- "Default is \"0.0.0.0\", which triggers the usage of the interface broadcast IP."))
-ip4b.optional = true
-ip4b.datatype = "ip4addr"
-ip4b.placeholder = "0.0.0.0"
-
-ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
- translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
-ip6m.optional = true
-ip6m.datatype = "ip6addr"
-ip6m.placeholder = "FF02::6D"
-
-ip4s = i:taboption("addrs", Value, "IPv4Src", translate("IPv4 source"),
- translate("IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which triggers usage of the interface IP."))
-ip4s.optional = true
-ip4s.datatype = "ip4addr"
-ip4s.placeholder = "0.0.0.0"
-
-ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
- translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
- "Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
-ip6s.optional = true
-ip6s.datatype = "ip6addr"
-ip6s.placeholder = "0::/0"
-
-
-hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
-hi.optional = true
-hi.datatype = "ufloat"
-hi.placeholder = "5.0"
-hi.write = write_float
-
-hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
-hv.optional = true
-hv.datatype = "ufloat"
-hv.placeholder = "40.0"
-hv.write = write_float
-
-ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
-ti.optional = true
-ti.datatype = "ufloat"
-ti.placeholder = "2.0"
-ti.write = write_float
-
-tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
-tv.optional = true
-tv.datatype = "ufloat"
-tv.placeholder = "256.0"
-tv.write = write_float
-
-mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
-mi.optional = true
-mi.datatype = "ufloat"
-mi.placeholder = "18.0"
-mi.write = write_float
-
-mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
-mv.optional = true
-mv.datatype = "ufloat"
-mv.placeholder = "324.0"
-mv.write = write_float
-
-ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
-ai.optional = true
-ai.datatype = "ufloat"
-ai.placeholder = "18.0"
-ai.write = write_float
-
-av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
-av.optional = true
-av.datatype = "ufloat"
-av.placeholder = "108.0"
-av.write = write_float
-
-
-ifs = m:section(TypedSection, "Interface", translate("Interfaces"))
-ifs.addremove = true
-ifs.anonymous = true
-ifs.extedit = luci.dispatcher.build_url("admin/services/olsrd/iface/%s")
-ifs.template = "cbi/tblsection"
-
-function ifs.create(...)
- local sid = TypedSection.create(...)
- luci.http.redirect(ifs.extedit % sid)
-end
-
-ign = ifs:option(Flag, "ignore", translate("Enable"))
-ign.enabled = "0"
-ign.disabled = "1"
-ign.rmempty = false
-function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
-end
-
-network = ifs:option(DummyValue, "interface", translate("Network"))
-network.template = "cbi/network_netinfo"
-
-mode = ifs:option(DummyValue, "Mode", translate("Mode"))
-function mode.cfgvalue(...)
- return Value.cfgvalue(...) or m.uci:get_first("olsrd", "InterfaceDefaults", "Mode", "mesh")
-end
-
-hello = ifs:option(DummyValue, "_hello", translate("Hello"))
-function hello.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd", section, "HelloInterval")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HelloInterval", 5))
- local v = tonumber(m.uci:get("olsrd", section, "HelloValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HelloValidityTime", 40))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-tc = ifs:option(DummyValue, "_tc", translate("TC"))
-function tc.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd", section, "TcInterval")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "TcInterval", 2))
- local v = tonumber(m.uci:get("olsrd", section, "TcValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "TcValidityTime", 256))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-mid = ifs:option(DummyValue, "_mid", translate("MID"))
-function mid.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd", section, "MidInterval")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "MidInterval", 18))
- local v = tonumber(m.uci:get("olsrd", section, "MidValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "MidValidityTime", 324))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-hna = ifs:option(DummyValue, "_hna", translate("HNA"))
-function hna.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd", section, "HnaInterval")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HnaInterval", 18))
- local v = tonumber(m.uci:get("olsrd", section, "HnaValidityTime")) or tonumber(m.uci:get_first("olsrd", "InterfaceDefaults", "HnaValidityTime", 108))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-return m
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
deleted file mode 100644
index 8418a07ba6c7..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrd6.lua
+++ /dev/null
@@ -1,390 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2010 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-require("luci.tools.webadmin")
-local fs = require "nixio.fs"
-local util = require "luci.util"
-local ip = require "luci.ip"
-
-local has_ipip = fs.glob("/etc/modules.d/[0-9]*-ipip")()
-
-m = Map("olsrd6", translate("OLSR Daemon"),
- translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
- "As such it allows mesh routing for any network equipment. "..
- "It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
- "Visit olsrd.org for help and documentation."))
-
-function m.on_parse()
- local has_defaults = false
-
- m.uci:foreach("olsrd6", "InterfaceDefaults",
- function(s)
- has_defaults = true
- return false
- end)
-
- if not has_defaults then
- m.uci:section("olsrd6", "InterfaceDefaults")
- end
-end
-
-function write_float(self, section, value)
- local n = tonumber(value)
- if n ~= nil then
- return Value.write(self, section, "%.1f" % n)
- end
-end
-
-s = m:section(TypedSection, "olsrd6", translate("General settings"))
-s.anonymous = true
-
-s:tab("general", translate("General Settings"))
-s:tab("lquality", translate("Link Quality Settings"))
-s:tab("smartgw", translate("SmartGW"), not has_ipip and translate("Warning: kmod-ipip is not installed. Without kmod-ipip SmartGateway will not work, please install it."))
-s:tab("advanced", translate("Advanced Settings"))
-
-poll = s:taboption("advanced", Value, "Pollrate", translate("Pollrate"),
- translate("Polling rate for OLSR sockets in seconds. Default is 0.05."))
-poll.optional = true
-poll.datatype = "ufloat"
-poll.placeholder = "0.05"
-
-nicc = s:taboption("advanced", Value, "NicChgsPollInt", translate("Nic changes poll interval"),
- translate("Interval to poll network interfaces for configuration changes (in seconds). Default is \"2.5\"."))
-nicc.optional = true
-nicc.datatype = "ufloat"
-nicc.placeholder = "2.5"
-
-tos = s:taboption("advanced", Value, "TosValue", translate("TOS value"),
- translate("Type of service value for the IP header of control traffic. Default is \"16\"."))
-tos.optional = true
-tos.datatype = "uinteger"
-tos.placeholder = "16"
-
-fib = s:taboption("general", ListValue, "FIBMetric", translate("FIB metric"),
- translate ("FIBMetric controls the metric value of the host-routes OLSRd sets. "..
- "\"flat\" means that the metric value is always 2. This is the preferred value "..
- "because it helps the Linux kernel routing to clean up older routes. "..
- "\"correct\" uses the hopcount as the metric value. "..
- "\"approx\" uses the hopcount as the metric value too, but does only update the hopcount if the nexthop changes too. "..
- "Default is \"flat\"."))
-fib:value("flat")
-fib:value("correct")
-fib:value("approx")
-
-lql = s:taboption("lquality", ListValue, "LinkQualityLevel", translate("LQ level"),
- translate("Link quality level switch between hopcount and cost-based (mostly ETX) routing.
"..
- "0 = do not use link quality
"..
- "2 = use link quality for MPR selection and routing
"..
- "Default is \"2\""))
-lql:value("2")
-lql:value("0")
-
-lqage = s:taboption("lquality", Value, "LinkQualityAging", translate("LQ aging"),
- translate("Link quality aging factor (only for lq level 2). Tuning parameter for etx_float and etx_fpm, smaller values "..
- "mean slower changes of ETX value. (allowed values are between 0.01 and 1.0)"))
-lqage.optional = true
-lqage:depends("LinkQualityLevel", "2")
-
-lqa = s:taboption("lquality", ListValue, "LinkQualityAlgorithm", translate("LQ algorithm"),
- translate("Link quality algorithm (only for lq level 2).
"..
- "etx_float: floating point ETX with exponential aging
"..
- "etx_fpm : same as etx_float, but with integer arithmetic
"..
- "etx_ff : ETX freifunk, an etx variant which use all OLSR traffic (instead of only hellos) for ETX calculation
"..
- "etx_ffeth: incompatible variant of etx_ff that allows ethernet links with ETX 0.1.
"..
- "Defaults to \"etx_ff\""))
-lqa.optional = true
-lqa:value("etx_ff")
-lqa:value("etx_fpm")
-lqa:value("etx_float")
-lqa:value("etx_ffeth")
-lqa:depends("LinkQualityLevel", "2")
-lqa.optional = true
-
-lqfish = s:taboption("lquality", Flag, "LinkQualityFishEye", translate("LQ fisheye"),
- translate("Fisheye mechanism for TCs (checked means on). Default is \"on\""))
-lqfish.default = "1"
-lqfish.optional = true
-
-hyst = s:taboption("lquality", Flag, "UseHysteresis", translate("Use hysteresis"),
- translate("Hysteresis for link sensing (only for hopcount metric). Hysteresis adds more robustness to the link sensing "..
- "but delays neighbor registration. Defaults is \"yes\""))
-hyst.default = "yes"
-hyst.enabled = "yes"
-hyst.disabled = "no"
-hyst:depends("LinkQualityLevel", "0")
-hyst.optional = true
-hyst.rmempty = true
-
-port = s:taboption("general", Value, "OlsrPort", translate("Port"),
- translate("The port OLSR uses. This should usually stay at the IANA assigned port 698. It can have a value between 1 and 65535."))
-port.optional = true
-port.default = "698"
-port.rmempty = true
-
-mainip = s:taboption("general", Value, "MainIp", translate("Main IP"),
- translate("Sets the main IP (originator ip) of the router. This IP will NEVER change during the uptime of olsrd. "..
- "Default is ::, which triggers usage of the IP of the first interface."))
-mainip.optional = true
-mainip.rmempty = true
-mainip.datatype = "ipaddr"
-mainip.placeholder = "::"
-
-sgw = s:taboption("smartgw", Flag, "SmartGateway", translate("Enable"), translate("Enable SmartGateway. If it is disabled, then " ..
- "all other SmartGateway parameters are ignored. Default is \"no\"."))
-sgw.default="no"
-sgw.enabled="yes"
-sgw.disabled="no"
-sgw.rmempty = true
-
-sgwnat = s:taboption("smartgw", Flag, "SmartGatewayAllowNAT", translate("Allow gateways with NAT"), translate("Allow the selection of an outgoing IPv4 gateway with NAT"))
-sgwnat:depends("SmartGateway", "yes")
-sgwnat.default="yes"
-sgwnat.enabled="yes"
-sgwnat.disabled="no"
-sgwnat.optional = true
-sgwnat.rmempty = true
-
-sgwuplink = s:taboption("smartgw", ListValue, "SmartGatewayUplink", translate("Announce uplink"), translate("Which kind of uplink is exported to the other mesh nodes. " ..
- "An uplink is detected by looking for a local HNA6 ::ffff:0:0/96 or 2000::/3. Default setting is \"both\"."))
-sgwuplink:value("none")
-sgwuplink:value("ipv4")
-sgwuplink:value("ipv6")
-sgwuplink:value("both")
-sgwuplink:depends("SmartGateway", "yes")
-sgwuplink.default="both"
-sgwuplink.optional = true
-sgwuplink.rmempty = true
-
-sgwulnat = s:taboption("smartgw", Flag, "SmartGatewayUplinkNAT", translate("Uplink uses NAT"), translate("If this Node uses NAT for connections to the internet. " ..
- "Default is \"yes\"."))
-sgwulnat:depends("SmartGatewayUplink", "ipv4")
-sgwulnat:depends("SmartGatewayUplink", "both")
-sgwulnat.default="yes"
-sgwulnat.enabled="yes"
-sgwulnat.disabled="no"
-sgwnat.optional = true
-sgwnat.rmempty = true
-
-sgwspeed = s:taboption("smartgw", Value, "SmartGatewaySpeed", translate("Speed of the uplink"), translate("Specifies the speed of "..
- "the uplink in kilobits/s. First parameter is upstream, second parameter is downstream. Default is \"128 1024\"."))
-sgwspeed:depends("SmartGatewayUplink", "ipv4")
-sgwspeed:depends("SmartGatewayUplink", "ipv6")
-sgwspeed:depends("SmartGatewayUplink", "both")
-sgwspeed.optional = true
-sgwspeed.rmempty = true
-
-sgwprefix = s:taboption("smartgw", Value, "SmartGatewayPrefix", translate("IPv6-Prefix of the uplink"), translate("This can be used " ..
- "to signal the external IPv6 prefix of the uplink to the clients. This might allow a client to change it's local IPv6 address to " ..
- "use the IPv6 gateway without any kind of address translation. The maximum prefix length is 64 bits. " ..
- "Default is \"::/0\" (no prefix)."))
-sgwprefix:depends("SmartGatewayUplink", "ipv6")
-sgwprefix:depends("SmartGatewayUplink", "both")
-sgwprefix.optional = true
-sgwprefix.rmempty = true
-
-willingness = s:taboption("advanced", ListValue, "Willingness", translate("Willingness"),
- translate("The fixed willingness to use. If not set willingness will be calculated dynamically based on battery/power status. Default is \"3\"."))
-for i=0,7 do
- willingness:value(i)
-end
-willingness.optional = true
-willingness.default = "3"
-
-natthr = s:taboption("advanced", Value, "NatThreshold", translate("NAT threshold"),
- translate("If the route to the current gateway is to be changed, the ETX value of this gateway is "..
- "multiplied with this value before it is compared to the new one. "..
- "The parameter can be a value between 0.1 and 1.0, but should be close to 1.0 if changed.
"..
- "WARNING: This parameter should not be used together with the etx_ffeth metric!
"..
- "Defaults to \"1.0\"."))
-for i=1,0.1,-0.1 do
- natthr:value(i)
-end
-natthr:depends("LinkQualityAlgorithm", "etx_ff")
-natthr:depends("LinkQualityAlgorithm", "etx_float")
-natthr:depends("LinkQualityAlgorithm", "etx_fpm")
-natthr.default = "1.0"
-natthr.optional = true
-natthr.write = write_float
-
-
-i = m:section(TypedSection, "InterfaceDefaults", translate("Interfaces Defaults"))
-i.anonymous = true
-i.addremove = false
-
-i:tab("general", translate("General Settings"))
-i:tab("addrs", translate("IP Addresses"))
-i:tab("timing", translate("Timing and Validity"))
-
-mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
-mode:value("mesh")
-mode:value("ether")
-mode.optional = true
-mode.rmempty = true
-
-
-weight = i:taboption("general", Value, "Weight", translate("Weight"),
- translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
- "Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
- "but here you can specify a fixed value. Olsrd will choose links with the lowest value.
"..
- "Note: Interface weight is used only when LinkQualityLevel is set to 0. "..
- "For any other value of LinkQualityLevel, the interface ETX value is used instead."))
-weight.optional = true
-weight.datatype = "uinteger"
-weight.placeholder = "0"
-
-lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
- translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
- "It is only used when LQ-Level is greater than 0. Examples:
"..
- "reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5
"..
- "reduce LQ to all nodes on this interface by 20%: default 0.8"))
-lqmult.optional = true
-lqmult.rmempty = true
-lqmult.cast = "table"
-lqmult.placeholder = "default 1.0"
-
-function lqmult.validate(self, value)
- for _, v in pairs(value) do
- if v ~= "" then
- local val = util.split(v, " ")
- local host = val[1]
- local mult = val[2]
- if not host or not mult then
- return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.")
- end
- if not (host == "default" or ip.IPv6(host)) then
- return nil, translate("Can only be a valid IPv6 address or 'default'")
- end
- if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
- return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
- end
- if not mult:match("[0-1]%.[0-9]+") then
- return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
- end
- end
- end
- return value
-end
-
-ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
- translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
-ip6m.optional = true
-ip6m.datatype = "ip6addr"
-ip6m.placeholder = "FF02::6D"
-
-ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
- translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
- "Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
-ip6s.optional = true
-ip6s.datatype = "ip6addr"
-ip6s.placeholder = "0::/0"
-
-
-hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
-hi.optional = true
-hi.datatype = "ufloat"
-hi.placeholder = "5.0"
-hi.write = write_float
-
-hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
-hv.optional = true
-hv.datatype = "ufloat"
-hv.placeholder = "40.0"
-hv.write = write_float
-
-ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
-ti.optional = true
-ti.datatype = "ufloat"
-ti.placeholder = "2.0"
-ti.write = write_float
-
-tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
-tv.optional = true
-tv.datatype = "ufloat"
-tv.placeholder = "256.0"
-tv.write = write_float
-
-mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
-mi.optional = true
-mi.datatype = "ufloat"
-mi.placeholder = "18.0"
-mi.write = write_float
-
-mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
-mv.optional = true
-mv.datatype = "ufloat"
-mv.placeholder = "324.0"
-mv.write = write_float
-
-ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
-ai.optional = true
-ai.datatype = "ufloat"
-ai.placeholder = "18.0"
-ai.write = write_float
-
-av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
-av.optional = true
-av.datatype = "ufloat"
-av.placeholder = "108.0"
-av.write = write_float
-
-
-ifs = m:section(TypedSection, "Interface", translate("Interfaces"))
-ifs.addremove = true
-ifs.anonymous = true
-ifs.extedit = luci.dispatcher.build_url("admin/services/olsrd6/iface/%s")
-ifs.template = "cbi/tblsection"
-
-function ifs.create(...)
- local sid = TypedSection.create(...)
- luci.http.redirect(ifs.extedit % sid)
-end
-
-ign = ifs:option(Flag, "ignore", translate("Enable"))
-ign.enabled = "0"
-ign.disabled = "1"
-ign.rmempty = false
-function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
-end
-
-network = ifs:option(DummyValue, "interface", translate("Network"))
-network.template = "cbi/network_netinfo"
-
-mode = ifs:option(DummyValue, "Mode", translate("Mode"))
-function mode.cfgvalue(...)
- return Value.cfgvalue(...) or m.uci:get_first("olsrd6", "InterfaceDefaults", "Mode", "mesh")
-end
-
-hello = ifs:option(DummyValue, "_hello", translate("Hello"))
-function hello.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd6", section, "HelloInterval")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HelloInterval", 5))
- local v = tonumber(m.uci:get("olsrd6", section, "HelloValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HelloValidityTime", 40))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-tc = ifs:option(DummyValue, "_tc", translate("TC"))
-function tc.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd6", section, "TcInterval")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "TcInterval", 2))
- local v = tonumber(m.uci:get("olsrd6", section, "TcValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "TcValidityTime", 256))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-mid = ifs:option(DummyValue, "_mid", translate("MID"))
-function mid.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd6", section, "MidInterval")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "MidInterval", 18))
- local v = tonumber(m.uci:get("olsrd6", section, "MidValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "MidValidityTime", 324))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-hna = ifs:option(DummyValue, "_hna", translate("HNA"))
-function hna.cfgvalue(self, section)
- local i = tonumber(m.uci:get("olsrd6", section, "HnaInterval")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HnaInterval", 18))
- local v = tonumber(m.uci:get("olsrd6", section, "HnaValidityTime")) or tonumber(m.uci:get_first("olsrd6", "InterfaceDefaults", "HnaValidityTime", 108))
- return "%.01fs / %.01fs" %{ i, v }
-end
-
-return m
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
deleted file mode 100644
index aadb44f37780..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrddisplay.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- Copyright 2011 Manuel Munz
--- Licensed to the public under the Apache License 2.0.
-
-m = Map("luci_olsr", translate("OLSR - Display Options"))
-
-s = m:section(TypedSection, "olsr")
-s.anonymous = true
-
-res = s:option(Flag, "resolve", translate("Resolve"),
- translate("Resolve hostnames on status pages. It is generally safe to allow this, but if you use public IPs and have unstable DNS-Setup then those pages will load really slow. In this case disable it here."))
-res.default = "0"
-res.optional = true
-
-return m
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
deleted file mode 100644
index 230990dd0a1c..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna.lua
+++ /dev/null
@@ -1,45 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2011 Manuel Munz
--- Licensed to the public under the Apache License 2.0.
-
-local uci = require "luci.model.uci".cursor()
-local ipv = uci:get_first("olsrd", "olsrd", "IpVersion", "4")
-
-mh = Map("olsrd", translate("OLSR - HNA-Announcements"), translate("Hosts in an OLSR routed network can announce connectivity " ..
- "to external networks using HNA messages."))
-
-if ipv == "6and4" or ipv == "4" then
- hna4 = mh:section(TypedSection, "Hna4", translate("Hna4"), translate("Both values must use the dotted decimal notation."))
- hna4.addremove = true
- hna4.anonymous = true
- hna4.template = "cbi/tblsection"
-
- net4 = hna4:option(Value, "netaddr", translate("Network address"))
- net4.datatype = "ip4addr"
- net4.placeholder = "10.11.12.13"
- net4.default = "10.11.12.13"
- msk4 = hna4:option(Value, "netmask", translate("Netmask"))
- msk4.datatype = "ip4addr"
- msk4.placeholder = "255.255.255.255"
- msk4.default = "255.255.255.255"
-end
-
-if ipv == "6and4" or ipv == "6" then
- hna6 = mh:section(TypedSection, "Hna6", translate("Hna6"), translate("IPv6 network must be given in full notation, " ..
- "prefix must be in CIDR notation."))
- hna6.addremove = true
- hna6.anonymous = true
- hna6.template = "cbi/tblsection"
-
- net6 = hna6:option(Value, "netaddr", translate("Network address"))
- net6.datatype = "ip6addr"
- net6.placeholder = "fec0:2200:106:0:0:0:0:0"
- net6.default = "fec0:2200:106:0:0:0:0:0"
- msk6 = hna6:option(Value, "prefix", translate("Prefix"))
- msk6.datatype = "range(0,128)"
- msk6.placeholder = "128"
- msk6.default = "128"
-end
-
-return mh
-
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
deleted file mode 100644
index 717436b13005..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdhna6.lua
+++ /dev/null
@@ -1,25 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2011 Manuel Munz
--- Licensed to the public under the Apache License 2.0.
-
-local uci = require "luci.model.uci".cursor()
-
-mh = Map("olsrd6", translate("OLSR - HNA6-Announcements"), translate("Hosts in an OLSR routed network can announce connectivity " ..
- "to external networks using HNA6 messages."))
-
- hna6 = mh:section(TypedSection, "Hna6", translate("Hna6"), translate("IPv6 network must be given in full notation, " ..
- "prefix must be in CIDR notation."))
- hna6.addremove = true
- hna6.anonymous = true
- hna6.template = "cbi/tblsection"
-
- net6 = hna6:option(Value, "netaddr", translate("Network address"))
- net6.datatype = "ip6addr"
- net6.placeholder = "fec0:2200:106:0:0:0:0:0"
- net6.default = "fec0:2200:106:0:0:0:0:0"
- msk6 = hna6:option(Value, "prefix", translate("Prefix"))
- msk6.datatype = "range(0,128)"
- msk6.placeholder = "128"
- msk6.default = "128"
-return mh
-
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
deleted file mode 100644
index df757c641b11..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface.lua
+++ /dev/null
@@ -1,177 +0,0 @@
--- Copyright 2010 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-local util = require "luci.util"
-local ip = require "luci.ip"
-
-function write_float(self, section, value)
- local n = tonumber(value)
- if n ~= nil then
- return Value.write(self, section, "%.1f" % n)
- end
-end
-
-m = Map("olsrd", translate("OLSR Daemon - Interface"),
- translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
- "As such it allows mesh routing for any network equipment. "..
- "It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
- "Visit olsrd.org for help and documentation."))
-
-m.redirect = luci.dispatcher.build_url("admin/services/olsrd")
-
-if not arg[1] or m.uci:get("olsrd", arg[1]) ~= "Interface" then
- luci.http.redirect(m.redirect)
- return
-end
-
-i = m:section(NamedSection, arg[1], "Interface", translate("Interface"))
-i.anonymous = true
-i.addremove = false
-
-i:tab("general", translate("General Settings"))
-i:tab("addrs", translate("IP Addresses"))
-i:tab("timing", translate("Timing and Validity"))
-
-ign = i:taboption("general", Flag, "ignore", translate("Enable"),
- translate("Enable this interface."))
-ign.enabled = "0"
-ign.disabled = "1"
-ign.rmempty = false
-function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
-end
-
-network = i:taboption("general", Value, "interface", translate("Network"),
- translate("The interface OLSRd should serve."))
-
-network.template = "cbi/network_netlist"
-network.widget = "radio"
-network.nocreate = true
-
-mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
-mode:value("mesh")
-mode:value("ether")
-mode.optional = true
-mode.rmempty = true
-
-
-weight = i:taboption("general", Value, "Weight", translate("Weight"),
- translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
- "Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
- "but here you can specify a fixed value. Olsrd will choose links with the lowest value.
"..
- "Note: Interface weight is used only when LinkQualityLevel is set to 0. "..
- "For any other value of LinkQualityLevel, the interface ETX value is used instead."))
-weight.optional = true
-weight.datatype = "uinteger"
-weight.placeholder = "0"
-
-lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
- translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
- "It is only used when LQ-Level is greater than 0. Examples:
"..
- "reduce LQ to 192.168.0.1 by half: 192.168.0.1 0.5
"..
- "reduce LQ to all nodes on this interface by 20%: default 0.8"))
-lqmult.optional = true
-lqmult.rmempty = true
-lqmult.cast = "table"
-lqmult.placeholder = "default 1.0"
-
-function lqmult.validate(self, value)
- for _, v in pairs(value) do
- if v ~= "" then
- local val = util.split(v, " ")
- local host = val[1]
- local mult = val[2]
- if not host or not mult then
- return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.")
- end
- if not (host == "default" or ip.IPv4(host) or ip.IPv6(host)) then
- return nil, translate("Can only be a valid IPv4 or IPv6 address or 'default'")
- end
- if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
- return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
- end
- if not mult:match("[0-1]%.[0-9]+") then
- return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
- end
- end
- end
- return value
-end
-
-ip4b = i:taboption("addrs", Value, "Ip4Broadcast", translate("IPv4 broadcast"),
- translate("IPv4 broadcast address for outgoing OLSR packets. One useful example would be 255.255.255.255. "..
- "Default is \"0.0.0.0\", which triggers the usage of the interface broadcast IP."))
-ip4b.optional = true
-ip4b.datatype = "ip4addr"
-ip4b.placeholder = "0.0.0.0"
-
-ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
- translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
-ip6m.optional = true
-ip6m.datatype = "ip6addr"
-ip6m.placeholder = "FF02::6D"
-
-ip4s = i:taboption("addrs", Value, "IPv4Src", translate("IPv4 source"),
- translate("IPv4 src address for outgoing OLSR packages. Default is \"0.0.0.0\", which triggers usage of the interface IP."))
-ip4s.optional = true
-ip4s.datatype = "ip4addr"
-ip4s.placeholder = "0.0.0.0"
-
-ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
- translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
- "Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
-ip6s.optional = true
-ip6s.datatype = "ip6addr"
-ip6s.placeholder = "0::/0"
-
-hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
-hi.optional = true
-hi.datatype = "ufloat"
-hi.placeholder = "5.0"
-hi.write = write_float
-
-hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
-hv.optional = true
-hv.datatype = "ufloat"
-hv.placeholder = "40.0"
-hv.write = write_float
-
-ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
-ti.optional = true
-ti.datatype = "ufloat"
-ti.placeholder = "2.0"
-ti.write = write_float
-
-tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
-tv.optional = true
-tv.datatype = "ufloat"
-tv.placeholder = "256.0"
-tv.write = write_float
-
-mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
-mi.optional = true
-mi.datatype = "ufloat"
-mi.placeholder = "18.0"
-mi.write = write_float
-
-mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
-mv.optional = true
-mv.datatype = "ufloat"
-mv.placeholder = "324.0"
-mv.write = write_float
-
-ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
-ai.optional = true
-ai.datatype = "ufloat"
-ai.placeholder = "18.0"
-ai.write = write_float
-
-av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
-av.optional = true
-av.datatype = "ufloat"
-av.placeholder = "108.0"
-av.write = write_float
-
-return m
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
deleted file mode 100644
index 77e423d939b9..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdiface6.lua
+++ /dev/null
@@ -1,164 +0,0 @@
--- Copyright 2010 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-local util = require "luci.util"
-local ip = require "luci.ip"
-
-function write_float(self, section, value)
- local n = tonumber(value)
- if n ~= nil then
- return Value.write(self, section, "%.1f" % n)
- end
-end
-
-m = Map("olsrd6", translate("OLSR Daemon - Interface"),
- translate("The OLSR daemon is an implementation of the Optimized Link State Routing protocol. "..
- "As such it allows mesh routing for any network equipment. "..
- "It runs on any wifi card that supports ad-hoc mode and of course on any ethernet device. "..
- "Visit olsrd.org for help and documentation."))
-
-m.redirect = luci.dispatcher.build_url("admin/services/olsrd6")
-
-if not arg[1] or m.uci:get("olsrd6", arg[1]) ~= "Interface" then
- luci.http.redirect(m.redirect)
- return
-end
-
-i = m:section(NamedSection, arg[1], "Interface", translate("Interface"))
-i.anonymous = true
-i.addremove = false
-
-i:tab("general", translate("General Settings"))
-i:tab("addrs", translate("IP Addresses"))
-i:tab("timing", translate("Timing and Validity"))
-
-ign = i:taboption("general", Flag, "ignore", translate("Enable"),
- translate("Enable this interface."))
-ign.enabled = "0"
-ign.disabled = "1"
-ign.rmempty = false
-function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
-end
-
-network = i:taboption("general", Value, "interface", translate("Network"),
- translate("The interface OLSRd should serve."))
-
-network.template = "cbi/network_netlist"
-network.widget = "radio"
-network.nocreate = true
-
-mode = i:taboption("general", ListValue, "Mode", translate("Mode"),
- translate("Interface mode is used to prevent unnecessary packet forwarding on switched ethernet interfaces. "..
- "Valid modes are \"mesh\" and \"ether\". Default is \"mesh\"."))
-mode:value("mesh")
-mode:value("ether")
-mode.optional = true
-mode.rmempty = true
-
-
-weight = i:taboption("general", Value, "Weight", translate("Weight"),
- translate("When multiple links exist between hosts the weight of interface is used to determine the link to use. "..
- "Normally the weight is automatically calculated by olsrd based on the characteristics of the interface, "..
- "but here you can specify a fixed value. Olsrd will choose links with the lowest value.
"..
- "Note: Interface weight is used only when LinkQualityLevel is set to 0. "..
- "For any other value of LinkQualityLevel, the interface ETX value is used instead."))
-weight.optional = true
-weight.datatype = "uinteger"
-weight.placeholder = "0"
-
-lqmult = i:taboption("general", DynamicList, "LinkQualityMult", translate("LinkQuality Multiplicator"),
- translate("Multiply routes with the factor given here. Allowed values are between 0.01 and 1.0. "..
- "It is only used when LQ-Level is greater than 0. Examples:
"..
- "reduce LQ to fd91:662e:3c58::1 by half: fd91:662e:3c58::1 0.5
"..
- "reduce LQ to all nodes on this interface by 20%: default 0.8"))
-lqmult.optional = true
-lqmult.rmempty = true
-lqmult.cast = "table"
-lqmult.placeholder = "default 1.0"
-
-function lqmult.validate(self, value)
- for _, v in pairs(value) do
- if v ~= "" then
- local val = util.split(v, " ")
- local host = val[1]
- local mult = val[2]
- if not host or not mult then
- return nil, translate("LQMult requires two values (IP address or 'default' and multiplicator) separated by space.")
- end
- if not (host == "default" or ip.IPv6(host)) then
- return nil, translate("Can only be a valid IPv6 address or 'default'")
- end
- if not tonumber(mult) or tonumber(mult) > 1 or tonumber(mult) < 0.01 then
- return nil, translate("Invalid Value for LQMult-Value. Must be between 0.01 and 1.0.")
- end
- if not mult:match("[0-1]%.[0-9]+") then
- return nil, translate("Invalid Value for LQMult-Value. You must use a decimal number between 0.01 and 1.0 here.")
- end
- end
- end
- return value
-end
-
-ip6m = i:taboption("addrs", Value, "IPv6Multicast", translate("IPv6 multicast"),
- translate("IPv6 multicast address. Default is \"FF02::6D\", the manet-router linklocal multicast."))
-ip6m.optional = true
-ip6m.datatype = "ip6addr"
-ip6m.placeholder = "FF02::6D"
-
-ip6s = i:taboption("addrs", Value, "IPv6Src", translate("IPv6 source"),
- translate("IPv6 src prefix. OLSRd will choose one of the interface IPs which matches the prefix of this parameter. "..
- "Default is \"0::/0\", which triggers the usage of a not-linklocal interface IP."))
-ip6s.optional = true
-ip6s.datatype = "ip6addr"
-ip6s.placeholder = "0::/0"
-
-hi = i:taboption("timing", Value, "HelloInterval", translate("Hello interval"))
-hi.optional = true
-hi.datatype = "ufloat"
-hi.placeholder = "5.0"
-hi.write = write_float
-
-hv = i:taboption("timing", Value, "HelloValidityTime", translate("Hello validity time"))
-hv.optional = true
-hv.datatype = "ufloat"
-hv.placeholder = "40.0"
-hv.write = write_float
-
-ti = i:taboption("timing", Value, "TcInterval", translate("TC interval"))
-ti.optional = true
-ti.datatype = "ufloat"
-ti.placeholder = "2.0"
-ti.write = write_float
-
-tv = i:taboption("timing", Value, "TcValidityTime", translate("TC validity time"))
-tv.optional = true
-tv.datatype = "ufloat"
-tv.placeholder = "256.0"
-tv.write = write_float
-
-mi = i:taboption("timing", Value, "MidInterval", translate("MID interval"))
-mi.optional = true
-mi.datatype = "ufloat"
-mi.placeholder = "18.0"
-mi.write = write_float
-
-mv = i:taboption("timing", Value, "MidValidityTime", translate("MID validity time"))
-mv.optional = true
-mv.datatype = "ufloat"
-mv.placeholder = "324.0"
-mv.write = write_float
-
-ai = i:taboption("timing", Value, "HnaInterval", translate("HNA interval"))
-ai.optional = true
-ai.datatype = "ufloat"
-ai.placeholder = "18.0"
-ai.write = write_float
-
-av = i:taboption("timing", Value, "HnaValidityTime", translate("HNA validity time"))
-av.optional = true
-av.datatype = "ufloat"
-av.placeholder = "108.0"
-av.write = write_float
-
-return m
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
deleted file mode 100644
index 59e99c867fff..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
+++ /dev/null
@@ -1,260 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2009 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-local ip = require "luci.ip"
-local fs = require "nixio.fs"
-
-if arg[1] then
- mp = Map("olsrd", translate("OLSR - Plugins"))
-
- p = mp:section(TypedSection, "LoadPlugin", translate("Plugin configuration"))
- p:depends("library", arg[1])
- p.anonymous = true
-
- ign = p:option(Flag, "ignore", translate("Enable"))
- ign.enabled = "0"
- ign.disabled = "1"
- ign.rmempty = false
- function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
- end
-
- lib = p:option(DummyValue, "library", translate("Library"))
- lib.default = arg[1]
-
- local function Range(x,y)
- local t = {}
- for i = x, y do t[#t+1] = i end
- return t
- end
-
- local function Cidr2IpMask(val)
- if val then
- for i = 1, #val do
- local cidr = ip.IPv4(val[i]) or ip.IPv6(val[i])
- if cidr then
- val[i] = cidr:network():string() .. " " .. cidr:mask():string()
- end
- end
- return val
- end
- end
-
- local function IpMask2Cidr(val)
- if val then
- for i = 1, #val do
- local ip, mask = val[i]:gmatch("([^%s]+)%s+([^%s]+)")()
- local cidr
- if ip and mask and ip:match(":") then
- cidr = ip.IPv6(ip, mask)
- elseif ip and mask then
- cidr = ip.IPv4(ip, mask)
- end
-
- if cidr then
- val[i] = cidr:string()
- end
- end
- return val
- end
- end
-
-
- local knownPlParams = {
- ["olsrd_bmf"] = {
- { Value, "BmfInterface", "bmf0" },
- { Value, "BmfInterfaceIp", "10.10.10.234/24" },
- { Flag, "DoLocalBroadcast", "no" },
- { Flag, "CapturePacketsOnOlsrInterfaces", "yes" },
- { ListValue, "BmfMechanism", { "UnicastPromiscuous", "Broadcast" } },
- { Value, "BroadcastRetransmitCount", "2" },
- { Value, "FanOutLimit", "4" },
- { DynamicList, "NonOlsrIf", "br-lan" }
- },
-
- ["olsrd_dyn_gw"] = {
- { Value, "Interval", "40" },
- { DynamicList, "Ping", "141.1.1.1" },
- { DynamicList, "HNA", "192.168.80.0/24", IpMask2Cidr, Cidr2IpMask }
- },
-
- ["olsrd_httpinfo"] = {
- { Value, "port", "80" },
- { DynamicList, "Host", "163.24.87.3" },
- { DynamicList, "Net", "0.0.0.0/0", Cidr2IpMask }
- },
-
- ["olsrd_nameservice"] = {
- { DynamicList, "name", "my-name.mesh" },
- { DynamicList, "hosts", "1.2.3.4 name-for-other-interface.mesh" },
- { Value, "suffix", ".olsr" },
- { Value, "hosts_file", "/path/to/hosts_file" },
- { Value, "add_hosts", "/path/to/file" },
- { Value, "dns_server", "141.1.1.1" },
- { Value, "resolv_file", "/path/to/resolv.conf" },
- { Value, "interval", "120" },
- { Value, "timeout", "240" },
- { Value, "lat", "12.123" },
- { Value, "lon", "12.123" },
- { Value, "latlon_file", "/var/run/latlon.js" },
- { Value, "latlon_infile", "/var/run/gps.txt" },
- { Value, "sighup_pid_file", "/var/run/dnsmasq.pid" },
- { Value, "name_change_script", "/usr/local/bin/announce_new_hosts.sh" },
- { DynamicList, "service", "http://me.olsr:80|tcp|my little homepage" },
- { Value, "services_file", "/var/run/services_olsr" },
- { Value, "services_change_script", "/usr/local/bin/announce_new_services.sh" },
- { DynamicList, "mac", "xx:xx:xx:xx:xx:xx[,0-255]" },
- { Value, "macs_file", "/path/to/macs_file" },
- { Value, "macs_change_script", "/path/to/script" }
- },
-
- ["olsrd_quagga"] = {
- { StaticList, "redistribute", {
- "system", "kernel", "connect", "static", "rip", "ripng", "ospf",
- "ospf6", "isis", "bgp", "hsls"
- } },
- { ListValue, "ExportRoutes", { "only", "both" } },
- { Flag, "LocalPref", "true" },
- { Value, "Distance", Range(0,255) }
- },
-
- ["olsrd_secure"] = {
- { Value, "Keyfile", "/etc/private-olsr.key" }
- },
-
- ["olsrd_txtinfo"] = {
- { Value, "accept", "127.0.0.1" }
- },
-
- ["olsrd_jsoninfo"] = {
- { Value, "accept", "127.0.0.1" },
- { Value, "port", "9090" },
- { Value, "UUIDFile", "/etc/olsrd/olsrd.uuid" },
-
- },
-
- ["olsrd_watchdog"] = {
- { Value, "file", "/var/run/olsrd.watchdog" },
- { Value, "interval", "30" }
- },
-
- ["olsrd_mdns"] = {
- { DynamicList, "NonOlsrIf", "lan" }
- },
-
- ["olsrd_p2pd"] = {
- { DynamicList, "NonOlsrIf", "lan" },
- { Value, "P2pdTtl", "10" }
- },
-
- ["olsrd_arprefresh"] = {},
- ["olsrd_dot_draw"] = {},
- ["olsrd_dyn_gw_plain"] = {},
- ["olsrd_pgraph"] = {},
- ["olsrd_tas"] = {}
- }
-
-
- -- build plugin options with dependencies
- if knownPlParams[arg[1]] then
- for _, option in ipairs(knownPlParams[arg[1]]) do
- local otype, name, default, uci2cbi, cbi2uci = unpack(option)
- local values
-
- if type(default) == "table" then
- values = default
- default = default[1]
- end
-
- if otype == Flag then
- local bool = p:option( Flag, name, name )
- if default == "yes" or default == "no" then
- bool.enabled = "yes"
- bool.disabled = "no"
- elseif default == "on" or default == "off" then
- bool.enabled = "on"
- bool.disabled = "off"
- elseif default == "1" or default == "0" then
- bool.enabled = "1"
- bool.disabled = "0"
- else
- bool.enabled = "true"
- bool.disabled = "false"
- end
- bool.optional = true
- bool.default = default
- bool:depends({ library = plugin })
- else
- local field = p:option( otype, name, name )
- if values then
- for _, value in ipairs(values) do
- field:value( value )
- end
- end
- if type(uci2cbi) == "function" then
- function field.cfgvalue(self, section)
- return uci2cbi(otype.cfgvalue(self, section))
- end
- end
- if type(cbi2uci) == "function" then
- function field.formvalue(self, section)
- return cbi2uci(otype.formvalue(self, section))
- end
- end
- field.optional = true
- field.default = default
- --field:depends({ library = arg[1] })
- end
- end
- end
-
- return mp
-
-else
-
- mpi = Map("olsrd", translate("OLSR - Plugins"))
-
- local plugins = {}
- mpi.uci:foreach("olsrd", "LoadPlugin",
- function(section)
- if section.library and not plugins[section.library] then
- plugins[section.library] = true
- end
- end
- )
-
- -- create a loadplugin section for each found plugin
- for v in fs.dir("/usr/lib") do
- if v:sub(1, 6) == "olsrd_" then
- v = string.match(v, "^(olsrd.*)%.so%..*")
- if not plugins[v] then
- mpi.uci:section(
- "olsrd", "LoadPlugin", nil,
- { library = v, ignore = 1 }
- )
- end
- end
- end
-
- t = mpi:section( TypedSection, "LoadPlugin", translate("Plugins") )
- t.anonymous = true
- t.template = "cbi/tblsection"
- t.override_scheme = true
- function t.extedit(self, section)
- local lib = self.map:get(section, "library") or ""
- return luci.dispatcher.build_url("admin", "services", "olsrd", "plugins") .. "/" .. lib
- end
-
- ign = t:option( Flag, "ignore", translate("Enabled") )
- ign.enabled = "0"
- ign.disabled = "1"
- ign.rmempty = false
- function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
- end
-
- t:option( DummyValue, "library", translate("Library") )
-
- return mpi
-end
diff --git a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua b/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
deleted file mode 100644
index 9873b0269a3e..000000000000
--- a/applications/luci-app-olsr/luasrc/model/cbi/olsr/olsrdplugins6.lua
+++ /dev/null
@@ -1,260 +0,0 @@
--- Copyright 2008 Steven Barth
--- Copyright 2009 Jo-Philipp Wich
--- Licensed to the public under the Apache License 2.0.
-
-local ip = require "luci.ip"
-local fs = require "nixio.fs"
-
-if arg[1] then
- mp = Map("olsrd6", translate("OLSR - Plugins"))
-
- p = mp:section(TypedSection, "LoadPlugin", translate("Plugin configuration"))
- p:depends("library", arg[1])
- p.anonymous = true
-
- ign = p:option(Flag, "ignore", translate("Enable"))
- ign.enabled = "0"
- ign.disabled = "1"
- ign.rmempty = false
- function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
- end
-
- lib = p:option(DummyValue, "library", translate("Library"))
- lib.default = arg[1]
-
- local function Range(x,y)
- local t = {}
- for i = x, y do t[#t+1] = i end
- return t
- end
-
- local function Cidr2IpMask(val)
- if val then
- for i = 1, #val do
- local cidr = ip.IPv4(val[i]) or ip.IPv6(val[i])
- if cidr then
- val[i] = cidr:network():string() .. " " .. cidr:mask():string()
- end
- end
- return val
- end
- end
-
- local function IpMask2Cidr(val)
- if val then
- for i = 1, #val do
- local ip, mask = val[i]:gmatch("([^%s]+)%s+([^%s]+)")()
- local cidr
- if ip and mask and ip:match(":") then
- cidr = ip.IPv6(ip, mask)
- elseif ip and mask then
- cidr = ip.IPv4(ip, mask)
- end
-
- if cidr then
- val[i] = cidr:string()
- end
- end
- return val
- end
- end
-
-
- local knownPlParams = {
- ["olsrd_bmf"] = {
- { Value, "BmfInterface", "bmf0" },
- { Value, "BmfInterfaceIp", "10.10.10.234/24" },
- { Flag, "DoLocalBroadcast", "no" },
- { Flag, "CapturePacketsOnOlsrInterfaces", "yes" },
- { ListValue, "BmfMechanism", { "UnicastPromiscuous", "Broadcast" } },
- { Value, "BroadcastRetransmitCount", "2" },
- { Value, "FanOutLimit", "4" },
- { DynamicList, "NonOlsrIf", "br-lan" }
- },
-
- ["olsrd_dyn_gw"] = {
- { Value, "Interval", "40" },
- { DynamicList, "Ping", "141.1.1.1" },
- { DynamicList, "HNA", "192.168.80.0/24", IpMask2Cidr, Cidr2IpMask }
- },
-
- ["olsrd_httpinfo"] = {
- { Value, "port", "80" },
- { DynamicList, "Host", "163.24.87.3" },
- { DynamicList, "Net", "0.0.0.0/0", Cidr2IpMask }
- },
-
- ["olsrd_nameservice"] = {
- { DynamicList, "name", "my-name.mesh" },
- { DynamicList, "hosts", "1.2.3.4 name-for-other-interface.mesh" },
- { Value, "suffix", ".olsr" },
- { Value, "hosts_file", "/path/to/hosts_file" },
- { Value, "add_hosts", "/path/to/file" },
- { Value, "dns_server", "141.1.1.1" },
- { Value, "resolv_file", "/path/to/resolv.conf" },
- { Value, "interval", "120" },
- { Value, "timeout", "240" },
- { Value, "lat", "12.123" },
- { Value, "lon", "12.123" },
- { Value, "latlon_file", "/var/run/latlon.js.ipv6" },
- { Value, "latlon_infile", "/var/run/gps.txt" },
- { Value, "sighup_pid_file", "/var/run/dnsmasq.pid" },
- { Value, "name_change_script", "/usr/local/bin/announce_new_hosts.sh" },
- { DynamicList, "service", "http://me.olsr:80|tcp|my little homepage" },
- { Value, "services_file", "/var/run/services_olsr" },
- { Value, "services_change_script", "/usr/local/bin/announce_new_services.sh" },
- { DynamicList, "mac", "xx:xx:xx:xx:xx:xx[,0-255]" },
- { Value, "macs_file", "/path/to/macs_file" },
- { Value, "macs_change_script", "/path/to/script" }
- },
-
- ["olsrd_quagga"] = {
- { StaticList, "redistribute", {
- "system", "kernel", "connect", "static", "rip", "ripng", "ospf",
- "ospf6", "isis", "bgp", "hsls"
- } },
- { ListValue, "ExportRoutes", { "only", "both" } },
- { Flag, "LocalPref", "true" },
- { Value, "Distance", Range(0,255) }
- },
-
- ["olsrd_secure"] = {
- { Value, "Keyfile", "/etc/private-olsr.key" }
- },
-
- ["olsrd_txtinfo"] = {
- { Value, "accept", "::1/128" }
- },
-
- ["olsrd_jsoninfo"] = {
- { Value, "accept", "::1/128" },
- { Value, "port", "9090" },
- { Value, "UUIDFile", "/etc/olsrd/olsrd.uuid.ipv6" },
-
- },
-
- ["olsrd_watchdog"] = {
- { Value, "file", "/var/run/olsrd.watchdog.ipv6" },
- { Value, "interval", "30" }
- },
-
- ["olsrd_mdns.so"] = {
- { DynamicList, "NonOlsrIf", "lan" }
- },
-
- ["olsrd_p2pd.so"] = {
- { DynamicList, "NonOlsrIf", "lan" },
- { Value, "P2pdTtl", "10" }
- },
-
- ["olsrd_arprefresh"] = {},
- ["olsrd_dot_draw"] = {},
- ["olsrd_dyn_gw_plain"] = {},
- ["olsrd_pgraph"] = {},
- ["olsrd_tas"] = {}
- }
-
-
- -- build plugin options with dependencies
- if knownPlParams[arg[1]] then
- for _, option in ipairs(knownPlParams[arg[1]]) do
- local otype, name, default, uci2cbi, cbi2uci = unpack(option)
- local values
-
- if type(default) == "table" then
- values = default
- default = default[1]
- end
-
- if otype == Flag then
- local bool = p:option( Flag, name, name )
- if default == "yes" or default == "no" then
- bool.enabled = "yes"
- bool.disabled = "no"
- elseif default == "on" or default == "off" then
- bool.enabled = "on"
- bool.disabled = "off"
- elseif default == "1" or default == "0" then
- bool.enabled = "1"
- bool.disabled = "0"
- else
- bool.enabled = "true"
- bool.disabled = "false"
- end
- bool.optional = true
- bool.default = default
- bool:depends({ library = plugin })
- else
- local field = p:option( otype, name, name )
- if values then
- for _, value in ipairs(values) do
- field:value( value )
- end
- end
- if type(uci2cbi) == "function" then
- function field.cfgvalue(self, section)
- return uci2cbi(otype.cfgvalue(self, section))
- end
- end
- if type(cbi2uci) == "function" then
- function field.formvalue(self, section)
- return cbi2uci(otype.formvalue(self, section))
- end
- end
- field.optional = true
- field.default = default
- --field:depends({ library = arg[1] })
- end
- end
- end
-
- return mp
-
-else
-
- mpi = Map("olsrd6", translate("OLSR - Plugins"))
-
- local plugins = {}
- mpi.uci:foreach("olsrd6", "LoadPlugin",
- function(section)
- if section.library and not plugins[section.library] then
- plugins[section.library] = true
- end
- end
- )
-
- -- create a loadplugin section for each found plugin
- for v in fs.dir("/usr/lib") do
- if v:sub(1, 6) == "olsrd_" then
- v=string.match(v, "^(olsrd_.*)%.so%..*")
- if not plugins[v] then
- mpi.uci:section(
- "olsrd6", "LoadPlugin", nil,
- { library = v, ignore = 1 }
- )
- end
- end
- end
-
- t = mpi:section( TypedSection, "LoadPlugin", translate("Plugins") )
- t.anonymous = true
- t.template = "cbi/tblsection"
- t.override_scheme = true
- function t.extedit(self, section)
- local lib = self.map:get(section, "library") or ""
- return luci.dispatcher.build_url("admin", "services", "olsrd6", "plugins") .. "/" .. lib
- end
-
- ign = t:option( Flag, "ignore", translate("Enabled") )
- ign.enabled = "0"
- ign.disabled = "1"
- ign.rmempty = false
- function ign.cfgvalue(self, section)
- return Flag.cfgvalue(self, section) or "0"
- end
-
- t:option( DummyValue, "library", translate("Library") )
-
- return mpi
-end
diff --git a/applications/luci-app-olsr/luasrc/tools/olsr.lua b/applications/luci-app-olsr/luasrc/tools/olsr.lua
deleted file mode 100644
index 781b2658d26e..000000000000
--- a/applications/luci-app-olsr/luasrc/tools/olsr.lua
+++ /dev/null
@@ -1,33 +0,0 @@
--- Copyright 2011 Manuel Munz
--- Licensed to the public under the Apache License 2.0.
-
-module("luci.tools.olsr", package.seeall)
-
-function etx_color(etx)
- local color = "#bb3333"
- if etx == 0 then
- color = "#bb3333"
- elseif etx < 2 then
- color = "#00cc00"
- elseif etx < 4 then
- color = "#ffcb05"
- elseif etx < 10 then
- color = "#ff6600"
- end
- return color
-end
-
-function snr_color(snr)
- local color = "#bb3333"
- if snr == 0 then
- color = "#bb3333"
- elseif snr > 30 then
- color = "#00cc00"
- elseif snr > 20 then
- color = "#ffcb05"
- elseif snr > 5 then
- color = "#ff6600"
- end
- return color
-end
-
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
deleted file mode 100644
index 213013f22c82..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/common_js.htm
+++ /dev/null
@@ -1,35 +0,0 @@
-<% if has_v4 and has_v6 then %>
-
-<%end %>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
deleted file mode 100644
index eb41219c7e4a..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/error_olsr.htm
+++ /dev/null
@@ -1,11 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%+header%>
-<%:OLSR Daemon%>
-<%:Unable to connect to the OLSR daemon!%>
-<%:Make sure that OLSRd is running, the "jsoninfo" plugin is loaded, configured on port 9090 and accepts connections from "127.0.0.1".%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
deleted file mode 100644
index 34cf5633631a..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/hna.htm
+++ /dev/null
@@ -1,124 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local i = 1
-
-if luci.http.formvalue("status") == "1" then
- local rv = {}
- for k, hna in ipairs(hna) do
- rv[#rv+1] = {
- proto = hna["proto"],
- destination = hna["destination"],
- genmask = hna["genmask"],
- gateway = hna["gateway"],
- hostname = hna["hostname"],
- validityTime = hna["validityTime"]
- }
- end
- luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
- return
-end
-%>
-
-<%+header%>
-
-
-
-<%:Active host net announcements%>
-
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
deleted file mode 100644
index 12f7cba967ce..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/interfaces.htm
+++ /dev/null
@@ -1,52 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local i = 1
-%>
-
-<%+header%>
-
-<%:Interfaces%>
-
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
-
-
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm
deleted file mode 100644
index 2f598489dc88..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/legend.htm
+++ /dev/null
@@ -1,24 +0,0 @@
-<%:Legend%>:
-
- - LQ: <%:Success rate of packages received from the neighbour%>
- - NLQ: <%:Success rate of packages sent to the neighbour%>
- - ETX: <%:Expected retransmission count%>
- -
-
- - <%:Green%>:<%:Very good (ETX < 2)%>
- - <%:Yellow%>:<%:Good (2 < ETX < 4)%>
- - <%:Orange%>:<%:Still usable (4 < ETX < 10)%>
- - <%:Red%>:<%:Bad (ETX > 10)%>
-
-
- - SNR: <%:Signal Noise Ratio in dB%>
- -
-
- - <%:Green%>:<%:Very good (SNR > 30)%>
- - <%:Yellow%>:<%:Good (30 > SNR > 20)%>
- - <%:Orange%>:<%:Still usable (20 > SNR > 5)%>
- - <%:Red%>:<%:Bad (SNR < 5)%>
-
-
-
-
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
deleted file mode 100644
index 469d89111aeb..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/mid.htm
+++ /dev/null
@@ -1,50 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local i = 1
-%>
-
-<%+header%>
-<%:Active MID announcements%>
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
deleted file mode 100644
index 8cdda1491621..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/neighbors.htm
+++ /dev/null
@@ -1,179 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local olsrtools = require "luci.tools.olsr"
-local i = 1
-
-if luci.http.formvalue("status") == "1" then
- local rv = {}
- for k, link in ipairs(links) do
- link.linkCost = tonumber(link.linkCost) or 0
- if link.linkCost == 4194304 then
- link.linkCost = 0
- end
- local color = olsrtools.etx_color(link.linkCost)
- local snr_color = olsrtools.snr_color(link.snr)
- defaultgw_color = ""
- if link.defaultgw == 1 then
- defaultgw_color = "#ffff99"
- end
-
- rv[#rv+1] = {
- rip = link.remoteIP,
- hn = link.hostname,
- lip = link.localIP,
- ifn = link.interface,
- lq = string.format("%.3f", link.linkQuality),
- nlq = string.format("%.3f",link.neighborLinkQuality),
- cost = string.format("%.3f", link.linkCost),
- snr = link.snr,
- signal = link.signal,
- noise = link.noise,
- color = color,
- snr_color = snr_color,
- dfgcolor = defaultgw_color,
- proto = link.proto
- }
- end
- luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
- return
-end
-%>
-
-<%+header%>
-
-
-
-
-<%:OLSR connections%>
-
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
deleted file mode 100644
index 7bfd73df20a9..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/overview.htm
+++ /dev/null
@@ -1,220 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-
-has_ipv4_conf = luci.model.uci.cursor():get_first("olsrd", "olsrd", "IpVersion")
-has_ipv6_conf = luci.model.uci.cursor():get_first("olsrd6", "olsrd", "IpVersion")
-
-function write_conf(conf, file)
- local fs = require "nixio.fs"
- if fs.access(conf) then
- luci.http.header("Content-Disposition", "attachment; filename="..file)
- luci.http.prepare_content("text/plain")
- luci.http.write(fs.readfile(conf))
- end
-end
-
-conf = luci.http.formvalue()
-
-if conf.openwrt_v4 then
- write_conf("/etc/config/olsrd", "olsrd")
- return false
-end
-
-if conf.openwrt_v6 then
- write_conf("/etc/config/olsrd6", "olsrd6")
- return false
-end
-
-if conf.conf_v4 then
- write_conf("/var/etc/olsrd.conf", "olsrd.conf")
- return false
-end
-
-if conf.conf_v6 then
- write_conf("/var/etc/olsrd6.conf", "olsrd6.conf")
- return false
-end
-
-%>
-
-<%+header%>
-
-
-
-
-
-
-OLSR <%:Overview%>
-
-
-
-
-
-
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
deleted file mode 100644
index 624047f40c8d..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/routes.htm
+++ /dev/null
@@ -1,143 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-
-local olsrtools = require "luci.tools.olsr"
-local i = 1
-
-if luci.http.formvalue("status") == "1" then
- local rv = {}
- for k, route in ipairs(routes) do
- local ETX = string.format("%.3f", tonumber(route.etx) or 0)
- rv[#rv+1] = {
- hostname = route.hostname,
- dest = route.destination,
- genmask = route.genmask,
- gw = route.gateway,
- interface = route.networkInterface,
- metric = route.metric,
- etx = ETX,
- color = olsrtools.etx_color(tonumber(ETX))
- }
- end
- luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
- return
-end
-
-%>
-
-<%+header%>
-
-
-
-
-
-<%:Known OLSR routes%>
-
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
deleted file mode 100644
index 99da8154be52..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/smartgw.htm
+++ /dev/null
@@ -1,155 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local i = 1
-require("luci.model.uci")
-local uci = luci.model.uci.cursor_state()
-
-uci:foreach("olsrd", "olsrd", function(s)
- if s.SmartGateway and s.SmartGateway == "yes" then has_smartgw = true end
-end)
-
-
-if luci.http.formvalue("status") == "1" then
- local rv = {}
- for k, gw in ipairs(gws.ipv4, gws.ipv6) do
- gw.cost = tonumber(gw.cost)/1024 or 0
- if gw.cost >= 100 then
- gw.cost = 0
- end
-
- rv[#rv+1] = {
- proto = gw.IPv4 and '4' or '6',
- originator = gw.originator,
- selected = gw.selected and luci.i18n.translate('yes') or luci.i18n.translate('no'),
- cost = gw.cost > 0 and string.format("%.3f", gw.cost) or luci.i18n.translate('infinite'),
- hops = gw.hops,
- uplink = gw.uplink,
- downlink = gw.downlink,
- v4 = gw.IPv4 and luci.i18n.translate('yes') or luci.i18n.translate('no'),
- v6 = gw.IPv6 and luci.i18n.translate('yes') or luci.i18n.translate('no'),
- prefix = gw.prefix
- }
- end
- luci.http.prepare_content("application/json")
- luci.http.write_json(rv)
- return
-end
-%>
-
-<%+header%>
-
-
-
-<%:SmartGW announcements%>
-
-
-
-<% if has_smartgw then %>
-
-
-
-<% else %>
-
- <%:SmartGateway is not configured on this system.%>
-
-<% end %>
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm b/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
deleted file mode 100644
index fe673c41112f..000000000000
--- a/applications/luci-app-olsr/luasrc/view/status-olsr/topology.htm
+++ /dev/null
@@ -1,62 +0,0 @@
-<%#
- Copyright 2008 Steven Barth
- Copyright 2008 Jo-Philipp Wich
- Copyright 2011 Manuel Munz
- Licensed to the public under the Apache License 2.0.
--%>
-
-<%
-local i = 1
-local olsrtools = require "luci.tools.olsr"
-%>
-
-<%+header%>
-<%:Active OLSR nodes%>
-
-
-
-
-
-<%+status-olsr/common_js%>
-<%+footer%>
diff --git a/applications/luci-app-olsr/root/usr/libexec/rpcd/olsrinfo b/applications/luci-app-olsr/root/usr/libexec/rpcd/olsrinfo
new file mode 100755
index 000000000000..831a964202a8
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/libexec/rpcd/olsrinfo
@@ -0,0 +1,78 @@
+#!/bin/sh
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+HOSTSFILE="-1"
+
+find_hosts_config() {
+ local cfg="$1"
+
+ config_get library "$cfg" library
+ if [ "$library" != "olsrd_nameservice" ]; then
+ return 1
+ fi
+ config_get hosts_file "$cfg" hosts_file
+ HOSTSFILE=$hosts_file
+}
+
+load_hosts() {
+ config_load olsrd
+ config_foreach find_hosts_config LoadPlugin
+ local hosts4=$(cat $HOSTSFILE)
+ HOSTSFILE=""
+ config_load olsrd6
+ config_foreach find_hosts_config LoadPlugin
+ if [ -f "$HOSTSFILE" ]; then
+ local hosts6=$(cat "$HOSTSFILE")
+ else
+ local hosts6=""
+ fi
+ local hosts="$hosts4$hosts6"
+ json_init
+ json_add_string hosts "$hosts"
+ json_dump
+}
+
+case "$1" in
+list)
+ json_init
+ json_add_object "getjsondata"
+ json_add_string 'otable' 'String'
+ json_add_int 'v4_port' 'Integer'
+ json_add_int 'v6_port' 'Integer'
+ json_close_object
+ json_add_object "hasipip"
+ json_close_object
+ json_add_object "hosts"
+ json_close_object
+ json_dump
+ ;;
+call)
+ case "$2" in
+ getjsondata)
+ json_init
+ json_load "$(cat)"
+ json_get_var otable otable
+ json_get_var v4_port v4_port
+ json_get_var v6_port v6_port
+
+ jsonreq4=$(echo "/${otable}" | nc 127.0.0.1 "${v4_port}" | sed -n '/^[}{ ]/p' 2>/dev/null)
+ jsonreq6=$(echo "/${otable}" | nc ::1 "${v6_port}" | sed -n '/^[}{ ]/p' 2>/dev/null)
+
+ json_init
+ json_add_string "jsonreq4" "$jsonreq4"
+ json_add_string "jsonreq6" "$jsonreq6"
+ json_dump
+ ;;
+ hasipip)
+ result=$(ls /etc/modules.d/ | grep -E "[0-9]*-ipip")
+ json_init
+ json_add_string "result" "$result"
+ json_dump
+ ;;
+ hosts)
+ load_hosts
+ ;;
+ esac
+ ;;
+esac
diff --git a/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-backend.json b/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-backend.json
new file mode 100644
index 000000000000..9daa5c72ff81
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-backend.json
@@ -0,0 +1,86 @@
+{
+ "admin/services/olsrd": {
+ "title": "OLSR IPv4",
+ "order": 5,
+ "depends": {
+ "acl": ["luci-app-olsr"]
+ },
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrd"
+ }
+ },
+ "admin/services/olsrd/display": {
+ "title": "Display",
+ "order": 10,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrddisplay"
+ }
+ },
+ "admin/services/olsrd/iface": {
+ "order": 10,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdiface"
+ }
+ },
+ "admin/services/olsrd/hna": {
+ "title": "HNA Announcements",
+ "order": 15,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdhna"
+ }
+ },
+ "admin/services/olsrd/plugins": {
+ "title": "Plugins",
+ "order": 20,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdplugins"
+ }
+ },
+ "admin/services/olsrd6": {
+ "title": "OLSR IPv6",
+ "order": 5,
+ "depends": {
+ "acl": ["luci-app-olsr"]
+ },
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrd6"
+ }
+ },
+ "admin/services/olsrd6/display": {
+ "title": "Display",
+ "order": 10,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrddisplay"
+ }
+ },
+ "admin/services/olsrd6/iface": {
+ "order": 10,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdiface6"
+ }
+ },
+ "admin/services/olsrd6/hna": {
+ "title": "HNA Announcements",
+ "order": 15,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdhna6"
+ }
+ },
+ "admin/services/olsrd6/plugins": {
+ "title": "Plugins",
+ "order": 20,
+ "action": {
+ "type": "view",
+ "path": "olsr/frontend/olsrdplugins6"
+ }
+ }
+}
diff --git a/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-frontend.json b/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-frontend.json
new file mode 100644
index 000000000000..2c1f055e2d03
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/share/luci/menu.d/luci-app-olsr-frontend.json
@@ -0,0 +1,72 @@
+{
+ "olsr": {
+ "title": "OLSR",
+ "order": 5,
+ "action": {
+ "type": "firstchild"
+ }
+ },
+ "olsr/neighbours": {
+ "title": "Neighbours",
+ "order": 15,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/neighbors"
+ }
+ },
+ "olsr/routes": {
+ "title": "Routes",
+ "order": 20,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/routes"
+ }
+ },
+ "olsr/topology": {
+ "title": "Topology",
+ "order": 25,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/topology"
+ }
+ },
+ "olsr/hna": {
+ "title": "HNA",
+ "order": 30,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/hna"
+ }
+ },
+ "olsr/mid": {
+ "title": "MID",
+ "order": 35,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/mid"
+ }
+ },
+ "olsr/interface": {
+ "title": "Interface",
+ "order": 35,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/interfaces"
+ }
+ },
+ "olsr/smartgw": {
+ "title": "SmartGW",
+ "order": 40,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/smartgw"
+ }
+ },
+ "olsr/error_olsr": {
+ "order": 45,
+ "action": {
+ "type": "view",
+ "path": "olsr/status-olsr/error_olsr"
+ }
+ }
+}
diff --git a/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr-unauthenticated.json b/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr-unauthenticated.json
new file mode 100644
index 000000000000..66bd8b737235
--- /dev/null
+++ b/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr-unauthenticated.json
@@ -0,0 +1,20 @@
+{
+ "unauthenticated": {
+ "description": "Grant read access",
+ "read": {
+ "ubus": {
+ "uci": ["get"],
+ "luci-rpc": ["*"],
+ "network.interface": ["dump"],
+ "network": ["get_proto_handlers"],
+ "olsrd": ["olsrd_jsoninfo"],
+ "olsrd6": ["olsrd_jsoninfo"],
+ "olsrinfo": ["getjsondata", "hasipip", "hosts"],
+ "file": ["read"],
+ "iwinfo": ["assoclist"]
+
+ },
+ "uci": ["luci_olsr", "olsrd", "olsrd6", "network", "network.interface"]
+ }
+ }
+}
diff --git a/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr.json b/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr.json
index 246afbc9414a..11c6946727b8 100644
--- a/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr.json
+++ b/applications/luci-app-olsr/root/usr/share/rpcd/acl.d/luci-app-olsr.json
@@ -2,10 +2,34 @@
"luci-app-olsr": {
"description": "Grant UCI access for luci-app-olsr",
"read": {
- "uci": [ "luci_olsr", "olsrd", "olsrd6" ]
+ "ubus": {
+ "luci-rpc": [
+ "*"
+ ],
+ "olsrinfo": [
+ "getjsondata",
+ "hasipip"
+ ]
+ },
+ "file": {
+ "/etc/modules.d": [
+ "list",
+ "read"
+ ],
+ "/usr/lib": [ "list" ]
+ },
+ "uci": [
+ "luci_olsr",
+ "olsrd",
+ "olsrd6"
+ ]
},
"write": {
- "uci": [ "luci_olsr", "olsrd", "olsrd6" ]
+ "uci": [
+ "luci_olsr",
+ "olsrd",
+ "olsrd6"
+ ]
}
}
-}
+}
\ No newline at end of file