commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[doc] master: Merge branch 'backup-redmine/2017-12-14' (47f37bed)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branch : master >--------------------------------------------------------------- commit 47f37bed4c31aa4a47f55d886e4fb43d8228bcc3 Merge: 5934f1b5 864fd367 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 17:41:15 2017 +0100 Merge branch 'backup-redmine/2017-12-14' >--------------------------------------------------------------- 47f37bed4c31aa4a47f55d886e4fb43d8228bcc3 open-mesh/Download.rst | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --cc open-mesh/Download.rst index bc05291a,00000000..3c427cd2 mode 100644,000000..100644 --- a/open-mesh/Download.rst +++ b/open-mesh/Download.rst @@@ -1,229 -1,0 +1,231 @@@ +Download B.A.T.M.A.N. +===================== + +We are currently working on different branches. To get the details about +the differences of these branches, see our :doc:`Branches Explained page <BranchesExplained>`. + +Please use the maint branch for your public infrastructure unless you +know exactly what you are doing and are prepared for the big unknown. + +.. _open-mesh-download-download-released-source-code: + +Download Released Source Code +----------------------------- + +- The latest version of :doc:`batman-adv </batman-adv/Wiki>` is - `batman-adv-2017.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `batman-adv-2017.4.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv…>`__ +- The latest version of batctl (management and control tool for + batman-adv) is - `batctl-2017.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.…>`__ ++ `batctl-2017.4.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.…>`__ +- The latest version of alfred (Almighty Lightweight Fact Remote + Exchange Daemon) is - `alfred-2017.3.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.…>`__ - `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.…>`__ - `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.…>`__ - `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.…>`__ ++ `alfred-2017.4.tar.gz <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.…>`__ ++ `md5 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.…>`__ ++ `sha1 <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.…>`__ ++ `asc <https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.…>`__ + +- The latest stable version of batmand + (:ref:`unmaintained <open-mesh-BranchesExplained-batmand>`) is + `batman-0.3.2.tar.gz <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `md5 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `sha1 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ + `asc <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.t…>`__ +- The latest version of the vis server for the batmand (package not + needed for batman-adv) is + `vis-0.3.2.tar.gz <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `md5 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `sha1 <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + `asc <https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.…>`__ + +If you are wondering whether batman-adv or batmand might suit your setup +better, have a look at :doc:`this page </batman-adv/Wiki>`. Please note that +the development is focusing on batman-adv at the moment. + +To download previous release tarballs, simply check out our `download +section <https://downloads.open-mesh.org/batman/releases/>`__. + +If you find any bugs, please :doc:`let us know <Contribute>`! + +Git Repository Access +--------------------- + +Since we started integrating the batman-adv kernel module into the +mainline Linux tree, we maintain a git repository which contains the +batman-adv maintenance branches. More information can be found +:doc:`on our git page <UsingBatmanGit>`. +On overview about all the git repositories can be found on our `git +frontend <https://git.open-mesh.org>`__. We also host individual +repositories for development related to batman or meshing in general. +Feel free to contact us if you are interested in getting a repository +too. + +batman-adv in the Linux tree +---------------------------- + +Since linux 2.6.33 batman-adv is part of the official linux tree. You +can build batman-adv along with your linux binary by simply selecting +batman-adv in the Linux drivers section. If you use an older kernel or +want to have access to the latest features you can checkout our git +repository which still are backward compatible until 2.6.29. + +It follows an overview of linux versions and the batman-adv version they +contain, so that you can easily pick the compatible batctl packages: + +- linux 2.6.33 => batman-adv 0.2.0 (get batctl 0.2.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.34 => batman-adv 0.2.1 (get batctl 0.2.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.35 => batman-adv 2010.0.x (get batctl 2010.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.36 => batman-adv 2010.1.x (get batctl 2010.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.37 => batman-adv 2010.2.x (get batctl 2010.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.38 => batman-adv 2011.0.x (get batctl 2011.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 2.6.39 => batman-adv 2011.1.x (get batctl 2011.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.0 => batman-adv 2011.2.x (get batctl 2011.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.1 => batman-adv 2011.3.x (get batctl 2011.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.2 => batman-adv 2011.4.x (get batctl 2011.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.3 => batman-adv 2012.0.x (get batctl 2012.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.4 => batman-adv 2012.1.x (get batctl 2012.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.5 => batman-adv 2012.2.x (get batctl 2012.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.6 => batman-adv 2012.3.x (get batctl 2012.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.7 => batman-adv 2012.4.x (get batctl 2012.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.8 => batman-adv 2013.0.x (get batctl 2013.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.9 => batman-adv 2013.1.x (get batctl 2013.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.10 => batman-adv 2013.2.x (get batctl 2013.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.11 => batman-adv 2013.3.x (get batctl 2013.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.12 => batman-adv 2013.4.x (get batctl 2013.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.13 => batman-adv 2014.0.x (get batctl 2014.0.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ + NOTE: in-kernel version number is 2013.5.0 +- linux 3.14 => batman-adv 2014.1.x (get batctl 2014.1.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.15 => batman-adv 2014.2.x (get batctl 2014.2.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.16 => batman-adv 2014.3.x (get batctl 2014.3.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 3.17-3.19 => batman-adv 2014.4.x (get batctl 2014.4.x from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.0-4.1 => batman-adv 2015.0 (get batctl 2015.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/>`__ +- linux 4.2-4.3 => batman-adv 2015.1 (get batctl 2015.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.4 => batman-adv 2015.2 (get batctl 2015.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.5 => batman-adv 2016.0 (get batctl 2016.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.6 => batman-adv 2016.1 (get batctl 2016.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.7 => batman-adv 2016.2 (get batctl 2016.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.8 => batman-adv 2016.3 (get batctl 2016.3 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.9 => batman-adv 2016.4 (get batctl 2016.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.10 => batman-adv 2016.5 (get batctl 2016.5 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.11 => batman-adv 2017.0.1 (get batctl 2017.0 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ +- linux 4.12 => batman-adv 2017.1 (get batctl 2017.1 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ - - linux 4.13 => batman-adv 2017.1 (get batctl 2017.2 from ++- linux 4.13 => batman-adv 2017.2 (get batctl 2017.2 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ - - linux 4.14 => batman-adv 2017.1 (get batctl 2017.3 from ++- linux 4.14 => batman-adv 2017.3 (get batctl 2017.3 from ++ `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ ++- linux 4.15 => batman-adv 2017.4 (get batctl 2017.4 from + `here <https://downloads.open-mesh.org/batman/stable/sources/batctl/)>`__ + +Arch Linux +---------- + +Batman-adv and Batctl are avaible in the +`AUR <https://wiki.archlinux.org/index.php/AUR>`__ as PKGBUILD: + +- `batctl <https://aur.archlinux.org/packages/batctl/>`__ - Latest + Batctl +- `batman-adv <https://aur.archlinux.org/packages/batman-adv/>`__ - + Latest Batman-adv +- `batman-adv-v14 <https://aur.archlinux.org/packages/batman-adv-v14/>`__ + - Last Batman-adv with compability-version 14 (2013.4) +- `batctl-v14 <https://aur.archlinux.org/packages/batctl-v14/>`__ - + Last Batctl with compability-version 14 (2013.4) + +Debian +------ + +Use apt-get (or any other dpkg frontend of choice) to install +B.A.T.M.A.N. onto your debian machine. Following packages are available: + +- `alfred <https://packages.debian.org/sid/alfred>`__ - batctl 2015.2 +- `batmand <https://packages.debian.org/sid/batmand>`__ - batman 0.3.2 +- `batctl <https://packages.debian.org/sid/batctl>`__ - batctl 2015.2 +- Debian Wheezy and all newer releases come with batman-adv as part of + the kernel, no need to re-install the module manually. For squeeze, + check: + + - `batman-adv-source <https://packages.debian.org/squeeze/batman-adv-source>`__ + - batman-advanced kernel 2010.0.0 module source for Debian Squeeze + (installable via + `module-assistant <https://packages.debian.org/squeeze/module-assistant)>`__ + - `batman-adv-dkms <https://packages.debian.org/squeeze/batman-adv-dkms>`__ + - batman-advanced kernel module 2010.0.0 dkms package for Debian + Squeeze to build new modules dynamically (half-automatic) + +- `linux <https://packages.debian.org/source/unstable/linux>`__ - + batman-advanced kernel module as `part of the + official <https://bugs.debian.org/622361>`__ kernel packages + +Similar packages are also available through `Ubuntu +universe <https://help.ubuntu.com/community/Repositories/Ubuntu>`__ . + +Gentoo +------ + +Use emerge to build B.A.T.M.A.N. on your gentoo machine. Following +ebuilds are available: + +- `net-misc/batctl <https://packages.gentoo.org/packages/net-misc/batctl>`__ +- `net-misc/batman-adv <https://packages.gentoo.org/packages/net-misc/batman-adv>`__ + +openSUSE +-------- + +- `network:utilities / + batctl <https://build.opensuse.org/package/show?package=batctl&project=network%3Aut…>`__ +- the batman-adv module is available as module in the official kernel + packages + +Building OpenWRT packages +------------------------- + +B.A.T.M.A.N. is also included in OpenWRT as a package. Download the +extra package feed, link the batman folder into your main OpenWRT svn +directory and use "make menuconfig" to select the B.A.T.M.A.N. flavor +you intend to use. This enables you to integrate B.A.T.M.A.N. seamlessly +into your builds (see :doc:`this page </batman-adv/Building-with-openwrt>` +for a detailed explanation). + +More information about how to build the OpenWRT toolchain is available +`here <https://wiki.openwrt.org/doc/howto/build>`__.

1 0

[doc] master: doc: Add LICENSE information to documents (3a725b4a)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] master: Merge branch 'master' of https://git.open-mesh.org/batman-adv-doc (5934f1b5)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branch : master >--------------------------------------------------------------- commit 5934f1b5aba64451db073fa82aa6f6d9b0f039d9 Merge: bcdf6e25 d80ed697 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 17:20:28 2017 +0100 Merge branch 'master' of https://git.open-mesh.org/batman-adv-doc The batman_adv protocol documentation was dropped because it doesn't contain the information about the current COMPAT_VERSION 15 protocol format. >--------------------------------------------------------------- 5934f1b5aba64451db073fa82aa6f6d9b0f039d9 batman-adv/BATMAN_IV.rst | 429 ++++++++++++++ .../{rebroadcast-eval3.dia => asym_link1.dia} | 318 ++++------ batman-adv/asym_link1.svg | 34 ++ .../{rebroadcast-eval3.dia => asym_link2.dia} | 318 ++++------ batman-adv/asym_link2.svg | 34 ++ batman-adv/asym_penalty.gp | 17 + batman-adv/asym_penalty.svg | 254 ++++++++ batman-adv/{rebroadcast-eval3.dia => asymetry.dia} | 305 +++++----- batman-adv/asymetry.svg | 39 ++ .../echo_cancel1.dia | 610 ++++++++++--------- batman-adv/echo_cancel1.svg | 68 +++ .../echo_cancel2.dia | 471 ++++++++------- batman-adv/echo_cancel2.svg | 72 +++ .../{bcast-avoid-no-neighbor.dia => eq_alt1.dia} | 155 ++--- batman-adv/eq_alt1.svg | 22 + .../hop_penalty_new1.dia | 373 ++++++------ batman-adv/hop_penalty_new1.svg | 51 ++ .../hop_penalty_new2.dia | 373 ++++++------ batman-adv/hop_penalty_new2.svg | 51 ++ .../{primary_flag.dia => multi_interface_1.dia} | 476 +++++++-------- batman-adv/multi_interface_1.svg | 53 ++ .../{primary_flag.dia => multi_interface_2.dia} | 477 +++++++-------- batman-adv/multi_interface_2.svg | 53 ++ batman-adv/protocol_information.rst | 1 + batman-adv/{bcast-avoid-no-neighbor.dia => rq.dia} | 156 ++--- batman-adv/rq.svg | 22 + batman-adv/{bcast-avoid-no-neighbor.dia => tq.dia} | 156 ++--- batman-adv/tq.svg | 22 + .../{interface_detection.dia => tq_prop.dia} | 644 ++++++++++---------- batman-adv/tq_prop.svg | 79 +++ .../{rebroadcast-eval3.dia => tq_prop_best1.dia} | 386 ++++++------ batman-adv/tq_prop_best1.svg | 43 ++ batman-adv/{ap-isola-75.dia => tq_prop_best2.dia} | 641 ++++++++++---------- batman-adv/tq_prop_best2.svg | 71 +++ batman-adv/{ap-isola-75.dia => tq_prop_best3.dia} | 625 ++++++++++---------- batman-adv/tq_prop_best3.svg | 63 ++ batmand/BATMAN_Daemon_HowTo.rst | 468 +++++++++++++++ .../announce_networks.dia | 456 ++++++-------- batmand/announce_networks.svg | 33 ++ batmand/gettingstarted.rst | 1 + .../multiple_announces.dia | 653 ++++++++++----------- batmand/multiple_announces.svg | 43 ++ .../multiple_clients.dia | 323 +++++----- batmand/multiple_clients.svg | 36 ++ conf.py | 2 +- 45 files changed, 5945 insertions(+), 4032 deletions(-) diff --cc batman-adv/BATMAN_IV.rst index 00000000,e88936aa..e88936aa mode 000000,100644..100644 --- a/batman-adv/BATMAN_IV.rst +++ b/batman-adv/BATMAN_IV.rst diff --cc batman-adv/asym_link1.svg index 00000000,3f63b769..3f63b769 mode 000000,100644..100644 --- a/batman-adv/asym_link1.svg +++ b/batman-adv/asym_link1.svg diff --cc batman-adv/asym_link2.svg index 00000000,fb63a81b..fb63a81b mode 000000,100644..100644 --- a/batman-adv/asym_link2.svg +++ b/batman-adv/asym_link2.svg diff --cc batman-adv/asym_penalty.gp index 00000000,7aaccfe7..7aaccfe7 mode 000000,100644..100644 --- a/batman-adv/asym_penalty.gp +++ b/batman-adv/asym_penalty.gp diff --cc batman-adv/asym_penalty.svg index 00000000,c733085b..c733085b mode 000000,100644..100644 --- a/batman-adv/asym_penalty.svg +++ b/batman-adv/asym_penalty.svg diff --cc batman-adv/asymetry.svg index 00000000,5aa822eb..5aa822eb mode 000000,100644..100644 --- a/batman-adv/asymetry.svg +++ b/batman-adv/asymetry.svg diff --cc batman-adv/echo_cancel1.svg index 00000000,e3a879e1..e3a879e1 mode 000000,100644..100644 --- a/batman-adv/echo_cancel1.svg +++ b/batman-adv/echo_cancel1.svg diff --cc batman-adv/echo_cancel2.svg index 00000000,277cf780..277cf780 mode 000000,100644..100644 --- a/batman-adv/echo_cancel2.svg +++ b/batman-adv/echo_cancel2.svg diff --cc batman-adv/eq_alt1.svg index 00000000,72087056..72087056 mode 000000,100644..100644 --- a/batman-adv/eq_alt1.svg +++ b/batman-adv/eq_alt1.svg diff --cc batman-adv/hop_penalty_new1.svg index 00000000,926eb978..926eb978 mode 000000,100644..100644 --- a/batman-adv/hop_penalty_new1.svg +++ b/batman-adv/hop_penalty_new1.svg diff --cc batman-adv/hop_penalty_new2.svg index 00000000,730cf972..730cf972 mode 000000,100644..100644 --- a/batman-adv/hop_penalty_new2.svg +++ b/batman-adv/hop_penalty_new2.svg diff --cc batman-adv/multi_interface_1.svg index 00000000,efbd96f7..efbd96f7 mode 000000,100644..100644 --- a/batman-adv/multi_interface_1.svg +++ b/batman-adv/multi_interface_1.svg diff --cc batman-adv/multi_interface_2.svg index 00000000,4a35ea87..4a35ea87 mode 000000,100644..100644 --- a/batman-adv/multi_interface_2.svg +++ b/batman-adv/multi_interface_2.svg diff --cc batman-adv/protocol_information.rst index 281b2c8a,00000000..189a4ca9 mode 100644,000000..100644 --- a/batman-adv/protocol_information.rst +++ b/batman-adv/protocol_information.rst @@@ -1,28 -1,0 +1,29 @@@ +==================== +Protocol Information +==================== + +Contents: + +.. toctree:: + :maxdepth: 2 + + Network-wide-multi-link-optimization + Client-announcement + Client-roaming + TT-Flags + Packet-types + Compatversion ++ BATMAN_IV + BATMAN_V + Bridge-loop-avoidance-II + DistributedArpTable-technical + Fragmentation-technical + Multicast-optimizations-tech + NetworkCoding-technical + +.. only:: subproject + + Indices + ======= + + * :ref:`genindex` diff --cc batman-adv/rq.svg index 00000000,5680b075..5680b075 mode 000000,100644..100644 --- a/batman-adv/rq.svg +++ b/batman-adv/rq.svg diff --cc batman-adv/tq.svg index 00000000,70aa24e4..70aa24e4 mode 000000,100644..100644 --- a/batman-adv/tq.svg +++ b/batman-adv/tq.svg diff --cc batman-adv/tq_prop.svg index 00000000,ec4fc80b..ec4fc80b mode 000000,100644..100644 --- a/batman-adv/tq_prop.svg +++ b/batman-adv/tq_prop.svg diff --cc batman-adv/tq_prop_best1.svg index 00000000,c4bd9fd5..c4bd9fd5 mode 000000,100644..100644 --- a/batman-adv/tq_prop_best1.svg +++ b/batman-adv/tq_prop_best1.svg diff --cc batman-adv/tq_prop_best2.svg index 00000000,7fd2db60..7fd2db60 mode 000000,100644..100644 --- a/batman-adv/tq_prop_best2.svg +++ b/batman-adv/tq_prop_best2.svg diff --cc batman-adv/tq_prop_best3.svg index 00000000,85bcc83e..85bcc83e mode 000000,100644..100644 --- a/batman-adv/tq_prop_best3.svg +++ b/batman-adv/tq_prop_best3.svg diff --cc batmand/BATMAN_Daemon_HowTo.rst index 00000000,54b29699..54b29699 mode 000000,100644..100644 --- a/batmand/BATMAN_Daemon_HowTo.rst +++ b/batmand/BATMAN_Daemon_HowTo.rst diff --cc batmand/gettingstarted.rst index 788f829b,00000000..5e5a5132 mode 100644,000000..100644 --- a/batmand/gettingstarted.rst +++ b/batmand/gettingstarted.rst @@@ -1,20 -1,0 +1,21 @@@ +=============== +Getting Started +=============== + +Contents: + +.. toctree:: + :maxdepth: 2 + ++ BATMAN_Daemon_HowTo + InternetTuning + VisualizeMesh + AnnouncingNetworks + Faq + +.. only:: subproject + + Indices + ======= + + * :ref:`genindex`

1 0

[doc] backup-redmine/2017-12-14, master: doc: batmand/multiple_announces.png (f31345c0)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: batman-adv/rq.dia (6f80aacd)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: batmand/BATMAN_Daemon_HowTo: import batmand documentation from https://git.open-mesh.org/batman-adv-doc.git (864fd367)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-12-14,master >--------------------------------------------------------------- commit 864fd367fb0e9707f4c3c9026f50570495900997 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 16:52:35 2017 +0000 doc: batmand/BATMAN_Daemon_HowTo: import batmand documentation from https://git.open-mesh.org/batman-adv-doc.git >--------------------------------------------------------------- 864fd367fb0e9707f4c3c9026f50570495900997 batmand/BATMAN_Daemon_HowTo.textile | 298 ++++++++++++++++++++++++++++++++++++ 1 file changed, 298 insertions(+) diff --git a/batmand/BATMAN_Daemon_HowTo.textile b/batmand/BATMAN_Daemon_HowTo.textile new file mode 100644 index 00000000..b7cb912e --- /dev/null +++ b/batmand/BATMAN_Daemon_HowTo.textile @@ -0,0 +1,298 @@ +h1. B.A.T.M.A.N. Layer 3 meshing guide + +h2(#installing-from-source). Installing from source + +h3(#pre-requirements). Pre-requirements + +* Compile environment and libraries +*# gcc +*# libc6-dev +*# build-essential +*# binutils +*# makedev +*# GNU make +*# libpthread +* Download the B.A.T.M.A.N. daemon code from the website https://www.open-mesh.org/projects/open-mesh/wiki/Download + + +h3(#compiling). Compiling + +All you have to do is untar and make, then you will see the executable file called _batmand_. + +<pre>$ wget \ +https://downloads.open-mesh.org/batman/stable/sources/batman/batman-0.3.tar.gz +$ tar xzvf batman-0.3.tar.gz +$ cd batman-0.3 +$ make</pre> + + +If you want reduce the size of executable file, just strip it by executing: + +<pre>$ strip batmand</pre> + + +Note that if you want to help us finding a bug in the daemon, please don't strip it. + +h3(#installing). Installing + +Copy _batmand_ to a location somewhere in your path, for example + +<pre>$ cp batmand /usr/sbin/</pre> + + +Or start it right from the directory where you compiled it + +<pre>$ ./batmand</pre> + + +h2(#usage). Usage + +If you execute batmand -h or -H, you will see the help page, in the following we will explain all parameters and how to work with them in a mesh network. + +h3(#synopsis). SYNOPSIS + +<pre>batmand [options] {interface} [interface]</pre> + + +h3(#description). DESCRIPTION + +You can start batmand without specifying options, but you have to choose at least one interface batmand runs on. + +<pre>$ batmand eth1</pre> + + +If you have more interfaces, then you just add them behind the first. + +<pre>$ batmand eth1 eth2 eth3</pre> + + +The B.A.T.M.A.N. daemon can also run on alias interfaces. Note that we use alias interfaces to separate B.A.T.M.A.N. routing protocol and olsr routing protocol. + +<pre>$ batmand eth1:test1 eth2:test2 eth3:test3</pre> + + +Note that the B.A.T.M.A.N. daemon will take the ip address and the broadcast address from the given interfaces. + +Note also that you have to check whether your essid, channel or wifi mode is correct or not. + +h4(#a-add-announced-networks). @-a@ add announced network(s) + +The daemon announces the availability of a connection to another network. This option can be used multiple times and can be used to add networks dynamically while the daemon is running. The parameter has to be in the form of ip-address/netmask. + +For example, if you are the node A, and you can connect to _other network_, then you can execute -a to announce the gateway. + +!announce_networks.png(Announce A as gateway to B)! +Announce A as gateway to B + +If the other nodes in the B.A.T.M.A.N. network want to connect to node B after receiving the announce network information form node A, then they will know they can use node A as gateway to reach node B. Now, you know what a announced network is, but executing this command is wrong: + +<pre>$ batmand -a 192.168.100.101 eth1</pre> + + +Because you have to specify the netmask parameter and different netmask parameters cause different results. Let's make a example: + +<pre>$ batmand -a 192.168.100.101/32 eth1</pre> + + +In this case, it means that node A can only connect to node B, because your parameter is /32. + +<pre>$ batmand -a 192.168.100.101/24 eth1</pre> + + +In this case, it means that node A can connect to the whole 192.168.100.x network, because your parameter is /24. So, if you use different netmask values, then the results are different. + +!multiple_announces.png(Two Announced Networks)! +Two Announced Networks + +Node A can announce more than one network. To announce two networks execute the following command: + +<pre>$ batmand -a 192.168.100.101/24 -a 192.168.200.201/24 eth1</pre> + + +Note that node A has to have a route to connect the node or network. + +h4(#a-delete-announced-networks). @-A@ delete announced network(s) + +Delete networks to the daemons list of available connections to another network(s). This option can be used multiple times and can only be used while the daemon is running. The parameter has to be in the form of ip-address/netmask. + +h4(#b-run-connection-in-batch-mode). @-b@ run connection in batch mode + +The debug information are updated after a period of time by default, so if you use "-b" it will execute once and then stop. + +<pre>$ batmand eth1 +$ batmand -b -c -d 1</pre> + + +In this case, it means run debug level 1 once. + +Note that -b can only be used with -c and debug level 1 & 2. + +h4(#c-connect-via-unix-socket). @-c@ connect via unix socket + +The B.A.T.M.A.N. daemon offers a unix socket interface to which you can connect. First, you have to create a B.A.T.M.A.N. daemon on your host, then use -c to connect to its interface. Note you can create as many client sockets as you like. Deploy it without any arguments to get the current configuration even if changed at runtime. + +!multiple_clients.png(Multiple clients connected to B.A.T.M.A.N. interface)! +Multiple clients connected to B.A.T.M.A.N. interface + +<pre>$ batmand eth1 +$ batmand -c -d 1</pre> + + +In this case, you ask the daemon to output debug level 1 in your current shell. The B.A.T.M.A.N. daemon will update the information after a period of time. + +Note that if you use -c flag, then you only can use -d to see the debug level. + +h4(#d-debug-level). @-d@ debug level + +The debug level can be set to five values. + +* 0 - debug disabled (default) +* 1 - list neighbors +* 2 - list gateways +* 3 - observe batmand +* 4 - observe batmand (very verbose) +* 5 - memory debug / cpu usage + +Note that debug level 5 can be disabled at compile time. + +For example, you can run in normal start: + +<pre>$ batmand -d 1 eth1</pre> + + +h5(#level-1). Level 1 + +just lists the neighbors in your B.A.T.M.A.N. network. + +<pre>Originator Router (#/128): Potential routers... [B.A.T.M.A.N. 0.2, +MainIF/IP: eth2 105.131.131.175, UT: 0d 0h 3m] +105.131.83.2 105.131.1.3 ( 71): 105.131.1.3 ( 71) +105.131.1.2 105.131.1.2 ( 52): 105.131.1.2 ( 52) +105.131.56.10 105.131.1.4 ( 25): 105.131.1.4 ( 25),105.131.1.6 ( 15),... +105.131.131.70 105.131.131.70 (121): 105.131.131.70 (121)</pre> + + +* In the first line, we will see the version of the B.A.T.M.A.N. daemon, main interface, main IP, and uptime. +* In the first column, we can see those IPs which we can reach. +* In the second column, we can see those IPs which we sent our packets to when we want to reach the IP of the first column. The number in the parenthesis indicates the link quality of the connection and the #/128 shows the maximum number of packets. +* In the third column, we can see those IPs which are one hop neighbors and rebroadcasted packets from the originator. The B.A.T.M.A.N. daemon will choose the router with the best link quality from the potential router list. + +In this case, 105.131.1.2 is a one hop neighbor of 105.131.131.175, because the 105.131.1.2 is originator, router and potential router at the same time. If 105.131.131.175 wants to exchange data with the 105.131.83.2, then it will sent its packets to the 105.131.1.3, because it is the router for this destination. + +h5(#level-2). Level 2 + +just lists gateways in the B.A.T.M.A.N. network. + +<pre>Gateway Router (#/128) +105.131.83.5 105.131.41.1 ( 57), gw_class 11 ->6 MBit, reliability: 0 +105.131.41.5 105.131.41.1 ( 53), gw_class 11 ->6 MBit, reliability: 0</pre> + + +* In the first column, we can see those IPs which are our gateways. +* In the second column, we can see those IPs which we sent our packets to when we want to reach the IP of the first column. The number in the parenthesis indicates the link quality of the connection and the #/128 shows the maximum number of packets. The gw_class means gateway class of the gateway and 11 ->6 MBit means how much bandwidth the gateway owner wants to share. The reliability means how good the quality of the internet connection is. In this case, 0 means this is the best quality. The reliability number will increase if the quality is poor. + +h5(#level-3). Level 3 + +has more information about the neighbors, or shows the error message when you have an incorrect command. Note that if there is no neighbor in the B.A.T.M.A.N. network, then it will display nothing. + +h5(#level-4). Level 4 + +has so many information about the B.A.T.M.A.N. network, for example, how many packets you sent, and sent to where, or how many packets you got, and received from where etc. + +h4(#g-gateway-class). @-g@ gateway class + +The gateway class is used to tell other nodes in the network your available internet bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the daemon will guess your appropriate gateway class. Use "/" to seperate the down- and upload rates. You can omit the upload rate and batmand will assume an upload of . + +* 5000 +* 5000kbit +* 5mbit +* 5mbit/1024 +* 5mbit/1024kbit +* 5mbit/1mbit + +You only can set the value in a normal start + +<pre>$ batmand -g 5mbit/1024 -d 3 eth1</pre> + + +Note that if you use debug level 3, then you will know whether you succeed setting the gateway class or not. + +h4(#o-originator-interval-in-ms). @-o@ originator interval in ms + +A node transmits broadcast messages (we call them originator message or OGM) to inform the neighboring nodes about it's existence. Originator interval is the time to wait after sending one message and before sending the next message. The default value is 1000 ms (1 second). In a mobile network, you may want to detect network changes very quickly, so you need to send message very often, for example, use a value of 500 ms. In a static network, you can save bandwidth by using a higher value. This option is only available in daemon mode. + +<pre>$ batmand -o 2000 eth1</pre> + + +In this case, batmand will wait 2 second until sending the next OGMs. + +h4(#p-preferred-gateway). @-p@ preferred gateway + +Set the internet gateway by yourself. + +Note that this automatically switches your B.A.T.M.A.N. daemon to "internet search modus" with "-r 1" unless "-r" is given. If the preferred gateway is not found the gateway selection will use the current routing class to choose a gateway. + +<pre>$ batmand -r 3 -d 3 -p 192.168.1.1 eth1</pre> + + +In this case, you set 192.168.1.1 as your preferred gateway, so all of your internet packets will be sent to the 192.168.1.1. + +h4(#r-routing-class). @-r@ routing class + +The routing class can be set to four values - it enables "internet search modus". The daemon will choose an internet gateway based on certain criteria (unless "-p" is specified): + +* 0 - set no default route (default) +* 1 - use fast connection +* 2 - use stable connection +* 3 - use fast-switch connection +* XX - use late-switch connection + +h5(#level-1-1). Level 1 + +B.A.T.M.A.N tries to find the best available connection by watching the uplinks throughput and the link quality. + +h5(#level-2-1). Level 2 + +B.A.T.M.A.N compares the link quality of the internet node and chooses the one with the best connection. + +h5(#level-3-1). Level 3 + +B.A.T.M.A.N compares the link quality of the internet node and chooses the one with the best connection but switches to another gateway as soon as a better connection is found. + +h5(#level-xx). Level XX + +B.A.T.M.A.N compares the link quality of the internet node and chooses the one with the best link quality but switches to another gateway as soon as this gateway has a TQ value which is XX better than the currently selected gateway. + +XX ist a number between 3 and 256 + +<pre>$ batmand -r 3 -d 3 eth1</pre> + + +In this case, the B.A.T.M.A.N. daemon will choose the best statistic internet connection for you. Note that if you use debug level 3, then you will know whether you succeeded setting the routing class or not. + +h4(#s-visualization-server). @-s@ visualization server + +Since no topology database is computed by the protocol an additional solution to create topology graphs has been implemented, the vis server. B.A.T.M.A.N. daemons may send their local view about their single-hop neighbors to the vis server. It collects the information and provides data in a format similar to OLSR's topology information output. Therefore existing solutions to draw topology graphs developed for OLSR can be used to visualize mesh-clouds using B.A.T.M.A.N. + +h4(#policy-routing-script). @--policy-routing-script@ + +This option disables the policy routing feature of batmand - all routing changes are send to the script which can make use of this information or not. Firmware and package maintainers can use this option to tightly integrate batmand into their own routing policies. This option is only available in daemon mode. + +h2(#troubleshooting). Troubleshooting + +h3(#why-the-b.a.t.m.a.n.-daemon-doesnt-reload-the-setting-after-i-fixed-the-main-ip). Why the B.A.T.M.A.N. daemon doesn't reload the setting after I fixed the main IP? + +You have to restart the B.A.T.M.A.N. daemon after you modified any network configuration, otherwise the B.A.T.M.A.N. daemon won't use the new settings. + +<pre>$ killall batmand +$ batmand eth1</pre> + + +h3(#why-i-cant-connect-to-the-internet-after-setting-the-default-gateway). Why I can't connect to the Internet after setting the default gateway? + +You have to use NAT on your gateway or firewall if you use the -r or -p options to set default route. + +<pre>$ iptables -t nat -A POSTROUTING -o eth1 -j MASQUERADE</pre> + + +Note that you don't set the default route by yourself.

1 0

[doc] backup-redmine/2017-12-14, master: doc: batmand/multiple_clients.png (75c759e2)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: batmand/multiple_announces.dia (2e83484c)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-12-14,master >--------------------------------------------------------------- commit 2e83484cca4ae1468ebaca0170c09506667594d6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 16:43:23 2017 +0000 doc: batmand/multiple_announces.dia >--------------------------------------------------------------- 2e83484cca4ae1468ebaca0170c09506667594d6 ...nnounce_networks.dia => multiple_announces.dia} | 426 ++++++++++++++------- 1 file changed, 293 insertions(+), 133 deletions(-) diff --git a/batmand/announce_networks.dia b/batmand/multiple_announces.dia similarity index 57% copy from batmand/announce_networks.dia copy to batmand/multiple_announces.dia index d6a27975..f4e450dd 100644 --- a/batmand/announce_networks.dia +++ b/batmand/multiple_announces.dia @@ -63,12 +63,63 @@ </dia:attribute> </dia:diagramdata> <dia:layer name="Background" visible="true"> - <dia:object type="Standard - Text" version="1" id="O0"> + <dia:object type="Standard - Ellipse" version="0" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="15.6,7.25"/> + <dia:point val="9.30148,3.5225"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.8,6.0775;19.4,7.25"/> + <dia:rectangle val="9.25148,3.4725;17.8135,7.7475"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="9.30148,3.5225"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="8.4620400000000089"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.1749999999999998"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O1"> + <dia:attribute name="obj_pos"> + <dia:point val="9.30148,-0.9075"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="9.25148,-0.9575;17.8135,3.3175"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="9.30148,-0.9075"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="8.4620400000000089"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.1749999999999998"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O2"> + <dia:attribute name="obj_pos"> + <dia:point val="0.44,1.275"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="0.39,1.225;7.475,5.5"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="0.44,1.275"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="6.9849999999999941"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.1749999999999998"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O3"> + <dia:attribute name="obj_pos"> + <dia:point val="3.9325,1.275"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="0.1325,0.1025;7.7325,1.275"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -82,7 +133,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15.6,6.755"/> + <dia:point val="3.9325,0.78"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -99,85 +150,133 @@ <dia:connection handle="0" to="O2" connection="1"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O1"> + <dia:object type="Standard - Text" version="1" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="26.08,7.14"/> + <dia:point val="10.121,1.23603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.5087,5.9675;28.6512,7.14"/> + <dia:rectangle val="10.121,0.740436;15.9031,1.73162"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#other network#</dia:string> + <dia:string># B 192.168.100.101#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="1"/> + <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.08,6.645"/> + <dia:point val="10.121,1.3"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="1"/> + <dia:enum val="0"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="1"/> + <dia:enum val="2"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O3" connection="1"/> + <dia:connection handle="0" to="O7" connection="4"/> </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O2"> + <dia:object type="Standard - Text" version="1" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="12.225,7.25"/> + <dia:point val="10.046,5.63603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.175,7.2;19.025,11.35"/> + <dia:rectangle val="10.046,5.14044;15.8356,6.13162"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string># C 192.168.200.201#</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="0.80000000000000004"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="10.046,5.7"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="valign"> + <dia:enum val="2"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O8" connection="4"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O6"> + <dia:attribute name="obj_pos"> + <dia:point val="4.675,2.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="4.625,2.45;5.025,2.85"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="12.225,7.25"/> + <dia:point val="4.675,2.5"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="6.7500000000000036"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.0499999999999972"/> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O3"> + <dia:object type="Standard - Ellipse" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="22.185,7.14"/> + <dia:point val="9.82097,1.08603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.135,7.09;30.025,11.6"/> + <dia:rectangle val="9.77097,1.03603;10.171,1.43603"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="22.185,7.14"/> + <dia:point val="9.82097,1.08603"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="7.7900000000000063"/> + <dia:real val="0.29999995231628418"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.4100000000000001"/> + <dia:real val="0.29999995231628418"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O4"> + <dia:object type="Standard - Ellipse" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="18.025,9.77847"/> + <dia:point val="9.74597,5.48603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="17.975,9.72847;18.375,10.1285"/> + <dia:rectangle val="9.69597,5.43603;10.096,5.83603"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="18.025,9.77847"/> + <dia:point val="9.74597,5.48603"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -192,15 +291,15 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O5"> + <dia:object type="Standard - Ellipse" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="22.55,9.37847"/> + <dia:point val="3.95,3.375"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.5,9.32847;22.9,9.72847"/> + <dia:rectangle val="3.9,3.325;4.3,3.725"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="22.55,9.37847"/> + <dia:point val="3.95,3.375"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -215,121 +314,90 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O6"> + <dia:object type="Standard - Ellipse" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="18.025,9.92847"/> + <dia:point val="4.125,4.35"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="17.2925,9.31035;18.0462,10.5466"/> + <dia:rectangle val="4.075,4.3;4.475,4.7"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#A #</dia:string> - </dia:attribute> - <dia:attribute name="font"> - <dia:font family="sans" style="0" name="Helvetica"/> - </dia:attribute> - <dia:attribute name="height"> - <dia:real val="1"/> - </dia:attribute> - <dia:attribute name="pos"> - <dia:point val="18.025,10.0091"/> - </dia:attribute> - <dia:attribute name="color"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="alignment"> - <dia:enum val="2"/> - </dia:attribute> - </dia:composite> + <dia:attribute name="elem_corner"> + <dia:point val="4.125,4.35"/> </dia:attribute> - <dia:attribute name="valign"> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> <dia:enum val="2"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O4" connection="3"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O7"> + <dia:object type="Standard - Ellipse" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="22.85,9.52847"/> + <dia:point val="3.825,1.8"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.85,8.91034;29.1837,10.1466"/> + <dia:rectangle val="3.775,1.75;4.175,2.15"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string># B 192.168.1.101#</dia:string> - </dia:attribute> - <dia:attribute name="font"> - <dia:font family="sans" style="0" name="Helvetica"/> - </dia:attribute> - <dia:attribute name="height"> - <dia:real val="1"/> - </dia:attribute> - <dia:attribute name="pos"> - <dia:point val="22.85,9.60909"/> - </dia:attribute> - <dia:attribute name="color"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="alignment"> - <dia:enum val="0"/> - </dia:attribute> - </dia:composite> + <dia:attribute name="elem_corner"> + <dia:point val="3.825,1.8"/> </dia:attribute> - <dia:attribute name="valign"> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> <dia:enum val="2"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O5" connection="4"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O8"> + <dia:object type="Standard - Ellipse" version="0" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="18.325,9.92847"/> + <dia:point val="2.925,3.125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.2707,9.0442;22.5961,10.0492"/> + <dia:rectangle val="2.875,3.075;3.275,3.475"/> </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="18.325,9.92847"/> - <dia:point val="22.5008,9.54668"/> + <dia:attribute name="elem_corner"> + <dia:point val="2.925,3.125"/> </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="22"/> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O4" connection="4"/> - <dia:connection handle="1" to="O5" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O9"> + <dia:object type="Standard - Ellipse" version="0" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="13.9751,8.63125"/> + <dia:point val="2.3,2.675"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.9251,8.58125;14.3251,8.98125"/> + <dia:rectangle val="2.25,2.625;2.65,3.025"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="13.9751,8.63125"/> + <dia:point val="2.3,2.675"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="0.30000215768814087"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="0.30000215768814087"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="inner_color"> <dia:color val="#000000"/> @@ -338,15 +406,15 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O10"> + <dia:object type="Standard - Ellipse" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="15.2751,9.33125"/> + <dia:point val="1.8,4.125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.2251,9.28125;15.6251,9.68125"/> + <dia:rectangle val="1.75,4.075;2.15,4.475"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="15.2751,9.33125"/> + <dia:point val="1.8,4.125"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -361,15 +429,15 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O11"> + <dia:object type="Standard - Ellipse" version="0" id="O15"> <dia:attribute name="obj_pos"> - <dia:point val="14.1251,9.78125"/> + <dia:point val="2.9,4.525"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.0751,9.73125;14.4751,10.1313"/> + <dia:rectangle val="2.85,4.475;3.25,4.875"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="14.1251,9.78125"/> + <dia:point val="2.9,4.525"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -384,15 +452,15 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O12"> + <dia:object type="Standard - Ellipse" version="0" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="15.5251,8.13125"/> + <dia:point val="1.45,3.1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.4751,8.08125;15.8751,8.48125"/> + <dia:rectangle val="1.4,3.05;1.8,3.45"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="15.5251,8.13125"/> + <dia:point val="1.45,3.1"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -407,15 +475,15 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O13"> + <dia:object type="Standard - Ellipse" version="0" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="15.3251,10.2312"/> + <dia:point val="1.825,2"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.2751,10.1812;15.6751,10.5812"/> + <dia:rectangle val="1.775,1.95;2.175,2.35"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="15.3251,10.2312"/> + <dia:point val="1.825,2"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -430,15 +498,43 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O14"> + <dia:object type="Standard - Line" version="0" id="O18"> + <dia:attribute name="obj_pos"> + <dia:point val="6.83107,3.66331"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="6.76074,0.816331;10.1749,3.73364"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="6.83107,3.66331"/> + <dia:point val="9.82097,1.23603"/> + </dia:attribute> + <dia:attribute name="numcp"> + <dia:int val="1"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="22"/> + </dia:attribute> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O19" connection="2"/> + <dia:connection handle="1" to="O7" connection="3"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O19"> <dia:attribute name="obj_pos"> - <dia:point val="12.9501,9.05625"/> + <dia:point val="6.575,3.61937"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.9001,9.00625;13.3001,9.40625"/> + <dia:rectangle val="6.525,3.56937;6.925,3.96937"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="12.9501,9.05625"/> + <dia:point val="6.575,3.61937"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="0.30000001192092896"/> @@ -453,5 +549,69 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> + <dia:object type="Standard - Line" version="0" id="O20"> + <dia:attribute name="obj_pos"> + <dia:point val="6.89561,3.86738"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="6.82735,3.79912;10.0823,5.98843"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="6.89561,3.86738"/> + <dia:point val="9.78991,5.52997"/> + </dia:attribute> + <dia:attribute name="numcp"> + <dia:int val="1"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="22"/> + </dia:attribute> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O19" connection="8"/> + <dia:connection handle="1" to="O8" connection="0"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O21"> + <dia:attribute name="obj_pos"> + <dia:point val="6.575,3.76937"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="5.8425,3.15124;6.59625,4.3875"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#A #</dia:string> + </dia:attribute> + <dia:attribute name="font"> + <dia:font family="sans" style="0" name="Helvetica"/> + </dia:attribute> + <dia:attribute name="height"> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="6.575,3.84999"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="2"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="valign"> + <dia:enum val="2"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O19" connection="3"/> + </dia:connections> + </dia:object> </dia:layer> </dia:diagram>

1 0

[doc] backup-redmine/2017-12-14, master: doc: batman-adv/multi_interface_2.png (cfe7c889)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: batman-adv/asym_link1.png (6a6e0453)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

← Newer
1
2
3
4
5
6
7
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017