commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[doc] batman-adv-doc, master: Add missing dashes (2a84979e)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 2a84979e10d2931a1e33f3fcde2b7d1d426b785e Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Jan 22 16:57:39 2009 +0100 Add missing dashes >--------------------------------------------------------------- 2a84979e10d2931a1e33f3fcde2b7d1d426b785e installing.tex | 2 +- title.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installing.tex b/installing.tex index 3234cf92..fac28154 100644 --- a/installing.tex +++ b/installing.tex @@ -1,5 +1,5 @@ \section{Installing from source} -\subsection{Prerequirements} +\subsection{Pre-requirements} \begin{itemize} \item Compile environment and libraries. diff --git a/title.tex b/title.tex index b5f4c9f5..840a97ae 100644 --- a/title.tex +++ b/title.tex @@ -1,7 +1,7 @@ \maketitle \begin{abstract} -B.A.T.M.A.N stands for ``better approach to mobile ad hoc networking'', this is +B.A.T.M.A.N stands for ``better approach to mobile ad-hoc networking'', this is a new routing protocol for multi-hop ad-hoc mesh networks. Go to \url{http://www.open-mesh.net} to see more information.

1 0

[doc] batman-adv-doc, master: Add captions to figures (bb74bc5f)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit bb74bc5f9f09916bf561af9b3d4d1407b6cd7a7d Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Jan 22 13:24:27 2009 +0100 Add captions to figures >--------------------------------------------------------------- bb74bc5f9f09916bf561af9b3d4d1407b6cd7a7d batmand_howto.tex | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/batmand_howto.tex b/batmand_howto.tex index a6efa2aa..74f46d4c 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -170,12 +170,13 @@ while the daemon is running. The parameter has to be in the form of ip-address/netmask. For example, if you are the node A, and you can connect to \emph{other -network}, then you can execute a to announce the gateway. +network}, then you can execute -a to announce the gateway. \begin{figure}[H] \begin{center} \input{img/announce_networks} \end{center} + \caption{Announce A as gateway to B} \end{figure} If the other nodes in the B.A.T.M.A.N. network want to connect to node B after @@ -205,6 +206,7 @@ then the results are different. \begin{center} \input{img/multiple_announces} \end{center} + \caption{Two announced networks} \end{figure} Node A can announce more than one network. To announce two networks execute the @@ -243,6 +245,7 @@ at runtime. \begin{center} \input{img/multiple_clients} \end{center} + \caption{Multiple clients connected to B.A.T.M.A.N. interface} \end{figure} \begin{verbatim}

1 0

[doc] batman-adv-doc, master: Unify styling of verbatim blocks (b1ebc913)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit b1ebc913d7cf0f7c974f97207e658077d9f72653 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 20:54:41 2009 +0100 Unify styling of verbatim blocks >--------------------------------------------------------------- b1ebc913d7cf0f7c974f97207e658077d9f72653 batmand_howto.tex | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/batmand_howto.tex b/batmand_howto.tex index 42585341..3ff1cc9e 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -138,9 +138,9 @@ the following we will explain all parameters and how to work with them in a mesh network. \subsection{SYNOPSIS} -\begin{verb} +\begin{verbatim} batmand [options] interface [interface interface] -\end{verb} +\end{verbatim} \subsection{DESCRIPTION} @@ -175,10 +175,12 @@ The default value is 1000 ms (1 second). In a mobile network, you may want to detect network changes very quickly, so you need to send message very often, for example, use a value of 500 ms. In a static network, you can save bandwidth by using a higher value. -\begin{verbatim} batmand -o 2000 eth1\end{verbatim} +\begin{verbatim} + $ batmand -o 2000 eth1 +\end{verbatim} In this case, batmand will wait 2 second until sending the next OGMs. -\begin{verbatim} -d debug level\end{verbatim} +\subsubsectionttt{-d debug level} The debug level can be set to five values. \begin{description}

1 0

[doc] batman-adv-doc, master: Merge changes of batman's manpage (89367995)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 89367995943349265be785105ecfc45caf2d8cd7 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 22:26:32 2009 +0100 Merge changes of batman's manpage >--------------------------------------------------------------- 89367995943349265be785105ecfc45caf2d8cd7 batmand_howto.tex | 128 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 77 insertions(+), 51 deletions(-) diff --git a/batmand_howto.tex b/batmand_howto.tex index 4f6aa4ae..796fb3cd 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -164,9 +164,13 @@ address from the given interfaces. Note also that you have to check whether your essid, channel or wifi mode is correct or not. -\subsubsectionttt{-a announce network(s)} -\emph{announce network} means a node announces the connection to another -network. For example, if you are the node A, and you can connect to \emph{other +\subsubsectionttt{-a add announced network(s)} +The daemon announces the availability of a connection to another network. This +option can be used multiple times and can be used to add networks dynamically +while the daemon is running. The parameter has to be in the form of +ip-address/netmask. + +For example, if you are the node A, and you can connect to \emph{other network}, then you can execute a to announce the gateway. \begin{center} @@ -207,9 +211,15 @@ following command: \end{verbatim} Note that node A has to have a route to connect the node or network. +\subsubsectionttt{-A delete announced network(s)} +Delete networks to the daemons list of available connections to another +network(s). This option can be used multiple times and can only be used while +the daemon is running. The parameter has to be in the form of +ip-address/netmask. + \subsubsectionttt{-b run connection in batch mode} The debug information are updated after a period of time by default, so if you -use -b it will execute once and then stop. +use "-b" it will execute once and then stop. \begin{verbatim} $ batmand eth1 $ batmand -b -c -d 1 @@ -223,6 +233,8 @@ The B.A.T.M.A.N. daemon offers a unix socket interface to which you can connect. First, you have to create a B.A.T.M.A.N. daemon on your host, then use -c to connect to its interface. Note you can create as many client sockets as you like. +Deploy it without any arguments to get the current configuration even if changed +at runtime. \begin{center} \includegraphics[scale=0.5]{multiple_clients} @@ -246,7 +258,9 @@ The debug level can be set to five values. \item[2] list gateways \item[3] observe batmand \item[4] observe batmand (very verbose) + \item[5] memory debug / cpu usage \end{description} +Note that debug level 5 can be disabled at compile time. For example, you can run in normal start: \begin{verbatim} @@ -317,51 +331,47 @@ packets you sent, and sent to where, or how many packets you got, and received from where etc. \subsubsectionttt{-g gateway class} -Gateway class can set eleven values, it means how much bandwidth you want to -share. -\begin{description} - \item[0] this is not an internet gateway (default) - \item[1] modem line - \item[2] ISDN line - \item[3] double ISDN - \item[4] 256 KBit - \item[5] UMTS / 0.5 MBit - \item[6] 1 MBit - \item[7] 2 MBit - \item[8] 3 MBit - \item[9] 5 MBit - \item[10] 6 MBit - \item[11] $>$6 Mbit -\end{description} +The gateway class is used to tell other nodes in the network your available +internet bandwidth. Just enter any number (optionally followed by "kbit" or +"mbit") and the daemon will guess your appropriate gateway class. Use "/" to +seperate the down- and upload rates. You can omit the upload rate and batmand +will assume an upload of $\mathrm{download}\over{5}$. + +\begin{itemize} +\item 5000 +\item 5000kbit +\item 5mbit +\item 5mbit/1024 +\item 5mbit/1024kbit +\item 5mbit/1mbit +\end{itemize} You only can set the value in a normal start \begin{verbatim} - $ batmand -g 7 -d 3 eth1 + $ batmand -g 5mbit/1024 -d 3 eth1 \end{verbatim} Note that if you use debug level 3, then you will know whether you succeed setting the gateway class or not. \subsubsectionttt{-o originator interval in ms} - Originator means a node transmits broadcast messages (we call them originator - message or OGM) to inform the neighboring nodes about its existence. Originator - interval is the time to wait after sending one message and before the - B.A.T.M.A.N. daemon sends the next message. - -The default value is 1000 ms (1 second). - -In a mobile network, you may want to detect network changes very quickly, so you -need to send message very often, for example, use a value of 500 ms. In a static -network, you can save bandwidth by using a higher value. +A node transmits broadcast messages (we call them originator message or OGM) to +inform the neighboring nodes about it’s existence. Originator interval is the +time to wait after sending one message and before sending the next message. +The default value is 1000 ms (1 second). In a mobile network, you may want to +detect network changes very quickly, so you need to send message very often, for +example, use a value of 500 ms. In a static network, you can save bandwidth by +using a higher value. This option is only available in daemon mode. \begin{verbatim} $ batmand -o 2000 eth1 \end{verbatim} In this case, batmand will wait 2 second until sending the next OGMs. \subsubsectionttt{-p preferred gateway} -Set the default gateway by yourself. +Set the internet gateway by yourself. -Note that you have to use -r to tell B.A.T.M.A.N. daemon you want to set the -default gateway, because -r will be used if the preferred gateway is not -available. +Note that this automatically switches your B.A.T.M.A.N. daemon to "internet +search modus" with "-r 1" unless "-r" is given. If the preferred gateway is not +found the gateway selection will use the current routing class to choose a +gateway. \begin{verbatim} $ batmand -r 3 -d 3 -p 192.168.1.1 eth1 @@ -370,14 +380,15 @@ In this case, you set 192.168.1.1 as your preferred gateway, so all of your internet packets will be sent to the 192.168.1.1. \subsubsectionttt{-r routing class} -Routing class can set to four values, it means this node in the B.A.T.M.A.N. -network wants to connect the Internet and chooses its internet gateway based on -certain criteria: +The routing class can be set to four values - it enables "internet search +modus". The daemon will choose an internet gateway based on certain criteria +(unless "-p" is specified): \begin{description} \item[0] set no default route (default) -\item[1] use fast internet connection -\item[2] use stable internet connection -\item[3] use best statistic internet connection +\item[1] use fast connection +\item[2] use stable connection +\item[3] use fast-switch connection +\item[XX] use late-switch connection \end{description} \paragraph*{Level 1} @@ -385,12 +396,20 @@ B.A.T.M.A.N tries to find the best available connection by watching the uplinks throughput and the link quality. \paragraph*{Level 2} -B.A.T.M.A.N observes the internet nodes and tries to find out which one is the -most reliable. This mode is not implemented yet but will follow in batmand 0.3. +B.A.T.M.A.N compares the link quality of the internet node and chooses the one +with the best connection. \paragraph*{Level 3} -B.A.T.M.A.N only compares the link quality of the internet node and chooses the -one with the best connection. +B.A.T.M.A.N compares the link quality of the internet node and chooses the one +with the best connection but switches to another gateway as soon as a better +connection is found. + +\paragraph*{Level XX} +B.A.T.M.A.N compares the link quality of the internet node and chooses the one +with the best link quality but switches to another gateway as soon as this +gateway has a TQ value which is XX better than the currently selected gateway. + +XX ist a number between 3 and 256 \begin{verbatim} $ batmand -r 3 -d 3 eth1 @@ -401,12 +420,19 @@ whether you succeeded setting the routing class or not. \subsubsectionttt{-s visualization server} Since no topology database is computed by the protocol an additional solution to -create topology graphs has been implemented, the Vis-Server. B.A.T.M.A.N. -daemons may send their local view about their single hop neighbors to the -Vis-server. The Vis-Server collects the information and provides data in a -format similar to OLSR's topology information output. Therefore existing -solutions to draw topology graphs developed for OLSR can be used to visualize -mesh clouds using B.A.T.M.A.N. +create topology graphs has been implemented, the vis server. B.A.T.M.A.N. +daemons may send their local view about their single-hop neighbors to the vis +server. It collects the information and provides data in a format similar to +OLSR's topology information output. Therefore existing solutions to draw +topology graphs developed for OLSR can be used to visualize mesh-clouds +using B.A.T.M.A.N. + +\subsubsectionttt{--policy-routing-script} +This option disables the policy routing feature of batmand - all routing changes +are send to the script which can make use of this information or not. Firmware +and package maintainers can use this option to tightly integrate batmand into +their own routing policies. This option is only available in daemon mode. + \section{Reference Links} \begin{itemize}

1 0

[doc] batman-adv-doc, master: Ignore output files and backup files in git status (a7370557)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit a737055718973833bdb629d570ef0d53d49d4c40 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 23:43:14 2009 +0100 Ignore output files and backup files in git status >--------------------------------------------------------------- a737055718973833bdb629d570ef0d53d49d4c40 .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..7533bcdc --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +*.pdf +*.eps +*.aux +*.log +*.out +*~

1 0

[doc] batman-adv-doc, master: Include by-nc-sa-3.0 logo as vector graphic (acf01b9e)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit acf01b9e22f30e551bb29d1c3ee2b31ef7388538 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 23:54:56 2009 +0100 Include by-nc-sa-3.0 logo as vector graphic >--------------------------------------------------------------- acf01b9e22f30e551bb29d1c3ee2b31ef7388538 .gitignore | 1 + batmand_howto.tex | 2 +- img/by-nc-sa.pdf | Bin 0 -> 8055 bytes img/byncsa30.png | Bin 1761 -> 0 bytes 4 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7533bcdc..e5ae50c1 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.log *.out *~ +!img/by-nc-sa.pdf diff --git a/batmand_howto.tex b/batmand_howto.tex index 2b88d969..26db2293 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -460,7 +460,7 @@ Note that you don't set the default route by yourself. \vfill \section*{Copyright} \begin{center} - \includegraphics[scale=0.8]{byncsa30} + \includegraphics[scale=0.5]{by-nc-sa} \end{center} This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License. To view a copy of this license, visit diff --git a/img/by-nc-sa.pdf b/img/by-nc-sa.pdf new file mode 100644 index 00000000..9259ca3e Binary files /dev/null and b/img/by-nc-sa.pdf differ diff --git a/img/byncsa30.png b/img/byncsa30.png deleted file mode 100644 index 88c9d930..00000000 Binary files a/img/byncsa30.png and /dev/null differ

1 0

[doc] batman-adv-doc, master: Include graphics as LaTeX pgf (54436d8f)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 54436d8fbb648d96712d677bd2bbc2abd7a601a2 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Thu Jan 22 13:17:30 2009 +0100 Include graphics as LaTeX pgf >--------------------------------------------------------------- 54436d8fbb648d96712d677bd2bbc2abd7a601a2 .gitignore | 2 +- batmand_howto.tex | 29 ++++++---- img/Makefile | 12 ++-- img/announce_networks.dia | 102 +++++++++++++-------------------- img/multiple_announces.dia | 59 +++++++++++-------- img/multiple_clients.dia | 140 +++++++++++++++++++++++++++------------------ 6 files changed, 181 insertions(+), 163 deletions(-) diff --git a/.gitignore b/.gitignore index e5ae50c1..f6da6668 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ *.pdf -*.eps *.aux *.log *.out *~ +img/*.tex !img/by-nc-sa.pdf diff --git a/batmand_howto.tex b/batmand_howto.tex index 26db2293..a6efa2aa 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -33,8 +33,7 @@ \usepackage[utf8x]{inputenc} -\usepackage{graphicx} -\graphicspath{{img/}} +\usepackage{graphicx, tikz} \usepackage{hyperref} \usepackage{listings} @@ -173,9 +172,11 @@ ip-address/netmask. For example, if you are the node A, and you can connect to \emph{other network}, then you can execute a to announce the gateway. -\begin{center} -\includegraphics[scale=0.5]{announce_networks} -\end{center} +\begin{figure}[H] + \begin{center} + \input{img/announce_networks} + \end{center} +\end{figure} If the other nodes in the B.A.T.M.A.N. network want to connect to node B after receiving the announce network information form node A, then they will know they @@ -200,9 +201,11 @@ In this case, it means that node A can connect to the whole 192.168.100.x network, because your parameter is /24. So, if you use different netmask values, then the results are different. -\begin{center} -\includegraphics[scale=0.5]{multiple_announces} -\end{center} +\begin{figure}[H] + \begin{center} + \input{img/multiple_announces} + \end{center} +\end{figure} Node A can announce more than one network. To announce two networks execute the following command: @@ -236,9 +239,11 @@ like. Deploy it without any arguments to get the current configuration even if changed at runtime. -\begin{center} -\includegraphics[scale=0.25]{multiple_clients} -\end{center} +\begin{figure}[h] + \begin{center} + \input{img/multiple_clients} + \end{center} +\end{figure} \begin{verbatim} $ batmand eth1 @@ -460,7 +465,7 @@ Note that you don't set the default route by yourself. \vfill \section*{Copyright} \begin{center} - \includegraphics[scale=0.5]{by-nc-sa} + \includegraphics[scale=0.5]{img/by-nc-sa} \end{center} This work is licensed under the Creative Commons Attribution-Noncommercial-Share Alike 3.0 License. To view a copy of this license, visit diff --git a/img/Makefile b/img/Makefile index 35e7f620..69558d10 100644 --- a/img/Makefile +++ b/img/Makefile @@ -1,16 +1,14 @@ # -*- makefile -*- DIA_IMAGES = announce_networks.dia multiple_announces.dia multiple_clients.dia -PDF_IMAGES = $(DIA_IMAGES:.dia=.pdf) +TEX_IMAGES = $(DIA_IMAGES:.dia=.tex) -all: $(PDF_IMAGES) +all: $(TEX_IMAGES) -.SUFFIXES: .dia .eps .pdf +.SUFFIXES: .dia .tex -.dia.eps: +.dia.tex: /usr/bin/dia -e $@ $< -.eps.pdf: - /usr/bin/epstopdf --outfile=$@ $< clean: - rm -f $(PDF_IMAGES) $(PDF_IMAGES:.pdf=.eps) + rm -f $(PDF_IMAGES) $(TEX_IMAGES) diff --git a/img/announce_networks.dia b/img/announce_networks.dia index ba1a16f6..260566fe 100644 --- a/img/announce_networks.dia +++ b/img/announce_networks.dia @@ -65,10 +65,10 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="11.8,6.7"/> + <dia:point val="15.6,7.25"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.8,6.00125;19.4212,7.2375"/> + <dia:rectangle val="11.8,6.01375;19.4212,7.25"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -82,26 +82,29 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="11.8,6.7"/> + <dia:point val="15.6,6.7125"/> </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="3"/> + <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="23.4981,6.625"/> + <dia:point val="26.08,7.14"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.4981,5.9475;28.6406,7.12"/> + <dia:rectangle val="23.5088,5.90375;28.6725,7.14"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -115,19 +118,22 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="23.4981,6.625"/> + <dia:point val="26.08,6.6025"/> </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="3"/> + <dia:enum val="1"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O3" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> @@ -211,10 +217,10 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="16.85,10.05"/> + <dia:point val="17.5,9.97847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="16.8181,9.00056;17.6,10.8564"/> + <dia:rectangle val="16.9787,9.36035;17.5,10.5966"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -225,76 +231,43 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="1.5"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="16.85,10.05"/> + <dia:point val="17.5,10.0591"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> </dia:attribute> <dia:attribute name="alignment"> - <dia:enum val="0"/> + <dia:enum val="2"/> </dia:attribute> </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="23.3,9.65"/> + <dia:point val="22.85,9.52847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.2681,8.60056;24.05,10.4564"/> + <dia:rectangle val="22.8288,8.91035;28.93,10.1466"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#B#</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="1.5"/> - </dia:attribute> - <dia:attribute name="pos"> - <dia:point val="23.3,9.65"/> - </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="O8"> - <dia:attribute name="obj_pos"> - <dia:point val="23.9525,10.725"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="23.9525,10.1654;28.2246,11.1566"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#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="23.9525,10.725"/> + <dia:point val="22.85,9.6091"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -305,15 +278,18 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O5" connection="4"/> + </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O9"> + <dia:object type="Standard - Line" version="0" id="O8"> <dia:attribute name="obj_pos"> <dia:point val="18.325,9.92847"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="18.2707,9.04421;22.5961,10.0492"/> + <dia:rectangle val="18.2707,9.0442;22.5961,10.0492"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="18.325,9.92847"/> @@ -336,7 +312,7 @@ <dia:connection handle="1" to="O5" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O10"> + <dia:object type="Standard - Ellipse" version="0" id="O9"> <dia:attribute name="obj_pos"> <dia:point val="13.9751,8.63125"/> </dia:attribute> @@ -359,7 +335,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O11"> + <dia:object type="Standard - Ellipse" version="0" id="O10"> <dia:attribute name="obj_pos"> <dia:point val="15.2751,9.33125"/> </dia:attribute> @@ -382,7 +358,7 @@ <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="O11"> <dia:attribute name="obj_pos"> <dia:point val="14.1251,9.78125"/> </dia:attribute> @@ -405,7 +381,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O13"> + <dia:object type="Standard - Ellipse" version="0" id="O12"> <dia:attribute name="obj_pos"> <dia:point val="15.5251,8.13125"/> </dia:attribute> @@ -428,7 +404,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O14"> + <dia:object type="Standard - Ellipse" version="0" id="O13"> <dia:attribute name="obj_pos"> <dia:point val="15.3251,10.2312"/> </dia:attribute> @@ -451,7 +427,7 @@ <dia:enum val="2"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Ellipse" version="0" id="O15"> + <dia:object type="Standard - Ellipse" version="0" id="O14"> <dia:attribute name="obj_pos"> <dia:point val="12.9501,9.05625"/> </dia:attribute> diff --git a/img/multiple_announces.dia b/img/multiple_announces.dia index 8d7444e5..8547b819 100644 --- a/img/multiple_announces.dia +++ b/img/multiple_announces.dia @@ -65,16 +65,16 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Ellipse" version="0" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="9.27648,3.3675"/> + <dia:point val="9.30148,3.5225"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="9.22648,3.3175;16.3115,7.5925"/> + <dia:rectangle val="9.25148,3.4725;17.8135,7.7475"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="9.27648,3.3675"/> + <dia:point val="9.30148,3.5225"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="6.9849999999999941"/> + <dia:real val="8.4620400000000089"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="4.1749999999999998"/> @@ -82,16 +82,16 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="9.27648,-0.9575"/> + <dia:point val="9.30148,-0.9075"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="9.22648,-1.0075;16.3115,3.2675"/> + <dia:rectangle val="9.25148,-0.9575;17.8135,3.3175"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="9.27648,-0.9575"/> + <dia:point val="9.30148,-0.9075"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="6.9849999999999941"/> + <dia:real val="8.4620400000000089"/> </dia:attribute> <dia:attribute name="elem_height"> <dia:real val="4.1749999999999998"/> @@ -116,10 +116,10 @@ </dia:object> <dia:object type="Standard - Text" version="1" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="0.475,0.975"/> + <dia:point val="3.9325,1.275"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.475,0.2975;8.075,1.47"/> + <dia:rectangle val="0.1325,0.03875;7.75375,1.275"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -133,26 +133,29 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="0.475,0.975"/> + <dia:point val="3.9325,0.7375"/> </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="3"/> + <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="O4"> <dia:attribute name="obj_pos"> - <dia:point val="10.275,1.3"/> + <dia:point val="10.121,1.23603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.275,0.740437;15.8721,1.73162"/> + <dia:rectangle val="10.121,0.740436;15.718,1.73162"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -166,7 +169,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="10.275,1.3"/> + <dia:point val="10.121,1.3"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -177,15 +180,18 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O7" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="10.3,5.7"/> + <dia:point val="10.046,5.63603"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10.3,5.14044;15.9046,6.13162"/> + <dia:rectangle val="10.046,5.14044;15.6505,6.13162"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -199,7 +205,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="10.3,5.7"/> + <dia:point val="10.046,5.7"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -210,8 +216,11 @@ </dia:composite> </dia:attribute> <dia:attribute name="valign"> - <dia:enum val="3"/> + <dia:enum val="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O8" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O6"> <dia:attribute name="obj_pos"> @@ -494,7 +503,7 @@ <dia:point val="6.83107,3.66331"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.76073,0.816332;10.1749,3.73364"/> + <dia:rectangle val="6.76074,0.816331;10.1749,3.73364"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="6.83107,3.66331"/> @@ -522,7 +531,7 @@ <dia:point val="6.575,3.61937"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.525,3.56937;6.925,3.96938"/> + <dia:rectangle val="6.525,3.56937;6.925,3.96937"/> </dia:attribute> <dia:attribute name="elem_corner"> <dia:point val="6.575,3.61937"/> @@ -545,7 +554,7 @@ <dia:point val="6.89561,3.86738"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.82734,3.79912;10.0823,5.98843"/> + <dia:rectangle val="6.82735,3.79912;10.0823,5.98843"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="6.89561,3.86738"/> @@ -573,7 +582,7 @@ <dia:point val="5.575,3.85"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="5.55375,3.15125;6.075,4.3875"/> + <dia:rectangle val="5.575,3.1725;6.075,4.345"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> diff --git a/img/multiple_clients.dia b/img/multiple_clients.dia index 670dc02f..0df4ed9a 100644 --- a/img/multiple_clients.dia +++ b/img/multiple_clients.dia @@ -65,10 +65,10 @@ <dia:layer name="Background" visible="true"> <dia:object type="Standard - Text" version="1" id="O0"> <dia:attribute name="obj_pos"> - <dia:point val="4.3,6.2"/> + <dia:point val="5.7125,3.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4.3,4.845;13.085,7.19"/> + <dia:rectangle val="3.51125,2.4275;7.91375,3.6"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -79,38 +79,44 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="4.3,6.2"/> + <dia:point val="5.7125,3.105"/> </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="3"/> + <dia:enum val="1"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O1" connection="1"/> + </dia:connections> </dia:object> <dia:object type="Standard - Box" version="0" id="O1"> <dia:attribute name="obj_pos"> - <dia:point val="3.7,6.8"/> + <dia:point val="2.7,3.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.65,6.75;13.6,24.4"/> + <dia:rectangle val="2.675,3.575;8.75,12.4"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="3.7,6.8"/> + <dia:point val="2.7,3.6"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="9.8499999999999996"/> + <dia:real val="6.0250000000000021"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="17.550000000000001"/> + <dia:real val="8.7750000000000004"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> <dia:attribute name="show_background"> <dia:boolean val="true"/> @@ -118,44 +124,50 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O2"> <dia:attribute name="obj_pos"> - <dia:point val="11.7248,10.15"/> + <dia:point val="7.8124,5.275"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.6748,10.1;15.3748,20.3"/> + <dia:rectangle val="7.7874,5.25;9.6374,10.35"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="11.7248,10.15"/> + <dia:point val="7.8124,5.275"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="3.6000000000000014"/> + <dia:real val="1.8000000000000007"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="10.1"/> + <dia:real val="5.0499999999999998"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O3"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,4.0375"/> + <dia:point val="11.7549,2.21875"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,3.9875;33.8098,8.9875"/> + <dia:rectangle val="11.7299,2.19375;18.8549,4.69375"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,4.0375"/> + <dia:point val="11.7549,2.21875"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4500000000000002"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O4"> <dia:attribute name="obj_pos"> - <dia:point val="26.6848,6.4875"/> + <dia:point val="15.2924,3.44375"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8786,5.25125;29.5336,7.72375"/> + <dia:rectangle val="13.8874,2.82562;16.7187,4.06188"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -166,10 +178,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6848,6.64875"/> + <dia:point val="15.2924,3.52438"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -188,27 +200,30 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O5"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,12.745"/> + <dia:point val="11.7549,6.5725"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,12.695;33.8098,17.695"/> + <dia:rectangle val="11.7299,6.5475;18.8549,9.0475"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,12.745"/> + <dia:point val="11.7549,6.5725"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4500000000000002"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O6"> <dia:attribute name="obj_pos"> - <dia:point val="26.6848,15.195"/> + <dia:point val="15.2924,7.7975"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8786,13.9587;29.5336,16.4312"/> + <dia:rectangle val="13.8874,7.21125;16.6974,8.38375"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -219,10 +234,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6848,15.3562"/> + <dia:point val="15.2924,7.88875"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -241,27 +256,30 @@ </dia:object> <dia:object type="Standard - Ellipse" version="0" id="O7"> <dia:attribute name="obj_pos"> - <dia:point val="19.6098,21.44"/> + <dia:point val="11.7549,10.92"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="19.5598,21.39;33.8098,26.39"/> + <dia:rectangle val="11.7299,10.895;18.8549,13.395"/> </dia:attribute> <dia:attribute name="elem_corner"> - <dia:point val="19.6098,21.44"/> + <dia:point val="11.7549,10.92"/> </dia:attribute> <dia:attribute name="elem_width"> - <dia:real val="14.149999999999999"/> + <dia:real val="7.0749999999999993"/> </dia:attribute> <dia:attribute name="elem_height"> - <dia:real val="4.8999999999999995"/> + <dia:real val="2.4499999999999993"/> + </dia:attribute> + <dia:attribute name="border_width"> + <dia:real val="0.050000000000000003"/> </dia:attribute> </dia:object> <dia:object type="Standard - Text" version="1" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="26.6635,23.89"/> + <dia:point val="15.2924,12.145"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="23.8573,22.6538;29.5123,25.1263"/> + <dia:rectangle val="13.8874,11.5588;16.6974,12.7313"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -272,10 +290,10 @@ <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="26.6635,24.0513"/> + <dia:point val="15.2924,12.2363"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -288,21 +306,27 @@ <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 - Line" version="0" id="O9"> <dia:attribute name="obj_pos"> - <dia:point val="23.3575,21.6928"/> + <dia:point val="13.6313,11.0481"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.0012,15.9396;23.4267,21.7621"/> + <dia:rectangle val="9.31282,7.96117;13.666,11.0828"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="23.3575,21.6928"/> - <dia:point val="15.3184,16.3844"/> + <dia:point val="13.6313,11.0481"/> + <dia:point val="9.6092,8.39219"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -319,18 +343,21 @@ </dia:object> <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="19.5598,15.1977"/> + <dia:point val="11.7309,7.79885"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.2224,14.6993;19.6098,15.6994"/> + <dia:rectangle val="9.56112,7.29966;11.7559,8.29968"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="19.5598,15.1977"/> - <dia:point val="15.2726,15.1993"/> + <dia:point val="11.7309,7.79885"/> + <dia:point val="9.58631,7.79967"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute> @@ -347,18 +374,21 @@ </dia:object> <dia:object type="Standard - Line" version="0" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="23.3639,8.6861"/> + <dia:point val="13.6329,4.54238"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.0007,8.61681;23.4332,14.4571"/> + <dia:rectangle val="9.31234,4.50774;13.6676,7.63699"/> </dia:attribute> <dia:attribute name="conn_endpoints"> - <dia:point val="23.3639,8.6861"/> - <dia:point val="15.3184,14.0126"/> + <dia:point val="13.6329,4.54238"/> + <dia:point val="9.6092,7.20628"/> </dia:attribute> <dia:attribute name="numcp"> <dia:int val="1"/> </dia:attribute> + <dia:attribute name="line_width"> + <dia:real val="0.050000000000000003"/> + </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="22"/> </dia:attribute>

1 0

[doc] batman-adv-doc, master: add illustrations for echo cancellation and tq propagation (941ed4a2)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 941ed4a2edbf46f6b6c6e11a6fdf18eb954674fd Author: Simon Wunderlich <dotslash(a)prime.dot.net> Date: Wed Jan 21 22:50:39 2009 +0100 add illustrations for echo cancellation and tq propagation >--------------------------------------------------------------- 941ed4a2edbf46f6b6c6e11a6fdf18eb954674fd batman_iv.docbook | 50 +++++++++++++++++++++++++++++++++++++++++------ images/Makefile | 4 +++- images/echo_cancel1.dia | Bin 0 -> 1695 bytes images/echo_cancel2.dia | Bin 0 -> 1591 bytes images/tq_prop_best1.dia | Bin 0 -> 1416 bytes images/tq_prop_best2.dia | Bin 0 -> 1831 bytes images/tq_prop_best3.dia | Bin 0 -> 1738 bytes 7 files changed, 47 insertions(+), 7 deletions(-) diff --git a/batman_iv.docbook b/batman_iv.docbook index 1656017f..b76981a2 100644 --- a/batman_iv.docbook +++ b/batman_iv.docbook @@ -238,14 +238,36 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, B.A.T.M.A.N. IV can not always rebroadcast the newly calculated TQ that came with the latest OGM. Instead the TQ that was received via the best neighbor is rebroadcasted to support asymetric link scenarios better. </para> <para> - Example: Node A and B are neighbors. Node A has a good connection towards node B but not vice versa. The node C has a good connection towards node A, has a good receiving link quality and bad sending quality towards B. [bild1] + Example: Node A and B are neighbors. Node A has a good connection towards node B but not vice versa. The node C has a good connection towards node A and a bad connection back, and C has a good receiving link quality and bad sending quality towards B. </para> +<para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/tq_prop_best1.pdf" format="EPS" scale="40" /> </imageobject> + <imageobject> <imagedata fileref="images/tq_prop_best1.png" format="PNG" /> </imageobject> + <textobject> <phrase>TQ propagation - example topology</phrase> </textobject> + </inlinemediaobject> </para> <para> - Due to this layout the originator messages from node A have a good chance arriving at B but the TQ value propagated by node B is very low due to the high packet loss towards node A. The messages from node A that travel via node C have a low probablity arriving at node B due to the packet loss towards node B but have a much better TQ value. Node B will propagate many messages with a low TQ value (received from node A directly) and a few messages with a high TQ value (received from node A via node C) although the connection towards node A is very good. [bild2] + Due to this layout the originator messages from node A have a good chance arriving at B but the TQ value propagated by node B is very low due to the high packet loss towards node A. The messages from node A that travel via node C have a low probablity arriving at node B due to the packet loss towards node B but have a much better TQ value. Node B will propagate many messages with a low TQ value (received from node A directly) and a few messages with a high TQ value (received from node A via node C) although the connection towards node A is very good. +</para> +<para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/tq_prop_best2.pdf" format="EPS" scale="40" /> </imageobject> + <imageobject> <imagedata fileref="images/tq_prop_best2.png" format="PNG" /> </imageobject> + <textobject> <phrase>TQ propagation - different paths for the OGM</phrase> </textobject> + </inlinemediaobject> </para> + <para> Therefore, B.A.T.M.A.N. IV will rebroadcast the received OGM with the TQ value of the best neighbor towards the originator. In the given example node B will place the TQ value received via node C in the message from node A before rebroadcasting it. It will flood its best TQ only. [bild3] </para> +<para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/tq_prop_best3.pdf" format="EPS" scale="40" /> </imageobject> + <imageobject> <imagedata fileref="images/tq_prop_best3.png" format="PNG" /> </imageobject> + <textobject> <phrase>TQ propagation - only the best path is propagated</phrase> </textobject> + </inlinemediaobject> +</para> + </sect2> <sect2 id="batman4_local_global_tq"> @@ -359,16 +381,32 @@ TODO Explain multiple interfaces, which interface sends which OGM by which TTL, As explained in the hop penalty section B.A.T.M.A.N. IV floods the network with more packets than B.A.T.M.A.N. III due to the less strict duplicate detection mechanism. B.A.T.M.A.N. IV checks for unknown sequence numbers via a specific neighbor. If this combination is "new" the OGM will be accepted, processed and rebroadcasted. This may duplicate known information when the message "comes back" due to rebroadcasting (so called echos). In dense areas without heavy packet loss this leads to increased bandwidth and CPU usage. </para> <para> - Lets consider the following example: 3 nodes (A, B and C) in a row (A can hear B but not C). Node A emits an OGM, B hears and rebroadcasts it. This broadcast from B arrives at C which also rebroadcasts the message. B will receive the very OGM that it sent before and happily rebroadcast again (the echo of its own message). [figure1] + <inlinemediaobject> + <imageobject> <imagedata fileref="images/echo_cancel1.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/echo_cancel1.png" format="PNG" /> </imageobject> + <textobject> <phrase>communication without echo cancellation penalty</phrase> </textobject> + </inlinemediaobject> + </para> + <para> - To detect echos (messages that already passed through a node) B.A.T.M.A.N. IV introduces a new protocol field called "old originator" which contains the IP address of the node rebroadcasting the OGM. Whenever a node receives a message from a neighbor it will fill the "old originator" field with the address of this neighbor before rebroadcasting it. If the neighbor recognizes his own IP address in the "old originator" field the packet will be ignored. [figure2] + Lets consider the following example: 3 nodes (A, B and C) in a row (A can hear B but not C). Node A emits an OGM, B hears and rebroadcasts it. This broadcast from B arrives at C which also rebroadcasts the message. B will receive the very OGM that it sent before and happily rebroadcast again (the echo of its own message). </para> <para> - Back to the example: Node B will ignore (drop) the packet coming back from node C as node C wrote the IP address of node B in the "old originator" field. [figure3] + To detect echos (messages that already passed through a node) B.A.T.M.A.N. IV introduces a new protocol field called "old originator" which contains the IP address of the node rebroadcasting the OGM. Whenever a node receives a message from a neighbor it will fill the "old originator" field with the address of this neighbor before rebroadcasting it. If the neighbor recognizes his own IP address in the "old originator" field the packet will be ignored. +</para> +<para> + Back to the example: Node B will ignore (drop) the packet coming back from node C as node C wrote the IP address of node B in the "old originator" field. +</para> +<para> + <inlinemediaobject> + <imageobject> <imagedata fileref="images/echo_cancel2.pdf" format="EPS" scale="50" /> </imageobject> + <imageobject> <imagedata fileref="images/echo_cancel2.png" format="PNG" /> </imageobject> + <textobject> <phrase>communication without echo cancellation penalty</phrase> </textobject> + </inlinemediaobject> </para> <para> - Even in more sophisticated scenarios with more nodes/hops this concept successfully reduces the packets. It ensures that packet only travels paths which did not see this OGM before. [figure4] + Even in more sophisticated scenarios with more nodes/hops this concept successfully reduces the packets. It ensures that packet only travels paths which did not see this OGM before. </para> </sect2> diff --git a/images/Makefile b/images/Makefile index 48c43730..03f5ded9 100644 --- a/images/Makefile +++ b/images/Makefile @@ -2,7 +2,9 @@ GP_IMAGES=asym_penalty.gp DIA_IMAGES=asymetry.dia tq.dia eq.dia eq_alt1.dia eq_alt2.dia eq_alt3.dia rq.dia \ hop_penalty1.dia hop_penalty2.dia \ hop_penalty3.dia hop_penalty4.dia hop_penalty5.dia hop_penalty6.dia \ - asym_link1.dia asym_link2.dia tq_prop.dia + asym_link1.dia asym_link2.dia tq_prop.dia \ + echo_cancel1.dia echo_cancel2.dia \ + tq_prop_best1.dia tq_prop_best2.dia tq_prop_best3.dia TEX_IMAGES=compute_tq.tex tq_prop_calc.tex PNG_IMAGES= $(DIA_IMAGES:.dia=.png) PNG_IMAGES+=$(GP_IMAGES:.gp=.png) diff --git a/images/echo_cancel1.dia b/images/echo_cancel1.dia new file mode 100644 index 00000000..5c816413 Binary files /dev/null and b/images/echo_cancel1.dia differ diff --git a/images/echo_cancel2.dia b/images/echo_cancel2.dia new file mode 100644 index 00000000..248505fd Binary files /dev/null and b/images/echo_cancel2.dia differ diff --git a/images/tq_prop_best1.dia b/images/tq_prop_best1.dia new file mode 100644 index 00000000..c50c436b Binary files /dev/null and b/images/tq_prop_best1.dia differ diff --git a/images/tq_prop_best2.dia b/images/tq_prop_best2.dia new file mode 100644 index 00000000..f6fc11ab Binary files /dev/null and b/images/tq_prop_best2.dia differ diff --git a/images/tq_prop_best3.dia b/images/tq_prop_best3.dia new file mode 100644 index 00000000..e7c59251 Binary files /dev/null and b/images/tq_prop_best3.dia differ

1 0

[doc] batman-adv-doc, master: Reorder batmand options in alphabetic order (c5b03af3)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit c5b03af36fb55cba372fd783667ea1204e4566f0 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 22:03:10 2009 +0100 Reorder batmand options in alphabetic order >--------------------------------------------------------------- c5b03af36fb55cba372fd783667ea1204e4566f0 batmand_howto.tex | 196 +++++++++++++++++++++++++++--------------------------- 1 file changed, 98 insertions(+), 98 deletions(-) diff --git a/batmand_howto.tex b/batmand_howto.tex index 3ff1cc9e..4f6aa4ae 100644 --- a/batmand_howto.tex +++ b/batmand_howto.tex @@ -139,7 +139,7 @@ network. \subsection{SYNOPSIS} \begin{verbatim} -batmand [options] interface [interface interface] +batmand [options] interface [interface...] \end{verbatim} @@ -164,21 +164,78 @@ address from the given interfaces. Note also that you have to check whether your essid, channel or wifi mode is correct or not. -\subsubsectionttt{-o originator interval in ms} - Originator means a node transmits broadcast messages (we call them originator - message or OGM) to inform the neighboring nodes about its existence. Originator - interval is the time to wait after sending one message and before the - B.A.T.M.A.N. daemon sends the next message. +\subsubsectionttt{-a announce network(s)} +\emph{announce network} means a node announces the connection to another +network. For example, if you are the node A, and you can connect to \emph{other +network}, then you can execute a to announce the gateway. -The default value is 1000 ms (1 second). +\begin{center} +\includegraphics[scale=0.8]{announce_networks} +\end{center} -In a mobile network, you may want to detect network changes very quickly, so you -need to send message very often, for example, use a value of 500 ms. In a static -network, you can save bandwidth by using a higher value. +If the other nodes in the B.A.T.M.A.N. network want to connect to node B after +receiving the announce network information form node A, then they will know they +can use node A as gateway to reach node B. Now, you know what a announced +network is, but executing this command is wrong: \begin{verbatim} - $ batmand -o 2000 eth1 + $ batmand -a 192.168.100.101 eth1 \end{verbatim} -In this case, batmand will wait 2 second until sending the next OGMs. + +Because you have to specify the netmask parameter and different netmask +parameters cause different results. Let's make a example: +\begin{verbatim} + $ batmand -a 192.168.100.101/32 eth1 +\end{verbatim} +In this case, it means that node A can only connect to node B, because your +parameter is /32. + +\begin{verbatim} + $ batmand -a 192.168.100.101/24 eth1 +\end{verbatim} +In this case, it means that node A can connect to the whole 192.168.100.x +network, because your parameter is /24. So, if you use different netmask values, +then the results are different. + +\begin{center} +\includegraphics[scale=0.8]{multiple_announces} +\end{center} + +Node A can announce more than one network. To announce two networks execute the +following command: +\begin{verbatim} + $ batmand -a 192.168.100.101/24 -a 192.168.200.201/24 eth1 +\end{verbatim} +Note that node A has to have a route to connect the node or network. + +\subsubsectionttt{-b run connection in batch mode} +The debug information are updated after a period of time by default, so if you +use -b it will execute once and then stop. +\begin{verbatim} + $ batmand eth1 + $ batmand -b -c -d 1 +\end{verbatim} +In this case, it means run debug level 1 once. + +Note that -b can only be used with -c and debug level 1 \& 2. + +\subsubsectionttt{-c connect via unix socket} +The B.A.T.M.A.N. daemon offers a unix socket interface to which you can connect. +First, you have to create a B.A.T.M.A.N. daemon on your host, then use -c to +connect to its interface. Note you can create as many client sockets as you +like. + +\begin{center} +\includegraphics[scale=0.5]{multiple_clients} +\end{center} + +\begin{verbatim} + $ batmand eth1 + $ batmand -c -d 1 +\end{verbatim} +In this case, you ask the daemon to output debug level 1 in your current shell. +The B.A.T.M.A.N. daemon will update the information after a period of time. + +Note that if you use -c flag, then you only can use -d to see the debug level. \subsubsectionttt{-d debug level} The debug level can be set to five values. @@ -259,36 +316,6 @@ has so many information about the B.A.T.M.A.N. network, for example, how many packets you sent, and sent to where, or how many packets you got, and received from where etc. -\subsubsectionttt{-c connect via unix socket} -The B.A.T.M.A.N. daemon offers a unix socket interface to which you can connect. -First, you have to create a B.A.T.M.A.N. daemon on your host, then use -c to -connect to its interface. Note you can create as many client sockets as you -like. - -\begin{center} -\includegraphics[scale=0.5]{multiple_clients} -\end{center} - -\begin{verbatim} - $ batmand eth1 - $ batmand -c -d 1 -\end{verbatim} -In this case, you ask the daemon to output debug level 1 in your current shell. -The B.A.T.M.A.N. daemon will update the information after a period of time. - -Note that if you use -c flag, then you only can use -d to see the debug level. - -\subsubsectionttt{-b run connection in batch mode} -The debug information are updated after a period of time by default, so if you -use -b it will execute once and then stop. -\begin{verbatim} - $ batmand eth1 - $ batmand -b -c -d 1 -\end{verbatim} -In this case, it means run debug level 1 once. - -Note that -b can only be used with -c and debug level 1 \& 2. - \subsubsectionttt{-g gateway class} Gateway class can set eleven values, it means how much bandwidth you want to share. @@ -313,6 +340,35 @@ You only can set the value in a normal start Note that if you use debug level 3, then you will know whether you succeed setting the gateway class or not. +\subsubsectionttt{-o originator interval in ms} + Originator means a node transmits broadcast messages (we call them originator + message or OGM) to inform the neighboring nodes about its existence. Originator + interval is the time to wait after sending one message and before the + B.A.T.M.A.N. daemon sends the next message. + +The default value is 1000 ms (1 second). + +In a mobile network, you may want to detect network changes very quickly, so you +need to send message very often, for example, use a value of 500 ms. In a static +network, you can save bandwidth by using a higher value. +\begin{verbatim} + $ batmand -o 2000 eth1 +\end{verbatim} +In this case, batmand will wait 2 second until sending the next OGMs. + +\subsubsectionttt{-p preferred gateway} +Set the default gateway by yourself. + +Note that you have to use -r to tell B.A.T.M.A.N. daemon you want to set the +default gateway, because -r will be used if the preferred gateway is not +available. + +\begin{verbatim} + $ batmand -r 3 -d 3 -p 192.168.1.1 eth1 +\end{verbatim} +In this case, you set 192.168.1.1 as your preferred gateway, so all of your +internet packets will be sent to the 192.168.1.1. + \subsubsectionttt{-r routing class} Routing class can set to four values, it means this node in the B.A.T.M.A.N. network wants to connect the Internet and chooses its internet gateway based on @@ -343,62 +399,6 @@ In this case, the B.A.T.M.A.N. daemon will choose the best statistic internet connection for you. Note that if you use debug level 3, then you will know whether you succeeded setting the routing class or not. -\subsubsectionttt{-p preferred gateway} -Set the default gateway by yourself. - -Note that you have to use -r to tell B.A.T.M.A.N. daemon you want to set the -default gateway, because -r will be used if the preferred gateway is not -available. - -\begin{verbatim} - $ batmand -r 3 -d 3 -p 192.168.1.1 eth1 -\end{verbatim} -In this case, you set 192.168.1.1 as your preferred gateway, so all of your -internet packets will be sent to the 192.168.1.1. - -\subsubsectionttt{-a announce network(s)} -\emph{announce network} means a node announces the connection to another -network. For example, if you are the node A, and you can connect to \emph{other -network}, then you can execute a to announce the gateway. - -\begin{center} -\includegraphics[scale=0.8]{announce_networks} -\end{center} - -If the other nodes in the B.A.T.M.A.N. network want to connect to node B after -receiving the announce network information form node A, then they will know they -can use node A as gateway to reach node B. Now, you know what a announced -network is, but executing this command is wrong: -\begin{verbatim} - $ batmand -a 192.168.100.101 eth1 -\end{verbatim} - -Because you have to specify the netmask parameter and different netmask -parameters cause different results. Let's make a example: -\begin{verbatim} - $ batmand -a 192.168.100.101/32 eth1 -\end{verbatim} -In this case, it means that node A can only connect to node B, because your -parameter is /32. - -\begin{verbatim} - $ batmand -a 192.168.100.101/24 eth1 -\end{verbatim} -In this case, it means that node A can connect to the whole 192.168.100.x -network, because your parameter is /24. So, if you use different netmask values, -then the results are different. - -\begin{center} -\includegraphics[scale=0.8]{multiple_announces} -\end{center} - -Node A can announce more than one network. To announce two networks execute the -following command: -\begin{verbatim} - $ batmand -a 192.168.100.101/24 -a 192.168.200.201/24 eth1 -\end{verbatim} -Note that node A has to have a route to connect the node or network. - \subsubsectionttt{-s visualization server} Since no topology database is computed by the protocol an additional solution to create topology graphs has been implemented, the Vis-Server. B.A.T.M.A.N.

1 0

[doc] batman-adv-doc, master: Redraw images using dia (46d93723)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: batman-adv-doc,master >--------------------------------------------------------------- commit 46d937231d1cdff7f4447f11d5b3c6d9e72f80b8 Author: Sven Eckelmann <sven.eckelmann(a)gmx.de> Date: Wed Jan 21 23:40:41 2009 +0100 Redraw images using dia >--------------------------------------------------------------- Makefile | 9 +- batmand_howto.tex | 6 +- img/Makefile | 16 ++ img/announce_networks.dia | 478 +++++++++++++++++++++++++++++++++++ img/announce_networks.png | Bin 1742 -> 0 bytes img/multiple_announces.dia | 605 +++++++++++++++++++++++++++++++++++++++++++++ img/multiple_announces.png | Bin 1512 -> 0 bytes img/multiple_clients.dia | 377 ++++++++++++++++++++++++++++ img/multiple_clients.png | Bin 6995 -> 0 bytes 9 files changed, 1486 insertions(+), 5 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 46d937231d1cdff7f4447f11d5b3c6d9e72f80b8

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017