commits April 2018

commits@lists.open-mesh.org

1 participants
27 discussions

[alfred] master: alfred: Start new development cycle (a23558e)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit a23558e81880681541f4d3fc7736fd29a8da1522 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Apr 25 18:40:09 2018 +0200 alfred: Start new development cycle Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- a23558e81880681541f4d3fc7736fd29a8da1522 CHANGELOG.rst | 5 +++++ alfred.h | 2 +- gpsd/alfred-gpsd.h | 2 +- vis/vis.h | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 9fce8c5..06a60ce 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,10 @@ .. SPDX-License-Identifier: GPL-2.0 +2018.1 (2018-04-25) +=================== + +* synchronization of batman-adv netlink header + 2018.0 (2018-02-26) =================== diff --git a/alfred.h b/alfred.h index d7194c6..9af4424 100644 --- a/alfred.h +++ b/alfred.h @@ -21,7 +21,7 @@ */ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.1" +#define SOURCE_VERSION "2018.2" #endif #include <net/ethernet.h> diff --git a/gpsd/alfred-gpsd.h b/gpsd/alfred-gpsd.h index 535d953..044f72d 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.1" +#define SOURCE_VERSION "2018.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock" diff --git a/vis/vis.h b/vis/vis.h index b0c6521..0169688 100644 --- a/vis/vis.h +++ b/vis/vis.h @@ -28,7 +28,7 @@ #ifndef SOURCE_VERSION -#define SOURCE_VERSION "2018.1" +#define SOURCE_VERSION "2018.2" #endif #define ALFRED_SOCK_PATH_DEFAULT "/var/run/alfred.sock"

4 years, 11 months

[linux-merge]linux integration; annotated tag, v4.17-rc2, created. v4.17-rc2

by postmaster＠open-mesh.org

The annotated tag, v4.17-rc2 has been created at 2010cd502831cd3e64db447fd892821446d92d0a (tag) tagging 6d08b06e67cd117f6992c46611dfb4ce267cd71e (commit) replaces v4.17-rc1 tagged by Linus Torvalds on Sun Apr 22 19:20:30 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.17-rc2 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlrdQu4eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGVjEIAJqS+sFJCAL8rNAv tiVJHuAjogVdZGJJFBUWyb4yNZw7nRSKfitaSe875WdF55IGEhnMDbAGe7IMEb5j 1F8Ml2bzJzMWxfBWAzeU+wj6FaQksbIsI1gVM8tqk/Wtu121pB32VW8R82oHg+Hr sjsFTKFicNsqih+7QTVujaRjSmabKf0/JdyYM6p1cqWrxZQ0pmFaGDu0rwet9PFx lJsewOmnoZ0GV/Qzn40E304Xf+Vv2gVDVbC5wY86ejNigFt+5qN+gtDqDu7UkftR ZfD4vJuiKCigNfUrpbJWfpbegBiQc0JMvjLWWhgo/AYdGhNGMlwjQanh2oZcXlrw VmrNduo= =/j3z -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

4 years, 11 months

[batctl] master: batctl: Don't translate multicast and zero mac addresses (70968bb)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 70968bb67d4da6f3c9349697a702dda4d2a8a166 Author: Sven Eckelmann <sven(a)narfation.org> Date: Thu Apr 19 20:14:20 2018 +0200 batctl: Don't translate multicast and zero mac addresses The IP to mac translation code already skips zero and multicast mac addressses because there might be multiple entries in the global translation table which would match this entry. There is no "best" entry originator for such an entry and such the result is basically a random pick. Translating such an input mac address (from ping/traceoute/translate) to a single originator address is therefore not appropriate. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> >--------------------------------------------------------------- 70968bb67d4da6f3c9349697a702dda4d2a8a166 functions.c | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/functions.c b/functions.c index 3c340a2..e0e9978 100644 --- a/functions.c +++ b/functions.c @@ -194,6 +194,19 @@ static int str_is_mcast_addr(char *addr) mac_addr->ether_addr_octet[0] & 0x01; } +static bool ether_addr_valid(const uint8_t *addr) +{ + /* no multicast address */ + if (addr[0] & 0x01) + return false; + + /* no zero address */ + if ((addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]) == 0) + return false; + + return true; +} + int read_file(const char *dir, const char *fname, int read_opt, float orig_timeout, float watch_interval, size_t header_lines) { @@ -475,6 +488,9 @@ struct ether_addr *translate_mac(const char *mesh_iface, memcpy(&out_mac, mac, sizeof(out_mac)); mac_result = &out_mac; + if (!ether_addr_valid(in_mac.ether_addr_octet)) + return mac_result; + ret = translate_mac_netlink(mesh_iface, &in_mac, mac_result); if (ret == -EOPNOTSUPP) @@ -571,19 +587,6 @@ static struct nla_policy neigh_policy[NDA_MAX+1] = { [NDA_PROBES] = { .type = NLA_U32 }, }; -static bool ether_addr_valid(const uint8_t *addr) -{ - /* no multicast address */ - if (addr[0] & 0x01) - return false; - - /* no zero address */ - if ((addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]) == 0) - return false; - - return true; -} - static int resolve_mac_from_parse(struct nl_msg *msg, void *arg) { struct nlattr *tb[NDA_MAX + 1];

4 years, 11 months

[batctl] master: batctl: Validate translated mac addresses (9f22e3d)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 9f22e3d0ed2a3d83479f3db3b570f49218024249 Author: Sven Eckelmann <sven(a)narfation.org> Date: Fri Apr 13 20:16:18 2018 +0200 batctl: Validate translated mac addresses The IP translation layer is using the neighbor table of the kernel to get the unicast link layer (mac) address for IP(v4|v6) addresses. The kernel can not only return unicast mac addresses to such an RTM_GETNEIGH request but also zero mac address. Such an address must be considered invalid because the global translation table may not only contain a unique client mac address entry for it. The translation from client mac to originator will therefore most likely return an unexpected originator. Dropping these kind of (bogus) results avoids confusions while using things like batctl's ping or traceroute. Reported-by: Andre Kasper <Andre.Kasper(a)gmx.de> Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Acked-by: Antonio Quartulli <a(a)unstable.cc> >--------------------------------------------------------------- 9f22e3d0ed2a3d83479f3db3b570f49218024249 functions.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/functions.c b/functions.c index cd92b60..3c340a2 100644 --- a/functions.c +++ b/functions.c @@ -571,6 +571,19 @@ static struct nla_policy neigh_policy[NDA_MAX+1] = { [NDA_PROBES] = { .type = NLA_U32 }, }; +static bool ether_addr_valid(const uint8_t *addr) +{ + /* no multicast address */ + if (addr[0] & 0x01) + return false; + + /* no zero address */ + if ((addr[0] | addr[1] | addr[2] | addr[3] | addr[4] | addr[5]) == 0) + return false; + + return true; +} + static int resolve_mac_from_parse(struct nl_msg *msg, void *arg) { struct nlattr *tb[NDA_MAX + 1]; @@ -616,6 +629,9 @@ static int resolve_mac_from_parse(struct nl_msg *msg, void *arg) mac = nla_data(tb[NDA_LLADDR]); l3addr = nla_data(tb[NDA_DST]); + if (!ether_addr_valid(mac)) + goto err; + if (memcmp(nl_arg->l3addr, l3addr, l3_len) == 0) { memcpy(nl_arg->mac_result, mac, ETH_ALEN); nl_arg->found = 1;

4 years, 11 months

[linux-merge]linux integration; annotated tag, v4.17-rc1, created. v4.17-rc1

by postmaster＠open-mesh.org

The annotated tag, v4.17-rc1 has been created at a79c33a10ce2764c62fb8af6cbb571752d55c1c0 (tag) tagging 60cc43fc888428bb2f18f08997432d426a243338 (commit) replaces v4.16 tagged by Linus Torvalds on Sun Apr 15 18:24:29 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.17-rc1 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlrT+00eHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGA0QH/RGgG0DdtcbI0Pfo qJy1Qlu/R4X70UNcdyr8hZGvlKAw53IjJa/TUiM+YI0FxMvS8SlPZ1Or4HIHGxmM QO1fpzBoCt5x+KF35q7L85XdcfWRJgxfC7Pi2zeZea529jZmieRj7CAl6e0IQVdv 7cLBp2BpmW4LHKVQulZHs/FDg8kfc4m8h8Y6+IvZTwQWMBmNBZxUxFnmcciEZed/ FqWTjb0jp6RQKBs3mg55HSH65+5KWaib45hPHait4GMVBr1zyCR3HEBcUNIZU+Hg RrKyJnW7/Dosb02lmy1ibEnnTkNUZskRk5FRZ5VJwmCvkJw5wURS19hwG38/iUgn 0mhVolg= =ZSod -----END PGP SIGNATURE----- David S. Miller (4): Merge git://git.kernel.org/.../davem/net Merge tag 'batadv-next-for-davem-20180319' of git://git.open-mesh.org/linux-merge Merge git://git.kernel.org/.../davem/net Merge git://git.kernel.org/.../davem/net Linus Lüssing (3): batman-adv: Avoid redundant multicast TT entries batman-adv: add DAT cache netlink support batman-adv: add multicast flags netlink support Simon Wunderlich (1): batman-adv: Start new development cycle Sven Eckelmann (3): batman-adv: Update copyright years for 2018 batman-adv: Fix indentation of batadv_seq_before batman-adv: Avoid relation operator comparison with bool ----------------------------------------------------------------------- -- linux integration

4 years, 11 months

[linux-merge]linux integration; annotated tag, batadv-net-for-davem-20180326, deleted. v4.16-rc1-14-ga752c0a45248

by postmaster＠open-mesh.org

The annotated tag, batadv-net-for-davem-20180326 has been deleted was ec5e423ff91779c32f7b1771bc115fef0ea737e1 ----------------------------------------------------------------------- tag batadv-net-for-davem-20180326 Here are some batman-adv bugfixes: - fix multicast-via-unicast transmissions for AP isolation and gateway extension, by Linus Luessing (2 patches) -----BEGIN PGP SIGNATURE----- iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAlq466kWHHN3QHNpbW9u d3VuZGVybGljaC5kZQAKCRChK+OYQpKeobv5EACwz70r21xIUxwq6FWXysTfxxXt H3qcXt2BzCaGYKmYt8xqz9z368v7wpgCsPfZsvW2eBYhcpCkGQm6PR2XNy7WMoBz 6aFO4SDDi5L/S+5O0iXg79niRiTe9lCbOl/r6uv/2FtY22rIfhocFwkBL8cjIC3E hOWuFUbk3mAu8i+WMyhfDEUL33oy9CMvlJqaxqJuTHf3HxjOeGVjusOvSbQu+OGG K+TCAbIjazQ02R9p6lXQoIAjfg+kfsYIdT84MTgjk91qCtp1ztRxr3MNAwTgPvA4 Vi4uZGLbLCMvaAF1wqVBSuOnFFwbUCc8IBIoUvvZSMQTYm3agcg96pFLMYqNzrhY aHco1neJ+a+pGUmByijmYbsrJI2dYqK0V0OZlLG9WKwkrE3Y023LGGdXUbdl4RhS LXqMLGVJ9eqV+m7MCuv/q/PTVOL89loAun0DuIU4IhJuDM2+5yEG5jBiI6ImIym+ KX3F9F9nyefr5aCYsd14izX6WHxTXkJQaVpjVNBP56P6eZMLMx81eozBD9eotFyv A1EgQolLFEKWmtKU2KUK+qrGFNXaLlc9z8ZGkbizi/CTEjN0tr1UjW6B6toOOoZ+ fhF3HwlpgqVOdDodT+eDtxY8YboZBCpAnAOiE1LP3leVY4yab23Q02kskOPTPg1G CfpZwDjXIyZburUvfA== =j2w0 -----END PGP SIGNATURE----- a752c0a4524889cdc0765925258fd1fd72344100 batman-adv: fix packet loss for broadcasted DHCP packets to a server ----------------------------------------------------------------------- -- linux integration

4 years, 11 months

[linux-merge]linux integration; annotated tag, v4.16, created. v4.16

by postmaster＠open-mesh.org

The annotated tag, v4.16 has been created at 3fb78e8be9d9428fbc4c016f8b031b01a6fdd63d (tag) tagging 0adb32858b0bddf4ada5f364a84ed60b196dbcda (commit) replaces v4.16-rc7 tagged by Linus Torvalds on Sun Apr 1 14:20:37 2018 -0700 - Shortlog ------------------------------------------------------------ Linux 4.16 -----BEGIN PGP SIGNATURE----- iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAlrBTSUeHHRvcnZhbGRz QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGCysH/260s3b9rxjrtd4B gZHYScFFdrQzRWqyBv2rlyDbqJ1dIjM6GmnsLhM5cu+MNSfLxO4UJHg/1DlcCbO5 0p/+XQQiT021C2/ZY+T28yqb+7cSubWVZiuGlhVfZ/uydYcG8Vdtw1VmjuLhWJgT bHGjDOL/cBo8IgQzbOLrVFYC4j/LgPMoiELzg0Bu/oWkaNVfPqJYU0vbQDE8gXN8 wJJ0CdDxdu0LC5eeQjb/oh4iFgwZBsZucuU8kKrhaferqdJ1Fdad4ll8usHrFd3g MrdSnTvdkCTidHFBtKWpFhFlxpTelgheBnu68VfL/mG8LPWgiL8Y5asHi6zQTyMn +Eii2pk= =tMYZ -----END PGP SIGNATURE----- Linus Lüssing (2): batman-adv: fix multicast-via-unicast transmission with AP isolation batman-adv: fix packet loss for broadcasted DHCP packets to a server ----------------------------------------------------------------------- -- linux integration

4 years, 11 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2018