batman-adv: tvlv - convert tt query packet to use tvlv unicast packets
Instead of generating TT specific packets the TVLV unicast API is used to send translation table data. Signed-off-by: Marek Lindner <lindner_marek@yahoo.de> Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
This commit is contained in:

committed by
Antonio Quartulli

parent
e1bf0c1409
commit
335fbe0f5d
@@ -557,84 +557,6 @@ static int batadv_check_unicast_packet(struct batadv_priv *bat_priv,
|
||||
return 0;
|
||||
}
|
||||
|
||||
int batadv_recv_tt_query(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
|
||||
{
|
||||
struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
|
||||
struct batadv_tt_query_packet *tt_query;
|
||||
uint16_t tt_size;
|
||||
int hdr_size = sizeof(*tt_query);
|
||||
char tt_flag;
|
||||
size_t packet_size;
|
||||
|
||||
if (batadv_check_unicast_packet(bat_priv, skb, hdr_size) < 0)
|
||||
return NET_RX_DROP;
|
||||
|
||||
/* I could need to modify it */
|
||||
if (skb_cow(skb, sizeof(struct batadv_tt_query_packet)) < 0)
|
||||
goto out;
|
||||
|
||||
tt_query = (struct batadv_tt_query_packet *)skb->data;
|
||||
|
||||
switch (tt_query->flags & BATADV_TT_QUERY_TYPE_MASK) {
|
||||
case BATADV_TT_REQUEST:
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_TT_REQUEST_RX);
|
||||
|
||||
/* If we cannot provide an answer the tt_request is
|
||||
* forwarded
|
||||
*/
|
||||
if (!batadv_send_tt_response(bat_priv, tt_query)) {
|
||||
if (tt_query->flags & BATADV_TT_FULL_TABLE)
|
||||
tt_flag = 'F';
|
||||
else
|
||||
tt_flag = '.';
|
||||
|
||||
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
||||
"Routing TT_REQUEST to %pM [%c]\n",
|
||||
tt_query->dst,
|
||||
tt_flag);
|
||||
return batadv_route_unicast_packet(skb, recv_if);
|
||||
}
|
||||
break;
|
||||
case BATADV_TT_RESPONSE:
|
||||
batadv_inc_counter(bat_priv, BATADV_CNT_TT_RESPONSE_RX);
|
||||
|
||||
if (batadv_is_my_mac(bat_priv, tt_query->dst)) {
|
||||
/* packet needs to be linearized to access the TT
|
||||
* changes
|
||||
*/
|
||||
if (skb_linearize(skb) < 0)
|
||||
goto out;
|
||||
/* skb_linearize() possibly changed skb->data */
|
||||
tt_query = (struct batadv_tt_query_packet *)skb->data;
|
||||
|
||||
tt_size = batadv_tt_len(ntohs(tt_query->tt_data));
|
||||
|
||||
/* Ensure we have all the claimed data */
|
||||
packet_size = sizeof(struct batadv_tt_query_packet);
|
||||
packet_size += tt_size;
|
||||
if (unlikely(skb_headlen(skb) < packet_size))
|
||||
goto out;
|
||||
|
||||
batadv_handle_tt_response(bat_priv, tt_query);
|
||||
} else {
|
||||
if (tt_query->flags & BATADV_TT_FULL_TABLE)
|
||||
tt_flag = 'F';
|
||||
else
|
||||
tt_flag = '.';
|
||||
batadv_dbg(BATADV_DBG_TT, bat_priv,
|
||||
"Routing TT_RESPONSE to %pM [%c]\n",
|
||||
tt_query->dst,
|
||||
tt_flag);
|
||||
return batadv_route_unicast_packet(skb, recv_if);
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
out:
|
||||
/* returning NET_RX_DROP will make the caller function kfree the skb */
|
||||
return NET_RX_DROP;
|
||||
}
|
||||
|
||||
int batadv_recv_roam_adv(struct sk_buff *skb, struct batadv_hard_iface *recv_if)
|
||||
{
|
||||
struct batadv_priv *bat_priv = netdev_priv(recv_if->soft_iface);
|
||||
|
Reference in New Issue
Block a user