commits December 2011

commits@lists.open-mesh.org

1 participants
80 discussions

batman-adv; branch, master, updated. v2011.4.0-50-g27fa916
by postmaster＠open-mesh.org 22 Dec '11

22 Dec '11

The following commit has been merged in the master branch: commit 27fa91679763b29d92374217845d422cfbb7ca8e Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Nov 28 17:40:17 2011 +0800 batman-adv: add infrastructure to change routing algorithm at runtime Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ring_buffer.h b/bat_algo.h similarity index 69% copy from ring_buffer.h copy to bat_algo.h index 7cdfe62..755379f 100644 --- a/ring_buffer.h +++ b/bat_algo.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2011 B.A.T.M.A.N. contributors: + * Copyright (C) 2011 B.A.T.M.A.N. contributors: * * Marek Lindner * @@ -19,10 +19,9 @@ * */ -#ifndef _NET_BATMAN_ADV_RING_BUFFER_H_ -#define _NET_BATMAN_ADV_RING_BUFFER_H_ +#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_ +#define _NET_BATMAN_ADV_BAT_ALGO_H_ -void ring_buffer_set(uint8_t lq_recv[], uint8_t *lq_index, uint8_t value); -uint8_t ring_buffer_avg(const uint8_t lq_recv[]); +int bat_iv_init(void); -#endif /* _NET_BATMAN_ADV_RING_BUFFER_H_ */ +#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */ diff --git a/bat_debugfs.c b/bat_debugfs.c index d0af9bf..a7a393e 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -221,6 +221,11 @@ static void debug_log_cleanup(struct bat_priv *bat_priv) } #endif +static int bat_algorithms_open(struct inode *inode, struct file *file) +{ + return single_open(file, bat_algo_seq_print_text, NULL); +} + static int originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; @@ -274,6 +279,7 @@ struct bat_debuginfo bat_debuginfo_##_name = { \ } \ }; +static BAT_DEBUGINFO(routing_algos, S_IRUGO, bat_algorithms_open); static BAT_DEBUGINFO(originators, S_IRUGO, originators_open); static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); static BAT_DEBUGINFO(softif_neigh, S_IRUGO, softif_neigh_open); @@ -293,9 +299,25 @@ static struct bat_debuginfo *mesh_debuginfos[] = { void debugfs_init(void) { + struct bat_debuginfo *bat_debug; + struct dentry *file; + bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); if (bat_debugfs == ERR_PTR(-ENODEV)) bat_debugfs = NULL; + + if (!bat_debugfs) + goto out; + + bat_debug = &bat_debuginfo_routing_algos; + file = debugfs_create_file(bat_debug->attr.name, + S_IFREG | bat_debug->attr.mode, + bat_debugfs, NULL, &bat_debug->fops); + if (!file) + pr_err("Can't add debugfs file: %s\n", bat_debug->attr.name); + +out: + return; } void debugfs_destroy(void) diff --git a/bat_iv_ogm.c b/bat_iv_ogm.c index 3402fa5..1847efa 100644 --- a/bat_iv_ogm.c +++ b/bat_iv_ogm.c @@ -29,6 +29,7 @@ #include "gateway_client.h" #include "hard-interface.h" #include "send.h" +#include "bat_algo.h" void bat_ogm_init(struct hard_iface *hard_iface) { @@ -1172,3 +1173,12 @@ void bat_ogm_receive(struct hard_iface *if_incoming, struct sk_buff *skb) } while (bat_ogm_aggr_packet(buff_pos, packet_len, batman_ogm_packet->tt_num_changes)); } + +static struct bat_algo_ops batman_iv __read_mostly = { + .name = "BATMAN IV", +}; + +int __init bat_iv_init(void) +{ + return bat_algo_register(&batman_iv); +} diff --git a/main.c b/main.c index 71b56cf..7c87a34 100644 --- a/main.c +++ b/main.c @@ -32,11 +32,14 @@ #include "gateway_client.h" #include "vis.h" #include "hash.h" +#include "bat_algo.h" /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked */ struct list_head hardif_list; +char bat_routing_algo[20] = "BATMAN IV"; +static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -45,6 +48,9 @@ struct workqueue_struct *bat_event_workqueue; static int __init batman_init(void) { INIT_LIST_HEAD(&hardif_list); + INIT_HLIST_HEAD(&bat_algo_list); + + bat_iv_init(); /* the name should not be longer than 10 chars - see * http://lwn.net/Articles/23634/ */ @@ -172,6 +178,72 @@ int is_my_mac(const uint8_t *addr) return 0; } +static struct bat_algo_ops *bat_algo_get(char *name) +{ + struct bat_algo_ops *bat_algo_ops = NULL, *bat_algo_ops_tmp; + struct hlist_node *node; + + hlist_for_each_entry(bat_algo_ops_tmp, node, &bat_algo_list, list) { + if (strcmp(bat_algo_ops_tmp->name, name) != 0) + continue; + + bat_algo_ops = bat_algo_ops_tmp; + break; + } + + return bat_algo_ops; +} + +int bat_algo_register(struct bat_algo_ops *bat_algo_ops) +{ + struct bat_algo_ops *bat_algo_ops_tmp; + int ret = -1; + + bat_algo_ops_tmp = bat_algo_get(bat_algo_ops->name); + if (bat_algo_ops_tmp) { + pr_info("Trying to register already registered routing " + "algorithm: %s\n", bat_algo_ops->name); + goto out; + } + + INIT_HLIST_NODE(&bat_algo_ops->list); + hlist_add_head(&bat_algo_ops->list, &bat_algo_list); + ret = 0; + +out: + return ret; +} + +int bat_algo_select(struct bat_priv *bat_priv, char *name) +{ + struct bat_algo_ops *bat_algo_ops; + int ret = -1; + + bat_algo_ops = bat_algo_get(name); + if (!bat_algo_ops) + goto out; + + bat_priv->bat_algo_ops = bat_algo_ops; + ret = 0; + +out: + return ret; +} + +int bat_algo_seq_print_text(struct seq_file *seq, void *offset) +{ + struct bat_algo_ops *bat_algo_ops; + struct hlist_node *node; + + seq_printf(seq, "Available routing algorithms:\n"); + + hlist_for_each_entry(bat_algo_ops, node, &bat_algo_list, list) { + seq_printf(seq, "%s\n", bat_algo_ops->name); + } + + return 0; +} + module_init(batman_init); module_exit(batman_exit); diff --git a/main.h b/main.h index d305845..222c120 100644 --- a/main.h +++ b/main.h @@ -149,6 +149,7 @@ enum dbg_level { #include "types.h" +extern char bat_routing_algo[]; extern struct list_head hardif_list; extern unsigned char broadcast_addr[]; @@ -159,6 +160,9 @@ void mesh_free(struct net_device *soft_iface); void inc_module_count(void); void dec_module_count(void); int is_my_mac(const uint8_t *addr); +int bat_algo_register(struct bat_algo_ops *bat_algo_ops); +int bat_algo_select(struct bat_priv *bat_priv, char *name); +int bat_algo_seq_print_text(struct seq_file *seq, void *offset); #ifdef CONFIG_BATMAN_ADV_DEBUG int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3); diff --git a/soft-interface.c b/soft-interface.c index bd8c7cf..b5aecd5 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -855,6 +855,10 @@ struct net_device *softif_create(const char *name) bat_priv->primary_if = NULL; bat_priv->num_ifaces = 0; + ret = bat_algo_select(bat_priv, bat_routing_algo); + if (ret < 0) + goto unreg_soft_iface; + ret = sysfs_add_meshif(soft_iface); if (ret < 0) goto unreg_soft_iface; diff --git a/types.h b/types.h index 35085f4..d21ff2c 100644 --- a/types.h +++ b/types.h @@ -206,6 +206,7 @@ struct bat_priv { atomic_t gw_reselect; struct hard_iface __rcu *primary_if; /* rcu protected pointer */ struct vis_info *my_vis_info; + struct bat_algo_ops *bat_algo_ops; }; struct socket_client { @@ -344,4 +345,9 @@ struct softif_neigh { struct rcu_head rcu; }; +struct bat_algo_ops { + struct hlist_node list; + char *name; +}; + #endif /* _NET_BATMAN_ADV_TYPES_H_ */ -- batman-adv

1 0

linux integration; annotated tag, v3.2-rc6, created. v3.2-rc6
by postmaster＠open-mesh.org 17 Dec '11

17 Dec '11

The annotated tag, v3.2-rc6 has been created at 5292d98194346528607da828962c7e8677c27e15 (tag) tagging 384703b8e6cd4c8ef08512e596024e028c91c339 (commit) replaces v3.2-rc5 tagged by Linus Torvalds on Fri Dec 16 18:36:34 2011 -0800 - Shortlog ------------------------------------------------------------ Linux 3.2-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJO7AA6AAoJEHm+PkMAQRiGjgkH/1aNwEbvB0EWAr4ZFtqRmWtR /u4g/EHxUABsHXtJ1zZOf+FhkxPu43tXPAhLmS5+dXBl6iSt4nELCraf84Ts/Y9/ i/PnWMMjRsgPEPo2uA8WlIzMuEyt3aLkC2BVcyunrwPjzUyJcz96xwYahLo6HTa9 A0VQgQtCCcTKCRIMqZTYkUaUYZWjYxDs252+S6BQ8H0bQkT/lHFEp60/efO+cJ6o CNAivWlg/gsHFGYJp4BtB3XlIzKJuvfl8NxGgC7O33G5/wmezS/MJH+XVwZaqlji 1wUf5R8i5D21hwZRy94oe0pjR6kHw5xcadQlHCDj4NcRV3FQ3uspJFzLO7aDa8o= =GnQX -----END PGP SIGNATURE----- Antonio Quartulli (2): batman-adv: in case of roaming mark the client with TT_CLIENT_ROAM batman-adv: delete global entry in case of roaming ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.2-rc1-1160-g1141272
by postmaster＠open-mesh.org 12 Dec '11

12 Dec '11

The following commit has been merged in the merge/master branch: commit 114127291352219aa50a1664cfa1180a65f2c036 Merge: 0fa214b2307ec8df272bb16c66248b3f1a3e4c84 d22e13c6c380261cf0b13d34e6412a1e393b5197 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 12 18:52:28 2011 +0800 Merge remote-tracking branch 'origin/standalone/next' into merge/master diff --combined net/batman-adv/icmp_socket.c index defd692,d9c1e7b..d9c1e7b --- a/net/batman-adv/icmp_socket.c +++ b/net/batman-adv/icmp_socket.c @@@ -136,10 -136,9 +136,9 @@@ static ssize_t bat_socket_read(struct f spin_unlock_bh(&socket_client->lock); - error = __copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len = min(count, socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len; kfree(socket_packet); if (error) @@@ -187,12 -186,7 +186,7 @@@ static ssize_t bat_socket_write(struct skb_reserve(skb, sizeof(struct ethhdr)); icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len); - if (!access_ok(VERIFY_READ, buff, packet_len)) { - len = -EFAULT; - goto free_skb; - } - - if (__copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_packet, buff, packet_len)) { len = -EFAULT; goto free_skb; } -- linux integration

1 0

batman-adv; branch, master, updated. v2011.4.0-49-g8d143ab
by postmaster＠open-mesh.org 12 Dec '11

12 Dec '11

The following commit has been merged in the master branch: commit 8d143abdeff5ddfdb2b5d6bffae8c1fdbbef4de8 Merge: 24d65d307541b7d9bcbb09e58b9209bb20b2c721 d22e13c6c380261cf0b13d34e6412a1e393b5197 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Mon Dec 12 18:49:28 2011 +0800 Merge branch 'next' diff --combined icmp_socket.c index 5bc8649,d9c1e7b..5d69e10 --- a/icmp_socket.c +++ b/icmp_socket.c @@@ -136,10 -136,9 +136,9 @@@ static ssize_t bat_socket_read(struct f spin_unlock_bh(&socket_client->lock); - error = __copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len = min(count, socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len; kfree(socket_packet); if (error) @@@ -187,17 -186,12 +186,12 @@@ static ssize_t bat_socket_write(struct skb_reserve(skb, sizeof(struct ethhdr)); icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len); - if (!access_ok(VERIFY_READ, buff, packet_len)) { - len = -EFAULT; - goto free_skb; - } - - if (__copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_packet, buff, packet_len)) { len = -EFAULT; goto free_skb; } - if (icmp_packet->packet_type != BAT_ICMP) { + if (icmp_packet->header.packet_type != BAT_ICMP) { bat_dbg(DBG_BATMAN, bat_priv, "Error - can't send packet from char device: " "got bogus packet type (expected: BAT_ICMP)\n"); @@@ -215,9 -209,9 +209,9 @@@ icmp_packet->uid = socket_client->index; - if (icmp_packet->version != COMPAT_VERSION) { + if (icmp_packet->header.version != COMPAT_VERSION) { icmp_packet->msg_type = PARAMETER_PROBLEM; - icmp_packet->version = COMPAT_VERSION; + icmp_packet->header.version = COMPAT_VERSION; bat_socket_add_packet(socket_client, icmp_packet, packet_len); goto free_skb; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-32-gd22e13c
by postmaster＠open-mesh.org 12 Dec '11

12 Dec '11

The following commit has been merged in the next branch: commit d22e13c6c380261cf0b13d34e6412a1e393b5197 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 10 15:28:36 2011 +0100 batman-adv: Only write requested number of byte to user buffer Don't write more than the requested number of bytes of an batman-adv icmp packet to the userspace buffer. Otherwise unrelated userspace memory might get overridden by the kernel. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/icmp_socket.c b/icmp_socket.c index 3b04fff..d9c1e7b 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -136,10 +136,9 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf, spin_unlock_bh(&socket_client->lock); - error = copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + packet_len = min(count, socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, packet_len); - packet_len = socket_packet->icmp_len; kfree(socket_packet); if (error) -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-31-gabe653f
by postmaster＠open-mesh.org 12 Dec '11

12 Dec '11

The following commit has been merged in the next branch: commit abe653f9ea919aa1c7a00a167b163e147da465a9 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Dec 10 15:28:35 2011 +0100 batman-adv: Directly check read of icmp packet in copy_from_user The access_ok read check can be directly done in copy_from_user since a failure of access_ok is handled the same way as an error in __copy_from_user. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/icmp_socket.c b/icmp_socket.c index 88ab26f..3b04fff 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -187,12 +187,7 @@ static ssize_t bat_socket_write(struct file *file, const char __user *buff, skb_reserve(skb, sizeof(struct ethhdr)); icmp_packet = (struct icmp_packet_rr *)skb_put(skb, packet_len); - if (!access_ok(VERIFY_READ, buff, packet_len)) { - len = -EFAULT; - goto free_skb; - } - - if (__copy_from_user(icmp_packet, buff, packet_len)) { + if (copy_from_user(icmp_packet, buff, packet_len)) { len = -EFAULT; goto free_skb; } -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.4.0-30-g2013715
by postmaster＠open-mesh.org 12 Dec '11

12 Dec '11

The following commit has been merged in the next branch: commit 201371597326fcd8118be4000954ff9ba8fd0ccd Author: Paul Kot <pawlkt(a)gmail.com> Date: Sat Dec 10 15:28:34 2011 +0100 batman-adv: bat_socket_read missing checks Writing a icmp_packet_rr and then reading icmp_packet can lead to kernel memory corruption, if __user *buf is just below TASK_SIZE. Signed-off-by: Paul Kot <pawlkt(a)gmail.com> [sven(a)narfation.org: made it checkpatch clean] Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/icmp_socket.c b/icmp_socket.c index defd692..88ab26f 100644 --- a/icmp_socket.c +++ b/icmp_socket.c @@ -136,8 +136,8 @@ static ssize_t bat_socket_read(struct file *file, char __user *buf, spin_unlock_bh(&socket_client->lock); - error = __copy_to_user(buf, &socket_packet->icmp_packet, - socket_packet->icmp_len); + error = copy_to_user(buf, &socket_packet->icmp_packet, + socket_packet->icmp_len); packet_len = socket_packet->icmp_len; kfree(socket_packet); -- batman-adv

1 0

linux integration; annotated tag, v3.2-rc5, created. v3.2-rc5
by postmaster＠open-mesh.org 10 Dec '11

10 Dec '11

The annotated tag, v3.2-rc5 has been created at 10fc295c8cd3c5b9d7d271b4875679ee294afbae (tag) tagging dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (commit) replaces v3.2-rc4 tagged by Linus Torvalds on Fri Dec 9 15:09:49 2011 -0800 - Shortlog ------------------------------------------------------------ Linux 3.2-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) iQEcBAABAgAGBQJO4pVFAAoJEHm+PkMAQRiGg8AH/2LlxymONDU8qVFmsojogmwm M0ZHl+l+8DxLy8U543wMI3Ww6pg3jkhRd4fUNMZIEPh4jpKYSGr71xNpdCDpLWb1 /wYXbw2vLKZ60HwByPgmIppk3kKb2SStSdnOyNHck9BnZBtmuvzr3B8PGnbg8wKI R9o1KkVpTfLDVCx6+TQL4CdxVfmgGUUjmQIctgz7CYP1bpZ1GacotZBSft54Jy/S vGsrvATAoY8FWtyIBj5JJW7xg6DkkQo2rC0PQ6jsv/p6Ji2kGKrxP3/VG2zo5yTl oXbQ8oBfs1BzFLNRffbliQXyLjnUcL9+mw3u3Jse7wgpIA0eUmkgcGV9qtB+7ac= =L7cE -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

batctl; branch, master, updated. v2011.4.0-9-gf6cf3de
by postmaster＠open-mesh.org 10 Dec '11

10 Dec '11

The following commit has been merged in the master branch: commit f6cf3de2e9a4474f27ac00305c2fc6f43f173132 Merge: 5f3776affad426fc2c00be3fb04c1bc1158829c5 517bc3396bf597ed7ca78e760a4dd2cbafc13236 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sat Dec 10 17:37:43 2011 +0800 Merge branch 'next' -- batctl

1 0

batctl; branch, next, updated. v2011.4.0-6-g517bc33
by postmaster＠open-mesh.org 10 Dec '11

10 Dec '11

The following commit has been merged in the next branch: commit 517bc3396bf597ed7ca78e760a4dd2cbafc13236 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Dec 8 19:33:06 2011 +0800 batctl: fix log level 'all' Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/sys.c b/sys.c index e510bee..105bb51 100644 --- a/sys.c +++ b/sys.c @@ -213,7 +213,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 15; + log_level = 7; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= (1 << 0); -- batctl

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2011