Antonio Quartulli | 1 Feb 2012 08:15
Gravatar

Re: [PATCH] batman-adv: pass the correct header size to interface_rx

On Tue, Jan 31, 2012 at 11:53:33PM +0100, Sven Eckelmann wrote:
> On Tuesday 31 January 2012 22:35:10 Antonio Quartulli wrote:
> > in recv_unicast_frag(), the third parameter of the interface_rx()
> > invocation, which is the size of the current header, is wrongly computed.
> 
> Really (actually it is the fourth, but I don't want to talk about that)? 
> Wasn't the reassembled unicast packet just a unicast packet and not a 
> unicast_frag packet (see frag_merge_packet)?
> 
> I could be wrong (didn't checked it), but I just have the feeling that the 
> current version could be correct.

I double checked a few second ago and yes, you are right. Once the packet has
been merged again it is a unicast_packet.

So, please guys, drop this patch.

Regards,

--

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara
Perazim | 2 Feb 2012 11:45
Picon
Favicon

some basic questions

I am trying batman-adv on trunk openwrt for ubiquiti bullet2. I am using
trunk because I want 2011.4.0.

In menuconfig I select Kernel Modules/Network Support/Kmod-batgat +
kmod-batman-adv + enable batctl.

Now I see that in Network/Routing and redirection/Batmand is auto
selected (I cannot deselect it)

Is this normal behavior? I see that besides the kmods, I also have
batmand installed on the router. I thought that this would have not been
included after the introduction of batman-adv.

Is this normal behavior or is there something wrong with menuconfig that
is causing batmand to be included?

Thanks,

Perazim

Jo-Philipp Wich | 2 Feb 2012 11:52
Gravatar

Re: some basic questions

Hi.

> Is this normal behavior or is there something wrong with menuconfig that
> is causing batmand to be included?

kmod-batgat belongs to the Layer 3 batman, do not select it.

~ Jow

Perazim | 3 Feb 2012 14:07
Picon
Favicon

Re: some basic questions

Thanks, that took care of the problem.

A followup question: I would rather use branch but it only has
batman-adv-2011.2.0 whereas the current version is 2011.4.0.

Followed the instructions here:

http://www.open-mesh.org/wiki/batman-adv/Building-with-openwrt

...
Changing the batman-adv / batctl version¶

It is also possible to modify the batman-adv version if you ever wanted
to build an older/newer version than configured in the package:

stable version:

Adjust the PKG_VERSION variable to download & build the stable release
you are interested in.

cat openwrt/feeds/packages/net/batman-adv/Makefile
[..]
PKG_VERSION:=2010.0.0
[..]

In doing this, I had to also update the md5sums for the sources.

I now receive this error while building:

make[3]: Leaving directory
(Continue reading)

Marek Lindner | 4 Feb 2012 11:16
Picon
Favicon

Re: some basic questions

On Friday, February 03, 2012 21:07:14 Perazim wrote:
> Thanks, that took care of the problem.
> 
> A followup question: I would rather use branch but it only has
> batman-adv-2011.2.0 whereas the current version is 2011.4.0.
> 
> Followed the instructions here:
> 
> http://www.open-mesh.org/wiki/batman-adv/Building-with-openwrt
>
> [..]
>
> Did something change between 2011.2.0 and 2011.4.0?

Yes, there were changes. You can check the svn history of the batman-adv 
package in OpenWrt or search through the mailing list archives. This question 
was asked & answered before.

Regards,
Marek

Sven Eckelmann | 4 Feb 2012 16:33
Favicon

Re: [PATCH] batman-adv: use ETH_ALEN instead of hardcoded numeric constants

On Monday 30 January 2012 20:59:17 Antonio Quartulli wrote:
> In packet.h the numeric constant 6 is used instead of the more portable
> ETH_ALEN define. This patch substitute any hardcoded value with such
> define.

Acked-by: Sven Eckelmann <sven@...>

Can you please also look through batctl tcpdump.h?

Thanks,
	Sven

> Signed-off-by: Antonio Quartulli <ordex@...>
> ---
>  packet.h |   26 +++++++++++++-------------
>  1 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/packet.h b/packet.h
> index 441f3db..3496d38 100644
> --- a/packet.h
> +++ b/packet.h
>  <at>  <at>  -100,8 +100,8  <at>  <at>  struct batman_ogm_packet {
>  	struct batman_header header;
>  	uint8_t  flags;    /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */
>  	uint32_t seqno;
> -	uint8_t  orig[6];
> -	uint8_t  prev_sender[6];
> +	uint8_t  orig[ETH_ALEN];
> +	uint8_t  prev_sender[ETH_ALEN];
>  	uint8_t  gw_flags;  /* flags related to gateway class */
(Continue reading)

Antonio Quartulli | 4 Feb 2012 16:52
Gravatar

[PATCH] batctl: use ETH_ALEN instead of hardcoded numeric constants

In tcpdump.h the numeric constants 6 is usedinstead of the more portable (and
readable) define ETH_ALEN. This patch substitute any hardcoded value with such
define.

Reported-by: Sven Eckelmann <sven@...>
Signed-off-by: Antonio Quartulli <ordex@...>
---
 tcpdump.h |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/tcpdump.h b/tcpdump.h
index 2a2cc0a..96989b4 100644
--- a/tcpdump.h
+++ b/tcpdump.h
 <at>  <at>  -21,6 +21,7  <at>  <at> 

 
 #include <netpacket/packet.h>
+#include <net/ethernet.h>
 #include "list-batman.h"

 #ifndef ARPHRD_IEEE80211_PRISM
 <at>  <at>  -65,11 +66,11  <at>  <at>  struct vlanhdr {
 struct ieee80211_hdr {
 	u_int16_t frame_control;
 	u_int16_t duration_id;
-	u_int8_t addr1[6];
-	u_int8_t addr2[6];
-	u_int8_t addr3[6];
+	u_int8_t addr1[ETH_ALEN];
(Continue reading)

Antonio Quartulli | 4 Feb 2012 16:53
Gravatar

Re: [PATCH] batman-adv: use ETH_ALEN instead of hardcoded numeric constants

On Sat, Feb 04, 2012 at 04:33:30PM +0100, Sven Eckelmann wrote:
> Can you please also look through batctl tcpdump.h?

Done, thank you for reporting!

Cheers,

--

-- 
Antonio Quartulli

..each of us alone is worth nothing..
Ernesto "Che" Guevara
Sven Eckelmann | 4 Feb 2012 17:34
Favicon

[RFCv2] batman-adv: Replace bitarray operations with bitmap

bitarray.c consists mostly of functionality that is already available as part
of the standard kernel API. batman-adv could use architecture optimized code
and reduce the binary size by switching to the standard functions.

Signed-off-by: Sven Eckelmann <sven@...>
---
Just renamed all functions to bat_xxx where xxx is the name of the function
used in the wrapper. Also all wrapper functions can now be inlined.

And yes, I didn't find a good way to deal with the bcast_own/bcast_own_sum
bitarray monster.

 bat_iv_ogm.c |   15 ++++---
 bitarray.c   |  118 ++++-----------------------------------------------------
 bitarray.h   |   26 +++++++++----
 main.h       |    2 +-
 routing.c    |    6 +-
 types.h      |    4 +-
 6 files changed, 41 insertions(+), 130 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 2b66dae..bbab00b 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
 <at>  <at>  -858,9 +858,9  <at>  <at>  static int bat_iv_ogm_update_seqnos(const struct ethhdr *ethhdr,
 	hlist_for_each_entry_rcu(tmp_neigh_node, node,
 				 &orig_node->neigh_list, list) {

-		is_duplicate |= get_bit_status(tmp_neigh_node->real_bits,
-					       orig_node->last_real_seqno,
(Continue reading)

Marek Lindner | 5 Feb 2012 15:35
Picon
Favicon

batman-adv 2012.0.0 released


Today the B.A.T.M.A.N. team releases its latest edition, 2012.0.0, containing 
a series of stabilization changes and bug fixes. This release does not 
introduce any new features and uniquely focuses on stability. As the kernel 
module always depends on the Linux kernel it was compiled against, it does not 
make sense to provide binaries on our website. As usual, you will find the 
signed tarballs in our download section: 

http://downloads.open-mesh.org/batman/releases/batman-adv-2012.0.0/ 

as well as prepackaged binaries in your distribution.

Thanks
------

Thanks to all people sending in patches:

 * Antonio Quartulli <ordex@...>
 * Dan Carpenter <dan.carpenter@...>
 * Marek Lindner <lindner_marek@...>
 * Paul Kot <pawlkt@...>
 * Simon Wunderlich <siwu@...>
 * Sven Eckelmann <sven@...>

batman-adv
----------

The gateway handling code was refactored as it became nearly impossible to 
understand the various gateway handling cases that were added over time. Also 
refactored was the TT handling code and a common subtype for locally and 
(Continue reading)


Gmane