commits April 2014

commits@lists.open-mesh.org

1 participants
12 discussions

[linux-merge]linux integration; annotated tag, v3.15-rc3, created. v3.15-rc3
by postmaster＠open-mesh.org 28 Apr '14

28 Apr '14

The annotated tag, v3.15-rc3 has been created at 42cb88a8267096a0a1a05209dabf41a320555e4f (tag) tagging d1db0eea852497762cab43b905b879dfcd3b8987 (commit) replaces v3.15-rc2 tagged by Linus Torvalds on Sun Apr 27 19:29:38 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTXb0SAAoJEHm+PkMAQRiG8NMH/jEHRwZDBXEaXejrXOYu2Ipy Se0hWlZ6Npz/Ro6uatBu94DYJmlvqVZ9SWBC2ULyfxvDZ9ziwrd/OI/Y4A2JzrCp 3MnFZf+yIF54v3hv65fySjtFWSHvBKlUdyjxDS8NO10S20OPyb5+IC5Tz7gpoZ3m d3NrfFzBZwEdpji38nv3JHhFO04xM/kEuusrEUki0YWbHMlhDql0VGeD+o9S5Jir h3A5PHP/6kd3JAd4CX9yCYQ8Zxj/d9G0wOR48FPpidrZkp687AIWzoImrIrboOtM Ni5eEBWTjeD/Pt+unePcfg0eCAlFcB3XnrSd05FSUAmFlO6rpz08ipit8W5KOmI= =8f84 -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master's head updated: batctl: mark multicast-mode switch as potentially compiled out (2de97c6)
by postmaster＠open-mesh.org 21 Apr '14

21 Apr '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 2de97c6 batctl: mark multicast-mode switch as potentially compiled out

1 0

[batctl] next: batctl: mark multicast-mode switch as potentially compiled out (2de97c6)
by postmaster＠open-mesh.org 21 Apr '14

21 Apr '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 2de97c6d92e91ba7aad19b003d48e3e77f381b9b Author: Linus Lüssing <linus.luessing(a)web.de> Date: Mon Apr 21 04:13:22 2014 +0200 batctl: mark multicast-mode switch as potentially compiled out To give users an additional hint if the multicast feature is not compiled in, to let them know what they can do to change that. Signed-off-by: Linus Lüssing <linus.luessing(a)web.de> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 2de97c6d92e91ba7aad19b003d48e3e77f381b9b functions.c | 1 + 1 file changed, 1 insertion(+) diff --git a/functions.c b/functions.c index 117dcff..b9ccaff 100644 --- a/functions.c +++ b/functions.c @@ -63,6 +63,7 @@ const char *fs_compile_out_param[] = { batctl_settings[BATCTL_SETTINGS_BLA].sysfs_name, batctl_settings[BATCTL_SETTINGS_DAT].sysfs_name, batctl_settings[BATCTL_SETTINGS_NETWORK_CODING].sysfs_name, + batctl_settings[BATCTL_SETTINGS_MULTICAST_MODE].sysfs_name, batctl_debug_tables[BATCTL_TABLE_BLA_CLAIMS].debugfs_name, batctl_debug_tables[BATCTL_TABLE_BLA_BACKBONES].debugfs_name, batctl_debug_tables[BATCTL_TABLE_DAT].debugfs_name,

1 0

[linux-merge]linux integration; annotated tag, v3.15-rc2, created. v3.15-rc2
by postmaster＠open-mesh.org 20 Apr '14

20 Apr '14

The annotated tag, v3.15-rc2 has been created at eaede3609686fa034e9eb1c7928de40437817147 (tag) tagging a798c10faf62a505d24e5f6213fbaf904a39623f (commit) replaces v3.15-rc1 tagged by Linus Torvalds on Sun Apr 20 11:08:58 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15-rc2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTVA06AAoJEHm+PkMAQRiGRIcH/0m2BIuhlrco3VAdccc8Xs1f hDc4o9/OfN9nDsRVcFkIADHctgllHnMZu5pWREjxN6GdjUTJUECCXJh9976oCEql LPHem9q4J/JBB8kfwKAZ0N1CDvVKi3OrFTYQChT3eQI6unXm86AyGz1xo/QTyBf9 mdYYsB76BGnwzoZM8zbeW3FVhtfTyCng/c+Wwe2+DloOaXVQKEa5XMfhzDveTLV7 D7X41q8nk9d/13lInWsuMafYlTEMophlZyEZnyNrIciZBXH5zS0AHH0pOgef2Ux+ qEH40PeL4+ZQqtFR1H34VIAUzl2TbTWcPMoQGjbMGM1CtId5muK4diQMP143d/E= =b7Ir -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-alfred] master: alfred: integrate some fixes from Sven (ac4103f)
by postmaster＠open-mesh.org 17 Apr '14

17 Apr '14

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit ac4103f4b877e50dd886bb8c18915bde9a1cc7e7 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Apr 17 14:47:49 2014 +0200 alfred: integrate some fixes from Sven Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- ac4103f4b877e50dd886bb8c18915bde9a1cc7e7 alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index d2dd827..c54cc8a 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -12,8 +12,8 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=alfred PKG_VERSION:=2014.1.0 -PKG_RELEASE:=0 -PKG_REV:=8a423ebaa066d6855a5ab1a1540e5559b5fbc8ac +PKG_RELEASE:=1 +PKG_REV:=839cfd5b37b31575e8b64bb93c7f8d7fc3049aa2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE).tar.gz PKG_SOURCE_URL:=git://git.open-mesh.org/alfred.git

1 0

[alfred] master: alfred: Check for changed interface properties (839cfd5)
by postmaster＠open-mesh.org 17 Apr '14

17 Apr '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 839cfd5b37b31575e8b64bb93c7f8d7fc3049aa2 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Thu Apr 17 13:19:31 2014 +0200 alfred: Check for changed interface properties The interface may have been recreated or the mac address was changed. In this situations socket has to be recreated to avoid proplems with the link-local IPv6 address and the scope_id (interface id). These properties are polled and checked every 60 seconds and the appropriate measures are taken when an error/change occurs. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 839cfd5b37b31575e8b64bb93c7f8d7fc3049aa2 alfred.h | 3 +++ server.c | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/alfred.h b/alfred.h index ba2e416..e3b6d86 100644 --- a/alfred.h +++ b/alfred.h @@ -31,6 +31,7 @@ #include "packet.h" #define ALFRED_INTERVAL 10 +#define ALFRED_IF_CHECK_INTERVAL 60 #define ALFRED_REQUEST_TIMEOUT 10 #define ALFRED_SERVER_TIMEOUT 60 #define ALFRED_DATA_TIMEOUT 600 @@ -102,6 +103,8 @@ struct globals { int netsock; int unix_sock; + struct timespec if_check; + struct hashtable_t *server_hash; struct hashtable_t *data_hash; struct hashtable_t *transaction_hash; diff --git a/server.c b/server.c index fd8572b..fdd97d4 100644 --- a/server.c +++ b/server.c @@ -20,14 +20,19 @@ */ #include <errno.h> +#include <inttypes.h> #include <net/ethernet.h> +#include <net/if.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <sys/select.h> +#include <sys/socket.h> +#include <sys/ioctl.h> #include <sys/time.h> +#include <unistd.h> #include <time.h> #include "alfred.h" #include "batadv_query.h" @@ -212,6 +217,64 @@ static int purge_data(struct globals *globals) return 0; } +static void check_if_socket(struct globals *globals) +{ + struct timespec now, diff; + int sock; + struct ifreq ifr; + + clock_gettime(CLOCK_MONOTONIC, &now); + time_diff(&now, &globals->if_check, &diff); + + if (diff.tv_sec < ALFRED_IF_CHECK_INTERVAL) + return; + + globals->if_check = now; + + if (globals->netsock < 0) + return; + + sock = socket(PF_INET6, SOCK_DGRAM, 0); + if (sock < 0) { + fprintf(stderr, "can't open socket: %s\n", strerror(errno)); + return; + } + + memset(&ifr, 0, sizeof(ifr)); + strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { + fprintf(stderr, "can't get interface: %s, closing netsock\n", + strerror(errno)); + goto close; + } + + if (globals->scope_id != (uint32_t)ifr.ifr_ifindex) { + fprintf(stderr, + "iface index changed from %"PRIu32" to %d, closing netsock\n", + globals->scope_id, ifr.ifr_ifindex); + goto close; + } + + if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { + fprintf(stderr, "can't get MAC address: %s, closing netsock\n", + strerror(errno)); + goto close; + } + + if (memcmp(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6) != 0) { + fprintf(stderr, "iface mac changed, closing netsock\n"); + goto close; + } + + close(sock); + return; + +close: + netsock_close(globals->netsock); + globals->netsock = -1; + close(sock); +} + int alfred_server(struct globals *globals) { int maxsock, ret; @@ -237,6 +300,7 @@ int alfred_server(struct globals *globals) return -1; clock_gettime(CLOCK_MONOTONIC, &last_check); + globals->if_check = last_check; while (1) { clock_gettime(CLOCK_MONOTONIC, &now); @@ -297,6 +361,7 @@ int alfred_server(struct globals *globals) push_local_data(globals); } purge_data(globals); + check_if_socket(globals); } if (globals->netsock >= 0)

1 0

[alfred] master: alfred: Handle EPERM on every sendto (fcd4b0a)
by postmaster＠open-mesh.org 17 Apr '14

17 Apr '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit fcd4b0a71b265b2e3dfea88f495c6f9279344add Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Thu Apr 17 13:19:30 2014 +0200 alfred: Handle EPERM on every sendto The announcements are currently only sent by alfred instances in master mode. Slave instances don't announce themself and thus don't detect the broken socket. To also catch such problems, it is useful to handle the detection of EPERM during the send in send_alfred_packet which is always called when a link-local UDP packet is send over the network. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- fcd4b0a71b265b2e3dfea88f495c6f9279344add send.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/send.c b/send.c index 89e9c07..dc0e428 100644 --- a/send.c +++ b/send.c @@ -32,7 +32,6 @@ int announce_master(struct globals *globals) { - ssize_t ret; struct alfred_announce_master_v0 announcement; if (globals->netsock < 0) @@ -42,14 +41,8 @@ int announce_master(struct globals *globals) announcement.header.version = ALFRED_VERSION; announcement.header.length = htons(0); - ret = send_alfred_packet(globals, &in6addr_localmcast, &announcement, - sizeof(announcement)); - if (ret == -EPERM) { - fprintf(stderr, "Error during announcement\n"); - netsock_close(globals->netsock); - globals->netsock = -1; - } - + send_alfred_packet(globals, &in6addr_localmcast, &announcement, + sizeof(announcement)); return 0; } @@ -176,6 +169,11 @@ ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, ret = sendto(globals->netsock, buf, length, 0, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); + if (ret == -EPERM) { + fprintf(stderr, "Error during sent\n"); + netsock_close(globals->netsock); + globals->netsock = -1; + } return ret; }

1 0

[linux-merge]linux integration; annotated tag, v3.15-rc1, created. v3.15-rc1
by postmaster＠open-mesh.org 14 Apr '14

14 Apr '14

The annotated tag, v3.15-rc1 has been created at 8e3557db5cb41a5f92cd3535c48a553376614b8d (tag) tagging c9eaa447e77efe77b7fa4c953bd62de8297fd6c5 (commit) replaces batman-adv-for-davem tagged by Linus Torvalds on Sun Apr 13 14:18:53 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.15-rc1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJTSv89AAoJEHm+PkMAQRiGd7AIAKL45dFRhX96W53uzGlpXtv7 Ecs9CMY5mtsB/rqtV/NSQaUELlNb4Ilb4lITh7NaLWAZxDJ12GwVsIbFoaBj7Ypx tfBNNxffGGnTTn2C1PpPQmLytLBvqXIVHMaPpDvnHYJl6g9BihshLzyMrsrizqnA DPJ0xMdgGp6BLC4qm0ZH1mS2q+TyXLN2ZCjJ1lp6NNYwBnwOe/ABjnUa0Ztu7aii 837N8h6nEuKHTr6DgrYHEgYVc3DPHPHaly/UJ8v4U30myzRv83YkD5DsBSUjSLj8 CzxJEnECa1XljLJK7SjRHy5pSP9tcUlmjx3Fk7IpQixmT+A15cov6fQ967jNlDw= =Hxnc -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[batctl] master's head updated: Merge branch 'maint' into next (2be41b6)
by postmaster＠open-mesh.org 06 Apr '14

06 Apr '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 06aff32 batctl: Start new development cycle 079de00 Merge remote-tracking branch 'origin/next' f08a28d batctl: tcpdump - fix IP header parsing 2be41b6 Merge branch 'maint' into next

1 0

[batctl] next's head updated: Merge branch 'maint' into next (2be41b6)
by postmaster＠open-mesh.org 06 Apr '14

06 Apr '14

Repository : ssh://git@open-mesh.org/batctl Branch 'next' now includes: f08a28d batctl: tcpdump - fix IP header parsing 2be41b6 Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits April 2014