nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
459 Commits 26 Branches 63 Tags 18 MiB
c6f96c3666
Commit Graph

459 Commits

Author SHA1 Message Date
Matthias Schiffer
1803525745 Configure unique MAC addresses for all WLAN interfaces 2014-09-15 19:55:09 +02:00
Matthias Schiffer
b51e1063b7 Add utility function to generate unique MAC addresses derived from the primary MAC 2014-09-15 19:55:09 +02:00
Matthias Schiffer
b977f00162 Fix mesh-batman-adv-core legacy script path 2014-09-15 19:55:09 +02:00
Matthias Schiffer
2dfe68d50a Remove obsolete legacy upgrade script 2014-09-15 19:55:09 +02:00
Nils Schneider
c06141cff3 gluon-node-info: remove fixup-owner script 2014-09-15 19:54:30 +02:00
Nils Schneider
0de7bf5f64 gluon-core: port initial/020-wireless to lua 2014-09-15 19:50:10 +02:00
Nils Schneider
53e56b0853 Merge pull request #74 from freifunk-gluon/authorized-keys 
gluon-authorized-keys: add keys from site.conf
 2014-09-15 19:20:01 +02:00
Nils Schneider
a753fa79e3 gluon-authorized-keys: add keys from site.conf 
This package will run as invariant script after each upgrade and copy
all keys from site.conf's authorized_keys entry to
/etc/dropbear/authorized_keys.

Existing keys will be preserved.

The site.conf entry 'authorized_keys' is required (if this package is
selected) and must contain a list of strings, each representing a line
of the resulting file.
 2014-09-15 19:19:21 +02:00
Nils Schneider
f21678dc0d Merge pull request #69 from freifunk-gluon/gluon-neighbour-info 
gluon-neighbour-info: query direct neighbours
 2014-09-15 18:52:25 +02:00
Nils Schneider
5fa97f8fdb gluon-core: add node_id() to gluon.util 2014-09-11 12:27:29 +02:00
Nils Schneider
d87cf05c95 mesh-batman-adv-core: disable igmp_snooping on br-client 
IGMP snooping causes serious trouble with IPv6 neighbour discovery.
 2014-09-09 11:29:51 +02:00
Nils Schneider
abcc86bf8f gluon-neighbour-info: global timeout 2014-09-06 15:40:03 +02:00
Nils Schneider
0222f342af gluon-neighbour-info: newlines between responses 2014-09-06 14:10:43 +02:00
Nils Schneider
b969f3e644 gluon-neighbour-info: cleanup, use recv instead of recvfrom 2014-09-06 14:02:19 +02:00
Nils Schneider
29464a4ba1 Merge pull request #72 from freifunk-gluon/fastd-site-enable 
mesh-vpn-fastd: enable from site.conf
 2014-09-06 13:38:43 +02:00
Nils Schneider
4e19df098a mesh-vpn-fastd: enable from site.conf 
This patch allows fastd's enabled flag's default value to be set from
site.conf.
 2014-09-03 20:37:17 +02:00
Jan-Philipp Litza
ae43f3dc3e gluon-core: Remove VERSION_DIR hack 
As the (removed) comment said, this was a one-time-hack that was obsoleted long ago.
 2014-08-30 15:13:52 +02:00
Nils Schneider
fe57f93bc7 gluon-neighbour-info: query direct neighbours 
This is a simple client for gluon-announced.
 2014-08-28 18:48:57 +02:00
Nils Schneider
e2ff6a6ed3 gluon-luci-admin: restructure firmware upgrades 2014-08-28 16:36:04 +02:00
NeoRaider
9d11f4bda1 Merge pull request #68 from FreifunkBremen/gluon-cron-fix 
gluon-cron: Fix endless loop parsing invalid lines
 2014-08-27 10:33:34 +02:00
Jan-Philipp Litza
afce06c3d3 gluon-cron: Fix endless loop parsing invalid lines 
Using the line
```
* * * * echo "foobar"
```
(notice the missing fifth time field) in a crontab causes gluon-cron
to enter an endless loop while parsing it, thus it won't even execute
the other, valid crontabs.

This is caused by the loop in [line 138] where `begin - min`
substracts the unsigned `min` from the signed `begin`. If now `begin`
is invalid, `strict_atoi` returns -1 and the loop starts at
`(-1)-1=MAX_INT` and runs while `i <= MAX_INT` which is always true.

The real culprit lies in [line 134] where exactly this case
`begin < min` is checked - but because of the signedness, this check doesn't
work as expected either.

The easiest solution is to make `min` a signed integer instead of an unsigned
one, as we do not require it to be very large and only pass the constants 0 or
1 to it.

To avoid other similar problems, this patch makes the input variable `n` a
signed integer as well.
 2014-08-27 10:20:04 +02:00
Nils Schneider
a90920e373 gluon-announced: avoid spawning zombies 2014-08-25 21:53:21 +02:00
Nils Schneider
40321595a9 Merge pull request #62 from freifunk-gluon/clientcount 
mesh-batman-adv-core: add clientcount statistics
 2014-08-22 14:40:09 +02:00
ohrensessel
fea00b3603 calculate rootfs usage instead of overlayfs 
in case a target does not use overlayfs
 2014-08-18 14:07:23 +02:00
ohrensessel
4d747c09c4 adapt overlay_usage to match the comments from luebeck 2014-08-18 13:08:54 +02:00
ohrensessel
42c43ba2af overlay: rename to clarify value 2014-08-18 12:12:00 +02:00
ohrensessel
0e95c90e21 overlay: change to normalized, fix error handling 2014-08-18 12:10:54 +02:00
ohrensessel
4e76436932 add overlay usage to statistics.d 2014-08-18 11:40:13 +02:00
Matthias Schiffer
fe2fc8785e Remove gluon-ath9k-workaround 2014-08-17 19:34:03 +02:00
Matthias Schiffer
f9e5e3325f gluon-setup-mode: cleanup and upgrade fix 
Since switching to Barrier Breaker/procd, we'd not notice if we were
upgrading from a version before renaming the config file to gluon-setup-mode
as the upgrade scripts run after the preinit.

Fix this by checking later during setup mode init again and rebooting into the
regular run mode if we detect this case.
 2014-08-16 15:15:24 +02:00
Matthias Schiffer
f3ff07b1a5 gluon-mesh-vpn-fastd: delete all old backbone peers on update 2014-08-16 14:51:18 +02:00
penguineer
31fe529e92 Beschreibungstext umformuliert, damit die Option "Mesh-VPN" klarer wird. 
Die Bezeichnung "Mesh-VPN" ist etwas irreführend. Man kann denken, dass hiermit das Meshing aktiviert wird, wobei es ja — im Gegenteil — um eine Nutzung des WAN geht.
 2014-08-15 15:28:05 +02:00
Nils Schneider
3652628e96 luci-portconfig: fix dns 2014-08-10 17:13:39 +02:00
Nils Schneider
a1d27aefbb mesh-batman-adv-core: add clientcount statistics 
This adds

  "client" { "total": <int>, "wifi": <int>" }

to statistics.d. "total" will be the number of clients connected.
"wifi" will be the number of clients connected over wifi. I.e. "total"
will always be equal to or greater than "wifi".

The node will not count itself.
 2014-08-10 13:24:08 +02:00
Nils Schneider
d90b1d66fd Merge pull request #61 from freifunk-gluon/configurable-wan 
Configurable WAN
 2014-08-09 23:31:19 +02:00
Nils Schneider
5145eab954 Merge pull request #59 from freifunk-gluon/form-fields 
luci-theme: fix centering of form fields
 2014-08-09 20:56:48 +02:00
Matthias Schiffer
62d910edde gluon-luci-portconfig: expose advanced WAN configuration 2014-08-09 17:36:15 +02:00
Matthias Schiffer
3762f52c69 gluon-core: restructure WAN configuration 2014-08-09 14:39:21 +02:00
Matthias Schiffer
d8f0c531c9 gluon-wan-dnsmasq: allow configuring static DNS servers 2014-08-09 14:39:05 +02:00
Nils Schneider
25e0c6e07b luci-theme: fix checkboxes on firefox 2014-08-09 09:35:39 +02:00
Nils Schneider
488ed1bdd7 Merge pull request #58 from jplitza/patch-1 
gluon-announced: fix help message
 2014-08-08 21:44:11 +02:00
Matthias Schiffer
143d5a9565 Add gluon-mesh-batman-adv-15 2014-08-08 15:56:36 +02:00
Matthias Schiffer
279cfd5117 Split gluon-mesh-batman-adv into gluon-mesh-batman-adv-core and gluon-mesh-batman-adv-14 2014-08-08 15:50:52 +02:00
Nils Schneider
b169a169d6 luci-theme: fix centering of form fields 2014-08-08 14:53:27 +02:00
Jan-Philipp Litza
8a32dd7887 gluon-announced: fix help message 
It incorrectly stated "-m" to be the multicast group option, when it really was "-g"
 2014-08-08 14:50:00 +02:00
Nils Schneider
4f65d49950 Revert "gluon-luci-theme: remove top padding cbi-field-title" 
This reverts commit f37f1f1ac2c9a44d0aafb25e3f5a01e16df6019e.
 2014-08-08 14:34:19 +02:00
Matthias Schiffer
cd0a932ac0 gluon-setup-mode: provide alternative rc.d directory for procd 2014-08-07 15:52:38 +02:00
Julian Kornberger
60e0a5601c gluon-luci-private-wifi: fix package naming 
previously it was gluon-luci-privatewifi
 2014-08-06 23:21:33 +02:00
Matthias Schiffer
1bf1a8ad05 Remove gluon-luci-core 
The package luci-base now contains everything we need.
 2014-08-06 12:07:34 +02:00
Matthias Schiffer
201acaa3a9 Dependency fixes for the new LuCi version 2014-08-06 12:06:49 +02:00
Matthias Schiffer
c0139e871f gluon-setup-mode: change START to 15 
To start after haveged after the recent update.
 2014-08-06 11:45:26 +02:00
Nils Schneider
257787a0b0 Merge pull request #40 from digineo/private-wifi 
gluon-luci-private-wifi: UI for enabling a private WLAN
 2014-08-05 15:50:53 +02:00
Nils Schneider
3aecc92073 gluon-config-mode: modularize wizard 
This commit splits gluon-config-mode into several, mostly independent
packages.

* gluon-config-mode-core: basic functionality (required)
* gluon-config-mode-hostname: hostname field
* gluon-config-mode-autoupdater: show when autoupdater is enabled
* gluon-config-mode-mesh-vpn: fastd vpn configuration, bw limit
* gluon-config-mode-geo-location: geo coordinates
* gluon-config-mode-contact-info: contact info field

The package gluon-config-mode has been removed. You need to replace
it with these packages (or any subset of them) in site.mk:

* gluon-config-mode-hostname
* gluon-config-mode-autoupdater
* gluon-config-mode-mesh-vpn
* gluon-config-mode-geo-location
* gluon-config-mode-contact-info

Note: It is not possible to deactivate the autoupdater in config mode
anymore (expert mode will still allow it). Instead, a message is shown
in case the autoupdater is enabled.
 2014-08-05 14:56:45 +02:00
Julian Kornberger
1fc572e863 gluon-luci-wifi: UI for enabling a private WLAN 
freifunk-gluon/gluon#122
 2014-08-05 01:20:15 +02:00
Matthias Schiffer
07ce01517c gluon-radvd: fix NULL deref 
The specification says that the ifa_addr field of struct ifaddrs may be NULL,
and in Barrier Breaker, this does actually occur...
 2014-08-04 22:57:26 +02:00
Nils Schneider
ce1a160bcc gluon-config-mode: mention reboot on button 
Make it clear that saving settings will reboot the device.
 2014-08-04 20:46:33 +02:00
Nils Schneider
74dfce8a30 gluon-announced: do not strdup optarg 2014-08-04 20:41:00 +02:00
Nils Schneider
a7a8f37308 Merge pull request #53 from freifunk-gluon/fastd-key-generate 
config-mode, mesh-vpn: refactor key generation
 2014-08-04 20:32:03 +02:00
Matthias Schiffer
8f6ec2fb4b gluon-simple-tc: replace tc with own implementation to reduce size 2014-08-04 20:08:40 +02:00
Matthias Schiffer
4732de1f82 gluon-radvd: implement own radvd to reduce size 2014-08-04 20:08:40 +02:00
Matthias Schiffer
bce2f19a8c Remove outdated IP dependencies 2014-08-04 20:08:40 +02:00
Matthias Schiffer
117f9b4662 gluon-mesh-batman-adv: don't parse ip output for nodeinfo 2014-08-04 20:08:40 +02:00
Matthias Schiffer
4795fc4a50 gluon-mesh-batman-adv: use lua-ethtool-stats instead of ethtool 2014-08-04 20:08:40 +02:00
Matthias Schiffer
7b0ed188b0 gluon-wan-dnsmasq: use libpacketmark 2014-08-03 11:07:28 +02:00
Matthias Schiffer
354508752c gluon-mesh-batman-adv: fix network.mesh_inferfaces announce field with new netifd 2014-07-28 16:29:20 +02:00
Nils Schneider
2f5705b5de config-mode, mesh-vpn: refactor key generation 
Previously, the config-mode was responsible for generating the fastd
secret. This patch sets the default secret to "generate" causing a
secret to be generated on its first use (e.g. show_key or start).

This also changes the info page (in Expert Mode) to show "n/a" when the
public key is not yet available.
 2014-07-27 16:22:40 +02:00
Matthias Schiffer
9510d03b8b gluon-autoupdater: perform fallback updates hourly 2014-07-25 16:55:00 +02:00
Matthias Schiffer
35d8ff579f gluon-autoupdater: unconditionally perform an update 5 minutes after boot when the whole PRIORITY delay has passed 2014-07-21 17:27:47 +02:00
Matthias Schiffer
a39f527dad gluon-autoupdater: add locking to ensure no two instances of the autoupdater run in parallel 2014-07-21 17:27:47 +02:00
Matthias Schiffer
bb2adefd34 gluon-autoupdater: adjust for new updater logic 
The probability field is removed, updates are performed once per night between
04:00 and 05:00.
 2014-07-21 17:27:47 +02:00
Matthias Schiffer
059ea7e5fd gluon-autoupdater: add version_file option to uci settings 2014-07-21 17:27:47 +02:00
Cyrus
cfc4a99307 Fixed bug which led to empty ath9k crontab file 
The crontab file was opened in write mode but in the case where no monitor is defined it would leave an empty file.
 2014-07-20 16:30:36 +02:00
Nils Schneider
0a3bf70d56 split announce.d into nodeinfo + statistics 2014-07-20 14:00:10 +02:00
Nils Schneider
a9c22c5ace gluon-core: add unique node_id 
This adds a `node_id` to announce.d. `node_id` is an hex-number uniquely
identifying a particular node. On nodes having a
primary MAC this MAC address will be used as `node_id` (sans the
colons). The value is opaque. It must not be converted back into
a MAC address.

`node_id` should be sent in all alfred and announced packets to
ensure clients can link the data to a particular node.
 2014-07-20 11:24:47 +02:00
Matthias Schiffer
12144126fe gluon-luci-admin: add an info page 2014-07-20 08:12:48 +02:00
Matthias Schiffer
71c9bb815f gluon-luci-theme: remove top padding cbi-field-title 
This allows to use cbi-field to format plain text instead of form fields.
 2014-07-20 08:12:48 +02:00
Matthias Schiffer
971dec8d27 gluon-core: remove now unused dnsmasq.d support 2014-07-20 04:04:27 +02:00
Matthias Schiffer
e9376fc3bd gluon-mesh-vpn-fastd: use gluon-wan-dnsmasq 2014-07-20 04:03:43 +02:00
Matthias Schiffer
f389ef925e Add new package gluon-wan-dnsmasq 
This package provides a secondary dnsmasq instance on port 54 which resolves
everything over the WAN interface.
 2014-07-20 03:25:22 +02:00
Matthias Schiffer
d638359215 Explicitly set the WAN MAC address on all models where WAN is a VLAN device 
Also move it to gluon-mesh-batman-adv, as mesh_on_wan is the only feature that
needs a unique MAC address on the WAN interface.
 2014-07-19 18:40:12 +02:00
Matthias Schiffer
f792997bb1 gluon-simple-tc: add site validator 2014-07-16 17:31:40 +02:00
Matthias Schiffer
de633e9bc3 gluon-simple-tc: change type of the enabled option in the site config to boolean 2014-07-16 16:56:15 +02:00
Matthias Schiffer
ce37755488 gluon-mesh-batman-adv: validate mesh_on_wan option 2014-07-16 16:44:33 +02:00
Nils Schneider
e2d9bd5160 Merge pull request #27 from freifunk-gluon/batman-on-wan 
gluon-batman-on-wan + gluon-luci-portconfig
 2014-07-16 16:30:36 +02:00
Nils Schneider
d2d3a7b628 gluon-batman-on-wan + gluon-luci-portconfig 2014-07-16 16:11:31 +02:00
ohrensessel
a25a56c0e8 gluon-ath9k-workaround: fix path of announce.d directory 2014-07-15 19:06:26 +02:00
Matthias Schiffer
baebeee98f gluon-luci-admin: support disabling password login again 2014-07-14 22:09:43 +02:00
Matthias Schiffer
e5999b3f44 gluon-luci-admin: allow removing all SSH keys 2014-07-14 18:56:49 +02:00
Matthias Schiffer
74d29bcdc9 gluon-mesh-batman-adv: fix mesh config script 2014-07-14 18:23:56 +02:00
Matthias Schiffer
16060d25d5 Move essential firewall rules from gluon-firewall to gluon-core and gluon-mesh-batman-adv 
The now empty gluon-firewall is removed.
 2014-07-14 17:53:41 +02:00
Matthias Schiffer
efe81b1c1c Merge branch 'gluon-announced' of https://github.com/freifunk-gluon/packages 2014-07-14 16:52:10 +02:00
Matthias Schiffer
a64483a3fc Merge branch 'mesh-announce-interfaces' of https://github.com/freifunk-gluon/packages 2014-07-14 16:50:54 +02:00
Nils Schneider
09e1de7dde gluon-announced: send nodeinformation on request 
This is a simple daemon that will respond to multicast UDP packets
containing the keyword "nodeinfo" with all the information we
currently distribute using alfred.

The daemon will listen on all mesh interface, that is the hard
interfaces batman-adv uses.
 2014-07-14 16:50:26 +02:00
Nils Schneider
b2a55f29d4 Merge pull request #35 from sargon/ath9k 
gluon-ath9k-workaround: Announce how often the workaround has been trigg...
 2014-07-13 09:13:30 +02:00
Nils Schneider
ae4c130c74 gluon-mesh-batman-adv: announce MAC of mesh ifaces 
This will make a node announce all MACs of its interfaces participating
in the batman-adv mesh. This enables other nodes to associate the
announced object with both the data reported by batadv-vis as well as a
simple list of neighbours as output by `iw dev $IFACE station dump`.
 2014-07-13 09:06:32 +02:00
Matthias Schiffer
eae6c25de6 Add support for IPv6 mesh VPN connections 
The support is still very limited (IPv6-only DNS on WAN doesn't work yet), and
we now need fastd running as root, but apart from that, is should work.
 2014-07-11 16:57:28 +02:00
NeoRaider
0312167fcd Merge pull request #36 from freifunk-gluon/gluon-announce 
gluon-announce: detach announce.d from alfred
 2014-07-11 14:45:40 +02:00
Nils Schneider
318e9d1a1d gluon-announce: detach announce.d from alfred 
All announce.d scripts have been moved to /lib/gluon/announce/announce.d
The script /lib/gluon/announce/announce.lua will collect all information
and output json.
 2014-07-11 14:43:47 +02:00
Matthias Schiffer
4d80b7a62d Split parts not Gluon-specific out of gluon-autoupdater 2014-07-11 14:06:42 +02:00
Matthias Schiffer
58ced87261 Use nicer platform match 2014-07-11 12:11:47 +02:00