[SQUASHED PATCH v18 0/8] keyXV2 Schritt A
Christian Dresel
fff at chrisi01.de
So Okt 15 11:23:14 CEST 2017
Hi
ich würde mir initial noch eine Änderung wünschen und zwar das wir in
der configurehood noch den Port am Gateway ändern damit das gleich von
Anfang an festgelegt ist und nicht noch irgendwo alte Router rumfliegen
denen man noch irgendwie die keyxchangefile auf Port 80 zustecken muss.
Ich hätte bei mir (Fürth) jetzt 2342 konfiguriert, wenn da niemand gegen
diese Port Einwände hat, dann kann es angepasst von mir aus ins git :)
Wir sollten dazu relativ schnell noch das 11s Patch hinterherschieben,
ich bin gerade in der ungünstigen Situation das ein 11s Uplinkrouter zur
Verfügung steht und das v18 sich zwar von dort die keyxchangev2data holt
(reinen Meshrouter mit v18 in Betrieb genommen) sich aber dennoch als
AdHoc konfiguriert da die Firmware noch nichts von 11s weiß. Das geht
natürlich mächtig in die Hose :(
Ansonsten hab ich bisschen mit Hoodwechsel und so rumgespielt und das
hat jedesmal auf anhieb einwandfrei funktioniert. Bis auf die kleinen
Anmerkungen sieht es gut aus und wenn der Port geändert ist, wegen mir
rein ins git.
mfg
Christian
On 14.10.2017 22:38, Tim Niemeyer wrote:
> In diesem Patchset sind alle Patches bis kurz vor dem 11s Patchset drin.
> Mit diesem Schritt A können wir erstmal eine stabile Basis bekommen.
>
> 11s und die Kanäle über den keyXV2 sind Features, die man relativ gut
> darauf aufbauend, aber getrennt von diesem Satz betrachten kann.
>
> Changes in v18:
> - Initialize variable radio
> - Suppress error when deleting non-existent files
> - Add jshn.sh to lib/functions/fff/keyxchange
>
> Changes in v17:
> - Reintroduce initial setup of wireless interfaces. This is required as configurenetwork reads the MAC addresses from the WiFi interfaces.
> - Fix resetting interfaces during connection drop
> - Remove exit before vpn-select
> - Use function for conditional wifiAddPhy
>
> Changes in v16:
> - Open configap for both 2.4 and 5 GHz
>
> Changes in v15:
> - Fixed 5 GHz channel
> - Only start vpn-select if router has internet
> - Put ping into function since it is used twice
> - Check for started in micrond to prevent race condition
> - Moved copy of keyxchangev2data to the end
>
> Changes in v14:
> - Removed single quotes in iface
> - Tested, working Inet+mesh:
> - Fixed stderr redirect
> - Added call of configurehood to rc.local, so it is triggered if wan does not come up. To prevent race condition, hotplug.d is removed.
> - Added wifi call to configAP setup
> - Remove hiddenap flag after successful setup
> - Added -q to uci calls
> - Added network interface configSta
> - Substitute timestamp to enable SHA comparison
> - Removed started-check from vpn-select
> - Removed interface ID for timeserver
>
> Changes in v13:
> - Fixed timeserver and upgrade path to be set by keyxchange
>
> Changes in v12:
> - Removed obsolete hostname
>
> Changes in v11:
> - Changed isGatewayAvailable to return integers (bool is not valid) and removed brackets for evaluations
> - Added variables for channels as they are used twice
> - Fixed $radio not set at the beginning (WORKAROUND!)
> - Changed OpenWRT to LEDE
> - Correctly reset json_select before reuse
> - Some tidying-up of comments and quotes
> - Fixed vpn loop so it works for more than one host (TESTED)
> - Fixed "else" if no file received
>
> Changes in v10:
> - Removed useless pubkey
> - Reintroduced mac variable for hostname rewrite
> - Minor code fixes
> - Added fff-hoods to fff-base Makefile
> - Removed trailing whitespaces and harmonized tabs
> - Fixed some comments spelling
> - Added mac for hostname rewrite
> - Removed redundant check for /tmp/keyxchangev2data
>
> Changes in v9:
> - rebase onto 20170918-beta
> - rebase onto 20170918-beta
> - rebase onto 20170918-beta
> - rebase onto 20170918-beta
>
> Changes in v8:
> - rebase onto 20170918-beta
> - rebase onto 20170918-beta
> - rebased on empty-pid-file patch (Adrian)
> - rebase onto 20170918-beta
>
> Changes in v7:
> - make main if smaller, only check if file greater 0 byte, no ping anymore
>
> Changes in v6:
> - remove /etc/community.cfg variables
> - remove load lat/lon from uci system
> - !!UNTESTED!!
> - fix hidden station v6
> - fix -n to -f if
> - Add function to check for a gateway and use this
> - remove /etc/community.cfg and variables
> - send fewer infos to keyxchangev2
> - add a check if /tmp/keyxchangev2 not downloadable and edit a bit on the wgets
> - change the position from json_load and do this only 1 times
> - !!UNTESTED!!
> - delete keyxchangev2data at start of the script
> - do only things with keyxchangev2data if available
> - change keyxchangev2 url
>
> Changes in v5:
> - wXSta to wXsta
> - clean tabstops
> - !!UNTESTED!!
> - change hidden AP ip to locallink
> - Open hidden AP after more checks
> - Load json File from Gateway if Gateway in Batman in Range
>
> Changes in v4:
> - Add batctl to ROUTING feed
>
> Changes in v3:
> -don't delete the batman-adv-legacy packages
>
> Changes in v2:
> - no File mode change
> - remove legacy commentary
> - clean tabstops
> - move the json vpn out of the if because we need this after reboot
> - Added separate hood fieldset
> - Added reset button
> - Added display of mesh type
>
> Adrian Schmutzler (4):
> vpn-select: Use keyxchangev2data instead of fastd_fff_output
> Remove references to community.cfg
> fff-web: Show hood in public and internal web interface
> Configure the Node a routable IPv6 ULA
>
> Christian Dresel (4):
> Update Batman to compat15
> Reconfigure fff-wireless for keyxchangev2
> Reconfigure vpn-select for keyxchangev2
> Add fff-hoods
>
> bsp/default/root_file_system/etc/rc.local | 4 +
> buildscript | 4 +-
> src/packages/fff/fff-batman-adv/Makefile | 43 ++++
> .../files/etc/uci-defaults/93-fff-batman-adv | 22 ++
> .../files/usr/lib/micron.d/fff-batman-adv | 1 +
> .../fff-fastd/files/etc/uci-defaults/55_fff-fastd | 41 ++--
> src/packages/fff/fff-hoods/Makefile | 39 ++++
> .../fff-hoods/files/lib/functions/fff/keyxchange | 17 ++
> .../fff/fff-hoods/files/usr/lib/micron.d/fff-hoods | 1 +
> .../fff/fff-hoods/files/usr/sbin/configurehood | 224 +++++++++++++++++++++
> .../fff/fff-support/files/usr/sbin/show_info | 1 -
> src/packages/fff/fff-sysupgrade/Makefile | 4 +-
> .../fff/fff-sysupgrade/files/etc/sysupgrade.sh | 9 +-
> src/packages/fff/fff-timeserver/Makefile | 2 +-
> .../files/etc/uci-defaults/51-fff-timeserver | 3 +-
> .../files/etc/hotplug.d/iface/50-vpn-select | 6 -
> .../files/usr/lib/micron.d/vpn-select | 1 -
> .../fff/fff-vpn-select/files/usr/sbin/vpn-select | 142 +++++++------
> .../fff-web/files/www/public/cgi-bin/status.html | 2 +
> .../fff/fff-web/files/www/ssl/cgi-bin/header | 1 +
> .../fff/fff-web/files/www/ssl/cgi-bin/home.html | 37 +++-
> .../files/etc/uci-defaults/60-fff-wireless | 27 +--
> .../fff-wireless/files/lib/functions/fff/wireless | 68 ++++++-
> src/packages/fff/fff/Makefile | 5 +-
> 24 files changed, 567 insertions(+), 137 deletions(-)
> create mode 100644 src/packages/fff/fff-batman-adv/Makefile
> create mode 100644 src/packages/fff/fff-batman-adv/files/etc/uci-defaults/93-fff-batman-adv
> create mode 100644 src/packages/fff/fff-batman-adv/files/usr/lib/micron.d/fff-batman-adv
> create mode 100644 src/packages/fff/fff-hoods/Makefile
> create mode 100644 src/packages/fff/fff-hoods/files/lib/functions/fff/keyxchange
> create mode 100644 src/packages/fff/fff-hoods/files/usr/lib/micron.d/fff-hoods
> create mode 100755 src/packages/fff/fff-hoods/files/usr/sbin/configurehood
> mode change 100755 => 100644 src/packages/fff/fff-timeserver/files/etc/uci-defaults/51-fff-timeserver
> delete mode 100755 src/packages/fff/fff-vpn-select/files/etc/hotplug.d/iface/50-vpn-select
> delete mode 100644 src/packages/fff/fff-vpn-select/files/usr/lib/micron.d/vpn-select
>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname : signature.asc
Dateityp : application/pgp-signature
Dateigröße : 833 bytes
Beschreibung: OpenPGP digital signature
URL : <http://lists.freifunk.net/pipermail/franken-dev-freifunk.net/attachments/20171015/d733a803/attachment.sig>
Mehr Informationen über die Mailingliste franken-dev