Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit acd34afa authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Antonio Quartulli
Browse files

batman-adv: Prefix packet enum with BATADV_ 



Reported-by: default avatarMartin Hundebøll <martin@hundeboll.net>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent d69909d2

net/batman-adv/bat_iv_ogm.c

+26 −22
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ static int batadv_iv_ogm_iface_enable(struct hard_iface *hard_iface) 
		goto out;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->header.packet_type = BAT_IV_OGM;

	batman_ogm_packet->header.packet_type = BATADV_IV_OGM;

	batman_ogm_packet->header.version = BATADV_COMPAT_VERSION;

	batman_ogm_packet->header.ttl = 2;

	batman_ogm_packet->flags = BATADV_NO_FLAGS;
@@ -107,7 +107,7 @@ static void batadv_iv_ogm_primary_iface_set(struct hard_iface *hard_iface) 
	struct batman_ogm_packet *batman_ogm_packet;



	batman_ogm_packet = (struct batman_ogm_packet *)hard_iface->packet_buff;

	batman_ogm_packet->flags = PRIMARIES_FIRST_HOP;

	batman_ogm_packet->flags = BATADV_PRIMARIES_FIRST_HOP;

	batman_ogm_packet->header.ttl = BATADV_TTL;

}
@@ -181,9 +181,9 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
		 */

		if ((forw_packet->direct_link_flags & (1 << packet_num)) &&

		    (forw_packet->if_incoming == hard_iface))

			batman_ogm_packet->flags |= DIRECTLINK;

			batman_ogm_packet->flags |= BATADV_DIRECTLINK;

		else

			batman_ogm_packet->flags &= ~DIRECTLINK;

			batman_ogm_packet->flags &= ~BATADV_DIRECTLINK;



		fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ?

							    "Sending own" :
@@ -194,7 +194,7 @@ static void batadv_iv_ogm_send_to_if(struct forw_packet *forw_packet, 
			   batman_ogm_packet->orig,

			   ntohl(batman_ogm_packet->seqno),

			   batman_ogm_packet->tq, batman_ogm_packet->header.ttl,

			   (batman_ogm_packet->flags & DIRECTLINK ?

			   (batman_ogm_packet->flags & BATADV_DIRECTLINK ?

			    "on" : "off"),

			   batman_ogm_packet->ttvn, hard_iface->net_dev->name,

			   hard_iface->net_dev->dev_addr);
@@ -228,7 +228,7 @@ static void batadv_iv_ogm_emit(struct forw_packet *forw_packet) 


	batman_ogm_packet = (struct batman_ogm_packet *)

						(forw_packet->skb->data);

	directlink = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);

	directlink = (batman_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0);



	if (!forw_packet->if_incoming) {

		pr_err("Error - can't forward packet: incoming iface not specified\n");
@@ -330,7 +330,7 @@ batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet, 
		 * are flooded through the net

		 */

		if ((!directlink) &&

		    (!(batman_ogm_packet->flags & DIRECTLINK)) &&

		    (!(batman_ogm_packet->flags & BATADV_DIRECTLINK)) &&

		    (batman_ogm_packet->header.ttl != 1) &&



		    /* own packets originating non-primary
@@ -353,7 +353,7 @@ batadv_iv_ogm_can_aggregate(const struct batman_ogm_packet *new_bat_ogm_packet, 
		     * own secondary interface packets

		     * (= secondary interface packets in general)

		     */

		    (batman_ogm_packet->flags & DIRECTLINK ||

		    (batman_ogm_packet->flags & BATADV_DIRECTLINK ||

		     (forw_packet->own &&

		      forw_packet->if_incoming != primary_if))) {

			res = true;
@@ -480,7 +480,7 @@ static void batadv_iv_ogm_queue_add(struct bat_priv *bat_priv, 
	unsigned long max_aggregation_jiffies;



	batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;

	direct_link = batman_ogm_packet->flags & DIRECTLINK ? 1 : 0;

	direct_link = batman_ogm_packet->flags & BATADV_DIRECTLINK ? 1 : 0;

	max_aggregation_jiffies = msecs_to_jiffies(BATADV_MAX_AGGREGATION_MS);



	/* find position for the packet in the forward queue */
@@ -547,7 +547,7 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
		 * simply drop the ogm.

		 */

		if (is_single_hop_neigh)

			batman_ogm_packet->flags |= NOT_BEST_NEXT_HOP;

			batman_ogm_packet->flags |= BATADV_NOT_BEST_NEXT_HOP;

		else

			return;

	}
@@ -566,11 +566,11 @@ static void batadv_iv_ogm_forward(struct orig_node *orig_node, 
		   batman_ogm_packet->tq, batman_ogm_packet->header.ttl);



	/* switch of primaries first hop flag when forwarding */

	batman_ogm_packet->flags &= ~PRIMARIES_FIRST_HOP;

	batman_ogm_packet->flags &= ~BATADV_PRIMARIES_FIRST_HOP;

	if (is_single_hop_neigh)

		batman_ogm_packet->flags |= DIRECTLINK;

		batman_ogm_packet->flags |= BATADV_DIRECTLINK;

	else

		batman_ogm_packet->flags &= ~DIRECTLINK;

		batman_ogm_packet->flags &= ~BATADV_DIRECTLINK;



	batadv_iv_ogm_queue_add(bat_priv, (unsigned char *)batman_ogm_packet,

				BATADV_OGM_HLEN + batadv_tt_len(tt_num_changes),
@@ -605,10 +605,10 @@ static void batadv_iv_ogm_schedule(struct hard_iface *hard_iface) 
	if (tt_num_changes >= 0)

		batman_ogm_packet->tt_num_changes = tt_num_changes;



	if (vis_server == VIS_TYPE_SERVER_SYNC)

		batman_ogm_packet->flags |= VIS_SERVER;

	if (vis_server == BATADV_VIS_TYPE_SERVER_SYNC)

		batman_ogm_packet->flags |= BATADV_VIS_SERVER;

	else

		batman_ogm_packet->flags &= ~VIS_SERVER;

		batman_ogm_packet->flags &= ~BATADV_VIS_SERVER;



	if ((hard_iface == primary_if) &&

	    (atomic_read(&bat_priv->gw_mode) == BATADV_GW_MODE_SERVER))
@@ -746,7 +746,7 @@ update_tt: 
	 */

	if (((batman_ogm_packet->orig != ethhdr->h_source) &&

	     (batman_ogm_packet->header.ttl > 2)) ||

	    (batman_ogm_packet->flags & PRIMARIES_FIRST_HOP))

	    (batman_ogm_packet->flags & BATADV_PRIMARIES_FIRST_HOP))

		batadv_tt_update_orig(bat_priv, orig_node, tt_buff,

				      batman_ogm_packet->tt_num_changes,

				      batman_ogm_packet->ttvn,
@@ -993,13 +993,16 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
	 * packet in an aggregation.  Here we expect that the padding

	 * is always zero (or not 0x01)

	 */

	if (batman_ogm_packet->header.packet_type != BAT_IV_OGM)

	if (batman_ogm_packet->header.packet_type != BATADV_IV_OGM)

		return;



	/* could be changed by schedule_own_packet() */

	if_incoming_seqno = atomic_read(&if_incoming->seqno);



	has_directlink_flag = (batman_ogm_packet->flags & DIRECTLINK ? 1 : 0);

	if (batman_ogm_packet->flags & BATADV_DIRECTLINK)

		has_directlink_flag = 1;

	else

		has_directlink_flag = 0;



	if (batadv_compare_eth(ethhdr->h_source, batman_ogm_packet->orig))

		is_single_hop_neigh = true;
@@ -1107,7 +1110,7 @@ static void batadv_iv_ogm_process(const struct ethhdr *ethhdr, 
		return;

	}



	if (batman_ogm_packet->flags & NOT_BEST_NEXT_HOP) {

	if (batman_ogm_packet->flags & BATADV_NOT_BEST_NEXT_HOP) {

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Drop packet: ignoring all packets not forwarded from the best next hop (sender: %pM)\n",

			   ethhdr->h_source);
@@ -1299,7 +1302,8 @@ int __init batadv_iv_init(void) 
	int ret;



	/* batman originator packet */

	ret = batadv_recv_handler_register(BAT_IV_OGM, batadv_iv_ogm_receive);

	ret = batadv_recv_handler_register(BATADV_IV_OGM,

					   batadv_iv_ogm_receive);

	if (ret < 0)

		goto out;
@@ -1310,7 +1314,7 @@ int __init batadv_iv_init(void) 
	goto out;



handler_unregister:

	batadv_recv_handler_unregister(BAT_IV_OGM);

	batadv_recv_handler_unregister(BATADV_IV_OGM);

out:

	return ret;

}

net/batman-adv/bat_sysfs.c

+15 −9
Original line number Diff line number Diff line
@@ -283,10 +283,14 @@ static ssize_t batadv_show_vis_mode(struct kobject *kobj, 
{

	struct bat_priv *bat_priv = batadv_kobj_to_batpriv(kobj);

	int vis_mode = atomic_read(&bat_priv->vis_mode);

	const char *mode;



	return sprintf(buff, "%s\n",

		       vis_mode == VIS_TYPE_CLIENT_UPDATE ?

							"client" : "server");

	if (vis_mode == BATADV_VIS_TYPE_CLIENT_UPDATE)

		mode = "client";

	else

		mode = "server";



	return sprintf(buff, "%s\n", mode);

}



static ssize_t batadv_store_vis_mode(struct kobject *kobj,
@@ -301,14 +305,16 @@ static ssize_t batadv_store_vis_mode(struct kobject *kobj, 


	ret = kstrtoul(buff, 10, &val);



	if (((count == 2) && (!ret) && (val == VIS_TYPE_CLIENT_UPDATE)) ||

	if (((count == 2) && (!ret) &&

	     (val == BATADV_VIS_TYPE_CLIENT_UPDATE)) ||

	    (strncmp(buff, "client", 6) == 0) ||

	    (strncmp(buff, "off", 3) == 0))

		vis_mode_tmp = VIS_TYPE_CLIENT_UPDATE;

		vis_mode_tmp = BATADV_VIS_TYPE_CLIENT_UPDATE;



	if (((count == 2) && (!ret) && (val == VIS_TYPE_SERVER_SYNC)) ||

	if (((count == 2) && (!ret) &&

	     (val == BATADV_VIS_TYPE_SERVER_SYNC)) ||

	    (strncmp(buff, "server", 6) == 0))

		vis_mode_tmp = VIS_TYPE_SERVER_SYNC;

		vis_mode_tmp = BATADV_VIS_TYPE_SERVER_SYNC;



	if (vis_mode_tmp < 0) {

		if (buff[count - 1] == '\n')
@@ -323,12 +329,12 @@ static ssize_t batadv_store_vis_mode(struct kobject *kobj, 
	if (atomic_read(&bat_priv->vis_mode) == vis_mode_tmp)

		return count;



	if (atomic_read(&bat_priv->vis_mode) == VIS_TYPE_CLIENT_UPDATE)

	if (atomic_read(&bat_priv->vis_mode) == BATADV_VIS_TYPE_CLIENT_UPDATE)

		old_mode =  "client";

	else

		old_mode = "server";



	if (vis_mode_tmp == VIS_TYPE_CLIENT_UPDATE)

	if (vis_mode_tmp == BATADV_VIS_TYPE_CLIENT_UPDATE)

		new_mode =  "client";

	else

		new_mode = "server";

net/batman-adv/bridge_loop_avoidance.c

+17 −17
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static void batadv_bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 


	/* now we pretend that the client would have sent this ... */

	switch (claimtype) {

	case CLAIM_TYPE_ADD:

	case BATADV_CLAIM_TYPE_ADD:

		/* normal claim frame

		 * set Ethernet SRC to the clients mac

		 */
@@ -300,7 +300,7 @@ static void batadv_bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 
		batadv_dbg(DBG_BLA, bat_priv,

			   "bla_send_claim(): CLAIM %pM on vid %d\n", mac, vid);

		break;

	case CLAIM_TYPE_DEL:

	case BATADV_CLAIM_TYPE_DEL:

		/* unclaim frame

		 * set HW SRC to the clients mac

		 */
@@ -309,7 +309,7 @@ static void batadv_bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 
			   "bla_send_claim(): UNCLAIM %pM on vid %d\n", mac,

			   vid);

		break;

	case CLAIM_TYPE_ANNOUNCE:

	case BATADV_CLAIM_TYPE_ANNOUNCE:

		/* announcement frame

		 * set HW SRC to the special mac containg the crc

		 */
@@ -318,7 +318,7 @@ static void batadv_bla_send_claim(struct bat_priv *bat_priv, uint8_t *mac, 
			   "bla_send_claim(): ANNOUNCE of %pM on vid %d\n",

			   ethhdr->h_source, vid);

		break;

	case CLAIM_TYPE_REQUEST:

	case BATADV_CLAIM_TYPE_REQUEST:

		/* request frame

		 * set HW SRC to the special mac containg the crc

		 */
@@ -459,7 +459,7 @@ static void batadv_bla_answer_request(struct bat_priv *bat_priv, 
				continue;



			batadv_bla_send_claim(bat_priv, claim->addr, claim->vid,

					      CLAIM_TYPE_ADD);

					      BATADV_CLAIM_TYPE_ADD);

		}

		rcu_read_unlock();

	}
@@ -485,7 +485,7 @@ static void batadv_bla_send_request(struct backbone_gw *backbone_gw) 


	/* send request */

	batadv_bla_send_claim(backbone_gw->bat_priv, backbone_gw->orig,

			      backbone_gw->vid, CLAIM_TYPE_REQUEST);

			      backbone_gw->vid, BATADV_CLAIM_TYPE_REQUEST);



	/* no local broadcasts should be sent or received, for now. */

	if (!atomic_read(&backbone_gw->request_sent)) {
@@ -511,7 +511,7 @@ static void batadv_bla_send_announce(struct bat_priv *bat_priv, 
	memcpy(&mac[4], &crc, 2);



	batadv_bla_send_claim(bat_priv, mac, backbone_gw->vid,

			      CLAIM_TYPE_ANNOUNCE);

			      BATADV_CLAIM_TYPE_ANNOUNCE);



}
@@ -694,7 +694,7 @@ static int batadv_handle_unclaim(struct bat_priv *bat_priv, 
	if (primary_if && batadv_compare_eth(backbone_addr,

					     primary_if->net_dev->dev_addr))

		batadv_bla_send_claim(bat_priv, claim_addr, vid,

				      CLAIM_TYPE_DEL);

				      BATADV_CLAIM_TYPE_DEL);



	backbone_gw = batadv_backbone_hash_find(bat_priv, backbone_addr, vid);
@@ -730,7 +730,7 @@ static int batadv_handle_claim(struct bat_priv *bat_priv, 
	batadv_bla_add_claim(bat_priv, claim_addr, vid, backbone_gw);

	if (batadv_compare_eth(backbone_addr, primary_if->net_dev->dev_addr))

		batadv_bla_send_claim(bat_priv, claim_addr, vid,

				      CLAIM_TYPE_ADD);

				      BATADV_CLAIM_TYPE_ADD);



	/* TODO: we could call something like tt_local_del() here. */
@@ -773,12 +773,12 @@ static int batadv_check_claim_group(struct bat_priv *bat_priv, 
	 * otherwise assume it is in the hw_src

	 */

	switch (bla_dst->type) {

	case CLAIM_TYPE_ADD:

	case BATADV_CLAIM_TYPE_ADD:

		backbone_addr = hw_src;

		break;

	case CLAIM_TYPE_REQUEST:

	case CLAIM_TYPE_ANNOUNCE:

	case CLAIM_TYPE_DEL:

	case BATADV_CLAIM_TYPE_REQUEST:

	case BATADV_CLAIM_TYPE_ANNOUNCE:

	case BATADV_CLAIM_TYPE_DEL:

		backbone_addr = ethhdr->h_source;

		break;

	default:
@@ -894,23 +894,23 @@ static int batadv_bla_process_claim(struct bat_priv *bat_priv, 


	/* check for the different types of claim frames ... */

	switch (bla_dst->type) {

	case CLAIM_TYPE_ADD:

	case BATADV_CLAIM_TYPE_ADD:

		if (batadv_handle_claim(bat_priv, primary_if, hw_src,

					ethhdr->h_source, vid))

			return 1;

		break;

	case CLAIM_TYPE_DEL:

	case BATADV_CLAIM_TYPE_DEL:

		if (batadv_handle_unclaim(bat_priv, primary_if,

					  ethhdr->h_source, hw_src, vid))

			return 1;

		break;



	case CLAIM_TYPE_ANNOUNCE:

	case BATADV_CLAIM_TYPE_ANNOUNCE:

		if (batadv_handle_announce(bat_priv, hw_src, ethhdr->h_source,

					   vid))

			return 1;

		break;

	case CLAIM_TYPE_REQUEST:

	case BATADV_CLAIM_TYPE_REQUEST:

		if (batadv_handle_request(bat_priv, primary_if, hw_src, ethhdr,

					  vid))

			return 1;

net/batman-adv/icmp_socket.c

+4 −4
Original line number Diff line number Diff line
@@ -187,14 +187,14 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 
		goto free_skb;

	}



	if (icmp_packet->header.packet_type != BAT_ICMP) {

	if (icmp_packet->header.packet_type != BATADV_ICMP) {

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n");

		len = -EINVAL;

		goto free_skb;

	}



	if (icmp_packet->msg_type != ECHO_REQUEST) {

	if (icmp_packet->msg_type != BATADV_ECHO_REQUEST) {

		batadv_dbg(DBG_BATMAN, bat_priv,

			   "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n");

		len = -EINVAL;
@@ -204,7 +204,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 
	icmp_packet->uid = socket_client->index;



	if (icmp_packet->header.version != BATADV_COMPAT_VERSION) {

		icmp_packet->msg_type = PARAMETER_PROBLEM;

		icmp_packet->msg_type = BATADV_PARAMETER_PROBLEM;

		icmp_packet->header.version = BATADV_COMPAT_VERSION;

		batadv_socket_add_packet(socket_client, icmp_packet,

					 packet_len);
@@ -239,7 +239,7 @@ static ssize_t batadv_socket_write(struct file *file, const char __user *buff, 
	goto out;



dst_unreach:

	icmp_packet->msg_type = DESTINATION_UNREACHABLE;

	icmp_packet->msg_type = BATADV_DESTINATION_UNREACHABLE;

	batadv_socket_add_packet(socket_client, icmp_packet, packet_len);

free_skb:

	kfree_skb(skb);

net/batman-adv/main.c

+7 −7
Original line number Diff line number Diff line
@@ -275,19 +275,19 @@ static void batadv_recv_handler_init(void) 
		batadv_rx_handler[i] = batadv_recv_unhandled_packet;



	/* batman icmp packet */

	batadv_rx_handler[BAT_ICMP] = batadv_recv_icmp_packet;

	batadv_rx_handler[BATADV_ICMP] = batadv_recv_icmp_packet;

	/* unicast packet */

	batadv_rx_handler[BAT_UNICAST] = batadv_recv_unicast_packet;

	batadv_rx_handler[BATADV_UNICAST] = batadv_recv_unicast_packet;

	/* fragmented unicast packet */

	batadv_rx_handler[BAT_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;

	batadv_rx_handler[BATADV_UNICAST_FRAG] = batadv_recv_ucast_frag_packet;

	/* broadcast packet */

	batadv_rx_handler[BAT_BCAST] = batadv_recv_bcast_packet;

	batadv_rx_handler[BATADV_BCAST] = batadv_recv_bcast_packet;

	/* vis packet */

	batadv_rx_handler[BAT_VIS] = batadv_recv_vis_packet;

	batadv_rx_handler[BATADV_VIS] = batadv_recv_vis_packet;

	/* Translation table query (request or response) */

	batadv_rx_handler[BAT_TT_QUERY] = batadv_recv_tt_query;

	batadv_rx_handler[BATADV_TT_QUERY] = batadv_recv_tt_query;

	/* Roaming advertisement */

	batadv_rx_handler[BAT_ROAM_ADV] = batadv_recv_roam_adv;

	batadv_rx_handler[BATADV_ROAM_ADV] = batadv_recv_roam_adv;

}



int batadv_recv_handler_register(uint8_t packet_type,