commits December 2017

commits@lists.open-mesh.org

1 participants
242 discussions

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/News-draft (80f93e78)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

1 0

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/News-draft: add new bugfixes (929515bf)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-12-14,master >--------------------------------------------------------------- commit 929515bf50eee9fdd3630901e3934886485c3cae Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Dec 5 09:53:21 2017 +0000 doc: open-mesh/News-draft: add new bugfixes >--------------------------------------------------------------- 929515bf50eee9fdd3630901e3934886485c3cae open-mesh/News-draft.textile | 75 +++++++++++++++++++++++++++++++++++++------- 1 file changed, 64 insertions(+), 11 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 804d9384..fe7aedb5 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,6 +1,6 @@ h1. DRAFT: Batman-adv 2017.4 released -Dec 05th, 2017. Today the B.A.T.M.A.N. team publishes the December 2017 update to batman-adv, batctl and alfred! TODO +Dec 05th, 2017. Today the B.A.T.M.A.N. team publishes the December 2017 update to batman-adv, batctl and alfred! This release contains mostly bugfixes, code cleanups and documentation updates. As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: @@ -19,14 +19,24 @@ h2. batman-adv <pre> $ git describe origin/master -v2017.3-11-gdcad23d0 -$ git shortlog --email --no-merges v2017.3..v2017.3-11-gdcad23d0 +v2017.3-20-g9a3b195 +$ git shortlog --email --no-merges v2017.3..v2017.3-20-g9a3b195 + + + +new kernel support +================== + + batman-adv: setup_timer() -> timer_setup() bugfixes ======== batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation + batman-adv: Always initialize fragment header priority + batman-adv: Fix check of retrieved orig_gw in batadv_v_gw_is_eligible + batman-adv: Fix lock for ogm cnt access in batadv_iv_ogm_calc_tq coding style cleanup/refactoring ================================ @@ -37,10 +47,15 @@ coding style cleanup/refactoring batman-adv: Remove unnecessary parentheses batman-adv: Fix "line over 80 characters" checkpatch warning batman-adv: Add argument names for function ptr definitions - batman-adv: Add missing kerneldoc for extack batman-adv: Remove unused header bug.h in bat_v.c - batman-adv: use inline kernel-doc for uapi constants +documentation updates +===================== + + batman-adv: use inline kernel-doc for uapi constants + batman-adv: Add .rst to README symlink + batman-adv: Convert CHANGELOG to reStructuredText + batman-adv: Convert README to reStructuredText @@ -50,9 +65,13 @@ coding style cleanup/refactoring * support latest kernels (3.2 - 4.15) * coding style cleanups and refactoring +* documentation cleanup * bugs squashed: - avoid spurious warnings from bat_v neigh_cmp implementation + - fix check of gateway availability in B.A.T.M.A.N. V + - fix locking for bidirectional TQ check counters + - remove leak of stack bits in fragmentation header priority </pre> @@ -61,17 +80,38 @@ h2. batctl <pre> $ git describe origin/master -v2017.3-2-g6116097 -$ git shortlog --email --no-merges v2017.3..v2017.3-2-g6116097 +v2017.3-15-g2ea390c +$ git shortlog --email --no-merges v2017.3..v2017.3-15-g2ea390c + + +Sven Eckelmann (13): bugfixes ======== + batctl: Handle failure during hash_iterator allocation + batctl: Handle allocation error for path_buff + batctl: Handle allocation error in vlan_get_link_parse + batctl: Print dummy value when localtime failed + batctl: Handle nlmsg_alloc errors + batctl: Handle nl_socket_alloc errors + batctl: Handle nl_cb_alloc errors + batctl: Free nl_sock on genl_ctrl_resolve error + batctl: Free nl_sock when if_nametoindex failed + coding style cleanup/refactoring ================================ batctl: use inline kernel-doc for uapi constants + batctl: tcpdump: Fix types for for TT v1 + batctl: Simplify concatenation of pathnames + +documentation updates +===================== + + batctl: Convert CHANGELOG to reStructuredText + batctl: Convert README to reStructuredText @@ -81,32 +121,43 @@ coding style cleanup/refactoring =================== * synchronization of batman-adv netlink header +* coding style cleanups and refactoring +* documentation cleanup +* bugs squashed: + - improve error handling for libnl related errors + - add checks for various allocation errors </pre> h2. alfred <pre> $ git describe origin/master -v2017.3-6-gd4cd6f3 -$ git shortlog --email --no-merges v2017.3..v2017.3-6-gd4cd6f3 +v2017.3-9-g6be59ad +$ git shortlog --email --no-merges v2017.3..v2017.3-9-g6be59ad bugs ==== alfred: Only query debugfs when netlink failed + alfred: Handle failure during hash iterator allocation coding style cleanup/refactoring ================================ - alfred: use inline kernel-doc for uapi constants - alfred: Only check for minimal length of fixed size packets alfred: Remove announce length validation alfred: Keep length unsigned when processing packets +documentation updates +===================== + + alfred: use inline kernel-doc for uapi constants + alfred: Convert CHANGELOG to reStructuredText + alfred: Convert README to reStructuredText + @@ -116,9 +167,11 @@ coding style cleanup/refactoring * synchronization of batman-adv netlink header * coding style cleanups and refactoring +* documentation cleanup * bugs squashed: - only query debugfs when netlink failed + - handle allocation errors in hashtable iterator </pre>

1 0

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/Download (eab2d284)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-12-14,master >--------------------------------------------------------------- commit eab2d2841772d0111ec97dead955418a8716bb8c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Dec 5 17:03:32 2017 +0000 doc: open-mesh/Download >--------------------------------------------------------------- eab2d2841772d0111ec97dead955418a8716bb8c open-mesh/Download.textile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/open-mesh/Download.textile b/open-mesh/Download.textile index 13a35680..c7c367d8 100644 --- a/open-mesh/Download.textile +++ b/open-mesh/Download.textile @@ -7,9 +7,9 @@ Please use the maint branch for your public infrastructure unless you know exact h2. Download Released Source Code -* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2017.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.3.tar.gz.asc -* The latest version of batctl (management and control tool for batman-adv) is "batctl-2017.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.3.tar.gz.asc -* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2017.3.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.3.tar.gz.asc +* The latest version of [[batman-adv:Wiki|batman-adv]] is "batman-adv-2017.4.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.4.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.4.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.4.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batman-adv/batman-adv-2017.4.tar.gz.asc +* The latest version of batctl (management and control tool for batman-adv) is "batctl-2017.4.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/batctl/batctl-2017.4.tar.gz.asc +* The latest version of alfred (Almighty Lightweight Fact Remote Exchange Daemon) is "alfred-2017.4.tar.gz":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.tar.gz "md5":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/stable/sources/alfred/alfred-2017.4.tar.gz.asc * The latest stable version of batmand ([[open-mesh:BranchesExplained#batmand|unmaintained]]) is "batman-0.3.2.tar.gz":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/batman-0.3.2.tar.gz.asc * The latest version of the vis server for the batmand (package not needed for batman-adv) is "vis-0.3.2.tar.gz":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz "md5":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.md5 "sha1":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.sha1 "asc":https://downloads.open-mesh.org/batman/releases/batman-0.3.2/vis-0.3.2.tar.gz.asc @@ -70,6 +70,7 @@ It follows an overview of linux versions and the batman-adv version they contain * linux 4.12 => batman-adv 2017.1 (get batctl 2017.1 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 4.13 => batman-adv 2017.2 (get batctl 2017.2 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) * linux 4.14 => batman-adv 2017.3 (get batctl 2017.3 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) +* linux 4.15 => batman-adv 2017.4 (get batctl 2017.4 from "here":https://downloads.open-mesh.org/batman/stable/sources/batctl/) h2. Arch Linux

1 0

[doc] backup-redmine/2017-12-14, master: doc: open-mesh/News-draft: gather changes for 2017.4 (4948bcec)
by postmaster＠open-mesh.org 14 Dec '17

14 Dec '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-12-14,master >--------------------------------------------------------------- commit 4948bcecaab02939f35b15dd20d685861e424ab9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 29 20:00:59 2017 +0000 doc: open-mesh/News-draft: gather changes for 2017.4 >--------------------------------------------------------------- 4948bcecaab02939f35b15dd20d685861e424ab9 open-mesh/News-draft.textile | 106 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 92 insertions(+), 14 deletions(-) diff --git a/open-mesh/News-draft.textile b/open-mesh/News-draft.textile index 4b3336eb..848ceecb 100644 --- a/open-mesh/News-draft.textile +++ b/open-mesh/News-draft.textile @@ -1,36 +1,114 @@ -h1. DRAFT: Batman-adv 2017.3 released +h1. DRAFT: Batman-adv 2017.4 released -Sep 28th, 2017. Today the B.A.T.M.A.N. team publishes the September 2017 update to batman-adv, batctl and alfred! A long standing problem in batman-adv was fixed that could lead to an excessive number of TT management packets when devices disagree about the enabled flags of a device in the translation table. The memory usage of alfred was reduced slightly when it is used with <code>--update-command</code> and receives a lot of updates. Also minor bugfixes and code cleanups are included in this version. +Dec 05th, 2017. Today the B.A.T.M.A.N. team publishes the December 2017 update to batman-adv, batctl and alfred! TODO As the kernel module always depends on the Linux kernel it is compiled against, it does not make sense to provide binaries on our website. As usual, you will find the signed tarballs in our download section: -https://downloads.open-mesh.org/batman/releases/batman-adv-2017.3/ +https://downloads.open-mesh.org/batman/releases/batman-adv-2017.4/ h2. Thanks Thanks to all people sending in patches: -* Colin Ian King <colin.king(a)canonical.com> -* Linus Lüssing <linus.luessing(a)c0d3.blue> -* Simon Wunderlich <sw(a)simonwunderlich.de> +* David Ahern <dsahern(a)gmail.com> +* Gao Feng <gfree.wind(a)vip.163.com> +* Simon Wunderlich <sw(a)simonwunderlich.de * Sven Eckelmann <sven(a)narfation.org> h2. batman-adv -* support latest kernels (3.2 - 4.14) -* coding style cleanups and refactoring -* bugs squashed: -** fix TT sync flag inconsistencies -** ignore invalid throughput values from wifi interfaces +<pre> +$ git describe origin/master +v2017.3-11-gdcad23d0 +$ git shortlog --email --no-merges v2017.3..v2017.3-11-gdcad23d0 + + +bugfixes +======== + + batman-adv: Avoid spurious warnings from bat_v neigh_cmp implementation + +coding style cleanup/refactoring +================================ + + batman-adv: Add extack to ndo_add_slave + batman-adv: Add extack to upper device linking + batman-adv: Remove useless function skb_header_release + batman-adv: Remove unnecessary parentheses + batman-adv: Fix "line over 80 characters" checkpatch warning + batman-adv: Add argument names for function ptr definitions + batman-adv: Add missing kerneldoc for extack + batman-adv: Remove unused header bug.h in bat_v.c + batman-adv: use inline kernel-doc for uapi constants + + +batman-adv 2017.4 + + * support latest kernels (3.2 - 4.15) + * coding style cleanups and refactoring + * bugs squashed: + - avoid spurious warnings from bat_v neigh_cmp implementation + + -- Tue, 05 Dec 2017 18:11:55 +0100 + +</pre> h2. batctl -* bugs squashed: -** Fix error messages on traceroute send failures +<pre> +$ git describe origin/master +v2017.3-2-g6116097 +$ git shortlog --email --no-merges v2017.3..v2017.3-2-g6116097 + + +bugfixes +======== + +coding style cleanup/refactoring +================================ + + batctl: use inline kernel-doc for uapi constants + +batctl 2017.4 + + * synchronization of batman-adv netlink header + + -- Tue, 05 Dec 2017 18:11:55 +0100 +</pre> h2. alfred -* reduction of memory usage when using --update-command +<pre> +$ git describe origin/master +v2017.3-6-gd4cd6f3 +$ git shortlog --email --no-merges v2017.3..v2017.3-6-gd4cd6f3 + + +bugs +==== + + alfred: Only query debugfs when netlink failed + + +coding style cleanup/refactoring +================================ + + alfred: use inline kernel-doc for uapi constants + + alfred: Only check for minimal length of fixed size packets + alfred: Remove announce length validation + alfred: Keep length unsigned when processing packets + +alfred 2017.4 + + * synchronization of batman-adv netlink header + * coding style cleanups and refactoring + * bugs squashed: + - only query debugfs when netlink failed + + -- Tue, 05 Dec 2017 18:11:55 +0100 +</pre> + Happy routing,

1 0

[doc] batman-adv-doc, master: add hop penalty and multiple interface illustrations (e84741e0)
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 e84741e00812eb57959e2c49f26b3f9dbe33d5fb Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 20:35:14 2009 +0200 add hop penalty and multiple interface illustrations >--------------------------------------------------------------- batman_iv.docbook | 36 +- images/Makefile | 4 +- images/{echo_cancel2.dia => hop_penalty_new1.dia} | 458 +++++++++------------ images/{echo_cancel2.dia => hop_penalty_new2.dia} | 458 +++++++++------------ images/{hop_penalty2.dia => multi_interface_1.dia} | 416 ++++++++----------- images/{hop_penalty2.dia => multi_interface_2.dia} | 423 ++++++++----------- 6 files changed, 780 insertions(+), 1015 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 e84741e00812eb57959e2c49f26b3f9dbe33d5fb

1 0

[doc] batman-adv-doc, master: apply mareks comments on pictures (1328f014)
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 1328f0140eefdb1634bdcc870c4bb5f114d65315 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 21:21:52 2009 +0200 apply mareks comments on pictures >--------------------------------------------------------------- 1328f0140eefdb1634bdcc870c4bb5f114d65315 images/hop_penalty_new1.dia | 24 ++--- images/hop_penalty_new2.dia | 10 +- images/multi_interface_1.dia | 213 ++++++++++++++++++++++--------------------- 3 files changed, 126 insertions(+), 121 deletions(-) diff --git a/images/hop_penalty_new1.dia b/images/hop_penalty_new1.dia index dfd27f27..5109492a 100644 --- a/images/hop_penalty_new1.dia +++ b/images/hop_penalty_new1.dia @@ -68,7 +68,7 @@ <dia:point val="17,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="17,-4.55956;21.4021,-2.76837"/> + <dia:rectangle val="17,-4.5425;21.385,-2.8025"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -125,7 +125,7 @@ TQ = 100 %#</dia:string> <dia:point val="2.11788,2.58432"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="2.11788,-0.906805;4.7165,5.27157"/> + <dia:rectangle val="2.11788,-0.80068;4.61038,5.05932"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -181,7 +181,7 @@ TQ = 100 %#</dia:string> <dia:point val="21.2042,2.66615"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="21.2042,-0.718846;23.7042,5.14115"/> + <dia:rectangle val="21.2042,-0.71885;23.7042,5.14115"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -290,7 +290,7 @@ TQ = 100 %#</dia:string> <dia:point val="12.5,-2.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.2937,-3.11813;13.7275,-1.88187"/> + <dia:rectangle val="11.2937,-3.08625;13.7062,-1.91375"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -304,7 +304,7 @@ TQ = 100 %#</dia:string> <dia:real val="1"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="12.5,-2.41937"/> + <dia:point val="12.5,-2.40875"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -326,7 +326,7 @@ TQ = 100 %#</dia:string> <dia:point val="3.2871,1.2871"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.23699,-0.0483348;22.3792,1.82826"/> + <dia:rectangle val="3.23699,-0.0483365;22.3793,1.82826"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="3.2871,1.2871"/> @@ -354,14 +354,14 @@ TQ = 100 %#</dia:string> <dia:point val="20,0"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.273,-8.71892;20.0706,0.0706485"/> + <dia:rectangle val="11.9263,-8.71892;20.0706,0.0706485"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="20,0"/> <dia:point val="12.3282,-8.34369"/> </dia:attribute> <dia:attribute name="curve_distance"> - <dia:real val="-2.3269140354912046"/> + <dia:real val="-1.355830028838052"/> </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="3"/> @@ -381,7 +381,7 @@ TQ = 100 %#</dia:string> <dia:point val="3.2871,1.2871"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="3.21706,-11.0133;12.7572,1.35714"/> + <dia:rectangle val="3.21706,-11.0132;12.7572,1.35714"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="3.2871,1.2871"/> @@ -409,7 +409,7 @@ TQ = 100 %#</dia:string> <dia:point val="10,3"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="10,2.44044;14.4021,4.23163"/> + <dia:rectangle val="10,2.4575;14.385,4.1975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -443,7 +443,7 @@ TQ = 100 %#</dia:string> <dia:point val="4,-5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="4,-5.55956;8.40206,-3.76837"/> + <dia:rectangle val="4,-5.5425;8.385,-3.8025"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -477,7 +477,7 @@ TQ = 100 %#</dia:string> <dia:point val="16,-12"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="16,-12.6988;26.5362,-10.4625"/> + <dia:rectangle val="16,-12.6775;26.515,-10.505"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> diff --git a/images/hop_penalty_new2.dia b/images/hop_penalty_new2.dia index 1c5f793a..132fa18c 100644 --- a/images/hop_penalty_new2.dia +++ b/images/hop_penalty_new2.dia @@ -68,7 +68,7 @@ <dia:point val="17,-4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="17,-4.55956;26.6121,-2.76837"/> + <dia:rectangle val="17,-4.5425;26.595,-2.8025"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -354,14 +354,14 @@ TQ = 96 % (hop penalty applied)#</dia:string> <dia:point val="20,0"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="12.2731,-8.71892;20.0706,0.0706485"/> + <dia:rectangle val="11.9263,-8.71892;20.0706,0.0706485"/> </dia:attribute> <dia:attribute name="conn_endpoints"> <dia:point val="20,0"/> <dia:point val="12.3282,-8.34369"/> </dia:attribute> <dia:attribute name="curve_distance"> - <dia:real val="-2.3269140354912046"/> + <dia:real val="-1.362060805153245"/> </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="3"/> @@ -388,7 +388,7 @@ TQ = 96 % (hop penalty applied)#</dia:string> <dia:point val="12.3282,-10.6718"/> </dia:attribute> <dia:attribute name="curve_distance"> - <dia:real val="2.1663871418151657"/> + <dia:real val="2.4028529138638737"/> </dia:attribute> <dia:attribute name="end_arrow"> <dia:enum val="3"/> @@ -477,7 +477,7 @@ TQ = 100 %#</dia:string> <dia:point val="16,-12"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="16,-12.6988;26.5362,-10.4625"/> + <dia:rectangle val="16,-12.6775;26.515,-10.505"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> diff --git a/images/multi_interface_1.dia b/images/multi_interface_1.dia index 573b1831..9704afa5 100644 --- a/images/multi_interface_1.dia +++ b/images/multi_interface_1.dia @@ -147,7 +147,7 @@ <dia:point val="16,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="15.8939,0.508875;18.5,6.68725"/> + <dia:rectangle val="16,0.615;18.5,6.475"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -203,7 +203,7 @@ <dia:point val="15,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1312,0.504406;15.8858,1.49559"/> + <dia:rectangle val="14.1312,0.53;15.8688,1.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -217,7 +217,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15,1.06397"/> + <dia:point val="15,1.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -298,65 +298,6 @@ </dia:object> <dia:object type="Standard - Box" version="0" id="O8"> <dia:attribute name="obj_pos"> - <dia:point val="4,3.5"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="3.95,3.45;6.05,4.55"/> - </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="4,3.5"/> - </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="2"/> - </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="1"/> - </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#e5e5e5"/> - </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> - </dia:attribute> - </dia:object> - <dia:object type="Standard - Text" version="1" id="O9"> - <dia:attribute name="obj_pos"> - <dia:point val="5,4"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="4.13125,3.50441;5.88581,4.49559"/> - </dia:attribute> - <dia:attribute name="text"> - <dia:composite type="text"> - <dia:attribute name="string"> - <dia:string>#wlan1#</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="5,4.06397"/> - </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="valign"> - <dia:enum val="2"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O8" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Box" version="0" id="O10"> - <dia:attribute name="obj_pos"> <dia:point val="14,3.5"/> </dia:attribute> <dia:attribute name="obj_bb"> @@ -378,12 +319,12 @@ <dia:boolean val="true"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O11"> + <dia:object type="Standard - Text" version="1" id="O9"> <dia:attribute name="obj_pos"> <dia:point val="15,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1312,3.50441;15.8858,4.49559"/> + <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> @@ -397,7 +338,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15,4.06397"/> + <dia:point val="15,4.0725"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -411,10 +352,10 @@ <dia:enum val="2"/> </dia:attribute> <dia:connections> - <dia:connection handle="0" to="O10" connection="8"/> + <dia:connection handle="0" to="O8" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O12"> + <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> <dia:point val="6,1"/> </dia:attribute> @@ -442,45 +383,51 @@ <dia:connection handle="1" to="O4" connection="3"/> </dia:connections> </dia:object> - <dia:object type="Standard - Line" version="0" id="O13"> + <dia:object type="Standard - Text" version="1" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="6.05011,4"/> + <dia:point val="1,6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.00011,3.5;13.9999,4.5"/> - </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="6.05011,4"/> - <dia:point val="13.9499,4"/> + <dia:rectangle val="1,5.6;1,6.8"/> </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> + <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="1,6"/> + </dia:attribute> + <dia:attribute name="color"> + <dia:color val="#000000"/> + </dia:attribute> + <dia:attribute name="alignment"> + <dia:enum val="0"/> + </dia:attribute> + </dia:composite> </dia:attribute> - <dia:attribute name="end_arrow"> + <dia:attribute name="valign"> <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O8" connection="8"/> - <dia:connection handle="1" to="O10" connection="8"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O14"> + <dia:object type="Standard - Text" version="1" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="1,6"/> + <dia:point val="6,-0.6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="0.98,5.58;1,6.84"/> + <dia:rectangle val="6,-1.15956;13.9796,0.631625"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>##</dia:string> + <dia:string>#originator = A/wlan0 +outgoing interface = wlan0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -489,7 +436,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="1,6"/> + <dia:point val="6,-0.6"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -503,17 +450,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O15"> + <dia:object type="Standard - Text" version="1" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="7,0"/> + <dia:point val="6,5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-0.559562;13.0521,0.431625"/> + <dia:rectangle val="6,4.44044;13.9796,6.23163"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#originator = A/wlan0#</dia:string> + <dia:string>#originator = A/wlan0 +outgoing interface = wlan1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -522,7 +470,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,0"/> + <dia:point val="6,5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -536,17 +484,71 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> + <dia:object type="Standard - BezierLine" version="0" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="5,1.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="4.94905,1.44905;14.0582,4.50076"/> + </dia:attribute> + <dia:attribute name="bez_points"> + <dia:point val="5,1.5"/> + <dia:point val="5.05,4.1"/> + <dia:point val="4.9,4.15"/> + <dia:point val="14,4"/> + </dia:attribute> + <dia:attribute name="corner_types"> + <dia:enum val="0"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> + </dia:attribute> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O6" connection="6"/> + <dia:connection handle="3" to="O8" connection="3"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Box" version="0" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="4,3.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="3.95,3.45;6.05,4.55"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="4,3.5"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="2"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#e5e5e5"/> + </dia:attribute> + <dia:attribute name="show_background"> + <dia:boolean val="true"/> + </dia:attribute> + </dia:object> <dia:object type="Standard - Text" version="1" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="6,5"/> + <dia:point val="5,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6,4.44044;12.0521,5.43163"/> + <dia:rectangle val="4.13125,3.53;5.86875,4.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#originator = A/wlan0#</dia:string> + <dia:string>#wlan1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -555,26 +557,29 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="6,5"/> + <dia:point val="5,4.0725"/> </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="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O15" connection="8"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> <dia:point val="12,4.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="11.9575,3.1025;13.1225,5.575"/> + <dia:rectangle val="12,3.145;13.1225,5.49"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text">

1 0

[doc] batman-adv-doc, master: update documents batman packet types (20b17541)
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 20b175410136361ae725c0eee2e8d124b22e7767 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Apr 12 19:14:59 2009 +0200 update documents batman packet types >--------------------------------------------------------------- 20b175410136361ae725c0eee2e8d124b22e7767 batman_adv.docbook | 69 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 52 insertions(+), 17 deletions(-) diff --git a/batman_adv.docbook b/batman_adv.docbook index 5c6d600e..f89ab2a9 100644 --- a/batman_adv.docbook +++ b/batman_adv.docbook @@ -122,22 +122,32 @@ <entry colname="colB">16-23</entry> <entry colname="col0">Flags</entry> <entry colname="col1">TTL</entry> - <entry namest="col2" nameend="col7">Originator MAC</entry> + <entry colname="col2">Gateway Info</entry> + <entry colname="col3">TQ</entry> + <entry namest="col4" nameend="col5">seqno</entry> + <entry namest="col6" nameend="col7">Originator MAC</entry> </row> <row> <entry colname="colB">24-31</entry> - <entry namest="col0" nameend="col1">Seqno</entry> - <entry colname="col2">Gateway Info</entry> - <entry namest="col3" nameend="col7">(Ethernet padding ...)</entry> + <entry namest="col0" nameend="col3">Originator MAC (cont.)</entry> + <entry namest="col4" nameend="col7">previous sender</entry> + </row> + <row> + <entry colname="colB">32-39</entry> + <entry namest="col0" nameend="col1">previous sender (cont.)</entry> + <entry colname="col2">#HNA entries</entry> + <entry colname="col3">padding</entry> + <entry namest="col4" nameend="col7">HNA entries ...</entry> </row> + </tbody> </tgroup> </table> <para> <itemizedlist> <listitem><para> Batman Type - value 0, this is an Originator packet.</para></listitem> - <listitem><para> Version - value 2, only this version is accepted.</para></listitem> + <listitem><para> Version - value 6, only this version is accepted.</para></listitem> <listitem><para> Flags - some Flags which are used in the algorithm: <itemizedlist> <listitem><para>0x80 - Unidirectional Link</para></listitem> @@ -145,9 +155,11 @@ </itemizedlist> </para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> - <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> - <listitem><para> Seqno - The Sequence Number, the Originator increases this number with each new packet. </para></listitem> <listitem><para> Gateway Info - reserved, classification of the gatway capabilities and quality (connection to the internet).</para></listitem> + <listitem><para> TQ - transmit quality, connection quality to the originator.</para></listitem> + <listitem><para> Seqno - The Sequence Number, the Originator increases this number with each new packet. </para></listitem> + <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> + <listitem><para> previous sender MAC - The MAC address of the node which sent the packet before. </para></listitem> </itemizedlist> </para> </sect2> @@ -187,12 +199,25 @@ <entry colname="colB">08-15</entry> <entry namest="col0" nameend="col5">(Ethernet header ..)</entry> <entry colname="col6">Batman Type</entry> - <entry colname="col7">message type</entry> + <entry colname="col7">Version</entry> </row> <row> - <entry colname="colB">16-21</entry> - <entry colname="col0">Code</entry> - <entry namest="col1" nameend="col7">(Ethernet padding ...)</entry> + <entry colname="colB">16-23</entry> + <entry colname="col0">Message Type</entry> + <entry namest="col1" nameend="col6">Destination MAC</entry> + <entry namest="col7" nameend="col7">Originator MAC</entry> + </row> + <row> + <entry colname="colB">24-31</entry> + <entry namest="col0" nameend="col4">Originator MAC (cont.)</entry> + <entry colname="col5">TTL</entry> + <entry colname="col6">UID</entry> + <entry namest="col7" nameend="col7">seqno</entry> + </row> + <row> + <entry colname="colB">32-39</entry> + <entry namest="col0" nameend="col0">seqno (cont.)</entry> + <entry namest="col1" nameend="col7">(Ethernet padding ..)</entry> </row> </tbody> @@ -201,14 +226,20 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 1, this is a message system packet.</para></listitem> + <listitem><para> Version - value 6, only this version is accepted.</para></listitem> <listitem><para> Message Type - same as in ICMP: <itemizedlist> <listitem><para>0 - Echo Reply</para></listitem> + <listitem><para>3 - Destination Unreachable</para></listitem> <listitem><para>8 - Echo Request</para></listitem> <listitem><para>11 - TTL Exceeded</para></listitem> </itemizedlist> </para></listitem> - <listitem><para> Code - distinction of some messages types. Only value 0 so far.</para></listitem> + <listitem><para> Destination MAC - MAC address of the node which should receive the request.</para></listitem> + <listitem><para> Originator MAC - MAC address of the sending node.</para></listitem> + <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> + <listitem><para> UID - unique number to identify the number of the requesting client. </para></listitem> + <listitem><para> seqno - Sequence Number of the request. </para></listitem> </itemizedlist> </para> </sect2> @@ -246,11 +277,13 @@ <entry colname="colB">08-15</entry> <entry namest="col0" nameend="col5">(Ethernet header ..)</entry> <entry colname="col6">Batman Type</entry> - <entry colname="col7">TTL</entry> + <entry colname="col7">Version</entry> </row> <row> <entry colname="colB">16-21</entry> - <entry namest="col0" nameend="col7">(Payload ...)</entry> + <entry namest="col0" nameend="col5">Destination MAC</entry> + <entry colname="col6">TTL</entry> + <entry namest="col7" nameend="col7">(Payload ...)</entry> </row> </tbody> @@ -259,8 +292,9 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> + <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Destination MAC - MAC address of the node which should receive the frame.</para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> - <listitem><para> Payload - The encapsulated Ethernet Frame, received from the virtual interface</para></listitem> </itemizedlist> </para> </sect2> @@ -299,7 +333,7 @@ <entry colname="colB">08-15</entry> <entry namest="col0" nameend="col5">(Ethernet header ..)</entry> <entry colname="col6">Batman Type</entry> - <entry colname="col7">(reserved)</entry> + <entry colname="col7">Version</entry> </row> <row> <entry colname="colB">16-21</entry> @@ -318,6 +352,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> + <listitem><para> Version - value 6, only this version is accepted.</para></listitem> <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> <listitem><para> Seqno - sequence number, the Originator increases this number with each new packet. </para></listitem> </itemizedlist> @@ -333,7 +368,7 @@ <sect1> <title>Usage</title> <para> - TODO Compilation, Installation of batman-adv-kernelland, batman-adv-userspace, battool + TODO Compilation, Installation of batman-adv-kernelland, battool TODO Usage batman-adv-userspace: debug output, command line options TODO Usage batman-adv-kernelland: insmod, proc files, log files, visualization

1 0

[doc] batman-adv-doc, master: apply another comment: green original originator, round arrows (30769e72)
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 30769e728880d62ae87050d5a7f3b25577c7272b Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sat Apr 11 21:44:03 2009 +0200 apply another comment: green original originator, round arrows >--------------------------------------------------------------- 30769e728880d62ae87050d5a7f3b25577c7272b images/multi_interface_2.dia | 213 ++++++++++++++++++++++--------------------- 1 file changed, 108 insertions(+), 105 deletions(-) diff --git a/images/multi_interface_2.dia b/images/multi_interface_2.dia index 26f64a28..71dbe064 100644 --- a/images/multi_interface_2.dia +++ b/images/multi_interface_2.dia @@ -251,7 +251,7 @@ <dia:real val="1"/> </dia:attribute> <dia:attribute name="inner_color"> - <dia:color val="#e5e5e5"/> + <dia:color val="#00ff00"/> </dia:attribute> <dia:attribute name="show_background"> <dia:boolean val="true"/> @@ -358,40 +358,45 @@ <dia:connection handle="0" to="O8" connection="8"/> </dia:connections> </dia:object> - <dia:object type="Standard - Box" version="0" id="O10"> + <dia:object type="Standard - Line" version="0" id="O10"> <dia:attribute name="obj_pos"> - <dia:point val="14,3.5"/> + <dia:point val="14,1"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="13.95,3.45;16.05,4.55"/> + <dia:rectangle val="5.95,0.5;14.05,1.5"/> </dia:attribute> - <dia:attribute name="elem_corner"> - <dia:point val="14,3.5"/> + <dia:attribute name="conn_endpoints"> + <dia:point val="14,1"/> + <dia:point val="6,1"/> </dia:attribute> - <dia:attribute name="elem_width"> - <dia:real val="2"/> + <dia:attribute name="numcp"> + <dia:int val="1"/> </dia:attribute> - <dia:attribute name="elem_height"> - <dia:real val="1"/> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="inner_color"> - <dia:color val="#e5e5e5"/> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> </dia:attribute> - <dia:attribute name="show_background"> - <dia:boolean val="true"/> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O4" connection="3"/> + <dia:connection handle="1" to="O6" connection="4"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O11"> <dia:attribute name="obj_pos"> - <dia:point val="15,4"/> + <dia:point val="1,6"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> + <dia:rectangle val="1,5.6;1,6.8"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#wlan2#</dia:string> + <dia:string>##</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -400,90 +405,32 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="15,4.0725"/> + <dia:point val="1,6"/> </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> <dia:attribute name="valign"> - <dia:enum val="2"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O10" connection="8"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Line" version="0" id="O12"> - <dia:attribute name="obj_pos"> - <dia:point val="14,1"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="5.95,0.5;14.05,1.5"/> - </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="14,1"/> - <dia:point val="6,1"/> - </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> - </dia:attribute> - <dia:attribute name="end_arrow"> <dia:enum val="3"/> </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O4" connection="3"/> - <dia:connection handle="1" to="O6" connection="4"/> - </dia:connections> - </dia:object> - <dia:object type="Standard - Line" version="0" id="O13"> - <dia:attribute name="obj_pos"> - <dia:point val="14,4"/> - </dia:attribute> - <dia:attribute name="obj_bb"> - <dia:rectangle val="5.95,3.5;14.05,4.5"/> - </dia:attribute> - <dia:attribute name="conn_endpoints"> - <dia:point val="14,4"/> - <dia:point val="6,4"/> - </dia:attribute> - <dia:attribute name="numcp"> - <dia:int val="1"/> - </dia:attribute> - <dia:attribute name="end_arrow"> - <dia:enum val="3"/> - </dia:attribute> - <dia:attribute name="end_arrow_length"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:attribute name="end_arrow_width"> - <dia:real val="0.5"/> - </dia:attribute> - <dia:connections> - <dia:connection handle="0" to="O10" connection="3"/> - <dia:connection handle="1" to="O8" connection="4"/> - </dia:connections> </dia:object> - <dia:object type="Standard - Text" version="1" id="O14"> + <dia:object type="Standard - Text" version="1" id="O12"> <dia:attribute name="obj_pos"> - <dia:point val="1,6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="1,5.6;1,6.8"/> + <dia:rectangle val="7,4.9575;13.22,6.6975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>##</dia:string> + <dia:string>#originator = A/wlan0, +direct link = 0#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -492,7 +439,7 @@ <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="1,6"/> + <dia:point val="7,5.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -506,18 +453,18 @@ <dia:enum val="3"/> </dia:attribute> </dia:object> - <dia:object type="Standard - Text" version="1" id="O15"> + <dia:object type="Standard - Text" version="1" id="O13"> <dia:attribute name="obj_pos"> - <dia:point val="7,5.5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,4.94044;13.2371,6.73163"/> + <dia:rectangle val="7,-1.0425;13.22,0.6975"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> <dia:string>#originator = A/wlan0, -direct link = 0#</dia:string> +direct link = 1#</dia:string> </dia:attribute> <dia:attribute name="font"> <dia:font family="sans" style="0" name="Helvetica"/> @@ -526,7 +473,7 @@ direct link = 0#</dia:string> <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,5.5"/> + <dia:point val="7,-0.5"/> </dia:attribute> <dia:attribute name="color"> <dia:color val="#000000"/> @@ -540,63 +487,119 @@ direct link = 0#</dia:string> <dia:enum val="3"/> </dia:attribute> </dia:object> + <dia:object type="Standard - BezierLine" version="0" id="O14"> + <dia:attribute name="obj_pos"> + <dia:point val="15,1"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="5.99505,1.48711;14.8958,4.5"/> + </dia:attribute> + <dia:attribute name="bez_points"> + <dia:point val="15,1"/> + <dia:point val="14.0746,4.05375"/> + <dia:point val="14.8,4"/> + <dia:point val="5,4"/> + </dia:attribute> + <dia:attribute name="corner_types"> + <dia:enum val="0"/> + <dia:enum val="0"/> + </dia:attribute> + <dia:attribute name="end_arrow"> + <dia:enum val="3"/> + </dia:attribute> + <dia:attribute name="end_arrow_length"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:attribute name="end_arrow_width"> + <dia:real val="0.5"/> + </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O4" connection="8"/> + <dia:connection handle="3" to="O8" connection="8"/> + </dia:connections> + </dia:object> + <dia:object type="Standard - Box" version="0" id="O15"> + <dia:attribute name="obj_pos"> + <dia:point val="14,3.5"/> + </dia:attribute> + <dia:attribute name="obj_bb"> + <dia:rectangle val="13.95,3.45;16.05,4.55"/> + </dia:attribute> + <dia:attribute name="elem_corner"> + <dia:point val="14,3.5"/> + </dia:attribute> + <dia:attribute name="elem_width"> + <dia:real val="2"/> + </dia:attribute> + <dia:attribute name="elem_height"> + <dia:real val="1"/> + </dia:attribute> + <dia:attribute name="inner_color"> + <dia:color val="#e5e5e5"/> + </dia:attribute> + <dia:attribute name="show_background"> + <dia:boolean val="true"/> + </dia:attribute> + </dia:object> <dia:object type="Standard - Text" version="1" id="O16"> <dia:attribute name="obj_pos"> - <dia:point val="7,4.5"/> + <dia:point val="15,4"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="6.9575,3.1025;8.1225,5.575"/> + <dia:rectangle val="14.1312,3.53;15.8688,4.47"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#X#</dia:string> + <dia:string>#wlan2#</dia:string> </dia:attribute> <dia:attribute name="font"> - <dia:font family="sans" style="80" name="Helvetica-Bold"/> + <dia:font family="sans" style="0" name="Helvetica"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="2"/> + <dia:real val="0.80000000000000004"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,4.5"/> + <dia:point val="15,4.0725"/> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#ff0000"/> + <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="2"/> </dia:attribute> + <dia:connections> + <dia:connection handle="0" to="O15" connection="8"/> + </dia:connections> </dia:object> <dia:object type="Standard - Text" version="1" id="O17"> <dia:attribute name="obj_pos"> - <dia:point val="7,-0.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="obj_bb"> - <dia:rectangle val="7,-1.05956;13.2371,0.731625"/> + <dia:rectangle val="7,3.145;8.1225,5.49"/> </dia:attribute> <dia:attribute name="text"> <dia:composite type="text"> <dia:attribute name="string"> - <dia:string>#originator = A/wlan0, -direct link = 1#</dia:string> + <dia:string>#X#</dia:string> </dia:attribute> <dia:attribute name="font"> - <dia:font family="sans" style="0" name="Helvetica"/> + <dia:font family="sans" style="80" name="Helvetica-Bold"/> </dia:attribute> <dia:attribute name="height"> - <dia:real val="0.80000000000000004"/> + <dia:real val="2"/> </dia:attribute> <dia:attribute name="pos"> - <dia:point val="7,-0.5"/> + <dia:point val="7,4.5"/> </dia:attribute> <dia:attribute name="color"> - <dia:color val="#000000"/> + <dia:color val="#ff0000"/> </dia:attribute> <dia:attribute name="alignment"> <dia:enum val="0"/>

1 0

[doc] batman-adv-doc, master: update packets according to compatibility verison 7 (2ff03c1f)
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 2ff03c1f0ad994c38f1b1838474698b6138b93ef Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun May 10 18:03:34 2009 +0200 update packets according to compatibility verison 7 >--------------------------------------------------------------- 2ff03c1f0ad994c38f1b1838474698b6138b93ef batman_adv.docbook | 53 ++++++++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/batman_adv.docbook b/batman_adv.docbook index f89ab2a9..8548f19f 100644 --- a/batman_adv.docbook +++ b/batman_adv.docbook @@ -71,7 +71,7 @@ <listitem><para> Destination MAC - The MAC of the neighbour or broadcast</para></listitem> <listitem><para> Source MAC - The MAC of the Network Interface the packet is sent out</para></listitem> <listitem><para> Ethernet Type - The Batman Ethertype (0x0842)</para></listitem> - <listitem><para> Batman Type - The different messages (unicast, broadcast, originator, message system) are distinguished in this field, as described in the next secionts</para></listitem> + <listitem><para> Batman Type - The different messages (unicast, broadcast, originator, message system, visualization) are distinguished in this field, as described in the next sections</para></listitem> </itemizedlist> The Destination MAC is set according to the embedded Ethernet Frame (if there is any), so inner Broadcasts are also @@ -121,23 +121,20 @@ <row> <entry colname="colB">16-23</entry> <entry colname="col0">Flags</entry> - <entry colname="col1">TTL</entry> - <entry colname="col2">Gateway Info</entry> - <entry colname="col3">TQ</entry> - <entry namest="col4" nameend="col5">seqno</entry> - <entry namest="col6" nameend="col7">Originator MAC</entry> + <entry colname="col1">TQ</entry> + <entry namest="col2" nameend="col3">Seqno</entry> + <entry namest="col4" nameend="col7">Originator MAC</entry> </row> <row> <entry colname="colB">24-31</entry> - <entry namest="col0" nameend="col3">Originator MAC (cont.)</entry> - <entry namest="col4" nameend="col7">previous sender</entry> + <entry namest="col0" nameend="col1">Originator MAC (cont.)</entry> + <entry namest="col2" nameend="col7">Previous Sender MAC</entry> </row> <row> <entry colname="colB">32-39</entry> - <entry namest="col0" nameend="col1">previous sender (cont.)</entry> - <entry colname="col2">#HNA entries</entry> - <entry colname="col3">padding</entry> - <entry namest="col4" nameend="col7">HNA entries ...</entry> + <entry colname="col0">TTL</entry> + <entry colname="col1">#HNA entries</entry> + <entry namest="col2" nameend="col7">HNA entries ...</entry> </row> @@ -147,7 +144,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 0, this is an Originator packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Flags - some Flags which are used in the algorithm: <itemizedlist> <listitem><para>0x80 - Unidirectional Link</para></listitem> @@ -155,11 +152,10 @@ </itemizedlist> </para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> - <listitem><para> Gateway Info - reserved, classification of the gatway capabilities and quality (connection to the internet).</para></listitem> <listitem><para> TQ - transmit quality, connection quality to the originator.</para></listitem> <listitem><para> Seqno - The Sequence Number, the Originator increases this number with each new packet. </para></listitem> <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> - <listitem><para> previous sender MAC - The MAC address of the node which sent the packet before. </para></listitem> + <listitem><para> Previous Sender MAC - The MAC address of the node which sent the packet before. </para></listitem> </itemizedlist> </para> </sect2> @@ -204,19 +200,17 @@ <row> <entry colname="colB">16-23</entry> <entry colname="col0">Message Type</entry> - <entry namest="col1" nameend="col6">Destination MAC</entry> - <entry namest="col7" nameend="col7">Originator MAC</entry> + <entry colname="col1">TTL</entry> + <entry namest="col2" nameend="col7">Destination MAC</entry> </row> <row> <entry colname="colB">24-31</entry> - <entry namest="col0" nameend="col4">Originator MAC (cont.)</entry> - <entry colname="col5">TTL</entry> - <entry colname="col6">UID</entry> - <entry namest="col7" nameend="col7">seqno</entry> + <entry namest="col0" nameend="col5">Originator MAC</entry> + <entry namest="col6" nameend="col7">Seqno</entry> </row> <row> <entry colname="colB">32-39</entry> - <entry namest="col0" nameend="col0">seqno (cont.)</entry> + <entry colname="col0">UID</entry> <entry namest="col1" nameend="col7">(Ethernet padding ..)</entry> </row> @@ -226,7 +220,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 1, this is a message system packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Message Type - same as in ICMP: <itemizedlist> <listitem><para>0 - Echo Reply</para></listitem> @@ -239,7 +233,7 @@ <listitem><para> Originator MAC - MAC address of the sending node.</para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> <listitem><para> UID - unique number to identify the number of the requesting client. </para></listitem> - <listitem><para> seqno - Sequence Number of the request. </para></listitem> + <listitem><para> Seqno - Sequence Number of the request. </para></listitem> </itemizedlist> </para> </sect2> @@ -292,7 +286,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Destination MAC - MAC address of the node which should receive the frame.</para></listitem> <listitem><para> TTL - Time to Live, decremented on each Hop. If 0, the packet is dropped. </para></listitem> </itemizedlist> @@ -352,7 +346,7 @@ <para> <itemizedlist> <listitem><para> Batman Type - value 2, this is a unicast packet.</para></listitem> - <listitem><para> Version - value 6, only this version is accepted.</para></listitem> + <listitem><para> Version - value 7, only this version is accepted.</para></listitem> <listitem><para> Originator MAC - The MAC address of the node which originally released the packet. </para></listitem> <listitem><para> Seqno - sequence number, the Originator increases this number with each new packet. </para></listitem> </itemizedlist> @@ -361,7 +355,12 @@ </para> </sect2> - +<sect2 id="Batman_adv_packet_types_5"> + <title>Batman Type 5 - Visualization</title> + <para> + TODO + </para> +</sect2> </sect1>

1 0

[doc] batman-adv-doc, master: batman-adv-doc: Fix external links (94166086)
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 94166086c7e29a95e2db03c5b57b8665f16d61cb Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Dec 6 16:28:25 2015 +0100 batman-adv-doc: Fix external links Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 94166086c7e29a95e2db03c5b57b8665f16d61cb README | 20 ++++++++++---------- batmand.docbook | 4 ++-- copyright.docbook | 2 +- references.docbook | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/README b/README index 8f4ff7dc..59ebe63e 100644 --- a/README +++ b/README @@ -1,18 +1,18 @@ Requirements ============ - * GNU make - http://www.gnu.org/software/make/ + * GNU make - https://www.gnu.org/software/make/ * xmlto - https://fedorahosted.org/xmlto/ - * docbook-xml (>= 4.5) - http://www.oasis-open.org/docbook/xml/ - * docbook-xsl - http://wiki.docbook.org/topic/DocBookXslStylesheets - * fop - http://xmlgraphics.apache.org/fop/ + * docbook-xml (>= 4.5) - https://www.oasis-open.org/docbook/xml/ + * docbook-xsl - http://wiki.docbook.org/DocBookXslStylesheets + * fop - https://xmlgraphics.apache.org/fop/ * ghostscript - http://www.ghostscript.com/ - * coreutils - http://www.gnu.org/software/coreutils/ + * coreutils - https://www.gnu.org/software/coreutils/coreutils.html * gnuplot - http://gnuplot.sourceforge.net/ - * dia - http://live.gnome.org/Dia - * texlive-latex-base - http://www.tug.org/texlive/ - * texlive-base - http://www.tug.org/texlive/ - * ps2eps - http://www.tm.uka.de/~bless/ps2eps + * dia - https://wiki.gnome.org/action/show/Apps/Dia + * texlive-latex-base - https://www.tug.org/texlive/ + * texlive-base - https://www.tug.org/texlive/ + * ps2eps - https://www.tm.uka.de/~bless/ps2eps * imagemagick - http://www.imagemagick.org/ @@ -31,4 +31,4 @@ Troubleshooting * "libjli.so: cannot open shared object file: No such file or directory" Make sure that /proc is mounted and `/bin/ls -l /proc/self/exe` prints [...] /proc/self/exe -> /bin/ls - See http://bugs.debian.org/435293 for more informations + See https://bugs.debian.org/435293 for more informations diff --git a/batmand.docbook b/batmand.docbook index 9f6c68b1..350e9ed1 100644 --- a/batmand.docbook +++ b/batmand.docbook @@ -18,7 +18,7 @@ <listitem><para>libpthread</para></listitem> </orderedlist></listitem> <listitem><para>Download the B.A.T.M.A.N. daemon code from the website - <ulink url="http://www.open-mesh.net/wiki/Download" /></para></listitem> + <ulink url="https://www.open-mesh.org/projects/open-mesh/wiki/Download" /></para></listitem> </itemizedlist> </section> <section> @@ -26,7 +26,7 @@ <para>All you have to do is untar and make, then you will see the executable file called <emphasis>batmand</emphasis>.</para> <programlisting><userinput>$ wget \ -http://downloads.open-mesh.net/batman/stable/sources/batman/batman-0.3.tar.gz +https://downloads.open-mesh.org/batman/stable/sources/batman/batman-0.3.tar.gz $ tar xzvf batman-0.3.tar.gz $ cd batman-0.3 $ make</userinput></programlisting> diff --git a/copyright.docbook b/copyright.docbook index 4ec2dffb..1cf1d6a2 100644 --- a/copyright.docbook +++ b/copyright.docbook @@ -5,6 +5,6 @@ you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License. To view a copy of this - license, visit <ulink url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin + license, visit <ulink url="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html" /> or write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.</para> </chapter> diff --git a/references.docbook b/references.docbook index 0cd65d3b..0cce1d4f 100644 --- a/references.docbook +++ b/references.docbook @@ -2,7 +2,7 @@ <section> <title>Reference Links</title> <itemizedlist> - <listitem><ulink url="http://www.open-mesh.net/" /></listitem> + <listitem><ulink url="https://www.open-mesh.org/" /></listitem> <listitem><ulink url="http://www.olsr.org/" /></listitem> </itemizedlist> </section>

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2017