commits

commits@lists.open-mesh.org

1 participants
12414 discussions

[linux-merge]linux integration; annotated tag, batadv-next-for-davem-20190808, created. batadv-next-for-davem-20190808
by postmaster＠open-mesh.org 08 Aug '19

08 Aug '19

The annotated tag, batadv-next-for-davem-20190808 has been created at 404d57bb81f97eb4e5dc78958c39a7cef58be874 (tag) tagging 9cb9a17813bf0de1f8ad6deb9538296d5148b5a8 (commit) replaces v5.3-rc1 tagged by Simon Wunderlich on Thu Aug 8 15:04:41 2019 +0200 - Shortlog ------------------------------------------------------------ This feature/cleanup patchset includes the following patches: - bump version strings, by Simon Wunderlich - Replace usage of strlcpy with strscpy, by Sven Eckelmann - Add OGMv2 per-interface queue and aggregations, by Linus Luessing (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl1MHekWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoW8TEACox7vhtW4MS8QCzPySCU3f8V6m f+2PPlUbM4CqXcOPGw/jQng6PAtcb4gNPssm52GaxdeB9jFqkI/ELdSn5mCh+EcG QRrhf5DVruYyqBU2gNhovEe7SlJl8IJno6kFdAggaMngXnvlBzIr7n4FMIUKNFYn 6kFbA8pugBXXvhiRcuzs+l5iUxdKUxTsUNPyppyqnqb8lrb0/30/681dfq87PmcV zehEf8Ry23W7CVQv6YougVJvK0GUwysULsvm8Wc8FsOke7CeeQIPLEF2Pcrl/CFM mfynXVXngE41MPBC59eUcWBGlRYwkuwm4Q+YQ8OUjr5+X5YP06jR5Dh8u6KVAMuy QWGSwyrlXSsCE6BTxoijdJqsLzHDXCmYY0GQI2tEMCyDnL95CU3tuTk4vckusuf+ NlhHv7m+Bo0w9ztDUBifzNyURW9VgUCoOZfW9rdYRWjjN8Oe6wnMWCFttGnkg0qu zrCJn5mGvz3Vp434K0uGY1wOZincSdM6grBSgmZv1UNMaBdlfNroJsUqvz6IE5Fe iI5kqRXoUG+ftfwacgyFEK08HpcZHvJkNDiHHRlOPPZm75yE7mwreVUrGRaibywQ pzTEwM+H2MX9xF+osjiPVc197fxpnkX9fI2LhDOEiblaJbdiIxd+cgWRMFS1YPvd ANaFfAh58+gDWcRqhg== =Cbzf -----END PGP SIGNATURE----- Linus Lüssing (2): batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues batman-adv: BATMAN_V: aggregate OGMv2 packets Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (1): batman-adv: Replace usage of strlcpy with strscpy ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20190808, created. batadv-net-for-davem-20190808
by postmaster＠open-mesh.org 08 Aug '19

08 Aug '19

The annotated tag, batadv-net-for-davem-20190808 has been created at 6f9ee85560c2eab128b3a8a66a8ccd35ca36fa7f (tag) tagging f7af86ccf1882084293b11077deec049fd01da63 (commit) replaces v5.3-rc1 tagged by Simon Wunderlich on Thu Aug 8 15:00:29 2019 +0200 - Shortlog ------------------------------------------------------------ Here are some batman-adv bugfixes: - Fix netlink dumping of all mcast_flags buckets, by Sven Eckelmann - Fix deletion of RTR(4|6) mcast list entries, by Sven Eckelmann -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAl1MHO0WHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeobHvD/9RQLU/2zrbq22QIhLwEt2DeGg3 Z//qHgK/LhDnLJRHA0F14NlA/4vPtzbfIX8m0Ai/mrPrk0naDKEeM6TSBw8IHQEz bsibnHkwB+cdgqGtVKFEHqL5seaD5Nnlu89xIvgTyeImq2Zd7heOphN8lLmJPdem 3TugLIkbEqO4P+KU8fdjuA+N4GcRzaArsendH+3z4LrlXJnh4YWvook4/gSjQwWe ydF+e2ktZvNEj8Xl5vsDpykBEFll+k4BThW8toIMx4FCLiw1Hqedp/agwIbs5Tjc ccdYa/wuKYUAwz5rsrqgx3FpH6z0w6h0b3AB++cLaahmas9qx/K7lT68PsJcPz0E qhZmbw0snRO/N+TZQPVd1B9i0H3efAaQzzUu/xfL2RRA91ztB5O2+3HZF3PBzw/J u1Ewt56vv4LV0QmeQLzczKMBS47DPoARk8mLOx0dpGl6vvkQYWBFbn+gk/+uPalk K15Yozd3h/nSEX3SWk50X3+AU/p8l7rAYcrOrpWsRmQGl06XBbRDr9mRijMoHnTE LM+AKiZLvOS1Q/UT/C0YwL2i665aG3NqzqMXq+0Mtciu6Lsefu8+JOZFxcK4GXGU XJ+Kkygf/3/5dhu3Nxm4GchQQSLVJRn/i0nCKJeWS/Qxdvcalk8lPQPrX2a2l6GY kW2KxW/KjwayzLpwSQ== =g2Gm -----END PGP SIGNATURE----- Sven Eckelmann (2): batman-adv: Fix netlink dumping of all mcast_flags buckets batman-adv: Fix deletion of RTR(4|6) mcast list entries ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v5.3-rc3, created. v5.3-rc3
by postmaster＠open-mesh.org 05 Aug '19

05 Aug '19

The annotated tag, v5.3-rc3 has been created at 16a223436c28816262794acf683e095965607762 (tag) tagging e21a712a9685488f5ce80495b37b9fdbe96c230d (commit) replaces v5.3-rc2 tagged by Linus Torvalds on Sun Aug 4 18:40:19 2019 -0700 - Shortlog ------------------------------------------------------------ Linux 5.3-rc3 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAl1HiQMeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGFaIIAIM7UI5LXf7FMsVl zVemD9uDuCqNijycIfFoXvVvDt8y1PnyFJd5C/hRtXjsHyCPB49CRULE05q9ZOh6 68jDa9VYOrnZoDlhMT4kuLf74x78RP19gVgQOLok8n0V3VKt7Yqrow5FKNOYVEfq 0Rd2DqZMU5yGxo6iwG4y1PjCwvwDQ/tcaAGjc9RtOlmYl9KX9MoVHuwn4EEqO8pC 3BN5GL0c/ebiCyNKG2n+y6vJGj5Y9rekyRYrtmtvhHsfs4iBirbnssMatyGm3gNz klysGhbQO98+DoVq3qqclVP5eK0XPdIBCAkF624tBhUN8gczRoQqVRBFuKCUCrD2 h9wT8dE= =k65Y -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master: batman-adv: BATMAN_V: aggregate OGMv2 packets (cbfeb115)
by postmaster＠open-mesh.org 05 Aug '19

05 Aug '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit cbfeb1153aacb19e8dbff642979c0c86f2d9d91b Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Aug 4 20:54:54 2019 +0200 batman-adv: BATMAN_V: aggregate OGMv2 packets Instead of transmitting individual OGMv2 packets from the aggregation queue merge those OGMv2 packets into a single one and transmit this aggregate instead. This reduces overhead as it saves an ethernet header and a transmission per aggregated OGMv2 packet. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- cbfeb1153aacb19e8dbff642979c0c86f2d9d91b net/batman-adv/bat_v_ogm.c | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index 52c990b5..319249f0 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -191,18 +191,44 @@ static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) * batadv_v_ogm_aggr_send() - flush & send aggregation queue * @hard_iface: the interface with the aggregation queue to flush * + * Aggregates all OGMv2 packets currently in the aggregation queue into a + * single OGMv2 packet and transmits this aggregate. + * + * The aggregation queue is empty after this call. + * * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. */ static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) { + unsigned int aggr_len = hard_iface->bat_v.aggr_len; + struct sk_buff *skb_aggr; + unsigned int ogm_len; struct sk_buff *skb; lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + if (!aggr_len) + return; + + skb_aggr = dev_alloc_skb(aggr_len + ETH_HLEN + NET_IP_ALIGN); + if (!skb_aggr) { + batadv_v_ogm_aggr_list_free(hard_iface); + return; + } + + skb_reserve(skb_aggr, ETH_HLEN + NET_IP_ALIGN); + skb_reset_network_header(skb_aggr); + while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) { hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb); - batadv_v_ogm_send_to_if(skb, hard_iface); + + ogm_len = batadv_v_ogm_len(skb); + skb_put_data(skb_aggr, skb->data, ogm_len); + + consume_skb(skb); } + + batadv_v_ogm_send_to_if(skb_aggr, hard_iface); } /**

1 0

[batman-adv] master: batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues (2a5267fa)
by postmaster＠open-mesh.org 05 Aug '19

05 Aug '19

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 2a5267fa7490df26854c4ae68306bafe2818399f Author: Linus Lüssing <linus.luessing(a)c0d3.blue> Date: Sun Aug 4 20:54:53 2019 +0200 batman-adv: BATMAN_V: introduce per hard-iface OGMv2 queues In preparation for the OGMv2 packet aggregation, hold OGMv2 packets for up to BATADV_MAX_AGGREGATION_MS milliseconds (100ms) on per hard-interface queues, before transmitting. This allows us to later squash multiple OGMs into a single frame and transmission for reduced overhead. Signed-off-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2a5267fa7490df26854c4ae68306bafe2818399f net/batman-adv/bat_v.c | 7 +++ net/batman-adv/bat_v_ogm.c | 153 ++++++++++++++++++++++++++++++++++++++++++++- net/batman-adv/bat_v_ogm.h | 3 + net/batman-adv/types.h | 12 ++++ 4 files changed, 173 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v.c b/net/batman-adv/bat_v.c index 22672cb3..64054edc 100644 --- a/net/batman-adv/bat_v.c +++ b/net/batman-adv/bat_v.c @@ -79,6 +79,7 @@ static int batadv_v_iface_enable(struct batadv_hard_iface *hard_iface) static void batadv_v_iface_disable(struct batadv_hard_iface *hard_iface) { + batadv_v_ogm_iface_disable(hard_iface); batadv_v_elp_iface_disable(hard_iface); } @@ -1081,6 +1082,12 @@ void batadv_v_hardif_init(struct batadv_hard_iface *hard_iface) */ atomic_set(&hard_iface->bat_v.throughput_override, 0); atomic_set(&hard_iface->bat_v.elp_interval, 500); + + hard_iface->bat_v.aggr_len = 0; + skb_queue_head_init(&hard_iface->bat_v.aggr_list); + spin_lock_init(&hard_iface->bat_v.aggr_list_lock); + INIT_DELAYED_WORK(&hard_iface->bat_v.aggr_wq, + batadv_v_ogm_aggr_work); } /** diff --git a/net/batman-adv/bat_v_ogm.c b/net/batman-adv/bat_v_ogm.c index fad95ef6..52c990b5 100644 --- a/net/batman-adv/bat_v_ogm.c +++ b/net/batman-adv/bat_v_ogm.c @@ -17,12 +17,14 @@ #include <linux/kernel.h> #include <linux/kref.h> #include <linux/list.h> +#include <linux/lockdep.h> #include <linux/netdevice.h> #include <linux/random.h> #include <linux/rculist.h> #include <linux/rcupdate.h> #include <linux/skbuff.h> #include <linux/slab.h> +#include <linux/spinlock.h> #include <linux/stddef.h> #include <linux/string.h> #include <linux/types.h> @@ -77,6 +79,20 @@ struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv, } /** + * batadv_v_ogm_start_queue_timer() - restart the OGM aggregation timer + * @hard_iface: the interface to use to send the OGM + */ +static void batadv_v_ogm_start_queue_timer(struct batadv_hard_iface *hard_iface) +{ + unsigned int msecs = BATADV_MAX_AGGREGATION_MS * 1000; + + /* msecs * [0.9, 1.1] */ + msecs += prandom_u32() % (msecs / 5) - (msecs / 10); + queue_delayed_work(batadv_event_workqueue, &hard_iface->bat_v.aggr_wq, + msecs_to_jiffies(msecs / 1000)); +} + +/** * batadv_v_ogm_start_timer() - restart the OGM sending timer * @bat_priv: the bat priv with all the soft interface information */ @@ -116,6 +132,104 @@ static void batadv_v_ogm_send_to_if(struct sk_buff *skb, } /** + * batadv_v_ogm_len() - OGMv2 packet length + * @skb: the OGM to check + * + * Return: Length of the given OGMv2 packet, including tvlv length, excluding + * ethernet header length. + */ +static unsigned int batadv_v_ogm_len(struct sk_buff *skb) +{ + struct batadv_ogm2_packet *ogm_packet; + + ogm_packet = (struct batadv_ogm2_packet *)skb->data; + return BATADV_OGM2_HLEN + ntohs(ogm_packet->tvlv_len); +} + +/** + * batadv_v_ogm_queue_left() - check if given OGM still fits aggregation queue + * @skb: the OGM to check + * @hard_iface: the interface to use to send the OGM + * + * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + * + * Return: True, if the given OGMv2 packet still fits, false otherwise. + */ +static bool batadv_v_ogm_queue_left(struct sk_buff *skb, + struct batadv_hard_iface *hard_iface) +{ + unsigned int max = min_t(unsigned int, hard_iface->net_dev->mtu, + BATADV_MAX_AGGREGATION_BYTES); + unsigned int ogm_len = batadv_v_ogm_len(skb); + + lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + + return hard_iface->bat_v.aggr_len + ogm_len <= max; +} + +/** + * batadv_v_ogm_aggr_list_free - free all elements in an aggregation queue + * @hard_iface: the interface holding the aggregation queue + * + * Empties the OGMv2 aggregation queue and frees all the skbs it contained. + * + * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + */ +static void batadv_v_ogm_aggr_list_free(struct batadv_hard_iface *hard_iface) +{ + struct sk_buff *skb; + + lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + + while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) + kfree_skb(skb); + + hard_iface->bat_v.aggr_len = 0; +} + +/** + * batadv_v_ogm_aggr_send() - flush & send aggregation queue + * @hard_iface: the interface with the aggregation queue to flush + * + * Caller needs to hold the hard_iface->bat_v.aggr_list_lock. + */ +static void batadv_v_ogm_aggr_send(struct batadv_hard_iface *hard_iface) +{ + struct sk_buff *skb; + + lockdep_assert_held(&hard_iface->bat_v.aggr_list_lock); + + while ((skb = skb_dequeue(&hard_iface->bat_v.aggr_list))) { + hard_iface->bat_v.aggr_len -= batadv_v_ogm_len(skb); + batadv_v_ogm_send_to_if(skb, hard_iface); + } +} + +/** + * batadv_v_ogm_queue_on_if() - queue a batman ogm on a given interface + * @skb: the OGM to queue + * @hard_iface: the interface to queue the OGM on + */ +static void batadv_v_ogm_queue_on_if(struct sk_buff *skb, + struct batadv_hard_iface *hard_iface) +{ + struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + + if (!atomic_read(&bat_priv->aggregated_ogms)) { + batadv_v_ogm_send_to_if(skb, hard_iface); + return; + } + + spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + if (!batadv_v_ogm_queue_left(skb, hard_iface)) + batadv_v_ogm_aggr_send(hard_iface); + + hard_iface->bat_v.aggr_len += batadv_v_ogm_len(skb); + skb_queue_tail(&hard_iface->bat_v.aggr_list, skb); + spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); +} + +/** * batadv_v_ogm_send() - periodic worker broadcasting the own OGM * @work: work queue item */ @@ -210,7 +324,7 @@ static void batadv_v_ogm_send(struct work_struct *work) break; } - batadv_v_ogm_send_to_if(skb_tmp, hard_iface); + batadv_v_ogm_queue_on_if(skb_tmp, hard_iface); batadv_hardif_put(hard_iface); } rcu_read_unlock(); @@ -224,6 +338,27 @@ out: } /** + * batadv_v_ogm_aggr_work() - OGM queue periodic task per interface + * @work: work queue item + * + * Emits aggregated OGM message in regular intervals. + */ +void batadv_v_ogm_aggr_work(struct work_struct *work) +{ + struct batadv_hard_iface_bat_v *batv; + struct batadv_hard_iface *hard_iface; + + batv = container_of(work, struct batadv_hard_iface_bat_v, aggr_wq.work); + hard_iface = container_of(batv, struct batadv_hard_iface, bat_v); + + spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + batadv_v_ogm_aggr_send(hard_iface); + spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); + + batadv_v_ogm_start_queue_timer(hard_iface); +} + +/** * batadv_v_ogm_iface_enable() - prepare an interface for B.A.T.M.A.N. V * @hard_iface: the interface to prepare * @@ -235,12 +370,26 @@ int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface) { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); + batadv_v_ogm_start_queue_timer(hard_iface); batadv_v_ogm_start_timer(bat_priv); return 0; } /** + * batadv_v_ogm_iface_disable() - release OGM interface private resources + * @hard_iface: interface for which the resources have to be released + */ +void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface) +{ + cancel_delayed_work_sync(&hard_iface->bat_v.aggr_wq); + + spin_lock_bh(&hard_iface->bat_v.aggr_list_lock); + batadv_v_ogm_aggr_list_free(hard_iface); + spin_unlock_bh(&hard_iface->bat_v.aggr_list_lock); +} + +/** * batadv_v_ogm_primary_iface_set() - set a new primary interface * @primary_iface: the new primary interface */ @@ -382,7 +531,7 @@ static void batadv_v_ogm_forward(struct batadv_priv *bat_priv, if_outgoing->net_dev->name, ntohl(ogm_forward->throughput), ogm_forward->ttl, if_incoming->net_dev->name); - batadv_v_ogm_send_to_if(skb, if_outgoing); + batadv_v_ogm_queue_on_if(skb, if_outgoing); out: if (orig_ifinfo) diff --git a/net/batman-adv/bat_v_ogm.h b/net/batman-adv/bat_v_ogm.h index 2a50df7f..bf16d040 100644 --- a/net/batman-adv/bat_v_ogm.h +++ b/net/batman-adv/bat_v_ogm.h @@ -11,10 +11,13 @@ #include <linux/skbuff.h> #include <linux/types.h> +#include <linux/workqueue.h> int batadv_v_ogm_init(struct batadv_priv *bat_priv); void batadv_v_ogm_free(struct batadv_priv *bat_priv); +void batadv_v_ogm_aggr_work(struct work_struct *work); int batadv_v_ogm_iface_enable(struct batadv_hard_iface *hard_iface); +void batadv_v_ogm_iface_disable(struct batadv_hard_iface *hard_iface); struct batadv_orig_node *batadv_v_ogm_orig_get(struct batadv_priv *bat_priv, const u8 *addr); void batadv_v_ogm_primary_iface_set(struct batadv_hard_iface *primary_iface); diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h index 6ae139d7..be7c02aa 100644 --- a/net/batman-adv/types.h +++ b/net/batman-adv/types.h @@ -117,6 +117,18 @@ struct batadv_hard_iface_bat_v { /** @elp_wq: workqueue used to schedule ELP transmissions */ struct delayed_work elp_wq; + /** @aggr_wq: workqueue used to transmit queued OGM packets */ + struct delayed_work aggr_wq; + + /** @aggr_list: queue for to be aggregated OGM packets */ + struct sk_buff_head aggr_list; + + /** @aggr_len: size of the OGM aggregate (excluding ethernet header) */ + unsigned int aggr_len; + + /** @aggr_list_lock: protects aggr_list */ + spinlock_t aggr_list_lock; + /** * @throughput_override: throughput override to disable link * auto-detection

1 0

[alfred] master: alfred: vis: Fix ifindex check when registering interface (0e0fcc5)
by postmaster＠open-mesh.org 03 Aug '19

03 Aug '19

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 0e0fcc5bca8159ad5e96f8d8165afbbae5ec95a5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Aug 2 08:35:53 2019 +0200 alfred: vis: Fix ifindex check when registering interface The return value of if_nametoindex should be checked before the rtnl query is send to the kernel. Otherwise we might try to operate on an ifindex which doesn't exist in the kernel - which will never register any interface. Fixes: a34f044de561 ("alfred: vis: Use rtnl to query list of hardifs of meshif") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0e0fcc5bca8159ad5e96f8d8165afbbae5ec95a5 vis/vis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vis/vis.c b/vis/vis.c index 8df3056..cdc5524 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -617,7 +617,7 @@ static int register_interfaces(struct globals *globals) }; register_arg.ifindex = if_nametoindex(globals->interface); - if (!globals->interface) + if (!register_arg.ifindex) return EXIT_FAILURE;

1 0

[openwrt-feed-devel] master: alfred-devel: Allow startup without batman-adv sysfs support (fe0d26f)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit fe0d26f6d398d01395e44beb326dd76c0661e8d0 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Aug 1 21:22:21 2019 +0200 alfred-devel: Allow startup without batman-adv sysfs support The batman-adv kernel module can be build without sysfs support. This will stop the kernel module from creating the "mesh" directory. The alfred init script must not depend on this folder to start the daemon up. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- fe0d26f6d398d01395e44beb326dd76c0661e8d0 alfred-devel/files/alfred.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init index e5d2006..0c35e65 100755 --- a/alfred-devel/files/alfred.init +++ b/alfred-devel/files/alfred.init @@ -86,7 +86,7 @@ alfred_start() { append args "-b $batmanif" if [ "$batmanif" != "none" ]; then - wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh" + wait_for_dir "$batmanif" "/sys/devices/virtual/net/$batmanif" fi append alfred_args "$args"

1 0

[openwrt-feed-devel] master: alfred-devel: Support multiple listening interfaces (9016955)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 9016955b0b0ddd4209680ec50b14b5c9a916ecb4 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Aug 1 20:58:41 2019 +0200 alfred-devel: Support multiple listening interfaces The alfred daemon allows to be started with multiple interfaces. The first interface is used for communication and to calculate the source mac address. The rest of the interfaces are only used for communication. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 9016955b0b0ddd4209680ec50b14b5c9a916ecb4 alfred-devel/files/alfred.config | 2 +- alfred-devel/files/alfred.init | 17 +++++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/alfred-devel/files/alfred.config b/alfred-devel/files/alfred.config index 9d3fff6..704adf1 100644 --- a/alfred-devel/files/alfred.config +++ b/alfred-devel/files/alfred.config @@ -1,5 +1,5 @@ config 'alfred' 'alfred' - option interface 'br-lan' + list interface 'br-lan' option mode 'master' option batmanif 'bat0' option start_vis '1' diff --git a/alfred-devel/files/alfred.init b/alfred-devel/files/alfred.init index 89e33ab..e5d2006 100755 --- a/alfred-devel/files/alfred.init +++ b/alfred-devel/files/alfred.init @@ -54,10 +54,17 @@ wait_for_ll_address() { exit 1 } +append_interface() +{ + append "interfaces" "$1" "," + wait_for_ll_address "$1" +} + alfred_start() { local args="" local section="$1" local disabled interface mode + local interfaces # check if section is disabled config_get_bool disabled "$section" disabled 0 @@ -65,8 +72,12 @@ alfred_start() { args="" - config_get interface "$section" interface - append args "-i $interface" + config_list_foreach "$section" "interface" append_interface + if [ -z "$interfaces" ]; then + config_get interface "$section" interface + append_interface "$interface" + fi + append args "-i $interfaces" config_get mode "$section" mode [ "$mode" = "master" ] && append args "-m" @@ -78,8 +89,6 @@ alfred_start() { wait_for_dir "$batmanif" "/sys/class/net/$batmanif/mesh" fi - wait_for_ll_address "$interface" - append alfred_args "$args" enable=1

1 0

[openwrt-feed-devel] master: batman-adv-devel: Add support for hardif settings (5d7f3ca)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 5d7f3ca0fe11089326e57bd6099c71cbaace9877 Author: Sven Eckelmann <sven(a)narfation.org> Date: Sat Jun 15 09:25:05 2019 +0200 batman-adv-devel: Add support for hardif settings B.A.T.M.A.N. V support additional settings which are hardif specific. The batadv_hardif proto has to expose them to allow automatic configuration. The default configuration would be: config interface 'bat0_hardif_eth0' option proto 'batadv_hardif' option master 'bat0' option ifname 'eth0' option mtu '1536' option 'elp_interval' 500 # string like '1mbit' is accepted instead of kbit for override option 'throughput_override' '0' Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5d7f3ca0fe11089326e57bd6099c71cbaace9877 batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh index 9283d2b..76ccd81 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh @@ -7,21 +7,30 @@ } proto_batadv_hardif_init_config() { + proto_config_add_int 'elp_interval' proto_config_add_string "master" + proto_config_add_string 'throughput_override' } proto_batadv_hardif_setup() { local config="$1" local iface="$2" + local elp_interval local master + local throughput_override + json_get_vars elp_interval json_get_vars master + json_get_vars throughput_override ( proto_add_host_dependency "$config" '' "$master" ) batctl -m "$master" interface -M add "$iface" + [ -n "$elp_interval" ] && batctl -m "$master" hardif "$iface" elp_interval "$elp_interval" + [ -n "$throughput_override" ] && batctl -m "$master" hardif "$iface" throughput_override "$throughput_override" + proto_init_update "$iface" 1 proto_send_update "$config" }

1 0

[openwrt-feed-devel] master: batman-adv-devel: Switch proto scripts to new prefixes (5b65c88)
by postmaster＠open-mesh.org 01 Aug '19

01 Aug '19

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 5b65c88e9cb867b40df854c7f98f9c2853eb5273 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Aug 1 16:22:00 2019 +0200 batman-adv-devel: Switch proto scripts to new prefixes The '-m' option to select the mesh interface or vlan interfaces was replaced with device type specific subcommand prefixes: * meshif <netdev> * vlan <vdev> * meshif <netdev> vid <vid> * hardif <netdev> This change should also be made in the proto script to allow batctl to drop the support of '-m' completely in the future. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5b65c88e9cb867b40df854c7f98f9c2853eb5273 batman-adv-devel/files/lib/netifd/proto/batadv.sh | 40 +++++++++++----------- .../files/lib/netifd/proto/batadv_hardif.sh | 8 ++--- .../files/lib/netifd/proto/batadv_vlan.sh | 2 +- 3 files changed, 25 insertions(+), 25 deletions(-) diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv.sh b/batman-adv-devel/files/lib/netifd/proto/batadv.sh index a7fe63c..edc14f4 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv.sh @@ -72,42 +72,42 @@ proto_batadv_setup() { set_default routing_algo 'BATMAN_IV' batctl routing_algo "$routing_algo" - batctl -m "$iface" interface create + batctl meshif "$iface" interface create - [ -n "$aggregated_ogms" ] && batctl -m "$iface" aggregation "$aggregated_ogms" - [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation" - [ -n "$bonding" ] && batctl -m "$iface" bonding "$bonding" - [ -n "$bridge_loop_avoidance" ] && batctl -m "$iface" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- - [ -n "$distributed_arp_table" ] && batctl -m "$iface" distributed_arp_table "$distributed_arp_table" 2>&- - [ -n "$fragmentation" ] && batctl -m "$iface" fragmentation "$fragmentation" + [ -n "$aggregated_ogms" ] && batctl meshif "$iface" aggregation "$aggregated_ogms" + [ -n "$ap_isolation" ] && batctl meshif "$iface" ap_isolation "$ap_isolation" + [ -n "$bonding" ] && batctl meshif "$iface" bonding "$bonding" + [ -n "$bridge_loop_avoidance" ] && batctl meshif "$iface" bridge_loop_avoidance "$bridge_loop_avoidance" 2>&- + [ -n "$distributed_arp_table" ] && batctl meshif "$iface" distributed_arp_table "$distributed_arp_table" 2>&- + [ -n "$fragmentation" ] && batctl meshif "$iface" fragmentation "$fragmentation" case "$gw_mode" in server) if [ -n "$gw_bandwidth" ]; then - batctl -m "$iface" gw_mode "server" "$gw_bandwidth" + batctl meshif "$iface" gw_mode "server" "$gw_bandwidth" else - batctl -m "$iface" gw_mode "server" + batctl meshif "$iface" gw_mode "server" fi ;; client) if [ -n "$gw_sel_class" ]; then - batctl -m "$iface" gw_mode "client" "$gw_sel_class" + batctl meshif "$iface" gw_mode "client" "$gw_sel_class" else - batctl -m "$iface" gw_mode "client" + batctl meshif "$iface" gw_mode "client" fi ;; *) - batctl -m "$iface" gw_mode "off" + batctl meshif "$iface" gw_mode "off" ;; esac - [ -n "$hop_penalty" ] && batctl -m "$iface" hop_penalty "$hop_penalty" - [ -n "$isolation_mark" ] && batctl -m "$iface" isolation_mark "$isolation_mark" - [ -n "$multicast_fanout" ] && batctl -m "$iface" multicast_fanout "$multicast_fanout" - [ -n "$multicast_mode" ] && batctl -m "$iface" multicast_mode "$multicast_mode" 2>&- - [ -n "$network_coding" ] && batctl -m "$iface" network_coding "$network_coding" 2>&- - [ -n "$log_level" ] && batctl -m "$iface" loglevel "$log_level" 2>&- - [ -n "$orig_interval" ] && batctl -m "$iface" orig_interval "$orig_interval" + [ -n "$hop_penalty" ] && batctl meshif "$iface" hop_penalty "$hop_penalty" + [ -n "$isolation_mark" ] && batctl meshif "$iface" isolation_mark "$isolation_mark" + [ -n "$multicast_fanout" ] && batctl meshif "$iface" multicast_fanout "$multicast_fanout" + [ -n "$multicast_mode" ] && batctl meshif "$iface" multicast_mode "$multicast_mode" 2>&- + [ -n "$network_coding" ] && batctl meshif "$iface" network_coding "$network_coding" 2>&- + [ -n "$log_level" ] && batctl meshif "$iface" loglevel "$log_level" 2>&- + [ -n "$orig_interval" ] && batctl meshif "$iface" orig_interval "$orig_interval" proto_init_update "$iface" 1 proto_send_update "$config" @@ -117,7 +117,7 @@ proto_batadv_teardown() { local config="$1" local iface="$config" - batctl -m "$iface" interface destroy + batctl meshif "$iface" interface destroy } add_protocol batadv diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh index 76ccd81..6eb597f 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_hardif.sh @@ -26,10 +26,10 @@ proto_batadv_hardif_setup() { ( proto_add_host_dependency "$config" '' "$master" ) - batctl -m "$master" interface -M add "$iface" + batctl meshif "$master" interface -M add "$iface" - [ -n "$elp_interval" ] && batctl -m "$master" hardif "$iface" elp_interval "$elp_interval" - [ -n "$throughput_override" ] && batctl -m "$master" hardif "$iface" throughput_override "$throughput_override" + [ -n "$elp_interval" ] && batctl hardif "$iface" elp_interval "$elp_interval" + [ -n "$throughput_override" ] && batctl hardif "$iface" throughput_override "$throughput_override" proto_init_update "$iface" 1 proto_send_update "$config" @@ -43,7 +43,7 @@ proto_batadv_hardif_teardown() { json_get_vars master - batctl -m "$master" interface -M del "$iface" || true + batctl meshif "$master" interface -M del "$iface" || true } add_protocol batadv_hardif diff --git a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh index b4835f6..115e61c 100755 --- a/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh +++ b/batman-adv-devel/files/lib/netifd/proto/batadv_vlan.sh @@ -17,7 +17,7 @@ proto_batadv_vlan_setup() { json_get_vars ap_isolation - [ -n "$ap_isolation" ] && batctl -m "$iface" ap_isolation "$ap_isolation" + [ -n "$ap_isolation" ] && batctl vlan "$iface" ap_isolation "$ap_isolation" proto_init_update "$iface" 1 proto_send_update "$config" }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits