commits November 2011

commits@lists.open-mesh.org

1 participants
69 discussions

batman-adv; branch, next, updated. v2011.4.0-20-gb42bb08

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 6ec6655451f681626a1e6cc257d3a809535e5a7c Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Sep 19 12:29:19 2011 +0200 batman-adv: tt_global_del_orig() has to print the correct message When deleting the entries, tt_global_del_orig() has to print the message passed as argument instead of a static one. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/translation-table.c b/translation-table.c index cc53f78..7de9960 100644 --- a/translation-table.c +++ b/translation-table.c @@ -720,9 +720,10 @@ void tt_global_del_orig(struct bat_priv *bat_priv, if (tt_global_entry->orig_node == orig_node) { bat_dbg(DBG_TT, bat_priv, "Deleting global tt entry %pM " - "(via %pM): originator time out\n", + "(via %pM): %s\n", tt_global_entry->addr, - tt_global_entry->orig_node->orig); + tt_global_entry->orig_node->orig, + message); hlist_del_rcu(node); tt_global_entry_free_ref(tt_global_entry); } -- batman-adv

11 years, 4 months

batman-adv; branch, next, updated. v2011.4.0-20-gb42bb08

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 3a0be91a0f6b32ee1a2151d5f8b82e6fa66e2fcf Merge: 6ec6655451f681626a1e6cc257d3a809535e5a7c 2d05b4a9732e16e425b34743cd254117ce554606 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Thu Sep 22 14:20:15 2011 +0200 Merge branch 'next' -- batman-adv

11 years, 4 months

batman-adv; branch, master, updated. v2011.4.0-20-gb42bb08

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit b42bb08d07964db71fc30217403bd3a49ce1ba76 Merge: c103efd9af4ca23f75d77ff10fb7af5a95ece3c3 dcac0a5750eb3c69eec84e0741df481451909480 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 14 10:03:00 2011 +0100 Merge commit 'v2011.4.0' Conflicts: README diff --combined README index 5ba56b5,c50cc0a..b4fdc8d --- a/README +++ b/README @@@ -1,4 -1,4 +1,4 @@@ - [state: 30-09-2011] + [state: 13-11-2011] BATMAN-ADV ---------- @@@ -18,7 -18,7 +18,7 @@@ Batman advanced was implemented as a Li duce the overhead to a minimum. It does not depend on any (other) network driver, and can be used on wifi as well as ethernet lan, vpn, etc ... (anything with ethernet-style layer 2). It compiles - against and should work with Linux 2.6.29 - 3.1. Supporting + against and should work with Linux 2.6.29 - 3.2. Supporting older versions is not planned, but it's probably easy to backport it. If you work on a backport, feel free to contact us. :-) @@@ -206,7 -206,7 +206,7 @@@ option "B.A.T.M.A.N. debugging". When c kernel tree it is necessary to edit the file Makefile.kbuild and uncomment the line -#EXTRA_CFLAGS += -DCONFIG_BATMAN_ADV_DEBUG +#ccflags-y += -DCONFIG_BATMAN_ADV_DEBUG Those additional debug messages can be accessed using a special file in debugfs @@@ -218,15 -218,16 +218,16 @@@ abled during run time. Following log_l 0 - All debug output disabled 1 - Enable messages related to routing / flooding / broadcasting - 2 - Enable route or tt entry added / changed / deleted - 3 - Enable all messages + 2 - Enable messages related to route added / changed / deleted + 4 - Enable messages related to translation table operations + 7 - Enable all messages The debug output can be changed at runtime using the file /sys/class/net/bat0/mesh/log_level. e.g. # echo 2 > /sys/class/net/bat0/mesh/log_level - will enable debug messages for when routes or TTs change. + will enable debug messages for when routes change. BATCTL -- batman-adv

11 years, 4 months

batman-adv; annotated tag, v2011.4.0, created. v2011.4.0

by postmaster＠open-mesh.org

The annotated tag, v2011.4.0 has been created at bf2b5c1b16927c6be0012e886b3d1b3b8543e778 (tag) tagging dcac0a5750eb3c69eec84e0741df481451909480 (commit) replaces v2011.3.1 tagged by Sven Eckelmann on Mon Nov 14 10:00:58 2011 +0100 - Shortlog ------------------------------------------------------------ batman-adv 2011.4.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOwNjKAAoJEF2HCgfBJntGQI8P/2wFYcuSSEBmzgcUeRqD76jW 6P2GQbyDYZz81nu3GlZiUF8fp1xooUTSKWUhuap8CKUpbB0j6seSt+N3dd6Ifq4j sYrq+QMC1iSMIUHFt7bkVixkCjyjScWrOunXPnLA3oPunleOo8cSdpown3gZRcFX Em/CULe/fGALW3MUd2UZBXopLGI4Pp9os09aOKdz9ZMP06d8EKRXhoGtvfN6NvDd EgfSEzB12knC7tOpO6P+jYrMf3R4g6XEk642rkiYkPQbgrjyP4fbSQVAccOxTMvQ t7+yzk+xaX6/JjYEN0ujGlC3UG4VQLxA5ANwobqonfrlUU7h3dSd+tJ4rZBVzjms 7Qc6RK4yT19kfdGbkpbo4LUnnvpl0kzxc1S4/LR6wHr9UOYhjh9N3ekGbEU1+jaV lCfWvIHqnKYdXApWG9w3yhwvBJHUS87ygMsox7UfzoZI985+pWGgS0ye8K5JmZvf 4SoyOSv3Iq6dSCuGnjaYUElEEDr2yM3V7SqbC6h7jPnR/iLYZiFLUzNg5xA/9eLO r6HaoiKojDANfJoT1RKQBEhs/oa3UQ61CPRBT4OL5uS4LHdytHqn04DoPNikxHCM luPHi5Tvoeux8PZGqVE+JO1Ccyd2tALeeUxpWyXUkwo15TtSdM2e9QnqDS4xkLFU o2ETjJPJhAEWvuEWq9fM =fOno -----END PGP SIGNATURE----- Antonio Quartulli (8): batman-adv: hash_add() has to discriminate on the return value batman-adv: correct several typ0s in the comments batman-adv: detect clients connected through a 802.11 device batman-adv: implement AP-isolation on the receiver side batman-adv: implement AP-isolation on the sender side batman-adv: print client flags in the local/global transtables output batman-adv: unify hash_entry field position in tt_local/global_entry batman-adv: unify hash_entry field position in tt_local/global_entry Joe Perches (1): batman-adv: Remove unnecessary OOM logging messages Marek Lindner (11): batman-adv: reuse tt_len() to calculate tt buffer length batman-adv: merge update_transtable() into tt related code batman-adv: rename all instances of batman_packet to batman_ogm_packet batman-adv: agglomerate all batman iv ogm processing functions in a single file batman-adv: move routing packet initialization into corresponding file batman-adv agglomerate all batman iv ogm senbding functions in the batman iv file Merge branch 'maint' into next Merge branch 'maint' into next Merge branch 'maint' into next batman-adv: readme update (mention ap isolation and new log level) Merge branch 'maint' into next Simon Wunderlich (5): batman-adv: update README - add ap_isolation batman-adv: remove references for global tt entries batman-adv: add sanity check when removing global tts batman-adv: remove references for global tt entries batman-adv: add sanity check when removing global tts Sven Eckelmann (4): Merge commit 'v2011.3.0' batman-adv: Start new development cycle batman-adv: Update CHANGELOG for upcoming release batman-adv: Update README for upcoming release ----------------------------------------------------------------------- -- batman-adv

11 years, 4 months

batctl; annotated tag, v2011.4.0, created. v2011.4.0

by postmaster＠open-mesh.org

The annotated tag, v2011.4.0 has been created at 6e39b0315a6c4dc99bef11100d0a30e291534546 (tag) tagging a9f63504f17d75914831dc8b6940b2740fa4e655 (commit) replaces v2011.3.0 tagged by Sven Eckelmann on Mon Nov 14 10:12:54 2011 +0100 - Shortlog ------------------------------------------------------------ batctl 2011.4.0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABCgAGBQJOwNuWAAoJEF2HCgfBJntGK2sQANh7weIjbxqZ2x3fgPspcG3x 8AAepvIvbb3i0h+O5PJknYwG+xLGtBjV/SpB4lbJgW8b55d2m4Je+pyYlSjy3X/g UMnkw+uqD6cWmVKYiRiCxbUlWuYkKDR8bt+Q6NhACXOhQXn9M3mUOoQPQ4V5CMmt aLFTLHpZuLwcH6kbYUQONalOdN/TZMhc0dTQ5ot4rWjlklDeVUm6+6ypP9XxTRzZ 1NmHzOGoEkRQbbOEtWT04vDLQ9YBQsEZd7h9llPs7M3o9Rz8KWJ+22HsN3VXxYUe DABELsZZx/dN6yuese4Yy7OI/ZgX98ZmLgDb6wW070asHAJapfPtIdeCYS7P+Lu8 BE8FbAq9jDQFr0bcvp1haYKDw4DuKIPo+35gLCz0D8BXk5yVquYz5pRkoSxHM5xW PhVWbgTrvJSDeVPzoL+ihy/hYc5DzU6PakhLk0y3aJN/qQ2LkuvT4zTIpOh988v3 1Me0DDccCsVKtcotAeIIJDtol4WWwlfGk3dgjR+JU58GIOqQum6i+AZUlS0Odm63 gfZMd7NygUL1QvSgvPgIeVIjtwaTOAIEStNYjOrjjFFrdJA54bMIYsB+e8rajFpC bLlklzWCE9WZ+m7tTa2Rc/ObXEjtVBvfE/j/7SsfqxF0Yak31aCWjRGkvmPoLUjD 13QONGrOG1P9shVIt131 =PHhI -----END PGP SIGNATURE----- Antonio Quartull (3): batctl: correct ttcrc print format in the tcpdump output batctl: correct batctl ll output batctl: update tt sections in the README Antonio Quartulli (2): batctl: added ap_isolation support batctl: detect clients connected through a 802.11 device Jonathan Neuschäfer (1): batctl: fix a memory leak in bat_hosts_init Marek Lindner (6): batctl: rename all instances of batman_packet to batman_ogm_packet batctl: rename all instances of batman_packet to batman_ogm_packet Merge branch 'next' of git+ssh://batman-git/batctl into next batctl: version also prints the kernel module version if available batctl: remove unused SINGLE_READ flag batctl: update the tcpdump section in the README Martin Hundebøll (1): batctl: Human readable log levels instead of bitmasks Simon Wunderlich (1): batctl: Update README Sven Eckelmann (2): Merge commit 'v2011.3.0' batctl: Start new development cycle ----------------------------------------------------------------------- -- batctl

11 years, 4 months

batctl; branch, master, updated. v2011.3.0-19-g1a43e58

by postmaster＠open-mesh.org

The following commit has been merged in the master branch: commit 1a43e58fbd0a24cb89baabf45fcc325f1d97b77d Merge: 240a99f99a824a324abbeffb2415e72b8467e6f2 a9f63504f17d75914831dc8b6940b2740fa4e655 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 14 10:15:47 2011 +0100 Merge commit 'v2011.4.0' -- batctl

11 years, 4 months

batctl; branch, next, updated. v2011.3.0-19-g1a43e58

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 240a99f99a824a324abbeffb2415e72b8467e6f2 Merge: cd1a5e22e37e7aafc967db4a8a9c079948eb931d edab69b199080cf0c7eac1288441a5e37dd22278 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Wed Nov 9 01:54:50 2011 +0800 Merge branch 'next' -- batctl

11 years, 4 months

batctl; branch, next, updated. v2011.3.0-19-g1a43e58

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit cd1a5e22e37e7aafc967db4a8a9c079948eb931d Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Sun Oct 30 22:11:30 2011 +0100 batctl: retrieve compat version from version field in case of parameter problem Reported-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> diff --git a/ping.c b/ping.c index 1003ab1..91b733a 100644 --- a/ping.c +++ b/ping.c @@ -283,8 +283,8 @@ int ping(char *mesh_iface, int argc, char **argv) break; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.ttl, COMPAT_VERSION); - printf("Please make sure to compatible versions!\n"); + icmp_packet_in.version, COMPAT_VERSION); + printf("Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); diff --git a/traceroute.c b/traceroute.c index ea43331..d120311 100644 --- a/traceroute.c +++ b/traceroute.c @@ -188,8 +188,8 @@ int traceroute(char *mesh_iface, int argc, char **argv) goto out; case PARAMETER_PROBLEM: printf("Error - the batman adv kernel module version (%d) differs from ours (%d)\n", - icmp_packet_in.ttl, COMPAT_VERSION); - printf("Please make sure to compatible versions!\n"); + icmp_packet_in.version, COMPAT_VERSION); + printf("Please make sure to use compatible versions!\n"); goto out; default: printf("Unknown message type %d len %zd received\n", icmp_packet_in.msg_type, read_len); -- batctl

11 years, 4 months

batctl; branch, next, updated. v2011.3.0-19-g1a43e58

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit 1a43e58fbd0a24cb89baabf45fcc325f1d97b77d Merge: 240a99f99a824a324abbeffb2415e72b8467e6f2 a9f63504f17d75914831dc8b6940b2740fa4e655 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Nov 14 10:15:47 2011 +0100 Merge commit 'v2011.4.0' -- batctl

11 years, 4 months

batctl; branch, next, updated. v2011.3.0-16-ga9f6350

by postmaster＠open-mesh.org

The following commit has been merged in the next branch: commit a9f63504f17d75914831dc8b6940b2740fa4e655 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Nov 13 23:18:46 2011 +0100 batctl: Update README Update the loglevel and originator table output in the README Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> diff --git a/README b/README index 97524da..7119951 100644 --- a/README +++ b/README @@ -233,15 +233,16 @@ Usage: batctl originators|o 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] -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) -fe:fe:00:00:07:01 (203) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (203) fe:fe:00:00:03:01 ( 88) -fe:fe:00:00:08:01 (196) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 0) fe:fe:00:00:02:01 (196) -fe:fe:00:00:03:01 (244) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 (104) fe:fe:00:00:02:01 (244) -fe:fe:00:00:09:01 (184) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (184) fe:fe:00:00:03:01 ( 72) -fe:fe:00:00:06:01 (214) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 76) fe:fe:00:00:02:01 (214) +[B.A.T.M.A.N. adv 2011.4.0, MainIF/MAC: eth0/fe:fe:00:00:01:01 (bat0)] + Originator last-seen (#/255) Nexthop [outgoingIF]: Potential nexthops ... +fe:fe:00:00:08:01 0.820s (194) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 65) fe:fe:00:00:02:01 (194) +fe:fe:00:00:03:01 0.980s (245) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (245) +fe:fe:00:00:05:01 0.140s (221) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 76) fe:fe:00:00:02:01 (221) +fe:fe:00:00:04:01 0.010s (235) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:02:01 (235) fe:fe:00:00:03:01 ( 81) +fe:fe:00:00:09:01 0.830s (187) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 63) fe:fe:00:00:02:01 (187) +fe:fe:00:00:06:01 0.830s (213) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 71) fe:fe:00:00:02:01 (213) +fe:fe:00:00:02:01 0.240s (255) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 81) fe:fe:00:00:02:01 (255) +fe:fe:00:00:07:01 0.670s (200) fe:fe:00:00:02:01 [ eth0]: fe:fe:00:00:03:01 ( 68) fe:fe:00:00:02:01 (200) batctl interface ================ @@ -295,10 +296,10 @@ Usage: batctl loglevel|ll [level] Example: $ batctl loglevel -[x] all debug output disabled (0) -[ ] messages related to routing / flooding / broadcasting (1) -[ ] messages related to route or hna added / changed / deleted (2) -[ ] all debug messages (3) +[x] all debug output disabled (none) +[ ] messages related to routing / flooding / broadcasting (batman) +[ ] messages related to route added / changed / deleted (routes) +[ ] messages related to translation table operations (tt) batctl aggregation ================== -- batctl

11 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2011