commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[doc] backup-redmine/2017-12-14, master: doc: batman-adv/multi_interface_1.dia (ac9cf558)
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 ac9cf558da698565f371ff44ac3c6742c59f5cc5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 16:26:30 2017 +0000 doc: batman-adv/multi_interface_1.dia >--------------------------------------------------------------- ac9cf558da698565f371ff44ac3c6742c59f5cc5 .../multi_interface_1.dia | 478 ++++++++++----------- 1 file changed, 238 insertions(+), 240 deletions(-) diff --git a/alfred/packet_request_v0.dia b/batman-adv/multi_interface_1.dia similarity index 68% copy from alfred/packet_request_v0.dia copy to batman-adv/multi_interface_1.dia index 6d5a13be..9704afa5 100644 --- a/alfred/packet_request_v0.dia +++ b/batman-adv/multi_interface_1.dia @@ -10,19 +10,19 @@ <dia:attribute name="paper"> <dia:composite type="paper"> <dia:attribute name="name"> - <dia:string>#Letter#</dia:string> + <dia:string>#A4#</dia:string> </dia:attribute> <dia:attribute name="tmargin"> - <dia:real val="2.5399999618530273"/> + <dia:real val="2.8222000598907471"/> </dia:attribute> <dia:attribute name="bmargin"> - <dia:real val="2.5399999618530273"/> + <dia:real val="2.8222000598907471"/> </dia:attribute> <dia:attribute name="lmargin"> - <dia:real val="2.5399999618530273"/> + <dia:real val="2.8222000598907471"/> </dia:attribute> <dia:attribute name="rmargin"> - <dia:real val="2.5399999618530273"/> + <dia:real val="2.8222000598907471"/> </dia:attribute> <dia:attribute name="is_portrait"> <dia:boolean val="true"/> @@ -62,188 +62,153 @@ </dia:composite> </dia:attribute> </dia:diagramdata> - <dia:layer name="Background" visible="true" active="true"> - <dia:object type="Standard - Box" version="0" id="O0"> + <dia:layer name="Background" visible="true"> + <dia:object type="Standard - Ellipse" version="0" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="2,6"/> + <dia:point val="0.1389,0.1419"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="1.95,5.95;38.05,7.05"/> + <dia:rectangle val="0.0889,0.0919;4.7631,4.7661"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="2,6"/> + <dia:point val="0.1389,0.1419"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="36"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="1"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> - </dia:attribute> - <dia:attribute name="border_color"> - <dia:color val="#ffffff"/> - </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="false"/> - </dia:attribute> - </dia:object> - <dia:object type="Standard - Box" version="0" id="O1"> - <dia:attribute name="obj_pos"> - <dia:point val="13,9"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="12.95,8.95;19.05,11.05"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="13,9"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="6"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="2"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#809dff"/> + <dia:color val="#d8e5e5"/> </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Box" version="0" id="O2"> + <dia:object type="Standard - Text" version="1" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="19,9"/> + <dia:point val="1.25678,3.72622"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.95,8.95;25.05,11.05"/> + <dia:rectangle val="1.25678,0.34122;3.74928,6.20122"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="19,9"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="6"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="2"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> - </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#809dff"/> + <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="5"/> + </dia:attribute> + <dia:attribute name="pos"> + <dia:point val="1.25678,3.72622"/> + </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="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="valign"> + <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Box" version="0" id="O3"> + <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="25,9"/> + <dia:point val="14.7958,0.333846"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="24.95,8.95;37.05,11.05"/> + <dia:rectangle val="14.7458,0.283846;19.5021,5.04015"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="25,9"/> + <dia:point val="14.7958,0.333846"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="12"/> + <dia:real val="4.6563072204589844"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="2"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + <dia:real val="4.6563072204589844"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#809dff"/> + <dia:color val="#d8e5e5"/> </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O4"> + <dia:object type="Standard - Text" version="1" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="25,7"/> + <dia:point val="16,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="20.745,6.0125;29.255,7"/> + <dia:rectangle val="16,0.615;18.5,6.475"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#alfred_request_v0#</dia:string> + <dia:string>#B#</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="1.0583332926034927"/> + <dia:real val="5"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="25,6.8"/> + <dia:point val="16,4"/> </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="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O5"> + <dia:object type="Standard - Box" version="0" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="12,10"/> + <dia:point val="14,0.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="9.0275,9.6275;12,10.3725"/> + <dia:rectangle val="13.95,0.45;16.05,1.55"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#alfred_tlv#</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="12,10.2225"/> - </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="14,0.5"/> </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="2"/> + <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="O6"> + <dia:object type="Standard - Text" version="1" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="16,10"/> + <dia:point val="15,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.9325,9.6275;18.0675,10.3725"/> + <dia:rectangle val="14.1312,0.53;15.8688,1.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#REQUEST (2)#</dia:string> + <dia:string>#wlan0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -252,7 +217,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="16,10.2225"/> + <dia:point val="15,1.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -266,56 +231,46 @@ <dia:enum val="2"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O1" connection="8"/> + <dia:connection handle="0" to="O4" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O7"> + <dia:object type="Standard - Box" version="0" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="22,10"/> + <dia:point val="4,0.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="20.01,9.6275;23.99,10.3725"/> + <dia:rectangle val="3.95,0.45;6.05,1.55"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#VERSION (0)#</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="22,10.2225"/> - </dia:attribute> - <dia:attribute name="color"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="alignment"> - <dia:enum val="1"/> - </dia:attribute> - </dia:composite> + <dia:attribute name="elem_corner"> + <dia:point val="4,0.5"/> </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="2"/> + <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="#00ff00"/> + </dia:attribute> + <dia:attribute name="show_background"> + <dia:boolean val="true"/> + </dia:attribute> + <dia:attribute name="corner_radius"> + <dia:real val="1.1754943508222875e-38"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O2" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O8"> + <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="31,10"/> + <dia:point val="5,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="29.425,9.6275;32.575,10.3725"/> + <dia:rectangle val="4.13125,0.53;5.86875,1.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#length (3)#</dia:string> + <dia:string>#wlan0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -324,7 +279,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="31,10.2225"/> + <dia:point val="5,1.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -338,72 +293,43 @@ <dia:enum val="2"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O3" connection="8"/> + <dia:connection handle="0" to="O6" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O9"> + <dia:object type="Standard - Box" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="19,11"/> + <dia:point val="14,3.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.95,10.95;31.05,13.05"/> + <dia:rectangle val="13.95,3.45;16.05,4.55"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19,11"/> + <dia:point val="14,3.5"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="12"/> - </dia:attribute> - <dia:attribute name="elem_height"> <dia:real val="2"/> </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> - </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#90ee90"/> - </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> - </dia:attribute> - </dia:object> - <dia:object type="Standard - Box" version="0" id="O10"> - <dia:attribute name="obj_pos"> - <dia:point val="13,11"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="12.95,10.95;19.05,13.05"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="13,11"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="6"/> - </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="2"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#90ee90"/> + <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="O11"> + <dia:object type="Standard - Text" version="1" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="25,12"/> + <dia:point val="15,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.8,11.6275;27.2,12.3725"/> + <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>#transaction id#</dia:string> + <dia:string>#wlan2#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -412,7 +338,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="25,12.2225"/> + <dia:point val="15,4.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -426,20 +352,48 @@ <dia:enum val="2"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O9" connection="8"/> + <dia:connection handle="0" to="O8" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O12"> + <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="16,12"/> + <dia:point val="6,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.565,11.6275;18.435,12.3725"/> + <dia:rectangle val="5.95,0.5;14.05,1.5"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="6,1"/> + <dia:point val="14,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="O6" connection="4"/> + <dia:connection handle="1" to="O4" connection="3"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O11"> + <dia:attribute name="obj_pos"> + <dia:point val="1,6"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <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>#requested type#</dia:string> + <dia:string>##</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -448,34 +402,32 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="16,12.2225"/> + <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:enum val="3"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O10" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O13"> + <dia:object type="Standard - Text" version="1" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="13,9"/> + <dia:point val="6,-0.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.7963,8.255;13.2038,9"/> + <dia:rectangle val="6,-1.15956;13.9796,0.631625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#0#</dia:string> + <dia:string>#originator = A/wlan0 +outgoing interface = wlan0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -484,34 +436,32 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="13,8.85"/> + <dia:point val="6,-0.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="1"/> + <dia:enum val="3"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O1" connection="0"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O14"> + <dia:object type="Standard - Text" version="1" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="19,9"/> + <dia:point val="6,5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.7963,8.255;19.2037,9"/> + <dia:rectangle val="6,4.44044;13.9796,6.23163"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#8#</dia:string> + <dia:string>#originator = A/wlan0 +outgoing interface = wlan1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -520,34 +470,85 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="19,8.85"/> + <dia:point val="6,5"/> </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="3"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - BezierLine" version="0" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="5,1.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="4.94905,1.44905;14.0582,4.50076"/> + </dia:attribute> + <dia:attribute name="bez_points"> + <dia:point val="5,1.5"/> + <dia:point val="5.05,4.1"/> + <dia:point val="4.9,4.15"/> + <dia:point val="14,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="O1" connection="2"/> + <dia:connection handle="0" to="O6" connection="6"/> + <dia:connection handle="3" to="O8" connection="3"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O15"> + <dia:object type="Standard - Box" version="0" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="4,3.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="3.95,3.45;6.05,4.55"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="4,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="25,9"/> + <dia:point val="5,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="24.5925,8.255;25.4075,9"/> + <dia:rectangle val="4.13125,3.53;5.86875,4.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#16#</dia:string> + <dia:string>#wlan1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -556,7 +557,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="25,8.85"/> + <dia:point val="5,4.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -567,47 +568,44 @@ </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="O2" connection="2"/> + <dia:connection handle="0" to="O15" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O16"> + <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="37,9"/> + <dia:point val="12,4.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="36.185,8.255;37,9"/> + <dia:rectangle val="12,3.145;13.1225,5.49"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#32#</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="37,8.85"/> + <dia:point val="12,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="2"/> + <dia:enum val="0"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="1"/> + <dia:enum val="3"/> </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O3" connection="2"/> - </dia:connections> </dia:object> </dia:layer> </dia:diagram>

1 0

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

14 Dec '17

1 0

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

14 Dec '17

1 0

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

14 Dec '17

1 0

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

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: batman-adv/tq_prop.dia (165cc803)
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 165cc80332932d3aa10dca24d634c5ac42676c31 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 16:26:41 2017 +0000 doc: batman-adv/tq_prop.dia >--------------------------------------------------------------- 165cc80332932d3aa10dca24d634c5ac42676c31 batman-adv/{echo_cancel1.dia => tq_prop.dia} | 433 ++++++++++++++------------- 1 file changed, 231 insertions(+), 202 deletions(-) diff --git a/batman-adv/echo_cancel1.dia b/batman-adv/tq_prop.dia similarity index 71% copy from batman-adv/echo_cancel1.dia copy to batman-adv/tq_prop.dia index 139e24d8..31f08d2e 100644 --- a/batman-adv/echo_cancel1.dia +++ b/batman-adv/tq_prop.dia @@ -65,19 +65,19 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Ellipse" version="0" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="0.148,0.148"/> + <dia:point val="0.1389,0.1419"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.098,0.098;5.05,5.05"/> + <dia:rectangle val="0.0889,0.0919;4.7631,4.7661"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="0.148,0.148"/> + <dia:point val="0.1389,0.1419"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4.8519997596740723"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8519997596740723"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="inner_color"> <dia:color val="#d8e5e5"/> @@ -119,88 +119,49 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O2"> + <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="2.574,2.574"/> + <dia:point val="10.4648,0.295846"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.4321,-0.449223;11.8925,1.24653"/> + <dia:rectangle val="10.4148,0.245846;15.1711,5.00215"/> </dia:attribute> - <dia:attribute name="bez_points"> - <dia:point val="2.574,2.574"/> - <dia:point val="4.624,0.924"/> - <dia:point val="11.2147,0.564534"/> - <dia:point val="13.426,2.426"/> - </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="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="O0" connection="8"/> - <dia:connection handle="3" to="O12" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O3"> - <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="4.09701,3.76521;11.6045,5.66166"/> - </dia:attribute> - <dia:attribute name="bez_points"> - <dia:point val="13.426,2.426"/> - <dia:point val="11.026,4.451"/> - <dia:point val="4.924,4.574"/> - <dia:point val="2.574,2.574"/> + <dia:attribute name="elem_corner"> + <dia:point val="10.4648,0.295846"/> </dia:attribute> - <dia:attribute name="corner_types"> - <dia:enum val="0"/> - <dia:enum val="0"/> + <dia:attribute name="elem_width"> + <dia:real val="4.6563072204589844"/> </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="22"/> + <dia:attribute name="elem_height"> + <dia:real val="4.6563072204589844"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:attribute name="inner_color"> + <dia:color val="#d8e5e5"/> </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="O12" connection="8"/> - <dia:connection handle="3" to="O0" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O4"> + <dia:object type="Standard - Text" version="1" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="7,-2"/> + <dia:point val="11.669,3.962"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-2.6775;9.0425,-1.505"/> + <dia:rectangle val="11.669,0.577;14.169,6.437"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step1#</dia:string> + <dia:string>#B#</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="5"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,-2"/> + <dia:point val="11.669,3.962"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -214,18 +175,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O5"> + <dia:object type="Standard - BezierLine" version="0" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> + <dia:point val="2.426,2.429"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.1571,-0.891012;23.8921,1.24621"/> + <dia:rectangle val="4.17638,-0.338677;11.3343,1.5075"/> </dia:attribute> <dia:attribute name="bez_points"> - <dia:point val="13.426,2.426"/> - <dia:point val="16,0"/> - <dia:point val="23.2147,0.564534"/> - <dia:point val="25.426,2.426"/> + <dia:point val="2.426,2.429"/> + <dia:point val="4.476,0.779"/> + <dia:point val="10.5817,0.762534"/> + <dia:point val="12.793,2.624"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> @@ -241,27 +202,33 @@ <dia:real val="0.5"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O12" connection="8"/> - <dia:connection handle="3" to="O11" connection="8"/> + <dia:connection handle="0" to="O0" connection="8"/> + <dia:connection handle="3" to="O2" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O6"> + <dia:object type="Standard - BezierLine" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="25.426,2.426"/> + <dia:point val="12.793,2.624"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.7879,3.78785;23.7985,6.18297"/> + <dia:rectangle val="3.86655,3.55003;11.004,5.58465"/> </dia:attribute> <dia:attribute name="bez_points"> - <dia:point val="25.426,2.426"/> - <dia:point val="23,5"/> - <dia:point val="16,5"/> - <dia:point val="13.426,2.426"/> + <dia:point val="12.793,2.624"/> + <dia:point val="10.393,4.649"/> + <dia:point val="4.776,4.429"/> + <dia:point val="2.426,2.429"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> <dia:enum val="0"/> </dia:attribute> + <dia:attribute name="line_color"> + <dia:color val="#0000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.040000000000000001"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -272,21 +239,22 @@ <dia:real val="0.5"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O11" connection="8"/> - <dia:connection handle="3" to="O12" connection="8"/> + <dia:connection handle="0" to="O2" connection="8"/> + <dia:connection handle="3" to="O0" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O7"> + <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="18,-2"/> + <dia:point val="5.53206,-2.18418"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-2.6775;20.275,-1.505"/> + <dia:rectangle val="5.53206,-2.86168;12.2721,-0.68918"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 2#</dia:string> + <dia:string>#incoming packet: +TQ =100%#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -295,7 +263,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="18,-2"/> + <dia:point val="5.53206,-2.18418"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -309,17 +277,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O8"> + <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="7,7"/> + <dia:point val="5.14923,6.73523"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,6.3225;9.275,7.495"/> + <dia:rectangle val="5.14923,6.05773;10.0342,8.23023"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 2#</dia:string> + <dia:string>#local TQ to A: +80%#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -328,10 +297,10 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,7"/> + <dia:point val="5.14923,6.73523"/> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#000000"/> + <dia:color val="#0000ff"/> </dia:attribute> <dia:attribute name="alignment"> <dia:enum val="0"/> @@ -342,17 +311,20 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O9"> + <dia:object type="Standard - Text" version="1" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="19,7"/> + <dia:point val="10.038,9.422"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19,6.3225;21.275,7.495"/> + <dia:rectangle val="10.038,8.7445;16.908,12.917"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 3#</dia:string> + <dia:string>#apply local TQ +and rebroadcast: +TQ = 80% * 100% + = 80%#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -361,7 +333,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="19,7"/> + <dia:point val="10.038,9.422"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -375,17 +347,19 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O10"> + <dia:object type="Standard - Text" version="1" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="29,-2"/> + <dia:point val="-0.4439,9.68"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="29,-2.6775;31.275,-1.505"/> + <dia:rectangle val="-0.4439,9.0025;4.9161,12.175"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 3#</dia:string> + <dia:string>#broadcast own +OGM with +TQ = 100%#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -394,7 +368,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="29,-2"/> + <dia:point val="-0.4439,9.68"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -408,44 +382,21 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O11"> - <dia:attribute name="obj_pos"> - <dia:point val="23,0"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="22.95,-0.05;27.902,4.902"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="23,0"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="4.8519997596740723"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="4.8519997596740723"/> - </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#d8e5e5"/> - </dia:attribute> - <dia:attribute name="aspect"> - <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="O10"> <dia:attribute name="obj_pos"> - <dia:point val="11,0"/> + <dia:point val="20.215,0.24"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.95,-0.05;15.902,4.902"/> + <dia:rectangle val="20.165,0.19;24.8392,4.8642"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="11,0"/> + <dia:point val="20.215,0.24"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4.8519997596740723"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8519997596740723"/> + <dia:real val="4.5741996765136719"/> </dia:attribute> <dia:attribute name="inner_color"> <dia:color val="#d8e5e5"/> @@ -454,12 +405,12 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O13"> + <dia:object type="Standard - Text" version="1" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="24,4"/> + <dia:point val="21.115,3.725"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="24,0.615;26.545,6.475"/> + <dia:rectangle val="21.115,0.34;23.66,6.2"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -473,7 +424,7 @@ <dia:real val="5"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="24,4"/> + <dia:point val="21.115,3.725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -487,51 +438,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O14"> + <dia:object type="Standard - BezierLine" version="0" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="12,4"/> + <dia:point val="12.793,2.624"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12,0.615;14.5,6.475"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#B#</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="5"/> - </dia:attribute> - <dia:attribute name="pos"> - <dia:point val="12,4"/> - </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="3"/> - </dia:attribute> - </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O15"> - <dia:attribute name="obj_pos"> - <dia:point val="25.426,2.426"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="27.1568,-0.56637;34.2616,1.35158"/> + <dia:rectangle val="14.4232,-0.383272;21.0761,1.43811"/> </dia:attribute> <dia:attribute name="bez_points"> - <dia:point val="25.426,2.426"/> - <dia:point val="28,0"/> - <dia:point val="33,0"/> - <dia:point val="33.85,0.9875"/> + <dia:point val="12.793,2.624"/> + <dia:point val="14.5061,0.95"/> + <dia:point val="20.2908,0.665634"/> + <dia:point val="22.5021,2.5271"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> @@ -547,26 +465,33 @@ <dia:real val="0.5"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O11" connection="8"/> + <dia:connection handle="0" to="O2" connection="8"/> + <dia:connection handle="3" to="O10" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O16"> + <dia:object type="Standard - BezierLine" version="0" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> + <dia:point val="22.5021,2.5271"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="2.73507,4.77019;12.8986,8.5908"/> + <dia:rectangle val="14.2648,3.77163;20.7457,5.62982"/> </dia:attribute> <dia:attribute name="bez_points"> - <dia:point val="13.426,2.426"/> - <dia:point val="12.1,7.85"/> - <dia:point val="3.75,6.85"/> - <dia:point val="2.574,2.574"/> + <dia:point val="22.5021,2.5271"/> + <dia:point val="20.1021,4.5521"/> + <dia:point val="15.143,4.624"/> + <dia:point val="12.793,2.624"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> <dia:enum val="0"/> </dia:attribute> + <dia:attribute name="line_color"> + <dia:color val="#0000ff"/> + </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.040000000000000001"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -577,21 +502,126 @@ <dia:real val="0.5"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O12" connection="8"/> - <dia:connection handle="3" to="O0" connection="8"/> + <dia:connection handle="0" to="O10" connection="8"/> + <dia:connection handle="3" to="O2" connection="8"/> </dia:connections> </dia:object> + <dia:object type="Standard - Text" version="1" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="15.9211,-2.1825"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="15.9211,-2.86;23.0211,-0.6875"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#forwarded packet: +TQ =80%#</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="15.9211,-2.1825"/> + </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="3"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="20.6211,9.3175"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="20.6211,8.64;27.0261,12.8125"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#apply local TQ +and rebroadcast: +TQ = 90% * 80% + = 72%#</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="20.6211,9.3175"/> + </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="3"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O16"> + <dia:attribute name="obj_pos"> + <dia:point val="15.8211,6.5175"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="15.8211,5.84;20.7186,8.0125"/> + </dia:attribute> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + <dia:string>#local TQ to B: +90%#</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="15.8211,6.5175"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#0000ff"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> + </dia:attribute> + <dia:attribute name="valign"> + <dia:enum val="3"/> + </dia:attribute> + </dia:object> <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="7,10"/> + <dia:point val="26.1211,-2.1325"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,9.3225;9.275,10.495"/> + <dia:rectangle val="26.1211,-2.81;33.2211,-0.6375"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 4#</dia:string> + <dia:string>#forwarded packet: +TQ = 72%#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -600,7 +630,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,10"/> + <dia:point val="26.1211,-2.1325"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -616,16 +646,16 @@ </dia:object> <dia:object type="Standard - BezierLine" version="0" id="O18"> <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> + <dia:point val="22.5021,2.5271"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1918,-3.69417;25.293,0.206811"/> + <dia:rectangle val="24.1032,-0.306035;32.2921,0.964149"/> </dia:attribute> <dia:attribute name="bez_points"> - <dia:point val="13.426,2.426"/> - <dia:point val="15,-2"/> - <dia:point val="24,-3"/> - <dia:point val="25.426,2.426"/> + <dia:point val="22.5021,2.5271"/> + <dia:point val="24.2152,0.8531"/> + <dia:point val="30.1061,-0.35"/> + <dia:point val="32.0561,0.45"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> @@ -641,30 +671,29 @@ <dia:real val="0.5"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O12" connection="8"/> - <dia:connection handle="3" to="O11" connection="8"/> + <dia:connection handle="0" to="O10" connection="8"/> </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O19"> <dia:attribute name="obj_pos"> - <dia:point val="18,-5"/> + <dia:point val="29.6061,3.65"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-5.5425;19.8125,-4.6025"/> + <dia:rectangle val="29.6061,0.9425;32.3886,5.6325"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#step 4#</dia:string> + <dia:string>#...#</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:real val="4"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="18,-5"/> + <dia:point val="29.6061,3.65"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/>

1 0

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

14 Dec '17

1 0

[doc] master: batman-adv-doc: Convert to sphinx documentation format (d80ed697)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branch : master >--------------------------------------------------------------- commit d80ed6979508073c2560745a9b3b250842b1ec62 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Dec 14 15:59:17 2017 +0100 batman-adv-doc: Convert to sphinx documentation format The documentation is currently converted to Sphinx. Parts of this legacy document will also be used in the new documentation. It is therefore necessary to have both in a common format. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- .gitattributes | 4 + .gitignore | 9 +- Makefile | 244 ++++++++-- README | 29 +- batman.docbook | 24 - batman_adv.docbook | 377 --------------- batman_adv/index.rst | 250 ++++++++++ batman_iv.docbook | 509 --------------------- {images => batman_iv}/asym_link1.dia | 0 batman_iv/asym_link1.svg | 34 ++ {images => batman_iv}/asym_link2.dia | 0 batman_iv/asym_link2.svg | 34 ++ {images => batman_iv}/asym_penalty.gp | 4 +- batman_iv/asym_penalty.svg | 254 ++++++++++ {images => batman_iv}/asymetry.dia | 0 batman_iv/asymetry.svg | 39 ++ {images => batman_iv}/echo_cancel1.dia | 0 batman_iv/echo_cancel1.svg | 68 +++ {images => batman_iv}/echo_cancel2.dia | 0 batman_iv/echo_cancel2.svg | 72 +++ {images => batman_iv}/eq_alt1.dia | 0 batman_iv/eq_alt1.svg | 22 + {images => batman_iv}/hop_penalty_new1.dia | 0 batman_iv/hop_penalty_new1.svg | 51 +++ {images => batman_iv}/hop_penalty_new2.dia | 0 batman_iv/hop_penalty_new2.svg | 51 +++ batman_iv/index.rst | 429 +++++++++++++++++ {images => batman_iv}/multi_interface_1.dia | 0 batman_iv/multi_interface_1.svg | 53 +++ {images => batman_iv}/multi_interface_2.dia | 0 batman_iv/multi_interface_2.svg | 53 +++ {images => batman_iv}/rq.dia | 0 batman_iv/rq.svg | 22 + {images => batman_iv}/tq.dia | 0 batman_iv/tq.svg | 22 + {images => batman_iv}/tq_prop.dia | 0 batman_iv/tq_prop.svg | 79 ++++ {images => batman_iv}/tq_prop_best1.dia | 0 batman_iv/tq_prop_best1.svg | 43 ++ {images => batman_iv}/tq_prop_best2.dia | 0 batman_iv/tq_prop_best2.svg | 71 +++ {images => batman_iv}/tq_prop_best3.dia | 0 batman_iv/tq_prop_best3.svg | 63 +++ batman_iv_only.docbook | 17 - batmand.docbook | 428 ----------------- {images => batmand}/announce_networks.dia | 0 batmand/announce_networks.svg | 33 ++ batmand/index.rst | 468 +++++++++++++++++++ {images => batmand}/multiple_announces.dia | 0 batmand/multiple_announces.svg | 43 ++ {images => batmand}/multiple_clients.dia | 0 batmand/multiple_clients.svg | 36 ++ bookinfo.docbook | 39 -- conf.py | 338 ++++++++++++++ copyright.docbook | 10 - images/Makefile | 51 --- images/asym_penalty_formula.tex | 6 - images/compute_tq.tex | 6 - images/eq.dia | 265 ----------- images/eq_alt2.dia | 242 ---------- images/eq_alt3.dia | 242 ---------- images/hop_penalty1.dia | 686 ---------------------------- images/hop_penalty2.dia | 686 ---------------------------- images/hop_penalty3.dia | 339 -------------- images/hop_penalty4.dia | 420 ----------------- images/hop_penalty5.dia | 359 --------------- images/hop_penalty6.dia | 420 ----------------- images/tq_prop_calc.tex | 6 - index.rst | 36 ++ introduction.docbook | 0 references.docbook | 8 - 71 files changed, 2893 insertions(+), 5201 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 d80ed6979508073c2560745a9b3b250842b1ec62

1 0

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/News-draft (0cc9ef34)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/News-draft: update changelogs for 2017.4 (686174c3)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017