commits October 2013

commits@lists.open-mesh.org

1 participants
109 discussions

[alfred] master: alfred: Don't access netsock when it is invalid (87c1916)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 87c191694383ec45e45ff97654061bac9c71ed6d Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:10 2013 +0200 alfred: Don't access netsock when it is invalid Alfred currently doesn't invalidate the netsock but it could happen in future changes. Accessing it in an invalid state would otherwise cause the program to crash or behave unexpected. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 87c191694383ec45e45ff97654061bac9c71ed6d recv.c | 3 +++ send.c | 3 +++ server.c | 19 ++++++++++++------- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/recv.c b/recv.c index 5ed4a62..b755681 100644 --- a/recv.c +++ b/recv.c @@ -378,6 +378,9 @@ int recv_alfred_packet(struct globals *globals) struct sockaddr_in6 source; socklen_t sourcelen; + if (globals->netsock < 0) + return -1; + sourcelen = sizeof(source); length = recvfrom(globals->netsock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); diff --git a/send.c b/send.c index 607afa1..603e84a 100644 --- a/send.c +++ b/send.c @@ -158,6 +158,9 @@ int send_alfred_packet(struct globals *globals, const struct in6_addr *dest, dest_addr.sin6_scope_id = globals->scope_id; memcpy(&dest_addr.sin6_addr, dest, sizeof(*dest)); + if (globals->netsock < 0) + return 0; + ret = sendto(globals->netsock, buf, length, 0, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); diff --git a/server.c b/server.c index 0d8e6c8..6864c1d 100644 --- a/server.c +++ b/server.c @@ -236,10 +236,6 @@ int alfred_server(struct globals *globals) if (netsock_open(globals)) return -1; - maxsock = globals->netsock; - if (globals->unix_sock > maxsock) - maxsock = globals->unix_sock; - clock_gettime(CLOCK_MONOTONIC, &last_check); while (1) { @@ -250,9 +246,16 @@ int alfred_server(struct globals *globals) tv.tv_nsec = 0; } + maxsock = -1; + if (globals->netsock > maxsock) + maxsock = globals->netsock; + if (globals->unix_sock > maxsock) + maxsock = globals->unix_sock; + FD_ZERO(&fds); FD_SET(globals->unix_sock, &fds); - FD_SET(globals->netsock, &fds); + if (globals->netsock >= 0) + FD_SET(globals->netsock, &fds); ret = pselect(maxsock + 1, &fds, NULL, NULL, &tv, NULL); if (ret == -1) { @@ -263,7 +266,8 @@ int alfred_server(struct globals *globals) printf("read unix socket\n"); unix_sock_read(globals); continue; - } else if (FD_ISSET(globals->netsock, &fds)) { + } else if (globals->netsock >= 0 && + FD_ISSET(globals->netsock, &fds)) { recv_alfred_packet(globals); continue; } @@ -282,7 +286,8 @@ int alfred_server(struct globals *globals) purge_data(globals); } - netsock_close(globals->netsock); + if (globals->netsock >= 0) + netsock_close(globals->netsock); unix_sock_close(globals); return 0; }

1 0

[alfred] master: alfred: Try to reinitialize invalid netsock (65d26ca)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 65d26cae04b75d029d6686bdee30de92cbee70e7 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:13 2013 +0200 alfred: Try to reinitialize invalid netsock Alfred needs to recover when the netsock became invalid. Otherwise it is incapable of communicating with other alfred instances. This recovery can fail until the used interface reappeared. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 65d26cae04b75d029d6686bdee30de92cbee70e7 server.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server.c b/server.c index bc3b551..ed04f70 100644 --- a/server.c +++ b/server.c @@ -246,6 +246,9 @@ int alfred_server(struct globals *globals) tv.tv_nsec = 0; } + if (globals->netsock < 0) + netsock_open(globals); + maxsock = -1; if (globals->netsock > maxsock) maxsock = globals->netsock;

1 0

[alfred] master: alfred: Handle failed announcement as netsock error (1b79312)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 1b793120c545d335c6bd3f06a804d4f8d8c918dc Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:12 2013 +0200 alfred: Handle failed announcement as netsock error An error detected by select doesn't include a missing/down device or other things which prevent sending. Detecting these can be done by checking -EPERM of a send like the announcment. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 1b793120c545d335c6bd3f06a804d4f8d8c918dc alfred.h | 4 ++-- send.c | 24 ++++++++++++++++++------ 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/alfred.h b/alfred.h index e931b1b..0b7a5ab 100644 --- a/alfred.h +++ b/alfred.h @@ -137,8 +137,8 @@ int push_data(struct globals *globals, struct in6_addr *destination, int announce_master(struct globals *globals); int push_local_data(struct globals *globals); int sync_data(struct globals *globals); -int send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length); +ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, + void *buf, int length); /* unix_sock.c */ int unix_sock_read(struct globals *globals); int unix_sock_open_daemon(struct globals *globals, const char *path); diff --git a/send.c b/send.c index 603e84a..85d1234 100644 --- a/send.c +++ b/send.c @@ -24,20 +24,32 @@ #include <stdint.h> #include <string.h> #include <sys/socket.h> +#include <errno.h> +#include <stdio.h> #include "alfred.h" #include "hash.h" #include "packet.h" int announce_master(struct globals *globals) { + ssize_t ret; struct alfred_announce_master_v0 announcement; + if (globals->netsock < 0) + return -1; + announcement.header.type = ALFRED_ANNOUNCE_MASTER; announcement.header.version = ALFRED_VERSION; announcement.header.length = htons(0); - send_alfred_packet(globals, &in6addr_localmcast, &announcement, - sizeof(announcement)); + 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; + } + return 0; } @@ -146,10 +158,10 @@ int push_local_data(struct globals *globals) return 0; } -int send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length) +ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, + void *buf, int length) { - int ret; + ssize_t ret; struct sockaddr_in6 dest_addr; memset(&dest_addr, 0, sizeof(dest_addr)); @@ -165,5 +177,5 @@ int send_alfred_packet(struct globals *globals, const struct in6_addr *dest, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); - return (ret == length); + return ret; }

1 0

[alfred] master: alfred: Fix the list email address in the README. (dd15f47)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit dd15f476161138848b376a990a749d7992508b67 Author: Andrew Lunn <andrew(a)lunn.ch> Date: Tue Oct 1 22:22:40 2013 +0200 alfred: Fix the list email address in the README. The address is wrong, missing the hostname. Signed-off-by: Andrew Lunn <andrew(a)lunn.ch> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- dd15f476161138848b376a990a749d7992508b67 README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 50c36ad..4706bf5 100644 --- a/README +++ b/README @@ -188,7 +188,7 @@ As alfred was developed to help on batman-adv, we share communication channels. Please send us comments, experiences, questions, anything :) IRC: #batman on irc.freenode.org -Mailing-list: b.a.t.m.a.n(a)open-mesh.org (optional subscription +Mailing-list: b.a.t.m.a.n(a)lists.open-mesh.org (optional subscription at https://lists.open-mesh.org/mm/listinfo/b.a.t.m.a.n) If you have test reports/patches/ideas, please read the wiki for further instruction

1 0

[alfred] master: alfred: Close netsock when initialization failed (785bc8b)
by postmaster＠open-mesh.org 03 Oct '13

03 Oct '13

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 785bc8b81cf5104b5179a990b288c15560081d3e Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Tue Oct 1 14:02:09 2013 +0200 alfred: Close netsock when initialization failed A failed initialization of the netsock is currently not cleaning up the socket. This is not problematic at the moment because a failed initialization also closes the server. This can be a problem later when the netsock is reopened with a modified configuration and a failed re-initialization is still accepted. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 785bc8b81cf5104b5179a990b288c15560081d3e netsock.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/netsock.c b/netsock.c index 39281af..bed62e9 100644 --- a/netsock.c +++ b/netsock.c @@ -49,6 +49,8 @@ int netsock_open(struct globals *globals) struct sockaddr_in6 sin6; struct ifreq ifr; + globals->netsock = -1; + sock = socket(PF_INET6, SOCK_DGRAM, 0); if (sock < 0) { fprintf(stderr, "can't open socket: %s\n", strerror(errno)); @@ -59,7 +61,7 @@ int netsock_open(struct globals *globals) strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { fprintf(stderr, "can't get interface: %s\n", strerror(errno)); - return -1; + goto err; } globals->scope_id = ifr.ifr_ifindex; @@ -72,7 +74,7 @@ int netsock_open(struct globals *globals) if (ioctl(sock, SIOCGIFHWADDR, &ifr) == -1) { fprintf(stderr, "can't get MAC address: %s\n", strerror(errno)); - return -1; + goto err; } memcpy(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); @@ -80,16 +82,19 @@ int netsock_open(struct globals *globals) if (ioctl(sock, SIOCGIFMTU, &ifr) == -1) { fprintf(stderr, "can't get MTU: %s\n", strerror(errno)); - return -1; + goto err; } if (bind(sock, (struct sockaddr *)&sin6, sizeof(sin6)) < 0) { fprintf(stderr, "can't bind\n"); - return -1; + goto err; } fcntl(sock, F_SETFL, fcntl(sock, F_GETFL, 0) | O_NONBLOCK); globals->netsock = sock; return 0; +err: + close(sock); + return -1; }

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, updated. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 02 Oct '13

02 Oct '13

The annotated tag, batman-adv-fix-for-davem has been updated to 4f1ee5e0e58feeaa9776a01dc743acc95e0c7030 (tag) from 9acd22fa05c1cb24eb581d40393a2148287ef995 (which is now obsolete) tagging 6c519bad7b19a2c14a075b400edabaa630330123 (commit) replaces v3.12-rc3 tagged by Antonio Quartulli on Wed Oct 2 22:01:53 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - fix multi soft-interfaces setups with Network Coding enabled by registering the CODED packet type once only (instead of once per soft-if) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSTHvQAAoJEADl0hg6qKeOBl8P/jDJhnH65p+zsXlK5RQ1bOmq F9cY7nY1cESQ0V4j9BGGqPcvy3ltCbVnaPGvrYKQ78CIVYFIlA0ZwmnjnXzkxi4a XWgG10Znx8yUOPllFoRp7r7yJht2FVprWnEN1aVCwbflpHxD5jI+L3C8JWULEfbI 7Gm3CcHQWzQSOv8u00XeoBmAo3Q+N0gaEAXl+vogKW4RP59GU4QSCstahyRuPmme l1C9SrLqi+KJjpvgxEdjHmGD8K0yLYJVw/6iMYlYpKbraU793madj0JNT+LwwAmE dMTOp83yKy+n8k4XRKYRnvOElAJVVvEjU81V/4ompVHzIfu/7f1xSWyAQpecbhFG srd/QLqIszScx7ELDQ3IVMacTLs2tMaEotvrymYIooRLz3ecgeAyXth3aBQErSD2 SoDliIpx8+D45c04ri9Hcwu2k1g100VYG0QiJMUC0berYGDyjPnbEdpnmYTioJ6J 4s4Qs3ve70lo0yc2ODDZxYN6n6Rk0PXuxJwj5PeBR6RswEo1izdelOXEcAevVjZE SRJn0niZmtYlS5gD/6aohkVKnKti9Rd2DrgOU7qCWJ/wLUiFSL5L7Lj9megKbmeG f4qxD9rC3wKQdX1TtU/ED7IfMWMBY0tcSEnbCYs+otI8kCbtvr0490h1JtNJALHb po2HXXIMEjqmbhkgsz29 =pqD/ -----END PGP SIGNATURE----- Matthias Schiffer (1): batman-adv: set up network coding packet handlers during module init ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, created. batman-adv-fix-for-davem
by postmaster＠open-mesh.org 02 Oct '13

02 Oct '13

The annotated tag, batman-adv-fix-for-davem has been created at 9acd22fa05c1cb24eb581d40393a2148287ef995 (tag) tagging 6c519bad7b19a2c14a075b400edabaa630330123 (commit) replaces v3.12-rc3 tagged by Antonio Quartulli on Wed Oct 2 21:38:53 2013 +0200 - Shortlog ------------------------------------------------------------ Included change: - fix multi soft-interface setups whit Network Coding enabled by registering the CODED packet type once only (instead of once per soft-if) -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSTHb4AAoJEADl0hg6qKeOyCkP/3+74cYDq3tFg26Z0pV1JXBM U7xWaBECoDkCMrMNsePvhxJmHaIf9QM444qbDaSGvWBfB4Gu4IziZcUIqJDP3CZP RkiYtclMmuRKX3A26KHYdsYmTVOeGbS+ExbJt1ILyG55traUplot6N8LOD+bkyV9 HQ0eCimFAtEvnf5wzUspgPu8yvAZku1QuyR99ezTzFQp9gGfNy6RBcoXvpok8hnE kyCMzAu/nVl5riWYwkL4anf4xVvMfslEfzIRBRrKwcBdomDv8X3C5zMRuQ7t5BES Y1efh3IQRYdWi868JxVFZayHpSgZk7vFtmVrF3Wjn/4RHy08xIxMlY+ega69CC9b kPjlJaC3L+AL4TGoAewyRGIKutvqjCiDw002D3s10vEAqQG4M1JNNgTi7DH/ku+q bUqyanZr9XOdfa9VlGB6q/7WYaAzhL4Q0cG0PVgyXuYU1PN9yOeU26kftK4ZrCOZ z0KwC8Gugvk7BRJSeH8TbFVYd9cvCD14xpkTuoaSJAOJrrB72aB9ewWjRQVs053q eD3ae+HDTBCbw4066IWj8RLWmpcYKAlEpAAVFXCX7anEvoDSoE/j9L/O2pnerfRf goTo8m2qtGfdTWIgsYw/PU0c8GQ09cnkL8Cw4iuUjJ/7QPv9paqARLnLcTGvGAw0 5zdWaGSARuICUvV+9+Q6 =s/ec -----END PGP SIGNATURE----- Matthias Schiffer (1): batman-adv: set up network coding packet handlers during module init ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, batman-adv-fix-for-davem, deleted. v3.11-9490-g4c18c42
by postmaster＠open-mesh.org 02 Oct '13

02 Oct '13

The annotated tag, batman-adv-fix-for-davem has been deleted was dde80ce25a9799d65461a1d2400de52f96c8c2e0 ----------------------------------------------------------------------- tag batman-adv-fix-for-davem Included change: - fix the Bridge Loop Avoidance component by marking the variables containing the VLAN ID with the HAS_TAG flag when needed. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABCAAGBQJSOKw8AAoJEADl0hg6qKeOVkQP/2kTHSfxe/jUBD5Jzk1wtxhi 1aJ2ihqPErYrjE6biY36e0S+ioIzWd44t/nwn1N8LCaxnHi+dhMwyKkqGCTXXmgT NPgdgYfE1zqvsNN8CoETpbxpic21lpXI8HBJ1jMu6yF8vWFRO2ZEXC/h72/bxUM4 sV07n5irn9ssbNhthQbIvoPagHm+Kpr4BRTpqZ0pPyA93GfpKLHTZX67Wi/pftC4 HVapzduObkliqxGJ/Xk8Ng6wNe4XnMuCWotdjaq0Bnff4AvVNoxYwZfpvfgJA8TT /Lttx0bgjLwGLpm3sjfD9b7IcshOFmhiGWuVUUFmlUFBU0gFtlevOEkjAh4bZeHS F8pVXJFBFec7GVBSYnWWRzGte1rYSAMD4kCgOyLjruRf2PhmenqRIQGiIbsjKk2a CU/hfJP4DpM5yDQ+typOrq3j2I4gb9JF7dTv1J7RSXjpxwFwlQeUfttiuLQGltkP WFREgKoikF/MFr2NwoVsckWLDx7+77hFBtdTnnlybtiviO87sEXSfFSS35M8PBnU tbAW5Sj3mD5r6GwQDtwEOhhETWdNtgJNFl4wLmOXl01KFgM9G2FzxUpsHULI2u5H vGdTTer4a482n1y1m8NEJPeo27SMgX2bW7IooTy4qjtSFD/+Bo7ThlVexQmzaYK6 OwqW2nRa4S13MQCPbmAQ =ipxk -----END PGP SIGNATURE----- 4c18c425b2d228415b635e97a64737d7f27c5536 batman-adv: set the TAG flag for the vid passed to BLA ----------------------------------------------------------------------- -- linux integration

1 0

[batman-adv] master's head updated: Merge branch 'maint' into next (17a6a8c)
by postmaster＠open-mesh.org 01 Oct '13

01 Oct '13

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 586cf84 batman-adv: set up network coding packet handlers during module init 17a6a8c Merge branch 'maint' into next

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits October 2013