Signed-off-by: Linus Lüssing linus.luessing@ascom.ch --- routing.c | 43 ++++++++++++++++++------------------------- routing.h | 8 +++----- soft-interface.c | 7 +++++-- unicast.c | 6 ++---- 4 files changed, 28 insertions(+), 36 deletions(-)
diff --git a/routing.c b/routing.c index 97e99ce..60579fc 100644 --- a/routing.c +++ b/routing.c @@ -1021,10 +1021,10 @@ out: /* find a suitable router for this originator, and use * bonding if possible. increases the found neighbors * refcount.*/ -struct neigh_node *find_router(struct bat_priv *bat_priv, - struct orig_node *orig_node, +struct neigh_node *find_router(struct orig_node *orig_node, struct hard_iface *recv_if) { + struct bat_priv *bat_priv; struct orig_node *primary_orig_node; struct orig_node *router_orig; struct neigh_node *router, *first_candidate, *tmp_neigh_node; @@ -1037,6 +1037,8 @@ struct neigh_node *find_router(struct bat_priv *bat_priv, if (!orig_node->router) return NULL;
+ bat_priv = orig_node->bat_priv; + /* without bonding, the first node should * always choose the default router. */ bonding_enabled = atomic_read(&bat_priv->bonding); @@ -1189,26 +1191,15 @@ static int check_unicast_packet(struct sk_buff *skb, int hdr_size) return 0; }
-int route_unicast_packet(struct bat_priv *bat_priv, struct sk_buff *skb, - struct hard_iface *recv_if, uint8_t *dest, - uint8_t packet_type) +int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, + struct orig_node *orig_node, uint8_t packet_type) { - struct orig_node *orig_node = NULL; struct neigh_node *neigh_node = NULL; int ret = NET_RX_DROP; struct sk_buff *new_skb;
- /* get routing information */ - rcu_read_lock(); - orig_node = orig_hash_find(bat_priv, dest); - - if (!orig_node) - goto unlock; - - rcu_read_unlock(); - /* find_router() increases neigh_nodes refcount if found. */ - neigh_node = find_router(bat_priv, orig_node, recv_if); + neigh_node = find_router(orig_node, recv_if);
if (!neigh_node) goto out; @@ -1218,9 +1209,9 @@ int route_unicast_packet(struct bat_priv *bat_priv, struct sk_buff *skb, goto out;
if (packet_type == BAT_UNICAST && - atomic_read(&bat_priv->fragmentation) && + atomic_read(&orig_node->bat_priv->fragmentation) && skb->len > neigh_node->if_incoming->net_dev->mtu) { - ret = frag_send_skb(skb, bat_priv, + ret = frag_send_skb(skb, orig_node->bat_priv, neigh_node->if_incoming, neigh_node->addr); goto out; } @@ -1228,7 +1219,7 @@ int route_unicast_packet(struct bat_priv *bat_priv, struct sk_buff *skb, if (packet_type == BAT_UNICAST_FRAG && frag_can_reassemble(skb, neigh_node->if_incoming->net_dev->mtu)) {
- ret = frag_reassemble_skb(skb, bat_priv, &new_skb); + ret = frag_reassemble_skb(skb, orig_node->bat_priv, &new_skb);
if (ret == NET_RX_DROP) goto out; @@ -1247,8 +1238,6 @@ int route_unicast_packet(struct bat_priv *bat_priv, struct sk_buff *skb, ret = NET_RX_SUCCESS; goto out;
-unlock: - rcu_read_unlock(); out: if (neigh_node) neigh_node_free_ref(neigh_node); @@ -1261,6 +1250,7 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) { struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct unicast_packet *unicast_packet; + struct orig_node *orig_node; int hdr_size = sizeof(struct unicast_packet);
if (check_unicast_packet(skb, hdr_size) < 0) @@ -1274,14 +1264,16 @@ int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if) return NET_RX_SUCCESS; }
- return route_unicast_packet(bat_priv, skb, recv_if, - unicast_packet->dest, unicast_packet->header.packet_type); + orig_node = orig_hash_find(bat_priv, unicast_packet->dest); + return route_unicast_packet(skb, recv_if, orig_node, + unicast_packet->header.packet_type); }
int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if) { struct bat_priv *bat_priv = netdev_priv(recv_if->soft_iface); struct unicast_frag_packet *unicast_packet; + struct orig_node *orig_node; int hdr_size = sizeof(struct unicast_frag_packet); struct sk_buff *new_skb = NULL; int ret; @@ -1308,8 +1300,9 @@ int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if) return NET_RX_SUCCESS; }
- return route_unicast_packet(bat_priv, skb, recv_if, - unicast_packet->dest, unicast_packet->header.packet_type); + orig_node = orig_hash_find(bat_priv, unicast_packet->dest); + return route_unicast_packet(skb, recv_if, orig_node, + unicast_packet->header.packet_type); }
diff --git a/routing.h b/routing.h index 5972bf3..d97f720 100644 --- a/routing.h +++ b/routing.h @@ -30,17 +30,15 @@ void receive_bat_packet(struct ethhdr *ethhdr, void update_routes(struct bat_priv *bat_priv, struct orig_node *orig_node, struct neigh_node *neigh_node, unsigned char *hna_buff, int hna_buff_len); -int route_unicast_packet(struct bat_priv *bat_priv, struct sk_buff *skb, - struct hard_iface *recv_if, uint8_t *dest, - uint8_t packet_type); +int route_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if, + struct orig_node *orig_node, uint8_t packet_type); int recv_icmp_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_unicast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_ucast_frag_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_bcast_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_vis_packet(struct sk_buff *skb, struct hard_iface *recv_if); int recv_bat_packet(struct sk_buff *skb, struct hard_iface *recv_if); -struct neigh_node *find_router(struct bat_priv *bat_priv, - struct orig_node *orig_node, +struct neigh_node *find_router(struct orig_node *orig_node, struct hard_iface *recv_if); void bonding_candidate_del(struct orig_node *orig_node, struct neigh_node *neigh_node); diff --git a/soft-interface.c b/soft-interface.c index bd460b3..07fe7c8 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -20,6 +20,7 @@ */
#include "main.h" +#include "originator.h" #include "soft-interface.h" #include "hard-interface.h" #include "routing.h" @@ -419,6 +420,7 @@ void interface_rx(struct net_device *soft_iface, { struct bat_priv *bat_priv = netdev_priv(soft_iface); struct unicast_packet *unicast_packet; + struct orig_node *orig_node; struct ethhdr *ethhdr; struct vlan_ethhdr *vhdr; short vid = -1; @@ -462,8 +464,9 @@ void interface_rx(struct net_device *soft_iface,
memcpy(unicast_packet->dest, bat_priv->softif_neigh->addr, ETH_ALEN); - ret = route_unicast_packet(bat_priv, skb, recv_if, - unicast_packet->dest, + + orig_node = orig_hash_find(bat_priv, unicast_packet->dest); + ret = route_unicast_packet(skb, recv_if, orig_node, unicast_packet->header.packet_type); if (ret == NET_RX_DROP) goto dropped; diff --git a/unicast.c b/unicast.c index c6c465c..54e956b 100644 --- a/unicast.c +++ b/unicast.c @@ -308,12 +308,10 @@ route: /* copy the destination for faster routing */ memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN);
- ret = route_unicast_packet(orig_node->bat_priv, skb, NULL, - unicast_packet->dest, unicast_packet->header.packet_type); + ret = route_unicast_packet(skb, NULL, orig_node, + unicast_packet->header.packet_type);
out: - if (orig_node) - orig_node_free_ref(orig_node); if (ret == NET_RX_DROP) kfree_skb(skb);