commits October 2013

commits@lists.open-mesh.org

1 participants
109 discussions

[alfred] master: vis: Add an output format which is json conformant. (38eae4d)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 38eae4d50e81222a852d98757bac3d6a6c3d6a9e Author: Andrew Lunn <andrew(a)lunn.ch> Date: Mon Oct 7 11:23:02 2013 +0200 vis: Add an output format which is json conformant. 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> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 38eae4d50e81222a852d98757bac3d6a6c3d6a9e README | 43 ++++++- vis/man/batadv-vis.8 | 45 +++++++- vis/vis.c | 302 +++++++++++++++++++++++++++++++++++++++++--------- vis/vis.h | 3 +- 4 files changed, 336 insertions(+), 57 deletions(-) diff --git a/README b/README index 52102e4..90a99de 100644 --- a/README +++ b/README @@ -162,7 +162,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" } @@ -179,6 +179,47 @@ 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", +[...] + Alfred-gpsd ----------- diff --git a/vis/man/batadv-vis.8 b/vis/man/batadv-vis.8 index 12b143e..9b7c05c 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 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (56965d9)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 56965d9966d9a97e6b627c821da257d4e7e6145f Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Sun Oct 13 23:02:51 2013 +0200 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 56965d9966d9a97e6b627c821da257d4e7e6145f CHANGELOG | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index aa0371f..f4e4ac4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,19 @@ +alfred 2013.4.0: + + * add new json output format for vis + * add gps location information service for alfred + * allow network interface to vanish and return without restart + * allow to switch between master and slave operation without restart + * renamed vis to batadv-vis to avoid collisions with other vis binaries + * add manpages + * various code cleanups + * bugs squashed: + + * handle failing write() in unix sockets + * Fix crash when vis opened empty file + + -- Sun, 13 Oct 2013 22:55:43 +0200 + alfred 2013.3.0: * initial release of alfred after beta (synced release cycle with

1 0

[batctl] master's head updated: batctl: fix typ0 in ICMP header kernel doc (110aaff)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: e374a3f batctl tcpdump: Fix reported length of TCP payload b6adee8 batctl tcpdump: Fix reported length of TCP payload 5da47e9 batctl: Don't use hyphen for parameter in manpage 366ef3d batctl: Fix type of new neighbor buffer in _seqno_trace_neigh_add 08e9bd5 batctl: Fix error handling jump in interface when batadv not loaded 8cd9d9f Merge branch 'maint' into next e141ab7 batctl: update email address for Simon Wunderlich dbcebdc batctl: update email address for Marek Lindner 110aaff batctl: fix typ0 in ICMP header kernel doc

1 0

[batctl] next: batctl: fix typ0 in ICMP header kernel doc (110aaff)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 110aaffeef7161f528d1b04872564ed1bc38fbc9 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sat Oct 12 16:17:36 2013 +0200 batctl: fix typ0 in ICMP header kernel doc Introduced by 1897ab719862eb43e0a6edd3a20b8d9fa7a2173d ("batman-adv: create common header for ICMP packets") Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 110aaffeef7161f528d1b04872564ed1bc38fbc9 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 0

[batctl] next: batctl: update email address for Marek Lindner (dbcebdc)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit dbcebdcde613101da33d64ffe6e5412323e8e434 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Oct 14 03:52:22 2013 +0800 batctl: update email address for Marek Lindner Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- dbcebdcde613101da33d64ffe6e5412323e8e434 allocate.h | 2 +- bat-hosts.c | 2 +- bat-hosts.h | 2 +- bisect_iv.c | 2 +- bisect_iv.h | 2 +- debug.c | 2 +- debug.h | 2 +- functions.c | 2 +- functions.h | 2 +- ioctl.c | 2 +- ioctl.h | 2 +- main.c | 2 +- main.h | 2 +- man/batctl.8 | 4 ++-- ping.c | 2 +- ping.h | 2 +- sys.c | 2 +- sys.h | 2 +- tcpdump.h | 2 +- traceroute.c | 2 +- traceroute.h | 2 +- translate.c | 2 +- translate.h | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/allocate.h b/allocate.h index 0f335e2..29bdda1 100644 --- a/allocate.h +++ b/allocate.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/bat-hosts.c b/bat-hosts.c index 9d36531..e03353d 100644 --- a/bat-hosts.c +++ b/bat-hosts.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/bat-hosts.h b/bat-hosts.h index 96abfa9..88f93f9 100644 --- a/bat-hosts.h +++ b/bat-hosts.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/bisect_iv.c b/bisect_iv.c index 917ffec..8e9f01f 100644 --- a/bisect_iv.c +++ b/bisect_iv.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/bisect_iv.h b/bisect_iv.h index c4e6df2..5c306ed 100644 --- a/bisect_iv.h +++ b/bisect_iv.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/debug.c b/debug.c index 6b7b648..3e78638 100644 --- a/debug.c +++ b/debug.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/debug.h b/debug.h index 563a7bb..28802c7 100644 --- a/debug.h +++ b/debug.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/functions.c b/functions.c index 7d9c44e..d8d86ce 100644 --- a/functions.c +++ b/functions.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/functions.h b/functions.h index a96b7ee..5409b38 100644 --- a/functions.h +++ b/functions.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/ioctl.c b/ioctl.c index cbb1aa5..0798060 100644 --- a/ioctl.c +++ b/ioctl.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2012-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/ioctl.h b/ioctl.h index 5d62f72..2d4801f 100644 --- a/ioctl.h +++ b/ioctl.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2012-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/main.c b/main.c index 84bb42a..aaf3587 100644 --- a/main.c +++ b/main.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/main.h b/main.h index 829d62b..76eda47 100644 --- a/main.h +++ b/main.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/man/batctl.8 b/man/batctl.8 index dbae47e..fafe735 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -294,7 +294,7 @@ addresses. .BR dmesg (1), .BR dot (1) .SH AUTHOR -batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek Lindner <lindner_marek(a)yahoo.de>. +batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek Lindner <mareklindner(a)neomailbox.ch>. .PP -This manual page was written by Simon Wunderlich <sw(a)simonwunderlich.de>, Marek Lindner <lindner_marek(a)yahoo.de> and +This manual page was written by Simon Wunderlich <sw(a)simonwunderlich.de>, Marek Lindner <mareklindner(a)neomailbox.ch> and Andrew Lunn <andrew(a)lunn.ch> diff --git a/ping.c b/ping.c index d505d02..aad13d9 100644 --- a/ping.c +++ b/ping.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/ping.h b/ping.h index 7c91d5d..ce4553a 100644 --- a/ping.h +++ b/ping.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/sys.c b/sys.c index 7539f76..5f1218e 100644 --- a/sys.c +++ b/sys.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/sys.h b/sys.h index 5d207a1..28a3638 100644 --- a/sys.h +++ b/sys.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/tcpdump.h b/tcpdump.h index 3c1a0e1..2ac979a 100644 --- a/tcpdump.h +++ b/tcpdump.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/traceroute.c b/traceroute.c index 0cb0441..18e2428 100644 --- a/traceroute.c +++ b/traceroute.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/traceroute.h b/traceroute.h index 5ec1308..fc7d319 100644 --- a/traceroute.h +++ b/traceroute.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/translate.c b/translate.c index da6d593..14fa04c 100644 --- a/translate.c +++ b/translate.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2007-2013 B.A.T.M.A.N. contributors: * - * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <lindner_marek(a)yahoo.de> + * Andreas Langer <an.langer(a)gmx.de>, Marek Lindner <mareklindner(a)neomailbox.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 diff --git a/translate.h b/translate.h index 320ad0e..691d234 100644 --- a/translate.h +++ b/translate.h @@ -1,7 +1,7 @@ /* * Copyright (C) 2009-2013 B.A.T.M.A.N. contributors: * - * Marek Lindner <lindner_marek(a)yahoo.de> + * Marek Lindner <mareklindner(a)neomailbox.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

1 0

[batman-adv] master's head updated: batman-adv: update email address for Marek Lindner (89dc982)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 712a23e batman-adv: fix typ0 in ICMP header kernel doc 89dc982 batman-adv: update email address for Marek Lindner

1 0

[batman-adv] next: batman-adv: update email address for Marek Lindner (89dc982)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 89dc98270922b2ad40d953ad6702a903dd2f6df5 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sat Oct 12 22:10:03 2013 +0800 batman-adv: update email address for Marek Lindner Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 89dc98270922b2ad40d953ad6702a903dd2f6df5 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 0

[batctl] next: batctl: update email address for Simon Wunderlich (e141ab7)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit e141ab719da671d1e386f45f0cef11a7c123e854 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Oct 10 23:59:09 2013 +0200 batctl: update email address for Simon Wunderlich 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> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e141ab719da671d1e386f45f0cef11a7c123e854 man/batctl.8 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/batctl.8 b/man/batctl.8 index af2729b..dbae47e 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -296,5 +296,5 @@ addresses. .SH AUTHOR batctl was written by Andreas Langer <an.langer(a)gmx.de> and Marek Lindner <lindner_marek(a)yahoo.de>. .PP -This manual page was written by Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de>, Marek Lindner <lindner_marek(a)yahoo.de> and +This manual page was written by Simon Wunderlich <sw(a)simonwunderlich.de>, Marek Lindner <lindner_marek(a)yahoo.de> and Andrew Lunn <andrew(a)lunn.ch>

1 0

[batctl] next: Merge branch 'maint' into next (8cd9d9f)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 8cd9d9f88353aa0c39f1d0b09ccb37efd18cadef Merge: e374a3f 08e9bd5 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Mon Oct 14 03:44:18 2013 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 8cd9d9f88353aa0c39f1d0b09ccb37efd18cadef

1 0

[batctl] next's head updated: Merge branch 'maint' into next (8cd9d9f)
by postmaster＠open-mesh.org 13 Oct '13

13 Oct '13

Repository : ssh://git@open-mesh.org/batctl Branch 'next' now includes: b6adee8 batctl tcpdump: Fix reported length of TCP payload 5da47e9 batctl: Don't use hyphen for parameter in manpage 366ef3d batctl: Fix type of new neighbor buffer in _seqno_trace_neigh_add 08e9bd5 batctl: Fix error handling jump in interface when batadv not loaded 8cd9d9f Merge branch 'maint' into next

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2013