B.A.T.M.A.N January 2013

b.a.t.m.a.n@lists.open-mesh.org

25 participants
52 discussions

[B.A.T.M.A.N.] [PATCH -v2 19/26] batman-adv: rename random32() to prandom_u32()

by Akinobu Mita

Use more preferable function name which implies using a pseudo-random number generator. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Acked-by: Antonio Quartulli <ordex(a)autistici.org> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Antonio Quartulli <ordex(a)autistici.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)vger.kernel.org --- No change from v1 net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7d02ebd..bc434c4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -123,7 +123,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += random32() % (2 * BATADV_JITTER); + msecs += prandom_u32() % (2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); } @@ -131,7 +131,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2)); + return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */ -- 1.7.11.7

10 years, 2 months

[B.A.T.M.A.N.] [PATCH] batctl: man page - fix undefined macro warning

by Marek Lindner

A line beginning with ' or . in a groff file has a special meaning and cannot be used for literal text. Instead the interpreter will try to execute it and fail doing so. A zero-width space or reformatting the paragraph can be used as simple workaround. This problem was detected using: LC_ALL=en_US.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z man/batctl.8 >/dev/null Signed-off-by: Pau Koning <paukoning(a)gmail.com> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> --- man/batctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/batctl.8 b/man/batctl.8 index 62e9de2..618fc8d 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -101,7 +101,7 @@ replace the MAC addresses with bat\-host names in the output. .IP "\fBgw_mode|gw\fP [\fBoff\fP|\fBclient\fP|\fBserver\fP] [\fBsel_class|bandwidth\fP]\fP" If no parameter is given the current gateway mode is displayed otherwise the parameter is used to set the gateway mode. The second (optional) argument specifies the selection class (if 'client' was the first argument) or the gateway bandwidth (if -'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about +\&'server' was the first argument). If the node is a server this parameter is used to inform other nodes in the network about this node's internet connection bandwidth. Just enter any number (optionally followed by "kbit" or "mbit") and the batman-adv module will guess your appropriate gateway class. Use "/" to separate the down\(hy and upload rates. You can omit the upload rate and the module will assume an upload of download / 5. -- 1.7.10.4

10 years, 2 months

[B.A.T.M.A.N.] [PATCH] batman-adv: update copyright years

by Antonio Quartulli

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- bat_algo.h | 2 +- bat_iv_ogm.c | 2 +- bitarray.c | 2 +- bitarray.h | 2 +- bridge_loop_avoidance.c | 2 +- bridge_loop_avoidance.h | 2 +- compat.c | 2 +- compat.h | 2 +- debugfs.c | 2 +- debugfs.h | 2 +- distributed-arp-table.c | 2 +- distributed-arp-table.h | 2 +- gateway_client.c | 2 +- gateway_client.h | 2 +- gateway_common.c | 2 +- gateway_common.h | 2 +- hard-interface.c | 2 +- hard-interface.h | 2 +- hash.c | 2 +- hash.h | 2 +- icmp_socket.c | 2 +- icmp_socket.h | 2 +- main.c | 2 +- main.h | 2 +- originator.c | 2 +- originator.h | 2 +- packet.h | 2 +- ring_buffer.c | 2 +- ring_buffer.h | 2 +- routing.c | 2 +- routing.h | 2 +- send.c | 2 +- send.h | 2 +- soft-interface.c | 2 +- soft-interface.h | 2 +- sysfs.c | 2 +- sysfs.h | 2 +- translation-table.c | 2 +- translation-table.h | 2 +- types.h | 2 +- unicast.c | 2 +- unicast.h | 2 +- vis.c | 2 +- vis.h | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/bat_algo.h b/bat_algo.h index a0ba3bf..a4808c2 100644 --- a/bat_algo.h +++ b/bat_algo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 36b9727..72fe1bb 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/bitarray.c b/bitarray.c index 5453b17..9739824 100644 --- a/bitarray.c +++ b/bitarray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/bitarray.h b/bitarray.h index cebaae7..a81b932 100644 --- a/bitarray.h +++ b/bitarray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/bridge_loop_avoidance.c b/bridge_loop_avoidance.c index 9971892..30f4652 100644 --- a/bridge_loop_avoidance.c +++ b/bridge_loop_avoidance.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/bridge_loop_avoidance.h b/bridge_loop_avoidance.h index 196d9a0..dea2fbc 100644 --- a/bridge_loop_avoidance.h +++ b/bridge_loop_avoidance.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/compat.c b/compat.c index a2a6f09..6c8fec8 100644 --- a/compat.c +++ b/compat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/compat.h b/compat.h index dcf72ee..3d03a2f 100644 --- a/compat.h +++ b/compat.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/debugfs.c b/debugfs.c index e47555b..6ae8651 100644 --- a/debugfs.c +++ b/debugfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/debugfs.h b/debugfs.h index 3319e1f..f8c3849 100644 --- a/debugfs.h +++ b/debugfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/distributed-arp-table.c b/distributed-arp-table.c index 8e1d89d..7485a78 100644 --- a/distributed-arp-table.c +++ b/distributed-arp-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/distributed-arp-table.h b/distributed-arp-table.h index d060c03..125c8c6 100644 --- a/distributed-arp-table.h +++ b/distributed-arp-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2011-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2011-2013 B.A.T.M.A.N. contributors: * * Antonio Quartulli * diff --git a/gateway_client.c b/gateway_client.c index dd07c7e..074107f 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_client.h b/gateway_client.h index f0d129e..039902d 100644 --- a/gateway_client.h +++ b/gateway_client.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.c b/gateway_common.c index 9001208..84bb2b1 100644 --- a/gateway_common.c +++ b/gateway_common.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/gateway_common.h b/gateway_common.h index 13697f6..509b2bf 100644 --- a/gateway_common.h +++ b/gateway_common.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/hard-interface.c b/hard-interface.c index f1d37cd..78cf350 100644 --- a/hard-interface.c +++ b/hard-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hard-interface.h b/hard-interface.h index 3732366..308437d 100644 --- a/hard-interface.h +++ b/hard-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/hash.c b/hash.c index 15a849c..7198daf 100644 --- a/hash.c +++ b/hash.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index ea02148..1b4da72 100644 --- a/hash.h +++ b/hash.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2006-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/icmp_socket.c b/icmp_socket.c index 87ca809..0ba6c89 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/icmp_socket.h b/icmp_socket.h index 29443a1..1fcca37 100644 --- a/icmp_socket.h +++ b/icmp_socket.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/main.c b/main.c index f65a222..21fe698 100644 --- a/main.c +++ b/main.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/main.h b/main.h index a1cd1b1..7cebbfd 100644 --- a/main.h +++ b/main.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/originator.c b/originator.c index 92a55fd..457ea44 100644 --- a/originator.c +++ b/originator.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2009-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/originator.h b/originator.h index 9778e65..286bf74 100644 --- a/originator.h +++ b/originator.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/packet.h b/packet.h index cb6405b..ed0aa89 100644 --- a/packet.h +++ b/packet.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/ring_buffer.c b/ring_buffer.c index c8f61e3..ccab0bb 100644 --- a/ring_buffer.c +++ b/ring_buffer.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/ring_buffer.h b/ring_buffer.h index fda8c17..3f92ae2 100644 --- a/ring_buffer.h +++ b/ring_buffer.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/routing.c b/routing.c index db89238..60ba03f 100644 --- a/routing.c +++ b/routing.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/routing.h b/routing.h index 9262279..99eeafa 100644 --- a/routing.h +++ b/routing.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.c b/send.c index 0b6f65b..80ca65f 100644 --- a/send.c +++ b/send.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/send.h b/send.h index 0078dec..38e662f 100644 --- a/send.h +++ b/send.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.c b/soft-interface.c index a8eb963..9927afa 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/soft-interface.h b/soft-interface.h index 07a08fe..43182e5 100644 --- a/soft-interface.h +++ b/soft-interface.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/sysfs.c b/sysfs.c index 84a55cb..afbba31 100644 --- a/sysfs.c +++ b/sysfs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/sysfs.h b/sysfs.h index 3fd1412..479acf4 100644 --- a/sysfs.h +++ b/sysfs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Marek Lindner * diff --git a/translation-table.c b/translation-table.c index 877acd1..fb15b4c 100644 --- a/translation-table.c +++ b/translation-table.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/translation-table.h b/translation-table.h index 46d4451..ab8e683 100644 --- a/translation-table.h +++ b/translation-table.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich, Antonio Quartulli * diff --git a/types.h b/types.h index 03197f5..89ac1fb 100644 --- a/types.h +++ b/types.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2007-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * diff --git a/unicast.c b/unicast.c index f56bccf..50e079f 100644 --- a/unicast.c +++ b/unicast.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/unicast.h b/unicast.h index 61abba5..429cf8a 100644 --- a/unicast.h +++ b/unicast.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2010-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2010-2013 B.A.T.M.A.N. contributors: * * Andreas Langer * diff --git a/vis.c b/vis.c index 2e70ec1..22d2785 100644 --- a/vis.c +++ b/vis.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2008-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis.h b/vis.h index 873282f..ad92b0e 100644 --- a/vis.h +++ b/vis.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2008-2012 B.A.T.M.A.N. contributors: +/* Copyright (C) 2008-2013 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * -- 1.8.0.2

10 years, 2 months

[B.A.T.M.A.N.] [PATCHv2] batman-adv: Start new development cycle

by Antonio Quartulli

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 866a1f0..a1cd1b1 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2012.5.0" +#define BATADV_SOURCE_VERSION "2013.0.0" #endif /* B.A.T.M.A.N. parameters */ -- 1.8.0.2

10 years, 2 months

[B.A.T.M.A.N.] Announcing the Wireless Battle Mesh v6 (15th of April - 21st of April 2013, Aalborg, Denmark)

by Martin Hundebøll

========================================================== Announcing the Wireless Battle Mesh v6 (15th of April - 21st of April 2013, Aalborg, Denmark) ========================================================== The next 'Wireless Battle of the Mesh' will take place from Mon 15th till Sun 21st of April at the University of Aalborg, Denmark. The event aims to bring together people from across the globe to test the performance of different routing protocols for ad-hoc networks, like Babel, B.A.T.M.A.N., BMX, OLSR, and 802.11s. Of course, new protocols (working on OpenWRT) are always welcome! It is not required to be active within the mentioned protocols, so if you are a mesh networking enthusiast, community networking activist, or have an interest in mesh networks in general, you have to check this out! Information about the event is gathered at: http://battlemesh.org/BattleMeshV6 Location ======== The event takes place at the University of Aalborg, Denmark. There will be room for hacking with software and hardware, talks and presentations, as well as informal discussions between participants. Participant Registration and Fee ================================ The event itself is free of charge and open for all, so to register without hotel and food supply, simply add your name to the participant table. http://battlemesh.org/BattleMeshV6/Participants If you wish low cost cost accomodation and low cost food supply, several special group bookings have been arranged. Payment in advance is required to get the full benefit of the discount. Therefore, this year's edition features an "early bird low cost" registration program: A bed in a nearby hotel from Monday till Sunday plus breakfast and dinner for the entire week are available for 1500 DKK (~201€) if the payment is made before February 15th, 2013. The price goes up to 1900 DKK (~255€) for all payments made after February 15th. These late arrangements are subject to availability. Of course, this package is not compulsory. You can also find your own bed and food supply yourself during the event if you wish to do so. Credit card payments for accomodation and food can be carried out here: https://www.erap.aau.dk/event/index.php/bmv6 Warm Up ======= As with Wireless BattleMesh V5 in Athens, we would like to arrange a warm up event in the preceeding weekend. So far, we have explored options like Djurslands Net and Net4Samsø, but nothing is final yet. Suggestions and ideas for this is more than welcome! Spread the Word =============== Feel free to spread the word by forwarding this mail to all lists / people that might be interested in it. Blogging about the event is more than welcome, and if you do so, please add a ping-back to the wiki page: http://battlemesh.org/BattleMeshV6 Contact ======= * Web: http://battlemesh.org/BattleMeshV6 * Email: http://ml.ninux.org/mailman/listinfo/battlemesh * IRC: irc.freenode.net #battlemesh

10 years, 2 months

Re: [B.A.T.M.A.N.] Packet-Loss-Peaks in a Freifunk-Network

by Marek Lindner

On Thursday, January 03, 2013 22:16:32 Jan Lühr wrote: > We noticed a few, unusual things: > -> regardless of the link tested (kif or fastd3) and regardless of the node > (node1, node2) small interruptions (loss-peaks) are appearing. -> These > peaks appear almost synchronous, a few "noise" comes from different > vpn-links and node-wan-uplinks. -> Since all links are wired, radio-noise > won't have an impact > -> The losses appear in batman-adv 2011.2.0 as well as in batman-adv > 2012.4.0. Thus I suspect that batman-adv is triggering theses > interruptions. If you believe batman-adv is the culprit, please remove batman-adv from your test setup and repeat the exact same test. Otherwise we move into the realm of speculation. Haven't heard of any "peak loss" due to batman-adv. Cheers, Marek PS: Forgot to click "reply to all", sorry for that.

10 years, 2 months

[B.A.T.M.A.N.] [PATCH] batman-adv: Start new development cycle

by Antonio Quartulli

Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 866a1f0..bd1c2c5 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #define BATADV_DRIVER_DEVICE "batman-adv" #ifndef BATADV_SOURCE_VERSION -#define BATADV_SOURCE_VERSION "2012.5.0" +#define BATADV_SOURCE_VERSION "2012.6.0" #endif /* B.A.T.M.A.N. parameters */ -- 1.8.0.2

10 years, 2 months

[B.A.T.M.A.N.] Packet-Loss-Peaks in a Freifunk-Network

by Jan Lühr

Hello folks, we spent some effort in measuring the stability on our freifunk-network. The networt itself consists of two networks. - Tinc-VPN, batman-adv 2011.2.0 - fastd-VPN, batman-adv 2012.4.0 The fastd-network has two gateways (kif and fastd3) and two nodes. Each node is connected to both gateways. (Example output of batctl o see below) Please take a look at: http://kbu.freifunk.net/index.php?title=Statistik#Ping_innerhalb_des_Freifu… While the first chart shows the stability of a node connected directly via tincy, the later ones use fastd. - Chart 2 shows kif -> node1 - Chart 3 shows fastd3 -> node1 - Chart 4 shows kif -> node2 We noticed a few, unusual things: -> regardless of the link tested (kif or fastd3) and regardless of the node (node1, node2) small interruptions (loss-peaks) are appearing. -> These peaks appear almost synchronous, a few "noise" comes from different vpn-links and node-wan-uplinks. -> Since all links are wired, radio-noise won't have an impact -> The losses appear in batman-adv 2011.2.0 as well as in batman-adv 2012.4.0. Thus I suspect that batman-adv is triggering theses interruptions. Have you notice same problems in past? Is there a way to fix these outages? Thanks, Keep smiling yanosz # batctl o [B.A.T.M.A.N. adv 2012.4.0, MainIF/MAC: wlan0-1/b2:48:7a:cb:2d:59 (bat0)] Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... vpn3 0.130s (255) vpn3 [ mesh-vpn]: kif (198) vpn3 (255) kif 0.280s (255) kif [ mesh-vpn]: vpn3 ( 0) kif (255) node1 2.700s (225) kif [ mesh-vpn]: kif (225) vpn3 (225) node2 3.110s (223) kif [ mesh-vpn]: kif (223) vpn3 (225)

10 years, 2 months

[B.A.T.M.A.N.] [PATCHv3] batman-adv: postpone OGM preparation to sending time

by Antonio Quartulli

OGMs are currently prepared 1 originator interval in advance then the time they are used to be sent. This means that once in the air they carry old information (like TT announcements and possibly other flags). To fix this, postpone the OGM creation to the same time of sending, in this way the OGM is first created and then immediately sent. This patch also removes a "magic" -2 operation that was introduced in the past to address the fact that batman-adv was sending "delayed OGM" plus the fact that the OGM seqno was increased right after having sent a new packet. Since this change is removing both the behaviours, the "magic" operation is not needed anymore. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> --- v3: * add more kernel doc v2: * added kernel doc * fixed sending time computation: previously msecs were summed to jiffies and max_aggregation_time was wrongly summed twice bat_iv_ogm.c | 139 +++++++++++++++++++++++++++++++++++++---------------------- types.h | 1 + 2 files changed, 89 insertions(+), 51 deletions(-) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index ff56fd5..244751c 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -54,39 +54,6 @@ out: return neigh_node; } -static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) -{ - struct batadv_ogm_packet *batadv_ogm_packet; - unsigned char *ogm_buff; - uint32_t random_seqno; - int res = -ENOMEM; - - /* randomize initial seqno to avoid collision */ - get_random_bytes(&random_seqno, sizeof(random_seqno)); - atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); - - hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; - ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); - if (!ogm_buff) - goto out; - - hard_iface->bat_iv.ogm_buff = ogm_buff; - - batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; - batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; - batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; - batadv_ogm_packet->header.ttl = 2; - batadv_ogm_packet->flags = BATADV_NO_FLAGS; - batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; - batadv_ogm_packet->tt_num_changes = 0; - batadv_ogm_packet->ttvn = 0; - - res = 0; - -out: - return res; -} - static void batadv_iv_ogm_iface_disable(struct batadv_hard_iface *hard_iface) { kfree(hard_iface->bat_iv.ogm_buff); @@ -116,16 +83,22 @@ batadv_iv_ogm_primary_iface_set(struct batadv_hard_iface *hard_iface) batadv_ogm_packet->header.ttl = BATADV_TTL; } -/* when do we schedule our own ogm to be sent */ +/** + * batadv_iv_ogm_emit_wait_time - compute the OGM preparation waiting time + * @bat_priv: the bat priv with all the soft interface information + * + * Returns the amount of jiffies to wait before preparing and sending the next + * own OGM + */ static unsigned long -batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) +batadv_iv_ogm_emit_wait_time(const struct batadv_priv *bat_priv) { unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; msecs += (random32() % 2 * BATADV_JITTER); - return jiffies + msecs_to_jiffies(msecs); + return msecs_to_jiffies(msecs); } /* when do we schedule a ogm packet to be sent */ @@ -459,7 +432,8 @@ out: /* aggregate a new packet into the existing ogm packet */ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, const unsigned char *packet_buff, - int packet_len, bool direct_link) + int packet_len, bool direct_link, + int own_packet) { unsigned char *skb_buff; unsigned long new_direct_link_flag; @@ -468,6 +442,7 @@ static void batadv_iv_ogm_aggregate(struct batadv_forw_packet *forw_packet_aggr, memcpy(skb_buff, packet_buff, packet_len); forw_packet_aggr->packet_len += packet_len; forw_packet_aggr->num_packets++; + forw_packet_aggr->own |= own_packet; /* save packet direct link flag status */ if (direct_link) { @@ -498,8 +473,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, /* find position for the packet in the forward queue */ spin_lock_bh(&bat_priv->forw_bat_list_lock); - /* own packets are not to be aggregated */ - if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) { + if ((atomic_read(&bat_priv->aggregated_ogms))) { hlist_for_each_entry(forw_packet_pos, tmp_node, &bat_priv->forw_bat_list, list) { if (batadv_iv_ogm_can_aggregate(batadv_ogm_packet, @@ -532,7 +506,7 @@ static void batadv_iv_ogm_queue_add(struct batadv_priv *bat_priv, if_incoming, own_packet); } else { batadv_iv_ogm_aggregate(forw_packet_aggr, packet_buff, - packet_len, direct_link); + packet_len, direct_link, own_packet); spin_unlock_bh(&bat_priv->forw_bat_list_lock); } } @@ -593,14 +567,39 @@ static void batadv_iv_ogm_forward(struct batadv_orig_node *orig_node, static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - unsigned char **ogm_buff = &hard_iface->bat_iv.ogm_buff; + + queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_iv.work, + batadv_iv_ogm_emit_wait_time(bat_priv)); +} + +/** + * batadv_iv_ogm_send - prepare an send an own OGM + * @work: kernel work struct + * + * Prepare the OGM and immediately enqueue it for sending + */ +static void batadv_iv_ogm_send(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct batadv_hard_iface_bat_iv *bat_iv; + struct batadv_hard_iface *primary_if, *hard_iface; + struct batadv_priv *bat_priv; + unsigned char **ogm_buff; struct batadv_ogm_packet *batadv_ogm_packet; - struct batadv_hard_iface *primary_if; - int *ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + int *ogm_buff_len; int vis_server, tt_num_changes = 0; uint32_t seqno; uint8_t bandwidth; + delayed_work = container_of(work, struct delayed_work, work); + bat_iv = container_of(delayed_work, struct batadv_hard_iface_bat_iv, + work); + hard_iface = container_of(bat_iv, struct batadv_hard_iface, bat_iv); + + bat_priv = netdev_priv(hard_iface->soft_iface); + ogm_buff = &hard_iface->bat_iv.ogm_buff; + ogm_buff_len = &hard_iface->bat_iv.ogm_buff_len; + vis_server = atomic_read(&bat_priv->vis_mode); primary_if = batadv_primary_if_get_selected(bat_priv); @@ -611,10 +610,9 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_ogm_packet = (struct batadv_ogm_packet *)(*ogm_buff); + seqno = (uint32_t)atomic_add_return(1, &hard_iface->bat_iv.ogm_seqno); /* change sequence number to network order */ - seqno = (uint32_t)atomic_read(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->seqno = htonl(seqno); - atomic_inc(&hard_iface->bat_iv.ogm_seqno); batadv_ogm_packet->ttvn = atomic_read(&bat_priv->tt.vn); batadv_ogm_packet->tt_crc = htons(bat_priv->tt.local_crc); @@ -637,12 +635,55 @@ static void batadv_iv_ogm_schedule(struct batadv_hard_iface *hard_iface) batadv_slide_own_bcast_window(hard_iface); batadv_iv_ogm_queue_add(bat_priv, hard_iface->bat_iv.ogm_buff, hard_iface->bat_iv.ogm_buff_len, hard_iface, 1, - batadv_iv_ogm_emit_send_time(bat_priv)); + batadv_iv_ogm_fwd_send_time()); if (primary_if) batadv_hardif_free_ref(primary_if); } +/** + * batadv_iv_ogm_iface_enable - initialize protocol specific hard_iface members + * @hard_iface: the interface getting enabled + * + * Returns 0 on success and a negative value representing the error in case of + * failure + * + */ +static int batadv_iv_ogm_iface_enable(struct batadv_hard_iface *hard_iface) +{ + struct batadv_ogm_packet *batadv_ogm_packet; + unsigned char *ogm_buff; + uint32_t random_seqno; + int res = -ENOMEM; + + /* randomize initial seqno to avoid collision */ + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&hard_iface->bat_iv.ogm_seqno, random_seqno); + + hard_iface->bat_iv.ogm_buff_len = BATADV_OGM_HLEN; + ogm_buff = kmalloc(hard_iface->bat_iv.ogm_buff_len, GFP_ATOMIC); + if (!ogm_buff) + goto out; + + hard_iface->bat_iv.ogm_buff = ogm_buff; + + batadv_ogm_packet = (struct batadv_ogm_packet *)ogm_buff; + batadv_ogm_packet->header.packet_type = BATADV_IV_OGM; + batadv_ogm_packet->header.version = BATADV_COMPAT_VERSION; + batadv_ogm_packet->header.ttl = 2; + batadv_ogm_packet->flags = BATADV_NO_FLAGS; + batadv_ogm_packet->tq = BATADV_TQ_MAX_VALUE; + batadv_ogm_packet->tt_num_changes = 0; + batadv_ogm_packet->ttvn = 0; + + INIT_DELAYED_WORK(&hard_iface->bat_iv.work, batadv_iv_ogm_send); + + res = 0; + +out: + return res; +} + static void batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, @@ -998,7 +1039,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, bool is_single_hop_neigh = false; bool is_from_best_next_hop = false; int is_duplicate, sameseq, simlar_ttl; - uint32_t if_incoming_seqno; uint8_t *prev_sender; /* Silently drop when the batman packet is actually not a @@ -1016,9 +1056,6 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, if (batadv_ogm_packet->header.packet_type != BATADV_IV_OGM) return; - /* could be changed by schedule_own_packet() */ - if_incoming_seqno = atomic_read(&if_incoming->bat_iv.ogm_seqno); - if (batadv_ogm_packet->flags & BATADV_DIRECTLINK) has_directlink_flag = 1; else @@ -1108,7 +1145,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, spin_lock_bh(&orig_neigh_node->ogm_cnt_lock); word = &(orig_neigh_node->bcast_own[offset]); - bit_pos = if_incoming_seqno - 2; + bit_pos = atomic_read(&if_incoming->bat_iv.ogm_seqno); bit_pos -= ntohl(batadv_ogm_packet->seqno); batadv_set_bit(word, bit_pos); weight = &orig_neigh_node->bcast_own_sum[if_num]; diff --git a/types.h b/types.h index 030ce41..978381a 100644 --- a/types.h +++ b/types.h @@ -49,6 +49,7 @@ struct batadv_hard_iface_bat_iv { unsigned char *ogm_buff; int ogm_buff_len; atomic_t ogm_seqno; + struct delayed_work work; }; struct batadv_hard_iface { -- 1.8.0.2

10 years, 2 months

[B.A.T.M.A.N.] [PATCH 20/29] batman-adv: rename random32() to prandom_u32()

by Akinobu Mita

Use more preferable function name which implies using a pseudo-random number generator. Signed-off-by: Akinobu Mita <akinobu.mita(a)gmail.com> Cc: Marek Lindner <lindner_marek(a)yahoo.de> Cc: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Cc: Antonio Quartulli <ordex(a)autistici.org> Cc: b.a.t.m.a.n(a)lists.open-mesh.org Cc: "David S. Miller" <davem(a)davemloft.net> Cc: netdev(a)vger.kernel.org --- net/batman-adv/bat_iv_ogm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index 7d02ebd..bc434c4 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -123,7 +123,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) unsigned int msecs; msecs = atomic_read(&bat_priv->orig_interval) - BATADV_JITTER; - msecs += random32() % (2 * BATADV_JITTER); + msecs += prandom_u32() % (2 * BATADV_JITTER); return jiffies + msecs_to_jiffies(msecs); } @@ -131,7 +131,7 @@ batadv_iv_ogm_emit_send_time(const struct batadv_priv *bat_priv) /* when do we schedule a ogm packet to be sent */ static unsigned long batadv_iv_ogm_fwd_send_time(void) { - return jiffies + msecs_to_jiffies(random32() % (BATADV_JITTER / 2)); + return jiffies + msecs_to_jiffies(prandom_u32() % (BATADV_JITTER / 2)); } /* apply hop penalty for a normal link */ -- 1.7.11.7

10 years, 2 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2013