commits March 2010

commits@lists.open-mesh.org

1 participants
38 discussions

r1606 - trunk/batctl
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 21:44:37 +0100 (Sun, 21 Mar 2010) New Revision: 1606 Modified: trunk/batctl/README trunk/batctl/main.c Log: batctl: fix syntax: enable -> enabled The vis server takes the argument "enabled/disabled", not "enable/disable" Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Reported-by: Linus Luessing <linus.luessing(a)web.de> Modified: trunk/batctl/README =================================================================== --- trunk/batctl/README 2010-03-21 20:42:45 UTC (rev 1605) +++ trunk/batctl/README 2010-03-21 20:44:37 UTC (rev 1606) @@ -339,7 +339,7 @@ display or modify the status of the VIS server -Usage: batctl vis_server|vs [enable|disable] +Usage: batctl vis_server|vs [enabled|disabled] Example: Modified: trunk/batctl/main.c =================================================================== --- trunk/batctl/main.c 2010-03-21 20:42:45 UTC (rev 1605) +++ trunk/batctl/main.c 2010-03-21 20:44:37 UTC (rev 1606) @@ -50,7 +50,7 @@ printf(" \tgw_srv_list|gwl \tdisplay the gateway server list\n"); printf(" \ttranslocal|tl \tdisplay the local translation table\n"); printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tvis_server|vs [enable|disable] \tdisplay or modify the status of the VIS server\n"); + printf(" \tvis_server|vs [enabled|disabled]\tdisplay or modify the status of the VIS server\n"); printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); printf(" \tbonding|b [0|1] \tdisplay or modify the bonding mode setting\n");

1 0

r1605 - branches/batctl-0.2.x
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 21:42:45 +0100 (Sun, 21 Mar 2010) New Revision: 1605 Modified: branches/batctl-0.2.x/README branches/batctl-0.2.x/main.c Log: batctl-0.2.x: fix syntax: enable -> enabled The vis server takes the argument "enabled/disabled", not "enable/disable" Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Reported-by: Linus Luessing <linus.luessing(a)web.de> Modified: branches/batctl-0.2.x/README =================================================================== --- branches/batctl-0.2.x/README 2010-03-21 19:34:08 UTC (rev 1604) +++ branches/batctl-0.2.x/README 2010-03-21 20:42:45 UTC (rev 1605) @@ -339,7 +339,7 @@ display or modify the status of the VIS server -Usage: batctl vis_server|vs [enable|disable] +Usage: batctl vis_server|vs [enabled|disabled] Example: Modified: branches/batctl-0.2.x/main.c =================================================================== --- branches/batctl-0.2.x/main.c 2010-03-21 19:34:08 UTC (rev 1604) +++ branches/batctl-0.2.x/main.c 2010-03-21 20:42:45 UTC (rev 1605) @@ -48,7 +48,7 @@ printf(" \tlog|l \tread the log produced by the kernel module\n"); printf(" \ttranslocal|tl \tdisplay the local translation table\n"); printf(" \ttransglobal|tg \tdisplay the global translation table\n"); - printf(" \tvis_server|vs [enable|disable] \tdisplay or modify the status of the VIS server\n"); + printf(" \tvis_server|vs [enabled|disabled]\tdisplay or modify the status of the VIS server\n"); printf(" \tvis_data|vd [dot|JSON] \tdisplay the VIS data in dot or JSON format\n"); printf(" \taggregation|ag [0|1] \tdisplay or modify the packet aggregation setting\n"); printf("\n");

1 0

r1604 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 20:34:08 +0100 (Sun, 21 Mar 2010) New Revision: 1604 Modified: trunk/batman-adv-kernelland/vis.h Log: batman-adv: Remove the obsolete VIS_FORMAT strings Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: trunk/batman-adv-kernelland/vis.h =================================================================== --- trunk/batman-adv-kernelland/vis.h 2010-03-21 19:25:31 UTC (rev 1603) +++ trunk/batman-adv-kernelland/vis.h 2010-03-21 19:34:08 UTC (rev 1604) @@ -20,8 +20,6 @@ */ #define VIS_TIMEOUT 200000 -#define VIS_FORMAT_DD_NAME "dot_draw" -#define VIS_FORMAT_JSON_NAME "json" struct vis_info { unsigned long first_seen;

1 0

r1603 - branches/batctl-0.2.x
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 20:25:31 +0100 (Sun, 21 Mar 2010) New Revision: 1603 Modified: branches/batctl-0.2.x/Makefile branches/batctl-0.2.x/allocate.h branches/batctl-0.2.x/bat-hosts.c branches/batctl-0.2.x/bat-hosts.h branches/batctl-0.2.x/bisect.c branches/batctl-0.2.x/bisect.h branches/batctl-0.2.x/functions.c branches/batctl-0.2.x/functions.h branches/batctl-0.2.x/hash.c branches/batctl-0.2.x/hash.h branches/batctl-0.2.x/list-batman.c branches/batctl-0.2.x/list-batman.h branches/batctl-0.2.x/main.c branches/batctl-0.2.x/main.h branches/batctl-0.2.x/packet.h branches/batctl-0.2.x/ping.c branches/batctl-0.2.x/ping.h branches/batctl-0.2.x/proc.c branches/batctl-0.2.x/proc.h branches/batctl-0.2.x/sys.c branches/batctl-0.2.x/sys.h branches/batctl-0.2.x/tcpdump.c branches/batctl-0.2.x/tcpdump.h branches/batctl-0.2.x/traceroute.c branches/batctl-0.2.x/traceroute.h branches/batctl-0.2.x/vis.c branches/batctl-0.2.x/vis.h Log: batctl-0.2.x: release string and copyright years update the release string (strip the beta) and update copyright numbers to 2010. Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: branches/batctl-0.2.x/Makefile =================================================================== --- branches/batctl-0.2.x/Makefile 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/Makefile 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2009 BATMAN contributors +# Copyright (C) 2006-2010 BATMAN contributors # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public Modified: branches/batctl-0.2.x/allocate.h =================================================================== --- branches/batctl-0.2.x/allocate.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/allocate.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/bat-hosts.c =================================================================== --- branches/batctl-0.2.x/bat-hosts.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/bat-hosts.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/bat-hosts.h =================================================================== --- branches/batctl-0.2.x/bat-hosts.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/bat-hosts.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/bisect.c =================================================================== --- branches/batctl-0.2.x/bisect.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/bisect.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/bisect.h =================================================================== --- branches/batctl-0.2.x/bisect.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/bisect.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/functions.c =================================================================== --- branches/batctl-0.2.x/functions.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/functions.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/functions.h =================================================================== --- branches/batctl-0.2.x/functions.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/functions.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/hash.c =================================================================== --- branches/batctl-0.2.x/hash.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/hash.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: branches/batctl-0.2.x/hash.h =================================================================== --- branches/batctl-0.2.x/hash.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/hash.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: branches/batctl-0.2.x/list-batman.c =================================================================== --- branches/batctl-0.2.x/list-batman.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/list-batman.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: branches/batctl-0.2.x/list-batman.h =================================================================== --- branches/batctl-0.2.x/list-batman.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/list-batman.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: branches/batctl-0.2.x/main.c =================================================================== --- branches/batctl-0.2.x/main.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/main.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/main.h =================================================================== --- branches/batctl-0.2.x/main.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/main.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * @@ -21,6 +21,6 @@ -#define SOURCE_VERSION "0.2.1-beta" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ +#define SOURCE_VERSION "0.2.1" /*put exactly one distinct word inside the string like "0.3-pre-alpha" or "0.3-rc1" or "0.3" */ #define BAT_DEVICE "/dev/batman-adv" Modified: branches/batctl-0.2.x/packet.h =================================================================== --- branches/batctl-0.2.x/packet.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/packet.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: branches/batctl-0.2.x/ping.c =================================================================== --- branches/batctl-0.2.x/ping.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/ping.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/ping.h =================================================================== --- branches/batctl-0.2.x/ping.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/ping.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/proc.c =================================================================== --- branches/batctl-0.2.x/proc.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/proc.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/proc.h =================================================================== --- branches/batctl-0.2.x/proc.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/proc.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/sys.c =================================================================== --- branches/batctl-0.2.x/sys.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/sys.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/sys.h =================================================================== --- branches/batctl-0.2.x/sys.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/sys.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/tcpdump.c =================================================================== --- branches/batctl-0.2.x/tcpdump.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/tcpdump.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de> * Modified: branches/batctl-0.2.x/tcpdump.h =================================================================== --- branches/batctl-0.2.x/tcpdump.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/tcpdump.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/traceroute.c =================================================================== --- branches/batctl-0.2.x/traceroute.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/traceroute.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Andreas Langer <a.langer(a)q-dsl.de>, Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/traceroute.h =================================================================== --- branches/batctl-0.2.x/traceroute.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/traceroute.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner <lindner_marek(a)yahoo.de> * Modified: branches/batctl-0.2.x/vis.c =================================================================== --- branches/batctl-0.2.x/vis.c 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/vis.c 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Andrew Lunn <andrew(a)lunn.ch> * * This program is free software; you can redistribute it and/or Modified: branches/batctl-0.2.x/vis.h =================================================================== --- branches/batctl-0.2.x/vis.h 2010-03-21 19:09:22 UTC (rev 1602) +++ branches/batctl-0.2.x/vis.h 2010-03-21 19:25:31 UTC (rev 1603) @@ -1,4 +1,6 @@ -/* Copyright (C) 2009 B.A.T.M.A.N. contributors: +/* + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Andrew Lunn <andrew(a)lunn.ch> * * This program is free software; you can redistribute it and/or

1 0

r1602 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 20:09:22 +0100 (Sun, 21 Mar 2010) New Revision: 1602 Modified: trunk/batman-adv-kernelland/main.h Log: batman-adv: Remove dead max addr #define It's not being used anywhere and just misleading, therefore removing it. Signed-off-by: Linus L?\195?\188ssing <linus.luessing(a)web.de> Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2010-03-21 18:53:00 UTC (rev 1601) +++ trunk/batman-adv-kernelland/main.h 2010-03-21 19:09:22 UTC (rev 1602) @@ -34,8 +34,6 @@ #define TQ_MAX_VALUE 255 #define JITTER 20 #define TTL 50 /* Time To Live of broadcast messages */ -#define MAX_ADDR 16 /* number of interfaces which can be added to - * batman. */ #define PURGE_TIMEOUT 200000 /* purge originators after time in ms if no * valid packet comes in -> TODO: check

1 0

r1601 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 21 Mar '10

21 Mar '10

Author: simon Date: 2010-03-21 19:53:00 +0100 (Sun, 21 Mar 2010) New Revision: 1601 Modified: trunk/batman-adv-kernelland/Makefile trunk/batman-adv-kernelland/Makefile.kbuild trunk/batman-adv-kernelland/aggregation.c trunk/batman-adv-kernelland/aggregation.h trunk/batman-adv-kernelland/bitarray.c trunk/batman-adv-kernelland/bitarray.h trunk/batman-adv-kernelland/compat.h trunk/batman-adv-kernelland/device.c trunk/batman-adv-kernelland/device.h trunk/batman-adv-kernelland/gateway_client.c trunk/batman-adv-kernelland/gateway_client.h trunk/batman-adv-kernelland/gateway_common.c trunk/batman-adv-kernelland/gateway_common.h trunk/batman-adv-kernelland/hard-interface.c trunk/batman-adv-kernelland/hard-interface.h trunk/batman-adv-kernelland/hash.c trunk/batman-adv-kernelland/hash.h trunk/batman-adv-kernelland/main.c trunk/batman-adv-kernelland/main.h trunk/batman-adv-kernelland/originator.c trunk/batman-adv-kernelland/originator.h trunk/batman-adv-kernelland/packet.h trunk/batman-adv-kernelland/proc.c trunk/batman-adv-kernelland/proc.h trunk/batman-adv-kernelland/ring_buffer.c trunk/batman-adv-kernelland/ring_buffer.h trunk/batman-adv-kernelland/routing.c trunk/batman-adv-kernelland/routing.h trunk/batman-adv-kernelland/send.c trunk/batman-adv-kernelland/send.h trunk/batman-adv-kernelland/soft-interface.c trunk/batman-adv-kernelland/soft-interface.h trunk/batman-adv-kernelland/translation-table.c trunk/batman-adv-kernelland/translation-table.h trunk/batman-adv-kernelland/types.h trunk/batman-adv-kernelland/vis.c trunk/batman-adv-kernelland/vis.h Log: batman-adv: Update copyright years Signed-off-by: Simon Wunderlich <siwu(a)hrz.tu-chemnitz.de> Modified: trunk/batman-adv-kernelland/Makefile =================================================================== --- trunk/batman-adv-kernelland/Makefile 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/Makefile 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # Modified: trunk/batman-adv-kernelland/Makefile.kbuild =================================================================== --- trunk/batman-adv-kernelland/Makefile.kbuild 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/Makefile.kbuild 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: +# Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: # # Marek Lindner, Simon Wunderlich # Modified: trunk/batman-adv-kernelland/aggregation.c =================================================================== --- trunk/batman-adv-kernelland/aggregation.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/aggregation.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/aggregation.h =================================================================== --- trunk/batman-adv-kernelland/aggregation.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/aggregation.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/bitarray.c =================================================================== --- trunk/batman-adv-kernelland/bitarray.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/bitarray.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: trunk/batman-adv-kernelland/bitarray.h =================================================================== --- trunk/batman-adv-kernelland/bitarray.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/bitarray.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: trunk/batman-adv-kernelland/compat.h =================================================================== --- trunk/batman-adv-kernelland/compat.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/compat.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/device.c =================================================================== --- trunk/batman-adv-kernelland/device.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/device.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: trunk/batman-adv-kernelland/device.h =================================================================== --- trunk/batman-adv-kernelland/device.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/device.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: trunk/batman-adv-kernelland/gateway_client.c =================================================================== --- trunk/batman-adv-kernelland/gateway_client.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/gateway_client.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,6 +1,8 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. Modified: trunk/batman-adv-kernelland/gateway_client.h =================================================================== --- trunk/batman-adv-kernelland/gateway_client.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/gateway_client.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,6 +1,8 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. Modified: trunk/batman-adv-kernelland/gateway_common.c =================================================================== --- trunk/batman-adv-kernelland/gateway_common.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/gateway_common.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,6 +1,8 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. Modified: trunk/batman-adv-kernelland/gateway_common.h =================================================================== --- trunk/batman-adv-kernelland/gateway_common.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/gateway_common.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,6 +1,8 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: + * * Marek Lindner + * * This program is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public * License as published by the Free Software Foundation. Modified: trunk/batman-adv-kernelland/hard-interface.c =================================================================== --- trunk/batman-adv-kernelland/hard-interface.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/hard-interface.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/hard-interface.h =================================================================== --- trunk/batman-adv-kernelland/hard-interface.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/hard-interface.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/hash.c =================================================================== --- trunk/batman-adv-kernelland/hash.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/hash.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: trunk/batman-adv-kernelland/hash.h =================================================================== --- trunk/batman-adv-kernelland/hash.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/hash.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * Modified: trunk/batman-adv-kernelland/main.c =================================================================== --- trunk/batman-adv-kernelland/main.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/main.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/main.h =================================================================== --- trunk/batman-adv-kernelland/main.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/main.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/originator.c =================================================================== --- trunk/batman-adv-kernelland/originator.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/originator.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2009-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/originator.h =================================================================== --- trunk/batman-adv-kernelland/originator.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/originator.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/packet.h =================================================================== --- trunk/batman-adv-kernelland/packet.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/packet.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/proc.c =================================================================== --- trunk/batman-adv-kernelland/proc.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/proc.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/proc.h =================================================================== --- trunk/batman-adv-kernelland/proc.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/proc.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/ring_buffer.c =================================================================== --- trunk/batman-adv-kernelland/ring_buffer.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/ring_buffer.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: trunk/batman-adv-kernelland/ring_buffer.h =================================================================== --- trunk/batman-adv-kernelland/ring_buffer.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/ring_buffer.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/routing.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/routing.h =================================================================== --- trunk/batman-adv-kernelland/routing.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/routing.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/send.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/send.h =================================================================== --- trunk/batman-adv-kernelland/send.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/send.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/soft-interface.c =================================================================== --- trunk/batman-adv-kernelland/soft-interface.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/soft-interface.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/soft-interface.h =================================================================== --- trunk/batman-adv-kernelland/soft-interface.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/soft-interface.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner * Modified: trunk/batman-adv-kernelland/translation-table.c =================================================================== --- trunk/batman-adv-kernelland/translation-table.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/translation-table.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/translation-table.h =================================================================== --- trunk/batman-adv-kernelland/translation-table.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/translation-table.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/types.h =================================================================== --- trunk/batman-adv-kernelland/types.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/types.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2007-2010 B.A.T.M.A.N. contributors: * * Marek Lindner, Simon Wunderlich * Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/vis.c 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich * Modified: trunk/batman-adv-kernelland/vis.h =================================================================== --- trunk/batman-adv-kernelland/vis.h 2010-03-20 14:51:53 UTC (rev 1600) +++ trunk/batman-adv-kernelland/vis.h 2010-03-21 18:53:00 UTC (rev 1601) @@ -1,5 +1,5 @@ /* - * Copyright (C) 2008-2009 B.A.T.M.A.N. contributors: + * Copyright (C) 2008-2010 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner *

1 0

r1600 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 20 Mar '10

20 Mar '10

Author: marek Date: 2010-03-20 15:51:53 +0100 (Sat, 20 Mar 2010) New Revision: 1600 Modified: trunk/batman-adv-kernelland/aggregation.c Log: batman-adv: Fix aggregation direct-link bug So far, neighbour's secondary interface OGMs can involuntarily piggyback on primary interface OGMs that arrived on the same secondary interface before. Secondary interface OGMs should NEVER leave their direct neighbour broadcast domain! This patch ensures that secondary interface OGMs can only be aggregated to other secondary interface OGMs. Signed-off-by: Linus L?\195?\188ssing <linus.luessing(a)web.de> Modified: trunk/batman-adv-kernelland/aggregation.c =================================================================== --- trunk/batman-adv-kernelland/aggregation.c 2010-03-20 14:51:42 UTC (rev 1599) +++ trunk/batman-adv-kernelland/aggregation.c 2010-03-20 14:51:53 UTC (rev 1600) @@ -81,9 +81,15 @@ * interface only - we still can aggregate */ if ((directlink) && (new_batman_packet->ttl == 1) && - (forw_packet->if_incoming == if_incoming)) + (forw_packet->if_incoming == if_incoming) && + + /* packets from direct neighbors or + * own secondary interface packets + * (= secondary interface packets in general) */ + (batman_packet->flags & DIRECTLINK || + (forw_packet->own && + forw_packet->if_incoming->if_num != 0))) return true; - } return false;

1 0

r1599 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 20 Mar '10

20 Mar '10

Author: marek Date: 2010-03-20 15:51:42 +0100 (Sat, 20 Mar 2010) New Revision: 1599 Modified: trunk/batman-adv-kernelland/aggregation.c trunk/batman-adv-kernelland/send.c Log: batman-adv: fix aggregation timing bug batman-adv aggregates routing packets to reduce the number of packets in the air. Every outgoing packet is compared with other packets in the buffer to determine whether it can be aggregated or not. Packets sent at a lower interval can be held back longer to maximize the aggregation. Due to insufficient checking batman-adv held back all packets for a certain time depending on its own lowest interval rate which slowed down all other nodes. Reported-by: Linus Luessing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <lindner_marek(a)yahoo.de> Modified: trunk/batman-adv-kernelland/aggregation.c =================================================================== --- trunk/batman-adv-kernelland/aggregation.c 2010-03-14 17:52:17 UTC (rev 1598) +++ trunk/batman-adv-kernelland/aggregation.c 2010-03-20 14:51:42 UTC (rev 1599) @@ -52,6 +52,8 @@ */ if (time_before(send_time, forw_packet->send_time) && + time_after_eq(send_time + msecs_to_jiffies(MAX_AGGREGATION_MS), + forw_packet->send_time) && (aggregated_bytes <= MAX_AGGREGATION_BYTES)) { /** @@ -196,6 +198,16 @@ if (forw_packet_aggr == NULL) { /* the following section can run without the lock */ spin_unlock_irqrestore(&forw_bat_list_lock, flags); + + /** + * if we could not aggregate this packet with one of the others + * we hold it back for a while, so that it might be aggregated + * later on + */ + if ((!own_packet) && + (atomic_read(&bat_priv->aggregation_enabled))) + send_time += msecs_to_jiffies(MAX_AGGREGATION_MS); + new_aggregated_packet(packet_buff, packet_len, send_time, direct_link, if_incoming, own_packet); Modified: trunk/batman-adv-kernelland/send.c =================================================================== --- trunk/batman-adv-kernelland/send.c 2010-03-14 17:52:17 UTC (rev 1598) +++ trunk/batman-adv-kernelland/send.c 2010-03-20 14:51:42 UTC (rev 1599) @@ -49,15 +49,7 @@ /* when do we schedule a forwarded packet to be sent */ static unsigned long forward_send_time(struct bat_priv *bat_priv) { - unsigned long send_time = jiffies; /* Starting now plus... */ - - if (atomic_read(&bat_priv->aggregation_enabled)) - send_time += (((MAX_AGGREGATION_MS - (JITTER/2) + - (random32() % JITTER)) * HZ) / 1000); - else - send_time += (((random32() % (JITTER/2)) * HZ) / 1000); - - return send_time; + return jiffies + (((random32() % (JITTER/2)) * HZ) / 1000); } /* send out an already prepared packet to the given address via the

1 0

r1598 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 14 Mar '10

14 Mar '10

Author: marek Date: 2010-03-14 18:52:17 +0100 (Sun, 14 Mar 2010) New Revision: 1598 Modified: trunk/batman-adv-kernelland/routing.c Log: batman-adv: Clone shared bat packets before modifying them "tcpdump" and "batctl td" will receive packets with a wrong sequence number on systems with a different endianess than network byte order. This happens due to the reordering of bytes in the function which handles aggregated bat packets. The function which receives the bat packets must ensure that these buffers aren't shared with anything else before that function tries to write into it. Otherwise it has to copy the buffers so it is save again to change them. Reported-by: Kevin Steen <batman(a)kevinsteen.net> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/routing.c =================================================================== --- trunk/batman-adv-kernelland/routing.c 2010-03-14 17:52:13 UTC (rev 1597) +++ trunk/batman-adv-kernelland/routing.c 2010-03-14 17:52:17 UTC (rev 1598) @@ -680,6 +680,7 @@ { struct ethhdr *ethhdr; unsigned long flags; + struct sk_buff *skb_old; /* drop packet if it has not necessary minimum size */ if (skb_headlen(skb) < sizeof(struct batman_packet)) @@ -695,12 +696,19 @@ if (is_bcast(ethhdr->h_source)) return NET_RX_DROP; - spin_lock_irqsave(&orig_hash_lock, flags); /* TODO: we use headlen instead of "length", because * only this data is paged in. */ - /* TODO: is another skb_copy needed here? there will be - * written on the data, but nobody (?) should further use - * this data */ + + /* create a copy of the skb, if needed, to modify it. */ + if (!skb_clone_writable(skb, skb_headlen(skb))) { + skb_old = skb; + skb = skb_copy(skb, GFP_ATOMIC); + if (!skb) + return NET_RX_DROP; + kfree_skb(skb_old); + } + + spin_lock_irqsave(&orig_hash_lock, flags); receive_aggr_bat_packet(ethhdr, skb->data, skb_headlen(skb),

1 0

r1597 - trunk/batman-adv-kernelland
by postmaster＠open-mesh.net 14 Mar '10

14 Mar '10

Author: marek Date: 2010-03-14 18:52:13 +0100 (Sun, 14 Mar 2010) New Revision: 1597 Modified: trunk/batman-adv-kernelland/vis.c Log: batman-adv: Fixing wrap-around bug in vis When the seqno for a vis packet had a wrap around from i.e. 255 to 0, add_packet() would falsely claim the older packet with the seqno 255 as newer as the one with the seqno of 0 and would therefore ignore the new packet. This happens with all following vis packets until the old vis packet expires after 180 seconds timeout. This patch fixes this issue and gets rid of these highly undesired 3min. breaks for the vis-server. Signed-off-by: Linus L?\195?\188ssing <linus.luessing(a)web.de> Signed-off-by: Sven Eckelmann <sven.eckelmann(a)gmx.de> Modified: trunk/batman-adv-kernelland/vis.c =================================================================== --- trunk/batman-adv-kernelland/vis.c 2010-03-11 19:19:05 UTC (rev 1596) +++ trunk/batman-adv-kernelland/vis.c 2010-03-14 17:52:13 UTC (rev 1597) @@ -28,6 +28,22 @@ #include "hash.h" #include "compat.h" +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define smallest_signed_int(x) (1u << (7u + 8u * (sizeof(x) - 1u))) + +/* Checks if a sequence number x is a predecessor/successor of y. + they handle overflows/underflows and can correctly check for a + predecessor/successor unless the variable sequence number has grown by + more then 2**(bitwidth(x)-1)-1. + This means that for a uint8_t with the maximum value 255, it would think: + * when adding nothing - it is neither a predecessor nor a successor + * before adding more than 127 to the starting value - it is a predecessor, + * when adding 128 - it is neither a predecessor nor a successor, + * after adding more than 127 to the starting value - it is a successor */ +#define seq_before(x,y) ({typeof(x) _dummy = (x - y); \ + _dummy > smallest_signed_int(_dummy); }) +#define seq_after(x,y) seq_before(y,x) + struct hashtable_t *vis_hash; DEFINE_SPINLOCK(vis_hash_lock); static DEFINE_SPINLOCK(recv_list_lock); @@ -213,7 +229,7 @@ old_info = hash_find(vis_hash, &search_elem); if (old_info != NULL) { - if (vis_packet->seqno - old_info->packet.seqno <= 0) { + if (!seq_after(vis_packet->seqno, old_info->packet.seqno)) { if (old_info->packet.seqno == vis_packet->seqno) { recv_list_add(&old_info->recv_list, vis_packet->sender_orig);

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits March 2010