B.A.T.M.A.N July 2009

b.a.t.m.a.n@lists.open-mesh.org

14 participants
34 discussions

[B.A.T.M.A.N.] [batman-adv] vis.[ch] Linux coding style cleanup

by Andrew Lunn

Fix all the warnings generated by the 2.6.29 checkpatch script about violations of the Linux coding style in the vis.[ch] files. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/vis.c =================================================================== --- batman-adv-kernelland/vis.c (revision 1346) +++ batman-adv-kernelland/vis.c (working copy) @@ -17,10 +17,6 @@ * */ - - - - #include "main.h" #include "send.h" #include "translation-table.h" @@ -31,30 +27,74 @@ #include "hash.h" #include "compat.h" - -static DECLARE_DELAYED_WORK(vis_timer_wq, send_vis_packets); - struct hashtable_t *vis_hash; DEFINE_SPINLOCK(vis_hash_lock); -static struct vis_info *my_vis_info = NULL; -static struct list_head send_list; /* always locked with vis_hash_lock ... */ +static struct vis_info *my_vis_info; +static struct list_head send_list; /* always locked with vis_hash_lock */ -void free_info(void *data); -void send_vis_packet(struct vis_info *info); -void start_vis_timer(void); -volatile uint8_t vis_format = DOT_DRAW; +static void start_vis_timer(void); +/* free the info */ +static void free_info(void *data) +{ + struct vis_info *info = data; + struct recvlist_node *entry, *tmp; -int vis_info_cmp(void *data1, void *data2) { + list_del_init(&info->send_list); + list_for_each_entry_safe(entry, tmp, &info->recv_list, list) { + list_del(&entry->list); + kfree(entry); + } + kfree(info); +} + +/* set the mode of the visualization to client or server */ +void vis_set_mode(int mode) +{ + spin_lock(&vis_hash_lock); + + if (my_vis_info != NULL) + my_vis_info->packet.vis_type = mode; + + spin_unlock(&vis_hash_lock); + +} + +/* is_vis_server(), locked outside */ +static int is_vis_server_locked(void) +{ + if (my_vis_info != NULL) + if (my_vis_info->packet.vis_type == VIS_TYPE_SERVER_SYNC) + return 1; + + return 0; +} + +/* get the current set mode */ +int is_vis_server(void) +{ + int ret = 0; + + spin_lock(&vis_hash_lock); + ret = is_vis_server_locked(); + spin_unlock(&vis_hash_lock); + + return ret; +} + +/* Compare two vis packets, used by the hashing algorithm */ +static int vis_info_cmp(void *data1, void *data2) +{ struct vis_info *d1, *d2; d1 = data1; d2 = data2; - return(memcmp(d1->packet.vis_orig, d2->packet.vis_orig, ETH_ALEN) == 0); + return memcmp(d1->packet.vis_orig, d2->packet.vis_orig, ETH_ALEN) == 0; } -/* hashfunction to choose an entry in a hash table of given size */ +/* hash function to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ -int vis_info_choose(void *data, int size) { +static int vis_info_choose(void *data, int size) +{ struct vis_info *vis_info = data; unsigned char *key; uint32_t hash = 0; @@ -71,11 +111,11 @@ hash ^= (hash >> 11); hash += (hash << 15); - return (hash%size); + return hash%size; } /* tries to add one entry to the receive list. */ -void recv_list_add(struct list_head *recv_list, char *mac) +static void recv_list_add(struct list_head *recv_list, char *mac) { struct recvlist_node *entry; entry = kmalloc(sizeof(struct recvlist_node), GFP_KERNEL); @@ -87,24 +127,22 @@ } /* returns 1 if this mac is in the recv_list */ -int recv_list_is_in(struct list_head *recv_list, char *mac) +static int recv_list_is_in(struct list_head *recv_list, char *mac) { struct recvlist_node *entry; list_for_each_entry(entry, recv_list, list) { - if (memcmp(entry->mac, mac, ETH_ALEN) == 0) return 1; } - return 0; } -/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old, broken.. ). - * vis hash must be locked outside. - * is_new is set when the packet is newer than old entries in the hash. */ - -struct vis_info *add_packet(struct vis_packet *vis_packet, int vis_info_len, int *is_new) +/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old, + * broken.. ). vis hash must be locked outside. is_new is set when the packet + * is newer than old entries in the hash. */ +static struct vis_info *add_packet(struct vis_packet *vis_packet, + int vis_info_len, int *is_new) { struct vis_info *info, *old_info; struct vis_info search_elem; @@ -121,12 +159,12 @@ if (old_info != NULL) { if (vis_packet->seqno - old_info->packet.seqno <= 0) { if (old_info->packet.seqno == vis_packet->seqno) { - - recv_list_add(&old_info->recv_list, vis_packet->sender_orig); - return(old_info); + recv_list_add(&old_info->recv_list, + vis_packet->sender_orig); + return old_info; } else { /* newer packet is already in hash. */ - return(NULL); + return NULL; } } /* remove old entry */ @@ -134,14 +172,15 @@ free_info(old_info); } - info = kmalloc(sizeof(struct vis_info) + vis_info_len,GFP_KERNEL); + info = kmalloc(sizeof(struct vis_info) + vis_info_len, GFP_KERNEL); if (info == NULL) return NULL; INIT_LIST_HEAD(&info->send_list); INIT_LIST_HEAD(&info->recv_list); info->first_seen = jiffies; - memcpy(&info->packet, vis_packet, sizeof(struct vis_packet) + vis_info_len); + memcpy(&info->packet, vis_packet, + sizeof(struct vis_packet) + vis_info_len); /* initialize and add new packet. */ *is_new = 1; @@ -153,7 +192,7 @@ recv_list_add(&info->recv_list, info->packet.sender_orig); /* try to add it */ - if (hash_add(vis_hash, info)< 0) { + if (hash_add(vis_hash, info) < 0) { /* did not work (for some reason) */ free_info(info); info = NULL; @@ -172,20 +211,20 @@ if (info == NULL) goto end; - /* only if we are server ourselves and packet is newer than the one in hash.*/ + /* only if we are server ourselves and packet is newer than the one in + * hash.*/ if (is_vis_server_locked() && is_new) { memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); } - end: spin_unlock(&vis_hash_lock); - } /* handle an incoming client update packet and schedule forward if needed. */ -void receive_client_update_packet(struct vis_packet *vis_packet, int vis_info_len) +void receive_client_update_packet(struct vis_packet *vis_packet, + int vis_info_len) { struct vis_info *info; int is_new; @@ -201,62 +240,58 @@ /* send only if we're the target server or ... */ - if (is_vis_server_locked() - && is_my_mac(info->packet.target_orig) - && is_new) { - + if (is_vis_server_locked() && + is_my_mac(info->packet.target_orig) && + is_new) { info->packet.vis_type = VIS_TYPE_SERVER_SYNC; /* upgrade! */ memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); - /* ... we're not the recipient (and thus need to forward). */ + /* ... we're not the recipient (and thus need to forward). */ } else if (!is_my_mac(info->packet.target_orig)) { - if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); } - end: spin_unlock(&vis_hash_lock); } -/* set the mode of the visualization to client or server */ -void vis_set_mode(int mode) +/* Walk the originators and find the VIS server with the best tq. Set the packet + * address to its address and return the best_tq. + * + * Must be called with the originator hash locked */ +static int find_best_vis_server(struct vis_info *info) { - spin_lock(&vis_hash_lock); + struct hash_it_t *hashit = NULL; + struct orig_node *orig_node; + int best_tq = -1; - if (my_vis_info != NULL) - my_vis_info->packet.vis_type = mode; - - spin_unlock(&vis_hash_lock); - + while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { + orig_node = hashit->bucket->data; + if ((orig_node != NULL) && + (orig_node->router != NULL) && + (orig_node->flags & VIS_SERVER) && + (orig_node->router->tq_avg > best_tq)) { + best_tq = orig_node->router->tq_avg; + memcpy(info->packet.target_orig, orig_node->orig, + ETH_ALEN); + } + } + return best_tq; } -/* is_vis_server(), locked outside */ -int is_vis_server_locked(void) +/* Return true if the vis packet is full. */ +static bool vis_packet_full(struct vis_info *info) { - if (my_vis_info != NULL) - if (my_vis_info->packet.vis_type == VIS_TYPE_SERVER_SYNC) - return 1; - - return 0; + if (info->packet.entries + 1 > + (1000 - sizeof(struct vis_info)) / sizeof(struct vis_info_entry)) + return true; + return false; } -/* get the current set mode */ -int is_vis_server(void) -{ - int ret = 0; - spin_lock(&vis_hash_lock); - ret = is_vis_server_locked(); - spin_unlock(&vis_hash_lock); - - return ret; -} - /* generates a packet of own vis data, * returns 0 on success, -1 if no packet could be generated */ - static int generate_vis_packet(void) { struct hash_it_t *hashit = NULL; @@ -270,22 +305,13 @@ info->first_seen = jiffies; spin_lock(&orig_hash_lock); - memcpy(info->packet.target_orig, broadcastAddr, 6); + memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); info->packet.ttl = TTL; info->packet.seqno++; info->packet.entries = 0; if (!is_vis_server_locked()) { - /* find vis-server to receive. */ - while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { - orig_node = hashit->bucket->data; - if ((orig_node != NULL) && (orig_node->router != NULL)) { - if ((orig_node->flags & VIS_SERVER) && orig_node->router->tq_avg > best_tq) { - best_tq = orig_node->router->tq_avg; - memcpy(info->packet.target_orig, orig_node->orig,6); - } - } - } + best_tq = find_best_vis_server(info); if (best_tq < 0) { spin_unlock(&orig_hash_lock); return -1; @@ -293,22 +319,23 @@ } hashit = NULL; - entry_array = (struct vis_info_entry *)((char *)info + sizeof(struct vis_info)); + entry_array = (struct vis_info_entry *) + ((char *)info + sizeof(struct vis_info)); while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { orig_node = hashit->bucket->data; - if (orig_node->router != NULL - && memcmp(orig_node->router->addr, orig_node->orig, ETH_ALEN) == 0 - && orig_node->router->tq_avg > 0) { + if (orig_node->router != NULL && + memcmp(orig_node->router->addr, + orig_node->orig, ETH_ALEN) == 0 && + orig_node->router->tq_avg > 0) { /* fill one entry into buffer. */ entry = &entry_array[info->packet.entries]; - memcpy(entry->dest, orig_node->orig, ETH_ALEN); entry->quality = orig_node->router->tq_avg; info->packet.entries++; - /* don't fill more than 1000 bytes */ - if (info->packet.entries + 1 > (1000 - sizeof(struct vis_info)) / sizeof(struct vis_info_entry)) { + + if (vis_packet_full(info)) { spin_unlock(&orig_hash_lock); return 0; } @@ -321,23 +348,20 @@ spin_lock_irqsave(&hna_local_hash_lock, flags); while (NULL != (hashit = hash_iterate(hna_local_hash, hashit))) { hna_local_entry = hashit->bucket->data; - entry = &entry_array[info->packet.entries]; - memcpy(entry->dest, hna_local_entry->addr, ETH_ALEN); entry->quality = 0; /* 0 means HNA */ info->packet.entries++; - /* don't fill more than 1000 bytes */ - if (info->packet.entries + 1 > (1000 - sizeof(struct vis_info)) / sizeof(struct vis_info_entry)) { + if (vis_packet_full(info)) { spin_unlock_irqrestore(&hna_local_hash_lock, flags); return 0; } } spin_unlock_irqrestore(&hna_local_hash_lock, flags); return 0; +} -} void purge_vis_packets(void) { struct hash_it_t *hashit = NULL; @@ -348,7 +372,8 @@ info = hashit->bucket->data; if (info == my_vis_info) /* never purge own data. */ continue; - if (time_after(jiffies, info->first_seen + (VIS_TIMEOUT/1000)*HZ)) { + if (time_after(jiffies, + info->first_seen + (VIS_TIMEOUT/1000)*HZ)) { hash_remove_bucket(vis_hash, hashit); free_info(info); } @@ -356,100 +381,119 @@ spin_unlock(&vis_hash_lock); } -/* called from timer; send (and maybe generate) vis packet. */ -void send_vis_packets(struct work_struct *work) +static void broadcast_vis_packet(struct vis_info *info, int packet_length) { - struct vis_info *info, *temp; + struct hash_it_t *hashit = NULL; + struct orig_node *orig_node; - purge_vis_packets(); - spin_lock(&vis_hash_lock); - if (generate_vis_packet() == 0) - /* schedule if generation was successful */ - list_add_tail(&my_vis_info->send_list, &send_list); + spin_lock(&orig_hash_lock); - list_for_each_entry_safe(info, temp, &send_list, send_list) { - list_del_init(&info->send_list); - send_vis_packet(info); + /* send to all routers in range. */ + while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { + orig_node = hashit->bucket->data; + + /* if it's a vis server and reachable, send it. */ + if (orig_node && + (orig_node->flags & VIS_SERVER) && + orig_node->batman_if && + orig_node->router) { + + /* don't send it if we already received the packet from + * this node. */ + if (recv_list_is_in(&info->recv_list, orig_node->orig)) + continue; + + memcpy(info->packet.target_orig, + orig_node->orig, ETH_ALEN); + + send_raw_packet((unsigned char *) &info->packet, + packet_length, + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, + orig_node->batman_if); + } } - spin_unlock(&vis_hash_lock); - start_vis_timer(); + memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); + spin_unlock(&orig_hash_lock); +} +static void unicast_vis_packet(struct vis_info *info, int packet_length) +{ + struct orig_node *orig_node; + + spin_lock(&orig_hash_lock); + orig_node = ((struct orig_node *) + hash_find(orig_hash, info->packet.target_orig)); + + if ((orig_node != NULL) && + (orig_node->batman_if != NULL) && + (orig_node->router != NULL)) { + send_raw_packet((unsigned char *) &info->packet, packet_length, + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, orig_node->batman_if); + } + spin_unlock(&orig_hash_lock); } /* only send one vis packet. called from send_vis_packets() */ -void send_vis_packet(struct vis_info *info) +static void send_vis_packet(struct vis_info *info) { - struct hash_it_t *hashit = NULL; - struct orig_node *orig_node; int packet_length; - if (info->packet.ttl < 2) { - debug_log(LOG_TYPE_NOTICE, "Error - can't send vis packet: ttl exceeded\n"); + debug_log(LOG_TYPE_NOTICE, + "Error - can't send vis packet: ttl exceeded\n"); return; } memcpy(info->packet.sender_orig, mainIfAddr, ETH_ALEN); - info->packet.ttl--; - packet_length = sizeof(struct vis_packet) + info->packet.entries * sizeof(struct vis_info_entry); + packet_length = sizeof(struct vis_packet) + + info->packet.entries * sizeof(struct vis_info_entry); - if (is_bcast(info->packet.target_orig)) { - /* broadcast packet */ - spin_lock(&orig_hash_lock); + if (is_bcast(info->packet.target_orig)) + broadcast_vis_packet(info, packet_length); + else + unicast_vis_packet(info, packet_length); + info->packet.ttl++; /* restore TTL */ +} - /* send to all routers in range. */ - while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { +/* called from timer; send (and maybe generate) vis packet. */ +static void send_vis_packets(struct work_struct *work) +{ + struct vis_info *info, *temp; - orig_node = hashit->bucket->data; + purge_vis_packets(); + spin_lock(&vis_hash_lock); + if (generate_vis_packet() == 0) + /* schedule if generation was successful */ + list_add_tail(&my_vis_info->send_list, &send_list); - /* if it's a vis server and reachable, send it. */ - if ((orig_node != NULL) && (orig_node->flags & VIS_SERVER) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { - - /* don't send it if we already received the packet from this node. */ - if (recv_list_is_in(&info->recv_list, orig_node->orig)) - continue; - - - memcpy(info->packet.target_orig, orig_node->orig, ETH_ALEN); - send_raw_packet((unsigned char *) &info->packet, packet_length, - orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - } - } - memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); - - spin_unlock(&orig_hash_lock); - } else { - /* unicast packet */ - spin_lock(&orig_hash_lock); - orig_node = ((struct orig_node *) hash_find(orig_hash, info->packet.target_orig)); - - if ((orig_node != NULL) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { - send_raw_packet((unsigned char *) &info->packet, packet_length, - orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - } - spin_unlock(&orig_hash_lock); - + list_for_each_entry_safe(info, temp, &send_list, send_list) { + list_del_init(&info->send_list); + send_vis_packet(info); } - info->packet.ttl++; /* restore TTL */ + spin_unlock(&vis_hash_lock); + start_vis_timer(); } +static DECLARE_DELAYED_WORK(vis_timer_wq, send_vis_packets); -/* init the vis server. this may only be called when if_list is already initialized - * (e.g. bat0 is initialized, interfaces have been added) */ +/* init the vis server. this may only be called when if_list is already + * initialized (e.g. bat0 is initialized, interfaces have been added) */ int vis_init(void) { vis_hash = hash_new(256, vis_info_cmp, vis_info_choose); if (vis_hash == NULL) { debug_log(LOG_TYPE_CRIT, "Can't initialize vis_hash\n"); - return(-1); + return -1; } my_vis_info = kmalloc(1000, GFP_KERNEL); if (my_vis_info == NULL) { vis_quit(); debug_log(LOG_TYPE_CRIT, "Can't initialize vis packet\n"); - return(-1); + return -1; } /* prefill the vis info */ my_vis_info->first_seen = jiffies - atomic_read(&vis_interval); @@ -468,47 +512,36 @@ memcpy(my_vis_info->packet.sender_orig, mainIfAddr, ETH_ALEN); if (hash_add(vis_hash, my_vis_info) < 0) { - debug_log(LOG_TYPE_CRIT, "Can't add own vis packet into hash\n"); - free_info(my_vis_info); /* not in hash, need to remove it manually. */ + debug_log(LOG_TYPE_CRIT, + "Can't add own vis packet into hash\n"); + free_info(my_vis_info); /* not in hash, need to remove it + * manually. */ vis_quit(); - return(-1); + return -1; } start_vis_timer(); - return(0); + return 0; } -/* free the info */ -void free_info(void *data) -{ - struct vis_info *info = data; - struct recvlist_node *entry, *tmp; - - list_del_init(&info->send_list); - list_for_each_entry_safe(entry, tmp, &info->recv_list, list) { - list_del(&entry->list); - kfree(entry); - } - kfree(info); -} - /* shutdown vis-server */ int vis_quit(void) { if (vis_hash != NULL) { cancel_delayed_work_sync(&vis_timer_wq); spin_lock(&vis_hash_lock); - hash_delete(vis_hash, free_info); /* properly remove, kill timers ... */ + /* properly remove, kill timers ... */ + hash_delete(vis_hash, free_info); vis_hash = NULL; my_vis_info = NULL; spin_unlock(&vis_hash_lock); } - return(0); + return 0; } /* schedule packets for (re)transmission */ -void start_vis_timer(void) +static void start_vis_timer(void) { - queue_delayed_work(bat_event_workqueue, &vis_timer_wq, (atomic_read(&vis_interval)/1000) * HZ); + queue_delayed_work(bat_event_workqueue, &vis_timer_wq, + (atomic_read(&vis_interval)/1000) * HZ); } - Index: batman-adv-kernelland/vis.h =================================================================== --- batman-adv-kernelland/vis.h (revision 1346) +++ batman-adv-kernelland/vis.h (working copy) @@ -17,19 +17,17 @@ * */ - #define VIS_TIMEOUT 200000 #define VIS_FORMAT_DD_NAME "dot_draw" #define VIS_FORMAT_JSON_NAME "json" - struct vis_info { unsigned long first_seen; struct list_head recv_list; - /* list of server-neighbors we received a vis-packet from. - * we should not reply to them. */ + /* list of server-neighbors we received a vis-packet + * from. we should not reply to them. */ struct list_head send_list; - /* this packet might be part of the vis send queue. */ + /* this packet might be part of the vis send queue. */ struct vis_packet packet; /* vis_info may follow here*/ } __attribute__((packed)); @@ -41,7 +39,7 @@ struct recvlist_node { struct list_head list; - uint8_t mac[6]; + uint8_t mac[ETH_ALEN]; }; enum vis_formats { @@ -51,14 +49,12 @@ extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -extern volatile uint8_t vis_format; -void receive_vis_packet(struct ethhdr *ethhdr, struct vis_packet *vis_packet, int vis_info_len); void vis_set_mode(int mode); int is_vis_server(void); -int is_vis_server_locked(void); -void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len); -void receive_client_update_packet(struct vis_packet *vis_packet, int vis_info_len); -void send_vis_packets(struct work_struct *work); +void receive_server_sync_packet(struct vis_packet *vis_packet, + int vis_info_len); +void receive_client_update_packet(struct vis_packet *vis_packet, + int vis_info_len); int vis_init(void); int vis_quit(void);

13 years, 8 months

[B.A.T.M.A.N.] [vis] Remove duplicate routes from vis output

by Edwe Cowley

Revision 1271 introduced a bug on the call to hash->compare() that caused duplicate routes to appear in the output. Inverted the conditional and now it works. Signed-off-by: Edwe Cowley <edwecowley(a)gmail.com> Index: batman/hash.c =================================================================== --- batman/hash.c (revision 1343) +++ batman/hash.c (working copy) @@ -179,7 +179,7 @@ bucket = hash->table[index]; while (bucket != NULL) { - if (hash->compare(bucket->data, data)) + if (!(hash->compare(bucket->data, data))) return -1; prev_bucket = bucket; @@ -217,7 +217,7 @@ bucket = hash->table[index]; while (bucket != NULL) { - if (hash->compare(bucket->data, keydata)) + if (!(hash->compare(bucket->data, keydata))) return bucket->data; bucket = bucket->next; @@ -260,7 +260,7 @@ hash_it_t.prev_bucket = NULL; while (hash_it_t.bucket != NULL) { - if (hash->compare(hash_it_t.bucket->data, data)) { + if (!(hash->compare(hash_it_t.bucket->data, data))) { hash_it_t.first_bucket = (hash_it_t.bucket == hash->table[hash_it_t.index] ? &hash->table[ hash_it_t.index ] : NULL); return hash_remove_bucket(hash, &hash_it_t); }

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv]: move vis_format from vis.c to proc.c

by Andrew Lunn

vis_format is currently in vis.c however this variable is only used in proc.c. Move it into proc, and remove the volatile, which should not be needed. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: vis.c =================================================================== --- vis.c (revision 1345) +++ vis.c (working copy) @@ -42,7 +42,6 @@ void free_info(void *data); void send_vis_packet(struct vis_info *info); void start_vis_timer(void); -volatile uint8_t vis_format = DOT_DRAW; int vis_info_cmp(void *data1, void *data2) { Index: vis.h =================================================================== --- vis.h (revision 1345) +++ vis.h (working copy) @@ -51,7 +51,6 @@ extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -extern volatile uint8_t vis_format; void receive_vis_packet(struct ethhdr *ethhdr, struct vis_packet *vis_packet, int vis_info_len); void vis_set_mode(int mode); Index: proc.c =================================================================== --- proc.c (revision 1345) +++ proc.c (working copy) @@ -31,6 +31,7 @@ #include "types.h" #include "hash.h" +static uint8_t vis_format = DOT_DRAW; static struct proc_dir_entry *proc_batman_dir = NULL, *proc_interface_file = NULL, *proc_orig_interval_file = NULL, *proc_originators_file = NULL;

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] VIS startup race condition fix plus coding style cleanup

by Andrew Lunn

There is a race condition between batman starting, adding the interfaces and creating the bat0 interface, and setting VIS into server mode, by echo'ing server into /proc/net/batman/vis. If you enable server mode before the bat0 interface is up and running, this gets forgotten when bat0 comes up. The vis_init() function has been split into two parts, vis_init() and vis_start(). vis_init() is called during the module init function and vis_start() is called when the bat0 interface is setup, thus closing the race. The files vis.[ch] have also been cleaned up with respect to the Linux kernel coding standard and 2.6.29 checkpatch script. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/vis.c =================================================================== --- batman-adv-kernelland/vis.c (revision 1343) +++ batman-adv-kernelland/vis.c (working copy) @@ -17,10 +17,6 @@ * */ - - - - #include "main.h" #include "send.h" #include "translation-table.h" @@ -31,30 +27,68 @@ #include "hash.h" #include "compat.h" - -static DECLARE_DELAYED_WORK(vis_timer_wq, send_vis_packets); - struct hashtable_t *vis_hash; DEFINE_SPINLOCK(vis_hash_lock); -static struct vis_info *my_vis_info = NULL; -static struct list_head send_list; /* always locked with vis_hash_lock ... */ +static struct vis_info my_vis_info; +static struct list_head send_list; /* always locked with vis_hash_lock */ -void free_info(void *data); -void send_vis_packet(struct vis_info *info); -void start_vis_timer(void); -volatile uint8_t vis_format = DOT_DRAW; +static void start_vis_timer(void); +/* free the info */ +static void free_info(void *data) +{ + struct vis_info *info = data; + struct recvlist_node *entry, *tmp; -int vis_info_cmp(void *data1, void *data2) { + list_del_init(&info->send_list); + list_for_each_entry_safe(entry, tmp, &info->recv_list, list) { + list_del(&entry->list); + kfree(entry); + } + kfree(info); +} + +/* set the mode of the visualization to client or server */ +void vis_set_mode(int mode) +{ + spin_lock(&vis_hash_lock); + my_vis_info.packet.vis_type = mode; + spin_unlock(&vis_hash_lock); +} + +/* is_vis_server(), locked outside */ +static int is_vis_server_locked(void) +{ + if (my_vis_info.packet.vis_type == VIS_TYPE_SERVER_SYNC) + return 1; + return 0; +} + +/* get the current set mode */ +int is_vis_server(void) +{ + int ret = 0; + + spin_lock(&vis_hash_lock); + ret = is_vis_server_locked(); + spin_unlock(&vis_hash_lock); + + return ret; +} + +/* Compare two vis packets, used by the hashing algorithm */ +static int vis_info_cmp(void *data1, void *data2) +{ struct vis_info *d1, *d2; d1 = data1; d2 = data2; - return(memcmp(d1->packet.vis_orig, d2->packet.vis_orig, ETH_ALEN) == 0); + return memcmp(d1->packet.vis_orig, d2->packet.vis_orig, ETH_ALEN) == 0; } -/* hashfunction to choose an entry in a hash table of given size */ +/* hash function to choose an entry in a hash table of given size */ /* hash algorithm from http://en.wikipedia.org/wiki/Hash_table */ -int vis_info_choose(void *data, int size) { +static int vis_info_choose(void *data, int size) +{ struct vis_info *vis_info = data; unsigned char *key; uint32_t hash = 0; @@ -71,11 +105,11 @@ hash ^= (hash >> 11); hash += (hash << 15); - return (hash%size); + return hash%size; } /* tries to add one entry to the receive list. */ -void recv_list_add(struct list_head *recv_list, char *mac) +static void recv_list_add(struct list_head *recv_list, char *mac) { struct recvlist_node *entry; entry = kmalloc(sizeof(struct recvlist_node), GFP_KERNEL); @@ -87,24 +121,23 @@ } /* returns 1 if this mac is in the recv_list */ -int recv_list_is_in(struct list_head *recv_list, char *mac) +static int recv_list_is_in(struct list_head *recv_list, char *mac) { struct recvlist_node *entry; list_for_each_entry(entry, recv_list, list) { - if (memcmp(entry->mac, mac, ETH_ALEN) == 0) return 1; } - return 0; } -/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old, broken.. ). - * vis hash must be locked outside. - * is_new is set when the packet is newer than old entries in the hash. */ +/* try to add the packet to the vis_hash. return NULL if invalid (e.g. too old, + * broken.. ). vis hash must be locked outside. is_new is set when the packet + * is newer than old entries in the hash. */ -struct vis_info *add_packet(struct vis_packet *vis_packet, int vis_info_len, int *is_new) +static struct vis_info *add_packet(struct vis_packet *vis_packet, + int vis_info_len, int *is_new) { struct vis_info *info, *old_info; struct vis_info search_elem; @@ -121,12 +154,12 @@ if (old_info != NULL) { if (vis_packet->seqno - old_info->packet.seqno <= 0) { if (old_info->packet.seqno == vis_packet->seqno) { - - recv_list_add(&old_info->recv_list, vis_packet->sender_orig); - return(old_info); + recv_list_add(&old_info->recv_list, + vis_packet->sender_orig); + return old_info; } else { /* newer packet is already in hash. */ - return(NULL); + return NULL; } } /* remove old entry */ @@ -134,14 +167,15 @@ free_info(old_info); } - info = kmalloc(sizeof(struct vis_info) + vis_info_len,GFP_KERNEL); + info = kmalloc(sizeof(struct vis_info), GFP_KERNEL); if (info == NULL) return NULL; INIT_LIST_HEAD(&info->send_list); INIT_LIST_HEAD(&info->recv_list); info->first_seen = jiffies; - memcpy(&info->packet, vis_packet, sizeof(struct vis_packet) + vis_info_len); + memcpy(&info->packet, vis_packet, + sizeof(struct vis_packet) + vis_info_len); /* initialize and add new packet. */ *is_new = 1; @@ -153,7 +187,7 @@ recv_list_add(&info->recv_list, info->packet.sender_orig); /* try to add it */ - if (hash_add(vis_hash, info)< 0) { + if (hash_add(vis_hash, info) < 0) { /* did not work (for some reason) */ free_info(info); info = NULL; @@ -162,7 +196,8 @@ } /* handle the server sync packet, forward if needed. */ -void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len) +void receive_server_sync_packet(struct vis_packet *vis_packet, + int vis_info_len) { struct vis_info *info; int is_new; @@ -172,20 +207,20 @@ if (info == NULL) goto end; - /* only if we are server ourselves and packet is newer than the one in hash.*/ + /* only if we are server ourselves and packet is newer than the one in + * hash.*/ if (is_vis_server_locked() && is_new) { memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); } - end: spin_unlock(&vis_hash_lock); - } /* handle an incoming client update packet and schedule forward if needed. */ -void receive_client_update_packet(struct vis_packet *vis_packet, int vis_info_len) +void receive_client_update_packet(struct vis_packet *vis_packet, + int vis_info_len) { struct vis_info *info; int is_new; @@ -197,63 +232,59 @@ info = add_packet(vis_packet, vis_info_len, &is_new); if (info == NULL) goto end; + /* note that outdated packets will be dropped at this point. */ - /* send only if we're the target server or ... */ - if (is_vis_server_locked() - && is_my_mac(info->packet.target_orig) - && is_new) { - + if (is_vis_server_locked() && + is_my_mac(info->packet.target_orig) && + is_new) { info->packet.vis_type = VIS_TYPE_SERVER_SYNC; /* upgrade! */ memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); - /* ... we're not the recipient (and thus need to forward). */ + /* ... we're not the recipient (and thus need to forward). */ } else if (!is_my_mac(info->packet.target_orig)) { - if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); } - end: spin_unlock(&vis_hash_lock); } -/* set the mode of the visualization to client or server */ -void vis_set_mode(int mode) +/* Walk the originators and find the VIS server with the best tq. Set the packet + * address to its address and return the best_tq. + * + * Must be called with the originator hash locked */ +static int find_best_vis_server(struct vis_info *info) { - spin_lock(&vis_hash_lock); + struct hash_it_t *hashit = NULL; + struct orig_node *orig_node; + int best_tq = -1; - if (my_vis_info != NULL) - my_vis_info->packet.vis_type = mode; - - spin_unlock(&vis_hash_lock); - + while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { + orig_node = hashit->bucket->data; + if ((orig_node != NULL) && + (orig_node->router != NULL) && + (orig_node->flags & VIS_SERVER) && + (orig_node->router->tq_avg > best_tq)) { + best_tq = orig_node->router->tq_avg; + memcpy(info->packet.target_orig, orig_node->orig, + ETH_ALEN); + } + } + return best_tq; } -/* is_vis_server(), locked outside */ -int is_vis_server_locked(void) +/* Return true if the vis packet is full. */ +static bool vis_packet_full(struct vis_info *info) { - if (my_vis_info != NULL) - if (my_vis_info->packet.vis_type == VIS_TYPE_SERVER_SYNC) - return 1; - - return 0; + if (info->packet.entries + 1 > ARRAY_SIZE(info->entries)) + return true; + return false; } -/* get the current set mode */ -int is_vis_server(void) -{ - int ret = 0; - spin_lock(&vis_hash_lock); - ret = is_vis_server_locked(); - spin_unlock(&vis_hash_lock); - - return ret; -} - /* generates a packet of own vis data, * returns 0 on success, -1 if no packet could be generated */ @@ -261,7 +292,7 @@ { struct hash_it_t *hashit = NULL; struct orig_node *orig_node; - struct vis_info *info = (struct vis_info *)my_vis_info; + struct vis_info *info = &my_vis_info; struct vis_info_entry *entry, *entry_array; struct hna_local_entry *hna_local_entry; int best_tq = -1; @@ -276,45 +307,34 @@ info->packet.entries = 0; if (!is_vis_server_locked()) { - /* find vis-server to receive. */ - while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { - orig_node = hashit->bucket->data; - if ((orig_node != NULL) && (orig_node->router != NULL)) { - if ((orig_node->flags & VIS_SERVER) && orig_node->router->tq_avg > best_tq) { - best_tq = orig_node->router->tq_avg; - memcpy(info->packet.target_orig, orig_node->orig,6); - } - } - } + best_tq = find_best_vis_server(info); if (best_tq < 0) { spin_unlock(&orig_hash_lock); return -1; } } hashit = NULL; + entry_array = info->entries; - entry_array = (struct vis_info_entry *)((char *)info + sizeof(struct vis_info)); - while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { orig_node = hashit->bucket->data; - if (orig_node->router != NULL - && memcmp(orig_node->router->addr, orig_node->orig, ETH_ALEN) == 0 - && orig_node->router->tq_avg > 0) { + if (orig_node->router != NULL && + memcmp(orig_node->router->addr, + orig_node->orig, ETH_ALEN) == 0 && + orig_node->router->tq_avg > 0) { /* fill one entry into buffer. */ entry = &entry_array[info->packet.entries]; - memcpy(entry->dest, orig_node->orig, ETH_ALEN); entry->quality = orig_node->router->tq_avg; info->packet.entries++; - /* don't fill more than 1000 bytes */ - if (info->packet.entries + 1 > (1000 - sizeof(struct vis_info)) / sizeof(struct vis_info_entry)) { + + if (vis_packet_full(info)) { spin_unlock(&orig_hash_lock); return 0; } } } - spin_unlock(&orig_hash_lock); hashit = NULL; @@ -323,21 +343,19 @@ hna_local_entry = hashit->bucket->data; entry = &entry_array[info->packet.entries]; - memcpy(entry->dest, hna_local_entry->addr, ETH_ALEN); entry->quality = 0; /* 0 means HNA */ info->packet.entries++; - /* don't fill more than 1000 bytes */ - if (info->packet.entries + 1 > (1000 - sizeof(struct vis_info)) / sizeof(struct vis_info_entry)) { + if (vis_packet_full(info)) { spin_unlock_irqrestore(&hna_local_hash_lock, flags); return 0; } } spin_unlock_irqrestore(&hna_local_hash_lock, flags); return 0; +} -} void purge_vis_packets(void) { struct hash_it_t *hashit = NULL; @@ -346,9 +364,10 @@ spin_lock(&vis_hash_lock); while (NULL != (hashit = hash_iterate(vis_hash, hashit))) { info = hashit->bucket->data; - if (info == my_vis_info) /* never purge own data. */ + if (info == &my_vis_info) /* never purge own data. */ continue; - if (time_after(jiffies, info->first_seen + (VIS_TIMEOUT/1000)*HZ)) { + if (time_after(jiffies, + info->first_seen + (VIS_TIMEOUT/1000)*HZ)) { hash_remove_bucket(vis_hash, hashit); free_info(info); } @@ -356,159 +375,165 @@ spin_unlock(&vis_hash_lock); } -/* called from timer; send (and maybe generate) vis packet. */ -void send_vis_packets(struct work_struct *work) +static void broadcast_vis_packet(struct vis_info *info, int packet_length) { - struct vis_info *info, *temp; + struct hash_it_t *hashit = NULL; + struct orig_node *orig_node; - purge_vis_packets(); - spin_lock(&vis_hash_lock); - if (generate_vis_packet() == 0) - /* schedule if generation was successful */ - list_add_tail(&my_vis_info->send_list, &send_list); + spin_lock(&orig_hash_lock); - list_for_each_entry_safe(info, temp, &send_list, send_list) { - list_del_init(&info->send_list); - send_vis_packet(info); + /* send to all routers in range. */ + while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { + orig_node = hashit->bucket->data; + + /* if it's a vis server and reachable, send it. */ + if (orig_node && + (orig_node->flags & VIS_SERVER) && + orig_node->batman_if && + orig_node->router) { + + /* don't send it if we already received the packet from + * this node. */ + if (recv_list_is_in(&info->recv_list, orig_node->orig)) + continue; + + memcpy(info->packet.target_orig, + orig_node->orig, ETH_ALEN); + + send_raw_packet((unsigned char *) &info->packet, + packet_length, + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, + orig_node->batman_if); + } } - spin_unlock(&vis_hash_lock); - start_vis_timer(); + memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); + spin_unlock(&orig_hash_lock); +} +static void unicast_vis_packet(struct vis_info *info, int packet_length) +{ + struct orig_node *orig_node; + + spin_lock(&orig_hash_lock); + orig_node = ((struct orig_node *) + hash_find(orig_hash, info->packet.target_orig)); + + if ((orig_node != NULL) && + (orig_node->batman_if != NULL) && + (orig_node->router != NULL)) { + send_raw_packet((unsigned char *) &info->packet, packet_length, + orig_node->batman_if->net_dev->dev_addr, + orig_node->router->addr, orig_node->batman_if); + } + spin_unlock(&orig_hash_lock); } /* only send one vis packet. called from send_vis_packets() */ void send_vis_packet(struct vis_info *info) { - struct hash_it_t *hashit = NULL; - struct orig_node *orig_node; int packet_length; - if (info->packet.ttl < 2) { - debug_log(LOG_TYPE_NOTICE, "Error - can't send vis packet: ttl exceeded\n"); + debug_log(LOG_TYPE_NOTICE, + "Error - can't send vis packet: ttl exceeded\n"); return; } memcpy(info->packet.sender_orig, mainIfAddr, ETH_ALEN); - info->packet.ttl--; - packet_length = sizeof(struct vis_packet) + info->packet.entries * sizeof(struct vis_info_entry); + packet_length = sizeof(struct vis_packet) + + info->packet.entries * sizeof(struct vis_info_entry); - if (is_bcast(info->packet.target_orig)) { - /* broadcast packet */ - spin_lock(&orig_hash_lock); + if (is_bcast(info->packet.target_orig)) + broadcast_vis_packet(info, packet_length); + else + unicast_vis_packet(info, packet_length); + info->packet.ttl++; /* restore TTL */ +} - /* send to all routers in range. */ - while (NULL != (hashit = hash_iterate(orig_hash, hashit))) { +/* called from timer; send (and maybe generate) vis packet. */ +static void send_vis_packets(struct work_struct *work) +{ + struct vis_info *info, *temp; - orig_node = hashit->bucket->data; + purge_vis_packets(); + spin_lock(&vis_hash_lock); + if (generate_vis_packet() == 0) + /* schedule if generation was successful */ + list_add_tail(&my_vis_info.send_list, &send_list); - /* if it's a vis server and reachable, send it. */ - if ((orig_node != NULL) && (orig_node->flags & VIS_SERVER) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { - - /* don't send it if we already received the packet from this node. */ - if (recv_list_is_in(&info->recv_list, orig_node->orig)) - continue; - - - memcpy(info->packet.target_orig, orig_node->orig, ETH_ALEN); - send_raw_packet((unsigned char *) &info->packet, packet_length, - orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - } - } - memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); - - spin_unlock(&orig_hash_lock); - } else { - /* unicast packet */ - spin_lock(&orig_hash_lock); - orig_node = ((struct orig_node *) hash_find(orig_hash, info->packet.target_orig)); - - if ((orig_node != NULL) && (orig_node->batman_if != NULL) && (orig_node->router != NULL)) { - send_raw_packet((unsigned char *) &info->packet, packet_length, - orig_node->batman_if->net_dev->dev_addr, orig_node->router->addr, orig_node->batman_if); - } - spin_unlock(&orig_hash_lock); - + list_for_each_entry_safe(info, temp, &send_list, send_list) { + list_del_init(&info->send_list); + send_vis_packet(info); } - info->packet.ttl++; /* restore TTL */ + spin_unlock(&vis_hash_lock); + start_vis_timer(); } -/* init the vis server. this may only be called when if_list is already initialized - * (e.g. bat0 is initialized, interfaces have been added) */ +static DECLARE_DELAYED_WORK(vis_timer_wq, send_vis_packets); + +/* init the vis server, but don't start it yet. However it is possible for the + * proc interface to set the vis_type, which will take affect once the vis + * server is started. */ int vis_init(void) { vis_hash = hash_new(256, vis_info_cmp, vis_info_choose); if (vis_hash == NULL) { debug_log(LOG_TYPE_CRIT, "Can't initialize vis_hash\n"); - return(-1); + return -1; } - my_vis_info = kmalloc(1000, GFP_KERNEL); - if (my_vis_info == NULL) { - vis_quit(); - debug_log(LOG_TYPE_CRIT, "Can't initialize vis packet\n"); - return(-1); - } /* prefill the vis info */ - my_vis_info->first_seen = jiffies - atomic_read(&vis_interval); - INIT_LIST_HEAD(&my_vis_info->recv_list); - INIT_LIST_HEAD(&my_vis_info->send_list); - my_vis_info->packet.version = COMPAT_VERSION; - my_vis_info->packet.packet_type = BAT_VIS; - my_vis_info->packet.vis_type = VIS_TYPE_CLIENT_UPDATE; - my_vis_info->packet.ttl = TTL; - my_vis_info->packet.seqno = 0; - my_vis_info->packet.entries = 0; - + INIT_LIST_HEAD(&my_vis_info.recv_list); + INIT_LIST_HEAD(&my_vis_info.send_list); + my_vis_info.packet.version = COMPAT_VERSION; + my_vis_info.packet.packet_type = BAT_VIS; + my_vis_info.packet.vis_type = VIS_TYPE_CLIENT_UPDATE; + my_vis_info.packet.ttl = TTL; + my_vis_info.packet.seqno = 0; + my_vis_info.packet.entries = 0; INIT_LIST_HEAD(&send_list); + return 0; +} - memcpy(my_vis_info->packet.vis_orig, mainIfAddr, ETH_ALEN); - memcpy(my_vis_info->packet.sender_orig, mainIfAddr, ETH_ALEN); +/* This may only be called when if_list is already initialized (e.g. bat0 is + * initialized, interfaces have been added). */ +int vis_start(void) +{ + my_vis_info.first_seen = jiffies - atomic_read(&vis_interval); + memcpy(my_vis_info.packet.vis_orig, mainIfAddr, ETH_ALEN); + memcpy(my_vis_info.packet.sender_orig, mainIfAddr, ETH_ALEN); - if (hash_add(vis_hash, my_vis_info) < 0) { - debug_log(LOG_TYPE_CRIT, "Can't add own vis packet into hash\n"); - free_info(my_vis_info); /* not in hash, need to remove it manually. */ + if (hash_add(vis_hash, &my_vis_info) < 0) { + debug_log(LOG_TYPE_CRIT, + "Can't add own vis packet into hash\n"); + /* not in hash, need to remove it manually. */ vis_quit(); - return(-1); + return -1; } - start_vis_timer(); - return(0); + return 0; } -/* free the info */ -void free_info(void *data) -{ - struct vis_info *info = data; - struct recvlist_node *entry, *tmp; - - list_del_init(&info->send_list); - list_for_each_entry_safe(entry, tmp, &info->recv_list, list) { - list_del(&entry->list); - kfree(entry); - } - kfree(info); -} - /* shutdown vis-server */ int vis_quit(void) { if (vis_hash != NULL) { cancel_delayed_work_sync(&vis_timer_wq); spin_lock(&vis_hash_lock); - hash_delete(vis_hash, free_info); /* properly remove, kill timers ... */ + /* properly remove, kill timers ... */ + hash_delete(vis_hash, free_info); vis_hash = NULL; - my_vis_info = NULL; spin_unlock(&vis_hash_lock); } - return(0); + return 0; } /* schedule packets for (re)transmission */ -void start_vis_timer(void) +static void start_vis_timer(void) { - queue_delayed_work(bat_event_workqueue, &vis_timer_wq, (atomic_read(&vis_interval)/1000) * HZ); + queue_delayed_work(bat_event_workqueue, &vis_timer_wq, + (atomic_read(&vis_interval)/1000) * HZ); } - Index: batman-adv-kernelland/vis.h =================================================================== --- batman-adv-kernelland/vis.h (revision 1343) +++ batman-adv-kernelland/vis.h (working copy) @@ -17,31 +17,29 @@ * */ - #define VIS_TIMEOUT 200000 #define VIS_FORMAT_DD_NAME "dot_draw" #define VIS_FORMAT_JSON_NAME "json" +struct vis_info_entry { + uint8_t dest[ETH_ALEN]; + uint8_t quality; /* quality = 0 means HNA */ +} __attribute__((packed)); struct vis_info { unsigned long first_seen; struct list_head recv_list; - /* list of server-neighbors we received a vis-packet from. - * we should not reply to them. */ + /* list of server-neighbors we received a vis-packet from. + * we should not reply to them. */ struct list_head send_list; - /* this packet might be part of the vis send queue. */ + /* this packet might be part of the vis send queue. */ struct vis_packet packet; - /* vis_info may follow here*/ + struct vis_info_entry entries[130]; } __attribute__((packed)); -struct vis_info_entry { - uint8_t dest[ETH_ALEN]; - uint8_t quality; /* quality = 0 means HNA */ -} __attribute__((packed)); - struct recvlist_node { struct list_head list; - uint8_t mac[6]; + uint8_t mac[ETH_ALEN]; }; enum vis_formats { @@ -51,14 +49,13 @@ extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -extern volatile uint8_t vis_format; -void receive_vis_packet(struct ethhdr *ethhdr, struct vis_packet *vis_packet, int vis_info_len); void vis_set_mode(int mode); int is_vis_server(void); -int is_vis_server_locked(void); -void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len); -void receive_client_update_packet(struct vis_packet *vis_packet, int vis_info_len); -void send_vis_packets(struct work_struct *work); +void receive_server_sync_packet(struct vis_packet *vis_packet, + int vis_info_len); +void receive_client_update_packet(struct vis_packet *vis_packet, + int vis_info_len); int vis_init(void); +int vis_start(void); int vis_quit(void); Index: batman-adv-kernelland/proc.c =================================================================== --- batman-adv-kernelland/proc.c (revision 1343) +++ batman-adv-kernelland/proc.c (working copy) @@ -31,8 +31,8 @@ #include "types.h" #include "hash.h" +volatile uint8_t vis_format = DOT_DRAW; - static struct proc_dir_entry *proc_batman_dir = NULL, *proc_interface_file = NULL, *proc_orig_interval_file = NULL, *proc_originators_file = NULL; static struct proc_dir_entry *proc_log_file = NULL, *proc_log_level_file = NULL, *proc_transtable_local_file = NULL, *proc_transtable_global_file = NULL; static struct proc_dir_entry *proc_vis_file = NULL, *proc_vis_format_file = NULL, *proc_aggr_file = NULL; @@ -643,7 +643,7 @@ spin_lock(&vis_hash_lock); while (NULL != (hashit = hash_iterate(vis_hash, hashit))) { info = hashit->bucket->data; - entries = (struct vis_info_entry *)((char *)info + sizeof(struct vis_info)); + entries = info->entries; addr_to_string(from, info->packet.vis_orig); for (i = 0; i < info->packet.entries; i++) { addr_to_string(to, entries[i].dest); Index: batman-adv-kernelland/main.c =================================================================== --- batman-adv-kernelland/main.c (revision 1343) +++ batman-adv-kernelland/main.c (working copy) @@ -114,6 +114,9 @@ hna_local_add(soft_device->dev_addr); start_hardif_check_timer(); + + vis_init(); + debug_log(LOG_TYPE_CRIT, "B.A.T.M.A.N. advanced %s%s (compability version %i) loaded \n", SOURCE_VERSION, (strlen(REVISION_VERSION) > 3 ? REVISION_VERSION : ""), COMPAT_VERSION); return 0; @@ -179,7 +182,7 @@ bat_device_setup(); - vis_init(); + vis_start(); } /* shuts down the whole module.*/

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] hash.[ch] Linux kernel coding style cleanup

by Andrew Lunn

Fix all the warnings generated by the 2.6.29 checkpatch script about violations of the Linux coding style in the hash.[ch] files. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/hash.c =================================================================== --- batman-adv-kernelland/hash.c (revision 1343) +++ batman-adv-kernelland/hash.c (working copy) @@ -17,15 +17,9 @@ * */ - - - - #include "main.h" #include "hash.h" - - /* clears the hash */ void hash_init(struct hashtable_t *hash) { @@ -37,9 +31,9 @@ hash->table[i] = NULL; } -/* remove the hash structure. if hashdata_free_cb != NULL, - * this function will be called to remove the elements inside of the hash. - * if you don't remove the elements, memory might be leaked. */ +/* remove the hash structure. if hashdata_free_cb != NULL, this function will be + * called to remove the elements inside of the hash. if you don't remove the + * elements, memory might be leaked. */ void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb) { struct element_t *bucket, *last_bucket; @@ -56,7 +50,6 @@ bucket = bucket->next; kfree(last_bucket); } - } hash_destroy(hash); @@ -69,9 +62,10 @@ kfree(hash); } -/* iterate though the hash. first element is selected with iter_in NULL. - * use the returned iterator to access the elements until hash_it_t returns NULL. */ -struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in) +/* iterate though the hash. first element is selected with iter_in NULL. use + * the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, + struct hash_it_t *iter_in) { struct hash_it_t *iter; @@ -81,19 +75,22 @@ iter->bucket = NULL; iter->prev_bucket = NULL; } else { - iter= iter_in; + iter = iter_in; } - /* sanity checks first (if our bucket got deleted in the last iteration): */ + /* sanity checks first (if our bucket got deleted in the last + * iteration): */ if (iter->bucket != NULL) { if (iter->first_bucket != NULL) { - /* we're on the first element and it got removed after the last iteration. */ + /* we're on the first element and it got removed after + * the last iteration. */ if ((*iter->first_bucket) != iter->bucket) { /* there are still other elements in the list */ if ((*iter->first_bucket) != NULL) { iter->prev_bucket = NULL; iter->bucket = (*iter->first_bucket); - iter->first_bucket = &hash->table[iter->index]; + iter->first_bucket = + &hash->table[iter->index]; return iter; } else { iter->bucket = NULL; @@ -101,9 +98,10 @@ } } else if (iter->prev_bucket != NULL) { /* - * we're not on the first element, and the bucket got removed after the last iteration. - * the last bucket's next pointer is not pointing to our actual bucket anymore. - * select the next. + * we're not on the first element, and the bucket got + * removed after the last iteration. the last bucket's + * next pointer is not pointing to our actual bucket + * anymore. select the next. */ if (iter->prev_bucket->next != iter->bucket) iter->bucket = iter->prev_bucket; @@ -120,11 +118,12 @@ } } - /* if not returned yet, we've reached the last one on the index and have to search forward */ + /* if not returned yet, we've reached the last one on the index and have + * to search forward */ iter->index++; /* go through the entries of the hash table */ while (iter->index < hash->size) { - if ((hash->table[iter->index]) != NULL){ + if ((hash->table[iter->index]) != NULL) { iter->prev_bucket = NULL; iter->bucket = hash->table[iter->index]; iter->first_bucket = &hash->table[iter->index]; @@ -140,7 +139,8 @@ } /* allocates and clears the hash */ -struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose) +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, + hashdata_choose_cb choose) { struct hashtable_t *hash; @@ -183,7 +183,7 @@ } /* found the tail of the list, add new element */ - bucket = kmalloc(sizeof(struct element_t),GFP_ATOMIC); + bucket = kmalloc(sizeof(struct element_t), GFP_ATOMIC); if (bucket == NULL) return -1; @@ -201,7 +201,8 @@ return 0; } -/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ +/* finds data, based on the key in keydata. returns the found data on success, + * or NULL on error */ void *hash_find(struct hashtable_t *hash, void *keydata) { int index; @@ -220,9 +221,10 @@ return NULL; } -/* remove bucket (this might be used in hash_iterate() if you already found the bucket - * you want to delete and don't need the overhead to find it again with hash_remove(). - * But usually, you don't want to use this function, as it fiddles with hash-internals. */ +/* remove bucket (this might be used in hash_iterate() if you already found the + * bucket you want to delete and don't need the overhead to find it again with + * hash_remove(). But usually, you don't want to use this function, as it + * fiddles with hash-internals. */ void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t) { void *data_save; @@ -240,10 +242,10 @@ return data_save; } -/* removes data from hash, if found. returns pointer do data on success, - * so you can remove the used structure yourself, or NULL on error . - * data could be the structure you use with just the key filled, - * we just need the key for comparing. */ +/* removes data from hash, if found. returns pointer do data on success, so you + * can remove the used structure yourself, or NULL on error . data could be the + * structure you use with just the key filled, we just need the key for + * comparing. */ void *hash_remove(struct hashtable_t *hash, void *data) { struct hash_it_t hash_it_t; @@ -254,18 +256,22 @@ while (hash_it_t.bucket != NULL) { if (hash->compare(hash_it_t.bucket->data, data)) { - hash_it_t.first_bucket = (hash_it_t.bucket == hash->table[hash_it_t.index] ? &hash->table[ hash_it_t.index ] : NULL); + hash_it_t.first_bucket = + (hash_it_t.bucket == + hash->table[hash_it_t.index] ? + &hash->table[hash_it_t.index] : NULL); return hash_remove_bucket(hash, &hash_it_t); } hash_it_t.prev_bucket = hash_it_t.bucket; - hash_it_t.bucket= hash_it_t.bucket->next; + hash_it_t.bucket = hash_it_t.bucket->next; } return NULL; } -/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success. */ +/* resize the hash, returns the pointer to the new hash or NULL on + * error. removes the old hash on success. */ struct hashtable_t *hash_resize(struct hashtable_t *hash, int size) { struct hashtable_t *new_hash; @@ -288,7 +294,8 @@ } } - /* remove hash and eventual overflow buckets but not the content itself. */ + /* remove hash and eventual overflow buckets but not the content + * itself. */ hash_delete(hash, NULL); return new_hash; Index: batman-adv-kernelland/hash.h =================================================================== --- batman-adv-kernelland/hash.h (revision 1343) +++ batman-adv-kernelland/hash.h (working copy) @@ -17,22 +17,16 @@ * */ - - - - #ifndef _BATMAN_HASH_H #define _BATMAN_HASH_H - - typedef int (*hashdata_compare_cb)(void *, void *); typedef int (*hashdata_choose_cb)(void *, int); typedef void (*hashdata_free_cb)(void *); struct element_t { - void *data; /* pointer to the data */ - struct element_t *next; /* overflow bucket pointer */ + void *data; /* pointer to the data */ + struct element_t *next; /* overflow bucket pointer */ }; struct hash_it_t { @@ -43,56 +37,61 @@ }; struct hashtable_t { - struct element_t **table; /* the hashtable itself, with the buckets */ - int elements; /* number of elements registered */ - int size; /* size of hashtable */ - hashdata_compare_cb compare; /* callback to a compare function. - * should compare 2 element datas for their keys, - * return 0 if same and not 0 if not same */ - hashdata_choose_cb choose; /* the hashfunction, should return an index based - * on the key in the data of the first argument - * and the size the second */ + struct element_t **table; /* the hashtable itself, with the buckets */ + int elements; /* number of elements registered */ + int size; /* size of hashtable */ + hashdata_compare_cb compare;/* callback to a compare function. should + * compare 2 element datas for their keys, + * return 0 if same and not 0 if not + * same */ + hashdata_choose_cb choose; /* the hashfunction, should return an index + * based on the key in the data of the first + * argument and the size the second */ }; /* clears the hash */ -void hash_init(struct hashtable_t *hash); +void hash_init(struct hashtable_t *hash); /* allocates and clears the hash */ -struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, hashdata_choose_cb choose); +struct hashtable_t *hash_new(int size, hashdata_compare_cb compare, + hashdata_choose_cb choose); -/* remove bucket (this might be used in hash_iterate() if you already found the bucket - * you want to delete and don't need the overhead to find it again with hash_remove(). - * But usually, you don't want to use this function, as it fiddles with hash-internals. */ -void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t); +/* remove bucket (this might be used in hash_iterate() if you already found the + * bucket you want to delete and don't need the overhead to find it again with + * hash_remove(). But usually, you don't want to use this function, as it + * fiddles with hash-internals. */ +void *hash_remove_bucket(struct hashtable_t *hash, struct hash_it_t *hash_it_t); -/* remove the hash structure. if hashdata_free_cb != NULL, - * this function will be called to remove the elements inside of the hash. - * if you don't remove the elements, memory might be leaked. */ -void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb); +/* remove the hash structure. if hashdata_free_cb != NULL, this function will be + * called to remove the elements inside of the hash. if you don't remove the + * elements, memory might be leaked. */ +void hash_delete(struct hashtable_t *hash, hashdata_free_cb free_cb); /* free only the hashtable and the hash itself. */ -void hash_destroy(struct hashtable_t *hash); +void hash_destroy(struct hashtable_t *hash); /* adds data to the hashtable. returns 0 on success, -1 on error */ -int hash_add(struct hashtable_t *hash, void *data); +int hash_add(struct hashtable_t *hash, void *data); -/* removes data from hash, if found. returns pointer do data on success, - * so you can remove the used structure yourself, or NULL on error . - * data could be the structure you use with just the key filled, - * we just need the key for comparing. */ -void *hash_remove(struct hashtable_t *hash, void *data); +/* removes data from hash, if found. returns pointer do data on success, so you + * can remove the used structure yourself, or NULL on error . data could be the + * structure you use with just the key filled, we just need the key for + * comparing. */ +void *hash_remove(struct hashtable_t *hash, void *data); -/* finds data, based on the key in keydata. returns the found data on success, or NULL on error */ -void *hash_find(struct hashtable_t *hash, void *keydata); +/* finds data, based on the key in keydata. returns the found data on success, + * or NULL on error */ +void *hash_find(struct hashtable_t *hash, void *keydata); -/* resize the hash, returns the pointer to the new hash or NULL on error. removes the old hash on success */ -struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); +/* resize the hash, returns the pointer to the new hash or NULL on + * error. removes the old hash on success */ +struct hashtable_t *hash_resize(struct hashtable_t *hash, int size); -/* print the hash table for debugging */ -void hash_debug( struct hashtable_t *hash); +/* iterate though the hash. first element is selected with iter_in NULL. use + * the returned iterator to access the elements until hash_it_t returns NULL. */ +struct hash_it_t *hash_iterate(struct hashtable_t *hash, + struct hash_it_t *iter_in); -/* iterate though the hash. first element is selected with iter_in NULL. - * use the returned iterator to access the elements until hash_it_t returns NULL. */ -struct hash_it_t *hash_iterate(struct hashtable_t *hash, struct hash_it_t *iter_in); - +/* print the hash table for debugging */ +void hash_debug(struct hashtable_t *hash); #endif

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv] bitarray.[ch] Linux coding style cleanup

by Andrew Lunn

Fix all the warnings generated by the 2.6.29 checkpatch script about violations of the Linux coding style in the bitarray.[ch] files. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/bitarray.c =================================================================== --- batman-adv-kernelland/bitarray.c (revision 1343) +++ batman-adv-kernelland/bitarray.c (working copy) @@ -17,16 +17,10 @@ * */ - - - - #include "main.h" #include "bitarray.h" #include "log.h" - - /* clear the bits */ void bit_init(TYPE_OF_WORD *seq_bits) { @@ -36,8 +30,10 @@ seq_bits[i] = 0; } -/* returns true if corresponding bit in given seq_bits indicates so and curr_seqno is within range of last_seqno */ -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, uint16_t curr_seqno) +/* returns true if the corresponding bit in the given seq_bits indicates true + * and curr_seqno is within range of last_seqno */ +uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, + uint16_t curr_seqno) { int16_t diff, word_offset, word_num; @@ -45,8 +41,10 @@ if (diff < 0 || diff >= TQ_LOCAL_WINDOW_SIZE) { return 0; } else { - word_offset = (last_seqno - curr_seqno) % WORD_BIT_SIZE;/* which position in the selected word */ - word_num = (last_seqno - curr_seqno) / WORD_BIT_SIZE; /* which word */ + /* which word */ + word_num = (last_seqno - curr_seqno) / WORD_BIT_SIZE; + /* which position in the selected word */ + word_offset = (last_seqno - curr_seqno) % WORD_BIT_SIZE; if (seq_bits[word_num] & 1 << word_offset) return 1; @@ -57,22 +55,19 @@ /* print the packet array, for debugging purposes */ static char bit_string[130]; -char* bit_print(TYPE_OF_WORD *seq_bits) { - int i,j,k=0,b=0; +char *bit_print(TYPE_OF_WORD *seq_bits) +{ + int i, j, k = 0, b = 0; -// printf("the last %d packets, we got %d:\n", TQ_LOCAL_WINDOW_SIZE, bit_packet_count(seq_bits)); - for ( i=0; i<NUM_WORDS; i++ ) { - for ( j=0; j<WORD_BIT_SIZE; j++) { - bit_string[k++] = ((seq_bits[i]>>j)%2 ? '1':'0'); /* print the j position */ - if( ++b == TQ_LOCAL_WINDOW_SIZE ) { - bit_string[k++]='|'; - } + for (i = 0; i < NUM_WORDS; i++) { + for (j = 0; j < WORD_BIT_SIZE; j++) { + bit_string[k++] = ((seq_bits[i]>>j)%2 ? '1' : '0'); + if (++b == TQ_LOCAL_WINDOW_SIZE) + bit_string[k++] = '|'; } - bit_string[k++]=' '; + bit_string[k++] = ' '; } - bit_string[k++]='\0'; -// debug_output( 4, "%s\n", bit_string); -// printf("\n\n"); + bit_string[k++] = '\0'; return bit_string; } @@ -82,18 +77,18 @@ int32_t word_offset, word_num; /* if too old, just drop it */ - if (n<0 || n >= TQ_LOCAL_WINDOW_SIZE) + if (n < 0 || n >= TQ_LOCAL_WINDOW_SIZE) return; -// printf("mark bit %d\n", n); + /* which word */ + word_num = n / WORD_BIT_SIZE; + /* which position in the selected word */ + word_offset = n % WORD_BIT_SIZE; - word_offset = n % WORD_BIT_SIZE; /* which position in the selected word */ - word_num = n / WORD_BIT_SIZE; /* which word */ - seq_bits[word_num] |= 1 << word_offset; /* turn the position on */ } -/* shift the packet array p by n places. */ +/* shift the packet array by n places. */ void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n) { int32_t word_offset, word_num; @@ -102,29 +97,36 @@ if (n <= 0) return; - word_offset= n % WORD_BIT_SIZE; /* shift how much inside each word */ + word_offset = n % WORD_BIT_SIZE;/* shift how much inside each word */ word_num = n / WORD_BIT_SIZE; /* shift over how much (full) words */ for (i = NUM_WORDS - 1; i > word_num; i--) { - /* going from old to new, so we can't overwrite the data we copy from. * - * left is high, right is low: FEDC BA98 7654 3210 + /* going from old to new, so we don't overwrite the data we copy + * from. + * + * left is high, right is low: FEDC BA98 7654 3210 * ^^ ^^ * vvvv * ^^^^ = from, vvvvv =to, we'd have word_num==1 and - * word_offset==WORD_BIT_SIZE/2 ????? in this example. (=24 bits) + * word_offset==WORD_BIT_SIZE/2 ????? in this example. + * (=24 bits) * * our desired output would be: 9876 5432 1000 0000 * */ seq_bits[i] = (seq_bits[i - word_num] << word_offset) + - /* take the lower port from the left half, shift it left to its final position */ - (seq_bits[i - word_num - 1] >> (WORD_BIT_SIZE-word_offset)); - /* and the upper part of the right half and shift it left to it's position */ - /* for our example that would be: word[0] = 9800 + 0076 = 9876 */ + /* take the lower port from the left half, shift it left + * to its final position */ + (seq_bits[i - word_num - 1] >> + (WORD_BIT_SIZE-word_offset)); + /* and the upper part of the right half and shift it left to + * it's position */ + /* for our example that would be: word[0] = 9800 + 0076 = + * 9876 */ } - /* now for our last word, i==word_num, we only have the it's "left" half. that's the 1000 word in - * our example.*/ + /* now for our last word, i==word_num, we only have the it's "left" + * half. that's the 1000 word in our example.*/ seq_bits[i] = (seq_bits[i - word_num] << word_offset); @@ -136,27 +138,33 @@ } -/* receive and process one packet, returns 1 if received seq_num is considered new, 0 if old */ -char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, int8_t set_mark) +/* receive and process one packet, returns 1 if received seq_num is considered + * new, 0 if old */ +char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, + int8_t set_mark) { int i; - /* we already got a sequence number higher than this one, so we just mark it. this should wrap around the integer just fine */ + /* we already got a sequence number higher than this one, so we just + * mark it. this should wrap around the integer just fine */ if ((seq_num_diff < 0) && (seq_num_diff >= -TQ_LOCAL_WINDOW_SIZE)) { if (set_mark) bit_mark(seq_bits, -seq_num_diff); - return 0; } /* it seems we missed a lot of packets or the other host restarted */ - if ((seq_num_diff > TQ_LOCAL_WINDOW_SIZE ) || (seq_num_diff < -TQ_LOCAL_WINDOW_SIZE)) { + if ((seq_num_diff > TQ_LOCAL_WINDOW_SIZE) || + (seq_num_diff < -TQ_LOCAL_WINDOW_SIZE)) { if (seq_num_diff > TQ_LOCAL_WINDOW_SIZE) - debug_log(LOG_TYPE_BATMAN, "It seems we missed a lot of packets (%i) !\n", seq_num_diff-1); + debug_log(LOG_TYPE_BATMAN, + "We missed a lot of packets (%i) !\n", + seq_num_diff-1); if (-seq_num_diff > TQ_LOCAL_WINDOW_SIZE) - debug_log(LOG_TYPE_BATMAN, "Other host probably restarted !\n"); + debug_log(LOG_TYPE_BATMAN, + "Other host probably restarted !\n"); for (i = 0; i < NUM_WORDS; i++) seq_bits[i] = 0; @@ -173,35 +181,22 @@ return 1; } -/* count the hamming weight, how many good packets did we receive? just count the 1's ... */ +/* count the hamming weight, how many good packets did we receive? just count + * the 1's. The inner loop uses the Kernighan algorithm, see + * http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan + */ int bit_packet_count(TYPE_OF_WORD *seq_bits) { int i, hamming = 0; TYPE_OF_WORD word; for (i = 0; i < NUM_WORDS; i++) { - word = seq_bits[i]; while (word) { - word &= word-1; /* see http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ + word &= word-1; hamming++; } - } - return hamming; } - -uint8_t bit_count(int32_t to_count) -{ - uint8_t hamming = 0; - - while (to_count) { - to_count &= to_count - 1; /* see http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetKernighan */ - hamming++; - } - - return hamming; -} - Index: batman-adv-kernelland/bitarray.h =================================================================== --- batman-adv-kernelland/bitarray.h (revision 1343) +++ batman-adv-kernelland/bitarray.h (working copy) @@ -18,18 +18,32 @@ */ - -#define TYPE_OF_WORD unsigned long /* you should choose something big, if you don't want to waste cpu */ +/* you should choose something big, if you don't want to waste cpu */ +#define TYPE_OF_WORD unsigned long #define WORD_BIT_SIZE (sizeof(TYPE_OF_WORD) * 8) +/* clear the bits, ready for use */ +void bit_init(TYPE_OF_WORD *seq_bits); +/* returns true if the corresponding bit in the given seq_bits indicates true + * and curr_seqno is within range of last_seqno */ +uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, + uint16_t curr_seqno); -void bit_init(TYPE_OF_WORD *seq_bits); -uint8_t get_bit_status(TYPE_OF_WORD *seq_bits, uint16_t last_seqno, uint16_t curr_seqno); -char *bit_print(TYPE_OF_WORD *seq_bits); +/* turn corresponding bit on, so we can remember that we got the packet */ void bit_mark(TYPE_OF_WORD *seq_bits, int32_t n); + +/* shift the packet array by n places. */ void bit_shift(TYPE_OF_WORD *seq_bits, int32_t n); -char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, int8_t set_mark); + + +/* receive and process one packet, returns 1 if received seq_num is considered + * new, 0 if old */ +char bit_get_packet(TYPE_OF_WORD *seq_bits, int16_t seq_num_diff, + int8_t set_mark); + +/* count the hamming weight, how many good packets did we receive? */ int bit_packet_count(TYPE_OF_WORD *seq_bits); -uint8_t bit_count(int32_t to_count); +/* print the packet array, for debugging purposes */ +char *bit_print(TYPE_OF_WORD *seq_bits);

13 years, 8 months

[B.A.T.M.A.N.] [patch] Typos and spelling errors

by Andrew Lunn

Hi Folks This patch fixes a few typos and spelling errors. Andrew Index: send.c =================================================================== --- send.c (revision 1340) +++ send.c (working copy) @@ -143,7 +143,7 @@ batman_packet->tq = (batman_packet->tq * (TQ_MAX_VALUE - (2 * TQ_HOP_PENALTY))) / (TQ_MAX_VALUE); debug_log(LOG_TYPE_BATMAN, - "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", + "%s %s packet (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", (packet_num > 0 ? "Forwarding" : (forw_packet->own ? "Sending own" : "Forwarding")), (packet_num > 0 ? "aggregated " : ""), orig_str, ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, Index: hard-interface.c =================================================================== --- hard-interface.c (revision 1340) +++ hard-interface.c (working copy) @@ -314,7 +314,7 @@ return; /** - * wait for readers of the the interfaces, so update won't be a problem. + * wait for readers of the interfaces, so update won't be a problem. * this function is not time critical and can wait a bit .... */ synchronize_rcu(); Index: README =================================================================== --- README (revision 1340) +++ README (working copy) @@ -57,7 +57,7 @@ # cat /proc/net/batman-adv/vis -This output can be processeed with graphviz-tools like dot. +This output can be processed with graphviz-tools like dot. The labels are similar/compatible to the ETX metric, 1.0 means perfect connection (100%), 2.0 means 50%, 3.0 means 33% and so on. Index: aggregation.c =================================================================== --- aggregation.c (revision 1340) +++ aggregation.c (working copy) @@ -59,7 +59,7 @@ batman_packet = (struct batman_packet *)forw_packet_pos->packet_buff; /** - * check aggregation compability + * 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 Index: routing.c =================================================================== --- routing.c (revision 1340) +++ routing.c (working copy) @@ -76,7 +76,7 @@ kfree(neigh_node); } - hna_global_del_orig(orig_node, "originator timeouted"); + hna_global_del_orig(orig_node, "originator timed out"); kfree(orig_node->bcast_own); kfree(orig_node->bcast_own_sum); @@ -158,7 +158,7 @@ if ((orig_node->router != NULL) && (neigh_node == NULL)) { debug_log(LOG_TYPE_ROUTES, "Deleting route towards: %s\n", orig_str); - hna_global_del_orig(orig_node, "originator timeouted"); + hna_global_del_orig(orig_node, "originator timed out"); /* route added */ } else if ((orig_node->router == NULL) && (neigh_node != NULL)) { @@ -247,7 +247,7 @@ /* * 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE * this does affect the nearly-symmetric links only a little, - * but punishes asymetric links more. + * but punishes asymmetric links more. * this will give a value between 0 and TQ_MAX_VALUE */ orig_neigh_node->tq_asym_penalty = TQ_MAX_VALUE - (TQ_MAX_VALUE * @@ -258,7 +258,7 @@ batman_packet->tq = ((batman_packet->tq * orig_neigh_node->tq_own * orig_neigh_node->tq_asym_penalty) / (TQ_MAX_VALUE * TQ_MAX_VALUE)); - debug_log(LOG_TYPE_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penality: %3i, total tq: %3i \n", + debug_log(LOG_TYPE_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i \n", orig_str, neigh_str, total_count, neigh_node->real_packet_count, orig_neigh_node->tq_own, orig_neigh_node->tq_asym_penalty, batman_packet->tq); /* if link has the minimum required transmission quality consider it bidirectional */ @@ -451,9 +451,9 @@ if (orig_neigh_node == NULL) return; - /* drop packet if sender is not a direct neighbor and if we no route towards it */ + /* drop packet if sender is not a direct neighbor and if we don't route towards it */ if (!is_single_hop_neigh && (orig_neigh_node->router == NULL)) { - debug_log(LOG_TYPE_BATMAN, "Drop packet: OGM via unkown neighbor! \n"); + debug_log(LOG_TYPE_BATMAN, "Drop packet: OGM via unknown neighbor! \n"); return; } @@ -662,7 +662,7 @@ if (!is_my_mac(ethhdr->h_dest)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct icmp_packet)) continue; @@ -761,7 +761,7 @@ if (!is_my_mac(ethhdr->h_dest)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct unicast_packet)) continue; @@ -809,7 +809,7 @@ if (is_bcast(ethhdr->h_source)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct bcast_packet)) continue; Index: main.h =================================================================== --- main.h (revision 1340) +++ main.h (working copy) @@ -34,7 +34,7 @@ #define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no valid packet comes in -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ #define LOCAL_HNA_TIMEOUT 3600000 -#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator messages in squence numbers (should be a multiple of our word size) */ +#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator messages in sequence numbers (should be a multiple of our word size) */ #define TQ_GLOBAL_WINDOW_SIZE 10 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv]: schedule_forward_packet(): Remove unused parameter

by Andrew Lunn

send.c:schedule_forward_packet() takes a parameter unsigned char *hna_buff which is not used in the function. Remove this unused parameter. No functional change otherwise. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/send.c =================================================================== --- batman-adv-kernelland/send.c (revision 1341) +++ batman-adv-kernelland/send.c (working copy) @@ -207,7 +207,7 @@ add_bat_packet_to_list(batman_if->packet_buff, batman_if->packet_len, batman_if, 1, send_time); } -void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, unsigned char *hna_buff, int hna_buff_len, struct batman_if *if_incoming) +void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, struct batman_if *if_incoming) { unsigned char in_tq, in_ttl, tq_avg = 0; unsigned long send_time; Index: batman-adv-kernelland/send.h =================================================================== --- batman-adv-kernelland/send.h (revision 1341) +++ batman-adv-kernelland/send.h (working copy) @@ -28,7 +28,7 @@ void send_own_packet_work(struct work_struct *work); void send_raw_packet(unsigned char *pack_buff, int pack_buff_len, uint8_t *src_addr, uint8_t *dst_addr, struct batman_if *batman_if); void schedule_own_packet(struct batman_if *batman_if); -void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, unsigned char *hna_buff, int hna_buff_len, struct batman_if *if_outgoing); +void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, struct batman_if *if_outgoing); void add_bcast_packet_to_list(unsigned char *packet_buff, int packet_len); void send_outstanding_bcast_packet(struct work_struct *work); void send_outstanding_bat_packet(struct work_struct *work); Index: batman-adv-kernelland/routing.c =================================================================== --- batman-adv-kernelland/routing.c (revision 1341) +++ batman-adv-kernelland/routing.c (working copy) @@ -469,7 +469,7 @@ if (is_single_hop_neigh) { /* mark direct link on incoming interface */ - schedule_forward_packet(orig_node, ethhdr, batman_packet, 1, hna_buff, hna_buff_len, if_incoming); + schedule_forward_packet(orig_node, ethhdr, batman_packet, 1, hna_buff_len, if_incoming); debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast neighbour packet with direct link flag \n"); return; @@ -487,7 +487,7 @@ } debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast originator packet \n"); - schedule_forward_packet(orig_node, ethhdr, batman_packet, 0, hna_buff, hna_buff_len, if_incoming); + schedule_forward_packet(orig_node, ethhdr, batman_packet, 0, hna_buff_len, if_incoming); } void purge_orig(struct work_struct *work)

13 years, 8 months

[B.A.T.M.A.N.] [batman-adv]: Fix some typo's and spelling errors

by Andrew Lunn

Fix a few typo's and spelling errors i noticed while reading through the code. No functional changes. Signed-off-by: Andrew Lunn <andrew.lunn(a)ascom.ch> Index: batman-adv-kernelland/send.c =================================================================== --- batman-adv-kernelland/send.c (revision 1341) +++ batman-adv-kernelland/send.c (working copy) @@ -143,7 +143,7 @@ batman_packet->tq = (batman_packet->tq * (TQ_MAX_VALUE - (2 * TQ_HOP_PENALTY))) / (TQ_MAX_VALUE); debug_log(LOG_TYPE_BATMAN, - "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", + "%s %s packet (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", (packet_num > 0 ? "Forwarding" : (forw_packet->own ? "Sending own" : "Forwarding")), (packet_num > 0 ? "aggregated " : ""), orig_str, ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, Index: batman-adv-kernelland/hard-interface.c =================================================================== --- batman-adv-kernelland/hard-interface.c (revision 1341) +++ batman-adv-kernelland/hard-interface.c (working copy) @@ -314,7 +314,7 @@ return; /** - * wait for readers of the the interfaces, so update won't be a problem. + * wait for readers of the interfaces, so update won't be a problem. * this function is not time critical and can wait a bit .... */ synchronize_rcu(); Index: batman-adv-kernelland/README =================================================================== --- batman-adv-kernelland/README (revision 1341) +++ batman-adv-kernelland/README (working copy) @@ -57,7 +57,7 @@ # cat /proc/net/batman-adv/vis -This output can be processeed with graphviz-tools like dot. +This output can be processed with graphviz-tools like dot. The labels are similar/compatible to the ETX metric, 1.0 means perfect connection (100%), 2.0 means 50%, 3.0 means 33% and so on. Index: batman-adv-kernelland/aggregation.c =================================================================== --- batman-adv-kernelland/aggregation.c (revision 1341) +++ batman-adv-kernelland/aggregation.c (working copy) @@ -59,7 +59,7 @@ batman_packet = (struct batman_packet *)forw_packet_pos->packet_buff; /** - * check aggregation compability + * 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 Index: batman-adv-kernelland/routing.c =================================================================== --- batman-adv-kernelland/routing.c (revision 1341) +++ batman-adv-kernelland/routing.c (working copy) @@ -76,7 +76,7 @@ kfree(neigh_node); } - hna_global_del_orig(orig_node, "originator timeouted"); + hna_global_del_orig(orig_node, "originator timed out"); kfree(orig_node->bcast_own); kfree(orig_node->bcast_own_sum); @@ -158,7 +158,7 @@ if ((orig_node->router != NULL) && (neigh_node == NULL)) { debug_log(LOG_TYPE_ROUTES, "Deleting route towards: %s\n", orig_str); - hna_global_del_orig(orig_node, "originator timeouted"); + hna_global_del_orig(orig_node, "originator timed out"); /* route added */ } else if ((orig_node->router == NULL) && (neigh_node != NULL)) { @@ -247,7 +247,7 @@ /* * 1 - ((1-x) ** 3), normalized to TQ_MAX_VALUE * this does affect the nearly-symmetric links only a little, - * but punishes asymetric links more. + * but punishes asymmetric links more. * this will give a value between 0 and TQ_MAX_VALUE */ orig_neigh_node->tq_asym_penalty = TQ_MAX_VALUE - (TQ_MAX_VALUE * @@ -258,7 +258,7 @@ batman_packet->tq = ((batman_packet->tq * orig_neigh_node->tq_own * orig_neigh_node->tq_asym_penalty) / (TQ_MAX_VALUE * TQ_MAX_VALUE)); - debug_log(LOG_TYPE_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penality: %3i, total tq: %3i \n", + debug_log(LOG_TYPE_BATMAN, "bidirectional: orig = %-15s neigh = %-15s => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i \n", orig_str, neigh_str, total_count, neigh_node->real_packet_count, orig_neigh_node->tq_own, orig_neigh_node->tq_asym_penalty, batman_packet->tq); /* if link has the minimum required transmission quality consider it bidirectional */ @@ -451,9 +451,9 @@ if (orig_neigh_node == NULL) return; - /* drop packet if sender is not a direct neighbor and if we no route towards it */ + /* drop packet if sender is not a direct neighbor and if we don't route towards it */ if (!is_single_hop_neigh && (orig_neigh_node->router == NULL)) { - debug_log(LOG_TYPE_BATMAN, "Drop packet: OGM via unkown neighbor! \n"); + debug_log(LOG_TYPE_BATMAN, "Drop packet: OGM via unknown neighbor! \n"); return; } @@ -662,7 +662,7 @@ if (!is_my_mac(ethhdr->h_dest)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct icmp_packet)) continue; @@ -761,7 +761,7 @@ if (!is_my_mac(ethhdr->h_dest)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct unicast_packet)) continue; @@ -809,7 +809,7 @@ if (is_bcast(ethhdr->h_source)) continue; - /* drop packet if it has not neccessary minimum size */ + /* drop packet if it has not necessary minimum size */ if (result < sizeof(struct ethhdr) + sizeof(struct bcast_packet)) continue; Index: batman-adv-kernelland/main.h =================================================================== --- batman-adv-kernelland/main.h (revision 1341) +++ batman-adv-kernelland/main.h (working copy) @@ -34,7 +34,7 @@ #define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no valid packet comes in -> TODO: check influence on TQ_LOCAL_WINDOW_SIZE */ #define LOCAL_HNA_TIMEOUT 3600000 -#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator messages in squence numbers (should be a multiple of our word size) */ +#define TQ_LOCAL_WINDOW_SIZE 64 /* sliding packet range of received originator messages in sequence numbers (should be a multiple of our word size) */ #define TQ_GLOBAL_WINDOW_SIZE 10 #define TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 #define TQ_LOCAL_BIDRECT_RECV_MINIMUM 1

13 years, 8 months

[B.A.T.M.A.N.] [PATCH]: Remove unused parameter

by Andrew Lunn

Hi Folks A little patch which removes an unused parameter to a function call... Andrew Index: send.c =================================================================== --- send.c (revision 1340) +++ send.c (working copy) @@ -207,7 +207,7 @@ add_bat_packet_to_list(batman_if->packet_buff, batman_if->packet_len, batman_if, 1, send_time); } -void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, unsigned char *hna_buff, int hna_buff_len, struct batman_if *if_incoming) +void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, struct batman_if *if_incoming) { unsigned char in_tq, in_ttl, tq_avg = 0; unsigned long send_time; Index: send.h =================================================================== --- send.h (revision 1340) +++ send.h (working copy) @@ -28,7 +28,7 @@ void send_own_packet_work(struct work_struct *work); void send_raw_packet(unsigned char *pack_buff, int pack_buff_len, uint8_t *src_addr, uint8_t *dst_addr, struct batman_if *batman_if); void schedule_own_packet(struct batman_if *batman_if); -void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, unsigned char *hna_buff, int hna_buff_len, struct batman_if *if_outgoing); +void schedule_forward_packet(struct orig_node *orig_node, struct ethhdr *ethhdr, struct batman_packet *batman_packet, uint8_t directlink, int hna_buff_len, struct batman_if *if_outgoing); void add_bcast_packet_to_list(unsigned char *packet_buff, int packet_len); void send_outstanding_bcast_packet(struct work_struct *work); void send_outstanding_bat_packet(struct work_struct *work); Index: routing.c =================================================================== --- routing.c (revision 1340) +++ routing.c (working copy) @@ -469,7 +469,7 @@ if (is_single_hop_neigh) { /* mark direct link on incoming interface */ - schedule_forward_packet(orig_node, ethhdr, batman_packet, 1, hna_buff, hna_buff_len, if_incoming); + schedule_forward_packet(orig_node, ethhdr, batman_packet, 1, hna_buff_len, if_incoming); debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast neighbour packet with direct link flag \n"); return; @@ -487,7 +487,7 @@ } debug_log(LOG_TYPE_BATMAN, "Forwarding packet: rebroadcast originator packet \n"); - schedule_forward_packet(orig_node, ethhdr, batman_packet, 0, hna_buff, hna_buff_len, if_incoming); + schedule_forward_packet(orig_node, ethhdr, batman_packet, 0, hna_buff_len, if_incoming); } void purge_orig(struct work_struct *work)

13 years, 8 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N July 2009