gmane.org.freifunk.batman

[PATCH 2/2] batman-adv: fix typo in kernel doc

Antonio Quartulli — 2013-05-24T15:25:29

Now TT uses CRC32 instead of CRC16

Introduced by c5e7a06a29612056006e4dc01910c0b44e858583
("batman-adv: use CRC32C instead of CRC16 in TT code")

Signed-off-by: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ< at >public.gmane.org>
---
 translation-table.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/translation-table.c b/translation-table.c
index f6b96cb..08da23a 100644
--- a/translation-table.c
+++ b/translation-table.c
< at >< at > -2402,7 +2402,7 < at >< at > out:
  * < at >tt_buff: buffer holding the tt information
  * < at >tt_num_changes: number of tt changes inside the tt buffer
  * < at >ttvn: translation table version number of this changeset
- * < at >tt_crc: crc16 checksum of orig node's translation table
+ * < at >tt_crc: crc32 checksum of orig node's translation table
  */
 static void batadv_tt_update_orig(struct batadv_priv *bat_priv,
   struct batadv_orig_node *orig_node,

[PATCH 1/2] batman-adv: fix num_changes type touint16_t

Antonio Quartulli — 2013-05-24T15:25:28

Since the introduction of the tvlv_tt_data struct variables
storing the number of TT changes are always declared as
uint16_t, however some of them were not changed.

Switch them al to uint16_t.

Introduced by 8405301b979466610a726b7d595b6bfee5306cf7
("batman-adv: tvlv - convert tt data sent within OGMs")

Signed-off-by: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ< at >public.gmane.org>
---
 translation-table.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/translation-table.c b/translation-table.c
index 44e7789..f6b96cb 100644
--- a/translation-table.c
+++ b/translation-table.c
< at >< at > -1486,7 +1486,7 < at >< at > static void batadv_tt_req_list_free(struct batadv_priv *bat_priv)
 static void batadv_tt_save_orig_buffer(struct batadv_priv *bat_priv,
        struct batadv_orig_node *orig_node,
        const unsigned char *tt_buff,
-       uint8_t tt_num_changes)
+       uint16_t tt_num_changes)
 {
 uint16_t tt_buff_len = batadv_tt_len(tt_num_changes);
 
< at >< at > -2407,8 +2407,8 < at >< at > out:
 st

[PATCH] batman-adv: correctly align the tt_tvlv_datastruct

Antonio Quartulli — 2013-05-24T13:04:44

4bytes long members must start at an address multiple of 4
in order to avoid unaligned memory access.

Add 2 padding bytes to satisfy this requirement.

Introduced by c5e7a06a29612056006e4dc01910c0b44e858583
"batman-adv: use CRC32C instead of CRC16 in TT code"

Signed-off-by: Antonio Quartulli <ordex-GaUfNO9RBHfsrOwW+9ziJQ< at >public.gmane.org>
---
 packet.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packet.h b/packet.h
index 21254a4..8675b52 100644
--- a/packet.h
+++ b/packet.h
< at >< at > -391,11 +391,13 < at >< at > struct batadv_tvlv_gateway_data {
  * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
  * < at >flags: translation table flags (see batadv_tt_data_flags)
  * < at >ttvn: translation table version number
+ * < at >reserved: not used, useful for alignment purposes
  * < at >crc: crc32 checksum of the local translation table
  */
 struct batadv_tvlv_tt_data {
 uint8_t flags;
 uint8_t ttvn;
+uint16_t reserved;
 __be32  crc;
 };

Re: Basic Multicast Optimizations

Marek Lindner — 2013-05-24T09:33:22

Hi,

On Friday, May 24, 2013 16:02:25 Linus Lüssing wrote:

we discussed this further and concluded that we can't simply make that 
decision. The order in which patches are going to be merged into net has to be 
decided by David Miller. So, please prepare a patch destined for net, send it 
to netdev (cc the batman ml if you like) to explain what we are planning to do 
and ask for advice.

Cheers,
Marek

[PATCH] batman-adv: fix typo in kernel doc

Antonio Quartulli — 2013-05-24T09:21:25

From: Antonio Quartulli <antonio-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

Introduced by 8405301b979466610a726b7d595b6bfee5306cf7
("batman-adv: tvlv - convert tt data sent within OGMs")

Signed-off-by: Antonio Quartulli <antonio-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 packet.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packet.h b/packet.h
index 2a73ebd..21254a4 100644
--- a/packet.h
+++ b/packet.h
< at >< at > -388,7 +388,7 < at >< at > struct batadv_tvlv_gateway_data {
 };
 
 /**
- * struct tvlv_tt_data - tt data propagated through the tt tvlv container
+ * struct batadv_tvlv_tt_data - tt data propagated through the tt tvlv container
  * < at >flags: translation table flags (see batadv_tt_data_flags)
  * < at >ttvn: translation table version number
  * < at >crc: crc32 checksum of the local translation table

Re: Basic Multicast Optimizations

Antonio Quartulli — 2013-05-24T09:06:43

I think (but I am not sure) that the TT-VLAN feature that I just sent to the ml
(I have to send v3..) could probably help in this direction, because a TT entry
is not defined by its MAC address only anymore, but by the couple {MAC, vid}.

Since your code uses the TT to store the multicast addresses, I think that VLAN
support can be added "easily"[tm] after the TT-VLAN code will be in.


Cheers,

Re: Basic Multicast Optimizations

Linus Lüssing — 2013-05-24T09:00:50

* VLAN support was not added yet as this will be some more work. Any
vlan frames with a multicast destination will still get flooded
for now so at least these patches shouldn't introduce any
regressions for those. However I have to admit that I didn't think
of VLANs yet and Marek suggested to check how much extra work it
might create later compared to adding that right from the start.
I'll have a look at that.

[PATCHv2 3/3] batman-adv: Modified forwardingbehaviour for multicast packets

Linus Lüssing — 2013-05-24T08:02:28

With this patch a multicast packet is not always simply flooded anymore,
the bevahiour for the following cases is changed to reduce
unnecessary overhead:

If all nodes within the horizon of a certain node have signalized
multicast listener announcement capability
(BATADV_MCAST_LISTENER_ANNOUNCEMENT) then an IPv6 multicast packet
with a destination of IPv6 link-local scope coming from the upstream
of this node...

* ...is dropped if there is no according multicast listener in the
  translation table,
* ...is forwarded via unicast if there is a single node with interested
  multicast listeners
* ...and otherwise still gets flooded.

Signed-off-by: Linus Lüssing <linus.luessing-S0/GAf8tV78< at >public.gmane.org>
---
 multicast.c         |   43 +++++++++++++++++++++++++++++++++
 multicast.h         |    8 +++++++
 soft-interface.c    |   10 ++++++++
 translation-table.c |   66 +++++++++++++++++++++++++++++++++++++++++++++++++++
 translation-table.h |    1 +
 5 files changed, 128 insertions(+)

diff --git a/multicast

[PATCHv2 2/3] batman-adv: Announce new capabilityvia multicast TVLV

Linus Lüssing — 2013-05-24T08:02:27

If the soft interface of a node is not part of a bridge then a node
announces a new multicast TVLV: The according flag
(BATADV_MCAST_LISTENER_ANNOUNCEMENT) signalizes that this node is
announcing all of its multicast listeners via the translation table
infrastructure. More precisely, all multicast listeners of scope greater
than link-local for IPv4 and of scope greater
or equal to link-local for IPv6.

Signed-off-by: Linus Lüssing <linus.luessing-S0/GAf8tV78< at >public.gmane.org>
---
 main.c           |    4 ++++
 multicast.c      |   62 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 multicast.h      |    7 ++++++
 originator.c     |    3 +++
 packet.h         |    7 ++++++
 soft-interface.c |    1 +
 types.h          |    4 ++++
 7 files changed, 86 insertions(+), 2 deletions(-)

diff --git a/main.c b/main.c
index 1c82c18..6ab5b2d 100644
--- a/main.c
+++ b/main.c
< at >< at > -145,6 +145,10 < at >< at > int batadv_mesh_init(struct net_device *soft_iface)
 if (ret < 0)
 goto err;
 
+ret = batadv_mcast_init(bat_priv);

[PATCHv2 1/3] batman-adv: Multicast ListenerAnnouncements via Translation Table

Linus Lüssing — 2013-05-24T08:02:26

With this patch a node which has no bridge interface on top of its soft
interface announces its local multicast listeners via the translation
table.

Signed-off-by: Linus Lüssing <linus.luessing-S0/GAf8tV78< at >public.gmane.org>
---
 Makefile               |    2 +
 Makefile.kbuild        |    1 +
 compat.c               |   21 +++++
 compat.h               |   18 ++++
 gen-compat-autoconf.sh |    1 +
 main.c                 |    6 ++
 main.h                 |    9 ++
 multicast.c            |  213 ++++++++++++++++++++++++++++++++++++++++++++++++
 multicast.h            |   43 ++++++++++
 soft-interface.c       |    3 +
 sysfs.c                |    6 ++
 translation-table.c    |   22 ++++-
 types.h                |   12 +++
 13 files changed, 353 insertions(+), 4 deletions(-)
 create mode 100644 multicast.c
 create mode 100644 multicast.h

diff --git a/Makefile b/Makefile
index 407cdc4..d7c6fa6 100644
--- a/Makefile
+++ b/Makefile
< at >< at > -27,6 +27,8 < at >< at > export CONFIG_BATMAN_ADV_BLA=y
 export CONFIG_BATMAN_ADV_DAT=y

Basic Multicast Optimizations

Linus Lüssing — 2013-05-24T08:02:25

This is the second revision of the basic multicast optimization patches.
It includes one functional fix and many style fixes, thanks to Antonios
feedback.

Three things were not included from these suggestions:

* The default mcast TVLV flags were left as it is not as easy to
switch. (see answer/explanation to [PATCH 2/3])
* for_each_pmc_rcu() was not moved to a commen net header file,
only a TODO was added. Will do that after this code might have
landed in net.


Additionally the limitation of 255 multicast listeners per originator
was removed (it was more a relic of the pre-TT announcement mechanism
and such limitations should be taken care of by the current TT
infrastructure instead).

Cheers, Linus

Re: [PATCHv2 6/7] batman-adv: add per VLAN interface attribute framework

Antonio Quartulli — 2013-05-24T07:03:46

ah, no I did not. :)
I'll add the prototype to compat.h


ok, will use 'softif'


ok, I will add 'interface'.


ops :)


ok


ops :)


I'll check, I remember there was a reason to do not use gat().


ok, I'll change it to softif as stated above.


yeah, softif everywhere! :D

Thanks a lot!

I'll send v3 and I'll include the BLA integration too.

Cheers,

Re: [PATCHv4] batman-adv: use htons when possible

Marek Lindner — 2013-05-24T06:42:01

Applied in revision 4a4f6b9.

Thanks,
Marek

Re: [PATCHv2 6/7] batman-adv: add per VLAN interfaceattribute framework

Marek Lindner — 2013-05-24T06:23:41

We have "now" twice in the same sentence. :)



I bet you didn't try to compile that on an older kernel ...



The naming could be better. Following your initial scheme this function should 
be called "batadv_priv_vlan_get". How about replacing "priv" with "softif" ? 
We'd end up with: 
 * batadv_softif_vlan_free_ref()
 * batadv_softif_vlan_get()



Again, the naming .. didn't we introduce a naming convention for each file ? 
soft-interface.c uses "interface" a lot. Why not using it ? For example,
batadv_interface_vid_add() ?


the

Returns ?



Same here. It should be batadv_interface_vid_kill() or something similar.



Returns ?



How about re-using your get() function from above ?



I am not so happy about the choice regarding the name again. The "batadv_priv" 
prefix has been introduced for bat_priv sub structs. Clearly, this isn't one 
but an element for a list. 



This leads to weird code like: bat_priv->priv_vlan_list_lock (priv twice) ..

Cheers,
Marek

[RFC 4/7] batman-adv: split out router from orig_node

Simon Wunderlich — 2013-05-23T21:21:09

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

For the network wide multi interface optimization there are different
routers for each outgoing interface (outgoing from the OGM perspective,
incoming for payload traffic). To reflect this, change the router and
associated data to a list of routers.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 bat_iv_ogm.c            |  385 +++++++++++++++++++++++++++++------------------
 distributed-arp-table.c |    3 +-
 gateway_client.c        |   10 +-
 icmp_socket.c           |    2 +-
 network-coding.c        |    9 +-
 originator.c            |  166 +++++++++++++++++++-
 originator.h            |   11 +-
 routing.c               |   42 +++++-
 routing.h               |    1 +
 translation-table.c     |    3 +-
 types.h                 |   25 ++-
 11 files changed, 483 insertions(+), 174 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index e98386c..f0b16d6 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c

[RFC 6/7] batman-adv: consider outgoing interface inOGM sending

Simon Wunderlich — 2013-05-23T21:21:11

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

The current OGM sending an aggregation functionality decides on
which interfaces a packet should be sent when it parses the forward
packet struct. However, with the network wide multi interface
optimization the outgoing interface is decided by the OGM processing
function.

This is reflected by moving the decision in the OGM processing function
and add the outgoing interface in the forwarding packet struct. This
practically implies that an OGM may be added multiple times (once per
outgoing interface), and this also affects aggregation which needs to
consider the outgoing interface as well.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 bat_iv_ogm.c |  133 +++++++++++++++++++++++++++++++++++++++-------------------
 send.c       |   13 ++++--
 types.h      |    7 +++-
 3 files changed, 104 insertions(+), 49 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 324bf5f..3fc900c 100644
--- a/bat_i

[RFC 7/7] batman-adv: add bonding again

Simon Wunderlich — 2013-05-23T21:21:12

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

With the new interface alternating, the first hop may send packets
in a round robin fashion to it's neighbors because it has multiple
valid routes built by the multi interface optimization. This patch
enables the feature if bonding is selected. Note that unlike the
bonding implemented before, this version is much simpler and may
even enable multi path routing to a certain degree.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 routing.c |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 routing.h |    2 +-
 types.h   |    2 ++
 3 files changed, 104 insertions(+), 4 deletions(-)

diff --git a/routing.c b/routing.c
index c1b6d85..87591b6 100644
--- a/routing.c
+++ b/routing.c
< at >< at > -403,9 +403,15 < at >< at > static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
 struct batadv_neigh_node *
 batadv_find_router(struct batadv_priv *bat_priv,
    struct batadv_orig_node *orig_node,
-

[RFC 5/7] batman-adv: add WiFi penalty

Simon Wunderlich — 2013-05-23T21:21:10

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

If the same interface is used for sending and receiving, there might be
throughput degradation on half-duplex interfaces such as WiFi. Add a
penalty if the same interface is used to reflect this problem in the
metric.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 bat_iv_ogm.c     |   26 ++++++++++++++++++++++----
 hard-interface.c |    2 +-
 hard-interface.h |    1 +
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index f0b16d6..324bf5f 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
< at >< at > -901,6 +901,7 < at >< at > static int batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node,
 uint8_t orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own;
 unsigned int neigh_rq_inv_cube, neigh_rq_max_cube;
 int tq_asym_penalty, inv_asym_penalty, ret = 0;
+int tq_iface_penalty;
 unsigned int combined_tq;
 
 /* find corresponding one hop neighbor */
< at >< at > -983,15 +984,32 < at >< at > stati

[RFC 3/7] batman-adv: split tq information inneigh_node struct

Simon Wunderlich — 2013-05-23T21:21:08

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

For the network wide multi interface optimization it is required to save
metrics per outgoing interface in one neighbor. Therefore a new type is
introduced to keep interface-specific information. This also requires
some changes in access and list management.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 bat_iv_ogm.c        |  133 +++++++++++++++++++++++++++++++++------------
 gateway_client.c    |   68 +++++++++++++++++++----
 originator.c        |  149 +++++++++++++++++++++++++++++++++++++++++++++------
 originator.h        |    3 ++
 translation-table.c |   11 +++-
 types.h             |   35 ++++++++----
 6 files changed, 325 insertions(+), 74 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index a340f9a..e98386c 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
< at >< at > -70,6 +70,7 < at >< at > static uint8_t batadv_ring_buffer_avg(const uint8_t lq_recv[])
 
 return (uint8_t)(sum / count);
 }
+
 static stru

[RFC 2/7] batman-adv: remove bonding and interfacealternating

Simon Wunderlich — 2013-05-23T21:21:07

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

Remove bonding and interface alternating code - it will be replaced
by a new, network-wide multi interface optimization which enables
both bonding and interface alternating in a better way.

Keep the sysfs and find router function though, this will be needed
later.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 bat_iv_ogm.c |    7 --
 originator.c |   13 +--
 routing.c    |  281 +++-------------------------------------------------------
 routing.h    |    8 --
 types.h      |   10 +--
 5 files changed, 13 insertions(+), 306 deletions(-)

diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c
index 2b94fdd..a340f9a 100644
--- a/bat_iv_ogm.c
+++ b/bat_iv_ogm.c
< at >< at > -82,8 +82,6 < at >< at > batadv_iv_ogm_neigh_new(struct batadv_hard_iface *hard_iface,
 if (!neigh_node)
 goto out;
 
-INIT_LIST_HEAD(&neigh_node->bonding_list);
-
 neigh_node->orig_node = orig_neigh;
 neigh_node->if_incoming = hard_iface;
 
< at >< at > -794,8 +792,6 < at >

[RFC 1/7] batman-adv: remove useless find_routerlook up

Simon Wunderlich — 2013-05-23T21:21:06

From: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>

This is not used anymore with the new fragmentation, and it might
actually mess up the bonding code because find_router() assumes it
is only called once per packet.

Signed-off-by: Simon Wunderlich <simon-2BnEqQcu77q1Z/+hSey0Gg< at >public.gmane.org>
---
 send.c |   29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

diff --git a/send.c b/send.c
index 32690c6..616364e 100644
--- a/send.c
+++ b/send.c
< at >< at > -251,30 +251,19 < at >< at > int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,
 struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
 struct batadv_unicast_packet *unicast_packet;
 struct batadv_orig_node *orig_node;
-struct batadv_neigh_node *neigh_node;
 int ret = NET_RX_DROP;
 
 /* get routing information */
-if (is_multicast_ether_addr(ethhdr->h_dest)) {
+if (is_multicast_ether_addr(ethhdr->h_dest))
 orig_node = batadv_gw_get_selected_orig(bat_priv);
-if (orig_node)
-goto find_router;
-}