commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Routing_scenarios (5ccebe2e)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 5ccebe2e1a98214e5709814e2ed730c9dc42ffc8 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jan 22 12:14:56 2011 +0000 doc: open-mesh/Routing_scenarios >--------------------------------------------------------------- 5ccebe2e1a98214e5709814e2ed730c9dc42ffc8 open-mesh/Routing_scenarios.textile | 54 +++++++++++-------------------------- 1 file changed, 15 insertions(+), 39 deletions(-) diff --git a/open-mesh/Routing_scenarios.textile b/open-mesh/Routing_scenarios.textile index 3398d746..e6bd3c55 100644 --- a/open-mesh/Routing_scenarios.textile +++ b/open-mesh/Routing_scenarios.textile @@ -1,79 +1,55 @@ += Routing scenarios = -h1. Routing scenarios - - -<pre> -<code class="div"> +{{{ +#!div style="width: 46em; text-align: justify" This page contains a collection of routing scenarios which all routing protocol changes have to go through to estimate its impact. +=== Best route === -h3. Best route - - - -h4. Asymmetric link - +==== Asymmetric link ==== The nodes A, B and C are connected via asymmetric links - every node has a good transmit connection to one neighbor and a good receiving connection from the other. The protocol has to detect that the best neighbor towards any destination is the one it rarely gets routing information from. [[Image(wiki:routing_scenarios:asym_link.png, 70%25)]] - -h4. Asymmetric path - +==== Asymmetric path ==== Node A and B are connected via multiple paths with different characteristics: a short asymmetric path and a long path without packet loss. The protocol should choose the long path for traffic traveling from A to B and the short path in the opposite direction. [[Image(wiki:routing_scenarios:asym_path.png, 100%25)]] - -h3. Convergence speed - +=== Convergence speed === A and B have 2 possible paths to communicate with each other. One of the nodes that is part of the currently used path dies or one of the links breaks down and the protocol needs to detect the unavailability of the path to switch as fast as possible to the other one. - -h4. The triangle - +==== The triangle ==== [[Image(wiki:routing_scenarios:triangle.png, 70%25)]] - -h4. The circle - +==== The circle ==== [[Image(wiki:routing_scenarios:circle.png, 100%25)]] - -h4. The bottle - +==== The bottle ==== [[Image(wiki:routing_scenarios:bottle.png, 100%25)]] - -h3. Mobility - +=== Mobility === While A is moving through the mesh the route between A and B shall recover as fast as possible. - -h4. New neighbor - +==== New neighbor ==== [[Image(wiki:routing_scenarios:new_neigh.png, 100%25)]] - -h4. New distant neighbor - +==== New distant neighbor ==== [[Image(wiki:routing_scenarios:new_dist_neigh.png, 100%25)]] - -h4. Mobile Node - +==== Mobile Node ==== [[Image(wiki:routing_scenarios:mob_node.png, 100%25)]] -</code></pre> +}}}

1 0

[doc] backup-redmine/2017-07-13, master: doc: attachments/triangle.png (d57afbab)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit d57afbab7223c24bbcd648404fef51abfd4565d4 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jan 22 12:14:04 2011 +0000 doc: attachments/triangle.png >--------------------------------------------------------------- d57afbab7223c24bbcd648404fef51abfd4565d4 attachments/triangle.png | Bin 0 -> 22657 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/attachments/triangle.png b/attachments/triangle.png new file mode 100644 index 00000000..8acdc6ca Binary files /dev/null and b/attachments/triangle.png differ

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux: Update example to be a little more davem centric (ab7e520b)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit ab7e520b685d80980898764f6338774ae4e2a4df Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 22 22:41:38 2011 +0000 doc: batman-adv/SubmittingLinux: Update example to be a little more davem centric >--------------------------------------------------------------- ab7e520b685d80980898764f6338774ae4e2a4df batman-adv/SubmittingLinux.textile | 113 +++++++++++++++++-------------------- 1 file changed, 52 insertions(+), 61 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index be91d2bb..fbc01b7a 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -1,6 +1,6 @@ = Submitting Patches to Linux = -We currently submit patches for Linux from our next branch. I try to give a short overview about it using some patches submitted to GregKH. +We currently submit patches for Linux from our next branch. I try to give a short overview about it using some patches submitted to DaveM. Following steps must always be done: * get the linux-integration repository (we assume that the linux branch is up to date) @@ -8,8 +8,7 @@ Following steps must always be done: * merge next into linux * check for compat code * check difference with next - * tag the current commit - * rebase on top of previous tag + * rebase on top of previous version * squash/cleanup patches * check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) * format patches @@ -19,7 +18,6 @@ Following steps must always be done: * create working branch on linux-next * apply all patches on linux next * check if all patches build again with linux next - * format patches on top of linux-next master * check if all patches are checkpatch.pl clean * submit patches @@ -38,7 +36,7 @@ remote: Compressing objects: 100%25 (252781/252781), done. == get the newest patches from next == {{{ -'-(%25)-(linux)> git remote update +'-(%25)-(merge/master)> git remote update Fetching origin remote: Counting objects: 1387, done. remote: Compressing objects: 100%25 (211/211), done. @@ -53,10 +51,10 @@ From git+ssh://open-mesh.org/srv/git/ecsv/linux-merge == merge next into linux == {{{ -'-(%25)-(xyz)> git checkout linux +'-(%25)-(xyz)> git checkout merge/master Checking out files: 100%25 (32337/32337), done. Switched to branch 'linux' -'-(%25)-(linux)> git merge -s subtree origin/next +'-(%25)-(merge/master)> git merge -s subtree origin/standalone/next Auto-merging net/batman-adv/Makefile CONFLICT (content): Merge conflict in net/batman-adv/Makefile CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in HEAD and modified in next. Version next of net/batman-adv/Makefile.kbuild left in tree. @@ -69,16 +67,16 @@ Auto-merging net/batman-adv/soft-interface.c Auto-merging net/batman-adv/translation-table.c Auto-merging net/batman-adv/vis.c Automatic merge failed; fix conflicts and then commit the result. -'-(%25)-(linux)> git rm net/batman-adv/Makefile.kbuild net/batman-adv/compat.h +'-(%25)-(merge/master)> git rm net/batman-adv/Makefile.kbuild net/batman-adv/compat.h net/batman-adv/Makefile: needs merge net/batman-adv/Makefile.kbuild: needs merge net/batman-adv/compat.h: needs merge rm 'net/batman-adv/Makefile.kbuild' rm 'net/batman-adv/compat.h' -'-(%25)-(linux)> vim net/batman-adv/Makefile -'-(%25)-(linux)> git add net/batman-adv/Makefile -'-(%25)-(linux)> git commit -[linux f2204f0] Merge remote branch 'origin/next' into linux +'-(%25)-(merge/master)> vim net/batman-adv/Makefile +'-(%25)-(merge/master)> git add net/batman-adv/Makefile +'-(%25)-(merge/master)> git commit +[linux f2204f0] Merge remote branch 'origin/standalone/next' into merge/master }}} == check for compat code == @@ -91,39 +89,21 @@ net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been m == check difference with next == {{{ -git diff origin/next: linux:net/batman-adv/ +git diff origin/standalone/next: merge/master:net/batman-adv/ }}} Here you should see the - * new added Kconfig, TODO, sysfs-class-net-batman-adv and sysfs-class-net-mesh + * new added Kconfig * A special Makefile which only contains obj-m and a batman-adv-objs line - * removed CHANGELOG, Makefile.kbuild, bat_printk.c and compat.h - * removed references to compat.h from each file - * README file with removed parts about how it can be compiled outside of the kernel, against which version it compiles and information how you compile the module outside of the kernel with debugging support + * removed CHANGELOG, Makefile.kbuild, bat_printk.c, README, sysfs-class-net-batman-adv, sysfs-class-net-mesh and compat.h + * removed references to compat.h from main.h -== tag the current commit == - -{{{ -'-(%25)-(linux)> git describe --tags --match "Greg*" -GregKH-20100618-10-gf2204f0 -'-(%25)-(linux)> git tag GregKH-20100625 -'-(%25)-(linux)> git push origin GregKH-20100625 -Counting objects: 24, done. -Delta compression using up to 2 threads. -Compressing objects: 100%25 (12/12), done. -Writing objects: 100%25 (12/12), 1.75 KiB, done. -Total 12 (delta 11), reused 0 (delta 0) -Generating commit mails...done -fatal: Not a valid object name master:net/batman-adv/TODO -To git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git - * [new tag] GregKH-20100625 -> GregKH-20100625 -}}} == rebase on top of previous tag == {{{ -'-(%25)-(linux)> git checkout -b patches -'-(%25)-(patches)> git rebase -s subtree GregKH-20100618 +'-(%25)-(merge/master)> git checkout -b patches +'-(%25)-(patches)> git rebase -s subtree origin/merge/master First, rewinding head to replay your work on top of it... Auto-merging net/batman-adv/main.c Auto-merging net/batman-adv/routing.c @@ -197,7 +177,7 @@ rm 'net/batman-adv/Makefile.kbuild' '-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git rebase -s subtree --continue Already applied: 0009 batman-adv: Add support for git revision string All done. -'-(%25)-(patches)> git diff linux +'-(%25)-(patches)> git diff origin/merge/master }}} The last diff must be empty or we did something wrong. @@ -205,14 +185,14 @@ The last diff must be empty or we did something wrong. == squash/cleanup patches == {{{ -'-(%25)-(patches)> git rebase -i GregKH-20100618 +'-(%25)-(patches)> git rebase -i origin/merge/master Successfully rebased and updated refs/heads/patches }}} == check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) == {{{ -'-(%25)-(patches)> git rev-list --reverse GregKH-20100618.. +'-(%25)-(patches)> git rev-list --reverse origin/merge/master.. 166b2caa61fce5260aed4e119671764331fdc62a 5cd65234b12021fe1f28e28e455a6b6a06712ec2 83d1bc8bb328bcfa42be492fe0e2648b77c18af2 @@ -259,7 +239,7 @@ Switched to branch 'patches' == format patches == {{{ -'-(%25)-(patches)> git format-patch --patience -s -M GregKH-20100618 +'-(%25)-(patches)> git format-patch --patience -s -M origin/merge/master 0001-batman-adv-Convert-names-from-Java-to-C-style.patch 0002-batman-adv-Avoid-rounding-issues-for-local-hna-timeo.patch 0003-batman-adv-Lower-resolution-for-timeouts.patch @@ -279,9 +259,9 @@ Usually I add "batman-adv: " right when checking the signed-off-by and author (f '-(%25)-(master)> git remote update '-(%25)-(master)> git reset --hard origin/master HEAD is now at c3116ae Add linux-next specific files for 20100625 -'-(%25)-(master)> git checkout -b greg -Switched to a new branch 'greg' -'-(%25)-(greg)> git am -3 ../linux-merge/00*.patch +'-(%25)-(master)> git checkout -b davem +Switched to a new branch 'davem' +'-(%25)-(davem)> git am -3 ../linux-merge/00*.patch Applying: batman-adv: Convert names from Java to C style Applying: batman-adv: Avoid rounding issues for local hna timeout Applying: batman-adv: Lower resolution for timeouts @@ -336,33 +316,47 @@ total: 0 errors, 0 warnings, 0 checks, 239 lines checked == submit patches == {{{ -'-(%25)-(greg)> git shortlog master.. > shortlog -'-(%25)-(greg)> git diff --stat master.. >> shortlog -'-(%25)-(greg)> git send-email --cc=b.a.t.m.a.n(a)lists.open-mesh.org --to greg(a)kroah.com --compose 00*.patch +'-(%25)-(greg)> ../linux-merge/ +'-(%25)-(patches)> git checkout batman-adv/next +'-(%25)-(batman-adv/next)> git diff merge/master -- net/batman-adv/ +'-(%25)-(batman-adv/next)> git rev-parse batman-adv/next +12513b76a021e5b41a9d5d5981da75dfd6480890 +'-(%25)-(batman-adv/next)> git push +'-(%25)-(batman-adv/next)> git am -3 00*.patch +Applying: batman-adv: Convert names from Java to C style +Applying: batman-adv: Avoid rounding issues for local hna timeout +Applying: batman-adv: Lower resolution for timeouts +Applying: batman-adv: replace manual calculation by msecs_to_jiffies() for better readability +Applying: batman-adv: Add sysfs abi documentation about bonding +Applying: batman-adv: adapting source version to revised versioning scheme +Applying: batman-adv: Add include guards to all header files +'-(%25)-(batman-adv/next)> git request-pull 12513b76a021e5b41a9d5d5981da75dfd6480890 git://git.open-mesh.org/ecsv/linux-merge.git > shortlog +'-(%25)-(batman-adv/next)> git send-email --compose --to=davem(a)davemloft.net --cc=netdev(a)vger.kernel.org --cc=b.a.t.m.a.n(a)lists.open-mesh.org 00*.patch }}} Now I will write something like {{{ -From Sven Eckelmann <sven.eckelmann(a)gmx.de> # This line is ignored. +From Sven Eckelmann <sven(a)narfation.org> # This line is ignored. GIT: Lines beginning in "GIT:" will be removed. GIT: Consider including an overall diffstat or table of contents GIT: for the patch you are writing. GIT: GIT: Clear the body content if you don't wish to send a summary. -From: Sven Eckelmann <sven.eckelmann(a)gmx.de> -Subject: batman-adv for 2.6.36 (3) +From: Sven Eckelmann <sven(a)narfation.org> +Subject: pull request: batman-adv 2010-06-26 In-Reply-To: Hi, -here are patches targeted for 2.6.36. All patches needed for that patchset are -already part of your net-next tree. +I would like tp propose following corrections for net-next-2.6. -All patches are cleanup patches and no new feature is added. +The following changes since commit 12513b76a021e5b41a9d5d5981da75dfd6480890: -thanks, - Sven + Staging: dt3155: remove unused 32-bit and 8-bit global registers (2010-06-25 11:18:34 -0700) + +are available in the git repository at: + git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next Antonio Quartulli (1): batman-adv: Convert names from Java to C style @@ -370,11 +364,10 @@ Antonio Quartulli (1): Linus Lüssing (1): batman-adv: Avoid rounding issues for local hna timeout -Marek Lindner (4): +Marek Lindner (3): batman-adv: replace manual calculation by msecs_to_jiffies() for better readability - batman-adv: Add sysfs abi documentation about bonding batman-adv: adapting source version to revised versioning scheme - batman-adv: fix early debugfs deinitialization + batman-adv: Add sysfs abi documentation about bonding Simon Wunderlich (1): batman-adv: Lower resolution for timeouts @@ -389,7 +382,7 @@ Sven Eckelmann (1): net/batman-adv/hard-interface.h | 5 +++++ net/batman-adv/hash.h | 8 +++++--- net/batman-adv/icmp_socket.h | 5 +++++ - net/batman-adv/main.c | 4 ++-- + net/batman-adv/main.c | 2 +- net/batman-adv/main.h | 13 +++++++++---- net/batman-adv/originator.c | 6 ++---- net/batman-adv/originator.h | 5 +++++ @@ -407,7 +400,5 @@ Sven Eckelmann (1): net/batman-adv/types.h | 6 +++--- net/batman-adv/vis.c | 14 +++++++------- net/batman-adv/vis.h | 7 ++++++- - 25 files changed, 117 insertions(+), 46 deletions(-) - - + 25 files changed, 116 insertions(+), 45 deletions(-) }}} \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux (b26cb1a3)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit b26cb1a3c1982f453067655c9dc224d394485e64 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jan 22 22:44:27 2011 +0000 doc: batman-adv/SubmittingLinux >--------------------------------------------------------------- b26cb1a3c1982f453067655c9dc224d394485e64 batman-adv/SubmittingLinux.textile | 176 +++++++++++++++++++++---------------- 1 file changed, 102 insertions(+), 74 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index d3862dc8..0ed4024f 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -1,41 +1,47 @@ -= Submitting Patches to Linux = + +h1. Submitting Patches to Linux + We currently submit patches for Linux from our next branch. I try to give a short overview about it using some patches submitted to DaveM. Following steps must always be done: - * get the linux-integration repository (we assume that the linux branch is up to date) - * get the newest patches from next - * merge next into linux - * check for compat code - * check difference with next - * rebase on top of previous version - * squash/cleanup patches - * check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) - * format patches - * check commit messages author/signed-off-by of patches - * Add "batman-adv: " before each commit subject - * get current version of linux-next - * create working branch on linux-next - * apply all patches on linux next - * check if all patches build again with linux next - * check if all patches are checkpatch.pl clean - * submit patches - - -== get the linux-integration repository == - -{{{ +* get the linux-integration repository (we assume that the linux branch is up to date) +* get the newest patches from next +* merge next into linux +* check for compat code +* check difference with next +* rebase on top of previous version +* squash/cleanup patches +* check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) +* format patches +* check commit messages author/signed-off-by of patches +* Add "batman-adv: " before each commit subject +* get current version of linux-next +* create working branch on linux-next +* apply all patches on linux next +* check if all patches build again with linux next +* check if all patches are checkpatch.pl clean +* submit patches + + + +h2. get the linux-integration repository + + +<pre> '-(%25)-> git clone git+ssh://git@open-mesh.org/srv/git/ecsv/linux-merge.git Initialized empty Git repository in /home/sven/tmp/linux-merge/.git/ remote: Counting objects: 1544059, done. remote: Compressing objects: 100%25 (252781/252781), done. .... '-(%25)-> cd linux-merge -}}} +</pre> + + +h2. get the newest patches from next -== get the newest patches from next == -{{{ +<pre> '-(%25)-(merge/master)> git remote update Fetching origin remote: Counting objects: 1387, done. @@ -46,11 +52,13 @@ Resolving deltas: 100%25 (651/651), completed with 228 local objects. From git+ssh://open-mesh.org/srv/git/ecsv/linux-merge bfa88ea..151b6a5 master -> origin/master c9f7cbe..078eb6a next -> origin/next -}}} +</pre> -== merge next into linux == -{{{ +h2. merge next into linux + + +<pre> '-(%25)-(xyz)> git checkout merge/master Checking out files: 100%25 (32337/32337), done. Switched to branch 'linux' @@ -77,31 +85,37 @@ rm 'net/batman-adv/compat.h' '-(%25)-(merge/master)> git add net/batman-adv/Makefile '-(%25)-(merge/master)> git commit [linux f2204f0] Merge remote branch 'origin/standalone/next' into merge/master -}}} +</pre> + -== check for compat code == +h2. check for compat code -{{{ + +<pre> git grep compat.h net/batman-adv/ net/batman-adv/CHANGELOG:* all kernel version compatibility functions has been moved to compat.h -}}} +</pre> + + +h2. check difference with next -== check difference with next == -{{{ +<pre> git diff origin/standalone/next: merge/master:net/batman-adv/ -}}} +</pre> Here you should see the - * new added Kconfig - * A special Makefile which only contains obj-m and a batman-adv-objs line - * removed CHANGELOG, Makefile.kbuild, bat_printk.c, README, sysfs-class-net-batman-adv, sysfs-class-net-mesh and compat.h - * removed references to compat.h from main.h +* new added Kconfig +* A special Makefile which only contains obj-m and a batman-adv-objs line +* removed CHANGELOG, Makefile.kbuild, bat_printk.c, README, sysfs-class-net-batman-adv, sysfs-class-net-mesh and compat.h +* removed references to compat.h from main.h -== rebase on top of previous tag == -{{{ +h2. rebase on top of previous tag + + +<pre> '-(%25)-(merge/master)> git checkout -b patches '-(%25)-(patches)> git rebase -s subtree origin/merge/master First, rewinding head to replay your work on top of it... @@ -149,7 +163,7 @@ To restore the original branch and stop rebasing run "git rebase --abort". '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git add net/batman-adv/Makefile '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git rebase -s subtree --continue Already applied: 0007 batman-adv: Use nproc to get number of available processors -CONFLICT (delete/modify): net/batman-adv/compat.h deleted in GregKH-20100618 and modified in HEAD~1. Version HEAD~1 of net/batman-adv/compat.h left in tree. +CONFLICT (delete/modify): net/batman-adv/compat.h deleted in [[GregKH]]-20100618 and modified in HEAD~1. Version HEAD~1 of net/batman-adv/compat.h left in tree. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". @@ -163,7 +177,7 @@ rm 'net/batman-adv/compat.h' Committed: 0008 batman-adv: Add include guards to all header files Auto-merging net/batman-adv/Makefile CONFLICT (content): Merge conflict in net/batman-adv/Makefile -CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in GregKH-20100618 and modified in HEAD~0. Version HEAD~0 of net/batman-adv/Makefile.kbuild left in tree. +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in [[GregKH]]-20100618 and modified in HEAD~0. Version HEAD~0 of net/batman-adv/Makefile.kbuild left in tree. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". @@ -178,20 +192,24 @@ rm 'net/batman-adv/Makefile.kbuild' Already applied: 0009 batman-adv: Add support for git revision string All done. '-(%25)-(patches)> git diff origin/merge/master -}}} +</pre> The last diff must be empty or we did something wrong. -== squash/cleanup patches == -{{{ +h2. squash/cleanup patches + + +<pre> '-(%25)-(patches)> git rebase -i origin/merge/master Successfully rebased and updated refs/heads/patches -}}} +</pre> + -== check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) == +h2. check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) -{{{ + +<pre> '-(%25)-(patches)> git rev-list --reverse origin/merge/master.. 166b2caa61fce5260aed4e119671764331fdc62a 5cd65234b12021fe1f28e28e455a6b6a06712ec2 @@ -204,41 +222,43 @@ a85d1b45e4cde0c882a41baaefeec0cd5502416f '-(%25)-(patches)> git checkout 166b2caa61fce5260aed4e119671764331fdc62a Previous HEAD position was a85d1b4... batman-adv: Avoid rounding issues for local hna timeout HEAD is now at 166b2ca... batman-adv: Convert names from Java to C style -'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ ... '-(%25)-(166b2caa61fce5260aed4e119671764331fdc62a)> git checkout 5cd65234b12021fe1f28e28e455a6b6a06712ec2 Previous HEAD position was 166b2ca... batman-adv: Convert names from Java to C style HEAD is now at 5cd6523... batman-adv: Avoid rounding issues for local hna timeout -'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ .... '-(%25)-(83d1bc8bb328bcfa42be492fe0e2648b77c18af2)> git checkout 9e9605f0fe000f1097cb43271540ab2b76b2a782 Previous HEAD position was 83d1bc8... batman-adv: Lower resolution for timeouts HEAD is now at 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability -'-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ .... '-(%25)-(9e9605f0fe000f1097cb43271540ab2b76b2a782)> git checkout 043aa9a54a5296c6027a5bcd808b8d29cea8a474 Previous HEAD position was 9e9605f... batman-adv: replace manual calculation by msecs_to_jiffies() for better readability HEAD is now at 043aa9a... batman-adv: Add sysfs abi documentation about bonding -'-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ ... '-(%25)-(043aa9a54a5296c6027a5bcd808b8d29cea8a474)> git checkout f6d8baba5fce6161bc2cee9c97e0afbc139942c0 Previous HEAD position was 043aa9a... batman-adv: Add sysfs abi documentation about bonding HEAD is now at f6d8bab... batman-adv: adapting source version to revised versioning scheme -'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ ... '-(%25)-(f6d8baba5fce6161bc2cee9c97e0afbc139942c0)> git checkout a85d1b45e4cde0c882a41baaefeec0cd5502416f Previous HEAD position was f6d8bab... batman-adv: adapting source version to revised versioning scheme HEAD is now at a85d1b4... batman-adv: Add include guards to all header files -'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=`pwd` +'-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> make CONFIG_BATMAN_ADV=m CC=cgcc -C /home/sven/tmp/linux-next M=@pwd@ ... '-(%25)-(a85d1b45e4cde0c882a41baaefeec0cd5502416f)> git checkout patches Switched to branch 'patches' '-(%25)-(patches)> cd ../../../ -}}} +</pre> + -== format patches == +h2. format patches -{{{ + +<pre> '-(%25)-(patches)> git format-patch --patience -s -M origin/merge/master 0001-batman-adv-Convert-names-from-Java-to-C-style.patch 0002-batman-adv-Avoid-rounding-issues-for-local-hna-timeo.patch @@ -248,13 +268,15 @@ Switched to branch 'patches' 0006-batman-adv-adapting-source-version-to-revised-versio.patch 0007-batman-adv-Add-include-guards-to-all-header-files.patch '-(%25)-(patches)> vim 00*.patch -}}} +</pre> Usually I add "batman-adv: " right when checking the signed-off-by and author (from) line. -== apply all patches on linux next == -{{{ +h2. apply all patches on linux next + + +<pre> '-(%25)-(patches)> cd ../linux-next '-(%25)-(master)> git remote update '-(%25)-(master)> git reset --hard origin/master @@ -269,18 +291,22 @@ Applying: batman-adv: replace manual calculation by msecs_to_jiffies() for bette Applying: batman-adv: Add sysfs abi documentation about bonding Applying: batman-adv: adapting source version to revised versioning scheme Applying: batman-adv: Add include guards to all header files -}}} +</pre> -== check if all patches build again with linux next == -{{{ +h2. check if all patches build again with linux next + + +<pre> '-(%25)-(davem)> make .... -}}} +</pre> + -== format patches on top of linux-next master == +h2. format patches on top of linux-next master -{{{ + +<pre> '-(%25)-(davem)> git format-patch -s --patience -M master 0001-batman-adv-Convert-names-from-Java-to-C-styl.patch 0002-batman-adv-Avoid-rounding-issues-for-local-h.patch @@ -311,11 +337,13 @@ total: 0 errors, 0 warnings, 0 checks, 8 lines checked total: 0 errors, 0 warnings, 0 checks, 239 lines checked 0007-batman-adv-Add-include-guards-to-all-header-.patch has no obvious style problems and is ready for submission. -}}} +</pre> + + +h2. submit patches -== submit patches == -{{{ +<pre> '-(%25)-(davem)> ../linux-merge/ '-(%25)-(patches)> git checkout batman-adv/next '-(%25)-(batman-adv/next)> git rev-parse batman-adv/next @@ -332,11 +360,11 @@ Applying: batman-adv: Add include guards to all header files '-(%25)-(batman-adv/next)> git push '-(%25)-(batman-adv/next)> git request-pull 12513b76a021e5b41a9d5d5981da75dfd6480890 git://git.open-mesh.org/ecsv/linux-merge.git > shortlog '-(%25)-(batman-adv/next)> git send-email --compose --to=davem(a)davemloft.net --cc=netdev(a)vger.kernel.org --cc=b.a.t.m.a.n(a)lists.open-mesh.org 00*.patch -}}} +</pre> Now I will write something like -{{{ +<pre> From Sven Eckelmann <sven(a)narfation.org> # This line is ignored. GIT: Lines beginning in "GIT:" will be removed. GIT: Consider including an overall diffstat or table of contents @@ -401,4 +429,4 @@ Sven Eckelmann (1): net/batman-adv/vis.c | 14 +++++++------- net/batman-adv/vis.h | 7 ++++++- 25 files changed, 116 insertions(+), 45 deletions(-) -}}} \ No newline at end of file +</pre> \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: attachments/triangle.dia (8cb2223e)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 8cb2223e4f30dab687a86158f44f749a8e3f7e4c Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jan 22 12:15:47 2011 +0000 doc: attachments/triangle.dia >--------------------------------------------------------------- 8cb2223e4f30dab687a86158f44f749a8e3f7e4c attachments/triangle.dia | Bin 0 -> 1520 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/attachments/triangle.dia b/attachments/triangle.dia new file mode 100644 index 00000000..5ce1b8a3 Binary files /dev/null and b/attachments/triangle.dia differ

1 0

[doc] backup-redmine/2017-07-13, master: doc: attachments/topology-scheme.png (4280dbb7)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 4280dbb7b7bbeb65400a08db8a720279b0cbe4c0 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Jan 21 10:47:20 2011 +0000 doc: attachments/topology-scheme.png >--------------------------------------------------------------- 4280dbb7b7bbeb65400a08db8a720279b0cbe4c0 attachments/topology-scheme.png | Bin 0 -> 5873 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/attachments/topology-scheme.png b/attachments/topology-scheme.png new file mode 100644 index 00000000..b0d9384a Binary files /dev/null and b/attachments/topology-scheme.png differ

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Bcast-hidden-node: link the image in text (0f44332a)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 0f44332a536c9a50133acec2d09f630a12f60a4c Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Jan 21 10:44:54 2011 +0000 doc: batman-adv/Bcast-hidden-node: link the image in text >--------------------------------------------------------------- 0f44332a536c9a50133acec2d09f630a12f60a4c batman-adv/Bcast-hidden-node.textile | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/batman-adv/Bcast-hidden-node.textile b/batman-adv/Bcast-hidden-node.textile index e06e3632..d40d97a0 100644 --- a/batman-adv/Bcast-hidden-node.textile +++ b/batman-adv/Bcast-hidden-node.textile @@ -1,22 +1,16 @@ += Hidden Node Problem = +See [http://en.wikipedia.org/wiki/Hidden_node here] for a general description of the problem. -h1. Hidden Node Problem - -See "here":http://en.wikipedia.org/wiki/Hidden_node for a general description of the problem. - - -h1. Hidden Node Problem and NDP/OGMs - -Especially in indoor scenarios like the one shown below where corners and thick walls are involved, hidden nodes can be a severe problem. Usually activating "RTS/CTS":http://en.wikipedia.org/wiki/802.11_RTS/CTS is a common way of solving this problem at least to some degree. However, "RTS/CTS":http://en.wikipedia.org/wiki/802.11_RTS/CTS can only be applied for unicast packets. Therefore a node C sending a lot of data packets to B, even with RTS/CTS those packets will interfere with BATMAN's broadcast packets (e.g. "NDP":http://www.open-mesh.org/wiki/batman-adv-ndp packets or OGMs). The effect is, that with this stream, only the TQ from A -> B will decrease dramatically, the rest will stay relatively equal. += Hidden Node Problem and NDP/OGMs = +Especially in indoor scenarios like the one shown below where corners and thick walls are involved, hidden nodes can be a severe problem. Usually activating [http://en.wikipedia.org/wiki/802.11_RTS/CTS RTS/CTS] is a common way of solving this problem at least to some degree. However, [http://en.wikipedia.org/wiki/802.11_RTS/CTS RTS/CTS] can only be applied for unicast packets. Therefore a node C sending a lot of data packets to B, even with RTS/CTS those packets will interfere with BATMAN's broadcast packets (e.g. [http://www.open-mesh.org/wiki/batman-adv-ndp NDP] packets or OGMs). The effect is, that with this stream, only the TQ from A -> B will decrease dramatically, the rest will stay relatively equal. In the worst case, this can lead to route flapping to the shorter path, due to all these lost packets, A will switch its route towards C to the direct one if occasionally some NDP/OGMs had been received over this link, which might however not be usable for i.e. TCP traffic due to a too high packet loss. [[Image(wiki:bcast-hidden-node:topology-scheme.png, 25%25)]] - -h1. Solution Proposal - += Solution Proposal = In BATMAN-Adv. we have the possibility to control not only the routing protocols control packets (like NDP packets or OGMs), but also the data flow. Furthermore the period when a node is sending an NDP packet / OGM is relatively constant (+ some jitter), which allows finding a solution which does not need an active channel reserving like RTS/CTS. Roughly the following steps could be done to decrease the number of lost control packets in case of hidden nodes: -* When sending an NDP packet, attach both the neighbor's NDP interval and the relative interval time offset. In other words, also add the amount of milliseconds when this node expects to receive the next NDP packet from this neighbor. -* Any neighbor receiving an NDP packet with this new information then knows at which times sending data packets could result in collisions (due to e.g. hidden nodes). -* A node then halts its unicast packet transmissions at these times. + * When sending an NDP packet, attach both the neighbor's NDP interval and the relative interval time offset. In other words, also add the amount of milliseconds when this node expects to receive the next NDP packet from this neighbor. + * Any neighbor receiving an NDP packet with this new information then knows at which times sending data packets could result in collisions (due to e.g. hidden nodes). + * A node then halts its unicast packet transmissions at these times. The benefit of this also is, that even if there was no hidden node problem in such a scenario, still a congested links (e.g. saturated bc. of many UDP packet transfers) could lead to switching to the unusable, direct link A - C. This solution also eliminates the influence of congestion on BATMAN's control packets. \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Routing_scenarios (03307933)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit 0330793314021eb597caf639fdd37015d73b0673 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jan 22 12:07:52 2011 +0000 doc: open-mesh/Routing_scenarios >--------------------------------------------------------------- 0330793314021eb597caf639fdd37015d73b0673 open-mesh/Routing_scenarios.textile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/open-mesh/Routing_scenarios.textile b/open-mesh/Routing_scenarios.textile index 3d24918e..93f993e2 100644 --- a/open-mesh/Routing_scenarios.textile +++ b/open-mesh/Routing_scenarios.textile @@ -21,7 +21,11 @@ Node A and B are connected via multiple paths with different characteristics: a === Convergence speed === -A and B have 2 possible paths to communicate with each other. One of the nodes that is part of the currently used path dies and the protocol needs to detect the unavailability of the path to switch as fast as possible to the other one. +A and B have 2 possible paths to communicate with each other. One of the nodes that is part of the currently used path dies or one of the links breaks down and the protocol needs to detect the unavailability of the path to switch as fast as possible to the other one. + +==== The triangle ==== + +[[Image(wiki:routing_scenarios:triangle.png, 100%25)]] ==== The circle ====

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Bcast-hidden-node (fb482cca)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

Repository : ssh://git@open-mesh.org/doc On branches: backup-redmine/2017-07-13,master >--------------------------------------------------------------- commit fb482cca2a9e4b3b40b569cb307f3cfe5560ca20 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Jan 21 10:18:15 2011 +0000 doc: batman-adv/Bcast-hidden-node >--------------------------------------------------------------- fb482cca2a9e4b3b40b569cb307f3cfe5560ca20 batman-adv/Bcast-hidden-node.textile | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/batman-adv/Bcast-hidden-node.textile b/batman-adv/Bcast-hidden-node.textile new file mode 100644 index 00000000..d7ea6db1 --- /dev/null +++ b/batman-adv/Bcast-hidden-node.textile @@ -0,0 +1,14 @@ += Hidden Node Problem = +See [http://en.wikipedia.org/wiki/Hidden_node here] for a general description of the problem. + += Hidden Node Problem and NDP/OGMs = +Especially in indoor scenarios like this, hidden nodes can be a severe problem. Usually activating [http://en.wikipedia.org/wiki/802.11_RTS/CTS RTS/CTS] is a common way of solving this problem at least to some degree. However, [http://en.wikipedia.org/wiki/802.11_RTS/CTS RTS/CTS] can only be applied for unicast packets. Therefore a node C sending a lot of data packets to B, even with RTS/CTS those packets will interfere with BATMAN's broadcast packets (e.g. [http://www.open-mesh.org/wiki/batman-adv-ndp NDP] packets or OGMs). The effect is, that with this stream, only the TQ from A -> B will decrease dramatically, the rest will stay relatively equal. + +In the worst case, this can lead to route flapping to the shorter path, due to all these lost packets, A will switch its route towards C to the direct one if occasionally some NDP/OGMs had been received over this link, which might however not be usable for i.e. TCP traffic due to a too high packet loss. + += Solution Proposal = +In BATMAN-Adv. we have the possibility to control not only the routing protocols control packets (like NDP packets or OGMs), but also the data flow. Furthermore the period when a node is sending an NDP packet / OGM is relatively constant (+ some jitter), which allows finding a solution which does not need an active channel reserving like RTS/CTS. Roughly the following steps could be done to decrease the number of lost control packets in case of hidden nodes: + * When sending an NDP packet, attach both the neighbor's NDP interval and the relative interval time offset. In other words, also add the amount of milliseconds when this node expects to receive the next NDP packet from this neighbor. + * Any neighbor receiving an NDP packet with this new information then knows at which times sending data packets could result in collisions (due to e.g. hidden nodes). + * A node then halts its unicast packet transmissions at these times. +The benefit of this also is, that even if there was no hidden node problem in such a scenario, still a congested links (e.g. saturated bc. of many UDP packet transfers) could lead to switching to the unusable, direct link A - C. This solution also eliminates the influence of congestion on BATMAN's control packets. \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/UsingBatmanGit (00d6992d)
by postmaster＠open-mesh.org 14 Jul '17

14 Jul '17

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017