commits December 2009

commits@lists.open-mesh.org

1 participants
59 discussions

r1516 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:23:35 +0000 (Tue, 29 Dec 2009) New Revision: 1516 Modified: trunk/batman-adv-kernelland/main.h Log: batman-adv: mark trunk as 0.3.0 alpha The git repository contains a newly created maint(enance) branch which becomes the batman-adv stable branch. Only bugfixes and lightweight interface changes needed for the linux kernel integration will be made available there. All new features go into the 0.3-branch. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2009-12-29 13:02:19 UTC (rev 1515) +++ trunk/batman-adv-kernelland/main.h 2009-12-29 13:23:35 UTC (rev 1516) @@ -26,7 +26,7 @@ #define DRIVER_DESC "B.A.T.M.A.N. advanced" #define DRIVER_DEVICE "batman-adv" -#define SOURCE_VERSION "0.2.1-beta" +#define SOURCE_VERSION "0.3.0-alpha" /* B.A.T.M.A.N. parameters */

1 0

r1515 - trunk/batctl
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:19 +0000 (Tue, 29 Dec 2009) New Revision: 1515 Modified: trunk/batctl/main.c trunk/batctl/vis.c Log: batctl: adjust vis.c coding style This patch adjusts the vis.c coding style (using Lindent) to match the rest of the batctl code better. Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2009-12-29 13:02:18 UTC (rev 1514) +++ trunk/batctl/main.c 2009-12-29 13:02:19 UTC (rev 1515) @@ -75,9 +75,9 @@ exit(EXIT_SUCCESS); } + /* TODO: remove this generic check here and move it into the individual functions */ /* check if user is root */ - if (((strcmp(argv[1], "bisect") != 0) && (strcmp(argv[1], "vis") != 0)) - && ((getuid()) || (getgid()))) { + if ((strcmp(argv[1], "bisect") != 0) && ((getuid()) || (getgid()))) { fprintf(stderr, "Error - you must be root to run '%s' !\n", argv[0]); exit(EXIT_FAILURE); } Modified: trunk/batctl/vis.c =================================================================== --- trunk/batctl/vis.c 2009-12-29 13:02:18 UTC (rev 1514) +++ trunk/batctl/vis.c 2009-12-29 13:02:19 UTC (rev 1515) @@ -33,294 +33,278 @@ #define TQ_MAX_VALUE 255 -typedef void (*print_tq_t)(char * orig, char * from, const long tq); -typedef void (*print_HNA_t)(char * orig, char * from); -typedef void (*print_1st_t)(char * orig); -typedef void (*print_2nd_t)(char * orig, char * from); -typedef void (*print_header_t)(void); -typedef void (*print_footer_t)(void); +typedef void (*print_tq_t) (char *orig, char *from, const long tq); +typedef void (*print_HNA_t) (char *orig, char *from); +typedef void (*print_1st_t) (char *orig); +typedef void (*print_2nd_t) (char *orig, char *from); +typedef void (*print_header_t) (void); +typedef void (*print_footer_t) (void); -struct funcs -{ - print_tq_t print_tq; - print_HNA_t print_HNA; - print_1st_t print_1st; - print_2nd_t print_2nd; - print_header_t print_header; - print_footer_t print_footer; +struct funcs { + print_tq_t print_tq; + print_HNA_t print_HNA; + print_1st_t print_1st; + print_2nd_t print_2nd; + print_header_t print_header; + print_footer_t print_footer; }; static bool with_HNA = true; static bool with_2nd = true; static bool with_names = true; -static void -usage(void) +static void usage(void) { - printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); - printf("or\n"); - printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); + printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); + printf("or\n"); + printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); } -static void -dot_print_tq(char * orig, char * from, const long tq) +static void dot_print_tq(char *orig, char *from, const long tq) { - int int_part = TQ_MAX_VALUE / tq; - int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); + int int_part = TQ_MAX_VALUE / tq; + int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); - printf("\t\"%s\" -> ", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"%s\" [label=\"%d.%d\"]\n", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), - int_part, frac_part); + printf("\t\"%s\" -> ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\"%s\" [label=\"%d.%d\"]\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), + int_part, frac_part); } -static void -dot_print_HNA(char * orig, char * from) +static void dot_print_HNA(char *orig, char *from) { - printf("\t\"%s\" -> ", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"%s\" [label=\"HNA\"]\n", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\"%s\" -> ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\"%s\" [label=\"HNA\"]\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } -static void -dot_print_1st(char * orig) +static void dot_print_1st(char *orig) { - printf("\tsubgraph \"cluster_%s\" {\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\t\t\"%s\" [peripheries=2]\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\t}\n"); + printf("\tsubgraph \"cluster_%s\" {\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\" [peripheries=2]\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t}\n"); } -static void -dot_print_2nd(char * orig, char * from) +static void dot_print_2nd(char *orig, char *from) { - printf("\tsubgraph \"cluster_%s\" {\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\t\t\"%s\" [peripheries=2]\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\t\t\"%s\"\n", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); - printf("\t}\n"); + printf("\tsubgraph \"cluster_%s\" {\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\" [peripheries=2]\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\"\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t}\n"); } -static void -dot_print_header(void) +static void dot_print_header(void) { - printf("digraph {\n"); + printf("digraph {\n"); } -static void -dot_print_footer(void) +static void dot_print_footer(void) { - printf("}\n"); + printf("}\n"); } -const struct funcs dot_funcs = - { dot_print_tq, - dot_print_HNA, - dot_print_1st, - dot_print_2nd, - dot_print_header, - dot_print_footer +const struct funcs dot_funcs = { dot_print_tq, + dot_print_HNA, + dot_print_1st, + dot_print_2nd, + dot_print_header, + dot_print_footer }; -static void -json_print_tq(char * orig, char * from, const long tq) +static void json_print_tq(char *orig, char *from, const long tq) { - int int_part = TQ_MAX_VALUE / tq; - int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); + int int_part = TQ_MAX_VALUE / tq; + int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); - printf("\t{ router : \"%s\", ", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("neighbor : \"%s\", label : \"%d.%d\" }\n", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), - int_part, frac_part); + printf("\t{ router : \"%s\", ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("neighbor : \"%s\", label : \"%d.%d\" }\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), + int_part, frac_part); } -static void -json_print_HNA(char * orig, char * from) +static void json_print_HNA(char *orig, char *from) { - printf("\t{ router : \"%s\", ", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("gateway : \"%s\", label : \"HNA\" }\n", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t{ router : \"%s\", ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("gateway : \"%s\", label : \"HNA\" }\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } -static void -json_print_1st(char * orig) +static void json_print_1st(char *orig) { - printf("\t{ primary : \"%s\" }\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t{ primary : \"%s\" }\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); } -static void -json_print_2nd(char * orig, char * from) +static void json_print_2nd(char *orig, char *from) { - printf("\t{ secondary : \"%s\", ", - get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t{ secondary : \"%s\", ", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); - printf("of : \"%s\" }\n", - get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("of : \"%s\" }\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); } -const struct funcs json_funcs = - { json_print_tq, - json_print_HNA, - json_print_1st, - json_print_2nd, - NULL, - NULL +const struct funcs json_funcs = { json_print_tq, + json_print_HNA, + json_print_1st, + json_print_2nd, + NULL, + NULL }; -static FILE * -open_vis(void) +static FILE *open_vis(void) { - char full_path[500]; + char full_path[500]; - if (check_proc_dir("/proc") != EXIT_SUCCESS) - return NULL; + if (check_proc_dir("/proc") != EXIT_SUCCESS) + return NULL; - strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH)); - full_path[strlen(PROC_ROOT_PATH)] = '\0'; - strncat(full_path, PROC_VIS_DATA, sizeof(full_path) - strlen(full_path)); + strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH)); + full_path[strlen(PROC_ROOT_PATH)] = '\0'; + strncat(full_path, PROC_VIS_DATA, + sizeof(full_path) - strlen(full_path)); - return fopen(full_path, "r"); + return fopen(full_path, "r"); } -static int -format(const struct funcs *funcs) +static int format(const struct funcs *funcs) { - size_t len = 0; - ssize_t read; - char * line = NULL; - char * orig, * from; - char * duplet; - char * line_save_ptr; - char * duplet_save_ptr; - char * endptr; - char * value; - long tq; - char * flag; + size_t len = 0; + ssize_t read; + char *line = NULL; + char *orig, *from; + char *duplet; + char *line_save_ptr; + char *duplet_save_ptr; + char *endptr; + char *value; + long tq; + char *flag; - FILE * fp = open_vis(); + FILE *fp = open_vis(); - if (!fp) - return EXIT_FAILURE; + if (!fp) + return EXIT_FAILURE; - if (funcs->print_header) - funcs->print_header(); + if (funcs->print_header) + funcs->print_header(); - while ((read = getline(&line, &len, fp)) != -1) { - /* First MAC address is the originator */ - orig = strtok_r(line, ",", &line_save_ptr); + while ((read = getline(&line, &len, fp)) != -1) { + /* First MAC address is the originator */ + orig = strtok_r(line, ",", &line_save_ptr); - duplet_save_ptr = line_save_ptr; - while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { - flag = strtok(duplet, " "); - if (!flag) - continue; - if (!strcmp(flag, "TQ")) { - from = strtok(NULL, " "); - value = strtok(NULL, " "); - tq = strtoul(value, &endptr, 0); - funcs->print_tq(orig, from, tq); - continue; - } - if (!strcmp(flag, "HNA")) { - /* We have an HNA record */ - if (!with_HNA) - continue; - from = strtok(NULL, " "); - funcs->print_HNA(orig, from); - continue; - } - if (!strcmp(flag, "SEC") && with_2nd) { - /* We found a secondary interface MAC address.*/ - from = strtok(NULL, " "); - funcs->print_2nd(orig, from); - } - if (!strcmp(flag, "PRIMARY") && with_2nd) { - /* We found a primary interface MAC address.*/ - funcs->print_1st(orig); - } - } - } + duplet_save_ptr = line_save_ptr; + while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { + flag = strtok(duplet, " "); + if (!flag) + continue; + if (!strcmp(flag, "TQ")) { + from = strtok(NULL, " "); + value = strtok(NULL, " "); + tq = strtoul(value, &endptr, 0); + funcs->print_tq(orig, from, tq); + continue; + } + if (!strcmp(flag, "HNA")) { + /* We have an HNA record */ + if (!with_HNA) + continue; + from = strtok(NULL, " "); + funcs->print_HNA(orig, from); + continue; + } + if (!strcmp(flag, "SEC") && with_2nd) { + /* We found a secondary interface MAC address. */ + from = strtok(NULL, " "); + funcs->print_2nd(orig, from); + } + if (!strcmp(flag, "PRIMARY") && with_2nd) { + /* We found a primary interface MAC address. */ + funcs->print_1st(orig); + } + } + } - if (funcs->print_footer) - funcs->print_footer(); + if (funcs->print_footer) + funcs->print_footer(); - if (line) - free(line); - return EXIT_SUCCESS; + if (line) + free(line); + return EXIT_SUCCESS; } -int -vis_data(int argc, char *argv[]) +int vis_data(int argc, char *argv[]) { - bool dot = false; - bool json = false; - int c; + bool dot = false; + bool json = false; + int c; - if (argc <=1) { - usage(); - return EXIT_FAILURE; - } + if (argc <= 1) { + usage(); + return EXIT_FAILURE; + } - /* Do we know the requested format? */ - if (strcmp(argv[1], "dot") == 0) - dot=true; - if (strcmp(argv[1], "json") == 0) - json=true; + /* Do we know the requested format? */ + if (strcmp(argv[1], "dot") == 0) + dot = true; + if (strcmp(argv[1], "json") == 0) + json = true; - if (!dot && !json) { - usage(); - return EXIT_FAILURE; - } + if (!dot && !json) { + usage(); + return EXIT_FAILURE; + } - /* Move over the output format */ - argc--; - argv++; + /* Move over the output format */ + argc--; + argv++; - while (1) { - int option_index = 0; - static struct option long_options[] = { - {"no-HNA", 0, 0, 'h'}, - {"no-2nd", 0, 0, '2'}, - {"numbers", 0, 0, 'n'}, - {0, 0, 0, 0} - }; + while (1) { + int option_index = 0; + static struct option long_options[] = { + {"no-HNA", 0, 0, 'h'}, + {"no-2nd", 0, 0, '2'}, + {"numbers", 0, 0, 'n'}, + {0, 0, 0, 0} + }; - c = getopt_long(argc, argv, "h2n", long_options, &option_index); - if (c == -1) - break; + c = getopt_long(argc, argv, "h2n", long_options, &option_index); + if (c == -1) + break; - switch(c) { - case 'h': - with_HNA = false; - break; - case '2': - with_2nd = false; - break; - case 'n': - with_names = false; - break; - default: - usage(); - return -1; - } - } + switch (c) { + case 'h': + with_HNA = false; + break; + case '2': + with_2nd = false; + break; + case 'n': + with_names = false; + break; + default: + usage(); + return -1; + } + } - if (with_names) - bat_hosts_init(); + if (with_names) + bat_hosts_init(); - if (dot) - return format(&dot_funcs); + if (dot) + return format(&dot_funcs); - if (json) - return format(&json_funcs); + if (json) + return format(&json_funcs); - return EXIT_FAILURE; + return EXIT_FAILURE; }

1 0

r1514 - trunk/batctl
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:18 +0000 (Tue, 29 Dec 2009) New Revision: 1514 Modified: trunk/batctl/README trunk/batctl/main.c trunk/batctl/proc.c trunk/batctl/proc.h trunk/batctl/vis.c trunk/batctl/vis.h Log: batctl: adjust vis server/data file path The kernel module changed the vis data file path which need to be changed in batctl as well. This patch depends on the "splitting /proc vis file into vis_server and vis_data" patch. Also, the vis_server has been added which needs to be supported as well. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batctl/README =================================================================== --- trunk/batctl/README 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/README 2009-12-29 13:02:18 UTC (rev 1514) @@ -11,15 +11,15 @@ hosts participating in the virtual switch are completely transparent for all protocols above layer 2. Therefore the common diagnosis tools do not work as expected. To overcome these problems batctl was created. At the moment batctl -contains ping, traceroute, tcpdump and interfaces to the kernel module +contains ping, traceroute, tcpdump and interfaces to the kernel module settings. How does it work ? ================== -batctl uses the /dev/batman-adv device provided by the B.A.T.M.A.N. advanced -kernel module to inject custom icmp packets into the data flow. That's why +batctl uses the /dev/batman-adv device provided by the B.A.T.M.A.N. advanced +kernel module to inject custom icmp packets into the data flow. That's why ping and traceroute work almost like their IP based counterparts. Tcpdump was designed because B.A.T.M.A.N. advanced encapsulates all traffic within batman packets, so that the normal tcpdump would not recognize the packets. @@ -30,7 +30,7 @@ This file is simliar to the /etc/hosts file. You can write one MAC address and one host name per line. batctl will analyze the file to find the matching MAC -address to your provided host name. Host names are much easier to remember +address to your provided host name. Host names are much easier to remember than MAC addresses. ;) @@ -39,9 +39,9 @@ Sends a Layer 2 batman-adv ping to check round trip time and connectivity -Usage: batctl ping [options] mac|bat-host +Usage: batctl ping [options] mac|bat-host options: - -c ping packet count + -c ping packet count -h print this help -i interval in seconds -t timeout in seconds @@ -60,10 +60,10 @@ batctl traceroute ================== -Traceroute sends 3 packets to each hop, awaits the answers and prints out the +Traceroute sends 3 packets to each hop, awaits the answers and prints out the response times. -Usage: batctl traceroute [options] mac|bat-host +Usage: batctl traceroute [options] mac|bat-host Example: @@ -121,15 +121,15 @@ ============= Analyzes the logfiles to build a small internal database of all sent sequence -numbers and routing table changes. This database can be used to search for -routing loops (default action), to trace OGMs of a host (use "-t" to -specify the mac address or bat-host name) throughout the network or to -display routing tables of the nodes (use "-r" to specify the mac address or +numbers and routing table changes. This database can be used to search for +routing loops (default action), to trace OGMs of a host (use "-t" to +specify the mac address or bat-host name) throughout the network or to +display routing tables of the nodes (use "-r" to specify the mac address or bat-host name). You can name a specific sequence number or a range using the -"-s" option to limit the output's range. Furthermore you can filter the -output by specifying an originator (use "-o" to specify the mac address or +"-s" option to limit the output's range. Furthermore you can filter the +output by specifying an originator (use "-o" to specify the mac address or bat-host name) to only see data connected to this originator. If "-n" was -given batctl will not replace the mac addresses with bat-host names in the +given batctl will not replace the mac addresses with bat-host names in the output. Usage: batctl bisect [options] <file1> <file2> .. <fileN> @@ -226,7 +226,7 @@ Example: $ batctl originators - Originator (#/255) Nexthop [outgoingIF]: Potential nexthops ... [B.A.T.M.A.N. adv 0.2-beta r1457, MainIF/MAC: eth0/fe:fe:00:00:01:01] + Originator (#/255) Nexthop [outgoingIF]: Potential nexthops ... [B.A.T.M.A.N. adv 0.2-beta r1457, MainIF/MAC: eth0/fe:fe:00:00:01:01] fe:fe:00:00:05:01 (223) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 96) fe:fe:00:00:02:01 (223) fe:fe:00:00:04:01 (233) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 (100) fe:fe:00:00:02:01 (233) fe:fe:00:00:02:01 (254) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (254) fe:fe:00:00:03:01 (100) @@ -241,12 +241,12 @@ display or modify the interface settings -Usage: batctl interface|if [none|interface] +Usage: batctl interface|if [none|interface] Example: $ batctl interface -[ active] eth0 fe:fe:00:00:01:01 +[ active] eth0 fe:fe:00:00:01:01 batctl interval =============== @@ -270,13 +270,13 @@ Example: $ batctl log -r) -[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:01:01 via prev OG: fe:fe:00:00:01:01 seqno 670, tq 245, TTL 49, V 8, IDF 1) -[ 400] Drop packet: originator packet from myself (via neighbour) -[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:02:01 via prev OG: fe:fe:00:00:02:01 seqno 545, tq 255, TTL 50, V 8, IDF 0) -[ 400] updating last_seqno: old 544, new 545 -[ 400] bidirectional: orig = fe:fe:00:00:02:01 neigh = fe:fe:00:00:02:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 255 -[ 400] update_originator(): Searching and updating originator entry of received packet +r) +[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:01:01 via prev OG: fe:fe:00:00:01:01 seqno 670, tq 245, TTL 49, V 8, IDF 1) +[ 400] Drop packet: originator packet from myself (via neighbour) +[ 400] Received BATMAN packet via NB: fe:fe:00:00:02:01 IF: eth0 [fe:fe:00:00:01:01] (from OG: fe:fe:00:00:02:01 via prev OG: fe:fe:00:00:02:01 seqno 545, tq 255, TTL 50, V 8, IDF 0) +[ 400] updating last_seqno: old 544, new 545 +[ 400] bidirectional: orig = fe:fe:00:00:02:01 neigh = fe:fe:00:00:02:01 => own_bcast = 64, real recv = 64, local tq: 255, asym_penalty: 255, total tq: 255 +[ 400] update_originator(): Searching and updating originator entry of received packet [ 400] Updating existing last-hop neighbour of originator [...] @@ -285,10 +285,10 @@ display or modify the log level -Usage: batctl |ll [level] +Usage: batctl |ll [level] Example: -$ batctl loglevel +$ batctl loglevel [x] critical (0) [x] warnings (1) [x] notices (2) @@ -307,9 +307,9 @@ display the local translation table -Usage: batctl translocal|tl +Usage: batctl translocal|tl -Example: +Example: $ batctl translocal Locally retrieved addresses (from bat0) announced via HNA: @@ -320,32 +320,32 @@ display the global translation table -Usage: batctl transglobal|tg +Usage: batctl transglobal|tg Example: Globally announced HNAs received via the mesh (translation table): - * 16:aa:c4:a2:00:00 via fe:fe:00:00:09:01 - * 5a:32:f9:df:00:00 via fe:fe:00:00:03:01 - * 32:ae:5a:00:00:00 via fe:fe:00:00:04:01 - * 86:88:80:29:00:00 via fe:fe:00:00:08:01 - * 9e:d8:72:f2:00:00 via fe:fe:00:00:02:01 - * 76:84:68:49:00:00 via fe:fe:00:00:05:01 - * 86:4b:b2:d2:00:00 via fe:fe:00:00:07:01 - * ca:a1:5b:e5:00:00 via fe:fe:00:00:06:01 + * 16:aa:c4:a2:00:00 via fe:fe:00:00:09:01 + * 5a:32:f9:df:00:00 via fe:fe:00:00:03:01 + * 32:ae:5a:00:00:00 via fe:fe:00:00:04:01 + * 86:88:80:29:00:00 via fe:fe:00:00:08:01 + * 9e:d8:72:f2:00:00 via fe:fe:00:00:02:01 + * 76:84:68:49:00:00 via fe:fe:00:00:05:01 + * 86:4b:b2:d2:00:00 via fe:fe:00:00:07:01 + * ca:a1:5b:e5:00:00 via fe:fe:00:00:06:01 -batctl visformat +batctl vis_server ================ -display or modify the vis output format +display or modify the status of the VIS server -Usage: batctl visformat|vf [format] +Usage: batctl vis_server|vs [enable|disable] -Example: +Example: -$ batctl visformat -[x] dot_draw -[ ] json +$ batctl vis_server +[x] client mode (server disabled) +[ ] server mode (server enabled) Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/main.c 2009-12-29 13:02:18 UTC (rev 1514) @@ -48,7 +48,8 @@ printf(" \tlog|l \tread the log produced by the kernel module\n"); printf(" \ttranslocal|tl \tdisplay the local translation table\n"); printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tvis [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); + printf(" \tvis_server|vs [enable|disable] \tdisplay or modify the status of the VIS server\n"); + printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); printf("\n"); printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); @@ -121,10 +122,14 @@ ret = handle_proc_setting(argc - 1, argv + 1, PROC_ORIG_INTERVAL, orig_interval_usage); - } else if (strcmp(argv[1], "vis") == 0) { + } else if ((strcmp(argv[1], "vis_server") == 0) || (strcmp(argv[1], "vs") == 0)) { - ret = vis(argc - 1, argv + 1); + ret = handle_proc_setting(argc - 1, argv + 1, PROC_VIS_SERVER, vis_server_usage); + } else if ((strcmp(argv[1], "vis_data") == 0) || (strcmp(argv[1], "vd") == 0)) { + + ret = vis_data(argc - 1, argv + 1); + } else if ((strcmp(argv[1], "aggregation") == 0) || (strcmp(argv[1], "ag") == 0)) { ret = handle_proc_setting(argc - 1, argv + 1, PROC_AGGR, aggregation_usage); Modified: trunk/batctl/proc.c =================================================================== --- trunk/batctl/proc.c 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/proc.c 2009-12-29 13:02:18 UTC (rev 1514) @@ -102,9 +102,9 @@ printf(" \t -h print this help\n"); } -void vis_format_usage(void) +void vis_server_usage(void) { - printf("Usage: batctl [options] visformat \n"); + printf("Usage: batctl [options] vis_server \n"); printf("options:\n"); printf(" \t -h print this help\n"); } Modified: trunk/batctl/proc.h =================================================================== --- trunk/batctl/proc.h 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/proc.h 2009-12-29 13:02:18 UTC (rev 1514) @@ -28,8 +28,8 @@ #define PROC_GATEWAYS "gateways" #define PROC_TRANSTABLE_LOCAL "transtable_local" #define PROC_TRANSTABLE_GLOBAL "transtable_global" -#define PROC_VIS "vis" -#define PROC_VIS_FORMAT "vis_format" +#define PROC_VIS_SERVER "vis_server" +#define PROC_VIS_DATA "vis_data" #define PROC_AGGR "aggregate_ogm" @@ -39,7 +39,7 @@ void trans_local_usage(void); void trans_global_usage(void); void orig_interval_usage(void); -void vis_format_usage(void); +void vis_server_usage(void); void aggregation_usage(void); int handle_table(int argc, char **argv, char *file_path, void table_usage(void)); int handle_proc_setting(int argc, char **argv, char *file_path, void setting_usage(void)); Modified: trunk/batctl/vis.c =================================================================== --- trunk/batctl/vis.c 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/vis.c 2009-12-29 13:02:18 UTC (rev 1514) @@ -40,7 +40,7 @@ typedef void (*print_header_t)(void); typedef void (*print_footer_t)(void); -struct funcs +struct funcs { print_tq_t print_tq; print_HNA_t print_HNA; @@ -54,7 +54,7 @@ static bool with_2nd = true; static bool with_names = true; -static void +static void usage(void) { printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); @@ -62,25 +62,25 @@ printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); } -static void +static void dot_print_tq(char * orig, char * from, const long tq) { int int_part = TQ_MAX_VALUE / tq; int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); - + printf("\t\"%s\" -> ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"%s\" [label=\"%d.%d\"]\n", + printf("\"%s\" [label=\"%d.%d\"]\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), int_part, frac_part); } -static void +static void dot_print_HNA(char * orig, char * from) { printf("\t\"%s\" -> ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("\"%s\" [label=\"HNA\"]\n", + printf("\"%s\" [label=\"HNA\"]\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } @@ -107,18 +107,18 @@ } static void -dot_print_header(void) +dot_print_header(void) { printf("digraph {\n"); } static void -dot_print_footer(void) +dot_print_footer(void) { printf("}\n"); } -const struct funcs dot_funcs = +const struct funcs dot_funcs = { dot_print_tq, dot_print_HNA, dot_print_1st, @@ -127,25 +127,25 @@ dot_print_footer }; -static void +static void json_print_tq(char * orig, char * from, const long tq) { int int_part = TQ_MAX_VALUE / tq; int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); - + printf("\t{ router : \"%s\", ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("neighbor : \"%s\", label : \"%d.%d\" }\n", + printf("neighbor : \"%s\", label : \"%d.%d\" }\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), int_part, frac_part); } -static void +static void json_print_HNA(char * orig, char * from) { printf("\t{ router : \"%s\", ", get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); - printf("gateway : \"%s\", label : \"HNA\" }\n", + printf("gateway : \"%s\", label : \"HNA\" }\n", get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); } @@ -166,7 +166,7 @@ get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); } -const struct funcs json_funcs = +const struct funcs json_funcs = { json_print_tq, json_print_HNA, json_print_1st, @@ -176,21 +176,21 @@ }; static FILE * -open_vis(void) +open_vis(void) { char full_path[500]; - + if (check_proc_dir("/proc") != EXIT_SUCCESS) return NULL; strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH)); full_path[strlen(PROC_ROOT_PATH)] = '\0'; - strncat(full_path, "vis", sizeof(full_path) - strlen(full_path)); + strncat(full_path, PROC_VIS_DATA, sizeof(full_path) - strlen(full_path)); return fopen(full_path, "r"); } -static int +static int format(const struct funcs *funcs) { size_t len = 0; @@ -204,15 +204,15 @@ char * value; long tq; char * flag; - - FILE * fp = open_vis(); + FILE * fp = open_vis(); + if (!fp) return EXIT_FAILURE; - + if (funcs->print_header) funcs->print_header(); - + while ((read = getline(&line, &len, fp)) != -1) { /* First MAC address is the originator */ orig = strtok_r(line, ",", &line_save_ptr); @@ -220,7 +220,7 @@ duplet_save_ptr = line_save_ptr; while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { flag = strtok(duplet, " "); - if (!flag) + if (!flag) continue; if (!strcmp(flag, "TQ")) { from = strtok(NULL, " "); @@ -231,7 +231,7 @@ } if (!strcmp(flag, "HNA")) { /* We have an HNA record */ - if (!with_HNA) + if (!with_HNA) continue; from = strtok(NULL, " "); funcs->print_HNA(orig, from); @@ -248,17 +248,17 @@ } } } - + if (funcs->print_footer) funcs->print_footer(); - + if (line) free(line); return EXIT_SUCCESS; } -int -vis(int argc, char *argv[]) +int +vis_data(int argc, char *argv[]) { bool dot = false; bool json = false; @@ -268,22 +268,22 @@ usage(); return EXIT_FAILURE; } - + /* Do we know the requested format? */ if (strcmp(argv[1], "dot") == 0) dot=true; if (strcmp(argv[1], "json") == 0) json=true; - + if (!dot && !json) { usage(); return EXIT_FAILURE; } - + /* Move over the output format */ argc--; argv++; - + while (1) { int option_index = 0; static struct option long_options[] = { @@ -292,11 +292,11 @@ {"numbers", 0, 0, 'n'}, {0, 0, 0, 0} }; - + c = getopt_long(argc, argv, "h2n", long_options, &option_index); if (c == -1) break; - + switch(c) { case 'h': with_HNA = false; @@ -312,13 +312,13 @@ return -1; } } - + if (with_names) bat_hosts_init(); - - if (dot) + + if (dot) return format(&dot_funcs); - + if (json) return format(&json_funcs); Modified: trunk/batctl/vis.h =================================================================== --- trunk/batctl/vis.h 2009-12-29 13:02:17 UTC (rev 1513) +++ trunk/batctl/vis.h 2009-12-29 13:02:18 UTC (rev 1514) @@ -17,5 +17,5 @@ * */ -int vis(int argc, char * argv[]); +int vis_data(int argc, char * argv[]);

1 0

r1513 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:17 +0000 (Tue, 29 Dec 2009) New Revision: 1513 Modified: trunk/batman-adv-kernelland/proc.c trunk/batman-adv-kernelland/proc.h trunk/batman-adv-kernelland/types.h trunk/batman-adv-kernelland/vis.c trunk/batman-adv-kernelland/vis.h Log: batman-adv: splitting /proc vis file into vis_server and vis_data The /proc vis file was used to enable/disable the vis server and to output the vis data at the same time. This behaviour was confusing and lacked a proper method to display the current vis server status. This patch seperates the 2 functionalities: * use vis_server to enable/disable the vis server and to retrieve its status * use vis_data to retrieve the vis raw data (if the server is enabled) Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2009-12-29 13:02:15 UTC (rev 1512) +++ trunk/batman-adv-kernelland/proc.c 2009-12-29 13:02:17 UTC (rev 1513) @@ -33,7 +33,7 @@ static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file; static struct proc_dir_entry *proc_transt_local_file; static struct proc_dir_entry *proc_transt_global_file; -static struct proc_dir_entry *proc_vis_file; +static struct proc_dir_entry *proc_vis_srv_file, *proc_vis_data_file; static struct proc_dir_entry *proc_aggr_file; static int proc_interfaces_read(struct seq_file *seq, void *offset) @@ -320,79 +320,55 @@ return single_open(file, proc_transt_global_read, NULL); } -/* While scanning for vis-entries of a particular vis-originator - * this list collects its interfaces to create a subgraph/cluster - * out of them later - */ -struct if_list_entry { - uint8_t addr[ETH_ALEN]; - bool primary; - struct hlist_node list; -}; - -/* insert interface to the list of interfaces of one originator, if it - * does not already exist in the list */ -static void proc_vis_insert_interface(const uint8_t *interface, - struct hlist_head *if_list, - bool primary) +/* setting the mode of the vis server by the user */ +static ssize_t proc_vis_srv_write(struct file *file, const char __user * buffer, + size_t count, loff_t *ppos) { - struct if_list_entry *entry; - struct hlist_node *pos; + char *vis_mode_string; + int not_copied = 0; - hlist_for_each_entry(entry, pos, if_list, list) { - if (compare_orig(entry->addr, (void *)interface)) - return; - } + vis_mode_string = kmalloc(count, GFP_KERNEL); - /* its a new address, add it to the list */ - entry = kmalloc(sizeof(*entry), GFP_KERNEL); - if (!entry) - return; - memcpy(entry->addr, interface, ETH_ALEN); - entry->primary = primary; - hlist_add_head(&entry->list, if_list); + if (!vis_mode_string) + return -ENOMEM; + + not_copied = copy_from_user(vis_mode_string, buffer, count); + vis_mode_string[count - not_copied - 1] = 0; + + if ((strcmp(vis_mode_string, "client") == 0) || + (strcmp(vis_mode_string, "disabled") == 0)) { + printk(KERN_INFO "batman-adv:Setting VIS mode to client (disabling vis server)\n"); + vis_set_mode(VIS_TYPE_CLIENT_UPDATE); + } else if ((strcmp(vis_mode_string, "server") == 0) || + (strcmp(vis_mode_string, "enabled") == 0)) { + printk(KERN_INFO "batman-adv:Setting VIS mode to server (enabling vis server)\n"); + vis_set_mode(VIS_TYPE_SERVER_SYNC); + } else + printk(KERN_ERR "batman-adv:Unknown VIS mode: %s\n", + vis_mode_string); + + kfree(vis_mode_string); + return count; } -static void proc_vis_read_prim_sec(struct seq_file *seq, - struct hlist_head *if_list) +static int proc_vis_srv_read(struct seq_file *seq, void *offset) { - struct if_list_entry *entry; - struct hlist_node *pos, *n; - char tmp_addr_str[ETH_STR_LEN]; + int vis_server = is_vis_server(); - hlist_for_each_entry_safe(entry, pos, n, if_list, list) { - if (entry->primary) { - seq_printf(seq, "PRIMARY, "); - } else { - addr_to_string(tmp_addr_str, entry->addr); - seq_printf(seq, "SEC %s, ", tmp_addr_str); - } + seq_printf(seq, "[%c] client mode (server disabled) \n", + (!vis_server) ? 'x' : ' '); + seq_printf(seq, "[%c] server mode (server enabled) \n", + (vis_server) ? 'x' : ' '); - hlist_del(&entry->list); - kfree(entry); - } + return 0; } -/* read an entry */ -static void proc_vis_read_entry(struct seq_file *seq, - struct vis_info_entry *entry, - struct hlist_head *if_list, - uint8_t *vis_orig) +static int proc_vis_srv_open(struct inode *inode, struct file *file) { - char to[40]; - - addr_to_string(to, entry->dest); - if (entry->quality == 0) { - proc_vis_insert_interface(vis_orig, if_list, true); - seq_printf(seq, "HNA %s, ", to); - } else { - proc_vis_insert_interface(entry->src, if_list, - compare_orig(entry->src, vis_orig)); - seq_printf(seq, "TQ %s %d, ", to, entry->quality); - } + return single_open(file, proc_vis_srv_read, NULL); } -static int proc_vis_read(struct seq_file *seq, void *offset) +static int proc_vis_data_read(struct seq_file *seq, void *offset) { HASHIT(hashit); struct vis_info *info; @@ -432,40 +408,11 @@ return 0; } -/* setting the mode of the vis server by the user */ -static ssize_t proc_vis_write(struct file *file, const char __user * buffer, - size_t count, loff_t *ppos) +static int proc_vis_data_open(struct inode *inode, struct file *file) { - char *vis_mode_string; - int not_copied = 0; - - vis_mode_string = kmalloc(count, GFP_KERNEL); - - if (!vis_mode_string) - return -ENOMEM; - - not_copied = copy_from_user(vis_mode_string, buffer, count); - vis_mode_string[count - not_copied - 1] = 0; - - if (strcmp(vis_mode_string, "client") == 0) { - printk(KERN_INFO "batman-adv:Setting VIS mode to client\n"); - vis_set_mode(VIS_TYPE_CLIENT_UPDATE); - } else if (strcmp(vis_mode_string, "server") == 0) { - printk(KERN_INFO "batman-adv:Setting VIS mode to server\n"); - vis_set_mode(VIS_TYPE_SERVER_SYNC); - } else - printk(KERN_ERR "batman-adv:Unknown VIS mode: %s\n", - vis_mode_string); - - kfree(vis_mode_string); - return count; + return single_open(file, proc_vis_data_read, NULL); } -static int proc_vis_open(struct inode *inode, struct file *file) -{ - return single_open(file, proc_vis_read, NULL); -} - static int proc_aggr_read(struct seq_file *seq, void *offset) { seq_printf(seq, "%i\n", atomic_read(&aggregation_enabled)); @@ -529,15 +476,24 @@ .release = single_release, }; -static const struct file_operations proc_vis_fops = { +static const struct file_operations proc_vis_srv_fops = { .owner = THIS_MODULE, - .open = proc_vis_open, + .open = proc_vis_srv_open, .read = seq_read, - .write = proc_vis_write, + .write = proc_vis_srv_write, .llseek = seq_lseek, .release = single_release, }; +static const struct file_operations proc_vis_data_fops = { + .owner = THIS_MODULE, + .open = proc_vis_data_open, + .read = seq_read, + .write = proc_dummy_write, + .llseek = seq_lseek, + .release = single_release, +}; + static const struct file_operations proc_originators_fops = { .owner = THIS_MODULE, .open = proc_originators_open, @@ -600,9 +556,12 @@ if (proc_interface_file) remove_proc_entry(PROC_FILE_INTERFACES, proc_batman_dir); - if (proc_vis_file) - remove_proc_entry(PROC_FILE_VIS, proc_batman_dir); + if (proc_vis_data_file) + remove_proc_entry(PROC_FILE_VIS_DATA, proc_batman_dir); + if (proc_vis_srv_file) + remove_proc_entry(PROC_FILE_VIS_SRV, proc_batman_dir); + if (proc_aggr_file) remove_proc_entry(PROC_FILE_AGGR, proc_batman_dir); @@ -679,12 +638,23 @@ return -EFAULT; } - proc_vis_file = create_proc_entry(PROC_FILE_VIS, S_IWUSR | S_IRUGO, + proc_vis_srv_file = create_proc_entry(PROC_FILE_VIS_SRV, + S_IWUSR | S_IRUGO, + proc_batman_dir); + if (proc_vis_srv_file) { + proc_vis_srv_file->proc_fops = &proc_vis_srv_fops; + } else { + printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_SRV); + cleanup_procfs(); + return -EFAULT; + } + + proc_vis_data_file = create_proc_entry(PROC_FILE_VIS_DATA, S_IRUGO, proc_batman_dir); - if (proc_vis_file) { - proc_vis_file->proc_fops = &proc_vis_fops; + if (proc_vis_data_file) { + proc_vis_data_file->proc_fops = &proc_vis_data_fops; } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS); + printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_DATA); cleanup_procfs(); return -EFAULT; } Modified: trunk/batman-adv-kernelland/proc.h =================================================================== --- trunk/batman-adv-kernelland/proc.h 2009-12-29 13:02:15 UTC (rev 1512) +++ trunk/batman-adv-kernelland/proc.h 2009-12-29 13:02:17 UTC (rev 1513) @@ -31,8 +31,8 @@ #define PROC_FILE_LOG_LEVEL "log_level" #define PROC_FILE_TRANST_LOCAL "transtable_local" #define PROC_FILE_TRANST_GLOBAL "transtable_global" -#define PROC_FILE_VIS "vis" -#define PROC_FILE_VIS_FORMAT "vis_format" +#define PROC_FILE_VIS_SRV "vis_server" +#define PROC_FILE_VIS_DATA "vis_data" #define PROC_FILE_AGGR "aggregate_ogm" void cleanup_procfs(void); Modified: trunk/batman-adv-kernelland/types.h =================================================================== --- trunk/batman-adv-kernelland/types.h 2009-12-29 13:02:15 UTC (rev 1512) +++ trunk/batman-adv-kernelland/types.h 2009-12-29 13:02:17 UTC (rev 1513) @@ -121,4 +121,14 @@ struct batman_if *if_incoming; }; +/* While scanning for vis-entries of a particular vis-originator + * this list collects its interfaces to create a subgraph/cluster + * out of them later + */ +struct if_list_entry { + uint8_t addr[ETH_ALEN]; + bool primary; + struct hlist_node list; +}; + #endif Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2009-12-29 13:02:15 UTC (rev 1512) +++ trunk/batman-adv-kernelland/vis.c 2009-12-29 13:02:17 UTC (rev 1513) @@ -114,6 +114,68 @@ return hash % size; } +/* insert interface to the list of interfaces of one originator, if it + * does not already exist in the list */ +static void proc_vis_insert_interface(const uint8_t *interface, + struct hlist_head *if_list, + bool primary) +{ + struct if_list_entry *entry; + struct hlist_node *pos; + + hlist_for_each_entry(entry, pos, if_list, list) { + if (compare_orig(entry->addr, (void *)interface)) + return; + } + + /* its a new address, add it to the list */ + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + memcpy(entry->addr, interface, ETH_ALEN); + entry->primary = primary; + hlist_add_head(&entry->list, if_list); +} + +void proc_vis_read_prim_sec(struct seq_file *seq, + struct hlist_head *if_list) +{ + struct if_list_entry *entry; + struct hlist_node *pos, *n; + char tmp_addr_str[ETH_STR_LEN]; + + hlist_for_each_entry_safe(entry, pos, n, if_list, list) { + if (entry->primary) { + seq_printf(seq, "PRIMARY, "); + } else { + addr_to_string(tmp_addr_str, entry->addr); + seq_printf(seq, "SEC %s, ", tmp_addr_str); + } + + hlist_del(&entry->list); + kfree(entry); + } +} + +/* read an entry */ +void proc_vis_read_entry(struct seq_file *seq, + struct vis_info_entry *entry, + struct hlist_head *if_list, + uint8_t *vis_orig) +{ + char to[40]; + + addr_to_string(to, entry->dest); + if (entry->quality == 0) { + proc_vis_insert_interface(vis_orig, if_list, true); + seq_printf(seq, "HNA %s, ", to); + } else { + proc_vis_insert_interface(entry->src, if_list, + compare_orig(entry->src, vis_orig)); + seq_printf(seq, "TQ %s %d, ", to, entry->quality); + } +} + /* tries to add one entry to the receive list. */ static void recv_list_add(struct list_head *recv_list, char *mac) { Modified: trunk/batman-adv-kernelland/vis.h =================================================================== --- trunk/batman-adv-kernelland/vis.h 2009-12-29 13:02:15 UTC (rev 1512) +++ trunk/batman-adv-kernelland/vis.h 2009-12-29 13:02:17 UTC (rev 1513) @@ -50,6 +50,12 @@ void vis_set_mode(int mode); int is_vis_server(void); +void proc_vis_read_entry(struct seq_file *seq, + struct vis_info_entry *entry, + struct hlist_head *if_list, + uint8_t *vis_orig); +void proc_vis_read_prim_sec(struct seq_file *seq, + struct hlist_head *if_list); void receive_server_sync_packet(struct vis_packet *vis_packet, int vis_info_len); void receive_client_update_packet(struct vis_packet *vis_packet,

1 0

r1512 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:15 +0000 (Tue, 29 Dec 2009) New Revision: 1512 Modified: trunk/batman-adv-kernelland/proc.c trunk/batman-adv-kernelland/vis.h Log: batman-adv: remove obsoleted vis_format /proc file batman-adv used to export the vis data using different formats that were switchable via /proc/net/batman-adv/vis_format. The various formats moved to user space and rendered this configuration switch useless. Signed-off-by: Linus Luessing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2009-12-29 13:02:15 UTC (rev 1511) +++ trunk/batman-adv-kernelland/proc.c 2009-12-29 13:02:15 UTC (rev 1512) @@ -29,13 +29,11 @@ #include "vis.h" #include "compat.h" -static uint8_t vis_format = DOT_DRAW; - static struct proc_dir_entry *proc_batman_dir, *proc_interface_file; static struct proc_dir_entry *proc_orig_interval_file, *proc_originators_file; static struct proc_dir_entry *proc_transt_local_file; static struct proc_dir_entry *proc_transt_global_file; -static struct proc_dir_entry *proc_vis_file, *proc_vis_format_file; +static struct proc_dir_entry *proc_vis_file; static struct proc_dir_entry *proc_aggr_file; static int proc_interfaces_read(struct seq_file *seq, void *offset) @@ -401,11 +399,8 @@ struct vis_info_entry *entries; HLIST_HEAD(vis_if_list); int i; - uint8_t current_format; char tmp_addr_str[ETH_STR_LEN]; - current_format = vis_format; - rcu_read_lock(); if (list_empty(&if_list) || (!is_vis_server())) { rcu_read_unlock(); @@ -471,55 +466,6 @@ return single_open(file, proc_vis_read, NULL); } -static int proc_vis_format_read(struct seq_file *seq, void *offset) -{ - uint8_t current_format = vis_format; - - seq_printf(seq, "[%c] %s\n", - (current_format == DOT_DRAW) ? 'x' : ' ', - VIS_FORMAT_DD_NAME); - seq_printf(seq, "[%c] %s\n", - (current_format == JSON) ? 'x' : ' ', - VIS_FORMAT_JSON_NAME); - return 0; -} - -static int proc_vis_format_open(struct inode *inode, struct file *file) -{ - return single_open(file, proc_vis_format_read, NULL); -} - -static ssize_t proc_vis_format_write(struct file *file, - const char __user *buffer, - size_t count, loff_t *ppos) -{ - char *vis_format_string; - int not_copied = 0; - - vis_format_string = kmalloc(count, GFP_KERNEL); - - if (!vis_format_string) - return -ENOMEM; - - not_copied = copy_from_user(vis_format_string, buffer, count); - vis_format_string[count - not_copied - 1] = 0; - - if (strcmp(vis_format_string, VIS_FORMAT_DD_NAME) == 0) { - printk(KERN_INFO "batman-adv:Setting VIS output format to: %s\n", - VIS_FORMAT_DD_NAME); - vis_format = DOT_DRAW; - } else if (strcmp(vis_format_string, VIS_FORMAT_JSON_NAME) == 0) { - printk(KERN_INFO "batman-adv:Setting VIS output format to: %s\n", - VIS_FORMAT_JSON_NAME); - vis_format = JSON; - } else - printk(KERN_ERR "batman-adv:Unknown VIS output format: %s\n", - vis_format_string); - - kfree(vis_format_string); - return count; -} - static int proc_aggr_read(struct seq_file *seq, void *offset) { seq_printf(seq, "%i\n", atomic_read(&aggregation_enabled)); @@ -583,15 +529,6 @@ .release = single_release, }; -static const struct file_operations proc_vis_format_fops = { - .owner = THIS_MODULE, - .open = proc_vis_format_open, - .read = seq_read, - .write = proc_vis_format_write, - .llseek = seq_lseek, - .release = single_release, -}; - static const struct file_operations proc_vis_fops = { .owner = THIS_MODULE, .open = proc_vis_open, @@ -666,9 +603,6 @@ if (proc_vis_file) remove_proc_entry(PROC_FILE_VIS, proc_batman_dir); - if (proc_vis_format_file) - remove_proc_entry(PROC_FILE_VIS_FORMAT, proc_batman_dir); - if (proc_aggr_file) remove_proc_entry(PROC_FILE_AGGR, proc_batman_dir); @@ -755,17 +689,6 @@ return -EFAULT; } - proc_vis_format_file = create_proc_entry(PROC_FILE_VIS_FORMAT, - S_IWUSR | S_IRUGO, - proc_batman_dir); - if (proc_vis_format_file) { - proc_vis_format_file->proc_fops = &proc_vis_format_fops; - } else { - printk(KERN_ERR "batman-adv: Registering the '/proc/net/%s/%s' file failed\n", PROC_ROOT_DIR, PROC_FILE_VIS_FORMAT); - cleanup_procfs(); - return -EFAULT; - } - proc_aggr_file = create_proc_entry(PROC_FILE_AGGR, S_IWUSR | S_IRUGO, proc_batman_dir); if (proc_aggr_file) { Modified: trunk/batman-adv-kernelland/vis.h =================================================================== --- trunk/batman-adv-kernelland/vis.h 2009-12-29 13:02:15 UTC (rev 1511) +++ trunk/batman-adv-kernelland/vis.h 2009-12-29 13:02:15 UTC (rev 1512) @@ -45,11 +45,6 @@ uint8_t mac[ETH_ALEN]; }; -enum vis_formats { - DOT_DRAW, - JSON, -}; - extern struct hashtable_t *vis_hash; extern spinlock_t vis_hash_lock;

1 0

r1511 - in trunk/batctl: . man
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:15 +0000 (Tue, 29 Dec 2009) New Revision: 1511 Added: trunk/batctl/vis.c trunk/batctl/vis.h Modified: trunk/batctl/Makefile trunk/batctl/functions.c trunk/batctl/functions.h trunk/batctl/main.c trunk/batctl/man/batctl.8 Log: batctl: Parse the new /proc vis format. Add code to batctl so that it can parse /proc/net/batman-adv/vis and generate either graphvis dot or JSON output. Tested and bugs found and fixed by Linus Luessing. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Linus Luessing <linus.luessing(a)web.de> Modified: trunk/batctl/Makefile =================================================================== --- trunk/batctl/Makefile 2009-12-29 13:02:14 UTC (rev 1510) +++ trunk/batctl/Makefile 2009-12-29 13:02:15 UTC (rev 1511) @@ -39,8 +39,8 @@ EXTRA_MODULES_C := bisect.c EXTRA_MODULES_H := bisect.h -SRC_C = main.c bat-hosts.c functions.c proc.c sys.c ping.c traceroute.c tcpdump.c list-batman.c hash.c $(EXTRA_MODULES_C) -SRC_H = main.h bat-hosts.h functions.h proc.h sys.h ping.h traceroute.h tcpdump.h list-batman.h hash.h allocate.h $(EXTRA_MODULES_H) +SRC_C = main.c bat-hosts.c functions.c proc.c sys.c ping.c traceroute.c tcpdump.c list-batman.c hash.c vis.c $(EXTRA_MODULES_C) +SRC_H = main.h bat-hosts.h functions.h proc.h sys.h ping.h traceroute.h tcpdump.h list-batman.h hash.h allocate.h vis.h $(EXTRA_MODULES_H) SRC_O = $(SRC_C:.c=.o) PACKAGE_NAME = batctl Modified: trunk/batctl/functions.c =================================================================== --- trunk/batctl/functions.c 2009-12-29 13:02:14 UTC (rev 1510) +++ trunk/batctl/functions.c 2009-12-29 13:02:15 UTC (rev 1511) @@ -99,7 +99,7 @@ return get_name_by_macaddr(mac_addr, read_opt); } -static int check_proc_dir(char *dir) +int check_proc_dir(char *dir) { struct stat st; Modified: trunk/batctl/functions.h =================================================================== --- trunk/batctl/functions.h 2009-12-29 13:02:14 UTC (rev 1510) +++ trunk/batctl/functions.h 2009-12-29 13:02:15 UTC (rev 1511) @@ -34,6 +34,7 @@ char *get_name_by_macstr(char *mac_str, int read_opt); int read_file(char *dir, char *path, int read_opt); int write_file(char *dir, char *path, char *value); +int check_proc_dir(char *dir); extern char *line_ptr; Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2009-12-29 13:02:14 UTC (rev 1510) +++ trunk/batctl/main.c 2009-12-29 13:02:15 UTC (rev 1511) @@ -35,6 +35,7 @@ #include "traceroute.h" #include "tcpdump.h" #include "bisect.h" +#include "vis.h" void print_usage(void) { @@ -47,7 +48,7 @@ printf(" \tlog|l \tread the log produced by the kernel module\n"); printf(" \ttranslocal|tl \tdisplay the local translation table\n"); printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tvisformat|vf [format] \tdisplay or modify the vis output format\n"); + printf(" \tvis [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); printf("\n"); printf(" \tping|p <destination> \tping another batman adv host via layer 2\n"); @@ -74,7 +75,8 @@ } /* check if user is root */ - if ((strcmp(argv[1], "bisect") != 0) && ((getuid()) || (getgid()))) { + if (((strcmp(argv[1], "bisect") != 0) && (strcmp(argv[1], "vis") != 0)) + && ((getuid()) || (getgid()))) { fprintf(stderr, "Error - you must be root to run '%s' !\n", argv[0]); exit(EXIT_FAILURE); } @@ -119,9 +121,9 @@ ret = handle_proc_setting(argc - 1, argv + 1, PROC_ORIG_INTERVAL, orig_interval_usage); - } else if ((strcmp(argv[1], "visformat") == 0) || (strcmp(argv[1], "vf") == 0)) { + } else if (strcmp(argv[1], "vis") == 0) { - ret = handle_proc_setting(argc - 1, argv + 1, PROC_VIS_FORMAT, vis_format_usage); + ret = vis(argc - 1, argv + 1); } else if ((strcmp(argv[1], "aggregation") == 0) || (strcmp(argv[1], "ag") == 0)) { Modified: trunk/batctl/man/batctl.8 =================================================================== --- trunk/batctl/man/batctl.8 2009-12-29 13:02:14 UTC (rev 1510) +++ trunk/batctl/man/batctl.8 2009-12-29 13:02:15 UTC (rev 1511) @@ -63,9 +63,22 @@ .IP "\fBtransglobal|tg\fP" Once started batctl will refresh the displayed global translation table every second. Use the "\-b" option to let batctl display the table only once (useful for scripts). If "\-n" was given batctl will not replace the mac addresses with bat\-host names in the output. .br -.IP "\fBvisformat|vf [format]\fP" -If no parameter is given the current vis format settings are displayed otherwise the parameter is used to set the vis format. +.IP "\fBvis dot\fP" +Display the visualisation data in graphviz dot(1) format. If +"\--numbers" or "\-n" batctl will not replace the mac addresses with +bat-host names in the output. With "\--no-HNA" or "\-h" the HNA +entries are not displayed, so the pure mesh topology can be seen. With +"\--no-2nd" or "\-2" a dot cluster is not formed around primary and +secondary addresses from the same device. .br +.IP "\fBvis json\fP" +Display the visualisation data in JSON format. If +"\--numbers" or "\-n" batctl will not replace the mac addresses with +bat-host names in the output. With "\--no-HNA" or "\-h" the HNA +entries are not displayed, so the pure mesh topology can be seen. With +"\--no-2nd" or "\-2" a dot cluster is not formed around primary and +secondary addresses from the same device. +.br .IP "\fBaggregation|ag [0|1]\fP" If no parameter is given the current aggregation settings are displayed otherwise the parameter is used to enable or disable the packet aggregation. .br Added: trunk/batctl/vis.c =================================================================== --- trunk/batctl/vis.c (rev 0) +++ trunk/batctl/vis.c 2009-12-29 13:02:15 UTC (rev 1511) @@ -0,0 +1,326 @@ +/* Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Andrew Lunn <andrew(a)lunn.ch> + * + * 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 + * + */ + +#define _GNU_SOURCE +#include <stdio.h> +#include <stdlib.h> +#include <stdint.h> +#include <stdbool.h> +#include <getopt.h> +#include <string.h> + +#include "main.h" +#include "vis.h" +#include "functions.h" +#include "bat-hosts.h" +#include "proc.h" + +#define TQ_MAX_VALUE 255 + +typedef void (*print_tq_t)(char * orig, char * from, const long tq); +typedef void (*print_HNA_t)(char * orig, char * from); +typedef void (*print_1st_t)(char * orig); +typedef void (*print_2nd_t)(char * orig, char * from); +typedef void (*print_header_t)(void); +typedef void (*print_footer_t)(void); + +struct funcs +{ + print_tq_t print_tq; + print_HNA_t print_HNA; + print_1st_t print_1st; + print_2nd_t print_2nd; + print_header_t print_header; + print_footer_t print_footer; +}; + +static bool with_HNA = true; +static bool with_2nd = true; +static bool with_names = true; + +static void +usage(void) +{ + printf("batctl vis dot {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); + printf("or\n"); + printf("batctl vis json {--no-HNA|-h} {--no-2nd|-2} {--numbers|-n}\n"); +} + +static void +dot_print_tq(char * orig, char * from, const long tq) +{ + int int_part = TQ_MAX_VALUE / tq; + int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); + + printf("\t\"%s\" -> ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\"%s\" [label=\"%d.%d\"]\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), + int_part, frac_part); +} + +static void +dot_print_HNA(char * orig, char * from) +{ + printf("\t\"%s\" -> ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\"%s\" [label=\"HNA\"]\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); +} + +static void +dot_print_1st(char * orig) +{ + printf("\tsubgraph \"cluster_%s\" {\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\" [peripheries=2]\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t}\n"); +} + +static void +dot_print_2nd(char * orig, char * from) +{ + printf("\tsubgraph \"cluster_%s\" {\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\" [peripheries=2]\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t\t\"%s\"\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + printf("\t}\n"); +} + +static void +dot_print_header(void) +{ + printf("digraph {\n"); +} + +static void +dot_print_footer(void) +{ + printf("}\n"); +} + +const struct funcs dot_funcs = + { dot_print_tq, + dot_print_HNA, + dot_print_1st, + dot_print_2nd, + dot_print_header, + dot_print_footer +}; + +static void +json_print_tq(char * orig, char * from, const long tq) +{ + int int_part = TQ_MAX_VALUE / tq; + int frac_part = (1000 * TQ_MAX_VALUE / tq) - (int_part * 1000); + + printf("\t{ router : \"%s\", ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("neighbor : \"%s\", label : \"%d.%d\" }\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0)), + int_part, frac_part); +} + +static void +json_print_HNA(char * orig, char * from) +{ + printf("\t{ router : \"%s\", ", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); + printf("gateway : \"%s\", label : \"HNA\" }\n", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); +} + +static void +json_print_1st(char * orig) +{ + printf("\t{ primary : \"%s\" }\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); +} + +static void +json_print_2nd(char * orig, char * from) +{ + printf("\t{ secondary : \"%s\", ", + get_name_by_macstr(from, (with_names ? USE_BAT_HOSTS : 0))); + + printf("of : \"%s\" }\n", + get_name_by_macstr(orig, (with_names ? USE_BAT_HOSTS : 0))); +} + +const struct funcs json_funcs = + { json_print_tq, + json_print_HNA, + json_print_1st, + json_print_2nd, + NULL, + NULL +}; + +static FILE * +open_vis(void) +{ + char full_path[500]; + + if (check_proc_dir("/proc") != EXIT_SUCCESS) + return NULL; + + strncpy(full_path, PROC_ROOT_PATH, strlen(PROC_ROOT_PATH)); + full_path[strlen(PROC_ROOT_PATH)] = '\0'; + strncat(full_path, "vis", sizeof(full_path) - strlen(full_path)); + + return fopen(full_path, "r"); +} + +static int +format(const struct funcs *funcs) +{ + size_t len = 0; + ssize_t read; + char * line = NULL; + char * orig, * from; + char * duplet; + char * line_save_ptr; + char * duplet_save_ptr; + char * endptr; + char * value; + long tq; + char * flag; + + FILE * fp = open_vis(); + + if (!fp) + return EXIT_FAILURE; + + if (funcs->print_header) + funcs->print_header(); + + while ((read = getline(&line, &len, fp)) != -1) { + /* First MAC address is the originator */ + orig = strtok_r(line, ",", &line_save_ptr); + + duplet_save_ptr = line_save_ptr; + while ((duplet = strtok_r(NULL, ",", &duplet_save_ptr)) != NULL) { + flag = strtok(duplet, " "); + if (!flag) + continue; + if (!strcmp(flag, "TQ")) { + from = strtok(NULL, " "); + value = strtok(NULL, " "); + tq = strtoul(value, &endptr, 0); + funcs->print_tq(orig, from, tq); + continue; + } + if (!strcmp(flag, "HNA")) { + /* We have an HNA record */ + if (!with_HNA) + continue; + from = strtok(NULL, " "); + funcs->print_HNA(orig, from); + continue; + } + if (!strcmp(flag, "SEC") && with_2nd) { + /* We found a secondary interface MAC address.*/ + from = strtok(NULL, " "); + funcs->print_2nd(orig, from); + } + if (!strcmp(flag, "PRIMARY") && with_2nd) { + /* We found a primary interface MAC address.*/ + funcs->print_1st(orig); + } + } + } + + if (funcs->print_footer) + funcs->print_footer(); + + if (line) + free(line); + return EXIT_SUCCESS; +} + +int +vis(int argc, char *argv[]) +{ + bool dot = false; + bool json = false; + int c; + + if (argc <=1) { + usage(); + return EXIT_FAILURE; + } + + /* Do we know the requested format? */ + if (strcmp(argv[1], "dot") == 0) + dot=true; + if (strcmp(argv[1], "json") == 0) + json=true; + + if (!dot && !json) { + usage(); + return EXIT_FAILURE; + } + + /* Move over the output format */ + argc--; + argv++; + + while (1) { + int option_index = 0; + static struct option long_options[] = { + {"no-HNA", 0, 0, 'h'}, + {"no-2nd", 0, 0, '2'}, + {"numbers", 0, 0, 'n'}, + {0, 0, 0, 0} + }; + + c = getopt_long(argc, argv, "h2n", long_options, &option_index); + if (c == -1) + break; + + switch(c) { + case 'h': + with_HNA = false; + break; + case '2': + with_2nd = false; + break; + case 'n': + with_names = false; + break; + default: + usage(); + return -1; + } + } + + if (with_names) + bat_hosts_init(); + + if (dot) + return format(&dot_funcs); + + if (json) + return format(&json_funcs); + + return EXIT_FAILURE; +} Added: trunk/batctl/vis.h =================================================================== --- trunk/batctl/vis.h (rev 0) +++ trunk/batctl/vis.h 2009-12-29 13:02:15 UTC (rev 1511) @@ -0,0 +1,21 @@ +/* Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Andrew Lunn <andrew(a)lunn.ch> + * + * 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 + * + */ + +int vis(int argc, char * argv[]); +

1 0

r1510 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 29 Dec '09

29 Dec '09

Author: marek Date: 2009-12-29 13:02:14 +0000 (Tue, 29 Dec 2009) New Revision: 1510 Modified: trunk/batman-adv-kernelland/proc.c trunk/batman-adv-kernelland/proc.h Log: batman-adv: moving vis output formats out of the kernel land The batman-adv kernel module is able to output visualization data using the dot draw or JSON format. This patch transforms the output into a generic format (called vis raw). User space tool may convert the raw data to support a variety of formats without the need of modifying the kernel module. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2009-12-28 03:59:22 UTC (rev 1509) +++ trunk/batman-adv-kernelland/proc.c 2009-12-29 13:02:14 UTC (rev 1510) @@ -322,166 +322,117 @@ return single_open(file, proc_transt_global_read, NULL); } -/* insert interface to the list of interfaces of one originator */ +/* While scanning for vis-entries of a particular vis-originator + * this list collects its interfaces to create a subgraph/cluster + * out of them later + */ +struct if_list_entry { + uint8_t addr[ETH_ALEN]; + bool primary; + struct hlist_node list; +}; +/* insert interface to the list of interfaces of one originator, if it + * does not already exist in the list */ static void proc_vis_insert_interface(const uint8_t *interface, - struct vis_if_list **if_entry, + struct hlist_head *if_list, bool primary) { - /* Did we get an empty list? (then insert imediately) */ - if (*if_entry == NULL) { - *if_entry = kmalloc(sizeof(struct vis_if_list), GFP_KERNEL); - if (*if_entry == NULL) + struct if_list_entry *entry; + struct hlist_node *pos; + + hlist_for_each_entry(entry, pos, if_list, list) { + if (compare_orig(entry->addr, (void *)interface)) return; + } - (*if_entry)->primary = primary; - (*if_entry)->next = NULL; - memcpy((*if_entry)->addr, interface, ETH_ALEN); - } else { - struct vis_if_list *head_if_entry = *if_entry; - /* Do we already have this interface in our list? */ - while (!compare_orig((*if_entry)->addr, (void *)interface)) { + /* its a new address, add it to the list */ + entry = kmalloc(sizeof(*entry), GFP_KERNEL); + if (!entry) + return; + memcpy(entry->addr, interface, ETH_ALEN); + entry->primary = primary; + hlist_add_head(&entry->list, if_list); +} - /* Or did we reach the end (then append the interface) */ - if ((*if_entry)->next == NULL) { - (*if_entry)->next = kmalloc(sizeof(struct vis_if_list), GFP_KERNEL); - if ((*if_entry)->next == NULL) - return; +static void proc_vis_read_prim_sec(struct seq_file *seq, + struct hlist_head *if_list) +{ + struct if_list_entry *entry; + struct hlist_node *pos, *n; + char tmp_addr_str[ETH_STR_LEN]; - memcpy((*if_entry)->next->addr, interface, ETH_ALEN); - (*if_entry)->next->primary = primary; - (*if_entry)->next->next = NULL; - break; - } - *if_entry = (*if_entry)->next; + hlist_for_each_entry_safe(entry, pos, n, if_list, list) { + if (entry->primary) { + seq_printf(seq, "PRIMARY, "); + } else { + addr_to_string(tmp_addr_str, entry->addr); + seq_printf(seq, "SEC %s, ", tmp_addr_str); } - /* Rewind the list to its head */ - *if_entry = head_if_entry; + + hlist_del(&entry->list); + kfree(entry); } } -/* read an entry */ +/* read an entry */ static void proc_vis_read_entry(struct seq_file *seq, struct vis_info_entry *entry, - struct vis_if_list **if_entry, - uint8_t *vis_orig, - uint8_t current_format, - uint8_t first_line) + struct hlist_head *if_list, + uint8_t *vis_orig) { - char from[40]; char to[40]; - int int_part, frac_part; addr_to_string(to, entry->dest); if (entry->quality == 0) { -#ifndef VIS_SUBCLUSTERS_DISABLED - proc_vis_insert_interface(vis_orig, if_entry, true); -#endif /* VIS_SUBCLUSTERS_DISABLED */ - addr_to_string(from, vis_orig); - if (current_format == DOT_DRAW) { - seq_printf(seq, "\t\"%s\" -> \"%s\" [label=\"HNA\"]\n", - from, to); - } else { - seq_printf(seq, - "%s\t{ router : \"%s\", gateway : \"%s\", label : \"HNA\" }", - (first_line ? "" : ",\n"), from, to); - } + proc_vis_insert_interface(vis_orig, if_list, true); + seq_printf(seq, "HNA %s, ", to); } else { -#ifndef VIS_SUBCLUSTERS_DISABLED - proc_vis_insert_interface(entry->src, if_entry, compare_orig(entry->src, vis_orig)); -#endif /* VIS_SUBCLUSTERS_DISABLED */ - addr_to_string(from, entry->src); - - /* kernel has no printf-support for %f? it'd be better to return - * this in float. */ - - int_part = TQ_MAX_VALUE / entry->quality; - frac_part = 1000 * TQ_MAX_VALUE / entry->quality - int_part * 1000; - - if (current_format == DOT_DRAW) { - seq_printf(seq, - "\t\"%s\" -> \"%s\" [label=\"%d.%d\"]\n", - from, to, int_part, frac_part); - } else { - seq_printf(seq, - "%s\t{ router : \"%s\", neighbor : \"%s\", label : %d.%d }", - (first_line ? "" : ",\n"), from, to, int_part, frac_part); - } + proc_vis_insert_interface(entry->src, if_list, + compare_orig(entry->src, vis_orig)); + seq_printf(seq, "TQ %s %d, ", to, entry->quality); } } - static int proc_vis_read(struct seq_file *seq, void *offset) { HASHIT(hashit); struct vis_info *info; struct vis_info_entry *entries; - struct vis_if_list *if_entries = NULL; + HLIST_HEAD(vis_if_list); int i; - uint8_t current_format, first_line = 1; -#ifndef VIS_SUBCLUSTERS_DISABLED + uint8_t current_format; char tmp_addr_str[ETH_STR_LEN]; - struct vis_if_list *tmp_if_next; -#endif /* VIS_SUBCLUSTERS_DISABLED */ current_format = vis_format; rcu_read_lock(); if (list_empty(&if_list) || (!is_vis_server())) { rcu_read_unlock(); - if (current_format == DOT_DRAW) - seq_printf(seq, "digraph {\n}\n"); goto end; } rcu_read_unlock(); - if (current_format == DOT_DRAW) - seq_printf(seq, "digraph {\n"); - spin_lock(&vis_hash_lock); while (hash_iterate(vis_hash, &hashit)) { info = hashit.bucket->data; entries = (struct vis_info_entry *) ((char *)info + sizeof(struct vis_info)); + addr_to_string(tmp_addr_str, info->packet.vis_orig); + seq_printf(seq, "%s,", tmp_addr_str); for (i = 0; i < info->packet.entries; i++) { - proc_vis_read_entry(seq, &entries[i], &if_entries, - info->packet.vis_orig, - current_format, first_line); - if (first_line) - first_line = 0; + proc_vis_read_entry(seq, &entries[i], &vis_if_list, + info->packet.vis_orig); } -#ifndef VIS_SUBCLUSTERS_DISABLED - /* Generate subgraphs from the collected items */ - if (current_format == DOT_DRAW) { - - addr_to_string(tmp_addr_str, info->packet.vis_orig); - seq_printf(seq, "\tsubgraph \"cluster_%s\" {\n", tmp_addr_str); - while (if_entries != NULL) { - - addr_to_string(tmp_addr_str, if_entries->addr); - if (if_entries->primary) - seq_printf(seq, "\t\t\"%s\" [peripheries=2]\n", tmp_addr_str); - else - seq_printf(seq, "\t\t\"%s\"\n", tmp_addr_str); - - /* ... and empty the list while doing this */ - tmp_if_next = if_entries->next; - kfree(if_entries); - if_entries = tmp_if_next; - } - seq_printf(seq, "\t}\n"); - } -#endif /* VIS_SUBCLUSTERS_DISABLED */ + /* add primary/secondary records */ + proc_vis_read_prim_sec(seq, &vis_if_list); + seq_printf(seq, "\n"); } spin_unlock(&vis_hash_lock); - if (current_format == DOT_DRAW) - seq_printf(seq, "}\n"); - else - seq_printf(seq, "\n"); end: return 0; } Modified: trunk/batman-adv-kernelland/proc.h =================================================================== --- trunk/batman-adv-kernelland/proc.h 2009-12-28 03:59:22 UTC (rev 1509) +++ trunk/batman-adv-kernelland/proc.h 2009-12-29 13:02:14 UTC (rev 1510) @@ -38,12 +38,3 @@ void cleanup_procfs(void); int setup_procfs(void); -/* While scanning for vis-entries of a particular vis-originator - * this list collects its interfaces to create a subgraph/cluster - * out of them later - */ -struct vis_if_list { - uint8_t addr[ETH_ALEN]; - bool primary; - struct vis_if_list *next; -};

1 0

r1509 - trunk/batctl
by postmaster＠open-mesh.net 28 Dec '09

28 Dec '09

Author: marek Date: 2009-12-28 03:59:22 +0000 (Mon, 28 Dec 2009) New Revision: 1509 Modified: trunk/batctl/Makefile trunk/batctl/functions.c trunk/batctl/functions.h trunk/batctl/sys.c Log: batctl: buffer based reading replaced by line-by-line reading The /proc read function now uses a library function to read the data line- by-line instead of loading it into a buffer before searching for the carriage returns manually. That approach simplifies the code and handles the bat-hosts substitution better. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batctl/Makefile =================================================================== --- trunk/batctl/Makefile 2009-12-28 03:56:37 UTC (rev 1508) +++ trunk/batctl/Makefile 2009-12-28 03:59:22 UTC (rev 1509) @@ -26,7 +26,7 @@ endif CC = gcc -CFLAGS += -pedantic -Wall -W -g3 -std=gnu99 -Os +CFLAGS += -pedantic -Wall -W -g3 -std=gnu99 -Os -fno-strict-aliasing EXTRA_CFLAGS = -DREVISION_VERSION=$(REVISION_VERSION) LDFLAGS += Modified: trunk/batctl/functions.c =================================================================== --- trunk/batctl/functions.c 2009-12-28 03:56:37 UTC (rev 1508) +++ trunk/batctl/functions.c 2009-12-28 03:59:22 UTC (rev 1509) @@ -38,7 +38,7 @@ static struct timeval start_time; static char *host_name; -char read_buff[10]; +char *line_ptr = NULL; void start_timer(void) { @@ -139,10 +139,11 @@ { struct ether_addr *mac_addr; struct bat_host *bat_host; - int fd = 0, res = EXIT_FAILURE, fd_opts; - unsigned int bytes_written, read_len; - char full_path[500], *read_ptr, lbuff[1500], *buff_ptr, *cr_ptr, *space_ptr, extra_char; - ssize_t data_read_len; + int res = EXIT_FAILURE; + char full_path[500], *buff_ptr, *space_ptr, extra_char; + size_t len = 0; + ssize_t read; + FILE *fp = NULL; if (read_opt & USE_BAT_HOSTS) bat_hosts_init(); @@ -159,118 +160,75 @@ full_path[strlen(dir)] = '\0'; strncat(full_path, fname, sizeof(full_path) - strlen(full_path)); - if (read_opt & USE_READ_BUFF) { - read_ptr = read_buff; - read_len = sizeof(read_buff)-1; - } else { - read_ptr = lbuff; - read_len = sizeof(lbuff)-1; - } - open: - fd = open(full_path, O_RDONLY); + fp = fopen(full_path, "r"); - if (fd < 0) { + if (!fp) { printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); goto out; } - /* make fd socket non blocking to exit immediately if the file to read is empty */ - fd_opts = fcntl(fd, F_GETFL, 0); - fcntl(fd, F_SETFL, fd_opts | O_NONBLOCK); - if (read_opt & CLR_CONT_READ) system("clear"); read: - while (1) { - data_read_len = read(fd, read_ptr, read_len); + while ((read = getline(&line_ptr, &len, fp)) != -1) { - if (data_read_len < 0) { - /* file was empty */ - if ((errno == EAGAIN) || (errno == EWOULDBLOCK)) - break; - - printf("Error - can't read from file '%s': %s\n", full_path, strerror(errno)); - goto out; - } - - if (data_read_len == 0) - break; - - read_ptr[data_read_len] = '\0'; - + /* the buffer will be handled elsewhere */ if (read_opt & USE_READ_BUFF) break; if (!(read_opt & USE_BAT_HOSTS)) { - printf("%s", read_ptr); - goto check_eof; + printf("%s", line_ptr); + continue; } /* replace mac addresses with bat host names */ - buff_ptr = read_ptr; - bytes_written = 0; + buff_ptr = line_ptr; - while ((cr_ptr = strchr(buff_ptr, '\n')) != NULL) { + while ((space_ptr = strchr(buff_ptr, ' ')) != NULL) { - *cr_ptr = '\0'; + *space_ptr = '\0'; + extra_char = '\0'; - while ((space_ptr = strchr(buff_ptr, ' ')) != NULL) { + if ((strlen(buff_ptr) == ETH_STR_LEN + 1) && (buff_ptr[ETH_STR_LEN] == ',')) { + extra_char = ','; + buff_ptr[ETH_STR_LEN] = '\0'; + } - *space_ptr = '\0'; - extra_char = '\0'; + if (strlen(buff_ptr) != ETH_STR_LEN) + goto print_plain_buff; - if ((strlen(buff_ptr) == ETH_STR_LEN + 1) && (buff_ptr[ETH_STR_LEN] == ',')) { - extra_char = ','; - buff_ptr[ETH_STR_LEN] = '\0'; - } + mac_addr = ether_aton(buff_ptr); - if (strlen(buff_ptr) != ETH_STR_LEN) - goto print_plain_buff; + if (!mac_addr) + goto print_plain_buff; - mac_addr = ether_aton(buff_ptr); + bat_host = bat_hosts_find_by_mac((char *)mac_addr); - if (!mac_addr) - goto print_plain_buff; + if (!bat_host) + goto print_plain_buff; - bat_host = bat_hosts_find_by_mac((char *)mac_addr); + if (read_opt & LOG_MODE) + printf("%s", bat_host->name); + else + /* keep table format */ + printf("%17s", bat_host->name); - if (!bat_host) - goto print_plain_buff; + if (extra_char != '\0') + printf("%c", extra_char); - if (read_opt & LOG_MODE) - printf("%s", bat_host->name); - else - /* keep table format */ - printf("%17s", bat_host->name); + printf(" "); + goto written; - if (extra_char != '\0') - printf("%c", extra_char); - - printf(" "); - goto written; - print_plain_buff: - printf("%s ", buff_ptr); + printf("%s ", buff_ptr); written: - bytes_written += strlen(buff_ptr) + 1; - buff_ptr = space_ptr + 1; - - } - - printf("%s\n", buff_ptr); - buff_ptr = cr_ptr + 1; - + buff_ptr = space_ptr + 1; } - if (bytes_written != (size_t)data_read_len) - printf("%s", buff_ptr); - -check_eof: - if (read_len != (size_t)data_read_len) - break; + printf("%s", buff_ptr); } if (read_opt & CONT_READ) { @@ -279,8 +237,8 @@ } if (read_opt & CLR_CONT_READ) { - if (fd) - close(fd); + if (fp) + fclose(fp); sleep(1); goto open; } @@ -288,8 +246,8 @@ res = EXIT_SUCCESS; out: - if (fd) - close(fd); + if (fp) + fclose(fp); if (read_opt & USE_BAT_HOSTS) bat_hosts_free(); Modified: trunk/batctl/functions.h =================================================================== --- trunk/batctl/functions.h 2009-12-28 03:56:37 UTC (rev 1508) +++ trunk/batctl/functions.h 2009-12-28 03:59:22 UTC (rev 1509) @@ -35,7 +35,7 @@ int read_file(char *dir, char *path, int read_opt); int write_file(char *dir, char *path, char *value); -extern char read_buff[10]; +extern char *line_ptr; enum { SINGLE_READ = 0x00, Modified: trunk/batctl/sys.c =================================================================== --- trunk/batctl/sys.c 2009-12-28 03:56:37 UTC (rev 1508) +++ trunk/batctl/sys.c 2009-12-28 03:59:22 UTC (rev 1509) @@ -103,17 +103,17 @@ if (res != EXIT_SUCCESS) goto out; - printf("[%c] %s (%d)\n", (read_buff[0] == '0') ? 'x' : ' ', + printf("[%c] %s (%d)\n", (line_ptr[0] == '0') ? 'x' : ' ', "all debug output disabled", 0); - printf("[%c] %s (%d)\n", (read_buff[0] == '1') ? 'x' : ' ', + printf("[%c] %s (%d)\n", (line_ptr[0] == '1') ? 'x' : ' ', "messages related to routing / flooding / broadcasting", 1); - printf("[%c] %s (%d)\n", (read_buff[0] == '2') ? 'x' : ' ', + printf("[%c] %s (%d)\n", (line_ptr[0] == '2') ? 'x' : ' ', "messages related to route or hna added / changed / deleted", 2); - printf("[%c] %s (%d)\n", (read_buff[0] == '3') ? 'x' : ' ', + printf("[%c] %s (%d)\n", (line_ptr[0] == '3') ? 'x' : ' ', "all debug messages", 3); out: - if (errno == EBADF) + if (errno == ENOENT) printf("To increase the log level you need to compile the module with debugging enabled (see the README)\n"); return res;

1 0

r1508 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 28 Dec '09

28 Dec '09

Author: marek Date: 2009-12-28 03:56:37 +0000 (Mon, 28 Dec 2009) New Revision: 1508 Modified: trunk/batman-adv-kernelland/proc.c Log: batman-adv: fix minor orig table layout bug The originator table contained a TAB instead of a space which broke the layout as well as the batctl parser. Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2009-12-19 15:34:13 UTC (rev 1507) +++ trunk/batman-adv-kernelland/proc.c 2009-12-28 03:56:37 UTC (rev 1508) @@ -230,7 +230,7 @@ addr_to_string(orig_str, orig_node->orig); addr_to_string(router_str, orig_node->router->addr); - seq_printf(seq, "%-17s (%3i) %17s [%10s]:", + seq_printf(seq, "%-17s (%3i) %17s [%10s]:", orig_str, orig_node->router->tq_avg, router_str, orig_node->router->if_incoming->dev);

1 0

[git] batman-adv branch, maint, created. c55595b2620a99e56ea0e42c4e95f98a975a02b6
by postmaster＠open-mesh.net 28 Dec '09

28 Dec '09

The branch, maint has been created at c55595b2620a99e56ea0e42c4e95f98a975a02b6 (commit) - Shortlog ------------------------------------------------------------ ----------------------------------------------------------------------- -- batman-adv

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits December 2009