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

Commit 81f02683 authored by Simon Wunderlich's avatar Simon Wunderlich Committed by Antonio Quartulli
Browse files

batman-adv: add seqno maximum age and protection start flag parameters 



To allow future use of the window protected function with different
maximum sequence numbers, add a parameter to set this value which
was previously hardcoded. Another parameter added for future use is a
flag to return whether the protection window has started.

While at it, also fix the kerneldoc.

Signed-off-by: default avatarSimon Wunderlich <simon@open-mesh.com>
Signed-off-by: default avatarMarek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: default avatarAntonio Quartulli <a@unstable.cc>
parent 140ed8e8

net/batman-adv/bat_iv_ogm.c

+2 −1
Original line number Diff line number Diff line
@@ -1315,7 +1315,8 @@ batadv_iv_ogm_update_seqnos(const struct ethhdr *ethhdr, 
	/* signalize caller that the packet is to be dropped. */

	if (!hlist_empty(&orig_node->neigh_list) &&

	    batadv_window_protected(bat_priv, seq_diff,

				    &orig_ifinfo->batman_seqno_reset)) {

				    BATADV_TQ_LOCAL_WINDOW_SIZE,

				    &orig_ifinfo->batman_seqno_reset, NULL)) {

		ret = BATADV_PROTECTED;

		goto out;

	}

net/batman-adv/main.h

+3 −0
Original line number Diff line number Diff line
@@ -35,6 +35,9 @@ 
/* Time To Live of broadcast messages */

#define BATADV_TTL 50



/* maximum sequence number age of broadcast messages */

#define BATADV_BCAST_MAX_AGE 64



/* purge originators after time in seconds if no valid packet comes in

 * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE

 */

net/batman-adv/routing.c

+10 −3
Original line number Diff line number Diff line
@@ -146,23 +146,29 @@ void batadv_update_route(struct batadv_priv *bat_priv, 
 * @bat_priv: the bat priv with all the soft interface information

 * @seq_num_diff: difference between the current/received sequence number and

 *  the last sequence number

 * @seq_old_max_diff: maximum age of sequence number not considered as restart

 * @last_reset: jiffies timestamp of the last reset, will be updated when reset

 *  is detected

 * @protection_started: is set to true if the protection window was started,

 *   doesn't change otherwise.

 *

 * Return:

 *  0 if the packet is to be accepted.

 *  1 if the packet is to be ignored.

 */

int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff,

			    unsigned long *last_reset)

			    s32 seq_old_max_diff, unsigned long *last_reset,

			    bool *protection_started)

{

	if (seq_num_diff <= -BATADV_TQ_LOCAL_WINDOW_SIZE ||

	if (seq_num_diff <= -seq_old_max_diff ||

	    seq_num_diff >= BATADV_EXPECTED_SEQNO_RANGE) {

		if (!batadv_has_timed_out(*last_reset,

					  BATADV_RESET_PROTECTION_MS))

			return 1;



		*last_reset = jiffies;

		if (protection_started)

			*protection_started = true;

		batadv_dbg(BATADV_DBG_BATMAN, bat_priv,

			   "old packet received, start protection\n");

	}
@@ -1073,7 +1079,8 @@ int batadv_recv_bcast_packet(struct sk_buff *skb, 


	/* check whether the packet is old and the host just restarted. */

	if (batadv_window_protected(bat_priv, seq_diff,

				    &orig_node->bcast_seqno_reset))

				    BATADV_BCAST_MAX_AGE,

				    &orig_node->bcast_seqno_reset, NULL))

		goto spin_unlock;



	/* mark broadcast in flood history, update window position

net/batman-adv/routing.h

+2 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ batadv_find_router(struct batadv_priv *bat_priv, 
		   struct batadv_orig_node *orig_node,

		   struct batadv_hard_iface *recv_if);

int batadv_window_protected(struct batadv_priv *bat_priv, s32 seq_num_diff,

			    unsigned long *last_reset);

			    s32 seq_old_max_diff, unsigned long *last_reset,

			    bool *protection_started);



#endif /* _NET_BATMAN_ADV_ROUTING_H_ */