[commits] [batman-adv] master: batman-adv: export compatibility version via debugfs (0679ec7)

postmaster at open-mesh.org postmaster at open-mesh.org
Tue Oct 16 11:30:39 CEST 2012


Repository : ssh://git@open-mesh.org/batman-adv

On branch  : master

>---------------------------------------------------------------

commit 0679ec75758588e185ceec11e5823de65b427a6f
Author: Antonio Quartulli <ordex at autistici.org>
Date:   Tue Oct 16 10:04:40 2012 +0200

    batman-adv: export compatibility version via debugfs
    
    Different versions of the batman-adv module may use the same compatibility
    version, but this is not understandable at runtime (the only way is to parse the
    kernel log and fetch the batman-adv advertisement message on loading). The user
    may want to know whether two nodes using different versions can communicate or
    not. For this purpose the module has to export this value through debugfs.
    
    Reported-by: Moritz Warning <moritzwarning at web.de>
    Signed-off-by: Antonio Quartulli <ordex at autistici.org>
    Signed-off-by: Marek Lindner <lindner_marek at yahoo.de>


>---------------------------------------------------------------

0679ec75758588e185ceec11e5823de65b427a6f
 debugfs.c |   12 ++++++++++++
 main.c    |   12 ++++++++++++
 main.h    |    1 +
 3 files changed, 25 insertions(+)

diff --git a/debugfs.c b/debugfs.c
index 6f58ddd..ae79b19 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -245,6 +245,16 @@ static int batadv_algorithms_open(struct inode *inode, struct file *file)
 	return single_open(file, batadv_algo_seq_print_text, NULL);
 }
 
+/**
+ * batadv_compat_open - Prepare file handler for printing of the compat version
+ * @inode: inode which was opened
+ * @file: file handle to be initialized
+ */
+static int batadv_compat_open(struct inode *inode, struct file *file)
+{
+	return single_open(file, batadv_compat_seq_print_text, NULL);
+}
+
 static int batadv_originators_open(struct inode *inode, struct file *file)
 {
 	struct net_device *net_dev = (struct net_device *)inode->i_private;
@@ -327,9 +337,11 @@ struct batadv_debuginfo batadv_debuginfo_##_name = {	\
  * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs
  */
 static BATADV_DEBUGINFO(routing_algos, S_IRUGO, batadv_algorithms_open);
+static BATADV_DEBUGINFO(compat_version, S_IRUGO, batadv_compat_open);
 
 static struct batadv_debuginfo *batadv_general_debuginfos[] = {
 	&batadv_debuginfo_routing_algos,
+	&batadv_debuginfo_compat_version,
 	NULL,
 };
 
diff --git a/main.c b/main.c
index dc33a0c..70797de 100644
--- a/main.c
+++ b/main.c
@@ -420,6 +420,18 @@ int batadv_algo_seq_print_text(struct seq_file *seq, void *offset)
 	return 0;
 }
 
+/**
+ * batadv_compat_seq_print_text - print the compatibility version
+ * @seq: debugfs table seq_file struct
+ * @offset: not used
+ */
+int batadv_compat_seq_print_text(struct seq_file *seq, void *offset)
+{
+	seq_printf(seq, "%d\n", BATADV_COMPAT_VERSION);
+
+	return 0;
+}
+
 static int batadv_param_set_ra(const char *val, const struct kernel_param *kp)
 {
 	struct batadv_algo_ops *bat_algo_ops;
diff --git a/main.h b/main.h
index 4d92ce6..2dfcf8c 100644
--- a/main.h
+++ b/main.h
@@ -176,6 +176,7 @@ void batadv_recv_handler_unregister(uint8_t packet_type);
 int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops);
 int batadv_algo_select(struct batadv_priv *bat_priv, char *name);
 int batadv_algo_seq_print_text(struct seq_file *seq, void *offset);
+int batadv_compat_seq_print_text(struct seq_file *seq, void *offset);
 
 /**
  * enum batadv_dbg_level - available log levels



More information about the commits mailing list