Commit 1c280471 authored by Marek Lindner's avatar Marek Lindner

batman-adv: add infrastructure to change routing algorithm at runtime

Signed-off-by: default avatarMarek Lindner <lindner_marek@yahoo.de>
parent 6e242f90
/*
* Copyright (C) 2011 B.A.T.M.A.N. contributors:
*
* Marek Lindner
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 2 of the GNU General Public
* License as published by the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA
*
*/
#ifndef _NET_BATMAN_ADV_BAT_ALGO_H_
#define _NET_BATMAN_ADV_BAT_ALGO_H_
int bat_iv_init(void);
#endif /* _NET_BATMAN_ADV_BAT_ALGO_H_ */
...@@ -221,6 +221,11 @@ static void debug_log_cleanup(struct bat_priv *bat_priv) ...@@ -221,6 +221,11 @@ static void debug_log_cleanup(struct bat_priv *bat_priv)
} }
#endif #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) static int originators_open(struct inode *inode, struct file *file)
{ {
struct net_device *net_dev = (struct net_device *)inode->i_private; struct net_device *net_dev = (struct net_device *)inode->i_private;
...@@ -274,6 +279,7 @@ struct bat_debuginfo bat_debuginfo_##_name = { \ ...@@ -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(originators, S_IRUGO, originators_open);
static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open); static BAT_DEBUGINFO(gateways, S_IRUGO, gateways_open);
static BAT_DEBUGINFO(softif_neigh, S_IRUGO, softif_neigh_open); static BAT_DEBUGINFO(softif_neigh, S_IRUGO, softif_neigh_open);
...@@ -293,9 +299,25 @@ static struct bat_debuginfo *mesh_debuginfos[] = { ...@@ -293,9 +299,25 @@ static struct bat_debuginfo *mesh_debuginfos[] = {
void debugfs_init(void) void debugfs_init(void)
{ {
struct bat_debuginfo *bat_debug;
struct dentry *file;
bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL); bat_debugfs = debugfs_create_dir(DEBUGFS_BAT_SUBDIR, NULL);
if (bat_debugfs == ERR_PTR(-ENODEV)) if (bat_debugfs == ERR_PTR(-ENODEV))
bat_debugfs = NULL; 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) void debugfs_destroy(void)
......
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include "gateway_client.h" #include "gateway_client.h"
#include "hard-interface.h" #include "hard-interface.h"
#include "send.h" #include "send.h"
#include "bat_algo.h"
void bat_ogm_init(struct hard_iface *hard_iface) 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) ...@@ -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, } while (bat_ogm_aggr_packet(buff_pos, packet_len,
batman_ogm_packet->tt_num_changes)); 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);
}
...@@ -32,11 +32,14 @@ ...@@ -32,11 +32,14 @@
#include "gateway_client.h" #include "gateway_client.h"
#include "vis.h" #include "vis.h"
#include "hash.h" #include "hash.h"
#include "bat_algo.h"
/* List manipulations on hardif_list have to be rtnl_lock()'ed, /* List manipulations on hardif_list have to be rtnl_lock()'ed,
* list traversals just rcu-locked */ * list traversals just rcu-locked */
struct list_head hardif_list; 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}; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
...@@ -45,6 +48,9 @@ struct workqueue_struct *bat_event_workqueue; ...@@ -45,6 +48,9 @@ struct workqueue_struct *bat_event_workqueue;
static int __init batman_init(void) static int __init batman_init(void)
{ {
INIT_LIST_HEAD(&hardif_list); INIT_LIST_HEAD(&hardif_list);
INIT_HLIST_HEAD(&bat_algo_list);
bat_iv_init();
/* the name should not be longer than 10 chars - see /* the name should not be longer than 10 chars - see
* http://lwn.net/Articles/23634/ */ * http://lwn.net/Articles/23634/ */
...@@ -172,6 +178,72 @@ int is_my_mac(const uint8_t *addr) ...@@ -172,6 +178,72 @@ int is_my_mac(const uint8_t *addr)
return 0; 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_init(batman_init);
module_exit(batman_exit); module_exit(batman_exit);
......
...@@ -147,6 +147,7 @@ enum dbg_level { ...@@ -147,6 +147,7 @@ enum dbg_level {
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include "types.h" #include "types.h"
extern char bat_routing_algo[];
extern struct list_head hardif_list; extern struct list_head hardif_list;
extern unsigned char broadcast_addr[]; extern unsigned char broadcast_addr[];
...@@ -157,6 +158,9 @@ void mesh_free(struct net_device *soft_iface); ...@@ -157,6 +158,9 @@ void mesh_free(struct net_device *soft_iface);
void inc_module_count(void); void inc_module_count(void);
void dec_module_count(void); void dec_module_count(void);
int is_my_mac(const uint8_t *addr); 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 #ifdef CONFIG_BATMAN_ADV_DEBUG
int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3); int debug_log(struct bat_priv *bat_priv, const char *fmt, ...) __printf(2, 3);
......
...@@ -855,6 +855,10 @@ struct net_device *softif_create(const char *name) ...@@ -855,6 +855,10 @@ struct net_device *softif_create(const char *name)
bat_priv->primary_if = NULL; bat_priv->primary_if = NULL;
bat_priv->num_ifaces = 0; 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); ret = sysfs_add_meshif(soft_iface);
if (ret < 0) if (ret < 0)
goto unreg_soft_iface; goto unreg_soft_iface;
......
...@@ -206,6 +206,7 @@ struct bat_priv { ...@@ -206,6 +206,7 @@ struct bat_priv {
atomic_t gw_reselect; atomic_t gw_reselect;
struct hard_iface __rcu *primary_if; /* rcu protected pointer */ struct hard_iface __rcu *primary_if; /* rcu protected pointer */
struct vis_info *my_vis_info; struct vis_info *my_vis_info;
struct bat_algo_ops *bat_algo_ops;
}; };
struct socket_client { struct socket_client {
...@@ -344,4 +345,9 @@ struct softif_neigh { ...@@ -344,4 +345,9 @@ struct softif_neigh {
struct rcu_head rcu; struct rcu_head rcu;
}; };
struct bat_algo_ops {
struct hlist_node list;
char *name;
};
#endif /* _NET_BATMAN_ADV_TYPES_H_ */ #endif /* _NET_BATMAN_ADV_TYPES_H_ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment