Skip to content

Commit 19df72c

Browse files
DO1JLRDO1JLR
authored
Merge pull request #41 from ffbsee/dev-new
Merge 1.0.3 dev to master
2 parents 2e40377 + 647fa52 commit 19df72c

File tree

181 files changed

+5467
-45111
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+5467
-45111
lines changed

‎README.md

+20-19
Original file line numberDiff line numberDiff line change
@@ -6,64 +6,65 @@ It connects to similar routers in the area and builds a Wifi-mesh network
66
but also opens an access point for computers to connect over Wifi.
77
Included is Internet connectivity and a web interface.
88

9-
Please talk to us on IRC if anything does not work!
9+
Please talk to us on [IRC](https://webirc.hackint.org/#irc://irc.hackint.org/#ffbsee) if anything does not work!
1010

11-
[Precompiled firmware images](https://firmware.ffbsee.de/firmware/ "Precompiled firmware images") are available on our server. All other released versions here on github are out-of-date.
11+
[Precompiled firmware images](https://firmware.ffbsee.de//firmware/ "Precompiled firmware images") are available on our server. You can search them via [Firmware-Wizard](https://firmware.ffbsee.de/firmware-wizard/). All other released versions here on github are **out-of-date**.
1212

1313
To build the firmware yourself you need a Unix console to enter commands into.
14+
Please have a look at the different Branches if you want to build the newest Beta-Firmware Version.
15+
1416
Install dependencies for the build environment (Debian/Ubuntu):
1517

1618
```bash
1719
sudo apt-get update; sudo apt-get upgrade
1820
sudo apt-get install subversion g++ zlib1g-dev build-essential git python
1921
sudo apt-get install libncurses5-dev gawk gettext unzip file libssl-dev wget
2022
```
21-
22-
If you want to build your own firmware we suggest to use our newest development-branch.
23-
Right now this is the branch [dev-new](https://github.com/ffbsee/firmware/tree/dev-new).
24-
2523
Build commands for the console:
2624

2725
```bash
28-
git clone https://github.com/openwrt/openwrt.git
29-
cd openwrt
30-
git reset --hard 0f757bd2606971252f901ef3faf4dbd0086315f7
26+
git clone git://git.lede-project.org/source.git
27+
cd source
28+
git reset --hard 6b6578feec74dfe1f5767c573d75ba08cc57c885
3129

3230
./scripts/feeds update -a
3331
./scripts/feeds install -a
3432

35-
git clone https://github.com/ffbsee/firmware.git
33+
git clone https://github.com/ffbsee/firmware.git -b master
3634
cp -rf firmware/files firmware/package .
37-
chmod -R a+rX firmware/files/www
38-
git am --whitespace=nowarn firmware/patches/openwrt/*.patch
35+
git am --whitespace=nowarn firmware/patches/lede/*.patch
3936
cd feeds/routing && git am --whitespace=nowarn ../../firmware/patches/routing/*.patch && cd -
40-
cd feeds/packages && git am --whitespace=nowarn ../../firmware/patches/packages/*.patch && cd -
4137
rm -rf firmware tmp
4238

4339
make defconfig
4440
make menuconfig
4541
```
4642
Now select the right "Target System" and "Target Profile" for your AP model:
4743

48-
For example, for the TL-WR841ND, select:
44+
For example, for the TL-WR841ND v3, select:
4945
* `Target System => Atheros AR7xxx/AR9xxx`
50-
* `Target Profile => TP-LINK TL-WR841ND`
46+
* `Target Profile => <*> TP-LINK TL-WR842N/ND v3`
5147

52-
Or in case you have the DIR-300, select:
53-
* `Target System => <*> AR231x/AR5312`
54-
* `Target Profile => <*> Default`
48+
Or in case you have the Ubiquiti UniFi Outdoor, select:
49+
* `Target System => Atheros AR7xxx/AR9xxx`
50+
* `Target Profile => <*> Ubiquiti UniFi Outdoor`
5551

5652
For other models you can lookup the "Target System" in the OpenWrt
5753
[hardware table](http://wiki.openwrt.org/toh/start). Your AP model
5854
should now be visible in the "Target Profile" list.
5955

56+
Please notice, that some Routers need different drivers for 5GHz. Sometimes you need to select them manually.
57+
6058
Now start the build process. This takes some time:
6159

6260
```bash
6361
make
6462
```
6563
*You have the opportunity to compile the firmware at more CPU threats to speed up the process.*
66-
*e.g. to run 3 jobs (commands) simultaneously use the following option:* `make -j 3`
64+
*e.g. to run 3 jobs (commands) simultaneously use the following option:*
65+
```bash
66+
make -j 3
67+
```
6768

6869
The **firmware image files** will be stored in the `bin`-folder. These images can now directly be used to update your router. Please note, that two differnt image types (per router) will be provided:
6970

‎files/etc/config/batman-adv

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11

2-
config 'mesh' 'bat0'
3-
option 'orig_interval' '10000'
2+
config mesh 'bat0'
3+
option 'orig_interval' '30000'
44
option 'multicast_mode' '1'
55
option 'distributed_arp_table' '1'
66
option 'bridge_loop_avoidance' '1'
77
option 'aggregated_ogms' '1'
88
option 'gw_mode' 'client'
9+
option routing_algo 'BATMAN_IV'

‎files/etc/config/fastd

+46-34
Original file line numberDiff line numberDiff line change
@@ -20,37 +20,49 @@ config peer_group 'backbone'
2020
option net 'default'
2121
option peer_limit '1'
2222

23-
config peer 'vpn1'
24-
option enabled 1
25-
option net 'default'
26-
option group 'backbone'
27-
option key '961b675cf8844e756dee9bd9f138a380f717d67e8bdef930435ba31890c179ac'
28-
list remote 'ipv6 "speedtest.vpn1.ffbsee.de" port 1244'
29-
list remote 'ipv4 "speedtest.vpn1.ffbsee.de" port 1244'
30-
option float 0
31-
32-
config peer 'vpn2'
33-
option enabled 1
34-
option net 'default'
35-
option group 'backbone'
36-
option key 'c9b43bb7c2f07814ffe4b0193ee79efb27244f88cff2e567d1db0e46f57ec5a7'
37-
list remote 'ipv4 "speedtest.vpn2.ffbsee.de" port 1244'
38-
option float 0
39-
40-
config peer 'vpn3'
41-
option enabled 1
42-
option net 'default'
43-
option group 'backbone'
44-
option key '1e81443889a1b9d3ee14fcbbee0aaf7331c38163ee8f64ef49fb41004ccb8280'
45-
list remote 'ipv6 "speedtest.vpn3.ffbsee.de" port 1244'
46-
list remote 'ipv4 "speedtest.vpn3.ffbsee.de" port 1244'
47-
option float 0
48-
49-
config peer 'vpn4'
50-
option enabled 1
51-
option net 'default'
52-
option group 'backbone'
53-
option key '696b6fbfa5f1cc1a8a85c78276b55448d0cb89ed9d52f30234f02a811f7132d0'
54-
list remote 'ipv6 "speedtest.vpn4.ffbsee.de" port 1244'
55-
list remote 'ipv4 "speedtest.vpn4.ffbsee.de" port 1244'
56-
option float 0
23+
config peer 'gw01'
24+
option enabled 1
25+
option net 'default'
26+
option group 'backbone'
27+
option key 'b8661d203e35247b7991e3700f9c7c952517a6e37bb1c1cc671c4c723d6df32c'
28+
list remote 'ipv6 "speedtest.gw01.ffbsee.net" port 1244'
29+
list remote 'ipv4 "speedtest.gw01.ffbsee.net" port 1244'
30+
option float 0
31+
32+
config peer 'gw02'
33+
option enabled 1
34+
option net 'default'
35+
option group 'backbone'
36+
option key '47304aac66113490f790cad11ab74ac2260f2797b2ab6ea19d70f30dcb86a813'
37+
list remote 'ipv6 "speedtest.gw02.ffbsee.net" port 1244'
38+
list remote 'ipv4 "speedtest.gw02.ffbsee.net" port 1244'
39+
option float 0
40+
41+
config peer 'gw03'
42+
option enabled 1
43+
option net 'default'
44+
option group 'backbone'
45+
option key '961b675cf8844e756dee9bd9f138a380f717d67e8bdef930435ba31890c179ac'
46+
list remote 'ipv6 "speedtest.gw03.ffbsee.net" port 1244'
47+
list remote 'ipv4 "speedtest.gw03.ffbsee.net" port 1244'
48+
option float 0
49+
50+
config peer 'gw04'
51+
option enabled 1
52+
option net 'default'
53+
option group 'backbone'
54+
option key '696b6fbfa5f1cc1a8a85c78276b55448d0cb89ed9d52f30234f02a811f7132d0'
55+
list remote 'ipv6 "speedtest.gw04.ffbsee.net" port 1244'
56+
list remote 'ipv4 "speedtest.gw04.ffbsee.net" port 1244'
57+
option float 0
58+
59+
config peer 'gw05'
60+
option enabled 1
61+
option net 'default'
62+
option group 'backbone'
63+
option key '78bcd22af09a7d88de16416cc83d7ee85f352bdbe8cb5372b3b475f555df8fd8'
64+
list remote 'ipv6 "speedtest.gw05.ffbsee.net" port 1244'
65+
list remote 'ipv4 "speedtest.gw05.ffbsee.net" port 1244'
66+
option float 0
67+
68+

‎files/etc/config/fastd.domestic

+24-33
Original file line numberDiff line numberDiff line change
@@ -20,39 +20,30 @@ config peer_group 'backbone'
2020
option net 'default'
2121
option peer_limit '1'
2222

23-
config peer 'vpn5'
24-
option enabled 1
25-
option net 'default'
26-
option group 'backbone'
27-
option key '47304aac66113490f790cad11ab74ac2260f2797b2ab6ea19d70f30dcb86a813'
28-
list remote 'ipv6 "speedtest.vpn5.ffbsee.de" port 1244'
29-
list remote 'ipv4 "speedtest.vpn5.ffbsee.de" port 1244'
30-
option float 0
31-
32-
config peer 'vpn6'
33-
option enabled 1
34-
option net 'default'
35-
option group 'backbone'
36-
option key '6b6aa97d779fa56ef9aefbbc9e4d479e0dfe82066af9b1d962ee722c640cdae5'
37-
list remote 'ipv6 "speedtest.vpn6.ffbsee.de" port 1244'
38-
list remote 'ipv4 "speedtest.vpn6.ffbsee.de" port 1244'
39-
option float 0
23+
config peer 'gw01'
24+
option enabled 1
25+
option net 'default'
26+
option group 'backbone'
27+
option key 'b8661d203e35247b7991e3700f9c7c952517a6e37bb1c1cc671c4c723d6df32c'
28+
list remote 'ipv6 "speedtest.gw01.ffbsee.net" port 1244'
29+
list remote 'ipv4 "speedtest.gw01.ffbsee.net" port 1244'
30+
option float 0
4031

41-
config peer 'vpn7'
42-
option enabled 1
43-
option net 'default'
44-
option group 'backbone'
45-
option key '6153895a2711146d343d61dcda6c888d7afda83f2ea3685467c78f15dfa22423'
46-
list remote 'ipv6 "speedtest.vpn7.ffbsee.de" port 1244'
47-
list remote 'ipv4 "speedtest.vpn7.ffbsee.de" port 1244'
48-
option float 0
32+
config peer 'gw03'
33+
option enabled 1
34+
option net 'default'
35+
option group 'backbone'
36+
option key '961b675cf8844e756dee9bd9f138a380f717d67e8bdef930435ba31890c179ac'
37+
list remote 'ipv6 "speedtest.gw03.ffbsee.net" port 1244'
38+
list remote 'ipv4 "speedtest.gw03.ffbsee.net" port 1244'
39+
option float 0
4940

50-
config peer 'vpn8'
51-
option enabled 1
52-
option net 'default'
53-
option group 'backbone'
54-
option key 'b8661d203e35247b7991e3700f9c7c952517a6e37bb1c1cc671c4c723d6df32c'
55-
list remote 'ipv6 "speedtest.vpn8.ffbsee.de" port 1244'
56-
list remote 'ipv4 "speedtest.vpn8.ffbsee.de" port 1244'
57-
option float 0
41+
config peer 'gw04'
42+
option enabled 1
43+
option net 'default'
44+
option group 'backbone'
45+
option key '696b6fbfa5f1cc1a8a85c78276b55448d0cb89ed9d52f30234f02a811f7132d0'
46+
list remote 'ipv6 "speedtest.gw04.ffbsee.net" port 1244'
47+
list remote 'ipv4 "speedtest.gw04.ffbsee.net" port 1244'
48+
option float 0
5849

‎files/etc/config/fastd.either

+40-65
Original file line numberDiff line numberDiff line change
@@ -20,74 +20,49 @@ config peer_group 'backbone'
2020
option net 'default'
2121
option peer_limit '1'
2222

23-
config peer 'vpn1'
24-
option enabled 1
25-
option net 'default'
26-
option group 'backbone'
27-
option key '961b675cf8844e756dee9bd9f138a380f717d67e8bdef930435ba31890c179ac'
28-
list remote 'ipv6 "speedtest.vpn1.ffbsee.de" port 1244'
29-
list remote 'ipv4 "speedtest.vpn1.ffbsee.de" port 1244'
30-
option float 0
23+
config peer 'gw01'
24+
option enabled 1
25+
option net 'default'
26+
option group 'backbone'
27+
option key 'b8661d203e35247b7991e3700f9c7c952517a6e37bb1c1cc671c4c723d6df32c'
28+
list remote 'ipv6 "speedtest.gw01.ffbsee.net" port 1244'
29+
list remote 'ipv4 "speedtest.gw01.ffbsee.net" port 1244'
30+
option float 0
3131

32-
config peer 'vpn2'
33-
option enabled 1
34-
option net 'default'
35-
option group 'backbone'
36-
option key 'c9b43bb7c2f07814ffe4b0193ee79efb27244f88cff2e567d1db0e46f57ec5a7'
37-
list remote 'ipv4 "speedtest.vpn2.ffbsee.de" port 1244'
38-
option float 0
39-
40-
config peer 'vpn3'
41-
option enabled 1
42-
option net 'default'
43-
option group 'backbone'
44-
option key '1e81443889a1b9d3ee14fcbbee0aaf7331c38163ee8f64ef49fb41004ccb8280'
45-
list remote 'ipv6 "speedtest.vpn3.ffbsee.de" port 1244'
46-
list remote 'ipv4 "speedtest.vpn3.ffbsee.de" port 1244'
47-
option float 0
48-
49-
config peer 'vpn4'
50-
option enabled 1
51-
option net 'default'
52-
option group 'backbone'
53-
option key '696b6fbfa5f1cc1a8a85c78276b55448d0cb89ed9d52f30234f02a811f7132d0'
54-
list remote 'ipv6 "speedtest.vpn4.ffbsee.de" port 1244'
55-
list remote 'ipv4 "speedtest.vpn4.ffbsee.de" port 1244'
56-
option float 0
32+
config peer 'gw02'
33+
option enabled 1
34+
option net 'default'
35+
option group 'backbone'
36+
option key '47304aac66113490f790cad11ab74ac2260f2797b2ab6ea19d70f30dcb86a813'
37+
list remote 'ipv6 "speedtest.gw02.ffbsee.net" port 1244'
38+
list remote 'ipv4 "speedtest.gw02.ffbsee.net" port 1244'
39+
option float 0
5740

58-
config peer 'vpn5'
59-
option enabled 1
60-
option net 'default'
61-
option group 'backbone'
62-
option key '47304aac66113490f790cad11ab74ac2260f2797b2ab6ea19d70f30dcb86a813'
63-
list remote 'ipv6 "speedtest.vpn5.ffbsee.de" port 1244'
64-
list remote 'ipv4 "speedtest.vpn5.ffbsee.de" port 1244'
65-
option float 0
41+
config peer 'gw03'
42+
option enabled 1
43+
option net 'default'
44+
option group 'backbone'
45+
option key '961b675cf8844e756dee9bd9f138a380f717d67e8bdef930435ba31890c179ac'
46+
list remote 'ipv6 "speedtest.gw03.ffbsee.net" port 1244'
47+
list remote 'ipv4 "speedtest.gw03.ffbsee.net" port 1244'
48+
option float 0
6649

67-
config peer 'vpn6'
68-
option enabled 1
69-
option net 'default'
70-
option group 'backbone'
71-
option key '6b6aa97d779fa56ef9aefbbc9e4d479e0dfe82066af9b1d962ee722c640cdae5'
72-
list remote 'ipv6 "speedtest.vpn6.ffbsee.de" port 1244'
73-
list remote 'ipv4 "speedtest.vpn6.ffbsee.de" port 1244'
74-
option float 0
50+
config peer 'gw04'
51+
option enabled 1
52+
option net 'default'
53+
option group 'backbone'
54+
option key '696b6fbfa5f1cc1a8a85c78276b55448d0cb89ed9d52f30234f02a811f7132d0'
55+
list remote 'ipv6 "speedtest.gw04.ffbsee.net" port 1244'
56+
list remote 'ipv4 "speedtest.gw04.ffbsee.net" port 1244'
57+
option float 0
7558

76-
config peer 'vpn7'
77-
option enabled 1
78-
option net 'default'
79-
option group 'backbone'
80-
option key '6153895a2711146d343d61dcda6c888d7afda83f2ea3685467c78f15dfa22423'
81-
list remote 'ipv6 "speedtest.vpn7.ffbsee.de" port 1244'
82-
list remote 'ipv4 "speedtest.vpn7.ffbsee.de" port 1244'
83-
option float 0
59+
config peer 'gw05'
60+
option enabled 1
61+
option net 'default'
62+
option group 'backbone'
63+
option key '78bcd22af09a7d88de16416cc83d7ee85f352bdbe8cb5372b3b475f555df8fd8'
64+
list remote 'ipv6 "speedtest.gw05.ffbsee.net" port 1244'
65+
list remote 'ipv4 "speedtest.gw05.ffbsee.net" port 1244'
66+
option float 0
8467

85-
config peer 'vpn8'
86-
option enabled 1
87-
option net 'default'
88-
option group 'backbone'
89-
option key 'b8661d203e35247b7991e3700f9c7c952517a6e37bb1c1cc671c4c723d6df32c'
90-
list remote 'ipv6 "speedtest.vpn8.ffbsee.de" port 1244'
91-
list remote 'ipv4 "speedtest.vpn8.ffbsee.de" port 1244'
92-
option float 0
9368

0 commit comments

Comments
 (0)