[B.A.T.M.A.N.] [PATCH 09/20] batman-adv: Route multicast tracker packets

Linus Lüssing
2010-12-07T22:32:19Z

This commit adds the ability to also forward a received multicast
tracker packet (if necessary). It also makes use of the same splitting
methods introduced with one of the previous commits, in case of multiple
next hop destinations.

Signed-off-by: Linus Lüssing <linus.luessing@saxnet.de>
---
hard-interface.c | 5 +++++
routing.c | 19 +++++++++++++++++++
routing.h | 1 +
3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/hard-interface.c b/hard-interface.c
index 2b502be..3b380e1 100644
--- a/hard-interface.c
+++ b/hard-interface.c
@@ -624,6 +624,11 @@ int batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
ret = recv_bcast_packet(skb, batman_if);
break;

+ /* multicast tracker packet */
+ case BAT_MCAST_TRACKER:
+ ret = recv_mcast_tracker_packet(skb, batman_if);
+ break;
+
/* vis packet */
case BAT_VIS:
ret = recv_vis_packet(skb, batman_if);
diff --git a/routing.c b/routing.c
index cf145b7..9c83006 100644
--- a/routing.c
+++ b/routing.c
@@ -35,6 +35,7 @@
#include "gateway_common.h"
#include "gateway_client.h"
#include "unicast.h"
+#include "multicast.h"

void slide_own_bcast_window(struct batman_if *batman_if)
{
@@ -1378,6 +1379,24 @@ int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if)
return NET_RX_SUCCESS;
}

+int recv_mcast_tracker_packet(struct sk_buff *skb, struct batman_if *recv_if)
+{
+ struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface);
+ struct mcast_tracker_packet *tracker_packet;
+ int hdr_size = sizeof(struct mcast_tracker_packet);
+
+ if (check_unicast_packet(skb, hdr_size) < 0)
+ return NET_RX_DROP;
+
+ tracker_packet = (struct mcast_tracker_packet *)skb->data;
+
+ route_mcast_tracker_packet(tracker_packet, skb->len, bat_priv);
+
+ dev_kfree_skb(skb);
+
+ return NET_RX_SUCCESS;
+}
+
int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if)
{
struct vis_packet *vis_packet;
diff --git a/routing.h b/routing.h
index d44b540..ad3f054 100644
--- a/routing.h
+++ b/routing.h
@@ -38,6 +38,7 @@ int recv_icmp_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_unicast_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_ucast_frag_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_bcast_packet(struct sk_buff *skb, struct batman_if *recv_if);
+int recv_mcast_tracker_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_vis_packet(struct sk_buff *skb, struct batman_if *recv_if);
int recv_bat_packet(struct sk_buff *skb, struct batman_if *recv_if);
struct neigh_node *find_router(struct bat_priv *bat_priv,
--
1.7.1