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

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

commit 03224404c914461ad6f024f9f1b62c5da060123e Author: Sven Eckelmann sven@narfation.org Date: Thu Dec 14 16:43:23 2017 +0000

doc: batmand/announce_networks.dia

03224404c914461ad6f024f9f1b62c5da060123e .../announce_networks.dia | 456 +++++++++------------ 1 file changed, 194 insertions(+), 262 deletions(-)

diff --git a/alfred/announce_master.dia b/batmand/announce_networks.dia similarity index 54% copy from alfred/announce_master.dia copy to batmand/announce_networks.dia index ce1f6e92..d6a27975 100644 --- a/alfred/announce_master.dia +++ b/batmand/announce_networks.dia @@ -62,54 +62,63 @@ </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 - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="20,13"/> + <dia:point val="15.6,7.25"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.95,12.95;24.05,16.05"/> + <dia:rectangle val="11.8,6.0775;19.4,7.25"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="20,13"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="4"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="3"/> - </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 name="text"> + <dia:composite type="text"> + <dia:attribute name="string"> + dia:string#B.A.T.M.A.N. network#</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.6,6.755"/> + </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> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="valign"> + <dia:enum val="1"/> </dia:attribute> + dia:connections + <dia:connection handle="0" to="O2" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="22,14.5"/> + <dia:point val="26.08,7.14"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="20.6225,13.7275;23.3775,15.2725"/> + <dia:rectangle val="23.5087,5.9675;28.6512,7.14"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#node 1 -(master)#</dia:string> + dia:string#other network#</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="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="22,14.3225"/> + <dia:point val="26.08,6.645"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -120,134 +129,118 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="2"/> + <dia:enum val="1"/> </dia:attribute> dia:connections - <dia:connection handle="0" to="O0" connection="8"/> + <dia:connection handle="0" to="O3" connection="1"/> </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O2"> + <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="20,20"/> + <dia:point val="12.225,7.25"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.95,19.95;24.05,23.05"/> + <dia:rectangle val="12.175,7.2;19.025,11.35"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="20,20"/> + <dia:point val="12.225,7.25"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4"/> + <dia:real val="6.7500000000000036"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="3"/> + <dia:real val="4.0499999999999972"/> </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O3"> + <dia:attribute name="obj_pos"> + <dia:point val="22.185,7.14"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#ffc780"/> + <dia:attribute name="obj_bb"> + <dia:rectangle val="22.135,7.09;30.025,11.6"/> </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="elem_corner"> + <dia:point val="22.185,7.14"/> </dia:attribute> - <dia:attribute name="corner_radius"> - <dia:real val="1"/> + <dia:attribute name="elem_width"> + <dia:real val="7.7900000000000063"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="4.4100000000000001"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O3"> + <dia:object type="Standard - Ellipse" version="0" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="22,21.5"/> + <dia:point val="18.025,9.77847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="20.895,20.7275;23.105,22.2725"/> + <dia:rectangle val="17.975,9.72847;18.375,10.1285"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#node 3 -(slave)#</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,21.3225"/> - </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="18.025,9.77847"/> </dia:attribute> - <dia:attribute name="valign"> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> <dia:enum val="2"/> </dia:attribute> - dia:connections - <dia:connection handle="0" to="O2" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O4"> + <dia:object type="Standard - Ellipse" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="14,20"/> + <dia:point val="22.55,9.37847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.95,19.95;18.05,23.05"/> + <dia:rectangle val="22.5,9.32847;22.9,9.72847"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="14,20"/> + <dia:point val="22.55,9.37847"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="4"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="3"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#ffc780"/> - </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:color val="#000000"/> </dia:attribute> - <dia:attribute name="corner_radius"> - <dia:real val="1"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O5"> + <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="16,21.5"/> + <dia:point val="18.025,9.92847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.895,20.7275;17.105,22.2725"/> + <dia:rectangle val="17.2925,9.31035;18.0462,10.5466"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#node 2 -(slave)#</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="0.80000000000000004"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="16,21.3225"/> + <dia:point val="18.025,10.0091"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="1"/> + <dia:enum val="2"/> </dia:attribute> </dia:composite> </dia:attribute> @@ -255,65 +248,35 @@ <dia:enum val="2"/> </dia:attribute> dia:connections - <dia:connection handle="0" to="O4" connection="8"/> + <dia:connection handle="0" to="O4" connection="3"/> </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O6"> - <dia:attribute name="obj_pos"> - <dia:point val="26,20"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="25.95,19.95;30.05,23.05"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="26,20"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="4"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="3"/> - </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> - </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#ffc780"/> - </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> - </dia:attribute> - <dia:attribute name="corner_radius"> - <dia:real val="1"/> - </dia:attribute> - </dia:object> <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="28,21.5"/> + <dia:point val="22.85,9.52847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="26.895,20.7275;29.105,22.2725"/> + <dia:rectangle val="22.85,8.91034;29.1837,10.1466"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#node 4 -(slave)#</dia:string> + dia:string# B 192.168.1.101#</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="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="28,21.3225"/> + <dia:point val="22.85,9.60909"/> </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> @@ -321,32 +284,22 @@ <dia:enum val="2"/> </dia:attribute> dia:connections - <dia:connection handle="0" to="O6" connection="8"/> + <dia:connection handle="0" to="O5" connection="4"/> </dia:connections> </dia:object> - <dia:object type="Standard - ZigZagLine" version="1" id="O8"> + <dia:object type="Standard - Line" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="22,16.0491"/> + <dia:point val="18.325,9.92847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.6382,15.9991;22.05,20.0616"/> - </dia:attribute> - <dia:attribute name="orth_points"> - <dia:point val="22,16.0491"/> - <dia:point val="22,18.75"/> - <dia:point val="16,18.75"/> - <dia:point val="16,19.9498"/> - </dia:attribute> - <dia:attribute name="orth_orient"> - <dia:enum val="1"/> - <dia:enum val="0"/> - <dia:enum val="1"/> + <dia:rectangle val="18.2707,9.0442;22.5961,10.0492"/> </dia:attribute> - <dia:attribute name="autorouting"> - <dia:boolean val="false"/> + <dia:attribute name="conn_endpoints"> + <dia:point val="18.325,9.92847"/> + <dia:point val="22.5008,9.54668"/> </dia:attribute> - <dia:attribute name="line_style"> - <dia:enum val="4"/> + <dia:attribute name="numcp"> + <dia:int val="1"/> </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> @@ -358,167 +311,146 @@ <dia:real val="0.5"/> </dia:attribute> dia:connections - <dia:connection handle="0" to="O0" connection="8"/> - <dia:connection handle="1" to="O4" connection="8"/> + <dia:connection handle="0" to="O4" connection="4"/> + <dia:connection handle="1" to="O5" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - ZigZagLine" version="1" id="O9"> + <dia:object type="Standard - Ellipse" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="22,16.0491"/> + <dia:point val="13.9751,8.63125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="21.95,15.9991;28.3618,20.0616"/> - </dia:attribute> - <dia:attribute name="orth_points"> - <dia:point val="22,16.0491"/> - <dia:point val="22,18.75"/> - <dia:point val="28,18.75"/> - <dia:point val="28,19.9498"/> - </dia:attribute> - <dia:attribute name="orth_orient"> - <dia:enum val="1"/> - <dia:enum val="0"/> - <dia:enum val="1"/> + <dia:rectangle val="13.9251,8.58125;14.3251,8.98125"/> </dia:attribute> - <dia:attribute name="autorouting"> - <dia:boolean val="false"/> + <dia:attribute name="elem_corner"> + <dia:point val="13.9751,8.63125"/> </dia:attribute> - <dia:attribute name="line_style"> - <dia:enum val="4"/> + <dia:attribute name="elem_width"> + <dia:real val="0.30000215768814087"/> </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="22"/> + <dia:attribute name="elem_height"> + <dia:real val="0.30000215768814087"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> </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="O0" connection="8"/> - <dia:connection handle="1" to="O6" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O10"> + <dia:object type="Standard - Ellipse" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="22,16.0492"/> + <dia:point val="15.2751,9.33125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="21.6382,15.9992;22.3618,20.0626"/> + <dia:rectangle val="15.2251,9.28125;15.6251,9.68125"/> </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="22,16.0492"/> - <dia:point val="22,19.9508"/> - </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> + <dia:attribute name="elem_corner"> + <dia:point val="15.2751,9.33125"/> </dia:attribute> - <dia:attribute name="line_style"> - <dia:enum val="4"/> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="22"/> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> </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="O0" connection="8"/> - <dia:connection handle="1" to="O2" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O11"> + <dia:object type="Standard - Ellipse" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="23.05,17.3"/> + <dia:point val="14.1251,9.78125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.05,16.705;23.05,17.45"/> + <dia:rectangle val="14.0751,9.73125;14.4751,10.1313"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="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:attribute> - <dia:attribute name="pos"> - <dia:point val="23.05,17.3"/> - </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="14.1251,9.78125"/> </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O12"> + <dia:object type="Standard - Ellipse" version="0" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="23,17"/> + <dia:point val="15.5251,8.13125"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23,16.405;30.2125,17.95"/> + <dia:rectangle val="15.4751,8.08125;15.8751,8.48125"/> </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#Master announcement -broadcast#</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="23,17"/> - </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="15.5251,8.13125"/> </dia:attribute> - <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="21.6,17.1"/> + <dia:point val="15.3251,10.2312"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="21.55,17.05;22.45,17.95"/> + <dia:rectangle val="15.2751,10.1812;15.6751,10.5812"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="21.6,17.1"/> + <dia:point val="15.3251,10.2312"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="0.80000000000000426"/> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="0.79999999999999716"/> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#000000"/> </dia:attribute> - <dia:attribute name="border_width"> - <dia:real val="0.10000000149011612"/> + <dia:attribute name="aspect"> + <dia:enum val="2"/> + </dia:attribute> + </dia:object> + <dia:object type="Standard - Ellipse" version="0" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="12.9501,9.05625"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="12.9001,9.00625;13.3001,9.40625"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="12.9501,9.05625"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="0.30000001192092896"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="0.30000001192092896"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#ff6e75"/> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="aspect"> + <dia:enum val="2"/> </dia:attribute> </dia:object> </dia:layer>