B.A.T.M.A.N October 2013

b.a.t.m.a.n@lists.open-mesh.org

22 participants
59 discussions

[B.A.T.M.A.N.] [PATCH v3] vis: Add an output format which is json conformant.
by Andrew Lunn 13 Oct '13

13 Oct '13

The current json output consists of individual lines which are json conformant, but there is no conformancy between lines. Add a new output format, which as a whole is json conformant. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> --- Since v1: Add routing algorithm to output Add batadv-vis version to output Update man page Since v2: Change cjson to jasondoc, as suggested by Nicolás Echániz README | 44 +++++++- vis/man/batadv-vis.8 | 45 +++++++- vis/vis.c | 302 ++++++++++++++++++++++++++++++++++++++++++--------- vis/vis.h | 3 +- 4 files changed, 337 insertions(+), 57 deletions(-) diff --git a/README b/README index 50c36ad..83cdaf8 100644 --- a/README +++ b/README @@ -152,7 +152,7 @@ digraph { [...] } -For a json formatted output, use: +For a json line formatted output, use: $ batadv-vis -f json { "primary" : "fe:f0:00:00:04:01" } @@ -169,6 +169,48 @@ For a json formatted output, use: { "primary" : "fe:f0:00:00:08:01" } [...] +and for output where the complete document is json, use: + + $ batadv-vis -f jsondoc +{ + "source_version" : "2013.3.0-14-gcd34783", + "algorithm" : 4, + "vis" : [ + { "primary" : "fe:f0:00:00:04:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:05:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.008" } + ], + "clients" : [ + "00:00:43:05:00:04", + "fe:f1:00:00:04:01" + ] + }, + { "primary" : "fe:f0:00:00:02:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:01:01", + "metric" : "1.016" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:08:01", + "metric" : "1.000" } + ], + "clients" : [ + "fe:f1:00:00:02:01", + "00:00:43:05:00:02" + ] + }, + { "primary" : "fe:f0:00:00:08:01", +[...] + + License ------- diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index dfa2604..807c3b1 100644 --- a/vis/man/batadv-vis.8 +++ b/vis/man/batadv-vis.8 @@ -51,7 +51,7 @@ information from batman-adv every 10 seconds and set it in alfred via unix socket. The alfred server must run too to get this information set. .TP \fB\-f\fP, \fB\-\-format\fP \fIformat\fP -Specify the output format for client mode (either "json" or "dot") +Specify the output format for client mode (either "json", "jsondoc" or "dot") . .SH EXAMPLES Start an batadv\-vis server which is fetching the information for bat0: @@ -106,6 +106,49 @@ To get a json vis output: [...] .fi .br + +To get output where the complete document is json: +.br +\fB batadv-vis -f jsondoc\fP +.nf + { + "source_version" : "2013.3.0-14-gcd34783", + "algorithm" : 4, + "vis" : [ + { "primary" : "fe:f0:00:00:04:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:05:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:04:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.008" } + ], + "clients" : [ + "00:00:43:05:00:04", + "fe:f1:00:00:04:01" + ] + }, + { "primary" : "fe:f0:00:00:02:01", + "neighbors" : [ + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:03:01", + "metric" : "1.000" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:01:01", + "metric" : "1.016" }, + { "router" : "fe:f0:00:00:02:01", + "neighbor" : "fe:f0:00:00:08:01", + "metric" : "1.000" } + ], + "clients" : [ + "fe:f1:00:00:02:01", + "00:00:43:05:00:02" + ] + }, + { "primary" : "fe:f0:00:00:08:01", + [...] + . .SH SEE ALSO .BR alfred (8), diff --git a/vis/vis.c b/vis/vis.c index ad7f530..9c7d7a9 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -26,6 +26,7 @@ #include <linux/if.h> #include <netinet/in.h> #include <signal.h> +#include <stdbool.h> #include <stddef.h> #include <stdio.h> #include <stdlib.h> @@ -511,18 +512,254 @@ static struct vis_v1 *vis_receive_answer_packet(int sock, uint16_t *len) return (struct vis_v1 *) data->data; } +static void vis_dot_preamble(void) +{ + printf("digraph {\n"); +} + +static void vis_dot_interfaces(uint8_t iface_n, struct vis_iface *ifaces) +{ + int i; + + printf("\tsubgraph \"cluster_%s\" {\n", mac_to_str(ifaces[0].mac)); + for (i = 0; i < iface_n; i++) + printf("\t\t\"%s\"%s\n", mac_to_str(ifaces[i].mac), + i ? " [peripheries=2]":""); + printf("\t}\n"); +} + +static void vis_dot_entries(uint8_t entries_n, struct vis_entry *vis_entries, + uint8_t iface_n, struct vis_iface *ifaces) +{ + int i; + + for (i = 0; i < entries_n; i++) { + if (vis_entries[i].ifindex == 255) { + printf("\t\"%s\" ", mac_to_str(ifaces[0].mac)); + printf("-> \"%s\" [label=\"TT\"]\n", + mac_to_str(vis_entries[i].mac)); + } else { + if (vis_entries[i].ifindex >= iface_n) { + fprintf(stderr, "ERROR: bad ifindex ...\n"); + continue; + } + if (vis_entries[i].qual == 0) { + fprintf(stderr, "ERROR: quality = 0?\n"); + continue; + } + printf("\t\"%s\" ", + mac_to_str(ifaces[vis_entries[i].ifindex].mac)); + printf("-> \"%s\" [label=\"%3.3f\"]\n", + mac_to_str(vis_entries[i].mac), + 255.0 / ((float)vis_entries[i].qual)); + } + } +} + +static void vis_dot_postamble(void) +{ + printf("}\n"); +} + +static void vis_json_preamble(void) +{ +} + +static void vis_json_interfaces(uint8_t iface_n, struct vis_iface *ifaces) +{ + int i; + + printf("{ \"primary\" : \"%s\" }\n", mac_to_str(ifaces[0].mac)); + for (i = 1; i < iface_n; i++) { + printf("{ \"secondary\" : \"%s\"", mac_to_str(ifaces[i].mac)); + printf(", \"of\" : \"%s\" }\n", mac_to_str(ifaces[0].mac)); + } +} + +static void vis_json_entries(uint8_t entries_n, struct vis_entry *vis_entries, + uint8_t iface_n, struct vis_iface *ifaces) +{ + int i; + + for (i = 0; i < entries_n; i++) { + if (vis_entries[i].ifindex == 255) { + printf("{ \"router\" : \"%s\"", + mac_to_str(ifaces[0].mac)); + printf(", \"gateway\" : \"%s\", \"label\" : \"TT\" }\n", + mac_to_str(vis_entries[i].mac)); + } else { + if (vis_entries[i].ifindex >= iface_n) { + fprintf(stderr, "ERROR: bad ifindex ...\n"); + continue; + } + if (vis_entries[i].qual == 0) { + fprintf(stderr, "ERROR: quality = 0?\n"); + continue; + } + printf("{ \"router\" : \"%s\"", + mac_to_str(ifaces[vis_entries[i].ifindex].mac)); + printf(", \"neighbor\" : \"%s\", \"label\" : \"%3.3f\" }\n", + mac_to_str(vis_entries[i].mac), + 255.0 / ((float)vis_entries[i].qual)); + } + } +} + +static void vis_json_postamble(void) +{ +} + +static void vis_jsondoc_preamble(void) +{ + printf("{\n"); + printf(" \"source_version\" : \"%s\",\n", SOURCE_VERSION); + printf(" \"algorithm\" : 4,\n"); + printf(" \"vis\" : [\n"); +} + +static void vis_jsondoc_interfaces(uint8_t iface_n, struct vis_iface *ifaces) +{ + int i; + static bool first_interface = true; + + if (first_interface) + first_interface = false; + else + printf(",\n"); + + printf(" { \"primary\" : \"%s\",\n", mac_to_str(ifaces[0].mac)); + if (iface_n > 1) { + printf(" \"secondary\" : [ "); + for (i = 1; i < iface_n; i++) { + printf("\"%s\"", mac_to_str(ifaces[i].mac)); + if ( i < iface_n - 1) + printf(","); + } + printf("\n ],\n"); + } +} + +static void vis_jsondoc_entries(uint8_t entries_n, + struct vis_entry *vis_entries, + uint8_t iface_n, struct vis_iface *ifaces) +{ + bool first_neighbor = true; + bool first_tt = true; + int i; + + printf(" \"neighbors\" : [\n"); + + for (i = 0; i < entries_n; i++) { + if (vis_entries[i].ifindex == 255) { + continue; + } + + if (vis_entries[i].ifindex >= iface_n) { + fprintf(stderr, "ERROR: bad ifindex ...\n"); + continue; + } + if (vis_entries[i].qual == 0) { + fprintf(stderr, "ERROR: quality = 0?\n"); + continue; + } + + if (first_neighbor) + first_neighbor = false; + else + printf(",\n"); + + printf(" { \"router\" : \"%s\",\n", + mac_to_str(ifaces[vis_entries[i].ifindex].mac)); + printf(" \"neighbor\" : \"%s\",\n", + mac_to_str(vis_entries[i].mac)); + printf(" \"metric\" : \"%3.3f\" }", + 255.0 / ((float)vis_entries[i].qual)); + } + + printf("\n ],\n"); + + printf(" \"clients\" : [\n"); + + for (i = 0; i < entries_n; i++) { + if (vis_entries[i].ifindex == 255) { + if (first_tt) + first_tt = false; + else + printf(",\n"); + + printf(" \"%s\"", + mac_to_str(vis_entries[i].mac)); + } + } + printf("\n ]\n"); + printf(" }"); +} + +static void vis_jsondoc_postamble(void) +{ + printf("\n ]\n"); + printf("}\n"); +} + +struct vis_print_ops +{ + void (*preamble)(void); + void (*interfaces)(uint8_t iface_n, struct vis_iface *ifaces); + void (*entries)(uint8_t entries_n, struct vis_entry *vis_entries, + uint8_t iface_n, struct vis_iface *ifaces); + void (*postamble)(void); +}; + +static const struct vis_print_ops vis_dot_ops = +{ + vis_dot_preamble, + vis_dot_interfaces, + vis_dot_entries, + vis_dot_postamble +}; + +static const struct vis_print_ops vis_json_ops = +{ + vis_json_preamble, + vis_json_interfaces, + vis_json_entries, + vis_json_postamble +}; + +static const struct vis_print_ops vis_jsondoc_ops = +{ + vis_jsondoc_preamble, + vis_jsondoc_interfaces, + vis_jsondoc_entries, + vis_jsondoc_postamble +}; + static int vis_read_answer(struct globals *globals) { + const struct vis_print_ops *ops; struct vis_v1 *vis_data; uint16_t len; struct vis_iface *ifaces; struct vis_entry *vis_entries; - int i; - if (globals->vis_format == FORMAT_DOT) - printf("digraph {\n"); + switch (globals->vis_format) { + case FORMAT_DOT: + ops = &vis_dot_ops; + break; + case FORMAT_JSON: + ops = &vis_json_ops; + break; + case FORMAT_JSONDOC: + ops = &vis_jsondoc_ops; + break; + default: + return -1; + } + + ops->preamble(); - while ((vis_data = vis_receive_answer_packet(globals->unix_sock, &len)) != NULL) { + while ((vis_data = + vis_receive_answer_packet(globals->unix_sock, &len)) != NULL) { if (len < sizeof(*vis_data)) return -1; @@ -536,60 +773,15 @@ static int vis_read_answer(struct globals *globals) ifaces = vis_data->ifaces; vis_entries = (struct vis_entry *) &ifaces[vis_data->iface_n]; - if (globals->vis_format == FORMAT_DOT) { - printf("\tsubgraph \"cluster_%s\" {\n", mac_to_str(ifaces[0].mac)); - for (i = 0; i < vis_data->iface_n; i++) - printf("\t\t\"%s\"%s\n", mac_to_str(ifaces[i].mac), - i ? " [peripheries=2]":""); - printf("\t}\n"); - } else if (globals->vis_format == FORMAT_JSON) { - printf("{ \"primary\" : \"%s\" }\n", mac_to_str(ifaces[0].mac)); - for (i = 1; i < vis_data->iface_n; i++) { - printf("{ \"secondary\" : \"%s\"", mac_to_str(ifaces[i].mac)); - printf(", \"of\" : \"%s\" }\n", mac_to_str(ifaces[0].mac)); - } - } + ops->interfaces(vis_data->iface_n, ifaces); if (vis_data->entries_n == 0) continue; - for (i = 0; i < vis_data->entries_n; i++) { - if (vis_entries[i].ifindex == 255) { - if (globals->vis_format == FORMAT_DOT) { - printf("\t\"%s\" ", mac_to_str(ifaces[0].mac)); - printf("-> \"%s\" [label=\"TT\"]\n", mac_to_str(vis_entries[i].mac)); - } else if (globals->vis_format == FORMAT_JSON) { - printf("{ \"router\" : \"%s\"", mac_to_str(ifaces[0].mac)); - printf(", \"gateway\" : \"%s\", \"label\" : \"TT\" }\n", mac_to_str(vis_entries[i].mac)); - } - } else { - if (vis_entries[i].ifindex >= vis_data->iface_n) { - fprintf(stderr, "ERROR: bad ifindex ...\n"); - continue; - } - if (vis_entries[i].qual == 0) { - fprintf(stderr, "ERROR: quality = 0?\n"); - continue; - } - if (globals->vis_format == FORMAT_DOT) { - printf("\t\"%s\" ", - mac_to_str(ifaces[vis_entries[i].ifindex].mac)); - printf("-> \"%s\" [label=\"%3.3f\"]\n", - mac_to_str(vis_entries[i].mac), - 255.0 / ((float)vis_entries[i].qual)); - } else if (globals->vis_format == FORMAT_JSON) { - printf("{ \"router\" : \"%s\"", - mac_to_str(ifaces[vis_entries[i].ifindex].mac)); - printf(", \"neighbor\" : \"%s\", \"label\" : \"%3.3f\" }\n", - mac_to_str(vis_entries[i].mac), - 255.0 / ((float)vis_entries[i].qual)); - - } - } - } + ops->entries(vis_data->entries_n, vis_entries, + vis_data->iface_n, ifaces); } - if (globals->vis_format == FORMAT_DOT) - printf("}\n"); + ops->postamble(); return 0; } @@ -611,7 +803,7 @@ static void vis_usage(void) printf("Usage: batadv-vis [options]\n"); printf(" -i, --interface specify the batman-adv interface configured on the system (default: bat0)\n"); printf(" -s, --server start up in server mode, which regularly updates vis data from batman-adv\n"); - printf(" -f, --format <format> specify the output format for client mode (either \"json\" or \"dot\")\n"); + printf(" -f, --format <format> specify the output format for client mode (either \"json\", \"jsondoc\" or \"dot\")\n"); printf(" -v, --version print the version\n"); printf(" -h, --help this help\n"); printf("\n"); @@ -649,6 +841,8 @@ static struct globals *vis_init(int argc, char *argv[]) case 'f': if (strncmp(optarg, "dot", 3) == 0) globals->vis_format = FORMAT_DOT; + else if (strncmp(optarg, "jsondoc", 7) == 0) + globals->vis_format = FORMAT_JSONDOC; else if (strncmp(optarg, "json", 4) == 0) globals->vis_format = FORMAT_JSON; else { diff --git a/vis/vis.h b/vis/vis.h index 6ba70c6..4ccbdad 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -49,7 +49,8 @@ enum opmode { enum vis_format { FORMAT_DOT, - FORMAT_JSON + FORMAT_JSON, + FORMAT_JSONDOC, }; struct vis_iface { -- 1.8.4.rc3

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: update email address for Marek Lindner
by Marek Lindner 13 Oct '13

13 Oct '13

Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> --- README | 2 +- main.h | 2 +- sysfs-class-net-batman-adv | 4 ++-- sysfs-class-net-mesh | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/README b/README index 89ace66..89490be 100644 --- a/README +++ b/README @@ -199,5 +199,5 @@ Mailing-list: b.a.t.m.a.n(a)open-mesh.org (optional subscription You can also contact the Authors: -Marek Lindner <lindner_marek(a)yahoo.de> +Marek Lindner <mareklindner(a)neomailbox.ch> Simon Wunderlich <sw(a)simonwunderlich.de> diff --git a/main.h b/main.h index ff39e46..811f5f8 100644 --- a/main.h +++ b/main.h @@ -20,7 +20,7 @@ #ifndef _NET_BATMAN_ADV_MAIN_H_ #define _NET_BATMAN_ADV_MAIN_H_ -#define BATADV_DRIVER_AUTHOR "Marek Lindner <lindner_marek(a)yahoo.de>, " \ +#define BATADV_DRIVER_AUTHOR "Marek Lindner <mareklindner(a)neomailbox.ch>, " \ "Simon Wunderlich <sw(a)simonwunderlich.de>" #define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" #define BATADV_DRIVER_DEVICE "batman-adv" diff --git a/sysfs-class-net-batman-adv b/sysfs-class-net-batman-adv index bdc0070..7f34a95 100644 --- a/sysfs-class-net-batman-adv +++ b/sysfs-class-net-batman-adv @@ -1,13 +1,13 @@ What: /sys/class/net/<iface>/batman-adv/iface_status Date: May 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Indicates the status of <iface> as it is seen by batman. What: /sys/class/net/<iface>/batman-adv/mesh_iface Date: May 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: The /sys/class/net/<iface>/batman-adv/mesh_iface file displays the batman mesh interface this <iface> diff --git a/sysfs-class-net-mesh b/sysfs-class-net-mesh index 7982a31..0baa657 100644 --- a/sysfs-class-net-mesh +++ b/sysfs-class-net-mesh @@ -1,7 +1,7 @@ What: /sys/class/net/<mesh_iface>/mesh/aggregated_ogms Date: May 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Indicates whether the batman protocol messages of the mesh <mesh_iface> shall be aggregated or not. @@ -42,21 +42,21 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/gw_bandwidth Date: October 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Defines the bandwidth which is propagated by this node if gw_mode was set to 'server'. What: /sys/class/net/<mesh_iface>/mesh/gw_mode Date: October 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Defines the state of the gateway features. Can be either 'off', 'client' or 'server'. What: /sys/class/net/<mesh_iface>/mesh/gw_sel_class Date: October 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Defines the selection criteria this node will use to choose a gateway if gw_mode was set to 'client'. @@ -78,14 +78,14 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/orig_interval Date: May 2010 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Defines the interval in milliseconds in which batman sends its protocol messages. What: /sys/class/net/<mesh_iface>/mesh/routing_algo Date: Dec 2011 -Contact: Marek Lindner <lindner_marek(a)yahoo.de> +Contact: Marek Lindner <mareklindner(a)neomailbox.ch> Description: Defines the routing procotol this mesh instance uses to find the optimal paths through the mesh. -- 1.8.4.rc3

1 1

[B.A.T.M.A.N.] [PATCH] alfred: update email address for Simon Wunderlich
by Simon Wunderlich 13 Oct '13

13 Oct '13

My university will stop email service for alumni in january 2014, please use my new e-mail address instead. Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> --- README | 2 +- man/alfred.8 | 4 ++-- vis/man/batadv-vis.8 | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README b/README index 4a494a4..2b0f555 100644 --- a/README +++ b/README @@ -198,6 +198,6 @@ http://www.open-mesh.org/projects/open-mesh/wiki/Contribute You can also contact the Authors: -Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> +Simon Wunderlich <sw(a)simonwunderlich.de> Sven Eckelmann <sven(a)open-mesh.com> diff --git a/man/alfred.8 b/man/alfred.8 index 5eb48aa..e77acc3 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -131,6 +131,6 @@ Retreive all data stored as id 65 from all connected alfred servers: .BR batadv-vis (8), .BR batctl (8) .SH AUTHOR -alfred was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> and Sven Eckelmann <sven(a)open-mesh.com>. +alfred was written by Simon Wunderlich <sw(a)simonwunderlich.de> and Sven Eckelmann <sven(a)open-mesh.com>. .PP -This manual page was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> and Sven Eckelmann <sven(a)open-mesh.com>. +This manual page was written by Simon Wunderlich <sw(a)simonwunderlich.de> and Sven Eckelmann <sven(a)open-mesh.com>. diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index dfa2604..12b143e 100644 --- a/vis/man/batadv-vis.8 +++ b/vis/man/batadv-vis.8 @@ -111,6 +111,6 @@ To get a json vis output: .BR alfred (8), .BR batctl (8) .SH AUTHOR -batadv\-vis was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>. +batadv\-vis was written by Simon Wunderlich <sw(a)simonwunderlich.de>. .PP -This manual page was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> and Sven Eckelmann <sven(a)open-mesh.com>. +This manual page was written by Simon Wunderlich <sw(a)simonwunderlich.de> and Sven Eckelmann <sven(a)open-mesh.com>. -- 1.7.10.4

2 6

[B.A.T.M.A.N.] [PATCH] batman-adv: fix typ0 in ICMP header kernel doc
by Antonio Quartulli 12 Oct '13

12 Oct '13

Introduced by 1897ab719862eb43e0a6edd3a20b8d9fa7a2173d ("batman-adv: create common header for ICMP packets") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- packet.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packet.h b/packet.h index f4bbb05..9fbcaac 100644 --- a/packet.h +++ b/packet.h @@ -195,7 +195,7 @@ struct batadv_ogm_packet { #define BATADV_OGM_HLEN sizeof(struct batadv_ogm_packet) /** - * batadc_icmp_header - common ICMP header + * batadv_icmp_header - common ICMP header * @header: common batman header * @msg_type: ICMP packet type * @dst: address of the destination node -- 1.8.3.2

2 1

[B.A.T.M.A.N.] [PATCH] batman-adv: update email address for Antonio Quartulli
by Antonio Quartulli 12 Oct '13

12 Oct '13

Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> --- sysfs-class-net-mesh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysfs-class-net-mesh b/sysfs-class-net-mesh index ee4a479..4c27952 100644 --- a/sysfs-class-net-mesh +++ b/sysfs-class-net-mesh @@ -8,7 +8,7 @@ Description: What: /sys/class/net/<mesh_iface>/mesh/<vlan_subdir>/ap_isolation Date: May 2011 -Contact: Antonio Quartulli <ordex(a)autistici.org> +Contact: Antonio Quartulli <antonio(a)meshcoding.com> Description: Indicates whether the data traffic going from a wireless client to another wireless client will be -- 1.8.3.2

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2013-10-09b
by Antonio Quartulli 11 Oct '13

11 Oct '13

Hello David, here you have my fixed pull request intended for net-next. The previous build error was due to an accidental remotion of the beginning of a batadv_dbg() statement during a merge conflict resolution. Sorry for that. Please pull or let me know of any problem. Thanks a lot, Antonio The following changes since commit 3d7d562ca4a884089344eb13451b5903a18d3817: bnx2x: Add ndo_get_phys_port_id support (2013-10-09 14:55:13 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 18c68d5960c8dfeb2db113f4b871bab259cfd565: batman-adv: reorder batadv_iv_flags (2013-10-09 21:22:35 +0200) ---------------------------------------------------------------- Included changes: - update emails for A. Quartulli and M. Lindner in MAINTAINERS - switch to the next on-the-wire protocol version - introduce the T(ype) V(ersion) L(ength) V(alue) framework - adjust the existing components to make them use the new TVLV code - make the TT component use CRC32 instead of CRC16 - totally remove the VIS functionality (has been moved to userspace) - reorder packet types and flags - add static checks on packet format - remove __packed from batadv_ogm_packet ---------------------------------------------------------------- Antonio Quartulli (4): MAINTAINERS: batman-adv - update emails batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit Marek Lindner (7): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets Simon Wunderlich (5): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags Documentation/ABI/testing/sysfs-class-net-mesh | 11 - Documentation/networking/batman-adv.txt | 50 +- MAINTAINERS | 4 +- net/batman-adv/Makefile | 1 - net/batman-adv/bat_iv_ogm.c | 111 +-- net/batman-adv/debugfs.c | 9 - net/batman-adv/distributed-arp-table.c | 64 ++ net/batman-adv/distributed-arp-table.h | 5 + net/batman-adv/gateway_client.c | 187 +++-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 230 +++--- net/batman-adv/gateway_common.h | 14 +- net/batman-adv/hard-interface.c | 9 - net/batman-adv/main.c | 623 +++++++++++++++- net/batman-adv/main.h | 37 +- net/batman-adv/network-coding.c | 63 ++ net/batman-adv/network-coding.h | 5 + net/batman-adv/originator.c | 4 +- net/batman-adv/packet.h | 248 ++++--- net/batman-adv/routing.c | 247 ++----- net/batman-adv/routing.h | 6 +- net/batman-adv/send.c | 1 - net/batman-adv/soft-interface.c | 4 +- net/batman-adv/sysfs.c | 96 +-- net/batman-adv/translation-table.c | 905 ++++++++++++++---------- net/batman-adv/translation-table.h | 13 +- net/batman-adv/types.h | 178 ++--- net/batman-adv/vis.c | 938 ------------------------- net/batman-adv/vis.h | 36 - 29 files changed, 1968 insertions(+), 2133 deletions(-) delete mode 100644 net/batman-adv/vis.c delete mode 100644 net/batman-adv/vis.h

3 21

[B.A.T.M.A.N.] batman / iptables / changed mac
by Bastian Bittorf 10 Oct '13

10 Oct '13

we see a strange behaviour using OpenWrt r38277 with kernel 3.10.14 and batman-adv: 2013.3.0 we use a http-splash-page, where the laptop's must click 'ok'. the iptables-rules are working like this, when the button is pressed: iptables -t mangle -I PREROUTING -d $laptop_ip -j ACCEPT iptables -t mangle -I PREROUTING -m mac --mac-source $laptop_mac -j ACCEPT we had the effect, that laptop can press the button and the rules are active, but 'internet was not working'. looking deeper into this, we can see that the second rule (mac) was not used, so the laptop gets the splash-page again and again. via using: iptables -t mangle -I PREROUTING -s $laptop_ip -j LOG we can see, that the mac-adress which the kernel/iptables sees is not the one from the laptop, the log-entry looks like this: (IP 192.168.99.243 = Laptop) [ 2579.600000] from_192.168.99.243: IN=eth0.1 OUT= MAC=02:00:ca:b1:00:99:02:00:de:ad:00:02:08:00:45:00:00:3c SRC=192.168.99.243 DST=193.99.144.80 LEN=60 TOS=0x00 PREC=0x00 TTL=62 ID=43918 DF PROTO=TCP SPT=55132 DPT=80 WINDOW=14600 RES=0x00 SYN URGP=0 the mac seems strange, the real mac is '00:13:e8:82:7e:4b'. but the pattern is interesting: MAC=02:00:ca:b1:00:99:02:00:de:ad:00:02:08:00:45:00:00:3c the mac consists of 3 macs somehow: 02:00:ca:b1:00:99 02:00:de:ad:00:02 08:00:45:00:00:3c the first is the 'lan1/cable' mac of the router which does the splash the second is the 'lan2/cable' mac of the nexthop router. the last one: * i have no idea *. i can reproduce the issue, so i can deliver much more debug-output than this. any idea with this data yet? for now we mac a 3rd rule, like the log-rule to 'free' the laptop - but i call it a workaround. iptables -t mangle -I PREROUTING -s $laptop_ip -j ACCEPT bye, bastian

2 1

[B.A.T.M.A.N.] pull request: batman-adv 2013-10-09
by Antonio Quartulli 09 Oct '13

09 Oct '13

Hello David, this is a set of changes intended for net-next/linux-3.13. As introduced one year ago (http://article.gmane.org/gmane.org.freifunk.batman/8484) in the last period we have been busy working on giving our batman-adv protocol/packet-format all those means to get stable and avoid incompatibilities in the near future (this is also why we did not send many changes for linux-3.12..). With this patchset we are finally switching to a new compatibility version and within this development cycle I will send you all those changes aimed to introduce all the needed mechanism to avoid any further compatibility breakage. First of all, in this batch you have the new TVLV code (Type Version Value Length) which is the first very important milestone towards our goal[1]. With this mechanism we will be able to improve/change the packet contents layout (used by the various features) without breaking compatibility with older protocol versions anymore. The development of this new component has been started by Spyros Gasteratos during his Google Summer of Code 2012 and then adjusted, finished and submitted by Marek Lindner. Together with it, you have a set of improvements that we are allowed to apply thanks to the switching to the new compat version. These changes are: - adapt the existing features to make them use the new TVLV mechanism - move from CRC16 to CRC32c for table correctness check in the TT component - reorder some of the flags sent over the wire - remove the __packed attribute from the OGM packet struct. Moreover, with this patchset we are totally removing our VISualisation component that is now implemented in userspace. Please pull let me know of any problem. Thank you, Antonio [1] http://www.open-mesh.org/projects/batman-adv/wiki/TVLV The following changes since commit f69b923a758f598fd6bb69e57564b59506f4f1fc: udp: fix a typo in __udp4_lib_mcast_demux_lookup (2013-10-09 01:51:57 -0400) are available in the git repository at: git://git.open-mesh.org/linux-merge.git tags/batman-adv-for-davem for you to fetch changes up to 7c4b3ec9d1f92256a31ff64d8a25a1a4fa1b86c3: batman-adv: reorder batadv_iv_flags (2013-10-09 13:11:38 +0200) ---------------------------------------------------------------- Included changes: - update emails for A. Quartulli and M. Lindner in MAINTAINERS - switch to the next on-the-wire protocol version - introduce the T(ype) V(ersion) L(ength) V(alue) framework - adjust the existing components to make them use the new TVLV code - make the TT component use CRC32 instead of CRC16 - totally remove the VIS functionality (has been moved to userspace) - reorder packet types and flags - add static checks on packet format - remove __packed from batadv_ogm_packet ---------------------------------------------------------------- Antonio Quartulli (4): MAINTAINERS: batman-adv - update emails batman-adv: switch to a new packet compatibility version batman-adv: use CRC32C instead of CRC16 in TT code batman-adv: move BATADV_TT_CLIENT_TEMP to higher bit Marek Lindner (7): batman-adv: tvlv - basic infrastructure batman-adv: tvlv - gateway download/upload bandwidth container batman-adv: tvlv - add distributed arp table container batman-adv: tvlv - add network coding container batman-adv: tvlv - convert tt data sent within OGMs batman-adv: tvlv - convert tt query packet to use tvlv unicast packets batman-adv: tvlv - convert roaming adv packet to use tvlv unicast packets Simon Wunderlich (5): batman-adv: remove vis functionality batman-adv: add build check macros for packet member offset batman-adv: reorder packet types batman-adv: remove packed from batadv_ogm_packet batman-adv: reorder batadv_iv_flags Documentation/ABI/testing/sysfs-class-net-mesh | 11 - Documentation/networking/batman-adv.txt | 50 +- MAINTAINERS | 4 +- net/batman-adv/Makefile | 1 - net/batman-adv/bat_iv_ogm.c | 111 +-- net/batman-adv/debugfs.c | 9 - net/batman-adv/distributed-arp-table.c | 64 ++ net/batman-adv/distributed-arp-table.h | 5 + net/batman-adv/gateway_client.c | 187 +++-- net/batman-adv/gateway_client.h | 2 +- net/batman-adv/gateway_common.c | 230 +++--- net/batman-adv/gateway_common.h | 14 +- net/batman-adv/hard-interface.c | 9 - net/batman-adv/main.c | 623 +++++++++++++++- net/batman-adv/main.h | 37 +- net/batman-adv/network-coding.c | 63 ++ net/batman-adv/network-coding.h | 5 + net/batman-adv/originator.c | 4 +- net/batman-adv/packet.h | 248 ++++--- net/batman-adv/routing.c | 247 ++----- net/batman-adv/routing.h | 6 +- net/batman-adv/send.c | 1 - net/batman-adv/soft-interface.c | 4 +- net/batman-adv/sysfs.c | 96 +-- net/batman-adv/translation-table.c | 906 ++++++++++++++---------- net/batman-adv/translation-table.h | 13 +- net/batman-adv/types.h | 178 ++--- net/batman-adv/vis.c | 938 ------------------------- net/batman-adv/vis.h | 36 - 29 files changed, 1968 insertions(+), 2134 deletions(-) delete mode 100644 net/batman-adv/vis.c delete mode 100644 net/batman-adv/vis.h

3 26

[B.A.T.M.A.N.] regarding ALFRED and GPS
by Stephen Thornton 09 Oct '13

09 Oct '13

I am currently developing a mesh router solution for several clients. I have been using batman-adv in this project for almost a year (using OpenWRT), and it has all worked fantastically. Thanks so much guys. I now have a requirement for GPS logging functionality, along with passing other data between nodes. I have already written a simple layer3 protocol for this purpose, but this was before ALFRED. ALFRED provides almost all the functionality I need apart from the fact that I really need to embed the alfred code within my own application. I could use it as is via a sys call, but it would be so much better to include the code. What are your feelings regarding splitting the alfred code into a library with can be included in other user applications, and an alfred client program that uses this library? I'm quite prepared to give quite a bit of my own time to doing this if you like the idea. best regards Steve Thornton

1 0

[B.A.T.M.A.N.] [PATCH] batman-adv: fix compat of net_ratelimited_function for >3.2.46
by Simon Wunderlich 09 Oct '13

09 Oct '13

From: Simon Wunderlich <simon(a)open-mesh.com> Appearently net_ratelimited_function was added to the stable series of from 3.2.47, which results in a lot of warnings when compiling against this kernel. This patch avoids this redefinition. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/compat.h b/compat.h index 7e0a7f0..04a2256 100644 --- a/compat.h +++ b/compat.h @@ -241,11 +241,13 @@ static inline void batadv_eth_hw_addr_random(struct net_device *dev) #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 5, 0) +#ifndef net_ratelimited_function #define net_ratelimited_function(func, ...) \ do { \ if (net_ratelimit()) \ func(__VA_ARGS__); \ } while (0) +#endif /* ifndef net_ratelimited_function */ #endif /* < KERNEL_VERSION(3, 5, 0) */ -- 1.7.10.4

3 3

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

B.A.T.M.A.N October 2013