commits February 2015

commits@lists.open-mesh.org

1 participants
26 discussions

[batman-adv] master: Merge branch 'next' (ca2655c)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit ca2655ce949bc949592c4aed04cba5d019741770 Merge: ec3b2d9 c7203da Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Wed Feb 18 17:01:55 2015 +0800 Merge branch 'next' >--------------------------------------------------------------- ca2655ce949bc949592c4aed04cba5d019741770 compat.h | 9 +++++++++ gateway_client.c | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)

1 0

[batman-adv] next: batman-adv: Remove uses of return value of seq_printf (c7203da)
by postmaster＠open-mesh.org 18 Feb '15

18 Feb '15

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit c7203da7a3aeec3358e60fe970f2aa654e5ca69c Author: Joe Perches <joe(a)perches.com> Date: Mon Feb 16 17:31:39 2015 -0800 batman-adv: Remove uses of return value of seq_printf This function is soon going to return void so remove the return value use. Convert the return value to test seq_has_overflowed() instead. Signed-off-by: Joe Perches <joe(a)perches.com> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- c7203da7a3aeec3358e60fe970f2aa654e5ca69c compat.h | 9 +++++++++ gateway_client.c | 19 ++++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/compat.h b/compat.h index c22fe1c..835c6ea 100644 --- a/compat.h +++ b/compat.h @@ -464,4 +464,13 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(3, 17, 0) */ +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) + +static inline bool seq_has_overflowed(struct seq_file *m) +{ + return m->count == m->size; +} + +#endif /* < KERNEL_VERSION(3, 19, 0) */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */ diff --git a/gateway_client.c b/gateway_client.c index 27649e8..a0876ea 100644 --- a/gateway_client.c +++ b/gateway_client.c @@ -592,15 +592,16 @@ static int batadv_write_buffer_text(struct batadv_priv *bat_priv, curr_gw = batadv_gw_get_selected_gw_node(bat_priv); - ret = seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n", - (curr_gw == gw_node ? "=>" : " "), - gw_node->orig_node->orig, - router_ifinfo->bat_iv.tq_avg, router->addr, - router->if_incoming->net_dev->name, - gw_node->bandwidth_down / 10, - gw_node->bandwidth_down % 10, - gw_node->bandwidth_up / 10, - gw_node->bandwidth_up % 10); + seq_printf(seq, "%s %pM (%3i) %pM [%10s]: %u.%u/%u.%u MBit\n", + (curr_gw == gw_node ? "=>" : " "), + gw_node->orig_node->orig, + router_ifinfo->bat_iv.tq_avg, router->addr, + router->if_incoming->net_dev->name, + gw_node->bandwidth_down / 10, + gw_node->bandwidth_down % 10, + gw_node->bandwidth_up / 10, + gw_node->bandwidth_up % 10); + ret = seq_has_overflowed(seq); if (curr_gw) batadv_gw_node_free_ref(curr_gw);

1 0

[linux-merge]linux integration; annotated tag, v3.19, created. v3.19
by postmaster＠open-mesh.org 09 Feb '15

09 Feb '15

The annotated tag, v3.19 has been created at e24f071559c7a928a3033e9fe9f68e52f4f6ec01 (tag) tagging bfa76d49576599a4b9f9b7a71f23d73d6dcff735 (commit) replaces v3.19-rc7 tagged by Linus Torvalds on Sun Feb 8 18:54:38 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJU2CFuAAoJEHm+PkMAQRiGUfQH/jdPZhzT0k2tllXWkkT8yB5S B7ddEmqZk5VK3AIVUO2nj0GJhpYLRCkqNWvBUV+1k8yo54J77nHlqeLX04yI7Pos rlOlIt8LQclCwtnsBMgaAUDrLI/ad2TZXBaxOHayjVWCOdjfFrkxLxS0ZHwqlgvx GJz8at4mf4gRx44Cmb555SW/cFwFm5n67oUrMDL4Nzormp+jTfTeX/G4N+AEUE/F AeDZxx0zWXpdOI1XhQKRHoJgVCpmPWkN+TO/YDO+ee1K1uoZ67X5jNVhmiwawjV5 EN3xcZMY+1KYmcj/qESoyC96SUCO2EAv2JN+9C37Egsg1TRguxvAchiVkADfqZ8= =SirG -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[alfred] master: alfred: Update copyright years for 2015 (dfb1ea4)
by postmaster＠open-mesh.org 05 Feb '15

05 Feb '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit dfb1ea4289387bc38d7fc7c51cfa9b0f3439e66f Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Feb 5 16:45:23 2015 +0100 alfred: Update copyright years for 2015 Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- dfb1ea4289387bc38d7fc7c51cfa9b0f3439e66f Makefile | 2 +- alfred.h | 2 +- batadv_query.c | 2 +- batadv_query.h | 2 +- client.c | 2 +- gpsd/Makefile | 2 +- gpsd/alfred-gpsd.c | 2 +- gpsd/alfred-gpsd.h | 2 +- hash.c | 2 +- hash.h | 2 +- main.c | 2 +- netsock.c | 2 +- packet.h | 2 +- recv.c | 2 +- send.c | 2 +- server.c | 2 +- unix_sock.c | 2 +- util.c | 2 +- vis/Makefile | 2 +- vis/vis.c | 2 +- vis/vis.h | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Makefile b/Makefile index 531339a..8e944c9 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2012-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2012-2015 B.A.T.M.A.N. 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 diff --git a/alfred.h b/alfred.h index f758fc9..ef00551 100644 --- a/alfred.h +++ b/alfred.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.c b/batadv_query.c index cf90554..473ab40 100644 --- a/batadv_query.c +++ b/batadv_query.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/batadv_query.h b/batadv_query.h index 463c8e1..6b938ea 100644 --- a/batadv_query.h +++ b/batadv_query.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/client.c b/client.c index cff5270..32fdd54 100644 --- a/client.c +++ b/client.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/gpsd/Makefile b/gpsd/Makefile index 7ac6288..5055987 100644 --- a/gpsd/Makefile +++ b/gpsd/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. 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 diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index d736ad1..86414cf 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index e287110..297f4e4 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Andrew Lunn, Simon Wunderlich * diff --git a/hash.c b/hash.c index fd85a0f..87e8484 100644 --- a/hash.c +++ b/hash.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/hash.h b/hash.h index c9c8fb1..aa27f25 100644 --- a/hash.h +++ b/hash.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2006-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Marek Lindner * diff --git a/main.c b/main.c index 7eb8baa..d298d65 100644 --- a/main.c +++ b/main.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/netsock.c b/netsock.c index 45c03e9..cc2e9a5 100644 --- a/netsock.c +++ b/netsock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/packet.h b/packet.h index 87ad263..27ee6e5 100644 --- a/packet.h +++ b/packet.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich, Sven Eckelmann * diff --git a/recv.c b/recv.c index 870485f..34a16fc 100644 --- a/recv.c +++ b/recv.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/send.c b/send.c index 19cc867..f1843fe 100644 --- a/send.c +++ b/send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/server.c b/server.c index 66809d9..1a3d876 100644 --- a/server.c +++ b/server.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/unix_sock.c b/unix_sock.c index 8a99327..d203c50 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/util.c b/util.c index 9f357cd..84d4b2d 100644 --- a/util.c +++ b/util.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2012-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2012-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/Makefile b/vis/Makefile index 9421ae2..32a578e 100644 --- a/vis/Makefile +++ b/vis/Makefile @@ -1,7 +1,7 @@ #!/usr/bin/make -f # -*- makefile -*- # -# Copyright (C) 2013-2014 B.A.T.M.A.N. contributors +# Copyright (C) 2013-2015 B.A.T.M.A.N. 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 diff --git a/vis/vis.c b/vis/vis.c index 3dd5c8c..038d89d 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich * diff --git a/vis/vis.h b/vis/vis.h index ac2afb5..a23dc83 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2013-2014 B.A.T.M.A.N. contributors: + * Copyright (C) 2013-2015 B.A.T.M.A.N. contributors: * * Simon Wunderlich *

1 0

[alfred] master: alfred: Close socket after connect failure (26a7b5e)
by postmaster＠open-mesh.org 05 Feb '15

05 Feb '15

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 26a7b5e98d76ad77ddd2b5fe9120ce4e78ef71ee Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Feb 5 15:47:13 2015 +0100 alfred: Close socket after connect failure The socket is still using one file descriptor of the process when the connection fails. This fd leak is non-problematic in the current client process code because the client would be closed in this situation anyway and therefore the socket would be closed when the process is stopped. But people using this as example code may not stop the process on this error. The unclosed and unused sockets would accumulate and the process would hit the limit for open file descriptors. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 26a7b5e98d76ad77ddd2b5fe9120ce4e78ef71ee gpsd/alfred-gpsd.c | 2 ++ unix_sock.c | 2 ++ vis/vis.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/gpsd/alfred-gpsd.c b/gpsd/alfred-gpsd.c index 86414cf..2516417 100644 --- a/gpsd/alfred-gpsd.c +++ b/gpsd/alfred-gpsd.c @@ -40,6 +40,8 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + close(globals->unix_sock); + globals->unix_sock = -1; perror("can't connect to unix socket"); return -1; } diff --git a/unix_sock.c b/unix_sock.c index d203c50..ae86956 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -84,6 +84,8 @@ int unix_sock_open_client(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + close(globals->unix_sock); + globals->unix_sock = -1; perror("can't connect to unix socket"); return -1; } diff --git a/vis/vis.c b/vis/vis.c index 038d89d..4a14e66 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -173,6 +173,8 @@ static int alfred_open_sock(struct globals *globals) if (connect(globals->unix_sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { + close(globals->unix_sock); + globals->unix_sock = -1; perror("can't connect to unix socket"); return -1; }

1 0

[linux-merge]linux integration; annotated tag, v3.19-rc7, created. v3.19-rc7
by postmaster＠open-mesh.org 02 Feb '15

02 Feb '15

The annotated tag, v3.19-rc7 has been created at 9d9ad3a9bd1afe27724b287052dccc0cf87eb6d3 (tag) tagging e36f014edff70fc02b3d3d79cead1d58f289332e (commit) replaces v3.19-rc6 tagged by Linus Torvalds on Sun Feb 1 20:07:38 2015 -0800 - Shortlog ------------------------------------------------------------ Linux 3.19-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUzvgKAAoJEHm+PkMAQRiG8XQH/1qVbHI4pP0KcnzfZUHq/mXq RuS4aJMwLm/Y6cXFraXBDaPde1A3CPtwtpob2C6giKcfu2zXGunY65haOEeJWNpX lCbBsLkNC3oDNkygBpVr5Zd6yibaw63WBjjLnpAi7pn2G2Zm2zB8DfILWWWMb7yz MH8ZXV+/xIYCTkjNWGWA1iMjmdYqu0PQHPeOgLsYQ+u7rxfM1zb/wHEkjqUZS6iu IaaZv7PV2PnFYnqib/iIPYjAEDvSQ4vN/7b82zlFd2Culm9j/568KCCWUPhJTb2l X0u4QYs49GnMTWVRa3bgYxS/nTUaE/6DeWs2y2WzqTt0/XDntVUnok0blUeDxGk= =o2kS -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2015