diff mbox

batman-adv: refine API calls for unicast transmissions of SKBs

Message ID 1372507359-2075-1-git-send-email-linus.luessing@web.de (mailing list archive)
State Superseded, archived
Headers

Commit Message

Linus Lüssing June 29, 2013, 12:02 p.m. UTC 
  With this patch the functions batadv_send_skb_unicast() and
batadv_send_skb_unicast_4addr() are further refined into
batadv_send_skb_tt(), batadv_send_skb_tt_4addr() and
batadv_send_skb_gw(). This way we avoid any guessing about where to send
a packet in the unicast forwarding methods and let the callers decide.

This is going to be useful for the upcoming multicast related patches in
particular.

Signed-off-by: Linus Lüssing <linus.luessing@web.de>
---
 distributed-arp-table.c |    7 ++--
 send.c                  |   88 ++++++++++++++++++++++++++++++++++++++---------
 send.h                  |   52 ++++++++++++++++++----------
 soft-interface.c        |    6 +++-
 4 files changed, 112 insertions(+), 41 deletions(-)

Comments

Antonio Quartulli July 1, 2013, 7:49 p.m. UTC | #1 
On Sat, Jun 29, 2013 at 02:02:39PM +0200, Linus Lüssing wrote:
> +/**
> + * batadv_send_skb_generic_tt - send an skb to a translation table node

I don't really like the expression "translation table node"..it looks like we
have different type of nodes...What about a simple"to a destination using the
Translation Table" ? you can go on a new line with the short description, if
needed.

> + * @bat_priv: the bat priv with all the soft interface information
> + * @skb: payload to send
> + * @packet_type: the batman unicast packet type to use
> + * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast
> + *  4addr packets)
> + * @vid: the vid to be used to search the translation table
> + *
> + * Look up the destination node for the destination address in the ethernet
> + * header via the translation table.

What about substituting "destination node" with "recipient node" to avoid
repeating destination?

> + *
> + * Wrap the given skb into a batman-adv unicast or unicast-4addr header
> + * depending on whether BATADV_UNICAST or BATADV_UNICAST_4ADDR was supplied
> + * as packet_type.
> + *
> + * Then send this frame to the according destination node.

Since the above is a list of steps performed by the function, I'd rather remove
the blank lines you've added between the paragraphs.

[...]

>  /**
> - * batadv_send_unicast_skb - send the skb encapsulated in a unicast packet
> + * batadv_send_skb_tt - send an skb to a translation table node

same as above

>   * @bat_priv: the bat priv with all the soft interface information
>   * @skb: the payload to send
>   * @vid: the vid to be used to search the translation table
>   *
> + * Look up the destination node for the destination address in the ethernet
> + * header via the translation table.
> + *

same as above

> + * Wrap the given skb into a batman-adv unicast header.
> + *
> + * Then send this frame to the according destination node.
> + *

same as above

>  /**
> - * batadv_send_4addr_unicast_skb - send the skb encapsulated in a unicast 4addr
> - *  packet
> + * batadv_send_skb_tt_4addr - send an skb to a translation table node

same as above

>   * @bat_priv: the bat priv with all the soft interface information
>   * @skb: the payload to send
>   * @packet_subtype: the unicast 4addr packet subtype to use
>   * @vid: the vid to be used to search the translation table
>   *
> + * Look up the destination node for the destination address in the ethernet
> + * header via the translation table.
> + *
> + * Wrap the given skb into a batman-adv unicast-4addr header.
> + *
> + * Then send this frame to the according destination node.
> + *

same as above

>   * Returns 1 in case of error or 0 otherwise.
>   */
> -static inline int batadv_send_skb_unicast_4addr(struct batadv_priv *bat_priv,
> -						struct sk_buff *skb,
> -						int packet_subtype,
> -						unsigned short vid)
> +static inline int batadv_send_skb_tt_4addr(struct batadv_priv *bat_priv,
> +					   struct sk_buff *skb,
> +					   int packet_subtype,
> +					   unsigned short vid)
>  {
> -	return batadv_send_skb_generic_unicast(bat_priv, skb,
> -					       BATADV_UNICAST_4ADDR,
> -					       packet_subtype, vid);
> +	return batadv_send_skb_generic_tt(bat_priv, skb,
> +					  BATADV_UNICAST_4ADDR,
> +					  packet_subtype, vid);
>  }
>  

I like this new API :)
If you are ok with my suggestions then you can also add 

Acked-by: Antonio Quartulli <ordex@autistici.org>

Cheers,
diff mbox

Patch

diff --git a/distributed-arp-table.c b/distributed-arp-table.c
index f2543c2..5399c29 100644
--- a/distributed-arp-table.c
+++ b/distributed-arp-table.c
@@ -1026,11 +1026,10 @@  bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
 	 * that a node not using the 4addr packet format doesn't support it.
 	 */
 	if (hdr_size == sizeof(struct batadv_unicast_4addr_packet))
-		err = batadv_send_skb_unicast_4addr(bat_priv, skb_new,
-						    BATADV_P_DAT_CACHE_REPLY,
-						    vid);
+		err = batadv_send_skb_tt_4addr(bat_priv, skb_new,
+					       BATADV_P_DAT_CACHE_REPLY, vid);
 	else
-		err = batadv_send_skb_unicast(bat_priv, skb_new, vid);
+		err = batadv_send_skb_tt(bat_priv, skb_new, vid);
 
 	if (!err) {
 		batadv_inc_counter(bat_priv, BATADV_CNT_DAT_CACHED_REPLY_TX);
diff --git a/send.c b/send.c
index b631355..c9c33d8 100644
--- a/send.c
+++ b/send.c
@@ -235,36 +235,34 @@  out:
 }
 
 /**
- * batadv_send_generic_unicast_skb - send an skb as unicast
+ * batadv_send_skb_unicast - encapsulate and send an skb via unicast
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: payload to send
  * @packet_type: the batman unicast packet type to use
  * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast
  *  4addr packets)
+ * @orig_node: the originator to send the packet to
  * @vid: the vid to be used to search the translation table
  *
- * Returns 1 in case of error or 0 otherwise.
+ * Wrap the given skb into a batman-adv unicast or unicast-4addr header
+ * depending on whether BATADV_UNICAST or BATADV_UNICAST_4ADDR was supplied
+ * as packet_type.
+ *
+ * Then send this frame to the given orig_node and release a reference to
+ * this orig_node.
+ *
+ * Return 1 in case of error or 0 otherwise.
  */
-int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,
-				    struct sk_buff *skb, int packet_type,
-				    int packet_subtype,
-				    unsigned short vid)
+static int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
+				   struct sk_buff *skb, int packet_type,
+				   int packet_subtype,
+				   struct batadv_orig_node *orig_node,
+				   unsigned short vid)
 {
 	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
 	struct batadv_unicast_packet *unicast_packet;
-	struct batadv_orig_node *orig_node;
 	int ret = NET_RX_DROP;
 
-	/* get routing information */
-	if (is_multicast_ether_addr(ethhdr->h_dest))
-		orig_node = batadv_gw_get_selected_orig(bat_priv);
-	else
-		/* check for tt host - increases orig_node refcount.
-		 * returns NULL in case of AP isolation
-		 */
-		orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
-						     ethhdr->h_dest, vid);
-
 	if (!orig_node)
 		goto out;
 
@@ -304,6 +302,62 @@  out:
 	return ret;
 }
 
+/**
+ * batadv_send_skb_generic_tt - send an skb to a translation table node
+ * @bat_priv: the bat priv with all the soft interface information
+ * @skb: payload to send
+ * @packet_type: the batman unicast packet type to use
+ * @packet_subtype: the unicast 4addr packet subtype (only relevant for unicast
+ *  4addr packets)
+ * @vid: the vid to be used to search the translation table
+ *
+ * Look up the destination node for the destination address in the ethernet
+ * header via the translation table.
+ *
+ * Wrap the given skb into a batman-adv unicast or unicast-4addr header
+ * depending on whether BATADV_UNICAST or BATADV_UNICAST_4ADDR was supplied
+ * as packet_type.
+ *
+ * Then send this frame to the according destination node.
+ *
+ * Return 1 in case of error or 0 otherwise.
+ */
+int batadv_send_skb_generic_tt(struct batadv_priv *bat_priv,
+			       struct sk_buff *skb, int packet_type,
+			       int packet_subtype, unsigned short vid)
+{
+	struct ethhdr *ethhdr = (struct ethhdr *)skb->data;
+	struct batadv_orig_node *orig_node;
+
+	orig_node = batadv_transtable_search(bat_priv, ethhdr->h_source,
+					     ethhdr->h_dest, vid);
+	return batadv_send_skb_unicast(bat_priv, skb, packet_type,
+				       packet_subtype, orig_node, vid);
+}
+
+/**
+ * batadv_send_skb_gw - send an skb to a gateway node
+ * @bat_priv: the bat priv with all the soft interface information
+ * @skb: payload to send
+ * @vid: the vid to be used to search the translation table
+ *
+ * Look up the currently selected gateway.
+ *
+ * Wrap the given skb into a batman-adv unicast header and send this frame
+ * to this gateway node.
+ *
+ * Return 1 in case of error or 0 otherwise.
+ */
+int batadv_send_skb_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
+		       unsigned short vid)
+{
+	struct batadv_orig_node *orig_node;
+
+	orig_node = batadv_gw_get_selected_orig(bat_priv);
+	return batadv_send_skb_unicast(bat_priv, skb, BATADV_UNICAST, 0,
+				       orig_node, vid);
+}
+
 void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)
 {
 	struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface);
diff --git a/send.h b/send.h
index c030cb7..87c4426 100644
--- a/send.h
+++ b/send.h
@@ -38,45 +38,59 @@  bool batadv_send_skb_prepare_unicast_4addr(struct batadv_priv *bat_priv,
 					   struct sk_buff *skb,
 					   struct batadv_orig_node *orig_node,
 					   int packet_subtype);
-int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv,
-				    struct sk_buff *skb, int packet_type,
-				    int packet_subtype,
-				    unsigned short vid);
+int batadv_send_skb_generic_tt(struct batadv_priv *bat_priv,
+			       struct sk_buff *skb, int packet_type,
+			       int packet_subtype, unsigned short vid);
+int batadv_send_skb_gw(struct batadv_priv *bat_priv, struct sk_buff *skb,
+		       unsigned short vid);
 
 /**
- * batadv_send_unicast_skb - send the skb encapsulated in a unicast packet
+ * batadv_send_skb_tt - send an skb to a translation table node
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the payload to send
  * @vid: the vid to be used to search the translation table
  *
+ * Look up the destination node for the destination address in the ethernet
+ * header via the translation table.
+ *
+ * Wrap the given skb into a batman-adv unicast header.
+ *
+ * Then send this frame to the according destination node.
+ *
  * Returns 1 in case of error or 0 otherwise.
  */
-static inline int batadv_send_skb_unicast(struct batadv_priv *bat_priv,
-					  struct sk_buff *skb,
-					  unsigned short vid)
+static inline int batadv_send_skb_tt(struct batadv_priv *bat_priv,
+				     struct sk_buff *skb,
+				     unsigned short vid)
 {
-	return batadv_send_skb_generic_unicast(bat_priv, skb, BATADV_UNICAST,
-					       0, vid);
+	return batadv_send_skb_generic_tt(bat_priv, skb, BATADV_UNICAST, 0,
+					  vid);
 }
 
 /**
- * batadv_send_4addr_unicast_skb - send the skb encapsulated in a unicast 4addr
- *  packet
+ * batadv_send_skb_tt_4addr - send an skb to a translation table node
  * @bat_priv: the bat priv with all the soft interface information
  * @skb: the payload to send
  * @packet_subtype: the unicast 4addr packet subtype to use
  * @vid: the vid to be used to search the translation table
  *
+ * Look up the destination node for the destination address in the ethernet
+ * header via the translation table.
+ *
+ * Wrap the given skb into a batman-adv unicast-4addr header.
+ *
+ * Then send this frame to the according destination node.
+ *
  * Returns 1 in case of error or 0 otherwise.
  */
-static inline int batadv_send_skb_unicast_4addr(struct batadv_priv *bat_priv,
-						struct sk_buff *skb,
-						int packet_subtype,
-						unsigned short vid)
+static inline int batadv_send_skb_tt_4addr(struct batadv_priv *bat_priv,
+					   struct sk_buff *skb,
+					   int packet_subtype,
+					   unsigned short vid)
 {
-	return batadv_send_skb_generic_unicast(bat_priv, skb,
-					       BATADV_UNICAST_4ADDR,
-					       packet_subtype, vid);
+	return batadv_send_skb_generic_tt(bat_priv, skb,
+					  BATADV_UNICAST_4ADDR,
+					  packet_subtype, vid);
 }
 
 #endif /* _NET_BATMAN_ADV_SEND_H_ */
diff --git a/soft-interface.c b/soft-interface.c
index d897194..e84ef45 100644
--- a/soft-interface.c
+++ b/soft-interface.c
@@ -289,7 +289,11 @@  static int batadv_interface_tx(struct sk_buff *skb,
 
 		batadv_dat_snoop_outgoing_arp_reply(bat_priv, skb);
 
-		ret = batadv_send_skb_unicast(bat_priv, skb, vid);
+		if (is_multicast_ether_addr(ethhdr->h_dest))
+			ret = batadv_send_skb_gw(bat_priv, skb, vid);
+		else
+			ret = batadv_send_skb_tt(bat_priv, skb, vid);
+
 		if (ret != 0)
 			goto dropped_freed;
 	}