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.] Getting batman into staging
by Andrew Lunn 26 Aug '09

26 Aug '09

Hi Greg CC: to the batman list should now work for you. Your email address has been listed as O.K. to accept. There is an ongoing discussion about an open list and fighting SPAM etc. > But first off, what is keeping this code from being added to the "main" > portion of the kernel tree? Have you submitted it for inclusion there > already? If so, what was the response? If not, why not? I'm reasonably new to the project so don't know the history too well. I get the impression the code has not been sent to lkml or linux-net list. There seems to be a perception within the developers that getting code into mainline is difficult, so why bother when it has been going O.K. out of mainline. I think you saying it could go into staging right now has taken quite a few people by surprise. Is staging the right way to do this? Is posting to say linux-net better for this sort of code? > Sound good? If so, send me some patches! Assuming we do go via staging, do you want one jumbo patch, 6500 lines of code, or should i break it up into smaller chunks? Thanks Andrew

2 1

[B.A.T.M.A.N.] Reply from Greg KH
by Andrew Lunn 26 Aug '09

26 Aug '09

and here is the reply... Andrew ---------------------------------------------------------------------- On Tue, Aug 25, 2009 at 10:05:30PM +0200, Andrew Lunn wrote: > Hi Greg > > I've decided to take on the challenge of getting batman-advanced into > mainline. This is a challenge since as to date all i've had committed > to mainline are a few USB querks for devices i happen to have. > > B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a > routing protocol for multi-hop ad-hoc mesh networks. It can be used > over wireless and wired links. Batman is used for example in Berlin to > provide their "Freifunknetzes", free wireless network, and in many > other cities. > > The project website can be found at: > > http://www.open-mesh.org/ > > My first question would be is this something that can go into staging? > It is not a device driver or a filesystem which seems to be the major > usage for staging. If it is "self-contained" then we can add it to the staging tree. > The only exception i found to this is the openPOWERLINK protocol > stack. Heh, bad example, that code is getting ripped out for the 2.6.32 release as there has been no support from the developers to get this code into mergable shape :) > Batman layers on top of the wireless and wired network devices, > exporting a virtual network device for accessing the resulting mesh. > The nice thing about batman is that it is completely contained. It > does not need any patches anywhere else, which does fit with the > staging model. Good. But first off, what is keeping this code from being added to the "main" portion of the kernel tree? Have you submitted it for inclusion there already? If so, what was the response? If not, why not? > > The source code is currently in a subversion repository: > > http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland/ > > I also have a list of things which i think need doing: > > Finish stripping out debug_log. > > Make batctl, the user space configuration tool, standalone. > > Maybe make batctl _The_ tool for configuration and status and > depreciate direct /proc access, so that we can restructure it without > too much pain for users. > > Take out the dot_draw/josm formatting in /proc/net/batman-adv/vis and > put it into userspace as part of batctl. > > Think if /proc/net/batman-adv should be renamed /proc/net/bat0 giving > the option of /proc/net/bat1 etc in the future? > > Should /proc/net/batman-adv/interface be replaced with an IOCTL interface > similar to brctl? > > Maybe move orig_interval, aggregate_ogm and write half of vis to > /sys/class/batman/bat0/? > > Investigate if there is a generic linux hash algorithm which should be used? > > Strip out all backward compatibility support to older kernels. > > Make use of printk %pM support. > > The code is however sparse clean and checkpatch only complains about a > few lines being longer than 80 characters. Most of these are printk > like statements. > > My second question would be when is the right time to get into > staging? Hm, based on the above, right now :) > Should i work on all these issues first? Or can it go into staging > with some of these issues in a TODO file, to be joined by new issues > as the code is reviewed by more experts? Yes, it can go in right now, with that TODO file, and we, and you, can work on it there. Sound good? If so, send me some patches! thanks, greg k-h

1 0

[B.A.T.M.A.N.] Getting batman into staging
by Andrew Lunn 26 Aug '09

26 Aug '09

Hi Folks Here is the email i sent to Greg KH about getting into staging Andrew ---------------------------------------------------------------------- > Hi Greg > > I've decided to take on the challenge of getting batman-advanced into > mainline. This is a challenge since as to date all i've had committed > to mainline are a few USB querks for devices i happen to have. > > B.A.T.M.A.N. (better approach to mobile ad-hoc networking) is a > routing protocol for multi-hop ad-hoc mesh networks. It can be used > over wireless and wired links. Batman is used for example in Berlin to > provide their "Freifunknetzes", free wireless network, and in many > other cities. > > The project website can be found at: > > http://www.open-mesh.org/ > > My first question would be is this something that can go into > staging? It is not a device driver or a filesystem which seems to > be the major usage for staging. The only exception i found to this > is the openPOWERLINK protocol stack. Batman layers on top of the > wireless and wired network devices, exporting a virtual network > device for accessing the resulting mesh. The nice thing about > batman is that it is completely contained. It does not need any > patches anywhere else, which does fit with the staging model. > > The source code is currently in a subversion repository: > > http://downloads.open-mesh.net/svn/batman/trunk/batman-adv-kernelland/ > > I also have a list of things which i think need doing: > > Finish stripping out debug_log. > > Make batctl, the user space configuration tool, standalone. > > Maybe make batctl _The_ tool for configuration and status and > depreciate direct /proc access, so that we can restructure it without > too much pain for users. > > Take out the dot_draw/josm formatting in /proc/net/batman-adv/vis and > put it into userspace as part of batctl. > > Think if /proc/net/batman-adv should be renamed /proc/net/bat0 giving > the option of /proc/net/bat1 etc in the future? > > Should /proc/net/batman-adv/interface be replaced with an IOCTL interface > similar to brctl? > > Maybe move orig_interval, aggregate_ogm and write half of vis to > /sys/class/batman/bat0/? > > Investigate if there is a generic linux hash algorithm which should be used? > > Strip out all backward compatibility support to older kernels. > > Make use of printk %pM support. > > The code is however sparse clean and checkpatch only complains about a > few lines being longer than 80 characters. Most of these are printk > like statements. > > My second question would be when is the right time to get into > staging? > > Should i work on all these issues first? Or can it go into staging > with some of these issues in a TODO file, to be joined by new issues > as the code is reviewed by more experts?

1 0

[B.A.T.M.A.N.] [batman-adv] Use prinkt instead of debug_log
by Andrew Lunn 24 Aug '09

24 Aug '09

If batman is to get into mainline, the use of debug_log will need to be removed. This is a first step in this direction. It replaces debug_log calls for CRITICAL, WARNING and NOTICE with printk calls. It tries to consistently prefix all such output with "batman:" making it easier to find such output mixed in with other kernel messages. LOG_TYPE_BATMAN and LOG_TYPE_ROUTES has not been changed. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Index: batman-adv-kernelland/vis.c =================================================================== --- batman-adv-kernelland/vis.c (revision 1411) +++ batman-adv-kernelland/vis.c (working copy) @@ -440,8 +440,8 @@ int packet_length; if (info->packet.ttl < 2) { - debug_log(LOG_TYPE_NOTICE, - "Error - can't send vis packet: ttl exceeded\n"); + printk(KERN_DEBUG + "batman: Can't send vis packet: ttl exceeded\n"); return; } @@ -490,13 +490,13 @@ vis_hash = hash_new(256, vis_info_cmp, vis_info_choose); if (!vis_hash) { - debug_log(LOG_TYPE_CRIT, "Can't initialize vis_hash\n"); + printk(KERN_ERR "batman: Can't initialize vis_hash\n"); goto err; } my_vis_info = kmalloc(1000, GFP_KERNEL); if (!my_vis_info) { - debug_log(LOG_TYPE_CRIT, "Can't initialize vis packet\n"); + printk(KERN_ERR "batman: Can't initialize vis packet\n"); goto err; } @@ -517,8 +517,8 @@ 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"); + printk(KERN_ERR + "batman: Can't add own vis packet into hash\n"); free_info(my_vis_info); /* not in hash, need to remove it * manually. */ goto err; Index: batman-adv-kernelland/translation-table.c =================================================================== --- batman-adv-kernelland/translation-table.c (revision 1411) +++ batman-adv-kernelland/translation-table.c (working copy) @@ -111,7 +111,7 @@ hna_local_hash->size * 2); if (swaphash == NULL) - debug_log(LOG_TYPE_CRIT, "Couldn't resize local hna hash table \n"); + printk(KERN_ERR "batman: Couldn't resize local hna hash table \n"); else hna_local_hash = swaphash; } @@ -331,7 +331,7 @@ hna_global_hash->size * 2); if (swaphash == NULL) - debug_log(LOG_TYPE_CRIT, "Couldn't resize global hna hash table \n"); + printk(KERN_ERR "batman: Couldn't resize global hna hash table \n"); else hna_global_hash = swaphash; } Index: batman-adv-kernelland/send.c =================================================================== --- batman-adv-kernelland/send.c (revision 1411) +++ batman-adv-kernelland/send.c (working copy) @@ -70,8 +70,8 @@ return; if (!(batman_if->net_dev->flags & IFF_UP)) { - debug_log(LOG_TYPE_WARN, - "Interface %s is not up - can't send packet via that interface !\n", batman_if->dev); + printk(KERN_WARNING + "batman: Interface %s is not up - can't send packet via that interface !\n", batman_if->dev); batman_if->if_active = IF_TO_BE_DEACTIVATED; return; } @@ -99,7 +99,7 @@ * (which is > 0). This will not be treated as an error. */ retval = dev_queue_xmit(skb); if (retval < 0) { - debug_log(LOG_TYPE_CRIT, "Can't write to raw socket: %i\n", + printk(KERN_WARNING "batman: Can't write to raw socket: %i\n", retval); batman_if->if_active = IF_TO_BE_DEACTIVATED; } @@ -171,8 +171,8 @@ unsigned char directlink = (batman_packet->flags & DIRECTLINK ? 1 : 0); if (!forw_packet->if_incoming) { - debug_log(LOG_TYPE_CRIT, - "Error - can't forward packet: incoming iface not specified\n"); + printk(KERN_ERR + "batman: Can't forward packet: incoming iface not specified\n"); return; } Index: batman-adv-kernelland/device.c =================================================================== --- batman-adv-kernelland/device.c (revision 1411) +++ batman-adv-kernelland/device.c (working copy) @@ -60,7 +60,7 @@ /* register our device - kernel assigns a free major number */ tmp_major = register_chrdev(0, DRIVER_DEVICE, &fops); if (tmp_major < 0) { - debug_log(LOG_TYPE_WARN, "Registering the character device failed with %d\n", + printk(KERN_ERR "batman: Registering the character device failed with %d\n", tmp_major); return 0; } @@ -68,14 +68,14 @@ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 0) if (devfs_mk_cdev(MKDEV(tmp_major, 0), S_IFCHR | S_IRUGO | S_IWUGO, "batman-adv", 0)) { - debug_log(LOG_TYPE_WARN, "Could not create /dev/batman-adv\n"); + printk(KERN_ERR "batman: Could not create /dev/batman-adv\n"); return 0; } #else batman_class = class_create(THIS_MODULE, "batman-adv"); if (IS_ERR(batman_class)) { - debug_log(LOG_TYPE_WARN, "Could not register class 'batman-adv' \n"); + printk(KERN_ERR "batman: Could not register class 'batman-adv' \n"); return 0; } @@ -109,7 +109,7 @@ #endif if (result < 0) - debug_log(LOG_TYPE_WARN, "Unregistering the character device failed with %d\n", result); + printk(KERN_ERR "batman: Unregistering the character device failed with %d\n", result); Major = 0; } @@ -132,7 +132,7 @@ } if (device_client_hash[i] != device_client) { - debug_log(LOG_TYPE_WARN, "Error - can't add another packet client: maximum number of clients reached \n"); + printk(KERN_INFO "batman: Can't add another packet client: maximum number of clients reached \n"); kfree(device_client); return -EXFULL; } @@ -229,7 +229,7 @@ struct batman_if *batman_if; if (len < sizeof(struct icmp_packet)) { - debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: invalid packet size\n"); + printk(KERN_DEBUG "batman: Can't send packet from char device: invalid packet size\n"); return -EINVAL; } @@ -240,12 +240,12 @@ return -EFAULT; if (icmp_packet.packet_type != BAT_ICMP) { - debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); + printk(KERN_DEBUG "batman: Can't send packet from char device: got bogus packet type (expected: BAT_ICMP)\n"); return -EINVAL; } if (icmp_packet.msg_type != ECHO_REQUEST) { - debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); + printk(KERN_DEBUG "batman: Can't send packet from char device: got bogus message type (expected: ECHO_REQUEST)\n"); return -EINVAL; } Index: batman-adv-kernelland/proc.c =================================================================== --- batman-adv-kernelland/proc.c (revision 1411) +++ batman-adv-kernelland/proc.c (working copy) @@ -74,8 +74,8 @@ return -ENOMEM; if (count > IFNAMSIZ - 1) { - debug_log(LOG_TYPE_WARN, - "Can't add interface: device name is too long\n"); + printk(KERN_WARNING + "batman: Can't add interface: device name is too long\n"); goto end; } @@ -102,7 +102,7 @@ rcu_read_lock(); list_for_each_entry_rcu(batman_if, &if_list, list) { if (strncmp(batman_if->dev, if_string, count) == 0) { - debug_log(LOG_TYPE_WARN, "Given interface is already active: %s\n", if_string); + printk(KERN_WARNING "batman: Given interface is already active: %s\n", if_string); rcu_read_unlock(); goto end; @@ -158,19 +158,19 @@ retval = strict_strtol(interval_string, 10, &originator_interval_tmp); if (retval) { - debug_log(LOG_TYPE_WARN, "New originator interval invalid\n"); + printk(KERN_WARNING "batman: New originator interval invalid\n"); goto end; } if (originator_interval_tmp <= JITTER * 2) { - debug_log(LOG_TYPE_WARN, - "New originator interval too small: %i (min: %i)\n", + printk(KERN_WARNING + "batman: New originator interval too small: %li (min: %i)\n", originator_interval_tmp, JITTER * 2); goto end; } - debug_log(LOG_TYPE_NOTICE, - "Changing originator interval from: %i to: %i\n", + printk(KERN_INFO + "batman: Changing originator interval from: %i to: %li\n", atomic_read(&originator_interval), originator_interval_tmp); atomic_set(&originator_interval, originator_interval_tmp); @@ -262,14 +262,7 @@ static int proc_log_level_read(struct seq_file *seq, void *offset) { - seq_printf(seq, "[x] %s (%d)\n", LOG_TYPE_CRIT_NAME, LOG_TYPE_CRIT); seq_printf(seq, "[%c] %s (%d)\n", - (LOG_TYPE_WARN & log_level) ? 'x' : ' ', - LOG_TYPE_WARN_NAME, LOG_TYPE_WARN); - seq_printf(seq, "[%c] %s (%d)\n", - (LOG_TYPE_NOTICE & log_level) ? 'x' : ' ', - LOG_TYPE_NOTICE_NAME, LOG_TYPE_NOTICE); - seq_printf(seq, "[%c] %s (%d)\n", (LOG_TYPE_BATMAN & log_level) ? 'x' : ' ', LOG_TYPE_BATMAN_NAME, LOG_TYPE_BATMAN); seq_printf(seq, "[%c] %s (%d)\n", @@ -315,10 +308,6 @@ case '\t': *cp = 0; /* compare */ - if (strcmp(tokptr, LOG_TYPE_WARN_NAME) == 0) - log_level_tmp |= LOG_TYPE_WARN; - if (strcmp(tokptr, LOG_TYPE_NOTICE_NAME) == 0) - log_level_tmp |= LOG_TYPE_NOTICE; if (strcmp(tokptr, LOG_TYPE_BATMAN_NAME) == 0) log_level_tmp |= LOG_TYPE_BATMAN; if (strcmp(tokptr, LOG_TYPE_ROUTES_NAME) == 0) @@ -331,7 +320,7 @@ } } - debug_log(LOG_TYPE_CRIT, "Changing log_level from: %i to: %i\n", + printk(KERN_INFO "batman: Changing log_level from: %i to: %i\n", log_level, log_level_tmp); log_level = log_level_tmp; @@ -503,14 +492,14 @@ vis_mode_string[count - not_copied - 1] = 0; if (strcmp(vis_mode_string, "client") == 0) { - debug_log(LOG_TYPE_NOTICE, "Setting VIS mode to client\n"); + printk(KERN_INFO "batman: Setting VIS mode to client\n"); vis_set_mode(VIS_TYPE_CLIENT_UPDATE); } else if (strcmp(vis_mode_string, "server") == 0) { - debug_log(LOG_TYPE_NOTICE, "Setting VIS mode to server\n"); + printk(KERN_INFO "batman: Setting VIS mode to server\n"); vis_set_mode(VIS_TYPE_SERVER_SYNC); } else - debug_log(LOG_TYPE_WARN, "Unknown VIS mode: %s\n", - vis_mode_string); + printk(KERN_WARNING "batman: Unknown VIS mode: %s\n", + vis_mode_string); kfree(vis_mode_string); return count; @@ -555,15 +544,15 @@ vis_format_string[count - not_copied - 1] = 0; if (strcmp(vis_format_string, VIS_FORMAT_DD_NAME) == 0) { - debug_log(LOG_TYPE_NOTICE, "Setting VIS output format to: %s\n", + printk(KERN_INFO "batman: Setting VIS output format to: %s\n", VIS_FORMAT_DD_NAME); vis_format = DOT_DRAW; } else if (strcmp(vis_format_string, VIS_FORMAT_JSON_NAME) == 0) { - debug_log(LOG_TYPE_NOTICE, "Setting VIS output format to: %s\n", + printk(KERN_INFO "batman: Setting VIS output format to: %s\n", VIS_FORMAT_JSON_NAME); vis_format = JSON; } else - debug_log(LOG_TYPE_WARN, "Unknown VIS output format: %s\n", + printk(KERN_WARNING "batman: Unknown VIS output format: %s\n", vis_format_string); kfree(vis_format_string); @@ -595,11 +584,11 @@ strict_strtol(aggr_string, 10, &aggregation_enabled_tmp); if ((aggregation_enabled_tmp != 0) && (aggregation_enabled_tmp != 1)) { - debug_log(LOG_TYPE_WARN, "Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp); + printk(KERN_WARNING "batman: Aggregation can only be enabled (1) or disabled (0), given value: %li\n", aggregation_enabled_tmp); goto end; } - debug_log(LOG_TYPE_NOTICE, "Changing aggregation from: %s (%i) to: %s (%li)\n", + printk(KERN_INFO "batman: Changing aggregation from: %s (%i) to: %s (%li)\n", (atomic_read(&aggregation_enabled) == 1 ? "enabled" : "disabled"), atomic_read(&aggregation_enabled), @@ -754,7 +743,7 @@ #endif if (!proc_batman_dir) { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s' folder failed\n", PROC_ROOT_DIR); + printk(KERN_ERR "batman: Registering the '/proc/net/%s' folder failed\n", PROC_ROOT_DIR); return -EFAULT; } @@ -764,7 +753,7 @@ if (proc_interface_file) { proc_interface_file->proc_fops = &proc_interfaces_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_INTERFACES); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_INTERFACES); cleanup_procfs(); return -EFAULT; } @@ -775,7 +764,7 @@ if (proc_orig_interval_file) { proc_orig_interval_file->proc_fops = &proc_orig_interval_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_ORIG_INTERVAL); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_ORIG_INTERVAL); cleanup_procfs(); return -EFAULT; } @@ -786,7 +775,7 @@ if (proc_log_level_file) { proc_log_level_file->proc_fops = &proc_log_level_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_LOG_LEVEL); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_LOG_LEVEL); cleanup_procfs(); return -EFAULT; } @@ -796,7 +785,7 @@ if (proc_originators_file) { proc_originators_file->proc_fops = &proc_originators_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_ORIGINATORS); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_ORIGINATORS); cleanup_procfs(); return -EFAULT; } @@ -806,7 +795,7 @@ if (proc_log_file) { proc_log_file->proc_fops = &proc_log_operations; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_FILE_LOG, PROC_FILE_GATEWAYS); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_FILE_LOG, PROC_FILE_GATEWAYS); cleanup_procfs(); return -EFAULT; } @@ -816,7 +805,7 @@ if (proc_transt_local_file) { proc_transt_local_file->proc_fops = &proc_transt_local_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_LOCAL); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_LOCAL); cleanup_procfs(); return -EFAULT; } @@ -826,7 +815,7 @@ if (proc_transt_global_file) { proc_transt_global_file->proc_fops = &proc_transt_global_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_GLOBAL); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_TRANST_GLOBAL); cleanup_procfs(); return -EFAULT; } @@ -836,7 +825,7 @@ if (proc_vis_file) { proc_vis_file->proc_fops = &proc_vis_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS); cleanup_procfs(); return -EFAULT; } @@ -847,7 +836,7 @@ if (proc_vis_format_file) { proc_vis_format_file->proc_fops = &proc_vis_format_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_FORMAT); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_FORMAT); cleanup_procfs(); return -EFAULT; } @@ -857,7 +846,7 @@ if (proc_aggr_file) { proc_aggr_file->proc_fops = &proc_aggr_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_AGGR); + printk(KERN_ERR "batman: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_AGGR); cleanup_procfs(); return -EFAULT; } Index: batman-adv-kernelland/soft-interface.c =================================================================== --- batman-adv-kernelland/soft-interface.c (revision 1411) +++ batman-adv-kernelland/soft-interface.c (working copy) @@ -212,7 +212,7 @@ * dropping */ if (!spin_trylock(&orig_hash_lock)) { lock_dropped++; - debug_log(LOG_TYPE_NOTICE, "%d packets dropped because lock was hold\n", lock_dropped); + printk(KERN_DEBUG "batman: %d packets dropped because lock was hold\n", lock_dropped); goto dropped; } Index: batman-adv-kernelland/hard-interface.c =================================================================== --- batman-adv-kernelland/hard-interface.c (revision 1411) +++ batman-adv-kernelland/hard-interface.c (working copy) @@ -119,7 +119,7 @@ batman_if->if_active = IF_INACTIVE; active_ifs--; - debug_log(LOG_TYPE_NOTICE, "Interface deactivated: %s\n", + printk(KERN_INFO "batman: Interface deactivated: %s\n", batman_if->dev); } @@ -142,8 +142,8 @@ &batman_if->raw_sock); if (retval < 0) { - debug_log(LOG_TYPE_WARN, "Can't create raw socket: %i\n", - retval); + printk(KERN_ERR "batman: Can't create raw socket: %i\n", + retval); goto error; } @@ -155,8 +155,8 @@ (struct sockaddr *)&bind_addr, sizeof(bind_addr)); if (retval < 0) { - debug_log(LOG_TYPE_WARN, "Can't create bind raw socket: %i\n", - retval); + printk(KERN_ERR "batman: Can't create bind raw socket: %i\n", + retval); goto error; } @@ -225,7 +225,7 @@ data_ptr = kmalloc((if_num + 1) * sizeof(TYPE_OF_WORD) * NUM_WORDS, GFP_ATOMIC); if (!data_ptr) { - debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n"); + printk(KERN_WARNING "batman: Can't resize orig: out of memory\n"); return -1; } @@ -236,7 +236,7 @@ data_ptr = kmalloc((if_num + 1) * sizeof(uint8_t), GFP_ATOMIC); if (!data_ptr) { - debug_log(LOG_TYPE_WARN, "Can't resize orig: out of memory\n"); + printk(KERN_WARNING "batman: Can't resize orig: out of memory\n"); return -1; } @@ -259,7 +259,7 @@ batman_if = kmalloc(sizeof(struct batman_if), GFP_KERNEL); if (!batman_if) { - debug_log(LOG_TYPE_WARN, "Can't add interface (%s): out of memory\n", dev); + printk(KERN_WARNING "batman: Can't add interface (%s): out of memory\n", dev); return -1; } @@ -274,7 +274,7 @@ batman_if->packet_buff = kmalloc(batman_if->packet_len, GFP_KERNEL); if (!batman_if->packet_buff) { - debug_log(LOG_TYPE_WARN, "Can't add interface packet (%s): out of memory\n", dev); + printk(KERN_WARNING "batman: Can't add interface packet (%s): out of memory\n", dev); goto out; } @@ -283,7 +283,7 @@ batman_if->if_active = IF_INACTIVE; INIT_RCU_HEAD(&batman_if->rcu); - debug_log(LOG_TYPE_NOTICE, "Adding interface: %s\n", dev); + printk(KERN_INFO "batman: Adding interface: %s\n", dev); avail_ifs++; INIT_LIST_HEAD(&batman_if->list); @@ -324,7 +324,7 @@ spin_unlock(&orig_hash_lock); if (!hardif_is_interface_up(batman_if->dev)) - debug_log(LOG_TYPE_WARN, "Not using interface %s (retrying later): interface not active\n", batman_if->dev); + printk(KERN_WARNING "batman: Not using interface %s (retrying later): interface not active\n", batman_if->dev); list_add_tail_rcu(&batman_if->list, &if_list); Index: batman-adv-kernelland/log.c =================================================================== --- batman-adv-kernelland/log.c (revision 1411) +++ batman-adv-kernelland/log.c (working copy) @@ -80,17 +80,9 @@ int retval = 0; char tmp_log_buf[256]; - /* only critical information get into the official kernel log */ - if (type == LOG_TYPE_CRIT) { + if (log_level & type) { va_start(args, fmt); vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); - printk(KERN_ERR "batman-adv: %s", tmp_log_buf); - va_end(args); - } - - if ((type == LOG_TYPE_CRIT) || (log_level & type)) { - va_start(args, fmt); - vscnprintf(tmp_log_buf, sizeof(tmp_log_buf), fmt, args); fdebug_log("[%10u] %s", (jiffies / HZ), tmp_log_buf); va_end(args); } Index: batman-adv-kernelland/main.c =================================================================== --- batman-adv-kernelland/main.c (revision 1411) +++ batman-adv-kernelland/main.c (working copy) @@ -88,20 +88,20 @@ interface_setup); if (!soft_device) { - debug_log(LOG_TYPE_CRIT, "Unable to allocate the batman interface\n"); + printk(KERN_ERR "batman: Unable to allocate the batman interface\n"); goto end; } retval = register_netdev(soft_device); if (retval < 0) { - debug_log(LOG_TYPE_CRIT, "Unable to register the batman interface: %i\n", retval); + printk(KERN_ERR "batman: Unable to register the batman interface: %i\n", retval); goto free_soft_device; } start_hardif_check_timer(); - debug_log(LOG_TYPE_CRIT, "B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded \n", + printk(KERN_INFO "B.A.T.M.A.N. advanced %s%s (compatibility version %i) loaded \n", SOURCE_VERSION, REVISION_VERSION_STR, COMPAT_VERSION); return 0; @@ -154,7 +154,7 @@ kthread_task = kthread_run(packet_recv_thread, NULL, "batman-adv"); if (IS_ERR(kthread_task)) { - debug_log(LOG_TYPE_CRIT, "Unable to start packet receive thread\n"); + printk(KERN_ERR "batman: Unable to start packet receive thread\n"); kthread_task = NULL; } } @@ -163,7 +163,7 @@ goto end; err: - debug_log(LOG_TYPE_CRIT, "Unable to allocate memory for mesh information structures: out of mem ?\n"); + printk(KERN_ERR "batman: Unable to allocate memory for mesh information structures: out of mem ?\n"); shutdown_module(); end: return; Index: batman-adv-kernelland/routing.c =================================================================== --- batman-adv-kernelland/routing.c (revision 1411) +++ batman-adv-kernelland/routing.c (working copy) @@ -156,7 +156,7 @@ swaphash = hash_resize(orig_hash, orig_hash->size * 2); if (swaphash == NULL) - debug_log(LOG_TYPE_CRIT, "Couldn't resize orig hash table \n"); + printk(KERN_WARNING "batman: Couldn't resize orig hash table \n"); else orig_hash = swaphash; } @@ -617,7 +617,7 @@ atomic_set(&exit_cond, 0); packet_buff = kmalloc(PACKBUFF_SIZE, GFP_KERNEL); if (!packet_buff) { - debug_log(LOG_TYPE_CRIT, "Could allocate memory for the packet buffer. :(\n"); + printk(KERN_ERR "batman: Couldn't allocate memory for the packet buffer. :(\n"); return -1; } @@ -640,8 +640,8 @@ while (1) { if (batman_if->if_active != IF_ACTIVE) { if (batman_if->if_active != IF_TO_BE_ACTIVATED) - debug_log(LOG_TYPE_NOTICE, - "Could not read from deactivated interface %s!\n", + printk(KERN_DEBUG + "batman: Could not read from deactivated interface %s!\n", batman_if->dev); if (batman_if->raw_sock) @@ -748,7 +748,7 @@ addr_to_string(src_str, icmp_packet->orig); addr_to_string(dst_str, icmp_packet->dst); - debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str); + printk(KERN_DEBUG "batman: 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) @@ -829,7 +829,7 @@ addr_to_string(src_str, ((struct ethhdr *)(unicast_packet + 1))->h_source); addr_to_string(dst_str, unicast_packet->dest); - debug_log(LOG_TYPE_NOTICE, "Error - can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str); + printk(KERN_DEBUG "batman: Can't send packet from %s to %s: ttl exceeded\n", src_str, dst_str); continue; } @@ -942,8 +942,9 @@ } - if ((result < 0) && (result != -EAGAIN)) - debug_log(LOG_TYPE_CRIT, "Could not receive packet from interface %s: %i\n", batman_if->dev, result); + if ((result < 0) && (result != -EAGAIN) && + printk_ratelimit()) + printk(KERN_WARNING "batman: Could not receive packet from interface %s: %i\n", batman_if->dev, result); /* lock for the next iteration */ rcu_read_lock(); Index: batman-adv-kernelland/main.h =================================================================== --- batman-adv-kernelland/main.h (revision 1411) +++ batman-adv-kernelland/main.h (working copy) @@ -66,19 +66,9 @@ * Logging */ -#define LOG_TYPE_CRIT 0 /* highest priority for fatal errors such as - * blocked sockets / failed packet delivery / - * programming errors */ -#define LOG_TYPE_WARN 1 /* warnings for small errors like wrong user - * input / damaged packets / etc */ -#define LOG_TYPE_NOTICE 2 /* notice information for new interfaces / - * changed settings / new originators / etc */ #define LOG_TYPE_BATMAN 4 /* all messages related to routing / flooding / * broadcasting / etc */ #define LOG_TYPE_ROUTES 8 /* route or hna added / changed / deleted */ -#define LOG_TYPE_CRIT_NAME "critical" -#define LOG_TYPE_WARN_NAME "warnings" -#define LOG_TYPE_NOTICE_NAME "notices" #define LOG_TYPE_BATMAN_NAME "batman" #define LOG_TYPE_ROUTES_NAME "routes"

2 5

[B.A.T.M.A.N.] tcpdump patch for batman-adv
by Andrew Lunn 19 Aug '09

19 Aug '09

Hi Folks Attached is a patch for tcpdump which adds support for dissecting batman-adv messages. This patch is against: git://github.com/mcr/tcpdump.git It would be great if a few users could test it before i submit the patch upstream. Thanks Andrew

2 2

[B.A.T.M.A.N.] batman-adv applying for an official Ethertype?
by Andrew Lunn 18 Aug '09

18 Aug '09

Hi Folks Has anybody investigated the process for applying for an approved Ethertype as needed by batman advanced? I found a few relevant documents: http://standards.ieee.org/regauth/ http://standards.ieee.org/regauth/ethertype/type-tut.html http://standards.ieee.org/regauth/faqs.html#q15 Not cheap :-( Andrew

3 3

[B.A.T.M.A.N.] batman-adv packet.h license
by Andrew Lunn 18 Aug '09

18 Aug '09

Hi Marek, Simon I'm writing a protocol dissector for tcpdump which understands batman-adv packets. To do this i need to use packet.h, at least that is the easiest way to do it. tcpdump uses the BSD license, where as packet.h is GPL2. So it is unlikely the tcpdump maintainers would accept packet.h as is. As the two copyright owners of this file, is it O.K. with you to if i change the license on this one file in my tcpdump patch to use BSD? Thanks Andrew

4 5

[B.A.T.M.A.N.] batman goes looping...
by Andrew Lunn 13 Aug '09

13 Aug '09

Hi Marek I finally had time to dig into our problems with loops in our chain. Some background for the list. Yang and I have been using User Mode Linux (UML) to build a test network for batman advanced. We connect a number of uml machines together using a modified version of uml_switch. The modifications allow us to change the packet drop probability between any two nodes. We have been testing using simple chains as shown in the attached gif. The black lines show the currently used links. The red lines are other links which are currently not used by batman. The black links have a packet drop probablilty of 0% and the red of 20%. Our test was to remove uml5 from the network and see how long batman-adv took to re-route around it. We ping from uml4 to uml6 and from uml1 to uml9. We found that uml4->uml6 would recover in around 14 seconds. However uml1->uml9 took much longer, 65 seconds. Looking at the routing, we found it went into loops. When sending from uml1 to uml9, uml1 routes to uml2, uml2 routes back to uml1. Here are the logs from uml2. I've cut out most of the packets, just showing OGMs from uml9. There is a simple relationship between the MAC address and the uml number: fe:fe:00:00:01:01 - uml1 fe:fe:00:00:02:01 - uml2 fe:fe:00:00:03:01 - uml3 etc... [ 42949558] Received BATMAN packet via NB: fe:fe:00:00:03:01, IF: eth1 [fe:fe:00:00:02:01] (from OG: fe:fe:00:00:09:01, via old OG: fe:fe:00:00:04:01, seqno 146, tq 218, TTL 44, V 7, IDF 0) [ 42949558] bidirectional: orig = fe:fe:00:00:09:01 neigh = fe:fe:00:00:03:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 218 [ 42949558] update_originator(): Searching and updating originator entry of received packet [ 42949558] Updating existing last-hop neighbour of originator [ 42949558] Drop packet: duplicate packet received This has been received from uml3 origionally from uml4. The TQ is 218 to uml9 via uml3. [ 42949559] Received BATMAN packet via NB: fe:fe:00:00:01:01, IF: eth1 [fe:fe:00:00:02:01] (from OG: fe:fe:00:00:09:01, via old OG: fe:fe:00:00:03:01, seqno 146, tq 209, TTL 42, V 7, IDF 0) [ 42949559] bidirectional: orig = fe:fe:00:00:09:01 neigh = fe:fe:00:00:01:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 209 [ 42949559] update_originator(): Searching and updating originator entry of received packet [ 42949559] Updating existing last-hop neighbour of originator [ 42949559] Drop packet: duplicate packet received This is where is starts to get interesting. This is from uml1, origionally from uml3. So it has jumped uml2, it used the 20% packet drop link which exists between uml1 and uml3. Because this is not an echo, uml2 processes it, and now knows that with a TQ of 209 it can get to uml9 via uml1. [ 42949559] Sending own packet (originator fe:fe:00:00:02:01, seqno 155, TQ 255, TTL 50, IDF off) on interface eth1 [fe:fe:00:00:02:01] [ 42949559] Forwarding aggregated packet (originator fe:fe:00:00:06:01, seqno 152, TQ 232, TTL 46, IDF off) on interface eth1 [fe:fe:00:00:02:01] [ 42949559] Forwarding aggregated packet (originator fe:fe:00:00:09:01, seqno 146, TQ 215, TTL 43, IDF off) on interface eth1 [fe:fe:00:00:02:01] [ 42949559] Forwarding packet (originator fe:fe:00:00:01:01, seqno 156, TQ 250, TTL 49, IDF on) on interface eth1 [fe:fe:00:00:02:01] [ 42949560] Received BATMAN packet via NB: fe:fe:00:00:03:01, IF: eth1 [fe:fe:00:00:02:01] (from OG: fe:fe:00:00:09:01, via old OG: fe:fe:00:00:04:01, seqno 148, tq 150, TTL 45, V 7, IDF 0) [ 42949560] updating last_seqno: old 146, new 148 [ 42949560] bidirectional: orig = fe:fe:00:00:09:01 neigh = fe:fe:00:00:03:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 150 [ 42949560] update_originator(): Searching and updating originator entry of received packet [ 42949560] Updating existing last-hop neighbour of originator [ 42949560] Changing route towards: fe:fe:00:00:09:01 (now via fe:fe:00:00:01:01 - was via fe:fe:00:00:03:01) [ 42949560] Forwarding packet: rebroadcast originator packet [ 42949560] Forwarding packet: tq_orig: 150, tq_avg: 209, tq_forw: 204, ttl_orig: 44, ttl_forw: 255 Now things go none optimal :-( This is from uml3, origionally from uml4. The TQ value has dropped to 150. This will be when we have removed uml5, so the TQ naturally does drop. The TQ value via uml3 is now less than the TQ value via uml1. So it changes its route to go via uml1. Looking at the logs of uml1, uml1 is always routing to uml9 via uml2. The problem here i think is to do with the asymetric links algorithms. When sending out an OGM, the node uses the TQ for its best link to the originator, not the link the OGM came in on. If the OGM from uml1 origionally from UML3 reported the TQ via that route, the TQ would very likely be lower. uml2 would then not of choosen to swap to uml1. However, uml1 reports its best route, which is via uml2. uml2 does not know this, decides to use uml1, and we have a loop. Does this all hang together correctly? I'm i interpreting this all right... How would you suggest fix this? Thanks Andrew

4 17

[B.A.T.M.A.N.] inconsistent vis-output in batman-adv
by Linus Lüssing 12 Aug '09

12 Aug '09

Hi there, I'm having some trouble with the vis-output in batman-adv 0.2 beta - compatibility-version 7. It seems like the 'From' part gets substituted with the mac address of a node's primary interface, while the 'to' part does not. The result is, that when I try to convert the dot-files to png/svg/etc. with neato from the graphviz toolchain, I get two seperate graphs. Of course, the easiest way might be to substitue the 'to' part with the mac addresses of the primary interfaces as well, but I'd prefer something differently: http://www.graphviz.org/Gallery/directed/cluster.html Those subgraph things from the dot-file-format would be a great way, to have a more detailed image of how two batman-nodes are connected, over which interfaces they're connected with each other. I had a little look at the batman-adv source code and noticed that the structure vis_info_entry in vis.h does only have a dest and not a src entry. So the vis-server only gets to know, the node's primary mac address but a primary or secondary mac in dest so far, right? I'm also still trying to figure out, where such a src information could come from... dest gets that stuff from orig_node->orig and there is a list of interfaces in orig_node->batman_if and also a neighbour list in orig_nodes->router. What would have to be used for the src address? I'm also wondering, what those hashing functions are for exactly. Would I break some of that stuff by introducing a src address in the vis-packet? I'm not that much into reading the batman-adv source code yet, but I'd like to get a little more familiar with it. So please be considerate :). Cheers, Linus PS: I'm having a router with vlans here, so two seperate LAN-ports, which batman is using, are having the same mac-address. Could that cause any trouble?

1 0

Re: [B.A.T.M.A.N.] Routing help?
by Marek Lindner 06 Aug '09

06 Aug '09

Hi, >I have 3 linksys wrt54 flashed with openwrt 7.09, webif'ed and installed > BATMAN 0.2-rv478.1, all OK I think. not sure what web interface you installed but are you aware of the fact that revision 478 is more than 2 years old ? Your current problem seems unrelated to batman but if you experience trouble / bugs with batman it might be wise to upgrade to the latest stable release. >From the ssh prompt on .3 I can ping .2 with no loss and ping .1 with ~ 6% > loss. However, if I try to ping .1 from the pc connected on the ethernet > port of .3 I get no route to host. Putting wireshark on the ethernet ifc > shows the arp going out but nothing coming back. Interestingly enough if I > ssh into .3 and ping .1, with wireshark running on the ethernet of .3 Is > see the outgoing ICMP but not the reply (which is there because the ping > succeeds) . It seems as if the local host traffic is not truly bridged. You bridged the LAN & WLAN on every device but the devices are not bridged with each other, hence you mix bridges & routing. What IP address did you assign to your PC ? Does your PC have a route towards the .1 (probably not) ? You also have make sure that all nodes have a route towards your PC. You can achieve that using HNA. See: http://www.open-mesh.net/wiki/AnnouncingNetworks for a detailed explanation. Regards, Marek

4 15

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