Commit 0c4061c0 authored by Linus Lüssing's avatar Linus Lüssing Committed by Simon Wunderlich
Browse files

batman-adv: tvlv: prepare for tvlv enabled multicast packet type 



Prepare TVLV infrastructure for more packet types, in particular the
upcoming batman-adv multicast packet type.

For that swap the OGM vs. unicast-tvlv packet boolean indicator to an
explicit unsigned integer packet type variable. And provide the skb
to a call to batadv_tvlv_containers_process(), as later the multicast
packet's TVLV handler will need to have access not only to the TVLV but
the full skb for forwarding. Forwarding will be invoked from the
multicast packet's TVLVs' contents later.

Signed-off-by: default avatarLinus Lüssing <linus.luessing@c0d3.blue>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent e7d6127b

include/uapi/linux/batadv_packet.h

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
 * @BATADV_CODED: network coded packets

 * @BATADV_ELP: echo location packets for B.A.T.M.A.N. V

 * @BATADV_OGM2: originator messages for B.A.T.M.A.N. V

 * @BATADV_MCAST: multicast packet with multiple destination addresses

 *

 * @BATADV_UNICAST: unicast packets carrying unicast payload traffic

 * @BATADV_UNICAST_FRAG: unicast packets carrying a fragment of the original
@@ -42,6 +43,7 @@ enum batadv_packettype { 
	BATADV_CODED            = 0x02,

	BATADV_ELP		= 0x03,

	BATADV_OGM2		= 0x04,

	BATADV_MCAST            = 0x05,

	/* 0x40 - 0x7f: unicast */

#define BATADV_UNICAST_MIN     0x40

	BATADV_UNICAST          = 0x40,

net/batman-adv/bat_v_ogm.c

+2 −2
Original line number Diff line number Diff line
@@ -799,8 +799,8 @@ batadv_v_ogm_process_per_outif(struct batadv_priv *bat_priv, 


	/* only unknown & newer OGMs contain TVLVs we are interested in */

	if (seqno_age > 0 && if_outgoing == BATADV_IF_DEFAULT)

		batadv_tvlv_containers_process(bat_priv, true, orig_node,

					       NULL, NULL,

		batadv_tvlv_containers_process(bat_priv, BATADV_OGM2, orig_node,

					       NULL,

					       (unsigned char *)(ogm2 + 1),

					       ntohs(ogm2->tvlv_len));

net/batman-adv/distributed-arp-table.c

+1 −1
Original line number Diff line number Diff line
@@ -822,7 +822,7 @@ int batadv_dat_init(struct batadv_priv *bat_priv) 
	batadv_dat_start_timer(bat_priv);



	batadv_tvlv_handler_register(bat_priv, batadv_dat_tvlv_ogm_handler_v1,

				     NULL, BATADV_TVLV_DAT, 1,

				     NULL, NULL, BATADV_TVLV_DAT, 1,

				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);

	batadv_dat_tvlv_container_update(bat_priv);

	return 0;

net/batman-adv/gateway_common.c

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ void batadv_gw_init(struct batadv_priv *bat_priv) 
		atomic_set(&bat_priv->gw.sel_class, 1);



	batadv_tvlv_handler_register(bat_priv, batadv_gw_tvlv_ogm_handler_v1,

				     NULL, BATADV_TVLV_GW, 1,

				     NULL, NULL, BATADV_TVLV_GW, 1,

				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);

}

net/batman-adv/multicast.c

+1 −1
Original line number Diff line number Diff line
@@ -1818,7 +1818,7 @@ static void batadv_mcast_tvlv_ogm_handler(struct batadv_priv *bat_priv, 
void batadv_mcast_init(struct batadv_priv *bat_priv)

{

	batadv_tvlv_handler_register(bat_priv, batadv_mcast_tvlv_ogm_handler,

				     NULL, BATADV_TVLV_MCAST, 2,

				     NULL, NULL, BATADV_TVLV_MCAST, 2,

				     BATADV_TVLV_HANDLER_OGM_CIFNOTFND);



	INIT_DELAYED_WORK(&bat_priv->mcast.work, batadv_mcast_mla_update);