Commit e91ecfc6 authored by Martin Hundebøll's avatar Martin Hundebøll Committed by Antonio Quartulli
Browse files

batman-adv: Move call to batadv_nc_skb_forward() from routing.c to send.c 



The call to batadv_nc_skb_forward() fits better in
batadv_send_skb_to_orig(), as this is where the actual next hop is
looked up.

To let the caller of batadv_send_skb_to_orig() know wether the skb is
transmitted, buffered or failed, the return value is changed from
boolean to int.

Signed-off-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
parent 5f80df67

net/batman-adv/network-coding.c

+2 −3
Original line number Diff line number Diff line
@@ -1359,18 +1359,17 @@ static bool batadv_nc_skb_add_to_path(struct sk_buff *skb, 
 *  buffer

 * @skb: data skb to forward

 * @neigh_node: next hop to forward packet to

 * @ethhdr: pointer to the ethernet header inside the skb

 *

 * Returns true if the skb was consumed (encoded packet sent) or false otherwise

 */

bool batadv_nc_skb_forward(struct sk_buff *skb,

			   struct batadv_neigh_node *neigh_node,

			   struct ethhdr *ethhdr)

			   struct batadv_neigh_node *neigh_node)

{

	const struct net_device *netdev = neigh_node->if_incoming->soft_iface;

	struct batadv_priv *bat_priv = netdev_priv(netdev);

	struct batadv_unicast_packet *packet;

	struct batadv_nc_path *nc_path;

	struct ethhdr *ethhdr = eth_hdr(skb);

	__be32 packet_id;

	u8 *payload;

net/batman-adv/network-coding.h

+2 −4
Original line number Diff line number Diff line
@@ -36,8 +36,7 @@ void batadv_nc_purge_orig(struct batadv_priv *bat_priv, 
void batadv_nc_init_bat_priv(struct batadv_priv *bat_priv);

void batadv_nc_init_orig(struct batadv_orig_node *orig_node);

bool batadv_nc_skb_forward(struct sk_buff *skb,

			   struct batadv_neigh_node *neigh_node,

			   struct ethhdr *ethhdr);

			   struct batadv_neigh_node *neigh_node);

void batadv_nc_skb_store_for_decoding(struct batadv_priv *bat_priv,

				      struct sk_buff *skb);

void batadv_nc_skb_store_sniffed_unicast(struct batadv_priv *bat_priv,
@@ -87,8 +86,7 @@ static inline void batadv_nc_init_orig(struct batadv_orig_node *orig_node) 
}



static inline bool batadv_nc_skb_forward(struct sk_buff *skb,

					 struct batadv_neigh_node *neigh_node,

					 struct ethhdr *ethhdr)

					 struct batadv_neigh_node *neigh_node)

{

	return false;

}

net/batman-adv/routing.c

+13 −10
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ static int batadv_recv_my_icmp_packet(struct batadv_priv *bat_priv, 
	icmp_packet->msg_type = BATADV_ECHO_REPLY;

	icmp_packet->header.ttl = BATADV_TTL;



	if (batadv_send_skb_to_orig(skb, orig_node, NULL))

	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)

		ret = NET_RX_SUCCESS;



out:
@@ -333,7 +333,7 @@ static int batadv_recv_icmp_ttl_exceeded(struct batadv_priv *bat_priv, 
	icmp_packet->msg_type = BATADV_TTL_EXCEEDED;

	icmp_packet->header.ttl = BATADV_TTL;



	if (batadv_send_skb_to_orig(skb, orig_node, NULL))

	if (batadv_send_skb_to_orig(skb, orig_node, NULL) != NET_XMIT_DROP)

		ret = NET_RX_SUCCESS;



out:
@@ -410,7 +410,7 @@ int batadv_recv_icmp_packet(struct sk_buff *skb, 
	icmp_packet->header.ttl--;



	/* route it */

	if (batadv_send_skb_to_orig(skb, orig_node, recv_if))

	if (batadv_send_skb_to_orig(skb, orig_node, recv_if) != NET_XMIT_DROP)

		ret = NET_RX_SUCCESS;



out:
@@ -775,7 +775,7 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, 
	struct batadv_neigh_node *neigh_node = NULL;

	struct batadv_unicast_packet *unicast_packet;

	struct ethhdr *ethhdr = eth_hdr(skb);

	int ret = NET_RX_DROP;

	int res, ret = NET_RX_DROP;

	struct sk_buff *new_skb;



	unicast_packet = (struct batadv_unicast_packet *)skb->data;
@@ -835,16 +835,19 @@ static int batadv_route_unicast_packet(struct sk_buff *skb, 
	/* decrement ttl */

	unicast_packet->header.ttl--;



	/* network code packet if possible */

	if (batadv_nc_skb_forward(skb, neigh_node, ethhdr)) {

		ret = NET_RX_SUCCESS;

	} else if (batadv_send_skb_to_orig(skb, orig_node, recv_if)) {

		ret = NET_RX_SUCCESS;

	res = batadv_send_skb_to_orig(skb, orig_node, recv_if);



		/* Update stats counter */

	/* translate transmit result into receive result */

	if (res == NET_XMIT_SUCCESS) {

		/* skb was transmitted and consumed */

		batadv_inc_counter(bat_priv, BATADV_CNT_FORWARD);

		batadv_add_counter(bat_priv, BATADV_CNT_FORWARD_BYTES,

				   skb->len + ETH_HLEN);



		ret = NET_RX_SUCCESS;

	} else if (res == NET_XMIT_POLICED) {

		/* skb was buffered and consumed */

		ret = NET_RX_SUCCESS;

	}



out:

net/batman-adv/send.c

+19 −8
Original line number Diff line number Diff line
@@ -96,26 +96,37 @@ send_skb_err: 
 * host, NULL can be passed as recv_if and no interface alternating is

 * attempted.

 *

 * Returns TRUE on success; FALSE otherwise.

 * Returns NET_XMIT_SUCCESS on success, NET_XMIT_DROP on failure, or

 * NET_XMIT_POLICED if the skb is buffered for later transmit.

 */

bool batadv_send_skb_to_orig(struct sk_buff *skb,

int batadv_send_skb_to_orig(struct sk_buff *skb,

			    struct batadv_orig_node *orig_node,

			    struct batadv_hard_iface *recv_if)

{

	struct batadv_priv *bat_priv = orig_node->bat_priv;

	struct batadv_neigh_node *neigh_node;

	int ret = NET_XMIT_DROP;



	/* batadv_find_router() increases neigh_nodes refcount if found. */

	neigh_node = batadv_find_router(bat_priv, orig_node, recv_if);

	if (!neigh_node)

		return false;

		return ret;



	/* route it */

	batadv_send_skb_packet(skb, neigh_node->if_incoming, neigh_node->addr);

	/* try to network code the packet, if it is received on an interface

	 * (i.e. being forwarded). If the packet originates from this node or if

	 * network coding fails, then send the packet as usual.

	 */

	if (recv_if && batadv_nc_skb_forward(skb, neigh_node)) {

		ret = NET_XMIT_POLICED;

	} else {

		batadv_send_skb_packet(skb, neigh_node->if_incoming,

				       neigh_node->addr);

		ret = NET_XMIT_SUCCESS;

	}



	batadv_neigh_node_free_ref(neigh_node);



	return true;

	return ret;

}



void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface)

net/batman-adv/send.h

+3 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
int batadv_send_skb_packet(struct sk_buff *skb,

			   struct batadv_hard_iface *hard_iface,

			   const uint8_t *dst_addr);

bool batadv_send_skb_to_orig(struct sk_buff *skb,

int batadv_send_skb_to_orig(struct sk_buff *skb,

			    struct batadv_orig_node *orig_node,

			    struct batadv_hard_iface *recv_if);

void batadv_schedule_bat_ogm(struct batadv_hard_iface *hard_iface);

CRA Git | Maintained and supported by SUSTech CRA and CCSE