Commit d295345a authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Simon Wunderlich
Browse files

batman-adv: Always send iface index+name in genlmsg 



The batman-adv netlink messages often contain the interface index and
interface name in the same message. This makes it easy for the receiver to
operate on the incoming data when it either needs to print something or
needs to operate on the interface index.

But one of the attributes was missing for:

* neighbor table dumps
* originator table dumps
* gateway list dumps
* query of hardif information
* query of vid information

The userspace therefore had to implement special workarounds using
SIOCGIFNAME or SIOCGIFINDEX depending on what was actually provided.
Providing both information simplifies the userspace code massively without
adding a lot of extra overhead in the kernel portion.

Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 9a959cab

net/batman-adv/bat_iv_ogm.c

+6 −0
Original line number Diff line number Diff line
@@ -1849,6 +1849,8 @@ batadv_iv_ogm_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, 
		    orig_node->orig) ||

	    nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    neigh_node->addr) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,

			   neigh_node->if_incoming->net_dev->name) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			neigh_node->if_incoming->net_dev->ifindex) ||

	    nla_put_u8(msg, BATADV_ATTR_TQ, tq_avg) ||
@@ -2078,6 +2080,8 @@ batadv_iv_ogm_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, 


	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    hardif_neigh->addr) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,

			   hardif_neigh->if_incoming->net_dev->name) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			hardif_neigh->if_incoming->net_dev->ifindex) ||

	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,
@@ -2459,6 +2463,8 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, 
		    router->addr) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,

			   router->if_incoming->net_dev->name) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			router->if_incoming->net_dev->ifindex) ||

	    nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,

			gw_node->bandwidth_down) ||

	    nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_UP,

net/batman-adv/bat_v.c

+10 −0
Original line number Diff line number Diff line
@@ -146,6 +146,8 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, 


	if (nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    hardif_neigh->addr) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,

			   hardif_neigh->if_incoming->net_dev->name) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			hardif_neigh->if_incoming->net_dev->ifindex) ||

	    nla_put_u32(msg, BATADV_ATTR_LAST_SEEN_MSECS,
@@ -298,6 +300,8 @@ batadv_v_orig_dump_subentry(struct sk_buff *msg, u32 portid, u32 seq, 
	if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, orig_node->orig) ||

	    nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN,

		    neigh_node->addr) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,

			   neigh_node->if_incoming->net_dev->name) ||

	    nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			neigh_node->if_incoming->net_dev->ifindex) ||

	    nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput) ||
@@ -739,6 +743,12 @@ static int batadv_v_gw_dump_entry(struct sk_buff *msg, u32 portid, 
		goto out;

	}



	if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			router->if_incoming->net_dev->ifindex)) {

		genlmsg_cancel(msg, hdr);

		goto out;

	}



	if (nla_put_u32(msg, BATADV_ATTR_BANDWIDTH_DOWN,

			gw_node->bandwidth_down)) {

		genlmsg_cancel(msg, hdr);

net/batman-adv/netlink.c

+8 −0
Original line number Diff line number Diff line
@@ -814,6 +814,10 @@ static int batadv_netlink_hardif_fill(struct sk_buff *msg, 
			bat_priv->soft_iface->ifindex))

		goto nla_put_failure;



	if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME,

			   bat_priv->soft_iface->name))

		goto nla_put_failure;



	if (nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX,

			net_dev->ifindex) ||

	    nla_put_string(msg, BATADV_ATTR_HARD_IFNAME,
@@ -1045,6 +1049,10 @@ static int batadv_netlink_vlan_fill(struct sk_buff *msg, 
			bat_priv->soft_iface->ifindex))

		goto nla_put_failure;



	if (nla_put_string(msg, BATADV_ATTR_MESH_IFNAME,

			   bat_priv->soft_iface->name))

		goto nla_put_failure;



	if (nla_put_u32(msg, BATADV_ATTR_VLANID, vlan->vid & VLAN_VID_MASK))

		goto nla_put_failure;