commits

commits@lists.open-mesh.org

1 participants
12421 discussions

[batman-adv] master: batman-adv: Use explicit tvlv padding for ELP packets (974337e)
by postmaster＠open-mesh.org 03 Nov '18

03 Nov '18

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 974337ee9773c4bd0a2d5c322306cf2bea445e11 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Oct 30 12:17:10 2018 +0100 batman-adv: Use explicit tvlv padding for ELP packets The announcement messages of batman-adv COMPAT_VERSION 15 have the possibility to announce additional information via a dynamic TVLV part. This part is optional for the ELP packets and currently not parsed by the Linux implementation. Still out-of-tree versions are using it to transport things like neighbor hashes to optimize the rebroadcast behavior. Since the ELP broadcast packets are smaller than the minimal ethernet packet, it often has to be padded. This is often done (as specified in RFC894) with octets of zero and thus work perfectly fine with the TVLV part (making it a zero length and thus empty). But not all ethernet compatible hardware seems to follow this advice. To avoid ambiguous situations when parsing the TVLV header, just force the 4 bytes (TVLV length + padding) after the required ELP header to zero. Fixes: a4b88af77e28 ("batman-adv: ELP - adding basic infrastructure") Reported-by: Linus Lüssing <linus.luessing(a)c0d3.blue> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 974337ee9773c4bd0a2d5c322306cf2bea445e11 net/batman-adv/bat_v_elp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/batman-adv/bat_v_elp.c b/net/batman-adv/bat_v_elp.c index 9f481cf..e8090f0 100644 --- a/net/batman-adv/bat_v_elp.c +++ b/net/batman-adv/bat_v_elp.c @@ -352,19 +352,21 @@ out: */ int batadv_v_elp_iface_enable(struct batadv_hard_iface *hard_iface) { + static const size_t tvlv_padding = sizeof(__be32); struct batadv_elp_packet *elp_packet; unsigned char *elp_buff; u32 random_seqno; size_t size; int res = -ENOMEM; - size = ETH_HLEN + NET_IP_ALIGN + BATADV_ELP_HLEN; + size = ETH_HLEN + NET_IP_ALIGN + BATADV_ELP_HLEN + tvlv_padding; hard_iface->bat_v.elp_skb = dev_alloc_skb(size); if (!hard_iface->bat_v.elp_skb) goto out; skb_reserve(hard_iface->bat_v.elp_skb, ETH_HLEN + NET_IP_ALIGN); - elp_buff = skb_put_zero(hard_iface->bat_v.elp_skb, BATADV_ELP_HLEN); + elp_buff = skb_put_zero(hard_iface->bat_v.elp_skb, + BATADV_ELP_HLEN + tvlv_padding); elp_packet = (struct batadv_elp_packet *)elp_buff; elp_packet->packet_type = BATADV_ELP;

1 0

[batctl] master: batctl: Fix minor typos in manpage (0a201c2)
by postmaster＠open-mesh.org 01 Nov '18

01 Nov '18

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 0a201c2a0bc3cc6ecf1917a9aed1ee2f3de00961 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 15 12:02:01 2018 +0200 batctl: Fix minor typos in manpage Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0a201c2a0bc3cc6ecf1917a9aed1ee2f3de00961 man/batctl.8 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/man/batctl.8 b/man/batctl.8 index d5fc530..3e21028 100644 --- a/man/batctl.8 +++ b/man/batctl.8 @@ -338,7 +338,7 @@ given batctl will not replace the MAC addresses with bat\-host names in the outp This command starts a throughput test entirely controlled by batman module in kernel space: the computational resources needed to align memory and copy data between user and kernel space that are required by other user space tools may -represent a bootleneck on some low profile device. +represent a bottleneck on some low profile device. The test consist of the transfer of 14 MB of data between the two nodes. The protocol used to transfer the data is somehow similar to TCP, but simpler: some @@ -346,9 +346,9 @@ TCP features are still missing, thus protocol performances could be worst. Since a fixed amount of data is transferred the experiment duration depends on the network conditions. The experiment can be interrupted with CTRL + C. At the end of a successful experiment the throughput in KBytes per second is returned, -togheter with the experiment duration in millisecond and the amount of bytes +together with the experiment duration in millisecond and the amount of bytes transferred. If too many packets are lost or the specified MAC address is not -reachable, a message notifing the error is returned instead of the result. +reachable, a message notifying the error is returned instead of the result. .RE .br .SH FILES

1 0

[alfred] master: alfred: Request MAC resolution for IPv4 address not in ARP cache (5610d5b)
by postmaster＠open-mesh.org 01 Nov '18

01 Nov '18

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 5610d5bf8f4447b4d689aede638b4e92ae343340 Author: Jonathan Haws <jhaws(a)sdl.usu.edu> Date: Mon Oct 29 11:57:59 2018 -0600 alfred: Request MAC resolution for IPv4 address not in ARP cache When using IPv4, if the remote server is not yet in the ARP cache, the MAC resolution will fail and data appear to not be shared via alfred. Add a routine (modified from batctl sources) to request MAC resolution by simply sending a datagram to the discard port (UDP/9). This adds the remote MAC to the ARP cache, resulting in successful MAC resolution. Fixes: c7da798113a2 ("alfred: IPv4 multicast distribution support.") Signed-off-by: Jonathan Haws <jhaws(a)sdl.usu.edu> Tested-by: Gary Zou <guohuizou2000(a)sina.com> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 5610d5bf8f4447b4d689aede638b4e92ae343340 util.c | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/util.c b/util.c index dd3f00f..0794792 100644 --- a/util.c +++ b/util.c @@ -30,6 +30,7 @@ #include <sys/ioctl.h> #include <sys/time.h> #include <time.h> +#include <unistd.h> #include "alfred.h" int time_diff(struct timespec *tv1, struct timespec *tv2, @@ -80,11 +81,35 @@ bool is_valid_ether_addr(uint8_t addr[ETH_ALEN]) return true; } +static void ipv4_request_mac_resolve(const alfred_addr *addr) +{ + const struct sockaddr *sockaddr; + struct sockaddr_in inet4; + size_t sockaddr_len; + int sock; + char t = 0; + + sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + if (sock < 0) + return; + + memset(&inet4, 0, sizeof(inet4)); + inet4.sin_family = AF_INET; + inet4.sin_port = htons(9); + inet4.sin_addr.s_addr = addr->ipv4.s_addr; + sockaddr = (const struct sockaddr *)&inet4; + sockaddr_len = sizeof(inet4); + + sendto(sock, &t, sizeof(t), 0, sockaddr, sockaddr_len); + close(sock); +} + int ipv4_arp_request(struct interface *interface, const alfred_addr *addr, struct ether_addr *mac) { struct arpreq arpreq; struct sockaddr_in *sin; + int retries = 1; memset(&arpreq, 0, sizeof(arpreq)); memset(mac, 0, ETH_ALEN); @@ -96,8 +121,13 @@ int ipv4_arp_request(struct interface *interface, const alfred_addr *addr, strncpy(arpreq.arp_dev, interface->interface, sizeof(arpreq.arp_dev)); arpreq.arp_dev[sizeof(arpreq.arp_dev) - 1] = '\0'; - if (ioctl(interface->netsock, SIOCGARP, &arpreq) < 0) - return -1; + while ((ioctl(interface->netsock, SIOCGARP, &arpreq) < 0) || !(arpreq.arp_flags & ATF_COM)) { + ipv4_request_mac_resolve(addr); + usleep(200000); + + if (retries-- == 0) + break; + } if (arpreq.arp_flags & ATF_COM) { memcpy(mac, arpreq.arp_ha.sa_data, sizeof(*mac));

1 0

[alfred] master: alfred: Fix detection of own packets for IPv4 mode (db842ed)
by postmaster＠open-mesh.org 30 Oct '18

30 Oct '18

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit db842ed210d00345619e0ebc45a4d0d840e0b7e5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 29 18:05:42 2018 +0100 alfred: Fix detection of own packets for IPv4 mode The incoming packet address is checked for a match against the local interface addresses to avoid processing its own packets. The IPv4 implementation used the same code but only initialized 4 of the 16 bytes of the address in the recv function. The interface initialization code in netsock_set_interfaces set all unused bytes to zero but recv_alfred_packet was modified to use 12 random bytes from the stack. Both functions must work the same way and first set the address bytes to zero and overwrite the actual used bytes with the address bytes. Otherwise, the result of netsock_set_interfaces for own packets is random in the IPv4 implementation. Fixes: c7da798113a2 ("alfred: IPv4 multicast distribution support.") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Tested-by: Jonathan Haws <jhaws(a)sdl.usu.edu> >--------------------------------------------------------------- db842ed210d00345619e0ebc45a4d0d840e0b7e5 recv.c | 1 + 1 file changed, 1 insertion(+) diff --git a/recv.c b/recv.c index 59d759c..5ff4bb5 100644 --- a/recv.c +++ b/recv.c @@ -416,6 +416,7 @@ int recv_alfred_packet(struct globals *globals, struct interface *interface, packet = (struct alfred_tlv *)buf; + memset(&alfred_source, 0, sizeof(alfred_source)); if (globals->ipv4mode) { memcpy(&alfred_source, &source4.sin_addr, sizeof(source4.sin_addr)); } else {

1 0

[openwrt-feed-devel] master: batctl-devel: Suppress "error" about missing VERSION (2a8c0fb)
by postmaster＠open-mesh.org 26 Oct '18

26 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 2a8c0fbc2ad850aabef8b63c5c0bf4564262eae1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Oct 26 09:15:57 2018 +0200 batctl-devel: Suppress "error" about missing VERSION The OpenWrt feeds script is trying to generate an index of packages and then prints an error (actually warning) that this package doesn't have a version. The version of the package is not known yet because the source for the package was not yet selected. To avoid that message, just set it to 0.0 when no other version information was specified. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 2a8c0fbc2ad850aabef8b63c5c0bf4564262eae1 batctl-devel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/batctl-devel/Makefile b/batctl-devel/Makefile index 4c0ba24..45d61f5 100644 --- a/batctl-devel/Makefile +++ b/batctl-devel/Makefile @@ -30,6 +30,8 @@ PKG_VERSION:=0.$(PKG_REV) endif PKG_LICENSE:=GPL-2.0 +PKG_REV?=0 +PKG_VERSION?=0.$(PKG_REV) include $(INCLUDE_DIR)/package.mk

1 0

[openwrt-feed-devel] master: alfred-devel: Suppress "error" about missing VERSION (0db1eb5)
by postmaster＠open-mesh.org 26 Oct '18

26 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit 0db1eb570c53aea89094ec5bd087415babf11cad Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Oct 26 09:15:57 2018 +0200 alfred-devel: Suppress "error" about missing VERSION The OpenWrt feeds script is trying to generate an index of packages and then prints an error (actually warning) that this package doesn't have a version. The version of the package is not known yet because the source for the package was not yet selected. To avoid that message, just set it to 0.0 when no other version information was specified. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 0db1eb570c53aea89094ec5bd087415babf11cad alfred-devel/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alfred-devel/Makefile b/alfred-devel/Makefile index f308bf7..75379bb 100644 --- a/alfred-devel/Makefile +++ b/alfred-devel/Makefile @@ -30,6 +30,8 @@ PKG_VERSION:=0.$(PKG_REV) endif PKG_LICENSE:=GPL-2.0 +PKG_REV?=0 +PKG_VERSION?=0.$(PKG_REV) include $(INCLUDE_DIR)/package.mk

1 0

[openwrt-feed-devel] master: batman-adv-devel: Re-add kmod-lib-crc16 back to dependency line (beed2bb)
by postmaster＠open-mesh.org 22 Oct '18

22 Oct '18

Repository : ssh://git@open-mesh.org/openwrt-feed-devel On branch : master >--------------------------------------------------------------- commit beed2bbdeae95f779a4f4a9229c21055087893d5 Author: Sven Eckelmann <sven(a)narfation.org> Date: Mon Oct 22 12:37:38 2018 +0200 batman-adv-devel: Re-add kmod-lib-crc16 back to dependency line The OpenWrt dependency builder cannot extract the crc16 dependency from the KMOD_BATMAN_ADV_BLA dependencies. They have to be specified directly in the OpenWrt Makefile's DEPENDS line to avoid error when BLA is enabled: Package kmod-batman-adv is missing dependencies for the following libraries: crc16.ko Reported-by: Lech Perczak <lech.perczak(a)gmail.com> Fixes: 0db66160aaab ("batman-adv: Sync config options with kernel Kconfig") Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- beed2bbdeae95f779a4f4a9229c21055087893d5 batman-adv-devel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0995507..7dd42b7 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -41,7 +41,7 @@ define KernelPackage/batman-adv-devel URL:=https://www.open-mesh.org/ MAINTAINER:=Simon Wunderlich <sw(a)simonwunderlich.de> SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc32c +kmod-cfg80211 + DEPENDS:=+BATMAN_ADV_DEVEL_BLA:kmod-lib-crc16 +kmod-lib-crc32c +kmod-cfg80211 TITLE:=B.A.T.M.A.N. Adv devel FILES:=$(PKG_BUILD_DIR)/net/batman-adv/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoProbe,batman-adv)

1 0

[linux-merge]linux integration; annotated tag, v4.19, created. v4.19
by postmaster＠open-mesh.org 22 Oct '18

22 Oct '18

The annotated tag, v4.19 has been created at 2241b8bcf2b5f1b01ebb1cbd1231bbbb72230064 (tag) tagging 84df9525b0c27f3ebc2ebb1864fa62a97fdedb7d (commit) replaces v4.19-rc8 tagged by Greg Kroah-Hartman on Mon Oct 22 07:47:45 2018 +0100 - Shortlog ------------------------------------------------------------ This is the 4.19 release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlvNcpEACgkQONu9yGCS aT42RRAAlRp5XBpxI2r4OJORxBKO/y0VHrqJaOKXnSBEoWxZln/Zp7vpXyNnPxlD 1wPsagUytcUkhPQTrrQNPcAqCLSjkrSnNieNiLmwvy96nYz59jPWG8EpUwSvmcWd CQWX4rjMUbYdFQ9dZxP3ak+Yd+YvBWP5Z6vl3DgMx5/OdPSOKdKsvTVUH1KFoibD 1B5bLCJoOpIFhbEw4mzejOehxPuMmkgJTGtmy7hwKBCe8YIPcfCE94xmjyNZzcmG z2BTyTkV64qrJ5A7BZgkT8J9XUD4ilsPbd/GLx0OIXPUFxKVtMmrimm2a2rvqP+p j538h4bwp24MRJIByHJ6n+3tuU8XcDBFRuVtScRhF1hUjOq8F+gkwbI0JeF9YzbD lklRufb4x7qykGlR6i+n8SlLBDnR/xPE144+HCJTTTaCNARLK2O+D2UL4aXHV/ai nyZc4gA0lvB8M9fN3c9oxnhO+qgE8zdoFIAkJMDItDMOO+1f18GoRsQQOCsrARox UvjDByE4gqDyOoWmpxRPUu2Dhd+ak2VrVYDAJhp/yRzIKe+06vhLgfOKUqEmOVCr c5NnGpChppmtfWIdBjjbdGThoFKVZOCxUAKCulAIzjhhDNlgvNWKUaCMg0nhkK4X 2AsOK9z6KNqBBDqQH70MiphW+/CpWlPYKQdUPyor+XBRbZcLXec= =9FSk -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v4.4.162, created. v4.4.162
by postmaster＠open-mesh.org 20 Oct '18

20 Oct '18

The annotated tag, v4.4.162 has been created at 8e4e887baceb2d9a8c897566bd3187e33a4306d3 (tag) tagging 24c2342b8e51ab3185e68470709904150a1e3ee0 (commit) replaces v4.4.157 tagged by Greg Kroah-Hartman on Sat Oct 20 09:52:38 2018 +0200 - Shortlog ------------------------------------------------------------ This is the 4.4.162 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAlvK3sYACgkQONu9yGCS aT6Qiw/+OxTScsntrhjtosUt2ZQxjZN4nuUQw57BId0lq/JLvUpOAjKJYCIC+O1t Pv8EbZvErpIYVIRN7/anlYVbmIvJj694eCmJXwS/bsYcgvJztEoYjgmJTbDwu2Nb /ZfyDWR+tc6tuPzFYe4qWKjpT9MO+RZKEE+ZiMWt1VuB8d5yRGBpGTy1NB8kbVCt VtlZ2K8UovD51wY8T5HGCny8DucL3pASunAgSftpssRfEWWhw1ftMWT1iNaaykki gAWLOZZdo2ChDjA0vFku2rJWcDdb5MTxLEuFuogjRxOnERqClLfabAoqaa2A9Afe gBeQeCOW0uMqX5BoqrQZKQY2cDbJrGjrBmDQ5dTt3ZTC1OzOE5x4mKGZbZXUa61X 8bhMEYt6kvzxoIwWdK7A+/B8gTYJhwYjRtssfeR4ViXGka8bDFnKAvTSIBo+74eB abNf06OReF/hnIEJkRNOmb8OPzPYDkvlEeZlRDVryzUGZUu2zSvwz8W21u+V86de og+tq15KvV+5wfiwpCs++SbNFl9RAVAyKdRicgeNXekf1FnEQM/bvhB6WOUWcbmy VT5RQjXu1lw+dhBlW7O0/qVihCG/UrgyabMh0rgwhS876evSxZWO9e5eHHDgcutq MHQYZwtDaL9dWIqTYF9NLvvl85YoboYc+7wydo4jvZYXxbQgsEo= =xW75 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.16.59, created. v3.16.59
by postmaster＠open-mesh.org 20 Oct '18

20 Oct '18

The annotated tag, v3.16.59 has been created at 46e4f02115610ae91eff62812092ec5129bdd8d4 (tag) tagging 58fb9b51d6c5061d772740965eb1ca2fc68aae7b (commit) replaces v3.16.57 tagged by Ben Hutchings on Wed Oct 3 04:10:13 2018 +0100 - Shortlog ------------------------------------------------------------ This is the 3.16.59 stable release -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAlu0MxUACgkQ57/I7JWG EQkUFRAAiJ5qo+WVDGHQ203Tnt9TBFOLPTDJQ0z3k1wSLhEU5p7jigknHp2dAcNA qdCSxEw6AACH0UcnS4+y4VoN4Zr0Pub/klsM7hluPlEJWPbSkpj4fkU9t+lx3OsM MTTs9J9YthaS6zLF3YZ7Kx51y8zQnLzMD8YDQey8rzt7QNtctmAK56RIG2LvxKMD ERlDNhNAalvFJiBh+rDtUz+GXQWQ0M7IdhUVLgmww5Sfdf0dSrZqZmFL7vbUvRCv JjAIK9QDwjMvHThDPLrUl42AHad79j74oDJOBAHe+i+UXjQbYobYAmlM3Tqf2N/B DHOpEQtm+F1w+wp9D3Jrb8h9mXdbxj369LtYdDn0bNy0YHlCtsg2RFMrJLVzEPSv HG0mOyP7t2qJAMltXIwAxtcvFZgMzI3ivwWAOj70Ge9p49otWj8CHb0q6RIVBpwB Gcmiefaz8DqcYPGdELp1XS/BNJCKz6xC0y3t+ir/gGAowvEqngpE812huQmSm+qK M0/18opsoe2PvVHI31D87bHs2fzolWst0qhSwE5I9K7lA/aiG0c5kMklbJwA8Zgc poXRJD0/TpUsPjN9VWHjIXw3EmERxyArItVMBGaBf/RBaQ9nYvu+/57vgkfHokJQ Z1Uf6ECkQc1Qs+5act4TEspTb0PeNiDsR8Acd2DodaizvGw2YdU= =YGQ6 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits