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

batman-adv: fixed hash functions type to uint32_t instead of int 



There are two reasons for this fix:
- the result of choose_orig() and vis_choose() is an index and therefore it can't
  be negative. Hence it is correct to make the return type unsigned too.

- sizeof(int) may not be the same on ALL the architectures. Since we plan to use
  choose_orig() as DHT hash function, we need to guarantee that, given the same
  argument, the result is the same. Then it is correct to explicitly express
  the size of the return type (and the second argument). Since the expected
  length is currently 4, uint32_t is the most convenient choice.

Signed-off-by: default avatarAntonio Quartulli <ordex@autistici.org>
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
parent eb7e2a1e

net/batman-adv/hash.c

+2 −2
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
/* clears the hash */

static void hash_init(struct hashtable_t *hash)

{

	int i;

	uint32_t i;



	for (i = 0 ; i < hash->size; i++) {

		INIT_HLIST_HEAD(&hash->table[i]);
@@ -42,7 +42,7 @@ void hash_destroy(struct hashtable_t *hash) 
}



/* allocates and clears the hash */

struct hashtable_t *hash_new(int size)

struct hashtable_t *hash_new(uint32_t size)

{

	struct hashtable_t *hash;

net/batman-adv/hash.h

+7 −6
Original line number Diff line number Diff line
@@ -33,17 +33,17 @@ typedef int (*hashdata_compare_cb)(const struct hlist_node *, const void *); 
/* the hashfunction, should return an index

 * based on the key in the data of the first

 * argument and the size the second */

typedef int (*hashdata_choose_cb)(const void *, int);

typedef uint32_t (*hashdata_choose_cb)(const void *, uint32_t);

typedef void (*hashdata_free_cb)(struct hlist_node *, void *);



struct hashtable_t {

	struct hlist_head *table;   /* the hashtable itself with the buckets */

	spinlock_t *list_locks;     /* spinlock for each hash list entry */

	int size;		    /* size of hashtable */

	uint32_t size;		    /* size of hashtable */

};



/* allocates and clears the hash */

struct hashtable_t *hash_new(int size);

struct hashtable_t *hash_new(uint32_t size);



/* free only the hashtable and the hash itself. */

void hash_destroy(struct hashtable_t *hash);
@@ -57,7 +57,7 @@ static inline void hash_delete(struct hashtable_t *hash, 
	struct hlist_head *head;

	struct hlist_node *node, *node_tmp;

	spinlock_t *list_lock; /* spinlock to protect write access */

	int i;

	uint32_t i;



	for (i = 0; i < hash->size; i++) {

		head = &hash->table[i];
@@ -93,7 +93,8 @@ static inline int hash_add(struct hashtable_t *hash, 
			   hashdata_choose_cb choose,

			   const void *data, struct hlist_node *data_node)

{

	int index, ret = -1;

	uint32_t index;

	int ret = -1;

	struct hlist_head *head;

	struct hlist_node *node;

	spinlock_t *list_lock; /* spinlock to protect write access */
@@ -137,7 +138,7 @@ static inline void *hash_remove(struct hashtable_t *hash, 
				hashdata_compare_cb compare,

				hashdata_choose_cb choose, void *data)

{

	size_t index;

	uint32_t index;

	struct hlist_node *node;

	struct hlist_head *head;

	void *data_save = NULL;

net/batman-adv/originator.c

+8 −5
Original line number Diff line number Diff line
@@ -164,7 +164,7 @@ void originator_free(struct bat_priv *bat_priv) 
	struct hlist_head *head;

	spinlock_t *list_lock; /* spinlock to protect write access */

	struct orig_node *orig_node;

	int i;

	uint32_t i;



	if (!hash)

		return;
@@ -350,7 +350,7 @@ static void _purge_orig(struct bat_priv *bat_priv) 
	struct hlist_head *head;

	spinlock_t *list_lock; /* spinlock to protect write access */

	struct orig_node *orig_node;

	int i;

	uint32_t i;



	if (!hash)

		return;
@@ -413,7 +413,8 @@ int orig_seq_print_text(struct seq_file *seq, void *offset) 
	int batman_count = 0;

	int last_seen_secs;

	int last_seen_msecs;

	int i, ret = 0;

	uint32_t i;

	int ret = 0;



	primary_if = primary_if_get_selected(bat_priv);
@@ -519,7 +520,8 @@ int orig_hash_add_if(struct hard_iface *hard_iface, int max_if_num) 
	struct hlist_node *node;

	struct hlist_head *head;

	struct orig_node *orig_node;

	int i, ret;

	uint32_t i;

	int ret;



	/* resize all orig nodes because orig_node->bcast_own(_sum) depend on

	 * if_num */
@@ -601,7 +603,8 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num) 
	struct hlist_head *head;

	struct hard_iface *hard_iface_tmp;

	struct orig_node *orig_node;

	int i, ret;

	uint32_t i;

	int ret;



	/* resize all orig nodes because orig_node->bcast_own(_sum) depend on

	 * if_num */

net/batman-adv/originator.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ int orig_hash_del_if(struct hard_iface *hard_iface, int max_if_num); 


/* hashfunction to choose an entry in a hash table of given size */

/* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */

static inline int choose_orig(const void *data, int32_t size)

static inline uint32_t choose_orig(const void *data, uint32_t size)

{

	const unsigned char *key = data;

	uint32_t hash = 0;

net/batman-adv/routing.c

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ void slide_own_bcast_window(struct hard_iface *hard_iface) 
	struct hlist_head *head;

	struct orig_node *orig_node;

	unsigned long *word;

	int i;

	uint32_t i;

	size_t word_index;



	for (i = 0; i < hash->size; i++) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE