Repository : ssh://git@open-mesh.org/doc
On branches: backup-redmine/2017-12-14,master
commit 163dc18f5c5b18e2a9e34ab4dfd744c8802168dc Author: Sven Eckelmann sven@narfation.org Date: Thu Dec 14 16:26:30 2017 +0000
doc: batman-adv/hop_penalty_new1.dia
163dc18f5c5b18e2a9e34ab4dfd744c8802168dc .../{echo_cancel2.dia => hop_penalty_new1.dia} | 458 +++++++++------------ 1 file changed, 200 insertions(+), 258 deletions(-)
diff --git a/batman-adv/echo_cancel2.dia b/batman-adv/hop_penalty_new1.dia similarity index 67% copy from batman-adv/echo_cancel2.dia copy to batman-adv/hop_penalty_new1.dia index b1859496..5109492a 100644 --- a/batman-adv/echo_cancel2.dia +++ b/batman-adv/hop_penalty_new1.dia @@ -63,49 +63,27 @@ </dia:attribute> </dia:diagramdata> <dia:layer name="Background" visible="true"> - <dia:object type="Standard - Ellipse" version="0" id="O0"> + <dia:object type="Standard - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="0.148,0.148"/> + <dia:point val="17,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.098,0.098;5.05,5.05"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="0.148,0.148"/> - </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 - Text" version="1" id="O1"> - <dia:attribute name="obj_pos"> - <dia:point val="1.25678,3.72622"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="1.25678,0.34122;3.74928,6.20122"/> + <dia:rectangle val="17,-4.5425;21.385,-2.8025"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#A#</dia:string> + dia:string#Originator = A, +TQ = 100 %#</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:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="1.25678,3.72622"/> + <dia:point val="17,-4"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -119,89 +97,49 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O2"> - <dia:attribute name="obj_pos"> - <dia:point val="2.574,2.574"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="4.4321,-0.449223;11.8925,1.24653"/> - </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:object type="Standard - Ellipse" version="0" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> + <dia:point val="1,-1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="5.50807,3.95208;11.6043,5.91679"/> + <dia:rectangle val="0.95,-1.05;5.6242,3.6242"/> </dia:attribute> - <dia:attribute name="bez_points"> - <dia:point val="13.426,2.426"/> - <dia:point val="11.026,4.451"/> - <dia:point val="8,6"/> - <dia:point val="6,5"/> + <dia:attribute name="elem_corner"> + <dia:point val="1,-1"/> </dia:attribute> - <dia:attribute name="corner_types"> - <dia:enum val="0"/> - <dia:enum val="0"/> + <dia:attribute name="elem_width"> + <dia:real val="4.5741996765136719"/> </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="27"/> + <dia:attribute name="elem_height"> + <dia:real val="4.5741996765136719"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="1"/> + <dia:attribute name="inner_color"> + <dia:color val="#d8e5e5"/> </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="1"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> - dia:connections - <dia:connection handle="0" to="O12" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O4"> + <dia:object type="Standard - Text" version="1" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="7,-4"/> + <dia:point val="2.11788,2.58432"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-4.69875;14.4588,-1.4625"/> + <dia:rectangle val="2.11788,-0.80068;4.61038,5.05932"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step1: -source = A -previous sender = A#</dia:string> + dia:string#A#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="1"/> + <dia:real val="5"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,-4"/> + <dia:point val="2.11788,2.58432"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -215,89 +153,49 @@ previous sender = A#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O5"> - <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="15.1571,-0.891012;23.8921,1.24621"/> - </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: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="O12" connection="8"/> - <dia:connection handle="3" to="O11" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O6"> + <dia:object type="Standard - Ellipse" version="0" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="25.426,2.426"/> + <dia:point val="20,-1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="16.2575,4.15738;23.7982,6.0043"/> + <dia:rectangle val="19.95,-1.05;24.7063,3.70631"/> </dia:attribute> - <dia:attribute name="bez_points"> - <dia:point val="25.426,2.426"/> - <dia:point val="23,5"/> - <dia:point val="18,6"/> - <dia:point val="17,5"/> + <dia:attribute name="elem_corner"> + <dia:point val="20,-1"/> </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="27"/> + <dia:attribute name="elem_height"> + <dia:real val="4.6563072204589844"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="1"/> + <dia:attribute name="inner_color"> + <dia:color val="#d8e5e5"/> </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="1"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> - dia:connections - <dia:connection handle="0" to="O11" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O7"> + <dia:object type="Standard - Text" version="1" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="18,-4"/> + <dia:point val="21.2042,2.66615"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-4.69875;25.4587,-1.4625"/> + <dia:rectangle val="21.2042,-0.71885;23.7042,5.14115"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 2: -source = B -previous sender = A#</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="18,-4"/> + <dia:point val="21.2042,2.66615"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -311,69 +209,49 @@ previous sender = A#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O8"> + <dia:object type="Standard - Ellipse" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="7,7"/> + <dia:point val="10,-13"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,6.33021;14.9744,12.6229"/> + <dia:rectangle val="9.95,-13.05;14.7063,-8.29369"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#step 2: -source = B -previous sender = A - -A will not rebroadcast -this packet#</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="7,7"/> - </dia:attribute> - <dia:attribute name="color"> - <dia:color val="#000000"/> - </dia:attribute> - <dia:attribute name="alignment"> - <dia:enum val="0"/> - </dia:attribute> - </dia:composite> + <dia:attribute name="elem_corner"> + <dia:point val="10,-13"/> </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:attribute name="elem_width"> + <dia:real val="4.6563072204589844"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.6563072204589844"/> + </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 - Text" version="1" id="O9"> + <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="19,7"/> + <dia:point val="11,-9.415"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19,6.33021;26.9744,12.6229"/> + <dia:rectangle val="11,-12.8;13.545,-6.94"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 3: -source = C -previous sender = B - -B will not rebroadcast -this packet#</dia:string> + dia:string#C#</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="19,7"/> + <dia:point val="11,-9.415"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -387,19 +265,37 @@ this packet#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O10"> + <dia:object type="Standard - Ellipse" version="0" id="O7"> + <dia:attribute name="obj_pos"> + <dia:point val="8,-7"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="7.95,-7.05;17.05,2.05"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="8,-7"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="9"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="9"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#e5e5e5"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Text" version="1" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="28,-4"/> + <dia:point val="12.5,-2.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="28,-4.69875;35.4588,-1.4625"/> + <dia:rectangle val="11.2937,-3.08625;13.7062,-1.91375"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 3: -source = C -previous sender = B#</dia:string> + dia:string#Switch#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -408,86 +304,127 @@ previous sender = B#</dia:string> <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="28,-4"/> + <dia:point val="12.5,-2.40875"/> </dia:attribute> <dia:attribute name="color"> <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="2"/> + </dia:attribute> + dia:connections + <dia:connection handle="0" to="O7" connection="8"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Arc" version="0" id="O9"> + <dia:attribute name="obj_pos"> + <dia:point val="3.2871,1.2871"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="3.23699,-0.0483365;22.3793,1.82826"/> + </dia:attribute> + <dia:attribute name="conn_endpoints"> + <dia:point val="3.2871,1.2871"/> + <dia:point val="22.3282,1.32815"/> + </dia:attribute> + <dia:attribute name="curve_distance"> + <dia:real val="-1.305882392308201"/> + </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="8"/> + <dia:connection handle="1" to="O3" connection="8"/> + </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O11"> + <dia:object type="Standard - Arc" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="23,0"/> + <dia:point val="20,0"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="22.95,-0.05;27.902,4.902"/> + <dia:rectangle val="11.9263,-8.71892;20.0706,0.0706485"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="23,0"/> + <dia:attribute name="conn_endpoints"> + <dia:point val="20,0"/> + <dia:point val="12.3282,-8.34369"/> </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="4.8519997596740723"/> + <dia:attribute name="curve_distance"> + <dia:real val="-1.355830028838052"/> </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="4.8519997596740723"/> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#d8e5e5"/> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> </dia:attribute> - <dia:attribute name="aspect"> - <dia:enum val="2"/> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> </dia:attribute> + dia:connections + <dia:connection handle="1" to="O5" connection="6"/> + </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O12"> + <dia:object type="Standard - Arc" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="11,0"/> + <dia:point val="3.2871,1.2871"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.95,-0.05;15.902,4.902"/> + <dia:rectangle val="3.21706,-11.0132;12.7572,1.35714"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="11,0"/> + <dia:attribute name="conn_endpoints"> + <dia:point val="3.2871,1.2871"/> + <dia:point val="12.3282,-10.6718"/> </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="4.8519997596740723"/> + <dia:attribute name="curve_distance"> + <dia:real val="2.1663871418151657"/> </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="4.8519997596740723"/> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#d8e5e5"/> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> </dia:attribute> - <dia:attribute name="aspect"> - <dia:enum val="2"/> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O1" connection="8"/> + <dia:connection handle="1" to="O5" 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="24,4"/> + <dia:point val="10,3"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="24,0.615;26.545,6.475"/> + <dia:rectangle val="10,2.4575;14.385,4.1975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#C#</dia:string> + dia:string#Originator = A, +TQ = 100 %#</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:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="24,4"/> + <dia:point val="10,3"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -501,26 +438,27 @@ previous sender = B#</dia:string> <dia:enum val="3"/> </dia:attribute> </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="12,4"/> + <dia:point val="4,-5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12,0.615;14.5,6.475"/> + <dia:rectangle val="4,-5.5425;8.385,-3.8025"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#B#</dia:string> + dia:string#Originator = A, +TQ = 100 %#</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:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="12,4"/> + <dia:point val="4,-5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -534,35 +472,39 @@ previous sender = B#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O15"> + <dia:object type="Standard - Text" version="1" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="25.426,2.426"/> + <dia:point val="16,-12"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="27.1507,-0.862011;35.3889,1.38891"/> - </dia:attribute> - <dia:attribute name="bez_points"> - <dia:point val="25.426,2.426"/> - <dia:point val="28,0"/> - <dia:point val="33,-1"/> - <dia:point val="35,1"/> - </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:rectangle val="16,-12.6775;26.515,-10.505"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:attribute name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + dia:string#Route to A via A, TQ = 100% +Route to A via B, TQ = 100%#</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="16,-12"/> + </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="end_arrow_width"> - <dia:real val="0.5"/> + <dia:attribute name="valign"> + <dia:enum val="3"/> </dia:attribute> - dia:connections - <dia:connection handle="0" to="O11" connection="8"/> - </dia:connections> </dia:object> </dia:layer> </dia:diagram>