B.A.T.M.A.N January 2010

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

16 participants
35 discussions

Re: [B.A.T.M.A.N.] [PATCH] batman-adv: atomic variable for vis-srv activation
by Sven Eckelmann 20 Jan '10

20 Jan '10

Marek Lindner wrote: > On Monday 11 January 2010 12:57:56 you wrote: > > This fixes the bug discovered by Marek Lindner which did not allow > > turning on the vis-server before an interface has been added. With this > > patch we are using a global atomic variable for activating and > > deactiating the vis-server-mode instead, which can be used before > > inserting an interface. > > Off-list: > Wollte mir grad deinen Patch reinziehen, aber trotz "git send-email" ist > auch diese Mail is base64 encoded ?? Im Header sehe ich jedenfalls > "X-Mailer: git- send-email 1.6.6". Evtl. hängt das mit charset (utf8) > zusammen ? Aaaalso. Ich habe ersteinmal keine Ahnung woher es kommt. git-format-patch produziert sowas jedenfalls nicht. git-send-email eigentlich auch nicht (der bleibt immer bei "Content-Type: text/plain; ...". Wenn ich jetzt im Git Quellcode suche, dann finde ich auch nur funktionen um base64 in Mails zu dekodieren. > @Sven: Hast du eine Idee, woran das liegen könnte ? Vielleicht macht der Mailman sowas oder irgendwas anderes auf open-mesh.org? Ich habe jetzt einfach mal an meine Adresse auf open-mesh.net die Mail geschickt. Die sieht aber vollkommen in Ordnung aus. Wenn ich in die mbox von mailman schauen /var/lib/mailman/archives/private/b.a.t.m.a.n.mbox/b.a.t.m.a.n.mbox , dann sieht die Mail so aus wie ich sie von git-send-email erwarten wuerde. Kann es also sein, dass es beim wieder raussenden passiert? Also nicht das raussenden ueber sendmail, sondern das Vorbereiten von mailman. NEWS fuer 2.1.8 (15-Apr-2006) {{{ - Updated email library to 2.5.7 which will encode payload into qp/base64 upon setting. This enabled backing out the scrubber related patches including 'X-Mailman-Scrubbed' header in 2.1.7. }}} Wieso es das macht ist vielleicht(tm) das "Content-Transfer-Encoding: 8bit" in der Mail von Linus + Decorating. Wenn wir das rausnehmen, sollte es eigentlich gehen. Siehe dazu auch Mailman/Handlers/Decorate.py process(..) Ich habe ersteinmal in https://lists.open-mesh.org/mm/admin/b.a.t.m.a.n/?VARHELP=nondigest/msg_foo… den Footer {{{ _______________________________________________ %(real_name)s mailing list %(real_name)s@%(host_name)s %(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s }}} entfernt. Vielleicht kann Linus nocheinmal exakt genauso seinen Patch an die Mailingliste senden. ....das waere jedenfalls bis jetzt meine Vermutung. Leider weiss ich gerade nicht wie ich das am einfachsten Testen koennte (bis auf das Linus den Patch einfach nochmal sendet). Gruesse, Sven

4 4

[B.A.T.M.A.N.] [PATCH] batman-adv: Add bonding functionality
by Simon Wunderlich 19 Jan '10

19 Jan '10

This patch introduces bonding functionality to batman-advanced, targeted for the 0.3 release. As we are able to route the payload traffic as we want, we may use multiple interfaces on multihomed hosts to transfer data to achieve higher bandwidth. This can be considered as "light Multi Path Routing" for single hop connections. To detect which interfaces of a peer node belong to the same host, a new flag PRIMARIES_FIRST_HOP is introduced. This flag is set on the first hop of OGMs of the primary (first) interface, which is broadcasted on all interfaces. When receiving such an OGM, we can learn which interfaces belong to the same host (by assigning them to the primary originator). Bonding works by sending packets in a round-robin fashion to the available neighbors, if multiple interfaces are available. The neighbors should be almost equally good to reach. To avoid interferences (i.e. sending on the same channel), only neighbors with different mac addresses and interfaces are considered as candidates. Bonding is deactivated by default, and can be activated by echo 1 > /proc/net/batman-adv/bonding for each individual node. Any suggestions or comments are welcome. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> --- Index: a/batman-adv-kernelland/types.h =================================================================== --- a/batman-adv-kernelland/types.h (revision 1532) +++ b/batman-adv-kernelland/types.h (working copy) @@ -48,6 +48,7 @@ struct orig_node { /* structure for orig_list maintaining nodes of mesh */ uint8_t orig[ETH_ALEN]; + uint8_t primary_addr[ETH_ALEN]; /* hosts primary interface address */ struct neigh_node *router; struct batman_if *batman_if; TYPE_OF_WORD *bcast_own; @@ -64,6 +65,10 @@ TYPE_OF_WORD bcast_bits[NUM_WORDS]; uint16_t last_bcast_seqno; /* last broadcast sequence number received by this host */ struct list_head neigh_list; + struct { + uint8_t candidates; /* how many candidates are available */ + struct neigh_node *selected; /* next bonding candidate */ + } bond; }; struct neigh_node { @@ -74,6 +79,7 @@ uint8_t tq_index; uint8_t tq_avg; uint8_t last_ttl; + struct neigh_node *next_bond_candidate; unsigned long last_valid; /* when last packet via this neighbor was received */ TYPE_OF_WORD real_bits[NUM_WORDS]; struct orig_node *orig_node; Index: a/batman-adv-kernelland/packet.h =================================================================== --- a/batman-adv-kernelland/packet.h (revision 1532) +++ b/batman-adv-kernelland/packet.h (working copy) @@ -31,6 +31,7 @@ #define COMPAT_VERSION 8 #define DIRECTLINK 0x40 #define VIS_SERVER 0x20 +#define PRIMARIES_FIRST_HOP 0x10 /* ICMP message types */ #define ECHO_REPLY 0 Index: a/batman-adv-kernelland/send.c =================================================================== --- a/batman-adv-kernelland/send.c (revision 1532) +++ b/batman-adv-kernelland/send.c (working copy) @@ -275,9 +275,9 @@ batman_packet->seqno = htons((uint16_t)atomic_read(&batman_if->seqno)); if (is_vis_server()) - batman_packet->flags = VIS_SERVER; + batman_packet->flags |= VIS_SERVER; else - batman_packet->flags = 0; + batman_packet->flags &= ~VIS_SERVER; /* could be read by receive_bat_packet() */ atomic_inc(&batman_if->seqno); @@ -332,6 +332,8 @@ batman_packet->seqno = htons(batman_packet->seqno); + /* switch of primaries first hop flag when forwarding */ + batman_packet->flags &= ~PRIMARIES_FIRST_HOP; if (directlink) batman_packet->flags |= DIRECTLINK; else Index: a/batman-adv-kernelland/proc.c =================================================================== --- a/batman-adv-kernelland/proc.c (revision 1532) +++ b/batman-adv-kernelland/proc.c (working copy) @@ -35,6 +35,7 @@ static struct proc_dir_entry *proc_transt_global_file; static struct proc_dir_entry *proc_vis_srv_file, *proc_vis_data_file; static struct proc_dir_entry *proc_aggr_file; +static struct proc_dir_entry *proc_bond_file; static int proc_interfaces_read(struct seq_file *seq, void *offset) { @@ -462,6 +463,53 @@ return single_open(file, proc_aggr_read, NULL); } +static int proc_bond_read(struct seq_file *seq, void *offset) +{ + seq_printf(seq, "%i\n", atomic_read(&bonding_enabled)); + + return 0; +} + +static ssize_t proc_bond_write(struct file *file, const char __user *buffer, + size_t count, loff_t *ppos) +{ + char *bond_string; + int not_copied = 0; + unsigned long bonding_enabled_tmp; + int retval; + + bond_string = kmalloc(count, GFP_KERNEL); + + if (!bond_string) + return -ENOMEM; + + not_copied = copy_from_user(bond_string, buffer, count); + bond_string[count - not_copied - 1] = 0; + + retval = strict_strtoul(bond_string, 10, &bonding_enabled_tmp); + + if (retval || bonding_enabled_tmp > 1) { + printk(KERN_ERR "batman-adv: Bonding can only be enabled (1) or disabled (0), given value: %li\n", bonding_enabled_tmp); + } else { + printk(KERN_INFO "batman-adv:Changing bonding from: %s (%i) to: %s (%li)\n", + (atomic_read(&bonding_enabled) == 1 ? + "enabled" : "disabled"), + atomic_read(&bonding_enabled), + (bonding_enabled_tmp == 1 ? "enabled" : "disabled"), + bonding_enabled_tmp); + atomic_set(&bonding_enabled, + (unsigned)bonding_enabled_tmp); + } + + kfree(bond_string); + return count; +} + +static int proc_bond_open(struct inode *inode, struct file *file) +{ + return single_open(file, proc_bond_read, NULL); +} + /* satisfying different prototypes ... */ static ssize_t proc_dummy_write(struct file *file, const char __user *buffer, size_t count, loff_t *ppos) @@ -478,6 +526,15 @@ .release = single_release, }; +static const struct file_operations proc_bond_fops = { + .owner = THIS_MODULE, + .open = proc_bond_open, + .read = seq_read, + .write = proc_bond_write, + .llseek = seq_lseek, + .release = single_release, +}; + static const struct file_operations proc_vis_srv_fops = { .owner = THIS_MODULE, .open = proc_vis_srv_open, @@ -567,6 +624,10 @@ if (proc_aggr_file) remove_proc_entry(PROC_FILE_AGGR, proc_batman_dir); + if (proc_bond_file) + remove_proc_entry(PROC_FILE_BOND, proc_batman_dir); + + if (proc_batman_dir) #ifdef __NET_NET_NAMESPACE_H remove_proc_entry(PROC_ROOT_DIR, init_net.proc_net); @@ -671,5 +732,15 @@ return -EFAULT; } + proc_bond_file = create_proc_entry(PROC_FILE_BOND, S_IWUSR | S_IRUGO, + proc_batman_dir); + if (proc_bond_file) { + proc_bond_file->proc_fops = &proc_bond_fops; + } else { + printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_BOND); + cleanup_procfs(); + return -EFAULT; + } + return 0; } Index: a/batman-adv-kernelland/proc.h =================================================================== --- a/batman-adv-kernelland/proc.h (revision 1532) +++ b/batman-adv-kernelland/proc.h (working copy) @@ -34,6 +34,7 @@ #define PROC_FILE_VIS_SRV "vis_server" #define PROC_FILE_VIS_DATA "vis_data" #define PROC_FILE_AGGR "aggregate_ogm" +#define PROC_FILE_BOND "bonding" void cleanup_procfs(void); int setup_procfs(void); Index: a/batman-adv-kernelland/soft-interface.c =================================================================== --- a/batman-adv-kernelland/soft-interface.c (revision 1532) +++ b/batman-adv-kernelland/soft-interface.c (working copy) @@ -22,6 +22,7 @@ #include "main.h" #include "soft-interface.h" #include "hard-interface.h" +#include "routing.h" #include "send.h" #include "translation-table.h" #include "types.h" @@ -170,11 +171,14 @@ return 0; } + + int interface_tx(struct sk_buff *skb, struct net_device *dev) { struct unicast_packet *unicast_packet; struct bcast_packet *bcast_packet; struct orig_node *orig_node; + struct neigh_node *router; struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct bat_priv *priv = netdev_priv(dev); struct batman_if *batman_if; @@ -227,37 +231,36 @@ if (!orig_node) orig_node = transtable_search(ethhdr->h_dest); - if ((orig_node) && - (orig_node->batman_if) && - (orig_node->router)) { - if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0) - goto unlock; + router = find_router(orig_node); - unicast_packet = (struct unicast_packet *)skb->data; + if (!router) + goto unlock; - unicast_packet->version = COMPAT_VERSION; - /* batman packet type: unicast */ - unicast_packet->packet_type = BAT_UNICAST; - /* set unicast ttl */ - unicast_packet->ttl = TTL; - /* copy the destination for faster routing */ - memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); + /* don't lock while sending the packets ... we therefore + * copy the required data before sending */ - /* net_dev won't be available when not active */ - if (orig_node->batman_if->if_active != IF_ACTIVE) - goto unlock; + batman_if = router->if_incoming; + memcpy(dstaddr, router->addr, ETH_ALEN); - /* don't lock while sending the packets ... we therefore - * copy the required data before sending */ + spin_unlock_irqrestore(&orig_hash_lock, flags); - batman_if = orig_node->batman_if; - memcpy(dstaddr, orig_node->router->addr, ETH_ALEN); - spin_unlock_irqrestore(&orig_hash_lock, flags); + if (batman_if->if_active != IF_ACTIVE) + goto dropped; - send_skb_packet(skb, batman_if, dstaddr); - } else { - goto unlock; - } + if (my_skb_push(skb, sizeof(struct unicast_packet)) < 0) + goto dropped; + + unicast_packet = (struct unicast_packet *)skb->data; + + unicast_packet->version = COMPAT_VERSION; + /* batman packet type: unicast */ + unicast_packet->packet_type = BAT_UNICAST; + /* set unicast ttl */ + unicast_packet->ttl = TTL; + /* copy the destination for faster routing */ + memcpy(unicast_packet->dest, orig_node->orig, ETH_ALEN); + + send_skb_packet(skb, batman_if, dstaddr); } priv->stats.tx_packets++; Index: a/batman-adv-kernelland/hard-interface.c =================================================================== --- a/batman-adv-kernelland/hard-interface.c (revision 1532) +++ b/batman-adv-kernelland/hard-interface.c (working copy) @@ -312,9 +312,9 @@ batman_packet = (struct batman_packet *)(batman_if->packet_buff); batman_packet->packet_type = BAT_PACKET; batman_packet->version = COMPAT_VERSION; - batman_packet->flags = 0x00; - batman_packet->ttl = (batman_if->if_num > 0 ? 2 : TTL); - batman_packet->flags = 0; + batman_packet->flags = batman_if->if_num > 0 ? + 0x00 : PRIMARIES_FIRST_HOP; + batman_packet->ttl = batman_if->if_num > 0 ? 2 : TTL; batman_packet->tq = TQ_MAX_VALUE; batman_packet->num_hna = 0; Index: a/batman-adv-kernelland/originator.c =================================================================== --- a/batman-adv-kernelland/originator.c (revision 1532) +++ b/batman-adv-kernelland/originator.c (working copy) @@ -221,10 +221,15 @@ orig_node->orig, (orig_node->last_valid / HZ)); return true; } else { - if (purge_orig_neighbors(orig_node, &best_neigh_node)) + if (purge_orig_neighbors(orig_node, &best_neigh_node)) { update_routes(orig_node, best_neigh_node, orig_node->hna_buff, orig_node->hna_buff_len); + /* set bonding candidates to zero. Will be updated + * at the next incoming packet for this originator. */ + + orig_node->bond.candidates = 0; + } } return false; } Index: a/batman-adv-kernelland/main.c =================================================================== --- a/batman-adv-kernelland/main.c (revision 1532) +++ b/batman-adv-kernelland/main.c (working copy) @@ -45,6 +45,7 @@ atomic_t originator_interval; atomic_t vis_interval; atomic_t aggregation_enabled; +atomic_t bonding_enabled; int16_t num_hna; int16_t num_ifs; @@ -85,6 +86,7 @@ atomic_set(&vis_interval, 1000);/* TODO: raise this later, this is only * for debugging now. */ atomic_set(&aggregation_enabled, 1); + atomic_set(&bonding_enabled, 0); /* the name should not be longer than 10 chars - see * http://lwn.net/Articles/23634/ */ Index: a/batman-adv-kernelland/routing.c =================================================================== --- a/batman-adv-kernelland/routing.c (revision 1532) +++ b/batman-adv-kernelland/routing.c (working copy) @@ -352,6 +352,106 @@ return is_duplicate; } +/* mark possible bonding candidates in the neighbor list */ +static void update_bonding(struct orig_node *orig_node, + struct orig_node *orig_neigh_node, + struct batman_packet *batman_packet) +{ + int candidates; + int interference_candidate; + int best_tq; + struct neigh_node *tmp_neigh_node, *tmp_neigh_node2; + struct neigh_node *first_candidate, *last_candidate; + + /* don't care if bonding is not enabled */ + if (!atomic_read(&bonding_enabled)) { + orig_node->bond.candidates = 0; + return; + } + + if (batman_packet->flags & PRIMARIES_FIRST_HOP) + memcpy(orig_neigh_node->primary_addr, + orig_node->orig, ETH_ALEN); + else + return; + + /* update the candidates for this originator */ + if (!orig_node->router) { + orig_node->bond.candidates = 0; + return; + } + + best_tq = orig_node->router->tq_avg; + + /* update bonding candidates */ + + candidates = 0; + + /* mark other nodes which also received "PRIMARIES FIRST HOP" packets + * as "bonding partner" */ + + /* first, zero the list */ + list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + tmp_neigh_node->next_bond_candidate = NULL; + } + + first_candidate = NULL; + last_candidate = NULL; + list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, list) { + + /* only consider if it has the same primary address ... */ + if (memcmp(orig_node->orig, + tmp_neigh_node->orig_node->primary_addr, + ETH_ALEN) != 0) + continue; + + /* ... and is good enough to be considered */ + if (tmp_neigh_node->tq_avg < best_tq - BONDING_TQ_THRESHOLD) + continue; + + /* check if we have another candidate with the same + * mac address or interface. If we do, we won't + * select this candidate because of possible interference. */ + + interference_candidate = 0; + list_for_each_entry(tmp_neigh_node2, + &orig_node->neigh_list, list) { + + if (tmp_neigh_node2 == tmp_neigh_node) + continue; + + if ((tmp_neigh_node->if_incoming == + tmp_neigh_node2->if_incoming) + || (memcmp(tmp_neigh_node->addr, + tmp_neigh_node2->addr, ETH_ALEN) == 0)) { + + interference_candidate = 1; + break; + } + } + /* don't care further if it is an interference candidate */ + if (interference_candidate) + continue; + + if (first_candidate == NULL) { + first_candidate = tmp_neigh_node; + tmp_neigh_node->next_bond_candidate = first_candidate; + } else + tmp_neigh_node->next_bond_candidate = last_candidate; + + last_candidate = tmp_neigh_node; + + candidates++; + } + + if (candidates > 0) { + first_candidate->next_bond_candidate = last_candidate; + orig_node->bond.selected = first_candidate; + } + + orig_node->bond.candidates = candidates; +} + void receive_bat_packet(struct ethhdr *ethhdr, struct batman_packet *batman_packet, unsigned char *hna_buff, int hna_buff_len, @@ -518,6 +618,8 @@ update_orig(orig_node, ethhdr, batman_packet, if_incoming, hna_buff, hna_buff_len, is_duplicate); + update_bonding(orig_node, orig_neigh_node, batman_packet); + /* is single hop (direct) neighbor */ if (is_single_hop_neigh) { @@ -788,16 +890,67 @@ return ret; } +/* find a suitable router for this originator, and use + * bonding if possible. */ +struct neigh_node *find_router(struct orig_node *orig_node) +{ + struct orig_node *primary_orig_node; + struct orig_node *router_orig; + struct neigh_node *router; + static uint8_t zero_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0}; + + if (!orig_node) + return NULL; + + if (!orig_node->router) + return NULL; + + /* don't care if bonding is not enabled */ + if (!atomic_read(&bonding_enabled)) + return orig_node->router; + + router_orig = orig_node->router->orig_node; + + /* if we have something in the primary_addr, we can search + * for a potential bonding candidate. */ + if (memcmp(router_orig->primary_addr, zero_mac, ETH_ALEN) == 0) + return orig_node->router; + + /* find the orig_node which has the primary interface. might + * even be the same as our orig_node in many cases */ + + primary_orig_node = hash_find(orig_hash, router_orig->primary_addr); + if (!primary_orig_node) + return orig_node->router; + + /* with less than 2 candidates, we can't do any + * bonding and prefer the original router. */ + + if (primary_orig_node->bond.candidates < 2) + return orig_node->router; + + router = primary_orig_node->bond.selected; + + /* sanity check - this should never happen. */ + if (!router) + return orig_node->router; + + /* select the next bonding partner ... */ + primary_orig_node->bond.selected = router->next_bond_candidate; + + return router; +} + int recv_unicast_packet(struct sk_buff *skb) { struct unicast_packet *unicast_packet; struct orig_node *orig_node; + struct neigh_node *router; struct ethhdr *ethhdr; struct batman_if *batman_if; struct sk_buff *skb_old; uint8_t dstaddr[ETH_ALEN]; int hdr_size = sizeof(struct unicast_packet); - int ret; unsigned long flags; /* drop packet if it has not necessary minimum size */ @@ -832,42 +985,43 @@ return NET_RX_DROP; } - ret = NET_RX_DROP; /* get routing information */ spin_lock_irqsave(&orig_hash_lock, flags); orig_node = ((struct orig_node *) hash_find(orig_hash, unicast_packet->dest)); - if ((orig_node != NULL) && - (orig_node->batman_if != NULL) && - (orig_node->router != NULL)) { + router = find_router(orig_node); - /* don't lock while sending the packets ... we therefore - * copy the required data before sending */ - batman_if = orig_node->batman_if; - memcpy(dstaddr, orig_node->router->addr, ETH_ALEN); - spin_unlock_irqrestore(&orig_hash_lock, flags); + if (!router) { + spin_lock_irqsave(&orig_hash_lock, flags); + return NET_RX_DROP; + } - /* create a copy of the skb, if needed, to modify it. */ - if (!skb_clone_writable(skb, sizeof(struct unicast_packet))) { - skb_old = skb; - skb = skb_copy(skb, GFP_ATOMIC); - if (!skb) - return NET_RX_DROP; - unicast_packet = (struct unicast_packet *) skb->data; - kfree_skb(skb_old); - } - /* decrement ttl */ - unicast_packet->ttl--; + /* don't lock while sending the packets ... we therefore + * copy the required data before sending */ - /* route it */ - send_skb_packet(skb, batman_if, dstaddr); - ret = NET_RX_SUCCESS; + batman_if = router->if_incoming; + memcpy(dstaddr, router->addr, ETH_ALEN); - } else - spin_unlock_irqrestore(&orig_hash_lock, flags); + spin_unlock_irqrestore(&orig_hash_lock, flags); - return ret; + /* create a copy of the skb, if needed, to modify it. */ + if (!skb_clone_writable(skb, sizeof(struct unicast_packet))) { + skb_old = skb; + skb = skb_copy(skb, GFP_ATOMIC); + if (!skb) + return NET_RX_DROP; + unicast_packet = (struct unicast_packet *) skb->data; + kfree_skb(skb_old); + } + + /* decrement ttl */ + unicast_packet->ttl--; + + /* route it */ + send_skb_packet(skb, batman_if, dstaddr); + + return NET_RX_SUCCESS; } Index: a/batman-adv-kernelland/main.h =================================================================== --- a/batman-adv-kernelland/main.h (revision 1532) +++ b/batman-adv-kernelland/main.h (working copy) @@ -58,6 +58,11 @@ #define LOG_BUF_LEN 8192 /* has to be a power of 2 */ #define ETH_STR_LEN 20 +/* how much worse secondary interfaces may be to + * to be considered as bonding candidates */ + +#define BONDING_TQ_THRESHOLD 50 + #define MAX_AGGREGATION_BYTES 512 /* should not be bigger than 512 bytes or * change the size of * forw_packet->direct_link_flags */ @@ -131,6 +136,7 @@ extern atomic_t originator_interval; extern atomic_t vis_interval; extern atomic_t aggregation_enabled; +extern atomic_t bonding_enabled; extern int16_t num_hna; extern int16_t num_ifs; Index: a/batman-adv-kernelland/routing.h =================================================================== --- a/batman-adv-kernelland/routing.h (revision 1532) +++ b/batman-adv-kernelland/routing.h (working copy) @@ -38,3 +38,4 @@ int recv_vis_packet(struct sk_buff *skb); int recv_bat_packet(struct sk_buff *skb, struct batman_if *batman_if); +struct neigh_node *find_router(struct orig_node *orig_node);

3 7

Re: [B.A.T.M.A.N.] batman-adv on different archs
by Sven Eckelmann 19 Jan '10

19 Jan '10

Juha Ylönen wrote: > > As far as I can see only data from 00:22:fa:dc:9a:ce can be seen (send > > from us > > aka laptop?). Have you tested if the adhoc connection between this two > > devices > > (arm <-> laptop) is really working (just set up the adhoc network as > > usual and > > then give them an ip instead of adding to > > /proc/net/batman-adv/interfaces. A > > simple ping test should be sufficient to say that it works(tm)). > > Yes, ad-hoc itself works pretty well. the device boots up to his default > ad-hoc, and I've sent the module over with scp and did some configuring > over ssh. I did run couple of tests with IP disabled in the interfaces > (set up exactly as in the readme) but recently I've just kept them in the > default setup with IP's, will it cause problems? The problem existed with > non-IP interfaces too. batman-adv works on a lower level - so it shouldn't be a really problem in that situation. Maybe you can "tcpdump -s 0 -w test.dump" on the arm too. I am currently not sure why the arm cannot or doesn't send packets at all. The logs in 20100118132935.91200(a)gmx.net say that it was send, but I currently don't understand why they don't reach their destination. Maybe a dump from the arm reveals the problem - or at least we know if data gets send at all or if the data is stopped somewhere else. Best regards, Sven

1 0

Re: [B.A.T.M.A.N.] Security on adhoc network
by LAMBA Jaideep 19 Jan '10

19 Jan '10

>> Hey Jaideep, >> >> as Sven mentioned correctly, using the WPA sequence numbers in WPA_NONE should be ignored. Some drivers (like madwifi) have to be teached to >> do that. Sequence numbers do not make much sense in Ad-Hoc anyway, as there is no central management for these sequence numbers. Of course, you >> lack some security features like detecting replay attacks or changing session keys which you have in master/station WPA. >> >> best regards, >> Simon Hey Simon, I understand. So does that mean all the city-wide mesh deployments we are seeing are susceptible to reply attack etc ? Will try to follow on Jouni's suggestion of fixing nl driver layer for 4-way handshake, GTK mgmt to see if I can contribute to solving this problem. Thanks for your help. Jaideep

1 0

[B.A.T.M.A.N.] Security on adhoc network
by LAMBA Jaideep 17 Jan '10

17 Jan '10

Are there any solutions currently under implementation for providing security (other than open/wep) over adhoc networks ? Thanks, Jaideep

3 4

[B.A.T.M.A.N.] network down timeout
by ecfu 15 Jan '10

15 Jan '10

Is there a configuration setting for batman-adv to timeout on a connection? i.e. if I lose a node in my network, I noticed it took a long time for that node to leave the originators list. What is this based on or in other words when does batman-adv declare the lost originator gone?

3 5

[B.A.T.M.A.N.] [PATCH 1/3] batman-adv: atomic variable for vis-srv activation
by Linus Lüssing 13 Jan '10

13 Jan '10

This fixes the bug discovered by Marek which did not allow turning on the vis-server before an interface has been added. This is now being done in a similar way as for (de)activating the aggregation mode with an atomic variable. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> --- main.c | 2 ++ main.h | 1 + proc.c | 43 ++++++++++++++++++++++++------------------- send.c | 2 +- vis.c | 41 +++-------------------------------------- vis.h | 2 -- 6 files changed, 31 insertions(+), 60 deletions(-) diff --git a/main.c b/main.c index c733504..843d552 100644 --- a/main.c +++ b/main.c @@ -44,6 +44,7 @@ DEFINE_SPINLOCK(forw_bcast_list_lock); atomic_t originator_interval; atomic_t vis_interval; +atomic_t vis_srv_enabled; atomic_t aggregation_enabled; int16_t num_hna; int16_t num_ifs; @@ -84,6 +85,7 @@ int init_module(void) atomic_set(&originator_interval, 1000); atomic_set(&vis_interval, 1000);/* TODO: raise this later, this is only * for debugging now. */ + atomic_set(&vis_srv_enabled, 0); atomic_set(&aggregation_enabled, 1); /* the name should not be longer than 10 chars - see diff --git a/main.h b/main.h index 3dfe5fe..385818f 100644 --- a/main.h +++ b/main.h @@ -130,6 +130,7 @@ extern spinlock_t forw_bcast_list_lock; extern atomic_t originator_interval; extern atomic_t vis_interval; +extern atomic_t vis_srv_enabled; extern atomic_t aggregation_enabled; extern int16_t num_hna; extern int16_t num_ifs; diff --git a/proc.c b/proc.c index 61e1d0d..e7b7bf3 100644 --- a/proc.c +++ b/proc.c @@ -325,36 +325,41 @@ static int proc_transt_global_open(struct inode *inode, struct file *file) static ssize_t proc_vis_srv_write(struct file *file, const char __user * buffer, size_t count, loff_t *ppos) { - char *vis_mode_string; + char *vis_srv_string; int not_copied = 0; + unsigned long vis_srv_enabled_tmp; + int retval; - vis_mode_string = kmalloc(count, GFP_KERNEL); + vis_srv_string = kmalloc(count, GFP_KERNEL); - if (!vis_mode_string) + if (!vis_srv_string) return -ENOMEM; - not_copied = copy_from_user(vis_mode_string, buffer, count); - vis_mode_string[count - not_copied - 1] = 0; - - if ((strcmp(vis_mode_string, "client") == 0) || - (strcmp(vis_mode_string, "disabled") == 0)) { - printk(KERN_INFO "batman-adv:Setting VIS mode to client (disabling vis server)\n"); - vis_set_mode(VIS_TYPE_CLIENT_UPDATE); - } else if ((strcmp(vis_mode_string, "server") == 0) || - (strcmp(vis_mode_string, "enabled") == 0)) { - printk(KERN_INFO "batman-adv:Setting VIS mode to server (enabling vis server)\n"); - vis_set_mode(VIS_TYPE_SERVER_SYNC); - } else + not_copied = copy_from_user(vis_srv_string, buffer, count); + vis_srv_string[count - not_copied - 1] = 0; + + retval = strict_strtoul(vis_srv_string, 10, &vis_srv_enabled_tmp); + + /* Unknown vis mode input? */ + if (retval == -EINVAL || vis_srv_enabled_tmp > 1) { printk(KERN_ERR "batman-adv:Unknown VIS mode: %s\n", - vis_mode_string); + vis_srv_string); + } + else { + if (vis_srv_enabled_tmp == 0) + printk(KERN_INFO "batman-adv:Setting VIS mode to client (disabling vis server)\n"); + else + printk(KERN_INFO "batman-adv:Setting VIS mode to server (enabling vis server)\n"); + atomic_set(&vis_srv_enabled, vis_srv_enabled_tmp); + } - kfree(vis_mode_string); + kfree(vis_srv_string); return count; } static int proc_vis_srv_read(struct seq_file *seq, void *offset) { - int vis_server = is_vis_server(); + int vis_server = atomic_read(&vis_srv_enabled); seq_printf(seq, "[%c] client mode (server disabled) \n", (!vis_server) ? 'x' : ' '); @@ -380,7 +385,7 @@ static int proc_vis_data_read(struct seq_file *seq, void *offset) unsigned long flags; rcu_read_lock(); - if (list_empty(&if_list) || (!is_vis_server())) { + if (list_empty(&if_list) || (!atomic_read(&vis_srv_enabled))) { rcu_read_unlock(); goto end; } diff --git a/send.c b/send.c index fd48f3f..92d14a6 100644 --- a/send.c +++ b/send.c @@ -279,7 +279,7 @@ void schedule_own_packet(struct batman_if *batman_if) /* change sequence number to network order */ batman_packet->seqno = htons((uint16_t)atomic_read(&batman_if->seqno)); - if (is_vis_server()) + if (atomic_read(&vis_srv_enabled)) batman_packet->flags = VIS_SERVER; else batman_packet->flags = 0; diff --git a/vis.c b/vis.c index fa8afdb..e7c14b5 100644 --- a/vis.c +++ b/vis.c @@ -49,41 +49,6 @@ static void free_info(void *data) kfree(info); } -/* set the mode of the visualization to client or server */ -void vis_set_mode(int mode) -{ - unsigned long flags; - spin_lock_irqsave(&vis_hash_lock, flags); - - if (my_vis_info != NULL) - my_vis_info->packet.vis_type = mode; - - spin_unlock_irqrestore(&vis_hash_lock, flags); -} - -/* 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; - unsigned long flags; - - spin_lock_irqsave(&vis_hash_lock, flags); - ret = is_vis_server_locked(); - spin_unlock_irqrestore(&vis_hash_lock, flags); - - return ret; -} - /* Compare two vis packets, used by the hashing algorithm */ static int vis_info_cmp(void *data1, void *data2) { @@ -280,7 +245,7 @@ void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len) /* only if we are server ourselves and packet is newer than the one in * hash.*/ - if (is_vis_server_locked() && is_new) { + if (atomic_read(&vis_srv_enabled) && is_new) { memcpy(info->packet.target_orig, broadcastAddr, ETH_ALEN); if (list_empty(&info->send_list)) list_add_tail(&info->send_list, &send_list); @@ -309,7 +274,7 @@ void receive_client_update_packet(struct vis_packet *vis_packet, /* send only if we're the target server or ... */ - if (is_vis_server_locked() && + if (atomic_read(&vis_srv_enabled) && is_my_mac(info->packet.target_orig) && is_new) { info->packet.vis_type = VIS_TYPE_SERVER_SYNC; /* upgrade! */ @@ -380,7 +345,7 @@ static int generate_vis_packet(void) info->packet.seqno++; info->packet.entries = 0; - if (!is_vis_server_locked()) { + if (!atomic_read(&vis_srv_enabled)) { best_tq = find_best_vis_server(info); if (best_tq < 0) { spin_unlock_irqrestore(&orig_hash_lock, flags); diff --git a/vis.h b/vis.h index 2e24258..0cdafde 100644 --- a/vis.h +++ b/vis.h @@ -48,8 +48,6 @@ struct recvlist_node { extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock; -void vis_set_mode(int mode); -int is_vis_server(void); void proc_vis_read_entry(struct seq_file *seq, struct vis_info_entry *entry, struct hlist_head *if_list, -- 1.6.5.7

3 6

[B.A.T.M.A.N.] modprobe
by ecfu 11 Jan '10

11 Jan '10

The installation instructions say to use insmod to load the batman-adv module. Can you use modprobe? Basically I just want it to start when the system boots. Is there an easy way to do this? Thanks

2 1

[B.A.T.M.A.N.] Are older kernels abandoned?
by Gus Wirth 11 Jan '10

11 Jan '10

Now that work is under way to incorporate B.A.T.M.A.N (batman-adv) into the mainline Linux kernel, hopefully 2.6.33, will older kernels be abandoned? I have some embedded systems that are on 2.6.30.10 and running fine, and I really don't want to have to put in a new kernel and recertify the software just to get some improvements to B.A.T.M.A.N. Is there any consideration to doing something similar to compat-wireless but for B.A.T.M.A.N (batman-adv) instead? Gus

2 1

[B.A.T.M.A.N.] B.A.T.M.A.N. V outlook
by Marek Lindner 08 Jan '10

08 Jan '10

Hey, I wrote a summary regarding the current ideas how B.A.T.M.A.N. V could look like: http://www.open-mesh.net/wiki/2009-12-18-batman-v-outlook Feedback welcome! Cheers, Marek

6 10

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N January 2010