Repository : ssh://git@open-mesh.org/doc
On branches: backup-redmine/2017-07-13,master
commit 6f31393fb0a9061996430d3b68f026852b9b1ab8 Author: Simon Wunderlich sw@simonwunderlich.de Date: Sun Nov 9 23:15:39 2008 +0000
doc: open-mesh/BranchesExplained: updates in the text, remove outdated saxnet branch
6f31393fb0a9061996430d3b68f026852b9b1ab8 open-mesh/BranchesExplained.textile | 41 +++++++++++++++---------------------- 1 file changed, 16 insertions(+), 25 deletions(-)
diff --git a/open-mesh/BranchesExplained.textile b/open-mesh/BranchesExplained.textile index 775e1c2f..b228de50 100644 --- a/open-mesh/BranchesExplained.textile +++ b/open-mesh/BranchesExplained.textile @@ -7,44 +7,35 @@ Arabic numerals are used to distinguish the version of our implementation. Next
Example: batman 0.2 uses the B.A.T.M.A.N. III routing algorithm.
-=== batman-0.2 === - -[Maintainer: Marek Lindner, Axel Neumann] - -0.2 stable was created last summer and represents our implementation of the BATMAN III routing algorithm. It works quite well and stable but has a major flaw while routing strong asymetric links. That is why we began working on a new algorithm - 0.2 is to be deprecated soon. - === batman-0.3 === +Maintainer: Marek Lindner, Andreas Langer
-[Maintainer: Marek Lindner, Andreas Langer] - -The 0.3 branch brought a bunch of new features and updates to 0.2, especially the 0.2 routing alorithm was dropped in favor of a newly designed approach. It seems rather stable but needs some more testing before replacing the current stable version. +The 0.3 branch brought a bunch of new features and updates to 0.2, especially the 0.2 routing alorithm was dropped in favor of a newly designed approach.
=== batman-experimental (aka bmx) === - -[Maintainer: Axel Neumann] +Maintainer: Axel Neumann
This branch kept the 0.2 routing algorithm and tried to overcome its flaws by extending it. Despite its name it is neither specifically unstable nor contains the latest features for the 0.3 branch (we are not debian ;-) ). Under the hood it shares much code with 0.3 - not more or less.
-=== batman-advanced (aka batman-adv aka batman-adv-userspace) === - -[Maintainer: Simon Wunderlich, Marek Lindner] +=== batman-advanced (aka batman-adv-kernelland) === +Maintainer: Marek Lindner, Simon Wunderlich
-In April 2007 batman advanced (residing in user space) came to light. It was a layer 2 implementation of batman 0.2. Since then it was continuously worked on and uses the batman 0.3 routing algorithm today. It builds a switch of all your nodes and enables you to run any protocol (IPv4, IPv6, ..) on top of it. +In April 2007 batman advanced (residing in user space) came to light. It uses the routing algorithm of batman 0.3, but instead of sending UDP packets and manipulating routing tables, it provides a virtual network interface and transparently transports packets on its own. It builds a switch of all your nodes and enables you to run any Layer 3 (and Ethernet Layer 2) protocols, like IPv4, IPv6, DHCP, IPX.., on top of it.
-=== batman-saxnet (merged back into batman-adv-userspace) === +Due to the testing we realized that the layer 2 proof of concept implementation in user space suffered from many performance problems. In late 2007 we ported our layer 2 implementation to kernel space in form of a kernel modul.
-[Maintainer: www.saxnet.de] +=== batman-adv-userspace === +Maintainer: Simon Wunderlich, Marek Lindner
-In autumn 2007 Saxnet (a German company) wanted to use our layer 2 implementation for their products. They tested, fixed and improved our layer 2 implementation. Therefore they got an extra branch which was merged back into our batman advanced userspace branch. +batman advanced userspace was the first implementation of the batman-advanced idea, used as proof of concept. However the virtual interface in userspace imposed a significant overhead for low-end wireless access points, so we decided to re-implement batman-advanced as kernel module which is now batman-adv-kernelland.
-=== batman-adv-kernelland === - -[Maintainer: Marek Lindner] +=== battools === +Maintainer: Andreas Langer
-Due to the testing we realized that the layer 2 implementation in user space suffered from many performance problems. In late 2007 we ported our layer 2 implementation to kernel space in form of a kernel modul. At the moment it is heavily worked on and a release is to be expected in the coming weeks. +The battools are a set of debugging tools which work together with our layer 2 implementation (user space and kernel land). You can use them to debug the mesh which proved to be difficult without them.
-=== battools === +=== batman-0.2 (outdated) === +Maintainer: Marek Lindner, Axel Neumann
-[Maintainer: Andreas Langer] +0.2 stable was created last summer and represents our implementation of the BATMAN III routing algorithm. It works quite well and stable but has a major flaw while routing strong asymetric links. That is why we began working on a new algorithm - 0.2 is to be deprecated soon.
-The battools are a set of debugging tools which work together with our layer 2 implementation (user space and kernel land). You can use them to debug the mesh which proved to be difficult without them.