commits

commits@lists.open-mesh.org

1 participants
12425 discussions

[doc] batman-adv-doc, master: add hop penalty and multiple interface illustrations (e84741e0)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit e84741e00812eb57959e2c49f26b3f9dbe33d5fb Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 20:35:14 2009 +0200 add hop penalty and multiple interface illustrations >--------------------------------------------------------------- batman_iv.docbook | 36 +- images/Makefile | 4 +- images/{echo_cancel2.dia => hop_penalty_new1.dia} | 458 +++++++++------------ images/{echo_cancel2.dia => hop_penalty_new2.dia} | 458 +++++++++------------ images/{hop_penalty2.dia => multi_interface_1.dia} | 416 ++++++++----------- images/{hop_penalty2.dia => multi_interface_2.dia} | 423 ++++++++----------- 6 files changed, 780 insertions(+), 1015 deletions(-) Diff suppressed because of size. To see it, use: git diff-tree --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e84741e00812eb57959e2c49f26b3f9dbe33d5fb

1 0

[doc] batman-adv-doc, master: update packets according to compatibility verison 7 (2ff03c1f)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 2ff03c1f0ad994c38f1b1838474698b6138b93ef Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun May 10 18:03:34 2009 +0200 update packets according to compatibility verison 7 >--------------------------------------------------------------- 2ff03c1f0ad994c38f1b1838474698b6138b93ef batman_adv.docbook | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/batman_adv.docbook b/batman_adv.docbook index f89ab2a9..8548f19f 100644 --- a/batman_adv.docbook +++ b/batman_adv.docbook @@ -71,7 +71,7 @@ <listitem><para> Destination MAC - The MAC of the neighbour or broadcast</para></listitem> <listitem><para> Source MAC - The MAC of the Network Interface the packet is sent out</para></listitem> <listitem><para> Ethernet Type - The Batman Ethertype (0x0842)</para></listitem> - <listitem><para> Batman Type - The different messages (unicast, broadcast, originator, message system) are distinguished in this field, as described in the next secionts</para></listitem> + <listitem><para> Batman Type - The different messages (unicast, broadcast, originator, message system, visualization) are distinguished in this field, as described in the next sections</para></listitem> </itemizedlist> The Destination MAC is set according to the embedded Ethernet Frame (if there is any), so inner Broadcasts are also @@ -121,23 +121,20 @@ <row> <entry colname="colB">16-23</entry> <entry colname="col0">Flags</entry> - <entry colname="col1">TTL</entry> - <entry colname="col2">Gateway Info</entry> - <entry colname="col3">TQ</entry> - <entry namest="col4" nameend="col5">seqno</entry> - <entry namest="col6" nameend="col7">Originator MAC</entry> + <entry colname="col1">TQ</entry> + <entry namest="col2" nameend="col3">Seqno</entry> + <entry namest="col4" nameend="col7">Originator MAC</entry> </row> <row> <entry colname="colB">24-31</entry> - <entry namest="col0" nameend="col3">Originator MAC (cont.)</entry> - <entry namest="col4" nameend="col7">previous sender</entry> + <entry namest="col0" nameend="col1">Originator MAC (cont.)</entry> + <entry namest="col2" nameend="col7">Previous Sender MAC</entry> </row> <row> <entry colname="colB">32-39</entry> - <entry namest="col0" nameend="col1">previous sender (cont.)</entry> - <entry colname="col2">#HNA entries</entry> - <entry colname="col3">padding</entry> - <entry namest="col4" nameend="col7">HNA entries ...</entry> + <entry colname="col0">TTL</entry> + <entry colname="col1">#HNA entries</entry> + <entry namest="col2" nameend="col7">HNA entries ...</entry> </row> @@ -147,7 +144,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 0, this is an Originator packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Flags - some Flags which are used in the algorithm: <itemizedlist> <listitem><para>0x80 - Unidirectional Link</para></listitem> @@ -155,11 +152,10 @@ </itemizedlist> </para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> - <listitem><para> Gateway Info - reserved, classification of the gatway capabilities and quality (connection to the internet).</para></listitem> <listitem><para> TQ - transmit quality, connection quality to the originator.</para></listitem> <listitem><para> Seqno - The Sequence Number, the Originator increases this number with each new packet. </para></listitem> <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> - <listitem><para> previous sender MAC - The MAC address of the node which sent the packet before. </para></listitem> + <listitem><para> Previous Sender MAC - The MAC address of the node which sent the packet before. </para></listitem> </itemizedlist> </para> </sect2> @@ -204,19 +200,17 @@ <row> <entry colname="colB">16-23</entry> <entry colname="col0">Message Type</entry> - <entry namest="col1" nameend="col6">Destination MAC</entry> - <entry namest="col7" nameend="col7">Originator MAC</entry> + <entry colname="col1">TTL</entry> + <entry namest="col2" nameend="col7">Destination MAC</entry> </row> <row> <entry colname="colB">24-31</entry> - <entry namest="col0" nameend="col4">Originator MAC (cont.)</entry> - <entry colname="col5">TTL</entry> - <entry colname="col6">UID</entry> - <entry namest="col7" nameend="col7">seqno</entry> + <entry namest="col0" nameend="col5">Originator MAC</entry> + <entry namest="col6" nameend="col7">Seqno</entry> </row> <row> <entry colname="colB">32-39</entry> - <entry namest="col0" nameend="col0">seqno (cont.)</entry> + <entry colname="col0">UID</entry> <entry namest="col1" nameend="col7">(Ethernet padding ..)</entry> </row> @@ -226,7 +220,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 1, this is a message system packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Message Type - same as in ICMP: <itemizedlist> <listitem><para>0 - Echo Reply</para></listitem> @@ -239,7 +233,7 @@ <listitem><para> Originator MAC - MAC address of the sending node.</para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> <listitem><para> UID - unique number to identify the number of the requesting client. </para></listitem> - <listitem><para> seqno - Sequence Number of the request. </para></listitem> + <listitem><para> Seqno - Sequence Number of the request. </para></listitem> </itemizedlist> </para> </sect2> @@ -292,7 +286,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Destination MAC - MAC address of the node which should receive the frame.</para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> </itemizedlist> @@ -352,7 +346,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> <listitem><para> Seqno - sequence number, the Originator increases this number with each new packet. </para></listitem> </itemizedlist> @@ -361,7 +355,12 @@ </para> </sect2> - +<sect2 id="Batman_adv_packet_types_5"> + <title>Batman Type 5 - Visualization</title> + <para> + TODO + </para> +</sect2> </sect1>

1 0

[doc] batman-adv-doc, master: batman-adv-doc: Fix external links (94166086)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 94166086c7e29a95e2db03c5b57b8665f16d61cb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 6 16:28:25 2015 +0100 batman-adv-doc: Fix external links Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 94166086c7e29a95e2db03c5b57b8665f16d61cb README | 20 ++++++++++---------- batmand.docbook | 4 ++-- copyright.docbook | 2 +- references.docbook | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8f4ff7dc..59ebe63e 100644 --- a/README +++ b/README @@ -1,18 +1,18 @@ Requirements ============ - * GNU make - http://www.gnu.org/software/make/ + * GNU make - https://www.gnu.org/software/make/ * xmlto - https://fedorahosted.org/xmlto/ - * docbook-xml (>= 4.5) - http://www.oasis-open.org/docbook/xml/ - * docbook-xsl - http://wiki.docbook.org/topic/DocBookXslStylesheets - * fop - http://xmlgraphics.apache.org/fop/ + * docbook-xml (>= 4.5) - https://www.oasis-open.org/docbook/xml/ + * docbook-xsl - http://wiki.docbook.org/DocBookXslStylesheets + * fop - https://xmlgraphics.apache.org/fop/ * ghostscript - http://www.ghostscript.com/ - * coreutils - http://www.gnu.org/software/coreutils/ + * coreutils - https://www.gnu.org/software/coreutils/coreutils.html * gnuplot - http://gnuplot.sourceforge.net/ - * dia - http://live.gnome.org/Dia - * texlive-latex-base - http://www.tug.org/texlive/ - * texlive-base - http://www.tug.org/texlive/ - * ps2eps - http://www.tm.uka.de/~bless/ps2eps + * dia - https://wiki.gnome.org/action/show/Apps/Dia + * texlive-latex-base - https://www.tug.org/texlive/ + * texlive-base - https://www.tug.org/texlive/ + * ps2eps - https://www.tm.uka.de/~bless/ps2eps * imagemagick - http://www.imagemagick.org/ @@ -31,4 +31,4 @@ Troubleshooting * "libjli.so: cannot open shared object file: No such file or directory" Make sure that /proc is mounted and `/bin/ls -l /proc/self/exe` prints [...] /proc/self/exe -> /bin/ls - See http://bugs.debian.org/435293 for more informations + See https://bugs.debian.org/435293 for more informations diff --git a/batmand.docbook b/batmand.docbook index 9f6c68b1..350e9ed1 100644 --- a/batmand.docbook +++ b/batmand.docbook @@ -18,7 +18,7 @@ <listitem><para>libpthread</para></listitem> </orderedlist></listitem> <listitem><para>Download the B.A.T.M.A.N. daemon code from the website - <ulink url="http://www.open-mesh.net/wiki/Download" /></para></listitem> + <ulink url="https://www.open-mesh.org/projects/open-mesh/wiki/Download" /></para></listitem> </itemizedlist> </section> <section> @@ -26,7 +26,7 @@ <para>All you have to do is untar and make, then you will see the executable file called <emphasis>batmand</emphasis>.</para> <programlisting><userinput>$ wget \ -http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz +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</userinput></programlisting> diff --git a/copyright.docbook b/copyright.docbook index 4ec2dffb..1cf1d6a2 100644 --- a/copyright.docbook +++ b/copyright.docbook @@ -5,6 +5,6 @@ you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. To view a copy of this - license, visit <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin + license, visit <ulink url="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para> </chapter> diff --git a/references.docbook b/references.docbook index 0cd65d3b..0cce1d4f 100644 --- a/references.docbook +++ b/references.docbook @@ -2,7 +2,7 @@ <section> <title>Reference Links</title> <itemizedlist> - <listitem><ulink url="http://www.open-mesh.net/" /></listitem> + <listitem><ulink url="https://www.open-mesh.org/" /></listitem> <listitem><ulink url="http://www.olsr.org/" /></listitem> </itemizedlist> </section>

1 0

[doc] batman-adv-doc, master: apply another comment: green original originator, round arrows (30769e72)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 30769e728880d62ae87050d5a7f3b25577c7272b Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 21:44:03 2009 +0200 apply another comment: green original originator, round arrows >--------------------------------------------------------------- 30769e728880d62ae87050d5a7f3b25577c7272b images/multi_interface_2.dia | 213 ++++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 105 deletions(-) diff --git a/images/multi_interface_2.dia b/images/multi_interface_2.dia index 26f64a28..71dbe064 100644 --- a/images/multi_interface_2.dia +++ b/images/multi_interface_2.dia @@ -251,7 +251,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#e5e5e5"/> + <dia:color val="#00ff00"/> </dia:attribute> <dia:attribute name="show_background"> <dia:boolean val="true"/> @@ -358,40 +358,45 @@ <dia:connection handle="0" to="O8" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O10"> + <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="14,3.5"/> + <dia:point val="14,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.95,3.45;16.05,4.55"/> + <dia:rectangle val="5.95,0.5;14.05,1.5"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="14,3.5"/> + <dia:attribute name="conn_endpoints"> + <dia:point val="14,1"/> + <dia:point val="6,1"/> </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="2"/> + <dia:attribute name="numcp"> + <dia:int val="1"/> </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="1"/> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#e5e5e5"/> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O4" connection="3"/> + <dia:connection handle="1" to="O6" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="15,4"/> + <dia:point val="1,6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> + <dia:rectangle val="1,5.6;1,6.8"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#wlan2#</dia:string> + <dia:string>##</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -400,90 +405,32 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15,4.0725"/> + <dia:point val="1,6"/> </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="2"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O10" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Line" version="0" id="O12"> - <dia:attribute name="obj_pos"> - <dia:point val="14,1"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="5.95,0.5;14.05,1.5"/> - </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="14,1"/> - <dia:point val="6,1"/> - </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> - </dia:attribute> - <dia:attribute name="end_arrow"> <dia:enum val="3"/> </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="O4" connection="3"/> - <dia:connection handle="1" to="O6" connection="4"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Line" version="0" id="O13"> - <dia:attribute name="obj_pos"> - <dia:point val="14,4"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="5.95,3.5;14.05,4.5"/> - </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="14,4"/> - <dia:point val="6,4"/> - </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> - </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="3"/> - </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="O10" connection="3"/> - <dia:connection handle="1" to="O8" connection="4"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O14"> + <dia:object type="Standard - Text" version="1" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="1,6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="1,5.6;1,6.8"/> + <dia:rectangle val="7,4.9575;13.22,6.6975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>##</dia:string> + <dia:string>#originator = A/wlan0, +direct link = 0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -492,7 +439,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="1,6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -506,18 +453,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O15"> + <dia:object type="Standard - Text" version="1" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="7,5.5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,4.94044;13.2371,6.73163"/> + <dia:rectangle val="7,-1.0425;13.22,0.6975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#originator = A/wlan0, -direct link = 0#</dia:string> +direct link = 1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -526,7 +473,7 @@ direct link = 0#</dia:string> <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,5.5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -540,63 +487,119 @@ direct link = 0#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> + <dia:object type="Standard - BezierLine" version="0" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="15,1"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="5.99505,1.48711;14.8958,4.5"/> + </dia:attribute> + <dia:attribute name="bez_points"> + <dia:point val="15,1"/> + <dia:point val="14.0746,4.05375"/> + <dia:point val="14.8,4"/> + <dia:point val="5,4"/> + </dia:attribute> + <dia:attribute name="corner_types"> + <dia:enum val="0"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> + </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="O4" connection="8"/> + <dia:connection handle="3" to="O8" connection="8"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Box" version="0" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="14,3.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="13.95,3.45;16.05,4.55"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="14,3.5"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="2"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#e5e5e5"/> + </dia:attribute> + <dia:attribute name="show_background"> + <dia:boolean val="true"/> + </dia:attribute> + </dia:object> <dia:object type="Standard - Text" version="1" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="7,4.5"/> + <dia:point val="15,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.9575,3.1025;8.1225,5.575"/> + <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#X#</dia:string> + <dia:string>#wlan2#</dia:string> </dia:attribute> <dia:attribute name="font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> + <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,4.5"/> + <dia:point val="15,4.0725"/> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#ff0000"/> + <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="1"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O15" connection="8"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="7,-0.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-1.05956;13.2371,0.731625"/> + <dia:rectangle val="7,3.145;8.1225,5.49"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#originator = A/wlan0, -direct link = 1#</dia:string> + <dia:string>#X#</dia:string> </dia:attribute> <dia:attribute name="font"> - <dia:font family="sans" style="0" name="Helvetica"/> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="0.80000000000000004"/> + <dia:real val="2"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,-0.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#000000"/> + <dia:color val="#ff0000"/> </dia:attribute> <dia:attribute name="alignment"> <dia:enum val="0"/>

1 0

[doc] batman-adv-doc, master: multiple interfaces added (b77a9ee1)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit b77a9ee1462a6f143763dd87a178e7923d6f7f23 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Apr 12 01:02:56 2009 +0800 multiple interfaces added >--------------------------------------------------------------- b77a9ee1462a6f143763dd87a178e7923d6f7f23 batman_iv.docbook | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index d98f5cbb..04e56828 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -447,14 +447,20 @@ </para> </sect2> - <sect2 id="multiple_interfaces"> +<sect2 id="multiple_interfaces"> <title>Multiple Interfaces</title> <para> -TODO Explain multiple interfaces, which interface sends which OGM by which TTL, and why. -(Maybe move this section somewhere else ... ) - -==> why explaining this in this document ? I would refer them to the RFC because this did not change with IV. - </para> + In order to support nodes with several network interfaces B.A.T.M.A.N. needs to detect which link connects to what interface. As every incoming packet is rebroadcasted via all existing interfaces B.A.T.M.A.N. IV needs to use a flag (direct link flag) to distinguish between real connections and rebroadcasts. +</para> +<para> + The detection process: Node A emits an OGM without any enabled flags. The neighbor B receives the message and checks whether the UDP sender address and the originator address are equal. If so it will rebroadcasting the OGM with the direct link flag enabled otherwise the flags are not changed. Once node A receives this rebroadcast of its own OGM it recognizes this neighbor as single-hop neighbor due to the existing direct link flag. If node A received this package via the same interface it was sent out (incoming interface address equals originator address) node A will accept this package and increase the the Echo Quality (EQ) packet count. Its ignored otherwise. +</para> +<para> + Examples: Node A hast 2 interfaces and broadcasts the OGM of one interface over both interfaces to make it known in the mesh cloud. Node B also has 2 interfaces and receives this broadcast via both. The OGM that orignated via the interface it belongs to is accepted to other one ignored (for further interface detection). +</para> +<para> + Node B will rebroadcast the message over both interfaces as well but only set the direct link interface flag on the packet that leaves the node via the interface the message came in. Node A will ignore the packet without the direct link flag and only counts the OGM that comes in via the interface it left in the first place. +</para> </sect2> </sect1>

1 0

[doc] batman-adv-doc, master: Merge branch 'master' of gitorious:batman-adv-doc/mainline (1f24245f)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 1f24245fe76a35d00dd76b7422de006758b76cf0 Merge: b77a9ee1 a4ea3344 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Apr 12 01:03:28 2009 +0800 Merge branch 'master' of gitorious:batman-adv-doc/mainline >--------------------------------------------------------------- 1f24245fe76a35d00dd76b7422de006758b76cf0 batman_iv.docbook | 12 ++++++++++-- images/Makefile | 2 +- images/asym_link2.dia | 8 ++++---- images/{tq_prop_calc.tex => asym_penalty_formula.tex} | 2 +- 4 files changed, 16 insertions(+), 8 deletions(-)

1 0

[doc] batman-adv-doc, master: update asym_link2 to be more clear about the used TQ (e27c218c)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit e27c218c536795122308acfe218e26ffad62ce51 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 17:50:17 2009 +0200 update asym_link2 to be more clear about the used TQ >--------------------------------------------------------------- e27c218c536795122308acfe218e26ffad62ce51 images/asym_link2.dia | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/images/asym_link2.dia b/images/asym_link2.dia index 5df51f22..b170d6e7 100644 --- a/images/asym_link2.dia +++ b/images/asym_link2.dia @@ -239,15 +239,15 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="6.58206,-0.884177"/> + <dia:point val="3.03206,-0.834177"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.58206,-1.56168;8.20456,-0.389177"/> + <dia:rectangle val="3.03206,-1.53293;12.7883,-0.296677"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#95%#</dia:string> + <dia:string>#24.75 (incoming TQ=95%)#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -256,7 +256,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="6.58206,-0.884177"/> + <dia:point val="3.03206,-0.834177"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/>

1 0

[doc] batman-adv-doc, master: update asymetry penalty section, add formula in text (a4ea3344)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit a4ea33448b5daa130f5ace9f0d4b9c178ca3d171 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 18:55:50 2009 +0200 update asymetry penalty section, add formula in text >--------------------------------------------------------------- a4ea33448b5daa130f5ace9f0d4b9c178ca3d171 batman_iv.docbook | 12 ++++++++++-- images/Makefile | 2 +- images/{tq_prop_calc.tex => asym_penalty_formula.tex} | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index d98f5cbb..a73483fd 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -272,7 +272,15 @@ </inlinemediaobject> </para> <para> - Thus B.A.T.M.A.N. IV needs to penalize links that have have a poor receiving link quality. To avoid a simple hysteresis which completely turns on or off a link B.A.T.M.A.N. IV uses a mathematical function to give the receiving link quality stronger negative impact the weaker the link becomes. + Thus B.A.T.M.A.N. IV needs to penalize links that have have a poor receiving link quality. To avoid a simple hysteresis which completely turns on or off a link, B.A.T.M.A.N. IV uses the function + <inlinemediaobject> + <imageobject> <imagedata fileref="images/asym_penalty_formula.eps" format="EPS"/> </imageobject> + <imageobject> <imagedata fileref="images/asym_penalty_formula.png" format="PNG" /> </imageobject> + <textobject> <phrase>compute the asymetry penalty factor</phrase> </textobject> + </inlinemediaobject> + to weight the penalty for the receiving link quality. As visible in the plot below, small packet + loss will influence the link rating only a little, while huge packet loss will still have a severe + influence TQ. </para> <para> <inlinemediaobject> @@ -282,7 +290,7 @@ </inlinemediaobject> </para> <para> - This obtained value is calculated into the TQ before it gets rebroadcasted. Neighboring nodes can weight the routing decision based on this information. In some situations the weak link is the only link available, so you want to use it, whereas in other cases better connections may exist. + This obtained value is multiplicated on the TQ before it gets rebroadcasted. Neighboring nodes can weight the routing decision based on this information. In some situations the weak link is the only link available, so you want to use it, whereas in other cases better connections may exist. </para> <para> <inlinemediaobject> diff --git a/images/Makefile b/images/Makefile index 139f6e52..d003929f 100644 --- a/images/Makefile +++ b/images/Makefile @@ -6,7 +6,7 @@ DIA_IMAGES=asymetry.dia tq.dia eq.dia eq_alt1.dia eq_alt2.dia eq_alt3.dia rq.dia echo_cancel1.dia echo_cancel2.dia \ tq_prop_best1.dia tq_prop_best2.dia tq_prop_best3.dia \ announce_networks.dia multiple_announces.dia multiple_clients.dia -TEX_IMAGES=compute_tq.tex tq_prop_calc.tex +TEX_IMAGES=compute_tq.tex tq_prop_calc.tex asym_penalty_formula.tex PNG_IMAGES= $(DIA_IMAGES:.dia=.png) PNG_IMAGES+=$(GP_IMAGES:.gp=.png) PNG_IMAGES+=$(TEX_IMAGES:.tex=.png) diff --git a/images/tq_prop_calc.tex b/images/asym_penalty_formula.tex similarity index 65% copy from images/tq_prop_calc.tex copy to images/asym_penalty_formula.tex index 23b71086..577590b8 100644 --- a/images/tq_prop_calc.tex +++ b/images/asym_penalty_formula.tex @@ -1,6 +1,6 @@ \documentclass{article} \pagestyle{empty} \begin{document} -$TQ = TQ_{incoming} * TQ_{local}$ +$f_{asym} = (100\% - (100\% - {RQ})^3)$ \end{document}

1 0

[doc] batman-adv-doc, master: remove deprecated hop penalty section (dbc0c083)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit dbc0c083ce4b1a9639ba7b075f49da89df1694bf Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Apr 11 08:12:48 2009 +0800 remove deprecated hop penalty section >--------------------------------------------------------------- dbc0c083ce4b1a9639ba7b075f49da89df1694bf batman_iv.docbook | 47 ----------------------------------------------- 1 file changed, 47 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index 4b9afe04..d98f5cbb 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -324,53 +324,6 @@ <para> Even in more sophisticated scenarios with more nodes/hops this concept successfully reduces the packets. It ensures that packet only travels paths which did not see this OGM before. </para> -<para> - In certain cases B.A.T.M.A.N. IV is unable to detect the 'real' source of an OGM which may lead to temporary routing loops. The following section is going to illustrate the issue and how the echo cancellation addresses it using an Ethernet network as example for the sake of simplicity. WiFi and other mediums are less susceptible as Ethernet but still affected. -</para> -<para> - Example: The node S (source) has a WiFi connection towards node A but no link to node B at all. Node A and node B are connected via Ethernet. We assume the Ethernet connection to be perfect (no packet loss) whereas the WiFi connection suffers from occasional collisions and interferences. -</para> -<para> - <inlinemediaobject> - <imageobject> <imagedata fileref="images/hop_penalty3.eps" format="EPS" scale="50" /> </imageobject> - <imageobject> <imagedata fileref="images/hop_penalty3.png" format="PNG" /> </imageobject> - <textobject> <phrase>example topology</phrase> </textobject> - </inlinemediaobject> -</para> -<para> - Whenever node A receives a packet via the WiFi connection it will rebroadcast the information on the Ethernet to inform neighbor nodes about the existance of the source node. Node B receives the broadcast and parses the packet before rebroadcasting it. At that point node A will receive that very packet again. -</para> -<para> - <inlinemediaobject> - <imageobject> <imagedata fileref="images/hop_penalty4.eps" format="EPS" scale="50" /> </imageobject> - <imageobject> <imagedata fileref="images/hop_penalty4.png" format="PNG" /> </imageobject> - <textobject> <phrase>packet hops</phrase> </textobject> - </inlinemediaobject> -</para> -<para> - B.A.T.M.A.N. III would have dropped the packet at this point. It has a duplicate packet detection based on sequence numbers only. The sequence number is known, hence the packet dropped (the fastest packet wins). In asymetric environments this may lead to suboptimal routing decisions. Therefore B.A.T.M.A.N. IV interprets the arrival of this packet as second path towards the originator. This path transmits the packet slower (due to more hops for example) but but may offer a better transmit quality. Duplicate sequence numbers are dropped if they arrive via the same neighbor. -</para> -<para> - On a lossy medium the TQ value is decreased while travelling from hop to hop (see asymetric link handling). The Ethernet connection does not suffer from packet loss which results in not decreasing the TQ value at all. Node A has 2 possible routes towards the originator: The node S itself and node B (both will advertise the same TQ value). -</para> -<para> - <inlinemediaobject> - <imageobject> <imagedata fileref="images/hop_penalty5.eps" format="EPS" scale="50" /> </imageobject> - <imageobject> <imagedata fileref="images/hop_penalty5.png" format="PNG" /> </imageobject> - <textobject> <phrase>route candidates</phrase> </textobject> - </inlinemediaobject> -</para> -<para> - As B.A.T.M.A.N. IV values TQ and fastest packet the node A's route will point towards the node S. Once the WiFi link quality drops (for a few moments due to some collisions) the TQ value from the node S will drop. At that point the B.A.T.M.A.N. IV node A will change its route towards node B which offers a better TQ value. Node A and node B will send packets forth and back in a loop. -</para> -<para> - <inlinemediaobject> - <imageobject> <imagedata fileref="images/hop_penalty6.eps" format="EPS" scale="50" /> </imageobject> - <imageobject> <imagedata fileref="images/hop_penalty6.png" format="PNG" /> </imageobject> - <textobject> <phrase>applied hop penalty</phrase> </textobject> - </inlinemediaobject> - -</para> </sect2> <sect2 id="batman4_tq_hop_penalty">

1 0

[doc] batman-adv-doc, master: update echo cancellation 2 picture (8076d8b0)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 8076d8b0cb2e939b471bdbf093ce05f60669298f Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 01:48:59 2009 +0200 update echo cancellation 2 picture >--------------------------------------------------------------- 8076d8b0cb2e939b471bdbf093ce05f60669298f images/echo_cancel2.dia | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/images/echo_cancel2.dia b/images/echo_cancel2.dia index 59dedd14..b1859496 100644 --- a/images/echo_cancel2.dia +++ b/images/echo_cancel2.dia @@ -185,14 +185,14 @@ <dia:point val="7,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-4.6775;13.48,-1.505"/> + <dia:rectangle val="7,-4.69875;14.4588,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#step1: source = A -old originator = A#</dia:string> +previous sender = A#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -281,14 +281,14 @@ old originator = A#</dia:string> <dia:point val="18,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-4.6775;24.015,-1.505"/> + <dia:rectangle val="18,-4.69875;25.4587,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#step 2: source = B -old originator=A#</dia:string> +previous sender = A#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -316,16 +316,17 @@ old originator=A#</dia:string> <dia:point val="7,7"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,6.358;15.72,11.596"/> + <dia:rectangle val="7,6.33021;14.9744,12.6229"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#step 2: source = B -old originator = A +previous sender = A -A will ignore this packet#</dia:string> +A will not rebroadcast +this packet#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -353,16 +354,17 @@ A will ignore this packet#</dia:string> <dia:point val="19,7"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19,6.358;27.72,11.596"/> + <dia:rectangle val="19,6.33021;26.9744,12.6229"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#step 3: source = C -old originator = B +previous sender = B -B will ignore this packet#</dia:string> +B will not rebroadcast +this packet#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -390,14 +392,14 @@ B will ignore this packet#</dia:string> <dia:point val="28,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="28,-4.6775;34.48,-1.505"/> + <dia:rectangle val="28,-4.69875;35.4588,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#step 3: source = C -old originator = B#</dia:string> +previous sender = B#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits