commits February 2012

commits@lists.open-mesh.org

1 participants
131 discussions

linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The annotated tag, batman-adv-for-davem has been created at 060287d5994d7d9c7a95a06fd289a2fcae01b1c6 (tag) tagging fdc8ff101163f10d36187a890a3c4990cebb8b12 (commit) replaces v3.3-rc1 tagged by Marek Lindner on Tue Feb 28 17:54:54 2012 +0800 - Shortlog ------------------------------------------------------------ code cleanups and code refactoring -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPTKR4AAoJEHtIZySjmTlpiUsP/AnfDVzKzBjhlOaKg3qq9ZIX fwuuzIr0AInpSfKYQi8dltxR4OU/l9Y8DT9OS/iONwhNpLmdbwl7VlU/MGvLFrq4 hSCnV2xxC0KayJ6NVhAoXaWgrdEk2Lvcr7adxdBGxBJUV1E22NKwcV97fpnLwnBm 8dyzHTsrMvkR7qeLOrdyoP7pcArAuu6BMJjHqU9nzrO/7D0hKO0wLFcgaq/SHm1d Eo02y5Fu2JhF4IXqo86C5uTVTNu5Zr/X7QzOnPQ72drHrA3d1RxqxPVJp4wy39bA FIy5PsgQUXTmBeE2zRYQf/hAwWAXdBXbuNiYLplIfoZP99pWMhRK7pD/6ZRS7eza AICoDkRe3kDdC6JMDTCHXjlNCmciZTnwMbBEM2bv7oey+U36lljjDzQ3udo1gkZk 2DRoGXE6hsJEaZDhzfHTXFGzHrRpD5GtvwNijCjBDxhN5uaIG8GD60hFYAO56z7F FY7W2xs67D6aZv6mr408LQfJ22fthaFiin0EAc0kyPz4E4cvK8Xp9PfyfIYP5gmG ASM09W+RQ8+akmkGwhcJHVh3XYKElfWUQOW6jnkptmNLJIVkJaYPyDfQF9smgMQv 7e9nvel8IaSWjXIwxCsYjWWFRdLmin2kfhz5GTm5m+Rppnx+WToE9buH2QDcCAQe IVmg2SW7Fq+4wEV62nxn =6pRo -----END PGP SIGNATURE----- Antonio Quartulli (4): batman-adv: add tt_initialised flag to the orig_node struct batman-adv: set TT_CLIENT_NEW flag before invoking hash_add() batman-adv: code refactoring - move debug print into tt_local_set_pending batman-adv: TT_CLIENT_PENDING is never set in struct tt_global_entry Marek Lindner (7): batman-adv: simplify bat_ogm_receive API call batman-adv: warn if added interface is part of a bridge batman-adv: add infrastructure to change routing algorithm at runtime batman-adv: convert batman iv algorithm to use dynamic infrastructure batman-adv: allowing changing the routing algorithm via module parameter batman-adv: export used routing algorithm via sysfs batman-adv: convert time_after instances to has_timed_out Martin Hundebøll (2): batman-adv: Rm empty line from is_my_mac() in main.c batman-adv: Move is_out_of_time() to main.h for general use Sven Eckelmann (4): batman-adv: Explicitly mark the common header structure batman-adv: refactor tt_global_del() to avoid misalignment batman-adv: Update copyright years batman-adv: Start new development cycle ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.3-rc1-1199-g97a84db
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The annotated tag, batman-adv-for-davem has been deleted was 05206ca0bfa948a28d66c0552b141ab90cfc415c ----------------------------------------------------------------------- tag batman-adv-for-davem code cleanups and code refactoring -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPTKHHAAoJEHtIZySjmTlp+4gQAJPNWXMOwqhQzz7rJwAHYr8f 6j0Zuf7Ehik4Z0iKFAcYtu7ULj/YuYOfepLw6CypgweD5TLDprdMvgCrmEA8h6D0 K4VCy25R4ije3OdLO28N16GVWg2wIEYTO00gar7g52JWWOM3jV7WcZZwoVllhIS0 ceNEaktNg3M52mVeWxNRaZkwmTpFIreXehix3ai+obvKLgvAbl2EYLtiFC/lmGoS pteTefRSA7ReWc1cHquktoCn1m/ZgDq9JztV2yYLR7hVsZHlt81OcxxKkQsPi5wU jTZWZ1lzBWu+sqRrcnya0pa0Jd6VAggSEAaYBBqPwf027nJ8unvr60xUcJf3EMv6 GsOIDMlzZyHZrA3dgVQdTGsEohWijmR3F2mKV5w5bT6gHQlRsN0opvlZY6Mb27XM ptobFSn+aWc4GhEofIZOALopR8BoK356kVOMG+DhC7cE2NuetE3rnTR7LUVNKu1G ilEV2dG8Qj6YQEgGH1pSgvLq6CgCoAokfdNA2ODGVZmuolAjDVzI6yk13AxB9svN /VY9dmyplPUey/HCiCqGMTuYSydOnPu5V3hNoUie3+OQXIse8MJru70zHcrGw4WF 65vwVYgMZpFcuJzI+qZaWVPI350wsP8CHRgnB5/lqUEaGV/JAoBrYBqKDwAj1PSV kBWFCHEQbG86WaKAZSTj =pUm/ -----END PGP SIGNATURE----- 97a84dbfd5213c9a6b5010cce00e8dbb9a853b52 batman-adv: use eth_hw_addr_random() instead of random_ether_addr() ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The annotated tag, batman-adv-for-davem has been created at 05206ca0bfa948a28d66c0552b141ab90cfc415c (tag) tagging 97a84dbfd5213c9a6b5010cce00e8dbb9a853b52 (commit) replaces v3.3-rc1 tagged by Marek Lindner on Tue Feb 28 17:42:45 2012 +0800 - Shortlog ------------------------------------------------------------ code cleanups and code refactoring -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPTKHHAAoJEHtIZySjmTlp+4gQAJPNWXMOwqhQzz7rJwAHYr8f 6j0Zuf7Ehik4Z0iKFAcYtu7ULj/YuYOfepLw6CypgweD5TLDprdMvgCrmEA8h6D0 K4VCy25R4ije3OdLO28N16GVWg2wIEYTO00gar7g52JWWOM3jV7WcZZwoVllhIS0 ceNEaktNg3M52mVeWxNRaZkwmTpFIreXehix3ai+obvKLgvAbl2EYLtiFC/lmGoS pteTefRSA7ReWc1cHquktoCn1m/ZgDq9JztV2yYLR7hVsZHlt81OcxxKkQsPi5wU jTZWZ1lzBWu+sqRrcnya0pa0Jd6VAggSEAaYBBqPwf027nJ8unvr60xUcJf3EMv6 GsOIDMlzZyHZrA3dgVQdTGsEohWijmR3F2mKV5w5bT6gHQlRsN0opvlZY6Mb27XM ptobFSn+aWc4GhEofIZOALopR8BoK356kVOMG+DhC7cE2NuetE3rnTR7LUVNKu1G ilEV2dG8Qj6YQEgGH1pSgvLq6CgCoAokfdNA2ODGVZmuolAjDVzI6yk13AxB9svN /VY9dmyplPUey/HCiCqGMTuYSydOnPu5V3hNoUie3+OQXIse8MJru70zHcrGw4WF 65vwVYgMZpFcuJzI+qZaWVPI350wsP8CHRgnB5/lqUEaGV/JAoBrYBqKDwAj1PSV kBWFCHEQbG86WaKAZSTj =pUm/ -----END PGP SIGNATURE----- Danny Kukawka (1): batman-adv: use eth_hw_addr_random() instead of random_ether_addr() Linus Lüssing (2): batman-adv: Remove duplicate types.h inclusions batman-adv: Disallow originator addressing within mesh layer Marek Lindner (10): batman-adv: reset broadcast flood protection on error Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Sven Eckelmann (16): net: Add batman-adv meshing protocol Merge remote branch 'origin/next' into linux Merge remote branch 'origin/next' into linux Merge remote branch 'origin/standalone/next' into merge/master Merge remote branch 'origin/standalone/next' into merge/master batman-adv: Linearize fragment packets before merge batman-adv: Split combined variable declarations batman-adv: Use successive sequence numbers for fragments Merge remote branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/master' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master Merge remote-tracking branch 'origin/standalone/next' into merge/master ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; annotated tag, batman-adv-for-davem, deleted. v3.3-rc1-10-gea3d2fd
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The annotated tag, batman-adv-for-davem has been deleted was 6772079fb2e8770d460804adbd5517e9ce237d9a ----------------------------------------------------------------------- tag batman-adv-for-davem infrastructure to change routing algorithm at runtime & fixes -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJPPVSjAAoJEHtIZySjmTlpx/MP/1wSkl3qJFDRZhk7H9WuSKp6 CzEEWeqJNqP9r+M6L9B8vlkenuDea0B29eCJQomU5i2zu7PLfR/QWcREKEyBQYQe dFnnrhRXC3VcaKN5ObiXKVZ+Q/kW4T38ZUzidRXtdwuRPeZ6CGN/2PfOCFvFL8iX 2vbwc6uknfWuGIcQUrpOeeg6Ntpz240KTy9k75UFoZys99hOqkJ2kNHqV025G9N+ gpSVgkJr7ch879EOJL1MbAHxFDLx8/07YI0lchG7rZLVpM9Gy+lziyZw2KuSFfim acbB/jU6amS31dZGTBrSbjKZ9ZmDvqz7ZgOj1FINUjkVmENVF6XqIk/EC5jJgfBH SGt+H8ai8FuFBqle5pd1QQON7KQdfZzuNgdtUNbi+VCaoY/Ld0wGTi3hn9fkQGiY v8tAj+ytoIHRgrPE714hWwzRbqJ+nR/+h9F7Pc5iurk0loOi1mHh2lZcF06aRBGq J4cIm0mBaHlz8otUY1JpXrg6lh4SwBNVldNQjhtKpwx8a5AtUxLuvvHZvHUyoHMf TShDG4wVPnR5762Ch+HzcD+Uwp/Hj7PITHuDGYIxADIxfdvdfhPCOQ3cslLFTWwX Sm+zBeIoPCrh6DDdZMts8rsaL0A+4uIOqEEeVPcP2Y9/IOclpGB5qyYImnMgIZEV REQWscaQM3EjpaV42AMV =ct48 -----END PGP SIGNATURE----- ea3d2fd1b11fb3ef8706a48ece0a49a61bcd08bc batman-adv: export used routing algorithm via sysfs ----------------------------------------------------------------------- -- linux integration

1 0

linux integration; branch, merge/master, updated. v3.3-rc1-1200-gae926bc
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the merge/master branch: commit ae926bc6cd9e569e8a16b20187444bfea5bcd591 Merge: 9ab5287fbffe88a2f6bd88c7a3421c60d4945e2b 2e52993f98abca5bdf181b81fb11f7c728ba6cf0 Author: Marek Lindner <lindner_marek(a)yahoo.de> Date: Tue Feb 28 14:07:41 2012 +0800 Merge remote-tracking branch 'origin/standalone/next' into merge/master Conflicts: net/batman-adv/compat.h diff --combined net/batman-adv/soft-interface.c index 2ffdc74,37fbcb5..37fbcb5 --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -541,6 -541,7 +541,7 @@@ static int interface_set_mac_addr(struc } memcpy(dev->dev_addr, addr->sa_data, ETH_ALEN); + dev->addr_assign_type &= ~NET_ADDR_RANDOM; return 0; } @@@ -783,7 -784,6 +784,6 @@@ static const struct net_device_ops bat_ static void interface_setup(struct net_device *dev) { struct bat_priv *priv = netdev_priv(dev); - char dev_addr[ETH_ALEN]; ether_setup(dev); @@@ -800,8 -800,7 +800,7 @@@ dev->hard_header_len = BAT_HEADER_LEN; /* generate random address */ - random_ether_addr(dev_addr); - memcpy(dev->dev_addr, dev_addr, ETH_ALEN); + eth_hw_addr_random(dev); SET_ETHTOOL_OPS(dev, &bat_ethtool_ops); -- linux integration

1 0

batctl; branch, master, updated. v2012.0.0-21-gc8c043b
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the master 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, master, updated. v2012.0.0-20-g8444f4c
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the master 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, master, updated. v2012.0.0-19-g7ae18ea
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the master 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

batman-adv; branch, master, updated. v2012.0.0-79-g4ca2a01
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the master branch: commit 4ca2a01e057606b8d5c08bb53dd62f95ffaf446b Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 13:36:40 2012 +0100 batman-adv: remove unused variable Actually unicast_4addr_packet in interface_rx() is set but never used and therefore can be safely be removed. Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/soft-interface.c b/soft-interface.c index 8b68e01..92137af 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -259,7 +259,6 @@ void interface_rx(struct net_device *soft_iface, int hdr_size) { struct bat_priv *bat_priv = netdev_priv(soft_iface); - struct unicast_4addr_packet *unicast_4addr_packet; struct ethhdr *ethhdr; struct vlan_ethhdr *vhdr; short vid __maybe_unused = -1; @@ -268,8 +267,6 @@ void interface_rx(struct net_device *soft_iface, if (!pskb_may_pull(skb, hdr_size)) goto dropped; - unicast_4addr_packet = (struct unicast_4addr_packet *)skb->data; - if (dat_snoop_incoming_arp_request(bat_priv, skb, hdr_size)) goto out; -- batman-adv

1 0

batman-adv; branch, master, updated. v2012.0.0-78-g459c4e4
by postmaster＠open-mesh.org 28 Feb '12

28 Feb '12

The following commit has been merged in the master branch: commit 459c4e49ba2d590ebd9e15c2f9688fd687d077b6 Author: Antonio Quartulli <ordex(a)autistici.org> Date: Mon Feb 27 11:29:53 2012 +0100 batman-adv: fix wrong dhcp option list browsing In is_type_dhcprequest(), while parsing a DHCP message, if the entry we found in the option list is neither a padding nor the dhcp-type, we have to ignore it and jump as many bytes as its length + 1. The "+ 1" byte is given by the subtype field itself that has to be jumped too. Reported-by: Marek Lindner <lindner_marek(a)yahoo.de> Signed-off-by: Antonio Quartulli <ordex(a)autistici.org> diff --git a/gateway_client.c b/gateway_client.c index 65a77a1..1f7e92d 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -563,10 +563,10 @@ static bool is_type_dhcprequest(struct sk_buff *skb, int header_len) p++; /* ...and then we jump over the data */ - if (pkt_len < *p) + if (pkt_len < 1 + (*p)) goto out; - pkt_len -= *p; - p += (*p); + pkt_len -= 1 + (*p); + p += 1 + (*p); } } out: -- batman-adv

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2012