Repository : ssh://git@open-mesh.org/doc

On branch : master

commit 5934f1b5aba64451db073fa82aa6f6d9b0f039d9 Merge: bcdf6e25 d80ed697 Author: Sven Eckelmann sven@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`