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

On branches: backup-redmine/2017-12-14,master

commit fbab935b4655550933ee166dddabfe5bc6c3aee0 Author: Sven Eckelmann sven@narfation.org Date: Thu Dec 14 16:26:30 2017 +0000

doc: batman-adv/multi_interface_2.dia

fbab935b4655550933ee166dddabfe5bc6c3aee0 ...multi_interface_1.dia => multi_interface_2.dia} | 81 +++++++++++----------- 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/batman-adv/multi_interface_1.dia b/batman-adv/multi_interface_2.dia similarity index 94% copy from batman-adv/multi_interface_1.dia copy to batman-adv/multi_interface_2.dia index 9704afa5..71dbe064 100644 --- a/batman-adv/multi_interface_1.dia +++ b/batman-adv/multi_interface_2.dia @@ -298,13 +298,13 @@ </dia:object> <dia:object type="Standard - Box" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="14,3.5"/> + <dia:point val="4,3.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.95,3.45;16.05,4.55"/> + <dia:rectangle val="3.95,3.45;6.05,4.55"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="14,3.5"/> + <dia:point val="4,3.5"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="2"/> @@ -318,18 +318,21 @@ <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:object> <dia:object type="Standard - Text" version="1" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="15,4"/> + <dia:point val="5,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> + <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#wlan2#</dia:string> + dia:string#wlan1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -338,7 +341,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15,4.0725"/> + <dia:point val="5,4.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -357,14 +360,14 @@ </dia:object> <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="6,1"/> + <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="6,1"/> <dia:point val="14,1"/> + <dia:point val="6,1"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> @@ -379,8 +382,8 @@ <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: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"> @@ -418,16 +421,16 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="6,-0.6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6,-1.15956;13.9796,0.631625"/> + <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#originator = A/wlan0 -outgoing interface = wlan0#</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"/> @@ -436,7 +439,7 @@ outgoing interface = wlan0#</dia:string> <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="6,-0.6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -452,16 +455,16 @@ outgoing interface = wlan0#</dia:string> </dia:object> <dia:object type="Standard - Text" version="1" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="6,5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6,4.44044;13.9796,6.23163"/> + <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 -outgoing interface = wlan1#</dia:string> + dia:string#originator = A/wlan0, +direct link = 1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -470,7 +473,7 @@ outgoing interface = wlan1#</dia:string> <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="6,5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -486,16 +489,16 @@ outgoing interface = wlan1#</dia:string> </dia:object> <dia:object type="Standard - BezierLine" version="0" id="O14"> <dia:attribute name="obj_pos"> - <dia:point val="5,1.5"/> + <dia:point val="15,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.94905,1.44905;14.0582,4.50076"/> + <dia:rectangle val="5.99505,1.48711;14.8958,4.5"/> </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: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"/> @@ -511,19 +514,19 @@ outgoing interface = wlan1#</dia:string> <dia:real val="0.5"/> </dia:attribute> dia:connections - <dia:connection handle="0" to="O6" connection="6"/> - <dia:connection handle="3" to="O8" connection="3"/> + <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="4,3.5"/> + <dia:point val="14,3.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.95,3.45;6.05,4.55"/> + <dia:rectangle val="13.95,3.45;16.05,4.55"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="4,3.5"/> + <dia:point val="14,3.5"/> </dia:attribute> <dia:attribute name="elem_width"> <dia:real val="2"/> @@ -540,15 +543,15 @@ outgoing interface = wlan1#</dia:string> </dia:object> <dia:object type="Standard - Text" version="1" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="5,4"/> + <dia:point val="15,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.13125,3.53;5.86875,4.47"/> + <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#wlan1#</dia:string> + dia:string#wlan2#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -557,7 +560,7 @@ outgoing interface = wlan1#</dia:string> <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="5,4.0725"/> + <dia:point val="15,4.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -576,10 +579,10 @@ outgoing interface = wlan1#</dia:string> </dia:object> <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="12,4.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12,3.145;13.1225,5.49"/> + <dia:rectangle val="7,3.145;8.1225,5.49"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -593,7 +596,7 @@ outgoing interface = wlan1#</dia:string> <dia:real val="2"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="12,4.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#ff0000"/>