p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

batman-adv: Add wrapper for ARP reply creation 

Removing duplicate code.

Signed-off-by: Linus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
This commit is contained in:
Linus Lüssing 2016-07-05 20:01:36 +02:00 committed by Simon Wunderlich
parent 75721643d5
commit cbfc16de30
1 changed files with 40 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
net/batman-adv/distributed-arp-table.c
View File

@ -948,6 +948,41 @@ static unsigned short batadv_dat_get_vid(struct sk_buff *skb, int *hdr_size)
return vid; return vid;
} }
/**
* batadv_dat_arp_create_reply - create an ARP Reply
* @bat_priv: the bat priv with all the soft interface information
* @ip_src: ARP sender IP
* @ip_dst: ARP target IP
* @hw_src: Ethernet source and ARP sender MAC
* @hw_dst: Ethernet destination and ARP target MAC
* @vid: VLAN identifier (optional, set to zero otherwise)
*
* Creates an ARP Reply from the given values, optionally encapsulated in a
* VLAN header.
*
* Return: An skb containing an ARP Reply.
*/
static struct sk_buff *
batadv_dat_arp_create_reply(struct batadv_priv *bat_priv, __be32 ip_src,
__be32 ip_dst, u8 *hw_src, u8 *hw_dst,
unsigned short vid)
{
struct sk_buff *skb;
skb = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_dst, bat_priv->soft_iface,
ip_src, hw_dst, hw_src, hw_dst);
if (!skb)
return NULL;
skb_reset_mac_header(skb);
if (vid & BATADV_VLAN_HAS_TAG)
skb = vlan_insert_tag(skb, htons(ETH_P_8021Q),
vid & VLAN_VID_MASK);
return skb;
}
/** /**
* batadv_dat_snoop_outgoing_arp_request - snoop the ARP request and try to * batadv_dat_snoop_outgoing_arp_request - snoop the ARP request and try to
* answer using DAT * answer using DAT
@ -1005,20 +1040,12 @@ bool batadv_dat_snoop_outgoing_arp_request(struct batadv_priv *bat_priv,
goto out; goto out;
} }
skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, skb_new = batadv_dat_arp_create_reply(bat_priv, ip_dst, ip_src,
bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr,
dat_entry->mac_addr, hw_src); hw_src, vid);
if (!skb_new) if (!skb_new)
goto out; goto out;
if (vid & BATADV_VLAN_HAS_TAG) {
skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
vid & VLAN_VID_MASK);
if (!skb_new)
goto out;
}
skb_reset_mac_header(skb_new);
skb_new->protocol = eth_type_trans(skb_new, skb_new->protocol = eth_type_trans(skb_new,
bat_priv->soft_iface); bat_priv->soft_iface);
bat_priv->stats.rx_packets++; bat_priv->stats.rx_packets++;
@ -1081,25 +1108,11 @@ bool batadv_dat_snoop_incoming_arp_request(struct batadv_priv *bat_priv,
if (!dat_entry) if (!dat_entry)
goto out; goto out;
skb_new = arp_create(ARPOP_REPLY, ETH_P_ARP, ip_src, skb_new = batadv_dat_arp_create_reply(bat_priv, ip_dst, ip_src,
bat_priv->soft_iface, ip_dst, hw_src, dat_entry->mac_addr, hw_src, vid);
dat_entry->mac_addr, hw_src);
if (!skb_new) if (!skb_new)
goto out; goto out;
/* the rest of the TX path assumes that the mac_header offset pointing
* to the inner Ethernet header has been set, therefore reset it now.
*/
skb_reset_mac_header(skb_new);
if (vid & BATADV_VLAN_HAS_TAG) {
skb_new = vlan_insert_tag(skb_new, htons(ETH_P_8021Q),
vid & VLAN_VID_MASK);
if (!skb_new)
goto out;
}
/* To preserve backwards compatibility, the node has choose the outgoing /* To preserve backwards compatibility, the node has choose the outgoing
* format based on the incoming request packet type. The assumption is * format based on the incoming request packet type. The assumption is
* that a node not using the 4addr packet format doesn't support it. * that a node not using the 4addr packet format doesn't support it.