commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/News-archive (4a303350)
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 4a30335009ce12266b1a98ea8b5e18647687ed18 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jul 1 01:09:40 2011 +0000 doc: open-mesh/News-archive >--------------------------------------------------------------- 4a30335009ce12266b1a98ea8b5e18647687ed18 open-mesh/News-archive.textile | 1 + 1 file changed, 1 insertion(+) diff --git a/open-mesh/News-archive.textile b/open-mesh/News-archive.textile index b7fa78d6..773f35ba 100644 --- a/open-mesh/News-archive.textile +++ b/open-mesh/News-archive.textile @@ -6,6 +6,7 @@ This page contains the links to previous news posts for archiving puposes. h3. 2011 +* *17.Mar. 2011* [[2011-03-17-batman-adv-and-the-penguin|Batman-adv and the Penguin join forces]] * *29.Jan. 2011* [[2011-01-29-batman-adv-2011-0-0-release|Batman-adv 2011.0.0 released]] * *18.Jan. 2011* [[2011-01-18-wbmv4-announcement|WBMv4 Announcement]]

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/WikiStart (05dec7be)
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 05dec7be0817a110cd331cdf6fb241ace839ca02 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Jun 26 11:50:20 2011 +0000 doc: open-mesh/WikiStart >--------------------------------------------------------------- 05dec7be0817a110cd331cdf6fb241ace839ca02 open-mesh/WikiStart.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/WikiStart.textile b/open-mesh/WikiStart.textile index d0c90a88..8e2f44a4 100644 --- a/open-mesh/WikiStart.textile +++ b/open-mesh/WikiStart.textile @@ -12,7 +12,7 @@ h2. News * *19.Jun. 2011* [[2011-06-19-batman-adv-2011-2-0-release|Batman-adv 2011.2.0 released]] * *19.Apr. 2011* [[2011-04-18-batman-adv-2011-1-0-release|Batman-adv 2011.1.0 released]] -* *30.Mar. 2011* [[2011-03-30-GSoC-announcement|B.A.T.M.A.N. @Google Summer of Code 2011]] +* *30.Mar. 2011* [[2011-03-30-GSoC2011-announcement|B.A.T.M.A.N. @Google Summer of Code 2011]] * *27.Mar. 2011* [[2011-03-27-transition-to-git|Transition to git]] * *17.Mar. 2011* [[2011-03-17-batman-adv-and-the-penguin|Batman-adv and the Penguin join forces]]

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/OGM (4c1d39c5)
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 4c1d39c56b18b8768e24956f18e58db64da731bc Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Jun 25 13:51:21 2011 +0000 doc: batman-adv/OGM >--------------------------------------------------------------- 4c1d39c56b18b8768e24956f18e58db64da731bc batman-adv/OGM.textile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/batman-adv/OGM.textile b/batman-adv/OGM.textile index f863cea0..b1b772db 100644 --- a/batman-adv/OGM.textile +++ b/batman-adv/OGM.textile @@ -128,7 +128,7 @@ A final check then needs to be applied: h3. 5. Router Ranking -For each OGM having passed the previous checks the according neighbor is a potential, loop-free router. The Router Ranking checks whether just an according Router or even completely new Originator entry needs to be created or an already existing Router entry matching the Router we received this OGM from just updated. Or whether also the currently Selected Router needs to be switched. Furthermore step 5.2. will force relinqushing the so far Selected Router if its information became too old because of this OGM received via a Router other than the Selected Router. +For each OGM having passed the previous checks the according neighbor is a potential, loop-free router. The Router Ranking checks whether just an according Router or even completely new Originator entry needs to be created or an already existing Router entry matching the Router we received this OGM from just updated. Or whether also the currently Selected Router needs to be switched. Furthermore step 5.2. will force relinquishing the so far Selected Router if its information became too old because of this OGM received via a Router other than the Selected Router. If this OGM just results in updating a Router in the Router list which is not and not going to be the currently Selected Router, then no rebroadcasting of this OGM will take place in step 5.3. for now. @@ -139,7 +139,7 @@ For the Router Ranking the following actions must be performed: h4. 5.1. Creating or Updating Originator and Router Entries -In this step we are updating the according entries in the Router list. Step 4.2.2 ensured that the OGM which was not dropped yet is actually containing either newer (higher sequence number) information - which is a loop-safe, possible choice because that Router or any next hop on that path did not and will not be allowed to switch back to a lower sequence number again (like the lower sequence number we would have). Or information of the same originator's OGM flooding round, the same sequence numbe, as the currently Selected Router but with that OGM having travelled along a better path (better due to a higher path TQ of this OGM - and note that an OGM having travelled along such a better path can never have travelled over us before, as then the path TQ would have to be worse and not better in such a case as with each hop the path TQ gets at least 1/255 worse due to the Hop Penalty, see section 7.1). The OGM with the properties just stated might also have been received from a Neighbor which we do not have a Router entry - or even an Originator entry yet which will be created in that case first. +In this step we are updating the according entries in the Router list. Step 4.2.2 ensured that the OGM which was not dropped yet is actually containing either newer (higher sequence number) information - which is a loop-safe, possible choice because that Router or any next hop on that path did not and will not be allowed to switch back to a lower sequence number again (like the lower sequence number we would have). Or information of the same originator's OGM flooding round, the same sequence number, as the currently Selected Router but with that OGM having travelled along a better path (better due to a higher path TQ of this OGM - and note that an OGM having travelled along such a better path can never have travelled over us before, as then the path TQ would have to be worse and not better in such a case as with each hop the path TQ gets at least 1/255 worse due to the Hop Penalty, see section 7.1). The OGM with the properties just stated might also have been received from a Neighbor which we do not have a Router entry - or even an Originator entry yet which will be created in that case first. More precisely, the following steps need to be undertaken in the updating and creating process: @@ -149,7 +149,7 @@ More precisely, the following steps need to be undertaken in the updating and cr * If no router entry matching the OGM's originator and the neighbor the OGM was received from exists: ** Create a new router entry with the previously determined path TQ, the OGM's Sequence Number and the TTL of the OGM. ** Unset this new router entry's Rebroadcasted flag. -* Else then: +* Otherwise: ** Update the path TQ, Router Sequence Number and TTL in this matching router entry. ** Unset the Rebroadcasted flag in this matching router entry.

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/OGM: adding some more descriptions for the potential router checks (cbb4b8c2)
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 cbb4b8c21420905f0ed9256ab0c2d2830664ac10 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Fri Jul 1 01:42:15 2011 +0000 doc: batman-adv/OGM: adding some more descriptions for the potential router checks >--------------------------------------------------------------- cbb4b8c21420905f0ed9256ab0c2d2830664ac10 batman-adv/OGM.textile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/batman-adv/OGM.textile b/batman-adv/OGM.textile index b1b772db..e9093017 100644 --- a/batman-adv/OGM.textile +++ b/batman-adv/OGM.textile @@ -113,8 +113,8 @@ h4. 4.2.2. Potential Router Checks The following steps check whether the Neighbor we received the OGM from is a potential Router, meaning that we could switch to this Neighbor without creating a routing loop. If this is not the case we are going to drop and ignore this OGM. Otherwise we will further call this Neighbor a potential Router or just Router and will pass on to the Router Ranking. * If an originator entry matching the originator address of the OGM and a Selected Router exist: -** If the OGM's Sequence Number is smaller than the Selected Router's Sequence Number then the message must be silently dropped. -** If for the according originator entry's router list a router entry matching the neighbor we received the OGM from exists and this entry has a sequence number higher than the one in the OGM then the message must be silently dropped. +** If the OGM's Sequence Number is smaller than the Selected Router's Sequence Number then the message must be silently dropped. This step is needed to ensure loop-freeness, we may only select newer or in certain circumstances equal sequence numbers. +** If for the according originator entry's router list a router entry matching the neighbor we received the OGM from exists and this entry has a sequence number higher than the one in the OGM then the message must be silently dropped. Due to the previous check this step is not needed to ensure loop-freeness. Instead it ensures that we are not "updating" a router entry (which might not be the Selected Router at the moment) with older information. If the OGM has not been dropped after these preliminary checks, the OGM will be modified in the following way to obtain the path TQ of the received OGM: @@ -123,8 +123,8 @@ If the OGM has not been dropped after these preliminary checks, the OGM will be A final check then needs to be applied: * If an originator entry matching the originator address of the OGM and a Selected Router exist: -** If the OGM's Sequence Number is equal to the Selected Router's Sequence Number and the OGM's path TQ is lower than the Selected Router's path TQ then the message must be silently dropped. -** If for the according originator entry's router list a router entry matching the neighbor we received the OGM from exists and this entry has a sequence number equal to the one in the OGM and the OGM's path TQ is lower than or equal to the router entry's path TQ then the message must be silently dropped. +** If the OGM's Sequence Number is equal to the Selected Router's Sequence Number and the OGM's path TQ is lower than the Selected Router's path TQ then the message must be silently dropped. This step is needed to ensure loop-freeness, an OGM of the same sequence number and a lower path TQ might have been rebroadcasted from us before and might have made any next hop along the selected path to have chosen us a a next hop again, possibly creating a routing loop. And actually we are just interested for the best path TQ for now anyway. +** If for the according originator entry's router list a router entry matching the neighbor we received the OGM from exists and this entry has a sequence number equal to the one in the OGM and the OGM's path TQ is lower than or equal to the router entry's path TQ then the message must be silently dropped. Due to the previous check this step is not needed to ensure loop-freeness. Instead it ensures that we are only updating a router entry with the same sequence number to a better path TQ (which might have arrived over a "longer", more delayed path). This is also needed to ensure in case of very low packet loss over best paths to get the best, true path TQ values within the OGM flood of one sequence number. h3. 5. Router Ranking

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/ELP (3f7fbfd5)
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 3f7fbfd5a63f3cb312cd926878a9578f28ca1d2d Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sat Jun 25 06:22:22 2011 +0000 doc: batman-adv/ELP >--------------------------------------------------------------- 3f7fbfd5a63f3cb312cd926878a9578f28ca1d2d batman-adv/ELP.textile | 61 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/batman-adv/ELP.textile b/batman-adv/ELP.textile index 0778db24..e90b66e8 100644 --- a/batman-adv/ELP.textile +++ b/batman-adv/ELP.textile @@ -9,30 +9,48 @@ This approach was chosen for its simplicity during the protocol design phase and As a result detecting local link qualities shall be handled by an independent message type, ELP, whereas the OGM message type remains responsible for flooding the mesh with these link quality information and determening the overall path transmit qualities. -h2. Definitions +h2. 1. Definitions * node - A mesh router which utilizes the B.A.T.M.A.N. protocol as specified in this document on at least one network interface. A node consists of one or more originators. * originator - An addressable entity within one mesh network routing layer. An originator's address has to be unique within a mesh network routing layer and unique on a node. A node's hard-interface may only be utilized by zero or one originator. * hard-interface - Network interface utilized by B.A.T.M.A.N. for its own ethernet frames. * sliding window - Sequence numbers are recorded in dedicated sliding windows until they are considered out-of-range. Thus, such a sliding window always contains the set of recently received sequence numbers. The amount of sequence numbers recorded in the sliding window is used as a metric for the quality of detected links and paths. +* Neighbor: An ELP sender within one hop distance (note, this is defined differently for the OGM protocol) +h2. 2. Conceptual Data Structures -h2. Protocol Procedure +h3. 2.1. Neighbor List +* Neighbor Address: The ethernet source address of the received ELP message. +* Originator Address: The originator address of the node. +* Packet Count Window: +* Sequence Number: +* Last Seen: +* Last Updated: +* Link RQ: +* Link TQ: -h3. Broadcasting own Echo Location Protocol (ELP) Messages +h3. 2.2. Originator List + +* Originator Address: The originator address of the node. +* Best Link TQ + +h2. 3. Protocol Procedure + + +h3. 3.1 Broadcasting own Echo Location Protocol (ELP) Messages Each node periodically (ELP interval) generates and broadcasts ELP messages for each interface B.A.T.M.A.N. is running on. A jitter may be applied to avoid collisions. -h4. The Echo Location Protocol (ELP) Format: ++The Echo Location Protocol (ELP) Format:+ * Packet type: Initialize this field with the ELP packet type. * Version: Set your internal compatibility version. * Originator Address: Set this field to the primary MAC address of this B.A.T.M.A.N. node. * Sequence number: On first broadcast set the sequence number to an arbitrary value and increment the field by one for each following broadcast. -* Interval: Set to the current ELP interval of this interface. +* Interval: Set to the current ELP interval of this interface in milli seconds. * Num Neigh: The number of neighbors that are announced with this message. If this B.A.T.M.A.N. interface wants to announce neighboring nodes it should append a neighbor entry message for each neighbor to be announced and fill the "number of neighbors" field accordingly. @@ -53,7 +71,7 @@ If this B.A.T.M.A.N. interface wants to announce neighboring nodes it should app +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ </code></pre> -h4. The Neighbor Entry Format: ++The Neighbor Entry Format:+ * Neighbor Address: This field contains the MAC address of the neighbor to be announced. * Link RQ: Fill this field with the total of the received sequence numbers (in percent) within the sliding sequence number window, including the time-based adjustment, from this neighbor. If that value would be 0, skip attaching that entry. @@ -70,11 +88,11 @@ Note: See 'Neighbor Ranking' and 'Time-based Window Adjustment' to get a detaile +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ </code></pre> -h4. ELP minimum packet size / padding +h4. 3.3.1. ELP minimum packet size / padding An ELP packet should be padded to at least 300 Bytes (excluding ethernet frame header) and may be padded to up to 1500 Bytes. Especially on wireless interfaces the packet size of broadcast packets can have quite an impact on the probability of arrival. -h3. Receiving Echo Location Messages (ELP) +h3. 3.2. Receiving Echo Location Messages (ELP) Upon receiving an ELP packet a node must perform the following preliminary checks before the packet is further processed: @@ -85,28 +103,28 @@ Upon receiving an ELP packet a node must perform the following preliminary check * If the originator address of the ELP message is our own the message must be silently dropped as this ELP message originated from this node. * If the ELP message does not contain a newer sequence number (duplicate, out-of-order or out-of-range) the message must be silently dropped. -h4. Duplicate +h4. 3.2.1. Duplicate An ELP packet is considered a duplicate if: * The last received sequence number is smaller than or equal to the current window sequence number. * The last received sequence number is greater than the current window sequence number minus WINDOW_SIZE. * The received sequence number is equal to the last received sequence number. -h4. Out-of-Order +h4. 3.2.2. Out-of-Order An ELP packet is considered out-of-order if: * The last received sequence number is smaller than or equal to the current window sequence number. * The last received sequence number is greater than the current window sequence number minus WINDOW_SIZE. * The received sequence number is smaller than the last received sequence number. -h4. Out-of-Range +h4. 3.2.3. Out-of-Range An ELP packet is considered out-of-range if: * The received sequence number is not a duplicate and not out-of-order. * The received sequence number is smaller than the current window sequence number. * The received sequence number is greater than the current window sequence number minus 2^31. -h3. Neighbor Ranking +h3. 3.3. Neighbor Ranking For each ELP message having passed the preliminary checks the following actions must be performed: @@ -121,9 +139,22 @@ For each ELP message having passed the preliminary checks the following actions * The sequence number of the received ELP message must be added to the sliding window. * The new resulting link RQ value is calculated by counting all sequence numbers that are to be found in the recently adjusted sliding window. * The neighbor entries must be parsed until an entry matching the MAC address of the incoming hard-interface has been found. If a match is found then save the received link RQ value as link TQ value towards this neighbor interface and skip the further traversal of the list. If no matching entry was found, set the link TQ value towards that neighbor to 0. +* The best link TQ needs to be updated. + +h4. 3.3.1. Best Link TQ + +The best link TQ is being determined in the following way: + +best link TQ = max{for all neighbors belonging to the originator: link TQ * asym_penalty(link RQ)} + +h5. 3.3.1.1 Asymmetric Link Penalty + +The asymmetric penalty is being determined in the following way: + +asym_penalty = 1 - (1 - link RQ)^3 -h3. Time-based Window Adjustment +h3. 3.4. Time-based Window Adjustment At least once per second all ELP windows must be shifted to the expected current sequence number. This needs to be done to avoid that the OGM protocol picks up too high link quality values from ELP which do very likely not represent the current link quality anymore. @@ -138,11 +169,11 @@ If so, the following actions must be performed: * The sliding window of the ELP message must be shifted (purged) to reflect the new upper and lower boundaries of the ranking range. * The new resulting link RQ value is calculated by counting all sequence numbers that are to be found in the recently adjusted sliding window. -h3. Neighbor Interface Purging Recommendations +h3. 3.5. Neighbor Interface Purging Recommendations A node may purge a neighbor interface from its neighbor list when its RQ value reaches 0. However a node with RQ 0 may be kept in the list as long as desired, as it does not make a difference for the routing decisions because of the asymmetric link penalty (see [ogm|OGM protocol] for details). -h2. Proposed Values for Constants +h2. 4. Proposed Values for Constants * _WINDOW_SIZE_: 2^32

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Building-with-openwrt (6d836076)
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 6d8360764636c50252322f9dd208756fa9ca603e Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Fri Jun 24 04:44:45 2011 +0000 doc: batman-adv/Building-with-openwrt >--------------------------------------------------------------- 6d8360764636c50252322f9dd208756fa9ca603e batman-adv/Building-with-openwrt.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/Building-with-openwrt.textile b/batman-adv/Building-with-openwrt.textile index e48ea5b4..87ebe059 100644 --- a/batman-adv/Building-with-openwrt.textile +++ b/batman-adv/Building-with-openwrt.textile @@ -111,7 +111,7 @@ make package/batman-adv-devel/clean make package/batman-adv-devel/compile V=99 </pre> -The package offers an easy way to apply custom patches whenever batman-adv is built. Simply copy your patches into the "patches" folder inside the package directory (you have to create the folder in case it does not exist yet). The location of the folder depends on which package you want to patch: +The package offers an easy way to apply custom patches whenever batman-adv is built. Simply copy your patches into the "patches" folder inside the package directory (you have to create the folder in case it does not exist yet). Patch files having the string 'batman' in their name are applied to batman-adv whereas patches containing the string 'batctl' are applied to the batctl tool. The location of the folder depends on which package you want to patch: +stable version+

1 0

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

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/OGM (f259c975)
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 f259c975f5c544b8c96e7efc8562298cff845de6 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sat Jun 25 06:22:51 2011 +0000 doc: batman-adv/OGM >--------------------------------------------------------------- f259c975f5c544b8c96e7efc8562298cff845de6 batman-adv/OGM.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv/OGM.textile b/batman-adv/OGM.textile index 3bf568fd..f863cea0 100644 --- a/batman-adv/OGM.textile +++ b/batman-adv/OGM.textile @@ -67,7 +67,7 @@ Each node periodically (OGM interval) generates a single OGM which is broadcaste * Packet type: Initialize this field with the OGM packet type. * Version: Set your internal compatibility version. -* Interval: Set to the current OGM interval of this originator. +* Interval: Set to the current OGM interval of this originator in milli seconds. * Sequence number: On first broadcast set the sequence number to an arbitrary value and increment the field by one for each following broadcast. * Originator Address: Set this field to the primary MAC address of this B.A.T.M.A.N. node. * Flags: Indicates certain attributes of this originator. So far 0x01 is reserved for VIS_SERVER (see [[VisAdv]])

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/SubmittingLinux (75889635)
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 75889635b866e827cf8725c6581a45326391bb9f Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Jun 24 13:03:02 2011 +0000 doc: batman-adv/SubmittingLinux >--------------------------------------------------------------- 75889635b866e827cf8725c6581a45326391bb9f batman-adv/SubmittingLinux.textile | 147 +++++++++++++++++++++---------------- 1 file changed, 82 insertions(+), 65 deletions(-) diff --git a/batman-adv/SubmittingLinux.textile b/batman-adv/SubmittingLinux.textile index 0b1001e0..ad5340fc 100644 --- a/batman-adv/SubmittingLinux.textile +++ b/batman-adv/SubmittingLinux.textile @@ -4,11 +4,11 @@ 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 linux-integration repository (we assume that the merge/master branch is up to date. The latest -rc1 must always be merged into merge/master, batman-adv/maint and batman-adv/next; The merge in batman-adv/maint and batman-adv/next must be a fast forward merge or somebody did something extremely wrong) * get the newest patches from next -* merge next into linux +* merge standalone/next into merge/master * check for compat code -* check difference with next +* check difference with standalone/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) @@ -49,8 +49,8 @@ remote: Total 823 (delta 651), reused 762 (delta 602) Receiving objects: 100%25 (823/823), 136.90 KiB | 254 KiB/s, done. Resolving deltas: 100%25 (651/651), completed with 228 local objects. From git+ssh://open-mesh.org/srv/git/marek/linux-merge - bfa88ea..151b6a5 master -> origin/master - c9f7cbe..078eb6a next -> origin/next + bfa88ea..151b6a5 standalone/master -> origin/standalone/master + c9f7cbe..078eb6a standalone/next -> origin/standalone/next </pre> @@ -60,11 +60,11 @@ h2. merge next into linux <pre> '-(%25)-(xyz)> git checkout merge/master Checking out files: 100%25 (32337/32337), done. -Switched to branch 'linux' +Switched to branch 'merge/master' '-(%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. +CONFLICT (delete/modify): net/batman-adv/Makefile.kbuild deleted in HEAD and modified in standalone/next. Version standalone/next of net/batman-adv/Makefile.kbuild left in tree. CONFLICT (delete/modify): net/batman-adv/compat.h deleted in HEAD and modified in next. Version next of net/batman-adv/compat.h left in tree. Auto-merging net/batman-adv/main.c Auto-merging net/batman-adv/originator.c @@ -91,8 +91,7 @@ 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 +'-(%25)-(merge/master)> git grep compat. net/batman-adv/ </pre> @@ -100,20 +99,20 @@ h2. check difference with next <pre> -git diff origin/standalone/next: origin/merge/master:net/batman-adv/ +git diff origin/standalone/next: merge/master:net/batman-adv/ </pre> Here you should see the * Removed CHANGELOG * new added Kconfig -* A special Makefile which only contains obj-m and a batman-adv-objs line +* A special Makefile which only contains obj-$(CONFIG_BATMAN_ADV) and many batman-adv-y lines * removed Makefile.kbuild, README, compat.c, compat.h * removed references to compat.h from main.h -* (Re)Moved sysfs-class-net-batman-adv and sysfs-class-net-mesh +* (Re)Moved sysfs-class-net-batman-adv and sysfs-class-net-mesh -h2. rebase on top of previous tag +h2. rebase on top of previous subtree merge/-rc1 merge <pre> @@ -164,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 origin/merge/master 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". @@ -178,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 origin/merge/master 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". @@ -207,8 +206,9 @@ Successfully rebased and updated refs/heads/patches </pre> -h2. check if all versions compile cleanly against a current version of linux-next and sparse (cgcc) +h2. check if all patches compile cleanly against the current version of linux-next and sparse (cgcc) +We assume that the linux-next tree was already build with @make allnoconfig@ and then enabling @CONFIG_NET=y@ and @CONFIG_CRC16=y@ <pre> '-(%25)-(patches)> git rev-list --reverse origin/merge/master.. @@ -297,6 +297,7 @@ Applying: batman-adv: Add include guards to all header files h2. check if all patches build again with linux next +It must be checked whether it builds with allnoconfig (+NET,+CRC16,+/-MODULES) as module/builtin and allyesconfig as module/builtin <pre> '-(%25)-(davem)> make @@ -373,61 +374,77 @@ 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(a)narfation.org> -Subject: pull request: batman-adv 2010-06-26 +Subject: pull request: batman-adv 2011-06-20 In-Reply-To: Hi, -I would like tp propose following corrections for net-next-2.6. +I would like to propose following changes for net-next-2.6/3.1. The +first part (1-4) are only only small cleanup patches. The last 8 patches +are related to Antonio Quartulli's research "Client announcement and +Fast roaming in a Layer-2 mesh network". The technical report isn't +published yet, but will hopefully follow soon. He tried to document all +important parts in some (unofficial) documents [1,2,3]. -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) +[1] http://www.open-mesh.org/wiki/batman-adv/Client-announcement +[2] http://www.open-mesh.org/wiki/batman-adv/Client-roaming +[3] http://www.open-mesh.org/wiki/batman-adv/Uevent + + +The following changes since commit ecbd532108cb21d9d3770f73e168bad65d14d9eb: + + batman-adv: use NO_FLAGS define instead of hard-coding 0 (2011-06-09 20:40:38 +0200) are available in the git repository at: - git://git.open-mesh.org/marek/linux-merge.git batman-adv/next - -Antonio Quartulli (1): - batman-adv: Convert names from Java to C style - -Linus Lüssing (1): - batman-adv: Avoid rounding issues for local hna timeout - -Marek Lindner (3): - batman-adv: replace manual calculation by msecs_to_jiffies() for better readability - batman-adv: adapting source version to revised versioning scheme - batman-adv: Add sysfs abi documentation about bonding - -Simon Wunderlich (1): - batman-adv: Lower resolution for timeouts - -Sven Eckelmann (1): - batman-adv: Add include guards to all header files - - net/batman-adv/aggregation.h | 5 +++++ - net/batman-adv/bat_debugfs.h | 6 +++--- - net/batman-adv/bat_sysfs.h | 6 +++--- - net/batman-adv/bitarray.h | 4 ++++ - 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 | 2 +- - net/batman-adv/main.h | 13 +++++++++---- - net/batman-adv/originator.c | 6 ++---- - net/batman-adv/originator.h | 5 +++++ - net/batman-adv/packet.h | 5 +++++ - net/batman-adv/ring_buffer.h | 5 +++++ - net/batman-adv/routing.c | 6 +++--- - net/batman-adv/routing.h | 5 +++++ - net/batman-adv/send.c | 14 +++++++------- - net/batman-adv/send.h | 5 +++++ - net/batman-adv/soft-interface.c | 6 +++--- - net/batman-adv/soft-interface.h | 7 ++++++- - net/batman-adv/sysfs-class-net-mesh | 8 ++++++++ - net/batman-adv/translation-table.c | 3 +-- - net/batman-adv/translation-table.h | 5 +++++ - net/batman-adv/types.h | 6 +++--- - net/batman-adv/vis.c | 14 +++++++------- - net/batman-adv/vis.h | 7 ++++++- - 25 files changed, 116 insertions(+), 45 deletions(-) + git://git.open-mesh.org/ecsv/linux-merge.git batman-adv/next + +Antonio Quartulli (8): + batman-adv: Unify the first 3 bytes in each packet + batman-adv: improved client announcement mechanism + batman-adv: improved roaming mechanism + batman-adv: protect the local and the global trans-tables with rcu + batman-adv: add wrapper function to throw uevent in userspace + batman-adv: gateway election code refactoring + batman-adv: throw uevent in userspace on gateway add/change/del event + batman-adv: improved gateway tq-based selection + +David Howells (1): + batman-adv: count_real_packets() in batman-adv assumes char is signed + +Sven Eckelmann (3): + batman-adv: Move compare_orig to originator.c + batman-adv: Keep interface_tx as local function + batman-adv: Reduce usage of char + + net/batman-adv/Kconfig | 1 + + net/batman-adv/aggregation.c | 25 +- + net/batman-adv/aggregation.h | 8 +- + net/batman-adv/bat_sysfs.c | 73 ++- + net/batman-adv/bat_sysfs.h | 2 + + net/batman-adv/bitarray.c | 8 +- + net/batman-adv/bitarray.h | 8 +- + net/batman-adv/gateway_client.c | 238 +++++-- + net/batman-adv/gateway_client.h | 3 +- + net/batman-adv/gateway_common.c | 6 +- + net/batman-adv/hard-interface.c | 17 +- + net/batman-adv/main.c | 18 +- + net/batman-adv/main.h | 27 +- + net/batman-adv/originator.c | 17 +- + net/batman-adv/originator.h | 8 - + net/batman-adv/packet.h | 92 ++- + net/batman-adv/routing.c | 317 +++++++-- + net/batman-adv/routing.h | 7 +- + net/batman-adv/send.c | 92 ++- + net/batman-adv/send.h | 2 +- + net/batman-adv/soft-interface.c | 26 +- + net/batman-adv/soft-interface.h | 1 - + net/batman-adv/translation-table.c | 1428 ++++++++++++++++++++++++++++++------ + net/batman-adv/translation-table.h | 38 +- + net/batman-adv/types.h | 64 ++- + net/batman-adv/unicast.c | 3 + + net/batman-adv/vis.c | 13 +- + 27 files changed, 2080 insertions(+), 462 deletions(-) </pre> \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/OGM (cc7a9c8b)
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 cc7a9c8b3d0d2ae8d9a9894c05fdaa391a6c2723 Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Tue Jun 21 18:55:08 2011 +0000 doc: batman-adv/OGM >--------------------------------------------------------------- cc7a9c8b3d0d2ae8d9a9894c05fdaa391a6c2723 batman-adv/OGM.textile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/batman-adv/OGM.textile b/batman-adv/OGM.textile index 1bdedda5..70185358 100644 --- a/batman-adv/OGM.textile +++ b/batman-adv/OGM.textile @@ -42,7 +42,6 @@ An originator list holds all addressable and to a certain degree reachable origi * Originator's Sequence Number: The newest OGM Sequence Number that has been accepted from the given Originator. * Router List: A list of potential routers towards an originator * Selected Router: A router from the Router List which is chosen as the next hop to forward data packets to for the according originator. -* Newest Router ? To be able to directly access the most up to date flags etc.? h3. 3.2 Router List @@ -52,12 +51,10 @@ A router list holds all potential routers, routers that might be switched to at * Rebroadcasted: This flag indicates whether the current Router Entry settings have been rebroadcasted yet. * Path TQ: The path TQ towards the originator of the OGM multiplied with the best link TQ at the time of reception. * Router's Sequence Number: The sequence number of the last accepted OGM received via the according router. -* TTL: The TTL of the last accepted OGM received via the according neighbor. -* Flags: The Flags of the last accepted OGM received via the according neighbor. -* Gateway Flags: The Gateway Flags of the last accepted OGM received via the according neighbor. -* TT Num Changes: The TT Num Changes of the last accepted OGM received via the according neighbor. -* TT VN: The TT VN of the last accepted OGM received via the according neighbor. -* TT CRC: The TT CRC of the last accepted OGM received via the according neighbor. +* TTL: The TTL of the last accepted OGM received via the according router. + +As well as other properties of the last accepted OGM received via the according router, like: +* Interval, Flags, Gateway Flags, TT Num Changes, TT VN, TT CRC h2. 4. Protocol Procedure @@ -70,6 +67,7 @@ Each node periodically (OGM interval) generates a single OGM which is broadcaste * Packet type: Initialize this field with the OGM packet type. * Version: Set your internal compatibility version. +* Interval: Set to the current OGM interval of this originator. * Sequence number: On first broadcast set the sequence number to an arbitrary value and increment the field by one for each following broadcast. * Originator Address: Set this field to the primary MAC address of this B.A.T.M.A.N. node. * Flags: Indicates certain attributes of this originator. So far 0x01 is reserved for VIS_SERVER (see [[VisAdv]]) @@ -85,6 +83,8 @@ Each node periodically (OGM interval) generates a single OGM which is broadcaste +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Packet Type | Version | TTL | Alignment | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ + | Interval | + +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Sequence Number | +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | Originator Address |

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017