commits September 2014

commits@lists.open-mesh.org

1 participants
7 discussions

[linux-merge]linux integration; annotated tag, v3.17-rc7, created. v3.17-rc7
by postmaster＠open-mesh.org 28 Sep '14

28 Sep '14

The annotated tag, v3.17-rc7 has been created at 823d115bbd2ec5655a43e9eb3e63eb0ba65956ad (tag) tagging fe82dcec644244676d55a1384c958d5f67979adb (commit) replaces v3.17-rc6 tagged by Linus Torvalds on Sun Sep 28 14:29:14 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.17-rc7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUKH2qAAoJEHm+PkMAQRiGuzcH/jbILxyha7pL9uFUTJnnWcAp cKduK0/JRKnukpjk/OQEmbxPi2aFCq2+R1ugKww2KCu8FUNAKDYOEebsl6UDF1o1 eHkm3lbiJn/WNhkUQ7Z7lqPu6S7cGC4czaU7V7yfad3aG5hbyYCJkFzkxFTkqTrA 03W92h0L8bosQxWySbL8ik2+jJVbXw5lBr6zgyyJYn3KWcFoHswjblKAyQ9ViAWT mwkzj7V/9CYCOMKBEnLdnuItBykhC3AEIiKPGAICGebbZBbN3+Rvo3YbARn+jMkz oG4AHd2hEGL1elYdLPbq1941gM8RWmZhTDTW6qZz3TFeyAHvRrZh7yMrqeqqmXo= =XUic -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.17-rc6, created. v3.17-rc6
by postmaster＠open-mesh.org 22 Sep '14

22 Sep '14

The annotated tag, v3.17-rc6 has been created at d9613c658b9f84a86999ab4bfbd7af005a7d9227 (tag) tagging 0f33be009b89d2268e94194dc4fd01a7851b6d51 (commit) replaces v3.17-rc5 tagged by Linus Torvalds on Sun Sep 21 15:43:14 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.17-rc6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUH1SCAAoJEHm+PkMAQRiGAgEH/i6CeKDkzElB8sPkK+sgWAlp FbhRmYQl9uiLw+HJhEvHu6AgdqSkRRyKripDqYSaWdwEG5XkueYMJLESXN4n0PFF 0CBe6t5z+wpJfbeQV481yNrUtwYopKSrpqnrb2Pp7AhsELRiWf95nJu3D+X2cYoq oNVUTcf8jKjp+kmBsdkujBo0x+e804kiFw5+yIZ6UyMIRiBbCcouH2ReBw6FgByJ 08/sHUQ/1mNDCFt1x5M4EGmM9ar5yHK2lvGpS2XEjDkAAXGx+PiFiT+/y+FU/CSk lfAYivyCU9zMhhdpMdo1DIuWhYkdazrHz/FoQFNpqDfsXsWE2L1HWm0TkULuNjs= =iFCQ -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

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

15 Sep '14

The annotated tag, v3.17-rc5 has been created at 0c399959441c6f829f62730a0c71e68aa9491bfc (tag) tagging 9e82bf014195d6f0054982c463575cdce24292be (commit) replaces v3.17-rc4 tagged by Linus Torvalds on Sun Sep 14 17:50:29 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.17-rc5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUFjfVAAoJEHm+PkMAQRiGANkIAIU3PNrAz9dIItq8a/rEAhnx l2shHoOyEmyNR2apholM3BPUNX50cbsc/HGdi7lZKLkA/ifAj6B9nFD2NzVsIChD 1QWVcvdkKlVuxXCDd26qbijlfmbTOAWrLw9ntvM+J6ZtECM6zCAZF4MAV/FwogPq ETGKD76AxJtVIhBMS99troAiC1YxmQ7DKgEr8CraTOR1qwXEonnPCmN/IZA6x2/G EXiihOuQB5me1X7k4PI0V8CDscQOn+3B2CQHIrjRB+KiTF+iKIuI8n6ORC6bpFh+ U8UZP9wLlIG1BrUHG83pIndglIHotqPcjmtfl1WGrRr2hn7abzVSfV+g5Syo3Vg= =Ep+s -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[linux-merge]linux integration; annotated tag, v3.17-rc4, created. v3.17-rc4
by postmaster＠open-mesh.org 08 Sep '14

08 Sep '14

The annotated tag, v3.17-rc4 has been created at 13360dd4297b38addd25d433d174d5b0a93a202f (tag) tagging 2ce7598c9a453e0acd0e07be7be3f5eb39608ebd (commit) replaces v3.17-rc3 tagged by Linus Torvalds on Sun Sep 7 16:09:50 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.17-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUDOW+AAoJEHm+PkMAQRiGOXYH/00TPKm8PdM5cXXG2YYYv9eT W99K7KD2i0/qiVtlGgjjvB7fO3K0HcZusTd2jmVd8IWntXvauq7Zpw5YZkjwu4KX Y1HCwwCd2aw0FoqgrJhNP3+j5Cr1BD/HLtbffjCe+A3tppOIis4Bwt2wJOoYlXpS hU9Jxxc4lcRo8YKbffouDo7PIneWeJy8N+WGpUR5BfJIEK0ZZtCUqn3/3WLX4FYu fE6uiF/bACTpKXU/mo4dDbhZp439H/QdwQc9B0F8+8CBDMXKaNHrPV7kN36T2SWa fD4boikTsi/yh9Ks1fvHbvNq2N0ihoMnja+vLRyvjAcAQv2fKG3OZtYgFWSdghU= =Xknd -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

[openwrt-feed-alfred] master: alfred: bump to latest trunk (9dd61a5)
by postmaster＠open-mesh.org 03 Sep '14

03 Sep '14

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit 9dd61a5de3cee0e2d3026ad8b435db5767afbe95 Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Wed Sep 3 13:43:35 2014 +0200 alfred: bump to latest trunk Add a few new features: * allow running multiple alfred instances (configurable unix socket path, bind network socket to a specific device) * add support for changing interfaces * improve error/debug output Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- 9dd61a5de3cee0e2d3026ad8b435db5767afbe95 alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 40b39ad..20f91b8 100644 --- a/alfred/Makefile +++ b/alfred/Makefile @@ -12,8 +12,8 @@ include $(TOPDIR)/rules.mk # PKG_NAME:=alfred PKG_VERSION:=2014.3.0 -PKG_RELEASE:=0 -PKG_REV:=5bfda266e711dab9d634e529a664561a4760d5eb +PKG_RELEASE:=1 +PKG_REV:=babd772a36e186bf1a0d2e00239c6754ba240704 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: support for changing interfaces (babd772)
by postmaster＠open-mesh.org 03 Sep '14

03 Sep '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit babd772a36e186bf1a0d2e00239c6754ba240704 Author: Simon Wunderlich <simon(a)open-mesh.com> Date: Mon Aug 25 19:19:16 2014 +0200 alfred: support for changing interfaces This patch adds support for changing the interface alfreds listens to on the fly without restarting alfred. Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> --- Changes to PATCH: * fix const warning >--------------------------------------------------------------- babd772a36e186bf1a0d2e00239c6754ba240704 alfred.h | 4 +++- client.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++ main.c | 66 ++++++++++++++++++++++++++++++++++------------------------ man/alfred.8 | 3 +++ packet.h | 17 +++++++++++++++ unix_sock.c | 38 +++++++++++++++++++++++++++++++++ vis/vis.c | 2 +- 7 files changed, 155 insertions(+), 29 deletions(-) diff --git a/alfred.h b/alfred.h index 35ac4dd..c83f7f0 100644 --- a/alfred.h +++ b/alfred.h @@ -86,6 +86,7 @@ enum clientmode { CLIENT_REQUEST_DATA, CLIENT_SET_DATA, CLIENT_MODESWITCH, + CLIENT_CHANGE_INTERFACE, }; struct globals { @@ -93,7 +94,7 @@ struct globals { struct in6_addr address; uint32_t scope_id; struct server *best_server; /* NULL if we are a server ourselves */ - const char *interface; + char *interface; const char *mesh_iface; enum opmode opmode; enum clientmode clientmode; @@ -125,6 +126,7 @@ int set_best_server(struct globals *globals); int alfred_client_request_data(struct globals *globals); int alfred_client_set_data(struct globals *globals); int alfred_client_modeswitch(struct globals *globals); +int alfred_client_change_interface(struct globals *globals); /* recv.c */ int recv_alfred_packet(struct globals *globals); struct transaction_head * diff --git a/client.c b/client.c index b868719..48313db 100644 --- a/client.c +++ b/client.c @@ -22,6 +22,7 @@ #include <ctype.h> #include <errno.h> #include <netinet/in.h> +#include <sys/ioctl.h> #include <stdint.h> #include <stdio.h> #include <string.h> @@ -218,3 +219,56 @@ int alfred_client_modeswitch(struct globals *globals) unix_sock_close(globals); return 0; } + +int alfred_client_change_interface(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_change_interface_v0 *change_interface; + struct ifreq ifr; + int ret, len; + int sock = -1; + + if (unix_sock_open_client(globals)) + return -1; + + if (strlen(globals->interface) > IFNAMSIZ) { + fprintf(stderr, "%s: interface name too long, not changing\n", + __func__); + return 0; + } + + sock = socket(PF_INET6, SOCK_DGRAM, 0); + if (sock < 0) { + perror("can't open socket"); + return -1; + } + + strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + ifr.ifr_name[IFNAMSIZ - 1] = '\0'; + if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { + fprintf(stderr, "%s: can't find interface, not changing\n", + __func__); + close(sock); + return -1; + } + + close(sock); + + change_interface = (struct alfred_change_interface_v0 *)buf; + len = sizeof(*change_interface); + + change_interface->header.type = ALFRED_CHANGE_INTERFACE; + change_interface->header.version = ALFRED_VERSION; + change_interface->header.length = htons(len - sizeof(change_interface->header)); + memcpy(change_interface->iface, globals->interface, + sizeof(change_interface->iface)); + + ret = write(globals->unix_sock, buf, len); + if (ret != len) + fprintf(stderr, "%s: only wrote %d of %d bytes: %s\n", + __func__, ret, len, strerror(errno)); + + unix_sock_close(globals); + + return 0; +} diff --git a/main.c b/main.c index 1add44e..5a4f1e6 100644 --- a/main.c +++ b/main.c @@ -33,25 +33,29 @@ static void alfred_usage(void) { printf("Usage: alfred [options]\n"); printf("client mode options:\n"); - printf(" -s, --set-data [data type] sets new data to distribute from stdin\n"); - printf(" for the supplied data type (0-255)\n"); - printf(" -r, --request [data type] collect data from the network and prints\n"); - printf(" it on the network\n"); - printf(" -V, --req-version specify the data version set for -s\n"); - printf(" -M, --modeswitch master switch daemon to mode master\n"); - printf(" slave switch daemon to mode slave\n"); + printf(" -s, --set-data [data type] sets new data to distribute from stdin\n"); + printf(" for the supplied data type (0-255)\n"); + printf(" -r, --request [data type] collect data from the network and prints\n"); + printf(" it on the network\n"); + printf(" -V, --req-version specify the data version set for -s\n"); + printf(" -M, --modeswitch master switch daemon to mode master\n"); + printf(" slave switch daemon to mode slave\n"); + printf(" -I, --change-interface [interface] change to the specified interface\n"); printf("\n"); printf("server mode options:\n"); - printf(" -i, --interface specify the interface to listen on\n"); - printf(" -b specify the batman-adv interface configured on the system (default: bat0)\n"); - printf(" use 'none' to disable the batman-adv based best server selection\n"); - printf(" -m, --master start up the daemon in master mode, which\n"); - printf(" accepts data from slaves and synces it with\n"); - printf(" other masters\n"); + printf(" -i, --interface specify the interface to listen on\n"); + printf(" -b specify the batman-adv interface\n"); + printf(" configured on the system (default: bat0)\n"); + printf(" use 'none' to disable the batman-adv\n"); + printf(" based best server selection\n"); + printf(" -m, --master start up the daemon in master mode, which\n"); + printf(" accepts data from slaves and synces it with\n"); + printf(" other masters\n"); printf("\n"); - printf(" -u, --unix-path [path] path to unix socket used for client-server communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); - printf(" -v, --version print the version\n"); - printf(" -h, --help this help\n"); + printf(" -u, --unix-path [path] path to unix socket used for client-server\n"); + printf(" communication (default: \""ALFRED_SOCK_PATH_DEFAULT"\")\n"); + printf(" -v, --version print the version\n"); + printf(" -h, --help this help\n"); printf("\n"); } @@ -60,16 +64,17 @@ static struct globals *alfred_init(int argc, char *argv[]) int opt, opt_ind, i; struct globals *globals; struct option long_options[] = { - {"set-data", required_argument, NULL, 's'}, - {"request", required_argument, NULL, 'r'}, - {"interface", required_argument, NULL, 'i'}, - {"master", no_argument, NULL, 'm'}, - {"help", no_argument, NULL, 'h'}, - {"req-version", required_argument, NULL, 'V'}, - {"modeswitch", required_argument, NULL, 'M'}, - {"unix-path", required_argument, NULL, 'u'}, - {"version", no_argument, NULL, 'v'}, - {NULL, 0, NULL, 0}, + {"set-data", required_argument, NULL, 's'}, + {"request", required_argument, NULL, 'r'}, + {"interface", required_argument, NULL, 'i'}, + {"master", no_argument, NULL, 'm'}, + {"help", no_argument, NULL, 'h'}, + {"req-version", required_argument, NULL, 'V'}, + {"modeswitch", required_argument, NULL, 'M'}, + {"change-interface", required_argument, NULL, 'I'}, + {"unix-path", required_argument, NULL, 'u'}, + {"version", no_argument, NULL, 'v'}, + {NULL, 0, NULL, 0}, }; globals = &alfred_globals; @@ -85,7 +90,7 @@ static struct globals *alfred_init(int argc, char *argv[]) time_random_seed(); - while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:u:", long_options, + while ((opt = getopt_long(argc, argv, "ms:r:hi:b:vV:M:I:u:", long_options, &opt_ind)) != -1) { switch (opt) { case 'r': @@ -135,6 +140,10 @@ static struct globals *alfred_init(int argc, char *argv[]) } globals->clientmode = CLIENT_MODESWITCH; break; + case 'I': + globals->clientmode = CLIENT_CHANGE_INTERFACE; + globals->interface = strdup(optarg); + break; case 'u': globals->unix_path = optarg; break; @@ -176,6 +185,9 @@ int main(int argc, char *argv[]) case CLIENT_MODESWITCH: return alfred_client_modeswitch(globals); break; + case CLIENT_CHANGE_INTERFACE: + return alfred_client_change_interface(globals); + break; } return 0; diff --git a/man/alfred.8 b/man/alfred.8 index c90caa8..35dee45 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -80,6 +80,9 @@ to 0 ('\fB\-V\fP 0'). \fBslave\fP Switch daemon to mode slave .fi +.TP +\fB\-I\fP, \fB\-\-change\-interface\fP \fIinterface\fP +Change the alfred server to use the new \fBinterface\fP . .SH SERVER OPTIONS .TP diff --git a/packet.h b/packet.h index ba8c5f6..dc06d65 100644 --- a/packet.h +++ b/packet.h @@ -20,6 +20,8 @@ #ifndef _ALFRED_PACKET_H #define _ALFRED_PACKET_H +#include <net/if.h> /* IFNAMSIZ */ + #define __packed __attribute__ ((packed)) /* basic blocks */ @@ -67,6 +69,7 @@ struct alfred_transaction_mgmt { * @ALFRED_STATUS_TXEND: Transaction was finished by sender * @ALFRED_STATUS_ERROR: Error was detected during the transaction * @ALFRED_MODESWITCH: Switch between different operation modes + * @ALFRED_CHANGE_INTERFACE: Change the listening interface */ enum alfred_packet_type { ALFRED_PUSH_DATA = 0, @@ -75,6 +78,7 @@ enum alfred_packet_type { ALFRED_STATUS_TXEND = 3, ALFRED_STATUS_ERROR = 4, ALFRED_MODESWITCH = 5, + ALFRED_CHANGE_INTERFACE = 6, }; /* packets */ @@ -143,6 +147,19 @@ struct alfred_modeswitch_v0 { } __packed; /** + * struct alfred_change_interface_v0 - Request to change the interface + * @header: TLV header describing the complete packet + * @iface: interface name to be changed to + * + * Sent to the daemon by client + */ +struct alfred_change_interface_v0 { + struct alfred_tlv header; + char iface[IFNAMSIZ]; +} __packed; + + +/** * struct alfred_status_v0 - Status info of a transaction * @header: TLV header describing the complete packet * @tx: Transaction identificator and sequence number of packet diff --git a/unix_sock.c b/unix_sock.c index cc0d25c..516c0a5 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -298,6 +298,38 @@ err: return ret; } +static int +unix_sock_change_iface(struct globals *globals, + struct alfred_change_interface_v0 *change_iface, + int client_sock) +{ + int len, ret = -1; + char *iface; + + len = ntohs(change_iface->header.length); + + if (len < (int)(sizeof(*change_iface) - sizeof(change_iface->header))) + goto err; + + iface = malloc(IFNAMSIZ + 1); + if (!iface) + goto err; + + memcpy(iface, change_iface->iface, IFNAMSIZ); + iface[IFNAMSIZ] = 0; + + netsock_close(globals->netsock); + + free(globals->interface); + globals->interface = iface; + netsock_open(globals); + + ret = 0; +err: + close(client_sock); + return ret; +} + int unix_sock_read(struct globals *globals) { int client_sock; @@ -350,6 +382,12 @@ int unix_sock_read(struct globals *globals) (struct alfred_modeswitch_v0 *)packet, client_sock); break; + case ALFRED_CHANGE_INTERFACE: + ret = unix_sock_change_iface(globals, + (struct alfred_change_interface_v0 *)packet, + client_sock); + break; + default: /* unknown packet type */ ret = -1; diff --git a/vis/vis.c b/vis/vis.c index 00372ab..3dd5c8c 100644 --- a/vis/vis.c +++ b/vis/vis.c @@ -23,7 +23,7 @@ #include <dirent.h> #include <errno.h> #include <getopt.h> -#include <linux/if.h> +#include <net/if.h> #include <netinet/in.h> #include <signal.h> #include <stdbool.h>

1 0

[linux-merge]linux integration; annotated tag, v3.17-rc3, created. v3.17-rc3
by postmaster＠open-mesh.org 01 Sep '14

01 Sep '14

The annotated tag, v3.17-rc3 has been created at 3c41a10e18914987b1b722c02f72f0f956be3904 (tag) tagging 69e273c0b0a3c337a521d083374c918dc52c666f (commit) replaces v3.17-rc2 tagged by Linus Torvalds on Sun Aug 31 18:23:12 2014 -0700 - Shortlog ------------------------------------------------------------ Linux 3.17-rc3 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUA8qAAAoJEHm+PkMAQRiGRNwH/194A8PirGSXmM83dMoW2RHU j597TT0frxfHiDDcHpIYZBg5Z0qV6ZvY2982HzYJr3eEDzXYzz0nI5TlNBeNPy1i yRb2c74/BKvIvSSj9s4MZ9918HbYWE7L1bJAoVs7uc50iANgVSuesOrWVzTylSor /cNwFV1GMjIVEGwP1/lZy40NQD92ZG1kkttzMnrrH9E5TQ7UK+DIAfJViFIYv8Cp fw2U5VKrZ7qZm0XlOq5keN/mD6lKicSBTlPdvSICHkzOBbUlS35tTnW3co9jmpba XUKNqM4YvXJWzbgrAGT8CHBaQTOMylRO/a2AOIwqOciODJJB0CqfJ0CtHUffOnE= =yN6O -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits September 2014