commits February 2018

commits@lists.open-mesh.org

1 participants
28 discussions

[batctl] master: batctl: Start new development cycle (06ea676)
by postmaster＠open-mesh.org 27 Feb '18

27 Feb '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 06ea676d1c60f89248c962dd7043388c0bdc6bc7 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Feb 27 09:53:20 2018 +0100 batctl: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 06ea676d1c60f89248c962dd7043388c0bdc6bc7 main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.h b/main.h index 1f1382b..486c8bf 100644 --- a/main.h +++ b/main.h @@ -26,7 +26,7 @@ #include <stdint.h> #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.0" +#define SOURCE_VERSION "2018.1" #endif #define SOCKET_PATH_FMT "%s/batman_adv/%s/socket"

1 0

[alfred] tag 'v2018.0' created
by postmaster＠open-mesh.org 27 Feb '18

27 Feb '18

Repository : ssh://git@open-mesh.org/alfred New tag : v2018.0 Referencing: 7a7428c694d78b7196613451d9018ffe4d32a4a6

1 0

[alfred] master: alfred: Start new development cycle (535d594)
by postmaster＠open-mesh.org 27 Feb '18

27 Feb '18

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 535d59405b0a2782ce0a190b14c807d13791a1c4 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Feb 27 09:55:41 2018 +0100 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 535d59405b0a2782ce0a190b14c807d13791a1c4 alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alfred.h b/alfred.h index 53732a6..d7194c6 100644 --- a/alfred.h +++ b/alfred.h @@ -21,7 +21,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.0" +#define SOURCE_VERSION "2018.1" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index f2f7675..535d953 100644 --- a/gpsd/alfred-gpsd.h +++ b/gpsd/alfred-gpsd.h @@ -39,7 +39,7 @@ #include "../list.h" #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.0" +#define SOURCE_VERSION "2018.1" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index 8fb67b0..b0c6521 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -28,7 +28,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.0" +#define SOURCE_VERSION "2018.1" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

1 0

[alfred] master: alfred: Update CHANGELOG for upcoming release (ddc5292)
by postmaster＠open-mesh.org 27 Feb '18

27 Feb '18

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit ddc529231c26907501d9f2177fe349d23b7b5a3c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Tue Feb 27 09:55:15 2018 +0100 alfred: Update CHANGELOG for upcoming release Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ddc529231c26907501d9f2177fe349d23b7b5a3c CHANGELOG.rst | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 8dd31f5..9fce8c5 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,12 @@ .. SPDX-License-Identifier: GPL-2.0 +2018.0 (2018-02-26) +=================== + +* synchronization of batman-adv netlink and packet headers +* mark licenses clearer, change batman-adv UAPI header from ISC to MIT +* coding style cleanups and refactoring + 2017.4 (2017-12-05) ===================

1 0

[linux-merge]linux integration; annotated tag, v4.16-rc3, created. v4.16-rc3
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

The annotated tag, v4.16-rc3 has been created at 671e0d17675c17d89086e353935bf718e8096b29 (tag) tagging 4a3928c6f8a53fa1aed28ccba227742486e8ddcb (commit) replaces v4.16-rc2 tagged by Linus Torvalds on Sun Feb 25 18:50:55 2018 -0800 - Shortlog ------------------------------------------------------------ Linux 4.16-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlqTdg8eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiG10wH/iSt+OKmBdUZSAYv ADvfifLynLgugFYNzuijj8/gVt6b0ZIB2/wSYfdPjDErLFogis6wjnxl0lf3sEMB g7Oy8SE+pPPQ7587lFkg6Pj53405b6BwCbSkg8PLlwepSGiu0JmGvUYmz753tIeP kRIIQk/KrLlxNFixhGWNfQ9k8PqJ0NCgcbj+mTxmFkfIw2FKnBtYz72LR7Eut3Mt PJFh4pLKsHKlcjvX8+SehDdLwlEBv/ohDP7S7gRyR+QX1aNZhZAXyHQ0C8/tw8h6 DnRvlTWp9EGTFxp8bYie5xcWusIcfy1eAA8yiG2kH+Mx7kLa8cmU234bHhUiu9yT YJSLoI4= =XBoV -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: Fix internal interface indices types (d5db560)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit d5db560de1352d3ec6933bca25b3aaad7ddd15e1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Dec 26 15:14:01 2017 +0100 batman-adv: Fix internal interface indices types batman-adv uses internal indices for each enabled and active interface. It is currently used by the B.A.T.M.A.N. IV algorithm to identifify the correct position in the ogm_cnt bitmaps. The type for the number of enabled interfaces (which defines the next interface index) was set to char. This type can be (depending on the architecture) either signed (limiting batman-adv to 127 active slave interfaces) or unsigned (limiting batman-adv to 255 active slave interfaces). This limit was not correctly checked when an interface was enabled and thus an overflow happened. This was only catched on systems with the signed char type when the B.A.T.M.A.N. IV code tried to resize its counter arrays with a negative size. The if_num interface index was only a s16 and therefore significantly smaller than the ifindex (int) used by the code net code. Both &batadv_hard_iface->if_num and &batadv_priv->num_ifaces must be (unsigned) int to support the same number of slave interfaces as the net core code. And the interface activation code must check the number of active slave interfaces to avoid integer overflows. Fixes: d1fbb61d0534 ("raw socket operations added: create / destroy / bind / send broadcast of own OGMs implemented orig interval configurable via /proc/net/batman-adv/orig_interval") Fixes: ea6f8d42a595 ("batman-adv: move /proc interface handling to /sys") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- d5db560de1352d3ec6933bca25b3aaad7ddd15e1 net/batman-adv/bat_iv_ogm.c | 24 ++++++++++++++---------- net/batman-adv/hard-interface.c | 9 +++++++-- net/batman-adv/originator.c | 4 ++-- net/batman-adv/originator.h | 4 ++-- net/batman-adv/types.h | 11 ++++++----- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c index bb8241c..be09a98 100644 --- a/net/batman-adv/bat_iv_ogm.c +++ b/net/batman-adv/bat_iv_ogm.c @@ -157,7 +157,7 @@ static void batadv_iv_ogm_orig_free(struct batadv_orig_node *orig_node) * Return: 0 on success, a negative error code otherwise. */ static int batadv_iv_ogm_orig_add_if(struct batadv_orig_node *orig_node, - int max_if_num) + unsigned int max_if_num) { void *data_ptr; size_t old_size; @@ -201,7 +201,8 @@ unlock: */ static void batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node, - int max_if_num, int del_if_num) + unsigned int max_if_num, + unsigned int del_if_num) { size_t chunk_size; size_t if_offset; @@ -239,7 +240,8 @@ batadv_iv_ogm_drop_bcast_own_entry(struct batadv_orig_node *orig_node, */ static void batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node, - int max_if_num, int del_if_num) + unsigned int max_if_num, + unsigned int del_if_num) { size_t if_offset; void *data_ptr; @@ -276,7 +278,8 @@ batadv_iv_ogm_drop_bcast_own_sum_entry(struct batadv_orig_node *orig_node, * Return: 0 on success, a negative error code otherwise. */ static int batadv_iv_ogm_orig_del_if(struct batadv_orig_node *orig_node, - int max_if_num, int del_if_num) + unsigned int max_if_num, + unsigned int del_if_num) { spin_lock_bh(&orig_node->bat_iv.ogm_cnt_lock); @@ -311,7 +314,8 @@ static struct batadv_orig_node * batadv_iv_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr) { struct batadv_orig_node *orig_node; - int size, hash_added; + int hash_added; + size_t size; orig_node = batadv_orig_hash_find(bat_priv, addr); if (orig_node) @@ -893,7 +897,7 @@ batadv_iv_ogm_slide_own_bcast_window(struct batadv_hard_iface *hard_iface) u32 i; size_t word_index; u8 *w; - int if_num; + unsigned int if_num; for (i = 0; i < hash->size; i++) { head = &hash->table[i]; @@ -1023,7 +1027,7 @@ batadv_iv_ogm_orig_update(struct batadv_priv *bat_priv, struct batadv_neigh_node *tmp_neigh_node = NULL; struct batadv_neigh_node *router = NULL; struct batadv_orig_node *orig_node_tmp; - int if_num; + unsigned int if_num; u8 sum_orig, sum_neigh; u8 *neigh_addr; u8 tq_avg; @@ -1182,7 +1186,7 @@ static bool batadv_iv_ogm_calc_tq(struct batadv_orig_node *orig_node, u8 total_count; u8 orig_eq_count, neigh_rq_count, neigh_rq_inv, tq_own; unsigned int neigh_rq_inv_cube, neigh_rq_max_cube; - int if_num; + unsigned int if_num; unsigned int tq_asym_penalty, inv_asym_penalty; unsigned int combined_tq; unsigned int tq_iface_penalty; @@ -1702,9 +1706,9 @@ static void batadv_iv_ogm_process(const struct sk_buff *skb, int ogm_offset, if (is_my_orig) { unsigned long *word; - int offset; + size_t offset; s32 bit_pos; - s16 if_num; + unsigned int if_num; u8 *weight; orig_neigh_node = batadv_iv_ogm_orig_get(bat_priv, diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index fd4a263..c405d15 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -763,6 +763,11 @@ int batadv_hardif_enable_interface(struct batadv_hard_iface *hard_iface, hard_iface->soft_iface = soft_iface; bat_priv = netdev_priv(hard_iface->soft_iface); + if (bat_priv->num_ifaces >= UINT_MAX) { + ret = -ENOSPC; + goto err_dev; + } + ret = netdev_master_upper_dev_link(hard_iface->net_dev, soft_iface, NULL, NULL, NULL); if (ret) @@ -876,7 +881,7 @@ void batadv_hardif_disable_interface(struct batadv_hard_iface *hard_iface, batadv_hardif_recalc_extra_skbroom(hard_iface->soft_iface); /* nobody uses this interface anymore */ - if (!bat_priv->num_ifaces) { + if (bat_priv->num_ifaces == 0) { batadv_gw_check_client_stop(bat_priv); if (autodel == BATADV_IF_CLEANUP_AUTO) @@ -912,7 +917,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) if (ret) goto free_if; - hard_iface->if_num = -1; + hard_iface->if_num = 0; hard_iface->net_dev = net_dev; hard_iface->soft_iface = NULL; hard_iface->if_status = BATADV_IF_NOT_IN_USE; diff --git a/net/batman-adv/originator.c b/net/batman-adv/originator.c index 2a51a0c..716e5b4 100644 --- a/net/batman-adv/originator.c +++ b/net/batman-adv/originator.c @@ -1569,7 +1569,7 @@ int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb) * Return: 0 on success or negative error number in case of failure */ int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, - int max_if_num) + unsigned int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_algo_ops *bao = bat_priv->algo_ops; @@ -1611,7 +1611,7 @@ err: * Return: 0 on success or negative error number in case of failure */ int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, - int max_if_num) + unsigned int max_if_num) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hashtable *hash = bat_priv->orig_hash; diff --git a/net/batman-adv/originator.h b/net/batman-adv/originator.h index f3601ab..3b3f59b 100644 --- a/net/batman-adv/originator.h +++ b/net/batman-adv/originator.h @@ -73,9 +73,9 @@ int batadv_orig_seq_print_text(struct seq_file *seq, void *offset); int batadv_orig_dump(struct sk_buff *msg, struct netlink_callback *cb); int batadv_orig_hardif_seq_print_text(struct seq_file *seq, void *offset); int batadv_orig_hash_add_if(struct batadv_hard_iface *hard_iface, - int max_if_num); + unsigned int max_if_num); int batadv_orig_hash_del_if(struct batadv_hard_iface *hard_iface, - int max_if_num); + unsigned int max_if_num); struct batadv_orig_node_vlan * batadv_orig_node_vlan_new(struct batadv_orig_node *orig_node, unsigned short vid); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 4a3b883..476b052 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -167,7 +167,7 @@ struct batadv_hard_iface { struct list_head list; /** @if_num: identificator of the interface */ - s16 if_num; + unsigned int if_num; /** @if_status: status of the interface for batman-adv */ char if_status; @@ -1596,7 +1596,7 @@ struct batadv_priv { atomic_t batman_queue_left; /** @num_ifaces: number of interfaces assigned to this mesh interface */ - char num_ifaces; + unsigned int num_ifaces; /** @mesh_obj: kobject for sysfs mesh subdirectory */ struct kobject *mesh_obj; @@ -2186,15 +2186,16 @@ struct batadv_algo_orig_ops { * orig_node due to a new hard-interface being added into the mesh * (optional) */ - int (*add_if)(struct batadv_orig_node *orig_node, int max_if_num); + int (*add_if)(struct batadv_orig_node *orig_node, + unsigned int max_if_num); /** * @del_if: ask the routing algorithm to apply the needed changes to the * orig_node due to an hard-interface being removed from the mesh * (optional) */ - int (*del_if)(struct batadv_orig_node *orig_node, int max_if_num, - int del_if_num); + int (*del_if)(struct batadv_orig_node *orig_node, + unsigned int max_if_num, unsigned int del_if_num); #ifdef CONFIG_BATMAN_ADV_DEBUGFS /** @print: print the originator table (optional) */

1 0

[batman-adv] master: Merge branch 'maint' (c5aa1fa)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit c5aa1faf1c83153f5b8b3b47205abfc5706abe66 Merge: e89f6ed 934b388 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Mon Feb 26 17:38:09 2018 +0100 Merge branch 'maint' >--------------------------------------------------------------- c5aa1faf1c83153f5b8b3b47205abfc5706abe66 compat.h | 4 ++++ net/batman-adv/bat_iv_ogm.c | 2 +- net/batman-adv/bat_v.c | 2 +- net/batman-adv/bridge_loop_avoidance.c | 22 ++++++++++++++-------- 4 files changed, 20 insertions(+), 10 deletions(-)

1 0

[batman-adv] master's head updated: Merge branch 'maint' (c5aa1fa)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: c58f37c batman-adv: Ignore invalid batadv_iv_gw during netlink send 12f1d3a batman-adv: Ignore invalid batadv_v_gw during netlink send 49197c0 batman-adv: Fix netlink dumping of BLA claims 29e4759 batman-adv: Fix netlink dumping of BLA backbones 934b388 batman-adv: Only use compat.h for kernel builds c5aa1fa Merge branch 'maint'

1 0

[batman-adv] maint: batman-adv: Only use compat.h for kernel builds (934b388)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 934b38842550cac4c0af3ce9ab1d23aa2dbb4241 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Feb 26 13:51:32 2018 +0100 batman-adv: Only use compat.h for kernel builds The compat.h will be included by default via the -include gcc parameter. This is done by appending the incude information to NOSTDINC_FLAGS in the Makefile. But Debian decided [1] that this NOSTDINC_FLAGS must also be used when not compiling kernel sources. This for example happens when the gcc-version.sh script is executed. This results in error messages like In file included from <command-line>:0:0: /usr/src//batman-adv/build/../compat.h:25:52: fatal error: linux/version.h: No such file or directory #include <linux/version.h> /* LINUX_VERSION_CODE */ ^ compilation terminated. In file included from <command-line>:0:0: /usr/src//batman-adv/build/../compat.h:25:52: fatal error: linux/version.h: No such file or directory #include <linux/version.h> /* LINUX_VERSION_CODE */ ^ compilation terminated. /usr/src/linux-headers-4.14.0-0.bpo.3-common/scripts/gcc-version.sh: line 32: printf: #: invalid number /usr/src/linux-headers-4.14.0-0.bpo.3-common/scripts/gcc-version.sh: line 32: printf: #: invalid number /bin/sh: 1: [: 0001: unexpected operator This can be avoided by disabling the compat.h whenever the preprocessor define __KERNEL__ is not set. [1] https://patchwork.kernel.org/patch/5238591/ Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 934b38842550cac4c0af3ce9ab1d23aa2dbb4241 compat.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compat.h b/compat.h index c10ad58..759829f 100644 --- a/compat.h +++ b/compat.h @@ -21,6 +21,8 @@ #ifndef _NET_BATMAN_ADV_COMPAT_H_ #define _NET_BATMAN_ADV_COMPAT_H_ +#ifdef __KERNEL__ + #include <linux/version.h> /* LINUX_VERSION_CODE */ #include <linux/kconfig.h> #include <generated/autoconf.h> @@ -159,4 +161,6 @@ static int __batadv_interface_kill_vid(struct net_device *dev, __be16 proto,\ #endif /* < KERNEL_VERSION(4, 15, 0) */ +#endif /* __KERNEL__ */ + #endif /* _NET_BATMAN_ADV_COMPAT_H_ */

1 0

[batman-adv] maint: batman-adv: Fix netlink dumping of BLA claims (49197c0)
by postmaster＠open-mesh.org 26 Feb '18

26 Feb '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 49197c00f82cfcfeef963ef9367841d38a6ff207 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Feb 24 12:03:36 2018 +0100 batman-adv: Fix netlink dumping of BLA claims The function batadv_bla_claim_dump_bucket must be able to handle non-complete dumps of a single bucket. It tries to do that by saving the latest dumped index in *idx_skip to inform the caller about the current state. But the caller only assumes that buckets were not completely dumped when the return code is non-zero. This function must therefore also return a non-zero index when the dumping of an entry failed. Otherwise the caller will just skip all remaining buckets. And the function must also reset *idx_skip back to zero when it finished a bucket. Otherwise it will skip the same number of entries in the next bucket as the previous one had. Fixes: 3b7a63606020 ("batman-adv: add B.A.T.M.A.N. Dump BLA claims via netlink") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 49197c00f82cfcfeef963ef9367841d38a6ff207 net/batman-adv/bridge_loop_avoidance.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/net/batman-adv/bridge_loop_avoidance.c b/net/batman-adv/bridge_loop_avoidance.c index cdd8e8e..60ce119 100644 --- a/net/batman-adv/bridge_loop_avoidance.c +++ b/net/batman-adv/bridge_loop_avoidance.c @@ -2161,22 +2161,25 @@ batadv_bla_claim_dump_bucket(struct sk_buff *msg, u32 portid, u32 seq, { struct batadv_bla_claim *claim; int idx = 0; + int ret = 0; rcu_read_lock(); hlist_for_each_entry_rcu(claim, head, hash_entry) { if (idx++ < *idx_skip) continue; - if (batadv_bla_claim_dump_entry(msg, portid, seq, - primary_if, claim)) { + + ret = batadv_bla_claim_dump_entry(msg, portid, seq, + primary_if, claim); + if (ret) { *idx_skip = idx - 1; goto unlock; } } - *idx_skip = idx; + *idx_skip = 0; unlock: rcu_read_unlock(); - return 0; + return ret; } /**

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits February 2018