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

Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>

diff --git a/net/batman-adv/bat_algo.h b/net/batman-adv/bat_algo.h
new file mode 100644 (file)
index 0000000..755379f
--- /dev/null
+++ b/net/batman-adv/bat_algo.h
@@ -0,0 +1,27 @@
+/*
+ * 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_ */

diff --git a/net/batman-adv/bat_debugfs.c b/net/batman-adv/bat_debugfs.c
index d0af9bf69e460bf881f6661003c360e60b44773b..a7a393eeb9351ad0780e6234a8e797cd1c4ba75c 100644 (file)
--- a/net/batman-adv/bat_debugfs.c
+++ b/net/batman-adv/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/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
index 3402fa575b4705284cfd195fc00537d3e1f50df0..1847efaaa6fd9d7f5643b9e81d8ddc26dfef4d7b 100644 (file)
--- a/net/batman-adv/bat_iv_ogm.c
+++ b/net/batman-adv/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/net/batman-adv/main.c b/net/batman-adv/main.c
index 71b56cf9cdd69ac1159066155f2fd944026cee7b..7c87a341f29f4f7431b6a21018a70d391f7ed72e 100644 (file)
--- a/net/batman-adv/main.c
+++ b/net/batman-adv/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/net/batman-adv/main.h b/net/batman-adv/main.h
index f9c659b3f3a96d537a11c32c339276c9c084d57d..586afafb1b67b06b67361d40923f8ec87c3adbd1 100644 (file)
--- a/net/batman-adv/main.h
+++ b/net/batman-adv/main.h
@@ -147,6 +147,7 @@ enum dbg_level {
 #include <linux/seq_file.h>
 #include "types.h"
 
+extern char bat_routing_algo[];
 extern struct list_head hardif_list;
 
 extern unsigned char broadcast_addr[];
@@ -157,6 +158,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/net/batman-adv/soft-interface.c b/net/batman-adv/soft-interface.c
index bd8c7cfaeacf47f04a2e0d757a7325242073aaa5..b5aecd5e45ccea4f8f21d509e5b59bfacb13a5d5 100644 (file)
--- a/net/batman-adv/soft-interface.c
+++ b/net/batman-adv/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/net/batman-adv/types.h b/net/batman-adv/types.h
index 35085f410b9637678519653b2a35a213efe6e6d7..d21ff2cf668e2abe535d7ab383b0e4bf07f66cdb 100644 (file)
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/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_ */