commits May 2014

commits@lists.open-mesh.org

1 participants
88 discussions

[alfred] master: alfred-gpsd: Fix altitude verification check (2dbaac4)
by postmaster＠open-mesh.org 27 May '14

27 May '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 2dbaac4cf1f974f6ef81e24c7fef286456a800ee Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 13:44:11 2014 +0200 alfred-gpsd: Fix altitude verification check Signed-off-by: Sven Eckelmann <sven(a)narfation.org> [sw: fixed typo in subject] Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 2dbaac4cf1f974f6ef81e24c7fef286456a800ee gpsd/alfred-gpsd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index ef20f28..089f2af 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -370,7 +370,7 @@ static void gpsd_parse_location(struct globals *globals, exit(EXIT_FAILURE); } - if ((alt < -1000) || (lon > 9000)) { + if ((alt < -1000) || (alt > 9000)) { /* No support for aircraft or submarines! */ printf("Invalid altitude\n"); gpsd_usage();

1 0

[alfred] master: batadv-vis: Avoid memory leak when tl parsing failed (40feaca)
by postmaster＠open-mesh.org 27 May '14

27 May '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 40feacaaee72a3569018e966428d4a4455821630 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 13:44:08 2014 +0200 batadv-vis: Avoid memory leak when tl parsing failed The parsing function for the local translation table can fail to convert the mac address and then jumps out of the function. This leaks the earlier allocated v_entry. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 40feacaaee72a3569018e966428d4a4455821630 vis/vis.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vis/vis.c b/vis/vis.c index 9031b27..a5ac664 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -213,8 +213,10 @@ static int parse_transtable_local(struct globals *globals) continue; mac = str_to_mac(tptr); - if (!mac) + if (!mac) { + free(v_entry); continue; + } memcpy(v_entry->v.mac, mac, ETH_ALEN); v_entry->v.ifindex = 255;

1 0

[alfred] master: batadv-vis: Avoid memory leak after failed realloc (0ad384e)
by postmaster＠open-mesh.org 27 May '14

27 May '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 0ad384e11ed039d4c3025a7eaf19fe6bcfd41acf Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 13:44:06 2014 +0200 batadv-vis: Avoid memory leak after failed realloc realloc doesn't free the original buffer when the reallocation failed. An abort of read_file without free'ing the buffer would leak it. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 0ad384e11ed039d4c3025a7eaf19fe6bcfd41acf vis/vis.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/vis/vis.c b/vis/vis.c index 7a8e780..b51fede 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -40,7 +40,7 @@ static char *read_file(char *fname) { FILE *fp; - char *buf = NULL; + char *buf = NULL, *buf_tmp; size_t size, ret; fp = fopen(fname, "r"); @@ -51,10 +51,13 @@ static char *read_file(char *fname) size = 0; while (!feof(fp)) { - buf = realloc(buf, size + 4097); - if (!buf) + buf_tmp = realloc(buf, size + 4097); + if (!buf_tmp) { + free(buf); return NULL; + } + buf = buf_tmp; ret = fread(buf + size, 1, 4096, fp); size += ret; }

1 0

[alfred] master: alfred: Use pre-allocated object for global variables (303907b)
by postmaster＠open-mesh.org 27 May '14

27 May '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 303907b7023a06aeb61b51bf9324ceefd7bb34de Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat May 24 13:44:09 2014 +0200 alfred: Use pre-allocated object for global variables The object storing the global variables is a good way to keep track of all data. But it is unnecessary to allocate an object on the heap for it. Using an object with static storage allows better compiler optimization and makes checking for actual memory leaks (unreachable memory) easier. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 303907b7023a06aeb61b51bf9324ceefd7bb34de gpsd/alfred-gpsd.c | 7 +++---- main.c | 6 ++---- vis/vis.c | 7 +++---- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index b71a9b2..ef20f28 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -21,6 +21,8 @@ #include "alfred-gpsd.h" +static struct globals gpsd_globals; + static int alfred_open_sock(struct globals *globals) { struct sockaddr_un addr; @@ -394,10 +396,7 @@ static struct globals *gpsd_init(int argc, char *argv[]) {NULL, 0, NULL, 0}, }; - globals = malloc(sizeof(*globals)); - if (!globals) - return NULL; - + globals = &gpsd_globals; memset(globals, 0, sizeof(*globals)); globals->opmode = OPMODE_CLIENT; diff --git a/main.c b/main.c index 32fb9b8..d848589 100644 --- a/main.c +++ b/main.c @@ -27,6 +27,7 @@ #include "alfred.h" #include "packet.h" +static struct globals alfred_globals; static void alfred_usage(void) { @@ -69,10 +70,7 @@ static struct globals *alfred_init(int argc, char *argv[]) {NULL, 0, NULL, 0}, }; - globals = malloc(sizeof(*globals)); - if (!globals) - return NULL; - + globals = &alfred_globals; memset(globals, 0, sizeof(*globals)); globals->opmode = OPMODE_SLAVE; diff --git a/vis/vis.c b/vis/vis.c index a5ac664..31f60d7 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -37,6 +37,8 @@ #include <unistd.h> #include "debugfs.h" +static struct globals vis_globals; + static char *read_file(char *fname) { FILE *fp; @@ -832,10 +834,7 @@ static struct globals *vis_init(int argc, char *argv[]) {NULL, 0, NULL, 0}, }; - globals = malloc(sizeof(*globals)); - if (!globals) - return NULL; - + globals = &vis_globals; memset(globals, 0, sizeof(*globals)); globals->opmode = OPMODE_CLIENT;

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 27 May '14

27 May '14

The annotated tag, batman-adv-fix-for-davem has been created at 9668a900d6047e809604995e7702b73f7c6a6243 (tag) tagging 9d4190df6a21d96238133a9a64866a9c796f4ec8 (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sat May 24 16:28:40 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - prevent NULL dereference in multicast code -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTgKzSAAoJEJgn97Bh2u9eahkP/jQIVQ4QTavjFyMbKuOmwgzz QTKagXAycpLdju91sBuHMRpiK67W/2rvwxedRm4nDb5S9fj0ruspKO7k5rHd4grG pn9t2LX3UXQhjLCwptzxbzfnB5sAoNMShl8OwJDkxrg1N4hL1Giwppa36TBG7fd1 S6NdR6++dICP3SI64cEMxjDqhnJ1xYIPAOijvkeR4b12ew0oT1C/dEUxhVkYh+Gr EDDzH5ZZg9uNfyOCYDeJugPa9gk3xUO5aWvtVdqdwouuwkCX0EgJDoluQw40Fi3M l9co1MIEEsvoT2ENdh3gqaET/7UjP2WR7ZdID64Z+/W2w5wk22xwIheAD+0nW3Tj rRowQh0/W4YGttNeBnJZ4l9o8ncHioZ9+FR4b9scd2y9wCHKIg8ChxKvoHkMIQ7y 31bljKGD5yJBbZXo/0YXPTVLkDglAJRuBhW7vEGlXnDQro7yfCbLuAFh3ejyWsts uU2IdkzmJabydVXzxwZfseFP+maZ4O/nAUux6Qgp8ZfZKY5rE9frjnTm8Pn6X2J0 EojVQizd2Keo6ZOhU5sqzO8G1bTVuIdCa6VLrbjcHflMCjjz4POI2cLAkeAx9Zop lkkxPszxLJ2IMxOQtbNp4Os6pVKpb+o+1/JpCnJbJTrx2UiRJkRRwHoCmc1rm/Rf PSy/d/kBPHYHKZb+C2re =w7BS -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Cong Wang (1): batman: fix a bogus warning from batadv_is_on_batman_iface() Marek Lindner (2): batman-adv: fix indirect hard_iface NULL dereference batman-adv: fix NULL pointer dereferences Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v3.15-rc4-261-gcc2f338
by postmaster＠open-mesh.org 27 May '14

27 May '14

The annotated tag, batman-adv-fix-for-davem has been deleted was 71fbcbdf2a0ae775ee2110d57b33a823755d727a ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Include changes: - fix NULL dereference in batadv_orig_hardif_seq_print_text() - fix reference counting imbalance when using fragmentation - avoid access to orig_node objects after they have been free'd - fix local TT check for outgoing arp requests in DAT -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTdQmwAAoJEEKTMo6mOh1VGLAP/A1nHDzPMUOcDttR49Cs38w0 oD2Ox66xSJh2Yn8qRg9k7CshG65pU70J77bQjkPvMtTlwsgwgLFcHP1b/RJQl7Cz aFSJY5tKvLL41TwqxLSAmvUyPMfvagXvxH65bLBIQ9+dLNkDiHNH/IjdnYKWHYi9 0tqUi7/pLaCfWXMkDVeWn0P2M8baDyU1HUTuRX3ctE4l9PKF9ZVgxsxaPrhTYlXY J61KT+VXs19rdAnYQlFiaDk64Q6meMjuNjxuLkViTmqKi6pSDGi9skeKWZXaKOjT UmLLygVyf9Sh36TWDKinSV09r/s+TeU35o6bCgrmshZebSmFEUkEDA7oxNJ5JW+Q Lh2Y2SrX/+F0+9yhxhDd0fHP3PAwt2XNKjIQjurE85Gw84ZoMyBsVIpF8LD3IS+I T5CSAB0fEyeS0ZFyChbgWSLZzFjcowRHwK1iO8SJC5LHRtYerEqnvgP/V3ej0dt9 A4nq8eO8N9AorQc1G9qMosLNLheMCmFenU2nb8MbC5yDvq2X9jxsmgYm0fvr/y47 f667bowPr0afhsLvTqy6ezYma9EV40F8jW2/OovyBRUuytavJ4xcbCz/FUlWfNRU xx68e15t49iOFJynGXt62LJnEmBzRaE2uUagZaMNms18gmsL10y5pECAmi9zhQWK smkfqmsVWU8nB9UsDIT7 =+DKS -----END PGP SIGNATURE----- cc2f33860cea0e48ebec096130bd0f7c4bf6e0bc batman-adv: fix local TT check for outgoing arp requests in DAT ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.15-rc7, created. v3.15-rc7
by postmaster＠open-mesh.org 26 May '14

26 May '14

The annotated tag, v3.15-rc7 has been created at 6b80f7f7e624b97f196fb7e69a70f5dbc60f8fb8 (tag) tagging c7208164e66f63e3ec1759b98087849286410741 (commit) replaces v3.15-rc6 tagged by Linus Torvalds on Sun May 25 16:06:07 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTgndfAAoJEHm+PkMAQRiGSjoH/Aj5U7WLvEvGs5DbAxVMCOdW vBZFwmSzpD6JWSLhpKNoOISxIvYN+JVVBnnQmK/FQeY5wg+tZoNv/p4AM6A2mMCb e4KLD049jzzCon1UyxOdrKcmojxu5JhIhlHtlCHA+jOA4hJuPB4rDnJ75dV0AyJ8 wTgAnadB5aVCUamd0UzImAaPfoy4hK+VpTrsBc0YM9xq6USQx6Ujpz7zcJqMsZ5m QPDB/iOBYezZodjSuEPog8bTE6bGm17vaHDGLh3+XyewnW/7pd39tstuw8GeVhlV Q0H471igg3X92HUPMXzikC7LzfYC7KJLrfF+VjjWerRP77PVHXOJUP/KYxf0LNs= =1ngz -----END PGP SIGNATURE----- Antonio Quartulli (3): batman-adv: fix reference counting imbalance while sending fragment batman-adv: increase orig refcount when storing ref in gw_node batman-adv: fix local TT check for outgoing arp requests in DAT Cong Wang (1): batman: fix a bogus warning from batadv_is_on_batman_iface() Marek Lindner (1): batman-adv: fix indirect hard_iface NULL dereference Simon Wunderlich (4): batman-adv: fix neigh_ifinfo imbalance batman-adv: fix neigh reference imbalance batman-adv: always run purge_orig_neighbors batman-adv: fix removing neigh_ifinfo ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; branch, merge/master, updated. v3.14-rc1-2150-g150985e
by postmaster＠open-mesh.org 22 May '14

22 May '14

The following commit has been merged in the merge/master branch: commit 150985e7766f4864b025efc3c5fac8b922d371e2 Merge: 0a1689da7bfc32d9f6caa581af41b560fd1e164f b34590b05cd6f67def14b126b2ea6bc9692776b6 Author: Antonio Quartulli <antonio(a)meshcoding.com> Date: Sun May 18 14:54:46 2014 +0200 Merge commit 'b34590b05cd6f67def14b126b2ea6bc9692776b6' into merge/master Signed-off-by: Antonio Quartulli <antonio(a)meshcoding.com> Conflicts: net/batman-adv/CHANGELOG net/batman-adv/README.external diff --combined net/batman-adv/debugfs.c index b758881,a12e25e..a12e25e --- a/net/batman-adv/debugfs.c +++ b/net/batman-adv/debugfs.c @@@ -245,6 -245,7 +245,7 @@@ static int batadv_algorithms_open(struc static int batadv_originators_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_orig_seq_print_text, net_dev); } @@@ -258,18 -259,21 +259,21 @@@ static int batadv_originators_hardif_op struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_orig_hardif_seq_print_text, net_dev); } static int batadv_gateways_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_gw_client_seq_print_text, net_dev); } static int batadv_transtable_global_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_tt_global_seq_print_text, net_dev); } @@@ -277,6 -281,7 +281,7 @@@ static int batadv_bla_claim_table_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_bla_claim_table_seq_print_text, net_dev); } @@@ -285,6 -290,7 +290,7 @@@ static int batadv_bla_backbone_table_op struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_bla_backbone_table_seq_print_text, net_dev); } @@@ -300,6 -306,7 +306,7 @@@ static int batadv_dat_cache_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_dat_cache_seq_print_text, net_dev); } #endif @@@ -307,6 -314,7 +314,7 @@@ static int batadv_transtable_local_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_tt_local_seq_print_text, net_dev); } @@@ -319,6 -327,7 +327,7 @@@ struct batadv_debuginfo static int batadv_nc_nodes_open(struct inode *inode, struct file *file) { struct net_device *net_dev = (struct net_device *)inode->i_private; + return single_open(file, batadv_nc_nodes_seq_print_text, net_dev); } #endif @@@ -333,7 -342,7 +342,7 @@@ struct batadv_debuginfo batadv_debuginf .llseek = seq_lseek, \ .release = single_release, \ } \ - }; + } /* the following attributes are general and therefore they will be directly * placed in the BATADV_DEBUGFS_SUBDIR subdirectory of debugfs @@@ -395,7 -404,7 +404,7 @@@ struct batadv_debuginfo batadv_hardif_d .llseek = seq_lseek, \ .release = single_release, \ }, \ - }; + } static BATADV_HARDIF_DEBUGINFO(originators, S_IRUGO, batadv_originators_hardif_open); diff --combined net/batman-adv/distributed-arp-table.c index aa5d494,dcd99b2..dcd99b2 --- a/net/batman-adv/distributed-arp-table.c +++ b/net/batman-adv/distributed-arp-table.c @@@ -662,6 -662,7 +662,7 @@@ static void batadv_dat_tvlv_container_u void batadv_dat_status_update(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_dat_tvlv_container_update(bat_priv); } diff --combined net/batman-adv/main.h index 770dc89,0000000..118b990 mode 100644,000000..100644 --- a/net/batman-adv/main.h +++ b/net/batman-adv/main.h @@@ -1,382 -1,0 +1,382 @@@ +/* Copyright (C) 2007-2014 B.A.T.M.A.N. contributors: + * + * Marek Lindner, Simon Wunderlich + * + * 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. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _NET_BATMAN_ADV_MAIN_H_ +#define _NET_BATMAN_ADV_MAIN_H_ + +#define BATADV_DRIVER_AUTHOR "Marek Lindner <mareklindner(a)neomailbox.ch>, " \ + "Simon Wunderlich <sw(a)simonwunderlich.de>" +#define BATADV_DRIVER_DESC "B.A.T.M.A.N. advanced" +#define BATADV_DRIVER_DEVICE "batman-adv" + +#ifndef BATADV_SOURCE_VERSION - #define BATADV_SOURCE_VERSION "2014.2.0" ++#define BATADV_SOURCE_VERSION "2014.3.0" +#endif + +/* B.A.T.M.A.N. parameters */ + +#define BATADV_TQ_MAX_VALUE 255 +#define BATADV_JITTER 20 + +/* Time To Live of broadcast messages */ +#define BATADV_TTL 50 + +/* purge originators after time in seconds if no valid packet comes in + * -> TODO: check influence on BATADV_TQ_LOCAL_WINDOW_SIZE + */ +#define BATADV_PURGE_TIMEOUT 200000 /* 200 seconds */ +#define BATADV_TT_LOCAL_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_ROAM_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_CLIENT_TEMP_TIMEOUT 600000 /* in milliseconds */ +#define BATADV_TT_WORK_PERIOD 5000 /* 5 seconds */ +#define BATADV_ORIG_WORK_PERIOD 1000 /* 1 second */ +#define BATADV_DAT_ENTRY_TIMEOUT (5*60000) /* 5 mins in milliseconds */ +/* sliding packet range of received originator messages in sequence numbers + * (should be a multiple of our word size) + */ +#define BATADV_TQ_LOCAL_WINDOW_SIZE 64 +/* milliseconds we have to keep pending tt_req */ +#define BATADV_TT_REQUEST_TIMEOUT 3000 + +#define BATADV_TQ_GLOBAL_WINDOW_SIZE 5 +#define BATADV_TQ_LOCAL_BIDRECT_SEND_MINIMUM 1 +#define BATADV_TQ_LOCAL_BIDRECT_RECV_MINIMUM 1 +#define BATADV_TQ_TOTAL_BIDRECT_LIMIT 1 + +/* number of OGMs sent with the last tt diff */ +#define BATADV_TT_OGM_APPEND_MAX 3 + +/* Time in which a client can roam at most ROAMING_MAX_COUNT times in + * milliseconds + */ +#define BATADV_ROAMING_MAX_TIME 20000 +#define BATADV_ROAMING_MAX_COUNT 5 + +#define BATADV_NO_FLAGS 0 + +#define BATADV_NULL_IFINDEX 0 /* dummy ifindex used to avoid iface checks */ + +#define BATADV_NO_MARK 0 + +/* default interface for multi interface operation. The default interface is + * used for communication which originated locally (i.e. is not forwarded) + * or where special forwarding is not desired/necessary. + */ +#define BATADV_IF_DEFAULT ((struct batadv_hard_iface *)NULL) + +#define BATADV_NUM_WORDS BITS_TO_LONGS(BATADV_TQ_LOCAL_WINDOW_SIZE) + +#define BATADV_LOG_BUF_LEN 8192 /* has to be a power of 2 */ + +/* number of packets to send for broadcasts on different interface types */ +#define BATADV_NUM_BCASTS_DEFAULT 1 +#define BATADV_NUM_BCASTS_WIRELESS 3 +#define BATADV_NUM_BCASTS_MAX 3 + +/* msecs after which an ARP_REQUEST is sent in broadcast as fallback */ +#define ARP_REQ_DELAY 250 +/* numbers of originator to contact for any PUT/GET DHT operation */ +#define BATADV_DAT_CANDIDATES_NUM 3 + +/** + * BATADV_TQ_SIMILARITY_THRESHOLD - TQ points that a secondary metric can differ + * at most from the primary one in order to be still considered acceptable + */ +#define BATADV_TQ_SIMILARITY_THRESHOLD 50 + +/* how much worse secondary interfaces may be to be considered as bonding + * candidates + */ +#define BATADV_BONDING_TQ_THRESHOLD 50 + +/* should not be bigger than 512 bytes or change the size of + * forw_packet->direct_link_flags + */ +#define BATADV_MAX_AGGREGATION_BYTES 512 +#define BATADV_MAX_AGGREGATION_MS 100 + +#define BATADV_BLA_PERIOD_LENGTH 10000 /* 10 seconds */ +#define BATADV_BLA_BACKBONE_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 3) +#define BATADV_BLA_CLAIM_TIMEOUT (BATADV_BLA_PERIOD_LENGTH * 10) +#define BATADV_BLA_WAIT_PERIODS 3 + +#define BATADV_DUPLIST_SIZE 16 +#define BATADV_DUPLIST_TIMEOUT 500 /* 500 ms */ +/* don't reset again within 30 seconds */ +#define BATADV_RESET_PROTECTION_MS 30000 +#define BATADV_EXPECTED_SEQNO_RANGE 65536 + +#define BATADV_NC_NODE_TIMEOUT 10000 /* Milliseconds */ + +enum batadv_mesh_state { + BATADV_MESH_INACTIVE, + BATADV_MESH_ACTIVE, + BATADV_MESH_DEACTIVATING, +}; + +#define BATADV_BCAST_QUEUE_LEN 256 +#define BATADV_BATMAN_QUEUE_LEN 256 + +enum batadv_uev_action { + BATADV_UEV_ADD = 0, + BATADV_UEV_DEL, + BATADV_UEV_CHANGE, +}; + +enum batadv_uev_type { + BATADV_UEV_GW = 0, +}; + +#define BATADV_GW_THRESHOLD 50 + +/* Number of fragment chains for each orig_node */ +#define BATADV_FRAG_BUFFER_COUNT 8 +/* Maximum number of fragments for one packet */ +#define BATADV_FRAG_MAX_FRAGMENTS 16 +/* Maxumim size of each fragment */ +#define BATADV_FRAG_MAX_FRAG_SIZE 1400 +/* Time to keep fragments while waiting for rest of the fragments */ +#define BATADV_FRAG_TIMEOUT 10000 + +#define BATADV_DAT_CANDIDATE_NOT_FOUND 0 +#define BATADV_DAT_CANDIDATE_ORIG 1 + +/* Debug Messages */ +#ifdef pr_fmt +#undef pr_fmt +#endif +/* Append 'batman-adv: ' before kernel messages */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + +/* Kernel headers */ + +#include <linux/mutex.h> /* mutex */ +#include <linux/module.h> /* needed by all modules */ +#include <linux/netdevice.h> /* netdevice */ +#include <linux/etherdevice.h> /* ethernet address classification */ +#include <linux/if_ether.h> /* ethernet header */ +#include <linux/poll.h> /* poll_table */ +#include <linux/kthread.h> /* kernel threads */ +#include <linux/pkt_sched.h> /* schedule types */ +#include <linux/workqueue.h> /* workqueue */ +#include <linux/percpu.h> +#include <linux/slab.h> +#include <net/sock.h> /* struct sock */ +#include <net/addrconf.h> /* ipv6 address stuff */ +#include <linux/ip.h> +#include <net/rtnetlink.h> +#include <linux/jiffies.h> +#include <linux/seq_file.h> +#include <linux/if_vlan.h> + +#include "types.h" + +#define BATADV_PRINT_VID(vid) (vid & BATADV_VLAN_HAS_TAG ? \ + (int)(vid & VLAN_VID_MASK) : -1) + +extern char batadv_routing_algo[]; +extern struct list_head batadv_hardif_list; + +extern unsigned char batadv_broadcast_addr[]; +extern struct workqueue_struct *batadv_event_workqueue; + +int batadv_mesh_init(struct net_device *soft_iface); +void batadv_mesh_free(struct net_device *soft_iface); +int batadv_is_my_mac(struct batadv_priv *bat_priv, const uint8_t *addr); +struct batadv_hard_iface * +batadv_seq_print_text_primary_if_get(struct seq_file *seq); +int batadv_max_header_len(void); +void batadv_skb_set_priority(struct sk_buff *skb, int offset); +int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, + struct packet_type *ptype, + struct net_device *orig_dev); +int +batadv_recv_handler_register(uint8_t packet_type, + int (*recv_handler)(struct sk_buff *, + struct batadv_hard_iface *)); +void batadv_recv_handler_unregister(uint8_t packet_type); +int batadv_algo_register(struct batadv_algo_ops *bat_algo_ops); +int batadv_algo_select(struct batadv_priv *bat_priv, char *name); +int batadv_algo_seq_print_text(struct seq_file *seq, void *offset); +__be32 batadv_skb_crc32(struct sk_buff *skb, u8 *payload_ptr); + +/** + * enum batadv_dbg_level - available log levels + * @BATADV_DBG_BATMAN: OGM and TQ computations related messages + * @BATADV_DBG_ROUTES: route added / changed / deleted + * @BATADV_DBG_TT: translation table messages + * @BATADV_DBG_BLA: bridge loop avoidance messages + * @BATADV_DBG_DAT: ARP snooping and DAT related messages + * @BATADV_DBG_NC: network coding related messages + * @BATADV_DBG_ALL: the union of all the above log levels + */ +enum batadv_dbg_level { + BATADV_DBG_BATMAN = BIT(0), + BATADV_DBG_ROUTES = BIT(1), + BATADV_DBG_TT = BIT(2), + BATADV_DBG_BLA = BIT(3), + BATADV_DBG_DAT = BIT(4), + BATADV_DBG_NC = BIT(5), + BATADV_DBG_ALL = 63, +}; + +#ifdef CONFIG_BATMAN_ADV_DEBUG +int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...) +__printf(2, 3); + +#define batadv_dbg(type, bat_priv, fmt, arg...) \ + do { \ + if (atomic_read(&bat_priv->log_level) & type) \ + batadv_debug_log(bat_priv, fmt, ## arg);\ + } \ + while (0) +#else /* !CONFIG_BATMAN_ADV_DEBUG */ +__printf(3, 4) +static inline void batadv_dbg(int type __always_unused, + struct batadv_priv *bat_priv __always_unused, + const char *fmt __always_unused, ...) +{ +} +#endif + +#define batadv_info(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_info("%s: " fmt, _netdev->name, ## arg); \ + } while (0) +#define batadv_err(net_dev, fmt, arg...) \ + do { \ + struct net_device *_netdev = (net_dev); \ + struct batadv_priv *_batpriv = netdev_priv(_netdev); \ + batadv_dbg(BATADV_DBG_ALL, _batpriv, fmt, ## arg); \ + pr_err("%s: " fmt, _netdev->name, ## arg); \ + } while (0) + +/* returns 1 if they are the same ethernet addr + * + * note: can't use ether_addr_equal() as it requires aligned memory + */ +static inline int batadv_compare_eth(const void *data1, const void *data2) +{ + return ether_addr_equal_unaligned(data1, data2); +} + +/** + * has_timed_out - compares current time (jiffies) and timestamp + timeout + * @timestamp: base value to compare with (in jiffies) + * @timeout: added to base value before comparing (in milliseconds) + * + * Returns true if current time is after timestamp + timeout + */ +static inline bool batadv_has_timed_out(unsigned long timestamp, + unsigned int timeout) +{ + return time_is_before_jiffies(timestamp + msecs_to_jiffies(timeout)); +} + +#define batadv_atomic_dec_not_zero(v) atomic_add_unless((v), -1, 0) + +/* Returns the smallest signed integer in two's complement with the sizeof x */ +#define batadv_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 batadv_seq_before(x, y) ({typeof(x) _d1 = (x); \ + typeof(y) _d2 = (y); \ + typeof(x) _dummy = (_d1 - _d2); \ + (void) (&_d1 == &_d2); \ + _dummy > batadv_smallest_signed_int(_dummy); }) +#define batadv_seq_after(x, y) batadv_seq_before(y, x) + +/* Stop preemption on local cpu while incrementing the counter */ +static inline void batadv_add_counter(struct batadv_priv *bat_priv, size_t idx, + size_t count) +{ + this_cpu_add(bat_priv->bat_counters[idx], count); +} + +#define batadv_inc_counter(b, i) batadv_add_counter(b, i, 1) + +/* Sum and return the cpu-local counters for index 'idx' */ +static inline uint64_t batadv_sum_counter(struct batadv_priv *bat_priv, + size_t idx) +{ + uint64_t *counters, sum = 0; + int cpu; + + for_each_possible_cpu(cpu) { + counters = per_cpu_ptr(bat_priv->bat_counters, cpu); + sum += counters[idx]; + } + + return sum; +} + +/* Define a macro to reach the control buffer of the skb. The members of the + * control buffer are defined in struct batadv_skb_cb in types.h. + * The macro is inspired by the similar macro TCP_SKB_CB() in tcp.h. + */ +#define BATADV_SKB_CB(__skb) ((struct batadv_skb_cb *)&((__skb)->cb[0])) + +void batadv_tvlv_container_register(struct batadv_priv *bat_priv, + uint8_t type, uint8_t version, + void *tvlv_value, uint16_t tvlv_value_len); +uint16_t batadv_tvlv_container_ogm_append(struct batadv_priv *bat_priv, + unsigned char **packet_buff, + int *packet_buff_len, + int packet_min_len); +void batadv_tvlv_ogm_receive(struct batadv_priv *bat_priv, + struct batadv_ogm_packet *batadv_ogm_packet, + struct batadv_orig_node *orig_node); +void batadv_tvlv_container_unregister(struct batadv_priv *bat_priv, + uint8_t type, uint8_t version); + +void batadv_tvlv_handler_register(struct batadv_priv *bat_priv, + void (*optr)(struct batadv_priv *bat_priv, + struct batadv_orig_node *orig, + uint8_t flags, + void *tvlv_value, + uint16_t tvlv_value_len), + int (*uptr)(struct batadv_priv *bat_priv, + uint8_t *src, uint8_t *dst, + void *tvlv_value, + uint16_t tvlv_value_len), + uint8_t type, uint8_t version, uint8_t flags); +void batadv_tvlv_handler_unregister(struct batadv_priv *bat_priv, + uint8_t type, uint8_t version); +int batadv_tvlv_containers_process(struct batadv_priv *bat_priv, + bool ogm_source, + struct batadv_orig_node *orig_node, + uint8_t *src, uint8_t *dst, + void *tvlv_buff, uint16_t tvlv_buff_len); +void batadv_tvlv_unicast_send(struct batadv_priv *bat_priv, uint8_t *src, + uint8_t *dst, uint8_t type, uint8_t version, + void *tvlv_value, uint16_t tvlv_value_len); +unsigned short batadv_get_vid(struct sk_buff *skb, size_t header_len); +bool batadv_vlan_ap_isola_get(struct batadv_priv *bat_priv, unsigned short vid); + +#endif /* _NET_BATMAN_ADV_MAIN_H_ */ diff --combined net/batman-adv/network-coding.c index a9546fe,40a2fc4..40a2fc4 --- a/net/batman-adv/network-coding.c +++ b/net/batman-adv/network-coding.c @@@ -86,6 -86,7 +86,7 @@@ static void batadv_nc_tvlv_container_up void batadv_nc_status_update(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_nc_tvlv_container_update(bat_priv); } diff --combined net/batman-adv/soft-interface.c index a827921,e783afb..e783afb --- a/net/batman-adv/soft-interface.c +++ b/net/batman-adv/soft-interface.c @@@ -454,14 -454,14 +454,14 @@@ out * possibly free it * @softif_vlan: the vlan object to release */ - void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *vlan) + void batadv_softif_vlan_free_ref(struct batadv_softif_vlan *softif_vlan) { - if (atomic_dec_and_test(&vlan->refcount)) { - spin_lock_bh(&vlan->bat_priv->softif_vlan_list_lock); - hlist_del_rcu(&vlan->list); - spin_unlock_bh(&vlan->bat_priv->softif_vlan_list_lock); + if (atomic_dec_and_test(&softif_vlan->refcount)) { + spin_lock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); + hlist_del_rcu(&softif_vlan->list); + spin_unlock_bh(&softif_vlan->bat_priv->softif_vlan_list_lock); - kfree_rcu(vlan, rcu); + kfree_rcu(softif_vlan, rcu); } } @@@ -611,8 -611,8 +611,8 @@@ static int batadv_interface_add_vid(str * exists, because the entry was deleted by kill_vid() */ batadv_tt_local_add(bat_priv->soft_iface, - bat_priv->soft_iface->dev_addr, vid, - BATADV_NULL_IFINDEX, BATADV_NO_MARK); + bat_priv->soft_iface->dev_addr, vid, + BATADV_NULL_IFINDEX, BATADV_NO_MARK); return 0; } @@@ -922,7 -922,7 +922,7 @@@ static void batadv_softif_init_early(st /* generate random address */ eth_hw_addr_random(dev); - SET_ETHTOOL_OPS(dev, &batadv_ethtool_ops); + dev->ethtool_ops = &batadv_ethtool_ops; memset(priv, 0, sizeof(*priv)); } diff --combined net/batman-adv/sysfs.c index 1ebb0d9,fc47baa..fc47baa --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@@ -29,12 -29,14 +29,14 @@@ static struct net_device *batadv_kobj_to_netdev(struct kobject *obj) { struct device *dev = container_of(obj->parent, struct device, kobj); + return to_net_dev(dev); } static struct batadv_priv *batadv_kobj_to_batpriv(struct kobject *obj) { struct net_device *net_dev = batadv_kobj_to_netdev(obj); + return netdev_priv(net_dev); } @@@ -106,7 -108,7 +108,7 @@@ struct batadv_attribute batadv_attr_vla .mode = _mode }, \ .show = _show, \ .store = _store, \ - }; + } /* Use this, if you have customized show and store functions */ #define BATADV_ATTR(_name, _mode, _show, _store) \ @@@ -115,7 -117,7 +117,7 @@@ struct batadv_attribute batadv_attr_##_ .mode = _mode }, \ .show = _show, \ .store = _store, \ - }; + } #define BATADV_ATTR_SIF_STORE_BOOL(_name, _post_func) \ ssize_t batadv_store_##_name(struct kobject *kobj, \ @@@ -124,6 -126,7 +126,7 @@@ { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct batadv_priv *bat_priv = netdev_priv(net_dev); \ + \ return __batadv_store_bool_attr(buff, count, _post_func, attr, \ &bat_priv->_name, net_dev); \ } @@@ -133,6 -136,7 +136,7 @@@ ssize_t batadv_show_##_name(struct kobj struct attribute *attr, char *buff) \ { \ struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); \ + \ return sprintf(buff, "%s\n", \ atomic_read(&bat_priv->_name) == 0 ? \ "disabled" : "enabled"); \ @@@ -155,6 -159,7 +159,7 @@@ ssize_t batadv_store_##_name(struct kob { \ struct net_device *net_dev = batadv_kobj_to_netdev(kobj); \ struct batadv_priv *bat_priv = netdev_priv(net_dev); \ + \ return __batadv_store_uint_attr(buff, count, _min, _max, \ _post_func, attr, \ &bat_priv->_name, net_dev); \ @@@ -165,6 -170,7 +170,7 @@@ ssize_t batadv_show_##_name(struct kobj struct attribute *attr, char *buff) \ { \ struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); \ + \ return sprintf(buff, "%i\n", atomic_read(&bat_priv->_name)); \ } \ @@@ -188,6 -194,7 +194,7 @@@ ssize_t batadv_store_vlan_##_name(struc size_t res = __batadv_store_bool_attr(buff, count, _post_func, \ attr, &vlan->_name, \ bat_priv->soft_iface); \ + \ batadv_softif_vlan_free_ref(vlan); \ return res; \ } @@@ -202,6 -209,7 +209,7 @@@ ssize_t batadv_show_vlan_##_name(struc size_t res = sprintf(buff, "%s\n", \ atomic_read(&vlan->_name) == 0 ? \ "disabled" : "enabled"); \ + \ batadv_softif_vlan_free_ref(vlan); \ return res; \ } @@@ -324,12 -332,14 +332,14 @@@ static ssize_t batadv_show_bat_algo(str struct attribute *attr, char *buff) { struct batadv_priv *bat_priv = batadv_kobj_to_batpriv(kobj); + return sprintf(buff, "%s\n", bat_priv->bat_algo_ops->name); } static void batadv_post_gw_reselect(struct net_device *net_dev) { struct batadv_priv *bat_priv = netdev_priv(net_dev); + batadv_gw_reselect(bat_priv); } -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.15-rc6, created. v3.15-rc6
by postmaster＠open-mesh.org 21 May '14

21 May '14

The annotated tag, v3.15-rc6 has been created at e13ef130784db89eb073c51d2c64173031f72521 (tag) tagging 4b660a7f5c8099d88d1a43d8ae138965112592c7 (commit) replaces v3.15-rc5 tagged by Linus Torvalds on Thu May 22 06:42:11 2014 +0900 - Shortlog ------------------------------------------------------------ Linux 3.15-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTfR2zAAoJEHm+PkMAQRiG3noH/2s+KUge3qO2M+AmxttUo74B +npAMdbqYR3MdEiwxYZfsHcMu4Ye/IKLcrh4pydB5hI2mdjtGkH1bnmia0f1ve/c Z/a0256+W8gWp7mcUBqSNztqLPAWa7wKOqNdLjj5idr1BSj6u8im+fQ9FBh2woki 1fyYAuq/60lq4CMOKJvkA95V1Ome/jO+8tS4PguOgsCETQxCVFGurZcBbG3Mx5Y3 v+ioCqeRc6GvxPFR6YngnTZCrsLxSRT3tnO2Qy5zX7dxjIQkCEbvIckpBQv01Y3R wNUaX+2Jae207igxrEv8CjmCFnmZFuUI15aWWCy6fOS/j8bjuk6ThYJO8N4ZBM0= =2ShG -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-for-davem, created. batman-adv-for-davem
by postmaster＠open-mesh.org 18 May '14

18 May '14

The annotated tag, batman-adv-for-davem has been created at 984abefc718b42e38bf4e357f52bb59c0896af89 (tag) tagging 871d3d9fdf1c2fb58927080c8e96edccb1fee010 (commit) replaces v3.15-rc4 tagged by Antonio Quartulli on Sun May 18 15:18:04 2014 +0200 - Shortlog ------------------------------------------------------------ Included changes: - fix codestyle to respect new checkpatch warnings - increase internal version number -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJTeLMvAAoJEEKTMo6mOh1VKtgP/RuR34USuUbY/xMZ9/Rn2/E7 z1qn6hh8hlw+Hd+Vn+9BvDJzwn+Baneu1c3SMP08kE+pAst0n788y/f/pVzfToJk Gll0sOVHiSm05M0QQ0Vq57H+rxoFv2KACM1t2+NMW+pB+PsSYG5y87b6I+0hR4Pv lbBCNmgIxY2alxM8qab2Zlt+cCUdkKUnI67P0LtVnMh91JuKwsheOdR+Smxz2+2g J+2Bzcz+NIHhJP9c+QmJipV+gtIRjFr7+bebaXDm/eEBq/3f6cEhFtwa76CmCpI/ cAIMDFORCHB27qNMgKSuzFDdhF1qQJnZh8FX0dfRBXvH8NwxBOkjFh1CBJ3iwjm1 T7GBTLTKiv/JqdNjqrWJ9OxChl8I2jppevZdimq1VUjhv9117Jc73TnzazjULTST xr5PpZ1gRfruUVXl362otrtzm0N/hdqez+mYlkZEx/ERTDedLCZZAnjTsx5PPMG+ GXlbc1BWuQZuHpvs8uWMcnXDaWtNyNKKpvfRPuvLIST80F1Bw/KRd2FDH/AiO2tL 2eACn9ughC5XO9E+/iyfWm1MQMEwo/w9+EfWpnRWV9HtDuHepVGy59x3mCYH/bN0 7FP23lbaFw05i/UpsRRneqkzMJLk/16qLCiNoC8u2hEiqKzu0/celPwl7B16Fs4Z CU65LSN/QNU9q+AXVQOd =tdAQ -----END PGP SIGNATURE----- Antonio Quartulli (2): batman-adv: add blank line between declarations and the rest of the code batman-adv: remove semi-colon after macro definition Simon Wunderlich (1): batman-adv: Start new development cycle Wilfried Klaebe (1): net: get rid of SET_ETHTOOL_OPS ----------------------------------------------------------------------- -- linux integration

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits May 2014