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

Commit b9dacc52 authored by Marek Lindner's avatar Marek Lindner
Browse files

batman-adv: agglomerate all batman iv ogm sending functions in the batman iv file 



In the process the batman iv OGM aggregation code could be merged
into the batman iv code base which makes the separate aggregation
files superfluous.

Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent d0b9fd89

net/batman-adv/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#



obj-$(CONFIG_BATMAN_ADV) += batman-adv.o

batman-adv-y += aggregation.o

batman-adv-y += bat_debugfs.o

batman-adv-y += bat_iv_ogm.o

batman-adv-y += bat_sysfs.o

net/batman-adv/aggregation.c

deleted100644 → 0
+0 −266
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA

 *

 */



#include "main.h"

#include "translation-table.h"

#include "aggregation.h"

#include "send.h"

#include "routing.h"

#include "hard-interface.h"



/* return true if new_packet can be aggregated with forw_packet */

static bool can_aggregate_with(const struct batman_ogm_packet

							*new_batman_ogm_packet,

			       struct bat_priv *bat_priv,

			       int packet_len,

			       unsigned long send_time,

			       bool directlink,

			       const struct hard_iface *if_incoming,

			       const struct forw_packet *forw_packet)

{

	struct batman_ogm_packet *batman_ogm_packet =

			(struct batman_ogm_packet *)forw_packet->skb->data;

	int aggregated_bytes = forw_packet->packet_len + packet_len;

	struct hard_iface *primary_if = NULL;

	bool res = false;



	/**

	 * we can aggregate the current packet to this aggregated packet

	 * if:

	 *

	 * - the send time is within our MAX_AGGREGATION_MS time

	 * - the resulting packet wont be bigger than

	 *   MAX_AGGREGATION_BYTES

	 */



	if (time_before(send_time, forw_packet->send_time) &&

	    time_after_eq(send_time + msecs_to_jiffies(MAX_AGGREGATION_MS),

					forw_packet->send_time) &&

	    (aggregated_bytes <= MAX_AGGREGATION_BYTES)) {



		/**

		 * check aggregation compatibility

		 * -> direct link packets are broadcasted on

		 *    their interface only

		 * -> aggregate packet if the current packet is

		 *    a "global" packet as well as the base

		 *    packet

		 */



		primary_if = primary_if_get_selected(bat_priv);

		if (!primary_if)

			goto out;



		/* packets without direct link flag and high TTL

		 * are flooded through the net  */

		if ((!directlink) &&

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

		    (batman_ogm_packet->ttl != 1) &&



		    /* own packets originating non-primary

		     * interfaces leave only that interface */

		    ((!forw_packet->own) ||

		     (forw_packet->if_incoming == primary_if))) {

			res = true;

			goto out;

		}



		/* if the incoming packet is sent via this one

		 * interface only - we still can aggregate */

		if ((directlink) &&

		    (new_batman_ogm_packet->ttl == 1) &&

		    (forw_packet->if_incoming == if_incoming) &&



		    /* packets from direct neighbors or

		     * own secondary interface packets

		     * (= secondary interface packets in general) */

		    (batman_ogm_packet->flags & DIRECTLINK ||

		     (forw_packet->own &&

		      forw_packet->if_incoming != primary_if))) {

			res = true;

			goto out;

		}

	}



out:

	if (primary_if)

		hardif_free_ref(primary_if);

	return res;

}



/* create a new aggregated packet and add this packet to it */

static void new_aggregated_packet(const unsigned char *packet_buff,

				  int packet_len, unsigned long send_time,

				  bool direct_link,

				  struct hard_iface *if_incoming,

				  int own_packet)

{

	struct bat_priv *bat_priv = netdev_priv(if_incoming->soft_iface);

	struct forw_packet *forw_packet_aggr;

	unsigned char *skb_buff;



	if (!atomic_inc_not_zero(&if_incoming->refcount))

		return;



	/* own packet should always be scheduled */

	if (!own_packet) {

		if (!atomic_dec_not_zero(&bat_priv->batman_queue_left)) {

			bat_dbg(DBG_BATMAN, bat_priv,

				"batman packet queue full\n");

			goto out;

		}

	}



	forw_packet_aggr = kmalloc(sizeof(*forw_packet_aggr), GFP_ATOMIC);

	if (!forw_packet_aggr) {

		if (!own_packet)

			atomic_inc(&bat_priv->batman_queue_left);

		goto out;

	}



	if ((atomic_read(&bat_priv->aggregated_ogms)) &&

	    (packet_len < MAX_AGGREGATION_BYTES))

		forw_packet_aggr->skb = dev_alloc_skb(MAX_AGGREGATION_BYTES +

						      sizeof(struct ethhdr));

	else

		forw_packet_aggr->skb = dev_alloc_skb(packet_len +

						      sizeof(struct ethhdr));



	if (!forw_packet_aggr->skb) {

		if (!own_packet)

			atomic_inc(&bat_priv->batman_queue_left);

		kfree(forw_packet_aggr);

		goto out;

	}

	skb_reserve(forw_packet_aggr->skb, sizeof(struct ethhdr));



	INIT_HLIST_NODE(&forw_packet_aggr->list);



	skb_buff = skb_put(forw_packet_aggr->skb, packet_len);

	forw_packet_aggr->packet_len = packet_len;

	memcpy(skb_buff, packet_buff, packet_len);



	forw_packet_aggr->own = own_packet;

	forw_packet_aggr->if_incoming = if_incoming;

	forw_packet_aggr->num_packets = 0;

	forw_packet_aggr->direct_link_flags = NO_FLAGS;

	forw_packet_aggr->send_time = send_time;



	/* save packet direct link flag status */

	if (direct_link)

		forw_packet_aggr->direct_link_flags |= 1;



	/* add new packet to packet list */

	spin_lock_bh(&bat_priv->forw_bat_list_lock);

	hlist_add_head(&forw_packet_aggr->list, &bat_priv->forw_bat_list);

	spin_unlock_bh(&bat_priv->forw_bat_list_lock);



	/* start timer for this packet */

	INIT_DELAYED_WORK(&forw_packet_aggr->delayed_work,

			  send_outstanding_bat_packet);

	queue_delayed_work(bat_event_workqueue,

			   &forw_packet_aggr->delayed_work,

			   send_time - jiffies);



	return;

out:

	hardif_free_ref(if_incoming);

}



/* aggregate a new packet into the existing aggregation */

static void aggregate(struct forw_packet *forw_packet_aggr,

		      const unsigned char *packet_buff, int packet_len,

		      bool direct_link)

{

	unsigned char *skb_buff;



	skb_buff = skb_put(forw_packet_aggr->skb, packet_len);

	memcpy(skb_buff, packet_buff, packet_len);

	forw_packet_aggr->packet_len += packet_len;

	forw_packet_aggr->num_packets++;



	/* save packet direct link flag status */

	if (direct_link)

		forw_packet_aggr->direct_link_flags |=

			(1 << forw_packet_aggr->num_packets);

}



void add_bat_packet_to_list(struct bat_priv *bat_priv,

			    unsigned char *packet_buff, int packet_len,

			    struct hard_iface *if_incoming, int own_packet,

			    unsigned long send_time)

{

	/**

	 * _aggr -> pointer to the packet we want to aggregate with

	 * _pos -> pointer to the position in the queue

	 */

	struct forw_packet *forw_packet_aggr = NULL, *forw_packet_pos = NULL;

	struct hlist_node *tmp_node;

	struct batman_ogm_packet *batman_ogm_packet;

	bool direct_link;



	batman_ogm_packet = (struct batman_ogm_packet *)packet_buff;

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



	/* find position for the packet in the forward queue */

	spin_lock_bh(&bat_priv->forw_bat_list_lock);

	/* own packets are not to be aggregated */

	if ((atomic_read(&bat_priv->aggregated_ogms)) && (!own_packet)) {

		hlist_for_each_entry(forw_packet_pos, tmp_node,

				     &bat_priv->forw_bat_list, list) {

			if (can_aggregate_with(batman_ogm_packet,

					       bat_priv,

					       packet_len,

					       send_time,

					       direct_link,

					       if_incoming,

					       forw_packet_pos)) {

				forw_packet_aggr = forw_packet_pos;

				break;

			}

		}

	}



	/* nothing to aggregate with - either aggregation disabled or no

	 * suitable aggregation packet found */

	if (!forw_packet_aggr) {

		/* the following section can run without the lock */

		spin_unlock_bh(&bat_priv->forw_bat_list_lock);



		/**

		 * if we could not aggregate this packet with one of the others

		 * we hold it back for a while, so that it might be aggregated

		 * later on

		 */

		if ((!own_packet) &&

		    (atomic_read(&bat_priv->aggregated_ogms)))

			send_time += msecs_to_jiffies(MAX_AGGREGATION_MS);



		new_aggregated_packet(packet_buff, packet_len,

				      send_time, direct_link,

				      if_incoming, own_packet);

	} else {

		aggregate(forw_packet_aggr,

			  packet_buff, packet_len,

			  direct_link);

		spin_unlock_bh(&bat_priv->forw_bat_list_lock);

	}

}

net/batman-adv/aggregation.h

deleted100644 → 0
+0 −42
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors:

 *

 * Marek Lindner, Simon Wunderlich

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of version 2 of the GNU General Public

 * License as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

 * General Public License for more details.

 *

 * You should have received a copy of the GNU General Public License

 * along with this program; if not, write to the Free Software

 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA

 * 02110-1301, USA

 *

 */



#ifndef _NET_BATMAN_ADV_AGGREGATION_H_

#define _NET_BATMAN_ADV_AGGREGATION_H_



#include "main.h"



/* is there another aggregated packet here? */

static inline int aggregated_packet(int buff_pos, int packet_len,

				    int tt_num_changes)

{

	int next_buff_pos = buff_pos + BATMAN_OGM_LEN + tt_len(tt_num_changes);



	return (next_buff_pos <= packet_len) &&

		(next_buff_pos <= MAX_AGGREGATION_BYTES);

}



void add_bat_packet_to_list(struct bat_priv *bat_priv,

			    unsigned char *packet_buff, int packet_len,

			    struct hard_iface *if_incoming, int own_packet,

			    unsigned long send_time);



#endif /* _NET_BATMAN_ADV_AGGREGATION_H_ */

net/batman-adv/bat_iv_ogm.c

+498 −4

File changed.

Preview size limit exceeded, changes collapsed.

net/batman-adv/bat_ogm.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ 
void bat_ogm_init(struct hard_iface *hard_iface);

void bat_ogm_init_primary(struct hard_iface *hard_iface);

void bat_ogm_update_mac(struct hard_iface *hard_iface);

void bat_ogm_schedule(struct hard_iface *hard_iface, int tt_num_changes);

void bat_ogm_emit(struct forw_packet *forw_packet);

void bat_ogm_receive(const struct ethhdr *ethhdr, unsigned char *packet_buff,

		     int packet_len, struct hard_iface *if_incoming);