From patchwork Sat May 11 17:23:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Linus_L=C3=BCssing?= X-Patchwork-Id: 2958 Return-Path: Received: from mout.web.de (mout.web.de [212.227.17.12]) by open-mesh.org (Postfix) with ESMTP id 4AD2C60217D for ; Sat, 11 May 2013 19:23:45 +0200 (CEST) Received: from localhost ([91.102.9.98]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0MAdx1-1UhUv842wt-00BP5u; Sat, 11 May 2013 19:23:44 +0200 From: =?UTF-8?q?Linus=20L=C3=BCssing?= To: b.a.t.m.a.n@lists.open-mesh.org Date: Sat, 11 May 2013 19:23:27 +0200 Message-Id: <1368293014-30742-4-git-send-email-linus.luessing@web.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1368293014-30742-1-git-send-email-linus.luessing@web.de> References: <1368293014-30742-1-git-send-email-linus.luessing@web.de> MIME-Version: 1.0 X-Provags-ID: V02:K0:RGqToQYkfWppSTiyvmzgIqyBfFgRygFNmbv/Ls80JYi 6K5B8XjJL3duv6KO655X5hbIpnV+rcbdXtAvwnQoIzkkpC4dpd Xj2cUV+x0vzqr1LZorn+qhLUw8TLGsuMnR+q1FGbewXcqCQ1h+ rrazZrsL1SJbctHka4F8msqAi3iphMzXWgtGI+roDq/xWa2Aos 2iQCEH0ve8hWySnoOWCAA== Subject: [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Modified forwarding behaviour for multicast packets X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 May 2013 17:23:45 -0000 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. Signed-off-by: Linus Lüssing --- multicast.c | 42 ++++++++++++++++++++++++++++++++++++++++++ multicast.h | 8 ++++++++ soft-interface.c | 10 ++++++++++ translation-table.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ translation-table.h | 1 + 5 files changed, 105 insertions(+) diff --git a/multicast.c b/multicast.c index 95beac4..673d5f1 100644 --- a/multicast.c +++ b/multicast.c @@ -218,6 +218,48 @@ out: } /** + * batadv_mcast_flood - Checks on how to forward a multicast packet + * @skb: The multicast packet to check + * @bat_priv: the bat priv with all the soft interface information + * + * Returns 1 if the packet should be flooded, 0 if it should be forwarded + * via unicast or -1 if it should be drooped. + */ +int batadv_mcast_flood(struct sk_buff *skb, struct batadv_priv *bat_priv) +{ + struct ethhdr *ethhdr = (struct ethhdr *)(skb->data); + struct ipv6hdr *ip6hdr; + int count, ret = 1; + + if (atomic_read(&bat_priv->mcast_group_awareness) && + !atomic_read(&bat_priv->mcast_num_non_aware) && + ntohs(ethhdr->h_proto) == ETH_P_IPV6) { + if (!pskb_may_pull(skb, sizeof(*ethhdr) + sizeof(*ip6hdr))) { + ret = -1; + goto out; + } + + ip6hdr = ipv6_hdr(skb); + + /* TODO: Implement Multicast Router Discovery, then add + * scope >= IPV6_ADDR_SCOPE_LINKLOCAL, too */ + if (IPV6_ADDR_MC_SCOPE(&ip6hdr->daddr) != + IPV6_ADDR_SCOPE_LINKLOCAL) + goto out; + + count = batadv_tt_global_hash_count(bat_priv, ethhdr->h_dest); + + if (!count) + ret = -1; + else if (count == 1) + ret = 0; + } + +out: + return ret; +} + +/** * batadv_mcast_tvlv_ogm_handler_v1 - process incoming multicast tvlv container * @bat_priv: the bat priv with all the soft interface information * @orig: the orig_node of the ogm diff --git a/multicast.h b/multicast.h index 9955a18..0c2baad 100644 --- a/multicast.h +++ b/multicast.h @@ -24,6 +24,8 @@ void batadv_mcast_mla_tt_update(struct batadv_priv *bat_priv); +int batadv_mcast_flood(struct sk_buff *skb, struct batadv_priv *bat_priv); + int batadv_mcast_init(struct batadv_priv *bat_priv); void batadv_mcast_free(struct batadv_priv *bat_priv); @@ -35,6 +37,12 @@ static inline void batadv_mcast_mla_tt_update(struct batadv_priv *bat_priv) return; } +static inline int batadv_mcast_flood(struct sk_buff *skb, + struct batadv_priv *bat_priv) +{ + return 1; +} + static inline int batadv_mcast_init(struct batadv_priv *bat_priv) { return 0; diff --git a/soft-interface.c b/soft-interface.c index c1142c2..831a618 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -36,6 +36,7 @@ #include #include #include "unicast.h" +#include "multicast.h" #include "bridge_loop_avoidance.h" #include "network-coding.h" @@ -222,6 +223,15 @@ static int batadv_interface_tx(struct sk_buff *skb, } } + if (do_bcast && !is_broadcast_ether_addr(ethhdr->h_dest)) { + ret = batadv_mcast_flood(skb, bat_priv); + if (ret < 0) + goto dropped; + + if (!ret) + do_bcast = false; + } + /* ethernet packet should be broadcasted */ if (do_bcast) { primary_if = batadv_primary_if_get_selected(bat_priv); diff --git a/translation-table.c b/translation-table.c index 37e7d47..1d2d618 100644 --- a/translation-table.c +++ b/translation-table.c @@ -83,6 +83,40 @@ batadv_tt_hash_find(struct batadv_hashtable *hash, const void *data) return tt_common_entry_tmp; } +/** + * batadv_tt_hash_count - Counts the number of tt entries for the given data + * @hash: hash table containing the tt entries + * @data: The data to count entries for + */ +static int batadv_tt_hash_count(struct batadv_hashtable *hash, const void *data) +{ + struct hlist_head *head; + struct batadv_tt_common_entry *tt_common_entry; + uint32_t index; + int count = 0; + + if (!hash) + goto out; + + index = batadv_choose_orig(data, hash->size); + head = &hash->table[index]; + + rcu_read_lock(); + hlist_for_each_entry_rcu(tt_common_entry, head, hash_entry) { + if (!batadv_compare_eth(tt_common_entry, data)) + continue; + + if (!atomic_read(&tt_common_entry->refcount)) + continue; + + count++; + } + rcu_read_unlock(); + +out: + return count; +} + static struct batadv_tt_local_entry * batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const void *data) { @@ -111,6 +145,16 @@ batadv_tt_global_hash_find(struct batadv_priv *bat_priv, const void *data) return tt_global_entry; } +/** + * batadv_tt_hash_count - Counts the number of global tt entries for some data + * @bat_priv: the bat priv with all the soft interface information + * @data: The data to count entries for + */ +int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const void *data) +{ + return batadv_tt_hash_count(bat_priv->tt.global_hash, data); +} + static void batadv_tt_local_entry_free_ref(struct batadv_tt_local_entry *tt_local_entry) { diff --git a/translation-table.h b/translation-table.h index 015d8b9..5986c57 100644 --- a/translation-table.h +++ b/translation-table.h @@ -31,6 +31,7 @@ int batadv_tt_global_seq_print_text(struct seq_file *seq, void *offset); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, struct batadv_orig_node *orig_node, const char *message); +int batadv_tt_global_hash_count(struct batadv_priv *bat_priv, const void *data); struct batadv_orig_node *batadv_transtable_search(struct batadv_priv *bat_priv, const uint8_t *src, const uint8_t *addr);