commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

Start a nNew thread

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/News-archive (7650b4cd)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/WikiStart (5c254b5a)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Contribute (a3f5fd96)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/UsingBatmanGit: change maint to be branch which gets merged into mainline kernel (fd27b17a)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit fd27b17ae4e785fc7ab86362369310d4304fe3ce Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Dec 28 02:37:31 2009 +0000 doc: open-mesh/UsingBatmanGit: change maint to be branch which gets merged into mainline kernel >--------------------------------------------------------------- fd27b17ae4e785fc7ab86362369310d4304fe3ce open-mesh/UsingBatmanGit.textile | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/open-mesh/UsingBatmanGit.textile b/open-mesh/UsingBatmanGit.textile index 7b907f6f..5c5dab31 100644 --- a/open-mesh/UsingBatmanGit.textile +++ b/open-mesh/UsingBatmanGit.textile @@ -28,22 +28,42 @@ time.[[BR]] In fact you will never work with this branch itself but one of the other branches.[[BR]] +'''maint branch''' + +The maint is a branch only maintained in git to gather bug fixes for the latest [[BR]] +release. Cherry-pick is used to get commits from the master branch and git-am[[BR]] +to insert patches from mailboxes. + +Create tracking branch after cloning the repository + +{{{ +git checkout -b maint --track origin/maint +}}} + +Cherry-picking a commit from master branch + +{{{ +git checkout maint +git cherry-pick $SHA1 +}}} + + '''linux branch''' The linux branch is a clone of Linus Torvalds developer branch. With the help[[BR]] -of some git vodoo the master branch is merged with this branch in the folder:[[BR]] -drivers/staging/batman-adv/. If you wish to merge the latest master branch [[BR]] +of some git voodoo the maint branch is merged with this branch in the folder:[[BR]] +drivers/staging/batman-adv/. If you wish to merge the latest maint branch [[BR]] changes into the linux branch you need to switch to the linux branch:[[BR]] {{{ git checkout linux }}} -and merge the master branch into this one: +and merge the maint branch into this one: {{{ git fetch origin -git merge -s subtree origin/master +git merge -s subtree origin/maint }}} If you wish to pull Linus latest changes and merge it you need to add the remote[[BR]] @@ -74,7 +94,7 @@ If you need to see the difference between the SVN repos and the batman-adv[[BR]] driver in drivers/staging/batman-adv/ you can run this command: {{{ -git diff origin/master: linux:drivers/staging/batman-adv/ +git diff origin/maint: linux:drivers/staging/batman-adv/ }}} @@ -89,7 +109,7 @@ git fetch $remote_name git checkout -b $new_branch_name $remote_name/master git merge -s ours --no-commit master -git read-tree --prefix=drivers/staging/batman-adv/ -u master +git read-tree --prefix=drivers/staging/batman-adv/ -u maint git commit -m "Add batman-adv to my new branch" }}}

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/FAQ: How to make my mesh network secure ? (0b5ea7a3)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Filing: update batctl manpage link (ddcd6dc2)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Quick-start-guide: adding note about MTU (3597998e)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 3597998e054d07712f4dde4490a5c777da1f4eaa Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Mon Jan 11 17:18:44 2010 +0000 doc: batman-adv/Quick-start-guide: adding note about MTU >--------------------------------------------------------------- 3597998e054d07712f4dde4490a5c777da1f4eaa batman-adv/Quick-start-guide.textile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/batman-adv/Quick-start-guide.textile b/batman-adv/Quick-start-guide.textile index e469fe11..b282dd7b 100644 --- a/batman-adv/Quick-start-guide.textile +++ b/batman-adv/Quick-start-guide.textile @@ -25,6 +25,7 @@ So where are we going to send data packets to if not to those interfaces we have On all nodes, install batman-adv, load the module and enter the following commands: {{{ +ifconfig wlan0 mtu 1524 iwconfig wlan0 mode ad-hoc essid my-mesh-network ap 02:12:34:56:78:9A channel 1 }}} {{{ @@ -34,12 +35,15 @@ ifconfig bat0 up }}} You can now use the automatically assigned IPv6 link-local adresses on bat0 (usually starting with fe80::...), modern operating systems should support this. Or you can assign IPv4 addresses manually on all those nodes (i.e. 'ifconfig bat0 192.168.123.x/24') or one of the laptops in range has to have a DHCP server running on the bat0 interface. As batman-adv is operating on layer 2, even dhcp-messages can be send over the mesh network. +'''Note:''' batman-adv inserts an additional header of 24 bytes into each data packet being send over the mesh. Therefore we are increasing the maximum size of a packet over the plain interfaces to 1524, so that packets with the standard MTU of 1500 can pass normaly through bat0. You might also decrease the MTU to 1476 on all hosts but is usually just do-able in more or less static- and small-scaled mesh-networks. + '''mixing non-B.A.T.M.A.N. systems with batman-adv'''[[BR]] If you have a couple of computers that you don't want to run batman-adv on but you still want make use of the mesh network, you will need to configure an entry point for them on a node running batman-adv. Any device running Linux (a notebook, a wifi-router, a pc with a wifi card, ...) can be setup to work as a mesh entry point. In addition to the usual mesh setup steps mentioned above it is necessary to configure a bridge over bat0 and the interface those 'non-B.A.T.M.A.N.' machines are connected to. Let's say eth0 is the interface on a mesh access point where those non-B.A.T.M.A.N. systems are attached to and wlan0 is the interface on a mesh access point through which we want to build the mesh network. On each mesh access point, install batman-adv first, load the module and enter the following commands: {{{ +ifconfig wlan0 mtu 1524 iwconfig wlan0 mode ad-hoc essid my-mesh-network ap 02:12:34:56:78:9A channel 1 }}} {{{ @@ -56,4 +60,6 @@ ifconfig mesh-bridge up }}} From now on you won't want to use eth0, wlan0 or bat0 for any routing anymore, instead you are just using the new bridge interface 'mesh-bridge'. Any packet our mesh access point receives over eth0 will be forwarded to bat0 because of the bridge. batman-adv will forward it through the mesh according to the destination's mac address. +For the MTU-part have a look at the note above. + ''(How does batman-adv know where it has to send a data packet of an external computer, that is not using batman-adv, to another computer that is not using batman-adv either? It is automatically listening on bat0 and will keep track of any host mac address passing by this interface. Those host's mac addresses will then be announced to other batman-adv nodes in the mesh network automatically - so called HNA messages - so that every batman-adv node is going to know behind which other batman-adv node it can find which mac addresses.)''

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/UsingBatmanGit (de17cf4c)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit de17cf4c71055b2b7239b2f5c147d59d8d8ef72e Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jan 1 22:31:27 2010 +0000 doc: open-mesh/UsingBatmanGit >--------------------------------------------------------------- de17cf4c71055b2b7239b2f5c147d59d8d8ef72e open-mesh/UsingBatmanGit.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/UsingBatmanGit.textile b/open-mesh/UsingBatmanGit.textile index 5c5dab31..08d76839 100644 --- a/open-mesh/UsingBatmanGit.textile +++ b/open-mesh/UsingBatmanGit.textile @@ -34,7 +34,7 @@ The maint is a branch only maintained in git to gather bug fixes for the latest release. Cherry-pick is used to get commits from the master branch and git-am[[BR]] to insert patches from mailboxes. -Create tracking branch after cloning the repository +Create branch associated with the remote-tracking branch after cloning the repository {{{ git checkout -b maint --track origin/maint

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Filing (8570a163)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Quick-start-guide (35524ff6)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 35524ff6d5e868299003570dc41d5735e7a843c6 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Dec 19 12:34:32 2009 +0000 doc: batman-adv/Quick-start-guide >--------------------------------------------------------------- 35524ff6d5e868299003570dc41d5735e7a843c6 batman-adv/Quick-start-guide.textile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/batman-adv/Quick-start-guide.textile b/batman-adv/Quick-start-guide.textile index e94bb25d..e469fe11 100644 --- a/batman-adv/Quick-start-guide.textile +++ b/batman-adv/Quick-start-guide.textile @@ -3,12 +3,12 @@ This page shall show a couple of easy examples of how to use and setup a mesh network with B.A.T.M.A.N.-Advanced (further referenced as batman-adv). It is assumed, the tool 'batctl' was installed which allows a more intuitive configuration, though everything can be configured by accessing '/proc/net/batman-adv/...' directly without the need of installing batctl. -=== Adding interfaces === -In the first configuraton step you need to tell batman-adv which interfaces it should use to build the mesh network. This can be either wifi devices like wlanX or athX but also common ethernet devices, usually ethX. batman-adv is not limited to a certain interface type, therefore you can use any interface you can find with 'ifconfig' (even pan0 for bluetooth if you like B.A.T.M.A.N. more than the normal, build-in 'mesh-protocol' of bluetooth :-) ). Those interfaces can be added by using +=== Configuring interfaces === +In the first configuraton step you need to tell batman-adv which interfaces it should use to build the mesh network. This can be either wifi devices like wlanX or athX but also common ethernet devices, usually ethX. batman-adv is not limited to a certain interface type, therefore you can use any interface you can find with 'ifconfig' (even pan0 for bluetooth if you like B.A.T.M.A.N. more than the normal, build-in 'mesh-protocol' of bluetooth :-) ). Those interfaces can be added by using 'batctl if ifname', e.g. {{{ batctl if eth0 }}} -for example. Make sure, this interface is up and running ('ifconfig eth0 up') and use the command +Make sure, this interface is up and running ('ifconfig eth0 up') and use the command {{{ batctl if }}} @@ -32,11 +32,11 @@ batctl if wlan0 ifconfig wlan0 up ifconfig bat0 up }}} -You can now use the automatically assigned IPv6 link-local adresses on bat0 (usually starting with fe80::...), modern operating systems should support this. Or you can assign IPv4 adresses manually on all those nodes (i.e. 'ifconfig bat0 192.168.123.x/24') or one of the laptops in range has to have a DHCP server running on the bat0 interface. As batman-adv is operating on layer 2, even dhcp-messages can be send over the mesh network. +You can now use the automatically assigned IPv6 link-local adresses on bat0 (usually starting with fe80::...), modern operating systems should support this. Or you can assign IPv4 addresses manually on all those nodes (i.e. 'ifconfig bat0 192.168.123.x/24') or one of the laptops in range has to have a DHCP server running on the bat0 interface. As batman-adv is operating on layer 2, even dhcp-messages can be send over the mesh network. -'''mixing non-B.A.T.M.A.N./non-wifi PCs with batman-adv'''[[BR]] +'''mixing non-B.A.T.M.A.N. systems with batman-adv'''[[BR]] -If you have a couple of computers that you don't want to run batman-adv on but you still want make use of the mesh network, you will need to configure an entry point for them on a node running batman-adv. Any device running Linux (a notebook, a wifi-router, a pc with a wifi card, ...) can be setup to work as a mesh entry point. In addition to the usual mesh setup steps mentioned above it is necessary to configure a bridge over bat0 and the interface those 'non-B.A.T.M.A.N.' machines are connected to. Let's say eth0 is the interface on a mesh access point where those non-batman, non-wifi computers are connected to and wlan0 is the interface on a mesh access point through which we want to build the mesh network. +If you have a couple of computers that you don't want to run batman-adv on but you still want make use of the mesh network, you will need to configure an entry point for them on a node running batman-adv. Any device running Linux (a notebook, a wifi-router, a pc with a wifi card, ...) can be setup to work as a mesh entry point. In addition to the usual mesh setup steps mentioned above it is necessary to configure a bridge over bat0 and the interface those 'non-B.A.T.M.A.N.' machines are connected to. Let's say eth0 is the interface on a mesh access point where those non-B.A.T.M.A.N. systems are attached to and wlan0 is the interface on a mesh access point through which we want to build the mesh network. On each mesh access point, install batman-adv first, load the module and enter the following commands: {{{ @@ -56,4 +56,4 @@ ifconfig mesh-bridge up }}} From now on you won't want to use eth0, wlan0 or bat0 for any routing anymore, instead you are just using the new bridge interface 'mesh-bridge'. Any packet our mesh access point receives over eth0 will be forwarded to bat0 because of the bridge. batman-adv will forward it through the mesh according to the destination's mac address. -''(How does batman-adv know where it has to send a data packet of an external computer, that is not using B.A.T.M.A.N., to another computer that is not using B.A.T.M.A.N. either? It is automatically listening on bat0 and will keep track any host mac address passing this interface. Those host's mac addresses will then be announced to other B.A.T.M.A.N. nodes in the mesh network automatically - so called HNA messages - so that every B.A.T.M.A.N. node is going to know behind which other B.A.T.M.A.N. node it can find which mac addresses.)'' +''(How does batman-adv know where it has to send a data packet of an external computer, that is not using batman-adv, to another computer that is not using batman-adv either? It is automatically listening on bat0 and will keep track of any host mac address passing by this interface. Those host's mac addresses will then be announced to other batman-adv nodes in the mesh network automatically - so called HNA messages - so that every batman-adv node is going to know behind which other batman-adv node it can find which mac addresses.)''

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017