commits April 2011

commits@lists.open-mesh.org

1 participants
94 discussions

vis; branch, master, updated. v0.3.2-9-g70b0258
by postmaster＠open-mesh.org 07 Apr '11

07 Apr '11

The following commit has been merged in the master branch: commit 70b0258f16bba78648c9458024e9ca66f589c828 Author: elektra <elektra(a)eee.(none)> Date: Thu Apr 7 20:52:24 2011 +0200 Reformatted the README file - and testing git access. diff --git a/README b/README index 33aa2cd..7e8a3a6 100644 --- a/README +++ b/README @@ -5,37 +5,61 @@ Visualize the mesh Concept ------- -In contrast to other routing protocols each batman node only knows the path to its single hop neighbors and knows nothing about the topology behind it. In practice it means that a batman node S is aware of node A which is somewhere in the mesh and reachable via neighbor B but it does not know about the number of hops and / or nodes in between. This approach is quite handy with regard to memory footprint, mesh stability and bandwidth friendliness but somewhat hard to visualize. Therefore a small helper was created: the vis server. It gathers the local views of each node and assembles a graph that can be fed into various tools which output an eye-candy graphic of the networks topology. +In contrast to other routing protocols each Batman node only knows the path +to its single hop neighbors and knows nothing about the topology behind it. +In practice it means that a batman node S is aware of node A which is +somewhere in the mesh and reachable via neighbor B but it does not know +about the number of hops and / or nodes in between. This approach is quite +handy with regard to memory footprint, mesh stability and bandwidth +friendliness but somewhat hard to visualize. Therefore a small helper was +created: the vis server. It gathers the local views of each node and +assembles a graph that can be fed into various tools which output an +eye-candy graphic of the networks topology. Batman nodes ------------ -Each batman node needs to know the IP address of the vis server it should send the vis packets to. This packet is sent every few seconds containing various information about the local neighbors (including their link qualities), secondary interfaces and announced networks. +Each batman node needs to know the IP address of the vis server it should +send the vis packets to. This packet is sent every few seconds containing +various information about the local neighbors (including their link +qualities), secondary interfaces and announced networks. Example: batmand -s visIP [interface] -The vis server can run in the mesh itself or somewhere in the internet, just make sure that batman can reach the given vis IP. +The vis server can run in the mesh itself or somewhere in the internet, just +make sure that batman can reach the given vis IP. Vis server ---------- -The vis server can run on multiple interfaces and expects incoming vis packets on UDP port 4307. Per default it sends the assembled graph to all clients connected to TCP port 2004 every few seconds. It uses the standardized dot draw format to express the relationships among the nodes. +The vis server can run on multiple interfaces and expects incoming vis +packets on UDP port 4307. Per default it sends the assembled graph to all +clients connected to TCP port 2004 every few seconds. It uses the +standardized dot draw format to express the relationships among the nodes. Example: vis [interface] [interface] -The vis server 0.3.2 (and later) additionally offer JSON as output format. Once activated you can retrieve the JSON output on TCP port 2005 (dot draw remains available on port 2004). +The vis server 0.3.2 (and later) additionally offer JSON as output format. +Once activated you can retrieve the JSON output on TCP port 2005 (dot draw +remains available on port 2004). Example: vis -j [interface] [interface] -Make sure that all mentioned ports are not blocked by a firewall. You can verify whether your setup works by using e.g. telnet to connect to port 2004 or 2005. +Make sure that all mentioned ports are not blocked by a firewall. You can +verify whether your setup works by using e.g. telnet to connect to port +2004 or 2005. Fancy graphics -------------- -If you intend to create images like this one [1] you need to use one of the many tools available. That screenshot was made by connecting mesh3d (which is part of the s3d tools [2] - debian packages are available) to the vis servers dot draw output (on port 2004). If you have impressive screenshots don't hesitate to let us know. :-) +If you intend to create images like this one [1] you need to use one of the +many tools available. That screenshot was made by connecting mesh3d (which +is part of the s3d tools [2] - debian packages are available) to the vis +servers dot draw output (on port 2004). If you have impressive screenshots +don't hesitate to let us know. :-) [1] http://downloads.open-mesh.net/batman/misc/wbm2009/08-vis_zoomed.png [2] http://s3d.berlios.de/ -- vis

1 0

linux integration; annotated tag, v2.6.39-rc2, created. v2.6.39-rc2
by postmaster＠open-mesh.org 06 Apr '11

06 Apr '11

The annotated tag, v2.6.39-rc2 has been created at 76af3715abf44176ae1ac9cf5cb9f3861d39eee1 (tag) tagging 6221f222c0ebf1acdf7abcf927178f40e1a65e2a (commit) replaces v2.6.39-rc1 tagged by Linus Torvalds on Tue Apr 5 18:30:59 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 2.6.39-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) iEYEABECAAYFAk2bwl0ACgkQF3YsRnbiHLvBXACfTJZUix5/OiTjYzhbAl6Bd/7M k/QAoIx2ZZPG8o2BDjo+PZ73EJO2BVJC =B92a -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

vis; branch, pu/nosvn, created. v0.3.2-10-g81ea5c8
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/nosvn has been created at 81ea5c8f1cc12b68306ab632b33a59192827215c (commit) - Shortlog ------------------------------------------------------------ commit 81ea5c8f1cc12b68306ab632b33a59192827215c Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:36:52 2011 +0200 vis: Remove subversion/svk revision information The current version of batmand cannot be obtained from subversion or svk anymore. It is unnecessary to provide the functionality to retrieve the current revision using these tools. We only have to differenciate between git checkout and official release. We cannot detect a git snapshot and thus the distribution has to provide the REVISION variable for snapshots. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 30ad47e12762943f5ae7fec60128178ae291bb49 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:34:14 2011 +0200 vis: Remove obsolete creation of source packages The creation of source packages is now either done by the release team using special scripts or through gitweb. It is not needed to provide the source target inside the Makefile and may not work in the future anyway. Signed-off-by: Sven Eckelmann <sven at narfation.org> ----------------------------------------------------------------------- -- vis

1 0

batmand; branch, pu/nosvn, created. v0.3.2-26-g1223d0f
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/nosvn has been created at 1223d0fb5812d587fa45fa0153756c2bd7309c3f (commit) - Shortlog ------------------------------------------------------------ commit 1223d0fb5812d587fa45fa0153756c2bd7309c3f Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:11:31 2011 +0200 batmand: Remove subversion/svk revision information The current version of batmand cannot be obtained from subversion or svk anymore. It is unnecessary to provide the functionality to retrieve the current revision using these tools. We only have to differenciate between git checkout and official release. We cannot detect a git snapshot and thus the distribution has to provide the REVISION variable for snapshots. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> commit 9a2309ff499805a8ec02538b4c67fe2d54a3769a Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 23:06:20 2011 +0200 batmand: Remove obsolete creation of source packages The creation of source packages is now either done by the release team using special scripts or through gitweb. It is not needed to provide the source target inside the Makefile and may not work in the future anyway. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> ----------------------------------------------------------------------- -- batmand

1 0

batmand; branch, pu/nproc, updated. v0.3.2-25-g1e062b3
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The following commit has been merged in the pu/nproc branch: commit 1e062b35c9b7aa4b47813eb3b766f3834f362a8c Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 23 14:12:58 2010 +0200 batmand: Use nproc to get number of available processors The current way of getting the number of cpus uses different assumptions which may or may not be true in the future: * /proc/cpuinfo exists * cpuinfo provides a list of all processing units * all processing units are available for the current process and its childs * the word 'processor' is only used in the cpu index and 'model name' lines * cpu index is strict monotonic increasing * lowest cpu index is 0 and highest cpu index is n-1 (n is the number of processing units) At least the number of available processing units for the current process can be shown to be wrong. on current systems by assigning a singe cpu to a process and its childs: $ numactl --physcpubind=0 nproc 1 $ numactl --physcpubind=0 sh -c 'NUM_CPUS=`cat /proc/cpuinfo | grep -v "model name" | grep processor | tail -1 | awk -F" " '\''{print $$3}'\''`;echo `expr $NUM_CPUS + 1`' 4 nproc is part of coreutils since version 8.1. On systems without nproc it will just assume that a single processing unit is available. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/Makefile b/Makefile index 8eafb26..fdf8232 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ REVISION_VERSION =\"\ rv$(REVISION)\" BAT_VERSION = $(shell grep "^\#define SOURCE_VERSION " $(SOURCE_VERSION_HEADER) | sed -e '1p' -n | awk -F '"' '{print $$2}' | awk '{print $$1}') FILE_NAME = $(PACKAGE_NAME)_$(BAT_VERSION)-rv$(REVISION)_$@ -NUM_CPUS = $(shell NUM_CPUS=`cat /proc/cpuinfo | grep -v 'model name' | grep processor | tail -1 | awk -F' ' '{print $$3}'`;echo `expr $$NUM_CPUS + 1`) +NUM_CPUS = $(shell nproc 2> /dev/null || echo 1) all: -- batmand

1 0

batmand; branch, pu/nproc, created. v0.3.2-26-gdcec9cf
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/nproc has been created at dcec9cf5bd2409f6ef61dd6443a9b4ecf01e64b2 (commit) - Shortlog ------------------------------------------------------------ commit dcec9cf5bd2409f6ef61dd6443a9b4ecf01e64b2 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Jun 23 14:12:58 2010 +0200 batmand: Use nproc to get number of available processors The current way of getting the number of cpus uses different assumptions which may or may not be true in the future: * /proc/cpuinfo exists * cpuinfo provides a list of all processing units * all processing units are available for the current process and its childs * the word 'processor' is only used in the cpu index and 'model name' lines * cpu index is strict monotonic increasing * lowest cpu index is 0 and highest cpu index is n-1 (n is the number of processing units) At least the number of available processing units for the current process can be shown to be wrong. on current systems by assigning a singe cpu to a process and its childs: $ numactl --physcpubind=0 nproc 1 $ numactl --physcpubind=0 sh -c 'NUM_CPUS=`cat /proc/cpuinfo | grep -v "model name" | grep processor | tail -1 | awk -F" " '\''{print $$3}'\''`;echo `expr $NUM_CPUS + 1`' 4 nproc is part of coreutils since version 8.1. On systems without nproc it will just assume that a single processing unit is available. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> ----------------------------------------------------------------------- -- batmand

1 0

batmand; branch, pu/nonblock_ioctl, created. v0.3.2-25-g9f99304
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/nonblock_ioctl has been created at 9f993041d6bad64f8c7f92c85686b256f7985bfa (commit) - Shortlog ------------------------------------------------------------ commit 9f993041d6bad64f8c7f92c85686b256f7985bfa Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 22:34:19 2011 +0200 batmand: Use non-blocking ioctl to fix FTBFS with linux >= 2.6.35 The batgat ioctl locks the used data structures itself and does not rely on the BKL. The BKL ioctl handler was removed in v2.6.35 can cannot be used anymore. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> ----------------------------------------------------------------------- -- batmand

1 0

batmand; branch, pu/makeclean, created. v0.3.2-25-g0ff26f0
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/makeclean has been created at 0ff26f036547524b23046be4145377c6ad6f9488 (commit) - Shortlog ------------------------------------------------------------ commit 0ff26f036547524b23046be4145377c6ad6f9488 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 3 22:34:19 2011 +0200 batmand: Fix FTBFS on second build attempt make clean will try to remove all files and folders which end with *.d. This fails when using the Debian package script on the leftover package folder with etc/init.d included because the rm is not started in recursive deletion mode. This find can be replaced with a simpler statement without using its functionality. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> ----------------------------------------------------------------------- -- batmand

1 0

vis; branch, pu/json, created. v0.3.2-9-g4124fe9
by postmaster＠open-mesh.org 03 Apr '11

03 Apr '11

The branch, pu/json has been created at 4124fe9ac1c2debdf5dee798e1754e3d7ae6d76f (commit) - Shortlog ------------------------------------------------------------ commit 4124fe9ac1c2debdf5dee798e1754e3d7ae6d76f Author: elektra <onelektra(a)gmx.net> Date: Wed Mar 9 18:16:16 2011 +0100 vis: Modified format of JSON output. The current vis server JSON output format is breaking the json_decode() function for PHP. This patch mainly: - Removes all spaces - Removes all the \t TABS - Double quotes the string-variables Reported-by: "Alberto Escudero-Pascual" <aep(a)it46.se> Signed-off-by: "elektra" <onelektra(a)gmx.net> ----------------------------------------------------------------------- -- vis

1 0

batman-adv; branch, master, updated. v2011.0.0-73-g76eab02
by postmaster＠open-mesh.org 01 Apr '11

01 Apr '11

The following commit has been merged in the master branch: commit 76eab023092bdb4d74aed878bba3d55a95e9f8a3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 1 08:49:19 2011 +0200 batman-adv: Fix imbalanced locking in gw_node_update 8ffdea813e32cee3c60be36fb9e6a5e077e51ea0 used rcu_read_unlock without using rcu_read_lock when gw_get_selected_gw_node didn't return a valid gw_node. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/gateway_client.c b/gateway_client.c index 3d0050b..2acd7a6 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -337,19 +337,20 @@ void gw_node_update(struct bat_priv *bat_priv, goto deselect; } - goto out; + goto unlock; } if (new_gwflags == 0) - goto out; + goto unlock; gw_node_add(bat_priv, orig_node, new_gwflags); - goto out; + goto unlock; deselect: gw_deselect(bat_priv); -out: +unlock: rcu_read_unlock(); +out: if (curr_gw) gw_node_free_ref(curr_gw); } -- batman-adv

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2011