commits March 2012

commits@lists.open-mesh.org

1 participants
147 discussions

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 8be18ccabf2915497469d3bcec792d65faeed10e Merge: 372d1bab30e4ca6aa559f25f5f6bd8c0ae3b5cc5 edf8d93b9a6163a06f86330672c417df38d26cf0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Feb 26 16:40:08 2012 +0800 Merge branch 'next' -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 2026933a75bd25b42dade47e03097904d5ecdea3 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Feb 9 18:02:14 2012 +0800 batctl: warn about options that are not compiled into batman-adv Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/debug.c b/debug.c index 155f499..928f81d 100644 --- a/debug.c +++ b/debug.c @@ -185,9 +185,5 @@ int log_print(char *mesh_iface, int argc, char **argv) debugfs_make_path(DEBUG_BATIF_PATH_FMT "/", mesh_iface, full_path, sizeof(full_path)); res = read_file(full_path, DEBUG_LOG, read_opt, 0, 0); - - if ((res != EXIT_SUCCESS) && (errno == ENOENT)) - printf("To read the debug log you need to compile the module with debugging enabled (see the README)\n"); - return res; } diff --git a/functions.c b/functions.c index 69a1385..8ce2419 100644 --- a/functions.c +++ b/functions.c @@ -35,11 +35,19 @@ #include "main.h" #include "functions.h" #include "bat-hosts.h" +#include "sys.h" static struct timeval start_time; static char *host_name; char *line_ptr = NULL; +const char *sysfs_compile_out_param[] = { + SYS_LOG, + SYS_LOG_LEVEL, + SYS_BRIDGE_LOOP_AVOIDANCE, + NULL, +}; + void start_timer(void) { gettimeofday(&start_time, NULL); @@ -125,6 +133,7 @@ int read_file(char *dir, char *fname, int read_opt, struct bat_host *bat_host; int res = EXIT_FAILURE; float last_seen; + const char **ptr; char full_path[500], *buff_ptr, *space_ptr, extra_char; size_t len = 0; FILE *fp = NULL; @@ -145,8 +154,21 @@ open: fp = fopen(full_path, "r"); if (!fp) { - if (!(read_opt & SILENCE_ERRORS)) + if (!(read_opt & SILENCE_ERRORS)) { + for (ptr = sysfs_compile_out_param; *ptr; ptr++) { + if (strcmp(*ptr, fname) != 0) + continue; + + break; + } + printf("Error - can't open file '%s': %s\n", full_path, strerror(errno)); + if (*ptr) { + printf("The option you called seems not to be compiled into your batman-adv kernel module.\n"); + printf("Consult the README if you wish to learn more about compiling options into batman-adv.\n"); + } + } + goto out; } diff --git a/sys.c b/sys.c index eeb7005..0b7ddf7 100644 --- a/sys.c +++ b/sys.c @@ -255,9 +255,6 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to bridge loop avoidance", "bla"); out: - if (errno == ENOENT) - printf("To increase the log level you need to compile the module with debugging enabled (see the README)\n"); - free(path_buff); return res; } -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 7ae18eaba0399e0a5ef6bc776bb1e97716c92d35 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 11:43:36 2012 +0100 batctl: fix 'all' loglevel After having added the "bla" log level, the numeric value for "all" is now 15, not 7. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/sys.c b/sys.c index 0b7ddf7..0b4cac3 100644 --- a/sys.c +++ b/sys.c @@ -214,7 +214,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 7; + log_level = 15; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= (1 << 0); -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit c8c043b9953cec095b7705e99443b37f6361c9a1 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 13:28:24 2012 +0100 batctl: add support for DBG_DAT log level This patch add the related options in order to support the DBG_DAT log level. README and mas are updated accordingly. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/README b/README index 64ee152..0fe192f 100644 --- a/README +++ b/README @@ -301,6 +301,7 @@ $ batctl loglevel [ ] messages related to route added / changed / deleted (routes) [ ] messages related to translation table operations (tt) [ ] messages related to bridge loop avoidance (bla) +[ ] messages related to the distributed arp table (dat) batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index 5cc37cb..036412b 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -65,7 +65,7 @@ Once started batctl will display the list of announced gateways in the network. If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" -If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. +If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'dat' enables messages related to the distributed arp table (DHT messages, ARP snooping and other debug logs). Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. diff --git a/sys.c b/sys.c index 0b4cac3..e0dcb07 100644 --- a/sys.c +++ b/sys.c @@ -184,6 +184,7 @@ static void log_level_usage(void) printf(" \t routes Messages related to route added / changed / deleted\n"); printf(" \t tt Messages related to translation table operations\n"); printf(" \t bla Messages related to bridge loop avoidance\n"); + printf(" \t dat Messages related to the distributed arp table\n"); } int handle_loglevel(char *mesh_iface, int argc, char **argv) @@ -214,7 +215,7 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level = 0; break; } else if (strcmp(argv[i], "all") == 0) { - log_level = 15; + log_level = 31; break; } else if (strcmp(argv[i], "batman") == 0) log_level |= (1 << 0); @@ -224,6 +225,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) log_level |= (1 << 2); else if (strcmp(argv[i], "bla") == 0) log_level |= (1 << 3); + else if (strcmp(argv[i], "dat") == 0) + log_level |= (1 << 4); else { log_level_usage(); goto out; @@ -253,6 +256,8 @@ int handle_loglevel(char *mesh_iface, int argc, char **argv) "messages related to translation table operations", "tt"); printf("[%c] %s (%s)\n", (log_level & 8) ? 'x' : ' ', "messages related to bridge loop avoidance", "bla"); + printf("[%c] %s (%s)\n", (log_level & 16) ? 'x' : ' ', + "messages related to the distributed arp table", "arp"); out: free(path_buff); -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 8444f4c1e118c6b3e3f272e5e0bb629a2ae53dda Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 13:17:39 2012 +0100 batctl: update README and man with bla loglevel information Both the README and the man page have to report the new loglevel information in the corresponding section Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/README b/README index da0ac68..64ee152 100644 --- a/README +++ b/README @@ -300,6 +300,7 @@ $ batctl loglevel [ ] messages related to routing / flooding / broadcasting (batman) [ ] messages related to route added / changed / deleted (routes) [ ] messages related to translation table operations (tt) +[ ] messages related to bridge loop avoidance (bla) batctl aggregation ================== diff --git a/man/batctl.8 b/man/batctl.8 index f45a070..5cc37cb 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -65,7 +65,7 @@ Once started batctl will display the list of announced gateways in the network. If no parameter is given the current originator interval setting is displayed otherwise the parameter is used to set the originator interval. The interval is in units of milliseconds. .br .IP "\fBloglevel\fP|\fBll\fP [\fBlevel\fP[ \fBlevel\fP[ \fBlevel\fP]] \fB...\fP]" -If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. +If no parameter is given the current log level settings are displayed otherwise the parameter(s) is/are used to set the log level. Level 'none' disables all verbose logging. Level 'batman' enables messages related to routing / flooding / broadcasting. Level 'routes' enables messages related to routes being added / changed / deleted. Level 'tt' enables messages related to translation table operations. Level 'bla' enables messages related to the bridge loop avoidance. Level 'all' enables all messages. The messages are sent to the batman-adv debug log. Use \fBbatctl log\fP to see them. Make sure to have debugging output enabled when compiling the module otherwise the output as well as the loglevel options won't be available. .br .IP "\fBlog\fP|\fBl\fP [\fB\-n\fP]\fP" batctl will read the batman-adv debug log which has to be compiled into the kernel module. If "\-n" is given batctl will not replace the MAC addresses with bat\-host names in the output. -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 40336a78e16b0cf77ba622ede81c405ca5f30ec4 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jun 2 12:54:20 2011 +0200 batman-adv: add UNICAST_4ADDR packet type The current unicast packet type does not contain the orig source address. This patches add a new unicast packet (called UNICAST_4ADDR) which provides two new fields: the originator source address and the subtype (the type of the data contained in the packet payload). The former is useful to identify the node which injected the packet into the network and the latter is useful to avoid creating new unicast packet types in the future: a macro defining a new subtype will be enough. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/packet.h b/packet.h index 7971a69..f704c51 100644 --- a/packet.h +++ b/packet.h @@ -25,14 +25,19 @@ #define ETH_P_BATMAN 0x4305 /* unofficial/not registered Ethertype */ enum bat_packettype { - BAT_IV_OGM = 0x01, - BAT_ICMP = 0x02, - BAT_UNICAST = 0x03, - BAT_BCAST = 0x04, - BAT_VIS = 0x05, - BAT_UNICAST_FRAG = 0x06, - BAT_TT_QUERY = 0x07, - BAT_ROAM_ADV = 0x08 + BAT_IV_OGM = 0x01, + BAT_ICMP = 0x02, + BAT_UNICAST = 0x03, + BAT_BCAST = 0x04, + BAT_VIS = 0x05, + BAT_UNICAST_FRAG = 0x06, + BAT_TT_QUERY = 0x07, + BAT_ROAM_ADV = 0x08, + BAT_UNICAST_4ADDR = 0x09 +}; + +enum bat_subtype { + BAT_P_DATA = 0x01 }; /* this file is included by batctl which needs these defines */ @@ -158,6 +163,12 @@ struct unicast_packet { uint8_t dest[ETH_ALEN]; } __packed; +struct unicast_4addr_packet { + struct unicast_packet u; + uint8_t src[ETH_ALEN]; + uint8_t subtype; +} __packed; + struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */ -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 2f71a2e4e6863efa4c1112c7f585d074dce34782 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Thu Jun 2 12:29:51 2011 +0200 batman-adv: Distributed ARP Table - add ARP parsing functions ARP messages are now parsed to make it possible to trigger special actions depending on their types (snooping). Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/packet.h b/packet.h index f704c51..02b0c87 100644 --- a/packet.h +++ b/packet.h @@ -37,7 +37,10 @@ enum bat_packettype { }; enum bat_subtype { - BAT_P_DATA = 0x01 + BAT_P_DATA = 0x01, + BAT_P_DAT_DHT_GET = 0x02, + BAT_P_DAT_DHT_PUT = 0x03, + BAT_P_DAT_CACHE_REPLY = 0x04 }; /* this file is included by batctl which needs these defines */ -- batctl

1 0

batctl; branch, master, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the master branch: commit c03a0c7445de336c637fe515128b69a74276b8d1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Mar 30 18:45:51 2012 +0200 batctl: Start new development cycle Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/main.h b/main.h index e81508f..0ab2553 100644 --- a/main.h +++ b/main.h @@ -20,7 +20,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2012.1.0" +#define SOURCE_VERSION "2012.2.0" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket" -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 685af7174cec2495526faf365522fd084822631a Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Jan 30 20:59:17 2012 +0100 batctl: use ETH_ALEN instead of hardcoded numeric constants In packet.h the numeric constant 6 is used instead of the more portable ETH_ALEN define. This patch substitute any hardcoded value with such define. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> Acked-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/packet.h b/packet.h index 441f3db..45e75ed 100644 --- a/packet.h +++ b/packet.h @@ -100,8 +100,8 @@ struct batman_ogm_packet { struct batman_header header; uint8_t flags; /* 0x40: DIRECTLINK flag, 0x20 VIS_SERVER flag... */ uint32_t seqno; - uint8_t orig[6]; - uint8_t prev_sender[6]; + uint8_t orig[ETH_ALEN]; + uint8_t prev_sender[ETH_ALEN]; uint8_t gw_flags; /* flags related to gateway class */ uint8_t tq; uint8_t tt_num_changes; @@ -114,8 +114,8 @@ struct batman_ogm_packet { struct icmp_packet { struct batman_header header; uint8_t msg_type; /* see ICMP message types above */ - uint8_t dst[6]; - uint8_t orig[6]; + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; uint16_t seqno; uint8_t uid; uint8_t reserved; @@ -128,8 +128,8 @@ struct icmp_packet { struct icmp_packet_rr { struct batman_header header; uint8_t msg_type; /* see ICMP message types above */ - uint8_t dst[6]; - uint8_t orig[6]; + uint8_t dst[ETH_ALEN]; + uint8_t orig[ETH_ALEN]; uint16_t seqno; uint8_t uid; uint8_t rr_cur; @@ -139,16 +139,16 @@ struct icmp_packet_rr { struct unicast_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */ - uint8_t dest[6]; + uint8_t dest[ETH_ALEN]; } __packed; struct unicast_frag_packet { struct batman_header header; uint8_t ttvn; /* destination translation table version number */ - uint8_t dest[6]; + uint8_t dest[ETH_ALEN]; uint8_t flags; uint8_t align; - uint8_t orig[6]; + uint8_t orig[ETH_ALEN]; uint16_t seqno; } __packed; @@ -156,7 +156,7 @@ struct bcast_packet { struct batman_header header; uint8_t reserved; uint32_t seqno; - uint8_t orig[6]; + uint8_t orig[ETH_ALEN]; } __packed; struct vis_packet { @@ -165,9 +165,9 @@ struct vis_packet { uint32_t seqno; /* sequence number */ uint8_t entries; /* number of entries behind this struct */ uint8_t reserved; - uint8_t vis_orig[6]; /* originator that announces its neighbors */ - uint8_t target_orig[6]; /* who should receive this packet */ - uint8_t sender_orig[6]; /* who sent or rebroadcasted this packet */ + uint8_t vis_orig[ETH_ALEN]; /* originator reporting its neighbors */ + uint8_t target_orig[ETH_ALEN]; /* who should receive this packet */ + uint8_t sender_orig[ETH_ALEN]; /* who sent or forwarded this packet */ } __packed; struct tt_query_packet { -- batctl

1 0

batctl; branch, next, updated. v2012.1.0-17-gc03a0c7
by postmaster＠open-mesh.org 30 Mar '12

30 Mar '12

The following commit has been merged in the next branch: commit 7d3967fa4457d61df3742807d8b8dd676bc3f399 Author: Simon Wunderlich <simon.wunderlich(a)s2003.tu-chemnitz.de> Date: Sun Jan 22 20:00:19 2012 +0100 batman-adv: add basic bridge loop avoidance code This second version of the bridge loop avoidance for batman-adv avoids loops between the mesh and a backbone (usually a LAN). By connecting multiple batman-adv mesh nodes to the same ethernet segment a loop can be created when the soft-interface is bridged into that ethernet segment. A simple visualization of the loop involving the most common case - a LAN as ethernet segment: node1 <-- LAN --> node2 | | wifi <-- mesh --> wifi Packets from the LAN (e.g. ARP broadcasts) will circle forever from node1 or node2 over the mesh back into the LAN. With this patch, batman recognizes backbone gateways, nodes which are part of the mesh and backbone/LAN at the same time. Each backbone gateway "claims" clients from within the mesh to handle them exclusively. By restricting that only responsible backbone gateways may handle their claimed clients traffic, loops are effectively avoided. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/packet.h b/packet.h index 45e75ed..caa12fe 100644 --- a/packet.h +++ b/packet.h @@ -90,6 +90,22 @@ enum tt_client_flags { TT_CLIENT_PENDING = 1 << 10 }; +/* claim frame types for the bridge loop avoidance */ +enum bla_claimframe { + CLAIM_TYPE_ADD = 0x00, + CLAIM_TYPE_DEL = 0x01, + CLAIM_TYPE_ANNOUNCE = 0x02, + CLAIM_TYPE_REQUEST = 0x03 +}; + +/* the destination hardware field in the ARP frame is used to + * transport the claim type and the group id */ +struct bla_claim_dst { + uint8_t magic[3]; /* FF:43:05 */ + uint8_t type; /* bla_claimframe */ + uint16_t group; /* group id */ +} __packed; + struct batman_header { uint8_t packet_type; uint8_t version; /* batman version field */ -- batctl

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2012