From patchwork Tue Mar 2 22:40:46 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Lindner X-Patchwork-Id: 33 Return-Path: Received: from smtp129.mail.ukl.yahoo.com (smtp129.mail.ukl.yahoo.com [77.238.184.60]) by open-mesh.net (Postfix) with SMTP id D86C915430E for ; Wed, 3 Mar 2010 00:09:25 +0100 (CET) Received: (qmail 91291 invoked from network); 2 Mar 2010 22:45:51 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.de; h=Received:X-Yahoo-SMTP:X-YMail-OSG:X-Yahoo-Newman-Property:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=QZUrsIp7EUbkt6tyS26njq1ytQ+Cv4okC2Qnt36/KtV3gG/FqpID753yhyCjkP622ivcfIsKZETZsJWYxowpUWTVNzPyY08eq/O5Te85miH5rL0HRmpSR+V7h7uL2E7ArPk5u/+XZkxZijjjuFagJaMRN7U3KfmvviJO3r74xbw= ; Received: from 115-80-176-30.taiwanmobile.net (lindner_marek@115.80.176.30 with plain) by smtp129.mail.ukl.yahoo.com with SMTP; 02 Mar 2010 22:45:46 +0000 GMT X-Yahoo-SMTP: tW.h3tiswBBMXO2coYcbPigGD5Lt6zY_.Zc- X-YMail-OSG: UYPeLiAVM1kQbIEnuxWEQdnxCG.sWNRoixmohK_aHDuxch6q9lNaE6Dr3OjiHuQJnDW.Jfk_LLJLVZgS1foHbiU2dO4nCxnnJWJ8RVPsWvKJ0K6BuwKN30yEuBvFxQUB0IPOUdRW0UYkT6_OHpOUcsw0Ro_j3b3cCSEFXWWEYtH0L12D1IgkmOtlSXxnYo0laCxJ9C.FaSf0yEwigPr0qvRiBfdiri1pyZx.iNaN1Zi.bDyHdeEQVj9wjVouVDvYKjRaqhVnE04P4g-- X-Yahoo-Newman-Property: ymail-3 From: Marek Lindner To: b.a.t.m.a.n@lists.open-mesh.net Date: Wed, 3 Mar 2010 06:40:46 +0800 Message-Id: <1267569647-23594-2-git-send-email-lindner_marek@yahoo.de> X-Mailer: git-send-email 1.7.0 In-Reply-To: <201003030640.16085.lindner_marek@yahoo.de> References: <201003030640.16085.lindner_marek@yahoo.de> Cc: Marek Lindner Subject: [B.A.T.M.A.N.] [PATCH 2/3] batctl: follow /proc to sysfs conversion & introduce input validation X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.11 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: Tue, 02 Mar 2010 23:09:26 -0000 batman-adv is in the process of migrating to sysfs, hence batctl needs to adapt the file paths. In addition batctl makes use of the input validation support of the new files in sysfs. Signed-off-by: Marek Lindner --- batctl/bat-hosts.c | 2 +- batctl/functions.c | 9 +++- batctl/functions.h | 3 + batctl/main.c | 8 ++-- batctl/proc.c | 34 -------------- batctl/proc.h | 8 --- batctl/sys.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++- batctl/sys.h | 17 ++++++- 8 files changed, 149 insertions(+), 55 deletions(-) diff --git a/batctl/bat-hosts.c b/batctl/bat-hosts.c index e770a49..33823be 100644 --- a/batctl/bat-hosts.c +++ b/batctl/bat-hosts.c @@ -20,7 +20,7 @@ */ - +#define _GNU_SOURCE #include #include #include diff --git a/batctl/functions.c b/batctl/functions.c index 2ead2fc..cf4d264 100644 --- a/batctl/functions.c +++ b/batctl/functions.c @@ -35,8 +35,6 @@ #include "functions.h" #include "bat-hosts.h" -#define BATMAN_ADV_TAG "batman-adv:" - static struct timeval start_time; static char *host_name; char *line_ptr = NULL; @@ -174,6 +172,13 @@ open: read: while ((read = getline(&line_ptr, &len, fp)) != -1) { + if (read_opt & SEARCH_ARGS) { + /* omit log lines which don't start with the correct tag */ + if (strncmp(line_ptr, SEARCH_ARGS_TAG, strlen(SEARCH_ARGS_TAG)) == 0) + break; + + continue; + } /* the buffer will be handled elsewhere */ if (read_opt & USE_READ_BUFF) diff --git a/batctl/functions.h b/batctl/functions.h index 88fa53b..c21e9a3 100644 --- a/batctl/functions.h +++ b/batctl/functions.h @@ -25,6 +25,8 @@ #define ETH_STR_LEN 17 +#define BATMAN_ADV_TAG "batman-adv:" +#define SEARCH_ARGS_TAG "commands:" /* return time delta from start to end in milliseconds */ void start_timer(void); @@ -45,4 +47,5 @@ enum { USE_BAT_HOSTS = 0x04, LOG_MODE = 0x08, USE_READ_BUFF = 0x10, + SEARCH_ARGS = 0x20, }; diff --git a/batctl/main.c b/batctl/main.c index 6e4493d..99bfb5b 100644 --- a/batctl/main.c +++ b/batctl/main.c @@ -102,15 +102,15 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "originators") == 0) || (strcmp(argv[1], "o") == 0)) { - ret = handle_table(argc - 1, argv + 1, PROC_ORIGINATORS, originators_usage); + ret = handle_sys_table(argc - 1, argv + 1, SYS_ORIGINATORS, originators_usage); } else if ((strcmp(argv[1], "translocal") == 0) || (strcmp(argv[1], "tl") == 0)) { - ret = handle_table(argc - 1, argv + 1, PROC_TRANSTABLE_LOCAL, trans_local_usage); + ret = handle_sys_table(argc - 1, argv + 1, SYS_TRANSTABLE_LOCAL, trans_local_usage); } else if ((strcmp(argv[1], "transglobal") == 0) || (strcmp(argv[1], "tg") == 0)) { - ret = handle_table(argc - 1, argv + 1, PROC_TRANSTABLE_GLOBAL, trans_global_usage); + ret = handle_sys_table(argc - 1, argv + 1, SYS_TRANSTABLE_GLOBAL, trans_global_usage); } else if ((strcmp(argv[1], "loglevel") == 0) || (strcmp(argv[1], "ll") == 0)) { @@ -142,7 +142,7 @@ int main(int argc, char **argv) } else if ((strcmp(argv[1], "aggregation") == 0) || (strcmp(argv[1], "ag") == 0)) { - ret = handle_proc_setting(argc - 1, argv + 1, PROC_AGGR, aggregation_usage); + ret = handle_sys_setting(argc - 1, argv + 1, SYS_AGGR, aggregation_usage); } else if ((strcmp(argv[1], "bisect") == 0)) { diff --git a/batctl/proc.c b/batctl/proc.c index 3294662..e323a52 100644 --- a/batctl/proc.c +++ b/batctl/proc.c @@ -68,33 +68,6 @@ int interface(int argc, char **argv) return EXIT_SUCCESS; } -void originators_usage(void) -{ - printf("Usage: batctl [options] originators \n"); - printf("options:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -w watch mode - refresh the originator table continuously\n"); -} - -void trans_local_usage(void) -{ - printf("Usage: batctl [options] translocal \n"); - printf("options:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -w watch mode - refresh the local translation table continuously\n"); -} - -void trans_global_usage(void) -{ - printf("Usage: batctl [options] transglobal \n"); - printf("options:\n"); - printf(" \t -h print this help\n"); - printf(" \t -n don't replace mac addresses with bat-host names\n"); - printf(" \t -w watch mode - refresh the global translation table continuously\n"); -} - void gw_srv_list_usage(void) { printf("Usage: batctl [options] gw_srv_list \n"); @@ -118,13 +91,6 @@ void vis_server_usage(void) printf(" \t -h print this help\n"); } -void aggregation_usage(void) -{ - printf("Usage: batctl [options] aggregation \n"); - printf("options:\n"); - printf(" \t -h print this help\n"); -} - void gw_mode_usage(void) { printf("Usage: batctl [options] gw_mode [mode]\n"); diff --git a/batctl/proc.h b/batctl/proc.h index d867b78..fba9a19 100644 --- a/batctl/proc.h +++ b/batctl/proc.h @@ -21,24 +21,16 @@ #define PROC_ROOT_PATH "/proc/net/batman-adv/" #define PROC_INTERFACES "interfaces" -#define PROC_ORIGINATORS "originators" #define PROC_ORIG_INTERVAL "orig_interval" -#define PROC_TRANSTABLE_LOCAL "transtable_local" -#define PROC_TRANSTABLE_GLOBAL "transtable_global" #define PROC_VIS_SERVER "vis_server" #define PROC_VIS_DATA "vis_data" -#define PROC_AGGR "aggregate_ogm" #define PROC_GW_MODE "gateway_mode" #define PROC_GW_SRV_LIST "gateway_srv_list" int interface(int argc, char **argv); -void originators_usage(void); -void trans_local_usage(void); -void trans_global_usage(void); void orig_interval_usage(void); void vis_server_usage(void); -void aggregation_usage(void); void gw_mode_usage(void); void gw_srv_list_usage(void); int handle_table(int argc, char **argv, char *file_path, void table_usage(void)); diff --git a/batctl/sys.c b/batctl/sys.c index d67a915..8afffc7 100644 --- a/batctl/sys.c +++ b/batctl/sys.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * @@ -94,11 +94,11 @@ int handle_loglevel(int argc, char **argv) } if (argc != 1) { - res = write_file(SYS_ROOT_PATH, SYS_LOG_LEVEL, argv[1]); + res = write_file(SYS_MODULE_PATH, SYS_LOG_LEVEL, argv[1]); goto out; } - res = read_file(SYS_ROOT_PATH, SYS_LOG_LEVEL, SINGLE_READ | USE_READ_BUFF); + res = read_file(SYS_MODULE_PATH, SYS_LOG_LEVEL, SINGLE_READ | USE_READ_BUFF); if (res != EXIT_SUCCESS) goto out; @@ -118,3 +118,120 @@ out: return res; } + +void originators_usage(void) +{ + printf("Usage: batctl [options] originators \n"); + printf("options:\n"); + printf(" \t -h print this help\n"); + printf(" \t -n don't replace mac addresses with bat-host names\n"); + printf(" \t -w watch mode - refresh the originator table continuously\n"); +} + +void trans_local_usage(void) +{ + printf("Usage: batctl [options] translocal \n"); + printf("options:\n"); + printf(" \t -h print this help\n"); + printf(" \t -n don't replace mac addresses with bat-host names\n"); + printf(" \t -w watch mode - refresh the local translation table continuously\n"); +} + +void trans_global_usage(void) +{ + printf("Usage: batctl [options] transglobal \n"); + printf("options:\n"); + printf(" \t -h print this help\n"); + printf(" \t -n don't replace mac addresses with bat-host names\n"); + printf(" \t -w watch mode - refresh the global translation table continuously\n"); +} + +int handle_sys_table(int argc, char **argv, char *file_path, void table_usage(void)) +{ + int optchar, read_opt = USE_BAT_HOSTS; + + while ((optchar = getopt(argc, argv, "hnw")) != -1) { + switch (optchar) { + case 'h': + table_usage(); + return EXIT_SUCCESS; + case 'n': + read_opt &= ~USE_BAT_HOSTS; + break; + case 'w': + read_opt |= CLR_CONT_READ; + break; + default: + table_usage(); + return EXIT_FAILURE; + } + } + + return read_file(SYS_BATIF_PATH, file_path, read_opt); +} + +void aggregation_usage(void) +{ + printf("Usage: batctl [options] aggregation \n"); + printf("options:\n"); + printf(" \t -h print this help\n"); +} + +int handle_sys_setting(int argc, char **argv, char *file_path, void setting_usage(void)) +{ + int optchar, res; + char *space_ptr, *comma_char, *cmds = NULL; + + while ((optchar = getopt(argc, argv, "h")) != -1) { + switch (optchar) { + case 'h': + setting_usage(); + return EXIT_SUCCESS; + default: + setting_usage(); + return EXIT_FAILURE; + } + } + + if (argc == 1) + return read_file(SYS_BATIF_PATH, file_path, SINGLE_READ); + + res = read_file(SYS_BATIF_PATH, file_path, SEARCH_ARGS); + if (res != EXIT_SUCCESS) + return res; + + while ((space_ptr = strchr(line_ptr, ' ')) != NULL) { + *space_ptr = '\0'; + + if (strncmp(line_ptr, SEARCH_ARGS_TAG, strlen(SEARCH_ARGS_TAG)) == 0) { + cmds = space_ptr + 1; + goto next; + } + + comma_char = NULL; + if (line_ptr[strlen(line_ptr) - 1] == ',') { + comma_char = line_ptr + strlen(line_ptr) - 1; + *comma_char = '\0'; + } + + if (strcmp(line_ptr, argv[1]) == 0) + goto write_file; + + *space_ptr = ' '; + if (comma_char) + *comma_char = ','; + +next: + line_ptr = space_ptr + 1; + } + + if (!cmds) + goto write_file; + + printf("Error - the supplied argument is invalid: %s\n", argv[1]); + printf("The following values are allowed: %s", cmds); + return EXIT_FAILURE; + +write_file: + return write_file(SYS_BATIF_PATH, file_path, argv[1]); +} diff --git a/batctl/sys.h b/batctl/sys.h index 812da63..b7dd975 100644 --- a/batctl/sys.h +++ b/batctl/sys.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * @@ -20,10 +20,21 @@ */ -#define SYS_ROOT_PATH "/sys/module/batman_adv/" +#define SYS_MODULE_PATH "/sys/module/batman_adv/" +#define SYS_BATIF_PATH "/sys/class/net/bat0/mesh/" #define SYS_LOG_LEVEL "parameters/debug" #define SYS_LOG "log" +#define SYS_ORIGINATORS "originators" +#define SYS_TRANSTABLE_LOCAL "transtable_local" +#define SYS_TRANSTABLE_GLOBAL "transtable_global" +#define SYS_AGGR "aggregate_ogm" - +void originators_usage(void); +void trans_local_usage(void); +void trans_global_usage(void); +void aggregation_usage(void); +void bonding_usage(void); int log_print(int argc, char **argv); int handle_loglevel(int argc, char **argv); +int handle_sys_table(int argc, char **argv, char *file_path, void table_usage(void)); +int handle_sys_setting(int argc, char **argv, char *file_path, void setting_usage(void));