commits July 2017

commits@lists.open-mesh.org

1 participants
1317 discussions

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/WikiStart (28842c0c)
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 28842c0c036517ff7a18a6a512644d2cb810d711 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Nov 1 16:30:46 2009 +0000 doc: open-mesh/WikiStart >--------------------------------------------------------------- 28842c0c036517ff7a18a6a512644d2cb810d711 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 fa550bf7..54e21a24 100644 --- a/open-mesh/WikiStart.textile +++ b/open-mesh/WikiStart.textile @@ -3,7 +3,7 @@ ---- = B.A.T.M.A.N. = -B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. This is the main development website, we have source code, binary packages, documentation and further information available:Ravi kiran +B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a routing protocol for multi-hop ad-hoc mesh networks. This is the main development website, we have source code, binary packages, documentation and further information available: == News == * '''23.Oct. 2009''' [wiki:2009-10-23-batman-goes-mainline Batman goes mainline] * '''13.Jun. 2009''' [wiki:2009-06-13-batman-0-3-2-release Batman 0.3.2 released]

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Release-todo (4e43acc9)
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 4e43acc9762e942fab528ca5e5bcf4dcc838bd25 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Nov 4 22:08:28 2009 +0000 doc: batman-adv/Release-todo >--------------------------------------------------------------- 4e43acc9762e942fab528ca5e5bcf4dcc838bd25 batman-adv/Release-todo.textile | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile new file mode 100644 index 00000000..d9c38a2f --- /dev/null +++ b/batman-adv/Release-todo.textile @@ -0,0 +1,15 @@ +for internal use, items to be done for release: + +open: + * clean up version strings + * remove dead code, if any + * build changelog + * update README + * update openwrt package + * update copyright years (if needed) + * update links in trac +Marek: + * formulate release announcement +Simon: + * svn tag release + * build package tar.gz and checksums \ No newline at end of file

1 0

[doc] backup-redmine/2017-07-13, master: doc: batman-adv/Release-todo (d9654624)
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 d96546242a38bdfbf340ac5e3e5e377b163786b4 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sat Nov 7 12:55:29 2009 +0000 doc: batman-adv/Release-todo >--------------------------------------------------------------- d96546242a38bdfbf340ac5e3e5e377b163786b4 batman-adv/Release-todo.textile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/batman-adv/Release-todo.textile b/batman-adv/Release-todo.textile index 3b9012c0..1db47053 100644 --- a/batman-adv/Release-todo.textile +++ b/batman-adv/Release-todo.textile @@ -6,28 +6,28 @@ This page contains a checklist of things that need to be done for a release. '''Code''' - * make sure all code contains the release version strings - * update copyright years (if needed) - * remove dead code (if any) - * svn tag release - * change version strings inside the trunk + * [x] make sure all code contains the release version strings + * [x] update copyright years (if needed) + * [x] remove dead code (if any) + * [ ] svn tag release + * [ ] change version strings inside the trunk '''Documentation''' - * build changelog - * update README - * write release announcement + * [ ] build changelog + * [x] update README + * [ ] write release announcement '''Release''' - * build package tar.gz (replace symlinks with real files) and generate checksums - * build stable binary packages - * move packages/checksums to ?? / create symlinks ?? - * update download links in the trac downloads page + * [ ] build package tar.gz (replace symlinks with real files) and generate checksums + * [ ] build stable binary packages + * [ ] move packages/checksums to ?? / create symlinks ?? + * [ ] update download links in the trac downloads page '''Distributions''' - * update openwrt package - * inform batman package maintainer + * [ ] update openwrt package + * [ ] inform batman package maintainer

1 0

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

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Emulation: add some links and references (6ac1faf4)
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 6ac1faf4d1721c27f9f79ddb07ddcb5afc161192 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Oct 18 16:39:32 2009 +0000 doc: open-mesh/Emulation: add some links and references >--------------------------------------------------------------- 6ac1faf4d1721c27f9f79ddb07ddcb5afc161192 open-mesh/Emulation.textile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/open-mesh/Emulation.textile b/open-mesh/Emulation.textile index faf035b6..c9d3bd50 100644 --- a/open-mesh/Emulation.textile +++ b/open-mesh/Emulation.textile @@ -1,15 +1,15 @@ = Emulation Setup = -As a lot of people discussed about simulating mesh network protocols, i'd like to share my qemu setup which i used to gather some data for batman-adv. The idea is to use [http://www.qemu.org/ QEMU] or [http://user-mode-linux.sourceforge.net/ UML] (instead of frameworks like they exist for [http://www.isi.edu/nsnam/ns/ NS-2]) to run an unmodified linux system with the unmodified source code. Besides BATMAN, you could evaluate any routing protocol. +As a lot of people discussed about simulating mesh network protocols at [http://hackerspace.be/Wbm2009v2/ WBMv2], i'd like to share my qemu setup which i used to gather some data for batman-adv. The idea is to use [http://www.qemu.org/ QEMU] or [http://user-mode-linux.sourceforge.net/ UML] (instead of frameworks like they exist for [http://www.isi.edu/nsnam/ns/ NS-2]) to run an unmodified linux system with the unmodified source code. Besides BATMAN, you could evaluate any routing protocol. == Architecture == My system consists of the following components: - * OpenWRT, kamikaze trunk version for x86 with minimal modifications (see below) - * one (unmodified) QEMU instance per host - * one (modified, see below) vde_switch per instance. You need multiple instances to allow interconnection with wirefilter - * one (unmodified) wirefilter per link between host. + * [http://openwrt.org/ OpenWRT], kamikaze trunk version for x86 with minimal modifications (see below) + * one (unmodified) [http://www.qemu.org/ QEMU] instance per host + * one (modified, see below) [http://wiki.virtualsquare.org/index.php/VDE_Basic_Networking vde_switch] per instance. You need multiple instances to allow interconnection with wirefilter + * one (unmodified) [http://wiki.virtualsquare.org/index.php/VDE#wirefilter wirefilter] per link between host. === OpenWRT === @@ -57,6 +57,8 @@ A sample openwrt image can be found here: === vde_switch === +The main advantage of [http://wiki.virtualsquare.org/index.php/VDE_Basic_Networking vde_switch] over [http://user-mode-linux.sourceforge.net/old/networking.html uml_switch] is that any clients can be attached to this virtual switch: QEMU, UML, tap interfaces, virtual interconnections, and not just UML instances. + If the vde_switches were just connected with wirefilter "patch cables" without modification, we would end up creating a broadcast domain and switch loops which we don't want: The goal is to allow the packets to travel only from one host to it's neighbor, not farther. To accomplish this, i've modified the vde_switch to have "coloured" ports. The idea is:

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Emulation: typo and toc (72aeac9b)
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 72aeac9b654ae8a255f0202a402851fa462855e2 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Oct 18 16:41:00 2009 +0000 doc: open-mesh/Emulation: typo and toc >--------------------------------------------------------------- 72aeac9b654ae8a255f0202a402851fa462855e2 open-mesh/Emulation.textile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/open-mesh/Emulation.textile b/open-mesh/Emulation.textile index c9d3bd50..7c5954b7 100644 --- a/open-mesh/Emulation.textile +++ b/open-mesh/Emulation.textile @@ -1,3 +1,5 @@ +[[TracGuideToc]] + = Emulation Setup = As a lot of people discussed about simulating mesh network protocols at [http://hackerspace.be/Wbm2009v2/ WBMv2], i'd like to share my qemu setup which i used to gather some data for batman-adv. The idea is to use [http://www.qemu.org/ QEMU] or [http://user-mode-linux.sourceforge.net/ UML] (instead of frameworks like they exist for [http://www.isi.edu/nsnam/ns/ NS-2]) to run an unmodified linux system with the unmodified source code. Besides BATMAN, you could evaluate any routing protocol. @@ -8,8 +10,8 @@ My system consists of the following components: * [http://openwrt.org/ OpenWRT], kamikaze trunk version for x86 with minimal modifications (see below) * one (unmodified) [http://www.qemu.org/ QEMU] instance per host - * one (modified, see below) [http://wiki.virtualsquare.org/index.php/VDE_Basic_Networking vde_switch] per instance. You need multiple instances to allow interconnection with wirefilter - * one (unmodified) [http://wiki.virtualsquare.org/index.php/VDE#wirefilter wirefilter] per link between host. + * one (modified, see below) [http://wiki.virtualsquare.org/index.php/VDE_Basic_Networking vde_switch] per instance. You need multiple instances to allow interconnection with wirefilter. + * one (unmodified) [http://wiki.virtualsquare.org/index.php/VDE#wirefilter wirefilter] per link between hosts. === OpenWRT ===

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Filing (2a26350d)
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 2a26350de3231a80b8472a5b32e4b49cf12e8997 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Oct 18 16:42:21 2009 +0000 doc: open-mesh/Filing >--------------------------------------------------------------- 2a26350de3231a80b8472a5b32e4b49cf12e8997 open-mesh/Filing.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/Filing.textile b/open-mesh/Filing.textile index 7eba4b17..4dead55a 100644 --- a/open-mesh/Filing.textile +++ b/open-mesh/Filing.textile @@ -34,4 +34,4 @@ * [wiki:Coredump How to get a coredump] - documentation about coredump configuration & retrieval * [wiki:the-olsr-story The OLSR story] - this text explains the roots of B.A.T.M.A.N. (Dec 2006) - + * [wiki:Emulation] - Howto for a Emulation environment using QEMU and VDE

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/Emulation: a proper TOC now ... (bdd299b0)
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 bdd299b0ee17198b331f49c005f6e4c811c8e3a0 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Oct 18 16:47:04 2009 +0000 doc: open-mesh/Emulation: a proper TOC now ... >--------------------------------------------------------------- bdd299b0ee17198b331f49c005f6e4c811c8e3a0 open-mesh/Emulation.textile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/open-mesh/Emulation.textile b/open-mesh/Emulation.textile index 7c5954b7..f2ba27f9 100644 --- a/open-mesh/Emulation.textile +++ b/open-mesh/Emulation.textile @@ -1,4 +1,4 @@ -[[TracGuideToc]] +[[PageOutline]] = Emulation Setup =

1 0

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

14 Jul '17

1 0

[doc] backup-redmine/2017-07-13, master: doc: open-mesh/UsingBatmanGit (463b5eb2)
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 463b5eb2eecc34559c3e580a0dedaef89f5ae5ed Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Oct 25 01:53:50 2009 +0000 doc: open-mesh/UsingBatmanGit >--------------------------------------------------------------- 463b5eb2eecc34559c3e580a0dedaef89f5ae5ed open-mesh/UsingBatmanGit.textile | 103 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/open-mesh/UsingBatmanGit.textile b/open-mesh/UsingBatmanGit.textile new file mode 100644 index 00000000..ccae0649 --- /dev/null +++ b/open-mesh/UsingBatmanGit.textile @@ -0,0 +1,103 @@ + += Using the batman git repository = + +If you want to find out why we also have a git repository now, please read [wiki:BatmanGoesMainline here]. + +=== Checkout === + +To retrieve the latest changes you can pull from the read-only http frontend.[[BR]] +Your are about to download 300MB of sources - that may take a while! + +{{{ +git clone http://git.open-mesh.org/batman-adv/ batman-adv-git +}}} + +=== Branches === + +The git repository is divided into several branches to make working easier.[[BR]] + +'''master branch''' + +The master branch is a clone of the batman kernel module SVN found at [[BR]] +http://downloads.open-mesh.org/svn/batman/trunk/batman-adv-kernelland/ [[BR]] + +The idea is that all kernel changes are built on top of the SVN, so that[[BR]] +changes which affect all branches can easily trickle down. A post-commit[[BR]] +script makes sure that the SVN is in sync with the git master branch all the[[BR]] +time.[[BR]] + +In fact you will never work with this branch itself but one of the other branches.[[BR]] + +'''linux branch''' + +The linux branch is a clone of Linus Torvalds developer branch. With the help[[BR]] +of some git vodoo the master branch is merged with this branch in the folder:[[BR]] +drivers/staging/batman-adv/. If you wish to merge the latest master branch [[BR]] +changes into the linux branch you need to switch to the linux branch:[[BR]] + +{{{ +git checkout linux +}}} + +and merge the master branch into this one: + +{{{ +git fetch origin +git merge -s subtree origin/master +}}} + +If you wish to pull Linus latest changes and merge it you need to add the remote[[BR]] +branch first (you can omit that step if you already have it). + +{{{ +git remote add torvalds git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git +}}} + +Fetch its content and merge it: + +{{{ +git checkout linux +git fetch torvalds +git merge torvalds/master +}}} + +To upload your changes you need to run: +{{{ +git checkout linux +git push origin linux +}}} + + +'''difference between SVN and git''' + +If you need to see the difference between the SVN repos and the batman-adv[[BR]] +driver in drivers/staging/batman-adv/ you can run this command: + +{{{ +git diff origin/master: linux:drivers/staging/batman-adv/ +}}} + + +'''adding a branch''' + +In case you want to add your own branch for testing purposes or simply wish[[BR]] +to understand the magic. + +{{{ +git remote add $remote_name $git_url +git fetch $remote_name + +git checkout -b $new_branch_name $remote_name/master +git merge -s ours --no-commit master +git read-tree --prefix=drivers/staging/batman-adv/ -u master +git commit -m "Add batman-adv to my new branch" +}}} + +=== TODO === + +We maintain a TODO file in the git repository that you can see here: + +[[Include(http://git.open-mesh.org/TODO.html)]] + +If you are interested in helping us out you can grab one item, make a patch[[BR]] +and send it to our [wiki:MailingList Mailinglist].

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits July 2017