[commits] [doc] backup-redmine/2017-12-14, master: doc: batman-adv/echo_cancel2.dia (95028996)

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

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

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

doc: batman-adv/echo_cancel2.dia

950289965f5ca572b69d6df18ad24642312dd5b8 batman-adv/{echo_cancel1.dia => echo_cancel2.dia} | 208 +++++----------------- 1 file changed, 47 insertions(+), 161 deletions(-)

diff --git a/batman-adv/echo_cancel1.dia b/batman-adv/echo_cancel2.dia similarity index 74% copy from batman-adv/echo_cancel1.dia copy to batman-adv/echo_cancel2.dia index 139e24d8..b1859496 100644 --- a/batman-adv/echo_cancel1.dia +++ b/batman-adv/echo_cancel2.dia @@ -155,43 +155,44 @@ <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:rectangle val="5.50807,3.95208;11.6043,5.91679"/> </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:point val="8,6"/> + <dia:point val="6,5"/> </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:enum val="27"/> </dia:attribute> <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> + <dia:real val="1"/> </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:attribute name="obj_pos"> - <dia:point val="7,-2"/> + <dia:point val="7,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-2.6775;9.0425,-1.505"/> + <dia:rectangle val="7,-4.69875;14.4588,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step1#</dia:string> + dia:string#step1: +source = A +previous sender = A#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -200,7 +201,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,-2"/> + <dia:point val="7,-4"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -250,43 +251,44 @@ <dia:point val="25.426,2.426"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.7879,3.78785;23.7985,6.18297"/> + <dia:rectangle val="16.2575,4.15738;23.7982,6.0043"/> </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="18,6"/> + <dia:point val="17,5"/> </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:enum val="27"/> </dia:attribute> <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> + <dia:real val="1"/> </dia:attribute> dia:connections <dia:connection handle="0" to="O11" connection="8"/> - <dia:connection handle="3" to="O12" connection="8"/> </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="18,-2"/> + <dia:point val="18,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-2.6775;20.275,-1.505"/> + <dia:rectangle val="18,-4.69875;25.4587,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 2#</dia:string> + dia:string#step 2: +source = B +previous sender = A#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -295,7 +297,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="18,-2"/> + <dia:point val="18,-4"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -314,12 +316,17 @@ <dia:point val="7,7"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,6.3225;9.275,7.495"/> + <dia:rectangle val="7,6.33021;14.9744,12.6229"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 2#</dia: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"/> @@ -347,12 +354,17 @@ <dia:point val="19,7"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19,6.3225;21.275,7.495"/> + <dia:rectangle val="19,6.33021;26.9744,12.6229"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 3#</dia:string> + dia:string#step 3: +source = C +previous sender = B + +B will not rebroadcast +this packet#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -377,15 +389,17 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="29,-2"/> + <dia:point val="28,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="29,-2.6775;31.275,-1.505"/> + <dia:rectangle val="28,-4.69875;35.4588,-1.4625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - dia:string#step 3#</dia:string> + dia:string#step 3: +source = C +previous sender = B#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -394,7 +408,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="29,-2"/> + <dia:point val="28,-4"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -525,13 +539,13 @@ <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="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,0"/> - <dia:point val="33.85,0.9875"/> + <dia:point val="33,-1"/> + <dia:point val="35,1"/> </dia:attribute> <dia:attribute name="corner_types"> <dia:enum val="0"/> @@ -550,133 +564,5 @@ <dia:connection handle="0" to="O11" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - BezierLine" version="0" id="O16"> - <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="2.73507,4.77019;12.8986,8.5908"/> - </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: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="O0" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Text" version="1" id="O17"> - <dia:attribute name="obj_pos"> - <dia:point val="7,10"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="7,9.3225;9.275,10.495"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#step 4#</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,10"/> - </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="O18"> - <dia:attribute name="obj_pos"> - <dia:point val="13.426,2.426"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1918,-3.69417;25.293,0.206811"/> - </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: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 - Text" version="1" id="O19"> - <dia:attribute name="obj_pos"> - <dia:point val="18,-5"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="18,-5.5425;19.8125,-4.6025"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - dia:string#step 4#</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="18,-5"/> - </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:layer> </dia:diagram>