commits April 2011

commits@lists.open-mesh.org

1 participants
94 discussions

batman-adv; branch, next, updated. v2011.0.0-39-g4424bde
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next branch: commit 4424bdeca1d265e81f8bb80a3fac9133fdfc2fa5 Merge: 0642cd27c05ce3bcadcc99cdb0ce6743fcf5c750 2b9a9e274364be840016ca54b132b294af29a9a0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sun Apr 17 15:31:30 2011 +0200 Merge branch 'maint' into next Conflicts: unicast.c -- batman-adv

1 0

batctl; branch, next, updated. v2011.0.0-20-gbe749a0
by postmaster＠open-mesh.org 17 Apr '11

17 Apr '11

The following commit has been merged in the next branch: commit be749a08dab715f2cacf39c71d409808e8efa42c Merge: c6fcdb6dc9a9a9f9308e72fcbb9462e4f678b57c eee3fc647349f8a0d2b671eed2f0e7375ac113d4 Author: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Date: Sun Apr 17 14:58:13 2011 +0200 batctl: Merge commits from master into next * batctl: avoid error message when command was successful * batctl: Remove subversion/svk revision information * batctl: Remove obsolete creation of source packages Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> -- batctl

1 0

batman-adv; branch, next, updated. v2011.0.0-37-g0642cd2
by postmaster＠open-mesh.org 16 Apr '11

16 Apr '11

The following commit has been merged in the next branch: commit a7776631ec0e08641590f9115c9dd23a4af88dbf Author: Lucas De Marchi <lucas.demarchi(a)profusion.mobi> Date: Wed Mar 30 22:57:33 2011 -0300 batman-adv: Fix common misspellings Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi(a)profusion.mobi> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index 9ed2614..824e1f6 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -474,7 +474,7 @@ void interface_rx(struct net_device *soft_iface, goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); - /* should not be neccesary anymore as we use skb_pull_rcsum() + /* should not be necessary anymore as we use skb_pull_rcsum() * TODO: please verify this and remove this TODO * -- Dec 21st 2009, Simon Wunderlich */ -- batman-adv

1 0

batman-adv; branch, next, updated. v2011.0.0-37-g0642cd2
by postmaster＠open-mesh.org 16 Apr '11

16 Apr '11

The following commit has been merged in the next branch: commit 0642cd27c05ce3bcadcc99cdb0ce6743fcf5c750 Author: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Date: Mon Apr 4 15:04:46 2011 -0700 batman-adv: fix minor typos/spelling Fix some minor typos: * informations => information Signed-off-by: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 85e4518..2c3de52 100644 --- a/README +++ b/README @@ -88,7 +88,7 @@ folder: # fragmentation gw_sel_class vis_mode -There is a special folder for debugging informations: +There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ # gateways socket transtable_global vis_data -- batman-adv

1 0

linux integration; annotated tag, v2.6.39-rc3, created. v2.6.39-rc3
by postmaster＠open-mesh.org 12 Apr '11

12 Apr '11

The annotated tag, v2.6.39-rc3 has been created at 074bd9a1615dd4c0108b0424a50770d1b605b53e (tag) tagging a6360dd37e1a144ed11e6548371bade559a1e4df (commit) replaces v2.6.39-rc2 tagged by Linus Torvalds on Mon Apr 11 17:22:00 2011 -0700 - Shortlog ------------------------------------------------------------ Linux 2.6.39-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) iEYEABECAAYFAk2jmzEACgkQF3YsRnbiHLuDZQCfQ8zg/3hXHEcpprPvvKCZaSLW szEAmwSkfVGtswJVCpZgC/6IQmIpu7Q+ =2/0l -----END PGP SIGNATURE----- Lucas De Marchi (1): Fix common misspellings ----------------------------------------------------------------------- -- linux integration

1 0

batman-adv; branch, master, updated. v2011.0.0-75-gdd7dbf2
by postmaster＠open-mesh.org 09 Apr '11

09 Apr '11

The following commit has been merged in the master branch: commit dd7dbf2af5b6f67d543bfe17dddaa0722037f8b4 Author: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Date: Mon Apr 4 15:04:46 2011 -0700 batman-adv: fix minor typos/spelling Fix some minor typos: * informations => information Signed-off-by: Sylvestre Ledru <sylvestre.ledru(a)scilab.org> Signed-off-by: Randy Dunlap <randy.dunlap(a)oracle.com> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/README b/README index 85e4518..2c3de52 100644 --- a/README +++ b/README @@ -88,7 +88,7 @@ folder: # fragmentation gw_sel_class vis_mode -There is a special folder for debugging informations: +There is a special folder for debugging information: # ls /sys/kernel/debug/batman_adv/bat0/ # gateways socket transtable_global vis_data -- batman-adv

1 0

batman-adv; branch, master, updated. v2011.0.0-74-g40a0cf6
by postmaster＠open-mesh.org 09 Apr '11

09 Apr '11

The following commit has been merged in the master branch: commit 40a0cf67838914c79d83e49d80c4e75df6042ade Author: Lucas De Marchi <lucas.demarchi(a)profusion.mobi> Date: Wed Mar 30 22:57:33 2011 -0300 batman-adv: Fix common misspellings Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi <lucas.demarchi(a)profusion.mobi> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> diff --git a/soft-interface.c b/soft-interface.c index 58ce440..1f6f756 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -532,7 +532,7 @@ void interface_rx(struct net_device *soft_iface, goto dropped; skb->protocol = eth_type_trans(skb, soft_iface); - /* should not be neccesary anymore as we use skb_pull_rcsum() + /* should not be necessary anymore as we use skb_pull_rcsum() * TODO: please verify this and remove this TODO * -- Dec 21st 2009, Simon Wunderlich */ -- batman-adv

1 0

vis; branch, pu/json, deleted. v0.3.2-9-g4124fe9
by postmaster＠open-mesh.org 08 Apr '11

08 Apr '11

The branch, pu/json has been deleted was 4124fe9ac1c2debdf5dee798e1754e3d7ae6d76f ----------------------------------------------------------------------- 4124fe9ac1c2debdf5dee798e1754e3d7ae6d76f vis: Modified format of JSON output. ----------------------------------------------------------------------- -- vis

1 0

vis; branch, master, updated. v0.3.2-10-g9160c18
by postmaster＠open-mesh.org 08 Apr '11

08 Apr '11

The following commit has been merged in the master branch: commit 9160c1811713ba4b9e2ccbc5b381e9aac333e60c Author: elektra <elektra(a)eee.(none)> Date: Fri Apr 8 11:53:16 2011 +0200 Modified JSON output format. No longer breaking the json_decode() function for PHP. Patch courtesy of Alberto Escudero-Pascual. diff --git a/vis.c b/vis.c index 4087ecb..a17e192 100644 --- a/vis.c +++ b/vis.c @@ -88,19 +88,21 @@ int my_daemon() if ( fork() ) exit(EXIT_SUCCESS); - chdir( "/" ); + if (chdir( "/" )==0) { - if ( ( fd = open(_PATH_DEVNULL, O_RDWR, 0) ) != -1 ) { + if ( ( fd = open(_PATH_DEVNULL, O_RDWR, 0) ) != -1 ) { - dup2(fd, STDIN_FILENO); - dup2(fd, STDOUT_FILENO); - dup2(fd, STDERR_FILENO); + dup2(fd, STDIN_FILENO); + dup2(fd, STDOUT_FILENO); + dup2(fd, STDERR_FILENO); - if ( fd > 2 ) - close(fd); + if ( fd > 2 ) + close(fd); + } + } else { + exit_error( "Error - can't chdir\n"); } - return 0; } @@ -395,7 +397,7 @@ void write_data_in_buffer() { fillme->dot_buffer = (char *)debugRealloc( fillme->dot_buffer, strlen( tmp ) + strlen( fillme->dot_buffer ) + 1, 408 ); strncat( fillme->dot_buffer, tmp, strlen( tmp ) ); - snprintf( tmp, sizeof( tmp ), "%s\t{ router : \"%s\", neighbour : \"%s\", label : %.2f }", + snprintf( tmp, sizeof( tmp ), "%s{\"router\":\"%s\",\"neighbour\":\"%s\",\"label\":%.2f}", (first_line ? "" : ",\n"), from_str, to_str, (float)( orig_node->tq_max / (float)neigh->tq_avg ) ); first_line = 0; fillme->json_buffer = (char *)debugRealloc( fillme->json_buffer, strlen( tmp ) + strlen( fillme->json_buffer ) + 1, 408 ); @@ -416,7 +418,7 @@ void write_data_in_buffer() { fillme->dot_buffer = (char *)debugRealloc( fillme->dot_buffer, strlen( tmp ) + strlen( fillme->dot_buffer ) + 1, 409 ); strncat( fillme->dot_buffer, tmp, strlen( tmp ) ); - snprintf( tmp, sizeof( tmp ), "%s\t{ router : \"%s\", gateway : \"%s/%s\", label : \"HNA\" }", + snprintf( tmp, sizeof( tmp ), "%s{\"router\":\"%s\",\"gateway\":\"%s/%s\",\"label\":\"HNA\"}", (first_line ? "" : ",\n"), from_str, to_str, hna_str ); first_line = 0; fillme->json_buffer = (char *)debugRealloc( fillme->json_buffer, strlen( tmp ) + strlen( fillme->json_buffer ) + 1, 409 ); @@ -432,7 +434,7 @@ void write_data_in_buffer() { strncat( fillme->dot_buffer, tmp, strlen( tmp ) ); snprintf( tmp, sizeof( tmp ), - "%s\t{ router : \"%s\", gateway : \"%s\", label : \"%s\" }", + "%s{\"router\":\"%s\",\"gateway\":\"%s\",\"label\":\"%s\"}", (first_line ? "" : ",\n"), from_str, "0.0.0.0/0.0.0.0", "HNA" ); first_line = 0; fillme->json_buffer = (char *)debugRealloc( fillme->json_buffer, strlen( tmp ) + strlen( fillme->json_buffer ) + 1, 410 ); -- vis

1 0

batmand; branch, master, updated. v0.3.2-25-g33a5773
by postmaster＠open-mesh.org 07 Apr '11

07 Apr '11

The following commit has been merged in the master branch: commit 33a5773ab39a089870667634e08ce98fad1a2fd1 Author: elektra <elektra(a)eee.(none)> Date: Thu Apr 7 20:55:39 2011 +0200 Added a explanation to the Makefile options to the INSTALL file. diff --git a/INSTALL b/INSTALL index a4fa559..58be950 100644 --- a/INSTALL +++ b/INSTALL @@ -20,6 +20,43 @@ make targets are still available but will most probably not work. If you're interested in porting and maintaining B.A.T.M.A.N. for these systems, please contact us. We would appreciate your help. +Tweaking +-------- + +You can tweak the program requirements by editing the Makefile. + + +Getting rid of the policy-routing requirement in the Linux kernel: + +By default batmand requires policy-routing to be enabled in the Linux +kernel. On many embedded devices this can be an obstacle if you want to get batmand +running, because it requires to install a different kernel. + +Remove the comment hash (#) leading this line in the Makefile: +#NO_POLICY_ROUTING = -DNO_POLICY_ROUTING + + +Reducing the batmand daemon size: + +In case you don't need debug output levels greater than 2 (debug level 1 +shows originators, debug level 2 shows Internet gateways), add a +comment hash leading this line in the Makefile: + +DEBUG_GREATER_2 = -DDEBUG + +This will skip tons of debug information from the binary and save about 8 KB. + + +Disable the easter-egg. The developers thought it would be fancy to have a +easter-egg. If you are bartering for every single byte of binary size, you +can disable it as well. Add a hash to this line: + +ENABLE_EASTEREGG = -DEASTEREGG + +This will save another 4 KB. + + + Compiling --------- -- batmand

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2011