B.A.T.M.A.N

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

15 participants
4308 discussions

Re: [B.A.T.M.A.N.] batman-adv on different archs
by "Juha Ylönen" 22 Jan '10

22 Jan '10

-------- Original-Nachricht -------- > Datum: Thu, 21 Jan 2010 18:57:52 +0100 > Von: Sven Eckelmann <sven.eckelmann(a)gmx.de> > Yes, but doesn't explain why there is no batman-adv packet from ARM > reaching > the laptop and the other way around. batman-adv is a layer bellow and has > nearly nothing to do with the stuff which runs over it (the only thing > which > accesses the layer over it should be the gateway stuff). > > @Juha, I found time and looked a little bit at the stuff which came from > the > ARM in the last log. Wireshark means that it is a Raw ethernet packet. And > thinks that the stuff attached is a IPX packet.... but reading the raw > data > reveals that it should be the batman-packet.... with extra data between > the > ethernet header and the actual batman-adv packet. So the problem looks to > me a > little bit like hardware of the arm does something very stupid to our > packets. > > I've attach a small picture to explain what I mean. The green part it the > normal receiver and sender stuff for ethernet. The orange part is not > explainable for me... Have we forgot some alignment stuff? Is your card > adding > some extra data? I am not sure what that could mean right now. > The red thing is the ethernet type for batman-adv, pink the type of > batman-adv > packet, yellow the protocol version and light blue the flags for that > packet. > I don't know more color - so just marked the rest of the packet blue. The > amount of bytes are correct and it looks fine to me. > > As anyone a good idea? Maybe a small capture of a normal ping test and a > rawsend test between the both could help to understand the problem better. > And > can you maybe tell us what kind of hardware is used inside the arm for the > eth1 device? Hi, This looks interesting, I've had problems with the wlan driver before but it has been quite stable for a while. Wlan chip in use is CSR UniFi 1050, with driver compiled from CSR supplied sources. I'll try your rawsend and ping capturing during the weekend. Sorry for the bother in advance if this turns out to be due the crappy wlan driver (as said, it has been giving problems earlier, though I haven't seen any packet mangling before). -Juha -- Haiti-Nothilfe! Helfen Sie per SMS: Sende UIHAITI an die Nummer 81190. Von 5 Euro je SMS (zzgl. SMS-Gebühr) gehen 4,83 Euro an UNICEF.

2 1

[B.A.T.M.A.N.] Batman questions
by David Murray 21 Jan '10

21 Jan '10

Hi, I have a couple of questions regarding BATMAN and BATMAN-ADV I do not understand what the transmission quality in OGMs is for. From my reading of the RFC draft, route selection is done based on the number of OGMs received for a specific destination within a sliding window of sequence numbers. I did catch a comment in the source code about transmission quality it being used for bidirectional link detection, but there I couldn't find a mention of transmission quality in the draft RFC. I have been looking at BATMAN and BATMAN-ADV OGMs in Wireshark. It seems that the BATMAN L3 OGMs have 18 bytes of BATMAN information on top of the 802.11 header (24bytes) LLC (8 bytes) IP header (20 bytes). Comparatively, the BATMAN-ADV OGMs comprise of a 802.11 header (24bytes) LLC (8 bytes) and 26 Bytes of BATMAN data. Now because Wireshark does not recognise BATMAN-ADV frames. I don't know what is being used for the extra 8 bytes of batman data. I guess the originator and receiver portions of the packet are now 6 byte MAC addresses rather than 4 byte IP addresses. However, this does not account for extra 8 bytes used for BATMAN-ADV. In the future, it seems like BATMAN-ADV will get the majority of the developer attention. Other than not having to asign IP addresses, which does seem pretty cool, I am finding it hard to see 'major' advantages of one versus another. This advantage also seems to be slightly offset because it now becomes harder to get gateway information. Is this right? Does working at the data link layer make it easier to extract, neighbour SNR's or bit rates from the wireless driver? What about power control? I'm just throwing ideas around here (I haven't thought this through) but could you have a power save mode whereby if the device is battery powered and has > 8 neighbours, then slowly reduce the transmission power until neighbours is < 4 or mains powered batman neighbours is <2. Thank you very much for your time Dave

3 2

[B.A.T.M.A.N.] batman-adv on different archs
by "Juha Ylönen" 20 Jan '10

20 Jan '10

Hi, I've been trying to get my embedded project included in my mesh, but no success yet. Could anyone give a pointers what is going wrong? I have batman-adv compiled on my laptop, and also for testing purposes on another laptop, they see each other and everything is fine. I used the same sources and compiled it cleanly on each. The problem comes when I try to add my little ARM based linux box onto the group. Again same sources used (latest stable from the wiki), crosscompiles fine and I can load the module as normal on the box. Setup goes as it should on both the device and the laptop, and both systems seems to be running smoothly. But my laptop can only see the other laptop, and the device doesn't see anyone. The wireless net is working and I can ping each device directly if I assign IP's to the 'real' interfaces, but through bat0 nothing is found. Any idea what is going wrong? --- I've also played with the batman daemon on the device, with it I the laptop and device can see each other just fine. The problem there is that apparently it doesn't really support multicast forwarding? i.e. If I have 3 devices A-B-C, where A does not have direct link to C (batman routes through B), sending a multicast from A can be received in B and vice versa, also same for C-B, but no messages from A to C. Will I have the same problem with batman-adv? Or can this be fixed on the daemon? Best Regards Juha -- GRATIS für alle GMX-Mitglieder: Die maxdome Movie-FLAT! Jetzt freischalten unter http://portal.gmx.net/de/go/maxdome01

5 13

[B.A.T.M.A.N.] [Patch 1/1] Staging: batman-adv: Use printk(%pM) for MAC addresses
by Andrew Lunn 20 Jan '10

20 Jan '10

printk() since kernel version 2.6.29 has supported printing MAC addresses directly, as an extension to the %p processing. This patch makes use of this for printk() and bat_dbg(). This will remove the overhead of using addr_to_string() which is normally never actually output. For kernels older than 2.6.29 the printk support from 2.6.31 has been imported into batman-adv and will be used for formatting the output before passing it onto the native printk() function. Fix the typo found by Gus Wirth. grep pMs suggests the typo only occurred once. Stripped out all unneeded %pX functionality in bat_printk.c so that the code is more likely to build with older kernels. Only build bat_printk.c with kernels that require it, thanks to Simon Wunderlich Makefile.kbuild patch. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Index: Makefile.kbuild =================================================================== --- Makefile.kbuild (revision 1524) +++ Makefile.kbuild (working copy) @@ -32,4 +32,4 @@ endif obj-m += batman-adv.o -batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o +batman-adv-objs := main.o proc.o send.o routing.o soft-interface.o device.o translation-table.o bitarray.o hash.o ring_buffer.o vis.o hard-interface.o aggregation.o originator.o $(shell [ "2" -eq "$(VERSION)" ] && [ "6" -eq "$(PATCHLEVEL)" ] && [ "$(SUBLEVEL)" -le "28" ] && echo bat_printk.o) Index: translation-table.c =================================================================== --- translation-table.c (revision 1524) +++ translation-table.c (working copy) @@ -61,7 +61,6 @@ struct hna_local_entry *hna_local_entry; struct hna_global_entry *hna_global_entry; struct hashtable_t *swaphash; - char hna_str[ETH_STR_LEN]; unsigned long flags; spin_lock_irqsave(&hna_local_hash_lock, flags); @@ -74,19 +73,17 @@ return; } - addr_to_string(hna_str, addr); - /* only announce as many hosts as possible in the batman-packet and space in batman_packet->num_hna That also should give a limit to MAC-flooding. */ if ((num_hna + 1 > (ETH_DATA_LEN - BAT_PACKET_LEN) / ETH_ALEN) || (num_hna + 1 > 255)) { - bat_dbg(DBG_ROUTES, "Can't add new local hna entry (%s): number of local hna entries exceeds packet size \n", hna_str); + bat_dbg(DBG_ROUTES, "Can't add new local hna entry (%pM): number of local hna entries exceeds packet size \n", addr); return; } - bat_dbg(DBG_ROUTES, "Creating new local hna entry: %s \n", - hna_str); + bat_dbg(DBG_ROUTES, "Creating new local hna entry: %pM \n", + addr); hna_local_entry = kmalloc(sizeof(struct hna_local_entry), GFP_ATOMIC); if (!hna_local_entry) @@ -201,12 +198,9 @@ static void hna_local_del(struct hna_local_entry *hna_local_entry, char *message) { - char hna_str[ETH_STR_LEN]; + bat_dbg(DBG_ROUTES, "Deleting local hna entry (%pM): %s \n", + hna_local_entry->addr, message); - addr_to_string(hna_str, hna_local_entry->addr); - bat_dbg(DBG_ROUTES, "Deleting local hna entry (%s): %s \n", - hna_str, message); - hash_remove(hna_local_hash, hna_local_entry->addr); _hna_local_del(hna_local_entry); } @@ -278,13 +272,10 @@ struct hna_global_entry *hna_global_entry; struct hna_local_entry *hna_local_entry; struct hashtable_t *swaphash; - char hna_str[ETH_STR_LEN], orig_str[ETH_STR_LEN]; int hna_buff_count = 0; unsigned long flags; unsigned char *hna_ptr; - addr_to_string(orig_str, orig_node->orig); - while ((hna_buff_count + 1) * ETH_ALEN <= hna_buff_len) { spin_lock_irqsave(&hna_global_hash_lock, flags); @@ -304,10 +295,9 @@ memcpy(hna_global_entry->addr, hna_ptr, ETH_ALEN); - addr_to_string(hna_str, hna_global_entry->addr); bat_dbg(DBG_ROUTES, - "Creating new global hna entry: %s (via %s)\n", - hna_str, orig_str); + "Creating new global hna entry: %pM (via %pM)\n", + hna_global_entry->addr, orig_node->orig); spin_lock_irqsave(&hna_global_hash_lock, flags); hash_add(hna_global_hash, hna_global_entry); @@ -399,14 +389,10 @@ void _hna_global_del_orig(struct hna_global_entry *hna_global_entry, char *message) { - char hna_str[ETH_STR_LEN], orig_str[ETH_STR_LEN]; + bat_dbg(DBG_ROUTES, "Deleting global hna entry %pM (via %pM): %s \n", + hna_global_entry->addr, hna_global_entry->orig_node->orig, + message); - addr_to_string(orig_str, hna_global_entry->orig_node->orig); - addr_to_string(hna_str, hna_global_entry->addr); - - bat_dbg(DBG_ROUTES, "Deleting global hna entry %s (via %s): %s \n", - hna_str, orig_str, message); - hash_remove(hna_global_hash, hna_global_entry->addr); kfree(hna_global_entry); } Index: send.c =================================================================== --- send.c (revision 1524) +++ send.c (working copy) @@ -132,7 +132,6 @@ uint8_t packet_num; int16_t buff_pos; struct batman_packet *batman_packet; - char orig_str[ETH_STR_LEN]; if (batman_if->if_active != IF_ACTIVE) return; @@ -154,15 +153,14 @@ else batman_packet->flags &= ~DIRECTLINK; - addr_to_string(orig_str, batman_packet->orig); fwd_str = (packet_num > 0 ? "Forwarding" : (forw_packet->own ? "Sending own" : "Forwarding")); bat_dbg(DBG_BATMAN, - "%s %spacket (originator %s, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", + "%s %spacket (originator %pM, seqno %d, TQ %d, TTL %d, IDF %s) on interface %s [%s]\n", fwd_str, (packet_num > 0 ? "aggregated " : ""), - orig_str, ntohs(batman_packet->seqno), + batman_packet->orig, ntohs(batman_packet->seqno), batman_packet->tq, batman_packet->ttl, (batman_packet->flags & DIRECTLINK ? "on" : "off"), @@ -186,7 +184,6 @@ struct batman_if *batman_if; struct batman_packet *batman_packet = (struct batman_packet *)(forw_packet->packet_buff); - char orig_str[ETH_STR_LEN]; unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); if (!forw_packet->if_incoming) { @@ -197,8 +194,6 @@ if (forw_packet->if_incoming->if_active != IF_ACTIVE) return; - addr_to_string(orig_str, batman_packet->orig); - /* multihomed peer assumed */ /* non-primary OGMs are only broadcasted on their interface */ if ((directlink && (batman_packet->ttl == 1)) || @@ -206,9 +201,9 @@ /* FIXME: what about aggregated packets ? */ bat_dbg(DBG_BATMAN, - "%s packet (originator %s, seqno %d, TTL %d) on interface %s [%s]\n", + "%s packet (originator %pM, seqno %d, TTL %d) on interface %s [%s]\n", (forw_packet->own ? "Sending own" : "Forwarding"), - orig_str, ntohs(batman_packet->seqno), + batman_packet->orig, ntohs(batman_packet->seqno), batman_packet->ttl, forw_packet->if_incoming->dev, forw_packet->if_incoming->addr_str); Index: hard-interface.c =================================================================== --- hard-interface.c (revision 1524) +++ hard-interface.c (working copy) @@ -74,7 +74,6 @@ static void check_known_mac_addr(uint8_t *addr) { struct batman_if *batman_if; - char mac_string[ETH_STR_LEN]; rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { @@ -85,9 +84,8 @@ if (!compare_orig(batman_if->net_dev->dev_addr, addr)) continue; - addr_to_string(mac_string, addr); - printk(KERN_WARNING "batman-adv:The newly added mac address (%s) already exists on: %s\n", - mac_string, batman_if->dev); + printk(KERN_WARNING "batman-adv:The newly added mac address (%pM) already exists on: %s\n", + addr, batman_if->dev); printk(KERN_WARNING "batman-adv:It is strongly recommended to keep mac addresses unique to avoid problems!\n"); } rcu_read_unlock(); Index: originator.c =================================================================== --- originator.c (revision 1524) +++ originator.c (working copy) @@ -121,7 +121,6 @@ { struct orig_node *orig_node; struct hashtable_t *swaphash; - char orig_str[ETH_STR_LEN]; int size; orig_node = ((struct orig_node *)hash_find(orig_hash, addr)); @@ -129,8 +128,7 @@ if (orig_node != NULL) return orig_node; - addr_to_string(orig_str, addr); - bat_dbg(DBG_BATMAN, "Creating new originator: %s \n", orig_str); + bat_dbg(DBG_BATMAN, "Creating new originator: %pM \n", addr); orig_node = kmalloc(sizeof(struct orig_node), GFP_ATOMIC); if (!orig_node) @@ -186,7 +184,6 @@ struct neigh_node **best_neigh_node) { struct list_head *list_pos, *list_pos_tmp; - char neigh_str[ETH_STR_LEN], orig_str[ETH_STR_LEN]; struct neigh_node *neigh_node; bool neigh_purged = false; @@ -201,9 +198,7 @@ (neigh_node->last_valid + ((PURGE_TIMEOUT * HZ) / 1000)))) { - addr_to_string(neigh_str, neigh_node->addr); - addr_to_string(orig_str, orig_node->orig); - bat_dbg(DBG_BATMAN, "neighbor timeout: originator %s, neighbor: %s, last_valid %lu\n", orig_str, neigh_str, (neigh_node->last_valid / HZ)); + bat_dbg(DBG_BATMAN, "neighbor timeout: originator %pM, neighbor: %pM, last_valid %lu\n", orig_node->orig, neigh_node->addr, (neigh_node->last_valid / HZ)); neigh_purged = true; list_del(list_pos); @@ -221,17 +216,14 @@ static bool purge_orig_node(struct orig_node *orig_node) { struct neigh_node *best_neigh_node; - char orig_str[ETH_STR_LEN]; - addr_to_string(orig_str, orig_node->orig); - if (time_after(jiffies, (orig_node->last_valid + ((2 * PURGE_TIMEOUT * HZ) / 1000)))) { bat_dbg(DBG_BATMAN, - "Originator timeout: originator %s, last_valid %lu\n", - orig_str, (orig_node->last_valid / HZ)); + "Originator timeout: originator %pM, last_valid %lu\n", + orig_node->orig, (orig_node->last_valid / HZ)); return true; } else { if (purge_orig_neighbors(orig_node, &best_neigh_node)) Index: routing.c =================================================================== --- routing.c (revision 1524) +++ routing.c (working copy) @@ -80,32 +80,24 @@ struct neigh_node *neigh_node, unsigned char *hna_buff, int hna_buff_len) { - char orig_str[ETH_STR_LEN], neigh_str[ETH_STR_LEN]; - char router_str[ETH_STR_LEN]; - - addr_to_string(orig_str, orig_node->orig); - /* route deleted */ if ((orig_node->router != NULL) && (neigh_node == NULL)) { - bat_dbg(DBG_ROUTES, "Deleting route towards: %s\n", - orig_str); + bat_dbg(DBG_ROUTES, "Deleting route towards: %pM\n", + orig_node->orig); hna_global_del_orig(orig_node, "originator timed out"); /* route added */ } else if ((orig_node->router == NULL) && (neigh_node != NULL)) { - addr_to_string(neigh_str, neigh_node->addr); bat_dbg(DBG_ROUTES, - "Adding route towards: %s (via %s)\n", - orig_str, neigh_str); + "Adding route towards: %pM (via %pM)\n", + orig_node->orig, neigh_node->addr); hna_global_add_orig(orig_node, hna_buff, hna_buff_len); /* route changed */ } else { - addr_to_string(neigh_str, neigh_node->addr); - addr_to_string(router_str, orig_node->router->addr); - bat_dbg(DBG_ROUTES, "Changing route towards: %s (now via %s - was via %s)\n", orig_str, neigh_str, router_str); + bat_dbg(DBG_ROUTES, "Changing route towards: %pM (now via %pM - was via %pM)\n", orig_node->orig, neigh_node->addr, orig_node->router->addr); } if (neigh_node != NULL) @@ -138,12 +130,8 @@ struct batman_if *if_incoming) { struct neigh_node *neigh_node = NULL, *tmp_neigh_node = NULL; - char orig_str[ETH_STR_LEN], neigh_str[ETH_STR_LEN]; unsigned char total_count; - addr_to_string(orig_str, orig_node->orig); - addr_to_string(neigh_str, orig_neigh_node->orig); - if (orig_node == orig_neigh_node) { list_for_each_entry(tmp_neigh_node, &orig_node->neigh_list, @@ -227,8 +215,8 @@ orig_neigh_node->tq_asym_penalty) / (TQ_MAX_VALUE * TQ_MAX_VALUE)); - bat_dbg(DBG_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, + bat_dbg(DBG_BATMAN, "bidirectional: orig = %-15pM neigh = %-15pM => own_bcast = %2i, real recv = %2i, local tq: %3i, asym_penalty: %3i, total tq: %3i \n", + orig_node->orig, orig_neigh_node->orig, total_count, neigh_node->real_packet_count, orig_neigh_node->tq_own, orig_neigh_node->tq_asym_penalty, batman_packet->tq); @@ -372,8 +360,6 @@ { struct batman_if *batman_if; struct orig_node *orig_neigh_node, *orig_node; - char orig_str[ETH_STR_LEN], prev_sender_str[ETH_STR_LEN]; - char neigh_str[ETH_STR_LEN]; char has_directlink_flag; char is_my_addr = 0, is_my_orig = 0, is_my_oldorig = 0; char is_broadcast = 0, is_bidirectional, is_single_hop_neigh; @@ -398,20 +384,16 @@ /* could be changed by schedule_own_packet() */ if_incoming_seqno = atomic_read(&if_incoming->seqno); - addr_to_string(orig_str, batman_packet->orig); - addr_to_string(prev_sender_str, batman_packet->prev_sender); - addr_to_string(neigh_str, ethhdr->h_source); - has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0); is_single_hop_neigh = (compare_orig(ethhdr->h_source, batman_packet->orig) ? 1 : 0); - bat_dbg(DBG_BATMAN, "Received BATMAN packet via NB: %s, IF: %s [%s] (from OG: %s, via prev OG: %s, seqno %d, tq %d, TTL %d, V %d, IDF %d) \n", - neigh_str, if_incoming->dev, if_incoming->addr_str, - orig_str, prev_sender_str, batman_packet->seqno, - batman_packet->tq, batman_packet->ttl, batman_packet->version, - has_directlink_flag); + bat_dbg(DBG_BATMAN, "Received BATMAN packet via NB: %pM, IF: %s [%s] (from OG: %pM, via prev OG: %pM, seqno %d, tq %d, TTL %d, V %d, IDF %d) \n", + ethhdr->h_source, if_incoming->dev, if_incoming->addr_str, + batman_packet->orig, batman_packet->prev_sender, + batman_packet->seqno, batman_packet->tq, batman_packet->ttl, + batman_packet->version, has_directlink_flag); list_for_each_entry_rcu(batman_if, &if_list, list) { if (batman_if->if_active != IF_ACTIVE) @@ -442,13 +424,13 @@ if (is_my_addr) { bat_dbg(DBG_BATMAN, - "Drop packet: received my own broadcast (sender: %s)\n", - neigh_str); + "Drop packet: received my own broadcast (sender: %pM)\n", + ethhdr->h_source); return; } if (is_broadcast) { - bat_dbg(DBG_BATMAN, "Drop packet: ignoring all packets with broadcast source addr (sender: %s) \n", neigh_str); + bat_dbg(DBG_BATMAN, "Drop packet: ignoring all packets with broadcast source addr (sender: %pM) \n", ethhdr->h_source); return; } @@ -488,7 +470,7 @@ } if (is_my_oldorig) { - bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast echos (sender: %s) \n", neigh_str); + bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast echos (sender: %pM) \n", ethhdr->h_source); return; } @@ -506,7 +488,7 @@ !(compare_orig(batman_packet->orig, batman_packet->prev_sender)) && (compare_orig(orig_node->router->addr, orig_node->router->orig_node->router->addr))) { - bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %s) \n", neigh_str); + bat_dbg(DBG_BATMAN, "Drop packet: ignoring all rebroadcast packets that may make me loop (sender: %pM) \n", ethhdr->h_source); return; } @@ -659,7 +641,6 @@ static int recv_icmp_ttl_exceeded(struct sk_buff *skb) { - unsigned char src_str[ETH_STR_LEN], dst_str[ETH_STR_LEN]; struct orig_node *orig_node; struct icmp_packet *icmp_packet; struct ethhdr *ethhdr; @@ -670,11 +651,8 @@ icmp_packet = (struct icmp_packet *) skb->data; ethhdr = (struct ethhdr *) skb_mac_header(skb); - addr_to_string(src_str, icmp_packet->orig); - addr_to_string(dst_str, icmp_packet->dst); + printk(KERN_WARNING "batman-adv:Warning - can't send packet from %pM to %pM: ttl exceeded\n", icmp_packet->orig, icmp_packet->dst); - printk(KERN_WARNING "batman-adv:Warning - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str); - /* send TTL exceeded if packet is an echo request (traceroute) */ if (icmp_packet->msg_type != ECHO_REQUEST) return NET_RX_DROP; @@ -793,7 +771,6 @@ int recv_unicast_packet(struct sk_buff *skb) { struct unicast_packet *unicast_packet; - unsigned char src_str[ETH_STR_LEN], dst_str[ETH_STR_LEN]; struct orig_node *orig_node; struct ethhdr *ethhdr; struct batman_if *batman_if; @@ -831,10 +808,7 @@ /* TTL exceeded */ if (unicast_packet->ttl < 2) { - addr_to_string(src_str, ethhdr->h_source); - addr_to_string(dst_str, ethhdr->h_dest); - - printk(KERN_WARNING "batman-adv:Warning - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str); + printk(KERN_WARNING "batman-adv:Warning - can't send packet from %pM to %pM: ttl exceeded\n", ethhdr->h_source, unicast_packet->dest); return NET_RX_DROP; } @@ -984,5 +958,3 @@ } return ret; } - - Index: compat.h =================================================================== --- compat.h (revision 1524) +++ compat.h (working copy) @@ -73,3 +73,8 @@ ret; \ }) #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25) */ + +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) +asmlinkage int bat_printk(const char *fmt, ...); +#define printk bat_printk +#endif

3 3

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N