From patchwork Mon Dec 5 09:56:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 1427 Return-Path: Received: from nm19-vm0.bullet.mail.ukl.yahoo.com (nm19-vm0.bullet.mail.ukl.yahoo.com [217.146.183.113]) by open-mesh.org (Postfix) with SMTP id 7EADB60089D for ; Mon, 5 Dec 2011 10:56:48 +0100 (CET) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@yahoo.de; dkim-adsp=none Received: from [217.146.183.180] by nm19.bullet.mail.ukl.yahoo.com with NNFMP; 05 Dec 2011 09:56:48 -0000 Received: from [77.238.184.54] by tm11.bullet.mail.ukl.yahoo.com with NNFMP; 05 Dec 2011 09:56:48 -0000 Received: from [127.0.0.1] by smtp123.mail.ukl.yahoo.com with NNFMP; 05 Dec 2011 09:56:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.de; s=s1024; t=1323079008; bh=Y9zsIxKegd1leFYuooMc9CyXY/SfK0TYFSjBxeTAsgc=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=5atAho24/0tjIpGjCuRfk19wSw9v/Vrr5iFL0BHNWjPsdWi/t7DevI1hcja4kioNvewKBhdckXHzDxFjHWl1g1qt0kKlXYiO7Ca/KJDUTTtjtS1d3qkvKKvSlRWrcQDHzeWk2cPHoa8oM3nuS54PYcMzxLj4/HUWFnwcBAbYqRE= X-Yahoo-Newman-Id: 255848.12924.bm@smtp123.mail.ukl.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: 6QftUawVM1m5GxtksKwga_gkGDxWbt3ND7tGt8AbmQa0yT9 I4J5r6EzLY9Ro8eVa7BWcicPOXo4J5VwUgp03IlFR52k9EhhDRcSjV6zkhVU oUjivyExKZW_FlMHda.Bv4eLWlYKEN9L8pG5Z2D6Y6Eo0oYDp3VI.Dc8OxED lS0sg1Y0MypQAMSJgfOKpNefigVTMa1GNDT4P_fk4H6ksDjZpSzdVBaLFH2f VBplRfu_1XT6FVR6tjGnO7Dy_V8vwQ3AdhPTwpGPZ6YFUH7_tLlkAvWgRYF6 dLVCvq8tlhR4qPCDGsATiWzVSj63Isod0LNBepbD9qNjEF.eMePHdDf_Wrm5 QnUfuNozl0RfWM8zqDi5472JQILUyvtrF0fzH7b45kjAPeXEuwu6Ronye.wg XzFwWyTuei32qZRpBOuFJm6fir17M7M2dDZyXQ5mWD934N8JTqQ7T X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- Received: from localhost (lindner_marek@78.46.248.235 with plain) by smtp123.mail.ukl.yahoo.com with SMTP; 05 Dec 2011 09:56:45 +0000 GMT From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.org Date: Mon, 5 Dec 2011 17:56:23 +0800 Message-Id: <1323078985-1116-2-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1323078985-1116-1-git-send-email-lindner_marek@yahoo.de> References: <1323078985-1116-1-git-send-email-lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: add infrastructure to change routing algorithm at runtime X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Dec 2011 09:56:48 -0000 Signed-off-by: Marek Lindner --- bat_algo.h | 27 ++++++++++++++++++++ bat_debugfs.c | 8 ++++++ bat_iv_ogm.c | 10 +++++++ main.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ main.h | 3 ++ soft-interface.c | 4 +++ types.h | 6 ++++ 7 files changed, 129 insertions(+), 0 deletions(-) create mode 100644 bat_algo.h diff --git a/bat_algo.h b/bat_algo.h new file mode 100644 index 0000000..755379f --- /dev/null +++ b/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/bat_debugfs.c b/bat_debugfs.c index d0af9bf..05e2f1f 100644 --- a/bat_debugfs.c +++ b/bat_debugfs.c @@ -221,6 +221,12 @@ static void debug_log_cleanup(struct bat_priv *bat_priv) } #endif +static int bat_algorithms_open(struct inode *inode, struct file *file) +{ + struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, bat_algo_seq_print_text, net_dev); +} + static int originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; @@ -274,6 +280,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); @@ -282,6 +289,7 @@ static BAT_DEBUGINFO(transtable_local, S_IRUGO, transtable_local_open); static BAT_DEBUGINFO(vis_data, S_IRUGO, vis_data_open); static struct bat_debuginfo *mesh_debuginfos[] = { + &bat_debuginfo_routing_algos, &bat_debuginfo_originators, &bat_debuginfo_gateways, &bat_debuginfo_softif_neigh, 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 fb87bdc..b554f63 100644 --- a/main.c +++ b/main.c @@ -32,11 +32,13 @@ #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; +static struct hlist_head bat_algo_list; unsigned char broadcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; @@ -45,6 +47,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/ */ @@ -173,6 +178,72 @@ int is_my_mac(const uint8_t *addr) } +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 464439f..8ad8f11 100644 --- a/main.h +++ b/main.h @@ -159,6 +159,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..a0046ac 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, "BATMAN IV"); + 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_ */