commits November 2014

commits@lists.open-mesh.org

1 participants
63 discussions

[alfred] master: alfred: Add support for multiple interfaces per master (67ae5f5)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 67ae5f57eedda4969934574c991d03d282e98252 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Wed Nov 12 14:54:29 2014 +0100 alfred: Add support for multiple interfaces per master It may required in some situations that all alfred master servers are potentially connected to the same backbone network but cannot see each other through the mesh. The data may still be exchanged and thus a master instance must listen for requests on the mesh and synchronize data over the backbone network. The limitation that data can only be synchronized over one master hop and not more still holds true. Also alfred servers in slave mode are not allowed to operate on multiple interfaces. This is especially important when switching from master to slave mode because this can fail now when multiple interfaces are configured. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- 67ae5f57eedda4969934574c991d03d282e98252 alfred.h | 40 +++++++++---- client.c | 58 ++++++++++++++----- main.c | 12 ++-- man/alfred.8 | 4 +- netsock.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- packet.h | 4 +- recv.c | 16 ++--- send.c | 67 ++++++++++++--------- server.c | 97 ++++++++++++++++--------------- unix_sock.c | 38 +++++++----- 10 files changed, 378 insertions(+), 141 deletions(-) diff --git a/alfred.h b/alfred.h index c83f7f0..cf94af4 100644 --- a/alfred.h +++ b/alfred.h @@ -27,6 +27,8 @@ #include <netinet/in.h> #include <stdint.h> #include <time.h> +#include <sys/select.h> +#include <sys/types.h> #include "list.h" #include "packet.h" @@ -89,19 +91,27 @@ enum clientmode { CLIENT_CHANGE_INTERFACE, }; -struct globals { +struct interface { struct ether_addr hwaddr; struct in6_addr address; uint32_t scope_id; - struct server *best_server; /* NULL if we are a server ourselves */ char *interface; + int netsock; + + struct list_head list; +}; + +struct globals { + struct list_head interfaces; + + char *change_interface; + struct server *best_server; /* NULL if we are a server ourselves */ const char *mesh_iface; enum opmode opmode; enum clientmode clientmode; int clientmode_arg; int clientmode_version; - int netsock; int unix_sock; const char *unix_path; @@ -128,7 +138,7 @@ 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); +int recv_alfred_packet(struct globals *globals, struct interface *interface); struct transaction_head * transaction_add(struct globals *globals, struct ether_addr mac, uint16_t id); struct transaction_head * @@ -137,14 +147,14 @@ transaction_clean_hash(struct globals *globals, struct transaction_head *transaction_clean(struct globals *globals, struct transaction_head *head); /* send.c */ -int push_data(struct globals *globals, struct in6_addr *destination, - enum data_source max_source_level, int type_filter, - uint16_t tx_id); +int push_data(struct globals *globals, struct interface *interface, + struct in6_addr *destination, enum data_source max_source_level, + int type_filter, uint16_t tx_id); int announce_master(struct globals *globals); int push_local_data(struct globals *globals); int sync_data(struct globals *globals); -ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length); +ssize_t send_alfred_packet(struct interface *interface, + 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); @@ -155,8 +165,16 @@ int unix_sock_req_data_finish(struct globals *globals, /* vis.c */ int vis_update_data(struct globals *globals); /* netsock.c */ -int netsock_open(struct globals *globals); -int netsock_close(int sock); +int netsock_open_all(struct globals *globals); +void netsock_close_all(struct globals *globals); +int netsock_set_interfaces(struct globals *globals, char *interfaces); +struct interface *netsock_first_interface(struct globals *globals); +void netsock_reopen(struct globals *globals); +int netsock_prepare_select(struct globals *globals, fd_set *fds, int maxsock); +void netsock_check_error(struct globals *globals, fd_set *errfds); +int netsock_receive_packet(struct globals *globals, fd_set *fds); +int netsock_own_address(const struct globals *globals, + const struct in6_addr *address); /* util.c */ int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff); diff --git a/client.c b/client.c index 48313db..cff5270 100644 --- a/client.c +++ b/client.c @@ -27,6 +27,9 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <net/if.h> +#include <stddef.h> +#include <sys/socket.h> #include "alfred.h" #include "packet.h" @@ -220,21 +223,15 @@ int alfred_client_modeswitch(struct globals *globals) return 0; } -int alfred_client_change_interface(struct globals *globals) +static int check_interface(const char *iface) { - unsigned char buf[MAX_PAYLOAD]; - struct alfred_change_interface_v0 *change_interface; - struct ifreq ifr; - int ret, len; int sock = -1; + struct ifreq ifr; - if (unix_sock_open_client(globals)) - return -1; - - if (strlen(globals->interface) > IFNAMSIZ) { - fprintf(stderr, "%s: interface name too long, not changing\n", + if (strlen(iface) > IFNAMSIZ) { + fprintf(stderr, "%s: interface name list too long, not changing\n", __func__); - return 0; + return -1; } sock = socket(PF_INET6, SOCK_DGRAM, 0); @@ -243,7 +240,7 @@ int alfred_client_change_interface(struct globals *globals) return -1; } - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, iface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { fprintf(stderr, "%s: can't find interface, not changing\n", @@ -254,14 +251,47 @@ int alfred_client_change_interface(struct globals *globals) close(sock); + return 0; +} + +int alfred_client_change_interface(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_change_interface_v0 *change_interface; + int ret, len; + char *input, *token, *saveptr; + + if (unix_sock_open_client(globals)) + return -1; + + if (strlen(globals->change_interface) > sizeof(change_interface->ifaces)) { + fprintf(stderr, "%s: interface name list too long, not changing\n", + __func__); + return 0; + } + 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)); + strncpy(change_interface->ifaces, globals->change_interface, + sizeof(change_interface->ifaces)); + change_interface->ifaces[sizeof(change_interface->ifaces) - 1] = '\0'; + + /* test it before sending + * globals->change_interface is now saved in change_interface->ifaces + * and can be modified by strtok_r + */ + input = globals->change_interface; + while ((token = strtok_r(input, ",", &saveptr))) { + input = NULL; + + ret = check_interface(token); + if (ret < 0) + return 0; + } ret = write(globals->unix_sock, buf, len); if (ret != len) diff --git a/main.c b/main.c index 5a4f1e6..7eb8baa 100644 --- a/main.c +++ b/main.c @@ -26,6 +26,7 @@ #include <string.h> #include "alfred.h" #include "packet.h" +#include "list.h" static struct globals alfred_globals; @@ -40,10 +41,10 @@ static void alfred_usage(void) 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(" -I, --change-interface [interface] change to the specified interface(s)\n"); printf("\n"); printf("server mode options:\n"); - printf(" -i, --interface specify the interface to listen on\n"); + printf(" -i, --interface specify the interface (or comma separated list of interfaes) 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"); @@ -80,9 +81,10 @@ static struct globals *alfred_init(int argc, char *argv[]) globals = &alfred_globals; memset(globals, 0, sizeof(*globals)); + INIT_LIST_HEAD(&globals->interfaces); + globals->change_interface = NULL; globals->opmode = OPMODE_SLAVE; globals->clientmode = CLIENT_NONE; - globals->interface = NULL; globals->best_server = NULL; globals->clientmode_version = 0; globals->mesh_iface = "bat0"; @@ -116,7 +118,7 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->opmode = OPMODE_MASTER; break; case 'i': - globals->interface = strdup(optarg); + netsock_set_interfaces(globals, optarg); break; case 'b': globals->mesh_iface = strdup(optarg); @@ -142,7 +144,7 @@ static struct globals *alfred_init(int argc, char *argv[]) break; case 'I': globals->clientmode = CLIENT_CHANGE_INTERFACE; - globals->interface = strdup(optarg); + globals->change_interface = strdup(optarg); break; case 'u': globals->unix_path = optarg; diff --git a/man/alfred.8 b/man/alfred.8 index 35dee45..0449189 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -82,12 +82,12 @@ to 0 ('\fB\-V\fP 0'). .fi .TP \fB\-I\fP, \fB\-\-change\-interface\fP \fIinterface\fP -Change the alfred server to use the new \fBinterface\fP +Change the alfred server to use the new \fBinterface\fP(s) . .SH SERVER OPTIONS .TP \fB\-i\fP, \fB\-\-interface\fP \fiface\fP -Specify the interface to listen on +Specify the interface (or comma separated list of interfaes) to listen on .TP \fB\-b\fP \fIbatmanif\fP Specify the batman-adv interface configured on the system (default: bat0). diff --git a/netsock.c b/netsock.c index b59b7b7..703334f 100644 --- a/netsock.c +++ b/netsock.c @@ -22,6 +22,7 @@ #include <sys/socket.h> #include <errno.h> #include <fcntl.h> +#include <net/ethernet.h> #include <net/if.h> #include <netinet/in.h> #include <stdio.h> @@ -29,28 +30,104 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <unistd.h> +#include <stdlib.h> +#include <sys/select.h> #include "alfred.h" #include "batadv_query.h" #include "packet.h" +#include "list.h" const struct in6_addr in6addr_localmcast = {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }; -int netsock_close(int sock) +void netsock_close_all(struct globals *globals) { - return close(sock); + struct interface *interface, *is; + + list_for_each_entry_safe(interface, is, &globals->interfaces, list) { + if (interface->netsock >= 0) + close(interface->netsock); + list_del(&interface->list); + free(interface->interface); + free(interface); + } +} + +struct interface *netsock_first_interface(struct globals *globals) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0) + return interface; + } + + return NULL; +} + +static struct interface *netsock_find_interface(struct globals *globals, + const char *name) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (strcmp(name, interface->interface) == 0) + return interface; + } + + return NULL; +} + +int netsock_set_interfaces(struct globals *globals, char *interfaces) +{ + char *input, *saveptr, *token; + struct interface *interface; + + netsock_close_all(globals); + + input = interfaces; + while ((token = strtok_r(input, ",", &saveptr))) { + input = NULL; + + interface = netsock_find_interface(globals, token); + if (interface) + continue; + + interface = malloc(sizeof(*interface)); + if (!interface) { + netsock_close_all(globals); + return -ENOMEM; + } + + memset(&interface->hwaddr, 0, sizeof(interface->hwaddr)); + memset(&interface->address, 0, sizeof(interface->address)); + interface->scope_id = 0; + interface->interface = NULL; + interface->netsock = -1; + + interface->interface = strdup(token); + if (!interface->interface) { + free(interface); + netsock_close_all(globals); + return -ENOMEM; + } + + list_add(&interface->list, &globals->interfaces); + } + + return 0; } -int netsock_open(struct globals *globals) +static int netsock_open(struct interface *interface) { int sock; struct sockaddr_in6 sin6; struct ifreq ifr; int ret; - globals->netsock = -1; + interface->netsock = -1; sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP); if (sock < 0) { @@ -59,14 +136,14 @@ int netsock_open(struct globals *globals) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, interface->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { perror("can't get interface"); goto err; } - globals->scope_id = ifr.ifr_ifindex; + interface->scope_id = ifr.ifr_ifindex; memset(&sin6, 0, sizeof(sin6)); sin6.sin6_port = htons(ALFRED_PORT); @@ -79,11 +156,11 @@ int netsock_open(struct globals *globals) goto err; } - memcpy(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); - mac_to_ipv6(&globals->hwaddr, &globals->address); + memcpy(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); + mac_to_ipv6(&interface->hwaddr, &interface->address); - if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - globals->interface, strlen(globals->interface) + 1)) { + if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface->interface, + strlen(interface->interface) + 1)) { perror("can't bind to device"); goto err; } @@ -105,10 +182,94 @@ int netsock_open(struct globals *globals) goto err; } - globals->netsock = sock; + interface->netsock = sock; return 0; err: close(sock); return -1; } + +int netsock_open_all(struct globals *globals) +{ + int num_socks = 0; + int ret; + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + ret = netsock_open(interface); + if (ret >= 0) + num_socks++; + } + + return num_socks; +} + +void netsock_reopen(struct globals *globals) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock < 0) + netsock_open(interface); + } +} + +int netsock_prepare_select(struct globals *globals, fd_set *fds, int maxsock) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0) { + FD_SET(interface->netsock, fds); + if (maxsock < interface->netsock) + maxsock = interface->netsock; + } + } + + return maxsock; +} + +void netsock_check_error(struct globals *globals, fd_set *errfds) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0 && + FD_ISSET(interface->netsock, errfds)) { + fprintf(stderr, "Error on netsock detected\n"); + close(interface->netsock); + interface->netsock = -1; + } + } +} + +int netsock_receive_packet(struct globals *globals, fd_set *fds) +{ + struct interface *interface; + int recvs = 0; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0 && + FD_ISSET(interface->netsock, fds)) { + recv_alfred_packet(globals, interface); + recvs++; + } + } + + return recvs; +} + +int netsock_own_address(const struct globals *globals, + const struct in6_addr *address) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (0 == memcmp(address, &interface->address, + sizeof(*address))) + return 1; + } + + return 0; +} diff --git a/packet.h b/packet.h index dc06d65..87ad263 100644 --- a/packet.h +++ b/packet.h @@ -149,13 +149,13 @@ struct alfred_modeswitch_v0 { /** * struct alfred_change_interface_v0 - Request to change the interface * @header: TLV header describing the complete packet - * @iface: interface name to be changed to + * @ifaces: interface list (comma separated) to be changed to * * Sent to the daemon by client */ struct alfred_change_interface_v0 { struct alfred_tlv header; - char iface[IFNAMSIZ]; + char ifaces[IFNAMSIZ * 16]; } __packed; diff --git a/recv.c b/recv.c index 2948547..6a257d7 100644 --- a/recv.c +++ b/recv.c @@ -287,6 +287,7 @@ process_alfred_announce_master(struct globals *globals, static int process_alfred_request(struct globals *globals, + struct interface *interface, struct in6_addr *source, struct alfred_request_v0 *request) { @@ -300,8 +301,8 @@ static int process_alfred_request(struct globals *globals, if (len != (sizeof(*request) - sizeof(request->header))) return -1; - push_data(globals, source, SOURCE_SYNCED, request->requested_type, - request->tx_id); + push_data(globals, interface, source, SOURCE_SYNCED, + request->requested_type, request->tx_id); return 0; } @@ -370,7 +371,7 @@ static int process_alfred_status_txend(struct globals *globals, } -int recv_alfred_packet(struct globals *globals) +int recv_alfred_packet(struct globals *globals, struct interface *interface) { uint8_t buf[MAX_PAYLOAD]; ssize_t length; @@ -378,11 +379,11 @@ int recv_alfred_packet(struct globals *globals) struct sockaddr_in6 source; socklen_t sourcelen; - if (globals->netsock < 0) + if (interface->netsock < 0) return -1; sourcelen = sizeof(source); - length = recvfrom(globals->netsock, buf, sizeof(buf), 0, + length = recvfrom(interface->netsock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); if (length <= 0) { perror("read from network socket failed"); @@ -396,8 +397,7 @@ int recv_alfred_packet(struct globals *globals) return -1; /* drop packets from ourselves */ - if (0 == memcmp(&source.sin6_addr, &globals->address, - sizeof(source.sin6_addr))) + if (netsock_own_address(globals, &source.sin6_addr)) return -1; /* drop truncated packets */ @@ -418,7 +418,7 @@ int recv_alfred_packet(struct globals *globals) (struct alfred_announce_master_v0 *)packet); break; case ALFRED_REQUEST: - process_alfred_request(globals, &source.sin6_addr, + process_alfred_request(globals, interface, &source.sin6_addr, (struct alfred_request_v0 *)packet); break; case ALFRED_STATUS_TXEND: diff --git a/send.c b/send.c index 32b7cbb..c1379bd 100644 --- a/send.c +++ b/send.c @@ -26,30 +26,32 @@ #include <sys/socket.h> #include <errno.h> #include <stdio.h> +#include <unistd.h> #include "alfred.h" #include "hash.h" #include "packet.h" +#include "list.h" int announce_master(struct globals *globals) { struct alfred_announce_master_v0 announcement; + struct interface *interface; - if (globals->netsock < 0) - return -1; - - announcement.header.type = ALFRED_ANNOUNCE_MASTER; - announcement.header.version = ALFRED_VERSION; - announcement.header.length = htons(0); + list_for_each_entry(interface, &globals->interfaces, list) { + 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)); + send_alfred_packet(interface, &in6addr_localmcast, + &announcement, sizeof(announcement)); + } return 0; } -int push_data(struct globals *globals, struct in6_addr *destination, - enum data_source max_source_level, int type_filter, - uint16_t tx_id) +int push_data(struct globals *globals, struct interface *interface, + struct in6_addr *destination, enum data_source max_source_level, + int type_filter, uint16_t tx_id) { struct hash_it_t *hashit = NULL; uint8_t buf[MAX_PAYLOAD]; @@ -84,7 +86,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, tlv_length += sizeof(*push) - sizeof(push->header); push->header.length = htons(tlv_length); push->tx.seqno = htons(seqno++); - send_alfred_packet(globals, destination, push, + send_alfred_packet(interface, destination, push, sizeof(*push) + total_length); total_length = 0; } @@ -103,7 +105,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, tlv_length += sizeof(*push) - sizeof(push->header); push->header.length = htons(tlv_length); push->tx.seqno = htons(seqno++); - send_alfred_packet(globals, destination, push, + send_alfred_packet(interface, destination, push, sizeof(*push) + total_length); } @@ -117,7 +119,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, status_end.tx.id = tx_id; status_end.tx.seqno = htons(seqno); - send_alfred_packet(globals, destination, &status_end, + send_alfred_packet(interface, destination, &status_end, sizeof(status_end)); } @@ -128,31 +130,40 @@ int push_data(struct globals *globals, struct in6_addr *destination, int sync_data(struct globals *globals) { struct hash_it_t *hashit = NULL; + struct interface *interface; /* send local data and data from our clients to (all) other servers */ - while (NULL != (hashit = hash_iterate(globals->server_hash, hashit))) { - struct server *server = hashit->bucket->data; - - push_data(globals, &server->address, SOURCE_FIRST_HAND, - NO_FILTER, get_random_id()); + list_for_each_entry(interface, &globals->interfaces, list) { + while (NULL != (hashit = hash_iterate(globals->server_hash, + hashit))) { + struct server *server = hashit->bucket->data; + + push_data(globals, interface, &server->address, + SOURCE_FIRST_HAND, NO_FILTER, + get_random_id()); + } } return 0; } int push_local_data(struct globals *globals) { + struct interface *interface; + /* no server - yet */ if (!globals->best_server) return -1; - push_data(globals, &globals->best_server->address, SOURCE_LOCAL, - NO_FILTER, get_random_id()); + list_for_each_entry(interface, &globals->interfaces, list) { + push_data(globals, interface, &globals->best_server->address, + SOURCE_LOCAL, NO_FILTER, get_random_id()); + } return 0; } -ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length) +ssize_t send_alfred_packet(struct interface *interface, + const struct in6_addr *dest, void *buf, int length) { ssize_t ret; struct sockaddr_in6 dest_addr; @@ -160,19 +171,19 @@ ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, memset(&dest_addr, 0, sizeof(dest_addr)); dest_addr.sin6_family = AF_INET6; dest_addr.sin6_port = htons(ALFRED_PORT); - dest_addr.sin6_scope_id = globals->scope_id; + dest_addr.sin6_scope_id = interface->scope_id; memcpy(&dest_addr.sin6_addr, dest, sizeof(*dest)); - if (globals->netsock < 0) + if (interface->netsock < 0) return 0; - ret = sendto(globals->netsock, buf, length, 0, + ret = sendto(interface->netsock, buf, length, 0, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); if (ret == -EPERM) { perror("Error during sent"); - netsock_close(globals->netsock); - globals->netsock = -1; + close(interface->netsock); + interface->netsock = -1; } return ret; diff --git a/server.c b/server.c index 94e6145..e45bc8a 100644 --- a/server.c +++ b/server.c @@ -32,11 +32,13 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/time.h> +#include <sys/types.h> #include <unistd.h> #include <time.h> #include "alfred.h" #include "batadv_query.h" #include "hash.h" +#include "list.h" static int server_compare(void *d1, void *d2) { @@ -217,21 +219,12 @@ static int purge_data(struct globals *globals) return 0; } -static void check_if_socket(struct globals *globals) +static void check_if_socket(struct interface *interface) { - 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) + if (interface->netsock < 0) return; sock = socket(PF_INET6, SOCK_DGRAM, 0); @@ -241,17 +234,17 @@ static void check_if_socket(struct globals *globals) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, interface->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { perror("can't get interface, closing netsock"); goto close; } - if (globals->scope_id != (uint32_t)ifr.ifr_ifindex) { + if (interface->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); + interface->scope_id, ifr.ifr_ifindex); goto close; } @@ -260,7 +253,7 @@ static void check_if_socket(struct globals *globals) goto close; } - if (memcmp(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6) != 0) { + if (memcmp(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6) != 0) { fprintf(stderr, "iface mac changed, closing netsock\n"); goto close; } @@ -269,16 +262,34 @@ static void check_if_socket(struct globals *globals) return; close: - netsock_close(globals->netsock); - globals->netsock = -1; + close(interface->netsock); + interface->netsock = -1; close(sock); } +static void check_if_sockets(struct globals *globals) +{ + struct timespec now, diff; + struct interface *interface; + + 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; + + list_for_each_entry(interface, &globals->interfaces, list) + check_if_socket(interface); +} + int alfred_server(struct globals *globals) { - int maxsock, ret; + int maxsock, ret, recvs; struct timespec last_check, now, tv; fd_set fds, errfds; + int num_socks; if (create_hashes(globals)) return -1; @@ -286,7 +297,7 @@ int alfred_server(struct globals *globals) if (unix_sock_open_daemon(globals)) return -1; - if (!globals->interface) { + if (list_empty(&globals->interfaces)) { fprintf(stderr, "Can't start server: interface missing\n"); return -1; } @@ -295,8 +306,16 @@ int alfred_server(struct globals *globals) batadv_interface_check(globals->mesh_iface) < 0) return -1; - if (netsock_open(globals)) + num_socks = netsock_open_all(globals); + if (num_socks <= 0) { + fprintf(stderr, "Failed to open interfaces\n"); + return -1; + } + + if (num_socks > 1 && globals->opmode == OPMODE_SLAVE) { + fprintf(stderr, "More than one interface specified in slave mode\n"); return -1; + } clock_gettime(CLOCK_MONOTONIC, &last_check); globals->if_check = last_check; @@ -309,42 +328,31 @@ 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; - if (globals->unix_sock > maxsock) - maxsock = globals->unix_sock; + netsock_reopen(globals); FD_ZERO(&fds); FD_ZERO(&errfds); FD_SET(globals->unix_sock, &fds); - if (globals->netsock >= 0) { - FD_SET(globals->netsock, &fds); - FD_SET(globals->netsock, &errfds); - } + maxsock = globals->unix_sock; + + maxsock = netsock_prepare_select(globals, &fds, maxsock); + maxsock = netsock_prepare_select(globals, &errfds, maxsock); + ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL); if (ret == -1) { perror("main loop select failed ..."); } else if (ret) { - if (globals->netsock >= 0 && - FD_ISSET(globals->netsock, &errfds)) { - fprintf(stderr, "Error on netsock detected\n"); - netsock_close(globals->netsock); - globals->netsock = -1; - } + netsock_check_error(globals, &errfds); if (FD_ISSET(globals->unix_sock, &fds)) { printf("read unix socket\n"); unix_sock_read(globals); continue; - } else if (globals->netsock >= 0 && - FD_ISSET(globals->netsock, &fds)) { - recv_alfred_packet(globals); - continue; + } else { + recvs = netsock_receive_packet(globals, &fds); + if (recvs > 0) + continue; } } clock_gettime(CLOCK_MONOTONIC, &last_check); @@ -359,11 +367,10 @@ int alfred_server(struct globals *globals) push_local_data(globals); } purge_data(globals); - check_if_socket(globals); + check_if_sockets(globals); } - if (globals->netsock >= 0) - netsock_close(globals->netsock); + netsock_close_all(globals); unix_sock_close(globals); return 0; } diff --git a/unix_sock.c b/unix_sock.c index 516c0a5..8a99327 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -31,6 +31,7 @@ #include <sys/un.h> #include <time.h> #include <unistd.h> +#include <errno.h> #include "alfred.h" #include "hash.h" #include "packet.h" @@ -98,6 +99,11 @@ static int unix_sock_add_data(struct globals *globals, struct alfred_data *data; struct dataset *dataset; int len, data_len, ret = -1; + struct interface *interface; + + interface = netsock_first_interface(globals); + if (!interface) + goto err; len = ntohs(push->header.length); @@ -112,7 +118,7 @@ static int unix_sock_add_data(struct globals *globals, data = push->data; data_len = ntohs(data->header.length); - memcpy(data->source, &globals->hwaddr, sizeof(globals->hwaddr)); + memcpy(data->source, &interface->hwaddr, sizeof(interface->hwaddr)); if ((int)(data_len + sizeof(*data)) > len) goto err; @@ -204,6 +210,7 @@ static int unix_sock_req_data(struct globals *globals, int len; uint16_t id; struct transaction_head *head = NULL; + struct interface *interface; len = ntohs(request->header.length); @@ -212,8 +219,10 @@ static int unix_sock_req_data(struct globals *globals, id = ntohs(request->tx_id); + interface = netsock_first_interface(globals); + /* no server to send the request to, only give back what we have now. */ - if (!globals->best_server) + if (!globals->best_server || !interface) return unix_sock_req_data_reply(globals, client_sock, id, request->requested_type); @@ -229,7 +238,7 @@ static int unix_sock_req_data(struct globals *globals, head->client_socket = client_sock; head->requested_type = request->requested_type; - send_alfred_packet(globals, &globals->best_server->address, + send_alfred_packet(interface, &globals->best_server->address, request, sizeof(*request)); return 0; @@ -283,6 +292,9 @@ static int unix_sock_modesw(struct globals *globals, switch (modeswitch->mode) { case ALFRED_MODESWITCH_SLAVE: + if (!list_is_singular(&globals->interfaces)) + goto err; + globals->opmode = OPMODE_SLAVE; break; case ALFRED_MODESWITCH_MASTER: @@ -304,25 +316,21 @@ unix_sock_change_iface(struct globals *globals, 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); + if (globals->opmode == OPMODE_SLAVE) { + if (strstr(change_iface->ifaces, ",") != NULL) { + ret = -EINVAL; + fprintf(stderr, "Tried to set multiple interfaces in slave mode\n"); + goto err; + } + } - free(globals->interface); - globals->interface = iface; - netsock_open(globals); + netsock_set_interfaces(globals, change_iface->ifaces); ret = 0; err:

8 years, 4 months

[alfred] master: alfred: Synchronize data only over correct interfaces (a822b86)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit a822b869fdc538f5ce6a89ae6b527a8a858759e0 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Wed Nov 12 14:54:30 2014 +0100 alfred: Synchronize data only over correct interfaces The server announcements are received over a specific interface. It is enough to synchronize data through the interface where an announcement was received. It only increases the overhead by alfred when sending data over an interface to an server without knowing that he is also reachable over it. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- a822b869fdc538f5ce6a89ae6b527a8a858759e0 alfred.h | 3 ++- netsock.c | 47 ++++++++++++++++++++++++++++++++++++++++- recv.c | 8 ++++--- send.c | 2 +- server.c | 69 +++++++++++++++++++++---------------------------------------- 5 files changed, 77 insertions(+), 52 deletions(-) diff --git a/alfred.h b/alfred.h index cf94af4..05ac870 100644 --- a/alfred.h +++ b/alfred.h @@ -98,6 +98,8 @@ struct interface { char *interface; int netsock; + struct hashtable_t *server_hash; + struct list_head list; }; @@ -117,7 +119,6 @@ struct globals { struct timespec if_check; - struct hashtable_t *server_hash; struct hashtable_t *data_hash; struct hashtable_t *transaction_hash; }; diff --git a/netsock.c b/netsock.c index 703334f..45c03e9 100644 --- a/netsock.c +++ b/netsock.c @@ -28,20 +28,52 @@ #include <stdio.h> #include <string.h> #include <sys/ioctl.h> -#include <sys/socket.h> #include <unistd.h> +#include <stddef.h> +#include <stdint.h> +#include <sys/types.h> #include <stdlib.h> #include <sys/select.h> #include "alfred.h" #include "batadv_query.h" #include "packet.h" #include "list.h" +#include "hash.h" const struct in6_addr in6addr_localmcast = {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }; +static int server_compare(void *d1, void *d2) +{ + struct server *s1 = d1, *s2 = d2; + /* compare source and type */ + if (memcmp(&s1->hwaddr, &s2->hwaddr, sizeof(s1->hwaddr)) == 0) + return 1; + else + return 0; +} + +static int server_choose(void *d1, int size) +{ + struct server *s1 = d1; + uint32_t hash = 0; + size_t i; + + for (i = 0; i < sizeof(s1->hwaddr); i++) { + hash += s1->hwaddr.ether_addr_octet[i]; + hash += (hash << 10); + hash ^= (hash >> 6); + } + + hash += (hash << 3); + hash ^= (hash >> 11); + hash += (hash << 15); + + return hash % size; +} + void netsock_close_all(struct globals *globals) { struct interface *interface, *is; @@ -50,9 +82,12 @@ void netsock_close_all(struct globals *globals) if (interface->netsock >= 0) close(interface->netsock); list_del(&interface->list); + hash_delete(interface->server_hash, free); free(interface->interface); free(interface); } + + globals->best_server = NULL; } struct interface *netsock_first_interface(struct globals *globals) @@ -106,6 +141,7 @@ int netsock_set_interfaces(struct globals *globals, char *interfaces) interface->scope_id = 0; interface->interface = NULL; interface->netsock = -1; + interface->server_hash = NULL; interface->interface = strdup(token); if (!interface->interface) { @@ -114,6 +150,15 @@ int netsock_set_interfaces(struct globals *globals, char *interfaces) return -ENOMEM; } + interface->server_hash = hash_new(64, server_compare, + server_choose); + if (!interface->server_hash) { + free(interface->interface); + free(interface); + netsock_close_all(globals); + return -ENOMEM; + } + list_add(&interface->list, &globals->interfaces); } diff --git a/recv.c b/recv.c index 6a257d7..90db0b3 100644 --- a/recv.c +++ b/recv.c @@ -231,6 +231,7 @@ err: static int process_alfred_announce_master(struct globals *globals, + struct interface *interface, struct in6_addr *source, struct alfred_announce_master_v0 *announce) { @@ -252,7 +253,7 @@ process_alfred_announce_master(struct globals *globals, if (len != (sizeof(*announce) - sizeof(announce->header))) return -1; - server = hash_find(globals->server_hash, &mac); + server = hash_find(interface->server_hash, &mac); if (!server) { server = malloc(sizeof(*server)); if (!server) @@ -261,7 +262,7 @@ process_alfred_announce_master(struct globals *globals, memcpy(&server->hwaddr, &mac, ETH_ALEN); memcpy(&server->address, source, sizeof(*source)); - if (hash_add(globals->server_hash, server)) { + if (hash_add(interface->server_hash, server)) { free(server); return -1; } @@ -414,7 +415,8 @@ int recv_alfred_packet(struct globals *globals, struct interface *interface) (struct alfred_push_data_v0 *)packet); break; case ALFRED_ANNOUNCE_MASTER: - process_alfred_announce_master(globals, &source.sin6_addr, + process_alfred_announce_master(globals, interface, + &source.sin6_addr, (struct alfred_announce_master_v0 *)packet); break; case ALFRED_REQUEST: diff --git a/send.c b/send.c index c1379bd..19cc867 100644 --- a/send.c +++ b/send.c @@ -134,7 +134,7 @@ int sync_data(struct globals *globals) /* send local data and data from our clients to (all) other servers */ list_for_each_entry(interface, &globals->interfaces, list) { - while (NULL != (hashit = hash_iterate(globals->server_hash, + while (NULL != (hashit = hash_iterate(interface->server_hash, hashit))) { struct server *server = hashit->bucket->data; diff --git a/server.c b/server.c index e45bc8a..66809d9 100644 --- a/server.c +++ b/server.c @@ -40,35 +40,6 @@ #include "hash.h" #include "list.h" -static int server_compare(void *d1, void *d2) -{ - struct server *s1 = d1, *s2 = d2; - /* compare source and type */ - if (memcmp(&s1->hwaddr, &s2->hwaddr, sizeof(s1->hwaddr)) == 0) - return 1; - else - return 0; -} - -static int server_choose(void *d1, int size) -{ - struct server *s1 = d1; - uint32_t hash = 0; - size_t i; - - for (i = 0; i < sizeof(s1->hwaddr); i++) { - hash += s1->hwaddr.ether_addr_octet[i]; - hash += (hash << 10); - hash ^= (hash >> 6); - } - - hash += (hash << 3); - hash ^= (hash >> 11); - hash += (hash << 15); - - return hash % size; -} - static int data_compare(void *d1, void *d2) { /* compare source and type */ @@ -135,11 +106,9 @@ static int tx_choose(void *d1, int size) static int create_hashes(struct globals *globals) { - globals->server_hash = hash_new(64, server_compare, server_choose); globals->data_hash = hash_new(128, data_compare, data_choose); globals->transaction_hash = hash_new(64, tx_compare, tx_choose); - if (!globals->server_hash || !globals->data_hash || - !globals->transaction_hash) + if (!globals->data_hash || !globals->transaction_hash) return -1; return 0; @@ -150,13 +119,17 @@ int set_best_server(struct globals *globals) struct hash_it_t *hashit = NULL; struct server *best_server = NULL; int best_tq = -1; + struct interface *interface; - while (NULL != (hashit = hash_iterate(globals->server_hash, hashit))) { - struct server *server = hashit->bucket->data; + list_for_each_entry(interface, &globals->interfaces, list) { + while (NULL != (hashit = hash_iterate(interface->server_hash, + hashit))) { + struct server *server = hashit->bucket->data; - if (server->tq > best_tq) { - best_tq = server->tq; - best_server = server; + if (server->tq > best_tq) { + best_tq = server->tq; + best_server = server; + } } } @@ -169,6 +142,7 @@ static int purge_data(struct globals *globals) { struct hash_it_t *hashit = NULL; struct timespec now, diff; + struct interface *interface; clock_gettime(CLOCK_MONOTONIC, &now); @@ -184,18 +158,21 @@ static int purge_data(struct globals *globals) free(dataset); } - while (NULL != (hashit = hash_iterate(globals->server_hash, hashit))) { - struct server *server = hashit->bucket->data; + list_for_each_entry(interface, &globals->interfaces, list) { + while (NULL != (hashit = hash_iterate(interface->server_hash, + hashit))) { + struct server *server = hashit->bucket->data; - time_diff(&now, &server->last_seen, &diff); - if (diff.tv_sec < ALFRED_SERVER_TIMEOUT) - continue; + time_diff(&now, &server->last_seen, &diff); + if (diff.tv_sec < ALFRED_SERVER_TIMEOUT) + continue; - if (globals->best_server == server) - globals->best_server = NULL; + if (globals->best_server == server) + globals->best_server = NULL; - hash_remove_bucket(globals->server_hash, hashit); - free(server); + hash_remove_bucket(interface->server_hash, hashit); + free(server); + } } if (!globals->best_server)

8 years, 4 months

[alfred] master: alfred: Add support for multiple interfaces per master (eb8b960)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit eb8b960eb3169ca912a6c85f4c3ed43a9100bac6 Author: Sven Eckelmann <sven(a)open-mesh.com> Date: Wed Nov 12 14:54:29 2014 +0100 alfred: Add support for multiple interfaces per master It may required in some situations that all alfred master servers are potentially connected to the same backbone network but cannot see each other through the mesh. The data may still be exchanged and thus a master instance must listen for requests on the mesh and synchronize data over the backbone network. The limitation that data can only be synchronized over one master hop and not more still holds true. Also alfred servers in slave mode are not allowed to operate on multiple interfaces. This is especially important when switching from master to slave mode because this can fail now when multiple interfaces are configured. Signed-off-by: Sven Eckelmann <sven(a)open-mesh.com> [simon: remove doubel bracket at strtok_r] Signed-off-by: Simon Wunderlich <simon(a)open-mesh.com> >--------------------------------------------------------------- eb8b960eb3169ca912a6c85f4c3ed43a9100bac6 alfred.h | 40 +++++++++---- client.c | 58 ++++++++++++++----- main.c | 12 ++-- man/alfred.8 | 4 +- netsock.c | 183 ++++++++++++++++++++++++++++++++++++++++++++++++++++++---- packet.h | 4 +- recv.c | 16 ++--- send.c | 67 ++++++++++++--------- server.c | 97 ++++++++++++++++--------------- unix_sock.c | 38 +++++++----- 10 files changed, 378 insertions(+), 141 deletions(-) diff --git a/alfred.h b/alfred.h index c83f7f0..cf94af4 100644 --- a/alfred.h +++ b/alfred.h @@ -27,6 +27,8 @@ #include <netinet/in.h> #include <stdint.h> #include <time.h> +#include <sys/select.h> +#include <sys/types.h> #include "list.h" #include "packet.h" @@ -89,19 +91,27 @@ enum clientmode { CLIENT_CHANGE_INTERFACE, }; -struct globals { +struct interface { struct ether_addr hwaddr; struct in6_addr address; uint32_t scope_id; - struct server *best_server; /* NULL if we are a server ourselves */ char *interface; + int netsock; + + struct list_head list; +}; + +struct globals { + struct list_head interfaces; + + char *change_interface; + struct server *best_server; /* NULL if we are a server ourselves */ const char *mesh_iface; enum opmode opmode; enum clientmode clientmode; int clientmode_arg; int clientmode_version; - int netsock; int unix_sock; const char *unix_path; @@ -128,7 +138,7 @@ 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); +int recv_alfred_packet(struct globals *globals, struct interface *interface); struct transaction_head * transaction_add(struct globals *globals, struct ether_addr mac, uint16_t id); struct transaction_head * @@ -137,14 +147,14 @@ transaction_clean_hash(struct globals *globals, struct transaction_head *transaction_clean(struct globals *globals, struct transaction_head *head); /* send.c */ -int push_data(struct globals *globals, struct in6_addr *destination, - enum data_source max_source_level, int type_filter, - uint16_t tx_id); +int push_data(struct globals *globals, struct interface *interface, + struct in6_addr *destination, enum data_source max_source_level, + int type_filter, uint16_t tx_id); int announce_master(struct globals *globals); int push_local_data(struct globals *globals); int sync_data(struct globals *globals); -ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length); +ssize_t send_alfred_packet(struct interface *interface, + 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); @@ -155,8 +165,16 @@ int unix_sock_req_data_finish(struct globals *globals, /* vis.c */ int vis_update_data(struct globals *globals); /* netsock.c */ -int netsock_open(struct globals *globals); -int netsock_close(int sock); +int netsock_open_all(struct globals *globals); +void netsock_close_all(struct globals *globals); +int netsock_set_interfaces(struct globals *globals, char *interfaces); +struct interface *netsock_first_interface(struct globals *globals); +void netsock_reopen(struct globals *globals); +int netsock_prepare_select(struct globals *globals, fd_set *fds, int maxsock); +void netsock_check_error(struct globals *globals, fd_set *errfds); +int netsock_receive_packet(struct globals *globals, fd_set *fds); +int netsock_own_address(const struct globals *globals, + const struct in6_addr *address); /* util.c */ int time_diff(struct timespec *tv1, struct timespec *tv2, struct timespec *tvdiff); diff --git a/client.c b/client.c index 48313db..05983ed 100644 --- a/client.c +++ b/client.c @@ -27,6 +27,9 @@ #include <stdio.h> #include <string.h> #include <unistd.h> +#include <net/if.h> +#include <stddef.h> +#include <sys/socket.h> #include "alfred.h" #include "packet.h" @@ -220,21 +223,15 @@ int alfred_client_modeswitch(struct globals *globals) return 0; } -int alfred_client_change_interface(struct globals *globals) +static int check_interface(const char *iface) { - unsigned char buf[MAX_PAYLOAD]; - struct alfred_change_interface_v0 *change_interface; - struct ifreq ifr; - int ret, len; int sock = -1; + struct ifreq ifr; - if (unix_sock_open_client(globals)) - return -1; - - if (strlen(globals->interface) > IFNAMSIZ) { - fprintf(stderr, "%s: interface name too long, not changing\n", + if (strlen(iface) > IFNAMSIZ) { + fprintf(stderr, "%s: interface name list too long, not changing\n", __func__); - return 0; + return -1; } sock = socket(PF_INET6, SOCK_DGRAM, 0); @@ -243,7 +240,7 @@ int alfred_client_change_interface(struct globals *globals) return -1; } - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, iface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { fprintf(stderr, "%s: can't find interface, not changing\n", @@ -254,14 +251,47 @@ int alfred_client_change_interface(struct globals *globals) close(sock); + return 0; +} + +int alfred_client_change_interface(struct globals *globals) +{ + unsigned char buf[MAX_PAYLOAD]; + struct alfred_change_interface_v0 *change_interface; + int ret, len; + char *input, *token, *saveptr; + + if (unix_sock_open_client(globals)) + return -1; + + if (strlen(globals->change_interface) > sizeof(change_interface->ifaces)) { + fprintf(stderr, "%s: interface name list too long, not changing\n", + __func__); + return 0; + } + 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)); + strncpy(change_interface->ifaces, globals->change_interface, + sizeof(change_interface->ifaces)); + change_interface->ifaces[sizeof(change_interface->ifaces) - 1] = '\0'; + + /* test it before sending + * globals->change_interface is now saved in change_interface->ifaces + * and can be modified by strtok_r + */ + input = globals->change_interface; + while (token = strtok_r(input, ",", &saveptr)) { + input = NULL; + + ret = check_interface(token); + if (ret < 0) + return 0; + } ret = write(globals->unix_sock, buf, len); if (ret != len) diff --git a/main.c b/main.c index 5a4f1e6..7eb8baa 100644 --- a/main.c +++ b/main.c @@ -26,6 +26,7 @@ #include <string.h> #include "alfred.h" #include "packet.h" +#include "list.h" static struct globals alfred_globals; @@ -40,10 +41,10 @@ static void alfred_usage(void) 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(" -I, --change-interface [interface] change to the specified interface(s)\n"); printf("\n"); printf("server mode options:\n"); - printf(" -i, --interface specify the interface to listen on\n"); + printf(" -i, --interface specify the interface (or comma separated list of interfaes) 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"); @@ -80,9 +81,10 @@ static struct globals *alfred_init(int argc, char *argv[]) globals = &alfred_globals; memset(globals, 0, sizeof(*globals)); + INIT_LIST_HEAD(&globals->interfaces); + globals->change_interface = NULL; globals->opmode = OPMODE_SLAVE; globals->clientmode = CLIENT_NONE; - globals->interface = NULL; globals->best_server = NULL; globals->clientmode_version = 0; globals->mesh_iface = "bat0"; @@ -116,7 +118,7 @@ static struct globals *alfred_init(int argc, char *argv[]) globals->opmode = OPMODE_MASTER; break; case 'i': - globals->interface = strdup(optarg); + netsock_set_interfaces(globals, optarg); break; case 'b': globals->mesh_iface = strdup(optarg); @@ -142,7 +144,7 @@ static struct globals *alfred_init(int argc, char *argv[]) break; case 'I': globals->clientmode = CLIENT_CHANGE_INTERFACE; - globals->interface = strdup(optarg); + globals->change_interface = strdup(optarg); break; case 'u': globals->unix_path = optarg; diff --git a/man/alfred.8 b/man/alfred.8 index 35dee45..0449189 100644 --- a/man/alfred.8 +++ b/man/alfred.8 @@ -82,12 +82,12 @@ to 0 ('\fB\-V\fP 0'). .fi .TP \fB\-I\fP, \fB\-\-change\-interface\fP \fIinterface\fP -Change the alfred server to use the new \fBinterface\fP +Change the alfred server to use the new \fBinterface\fP(s) . .SH SERVER OPTIONS .TP \fB\-i\fP, \fB\-\-interface\fP \fiface\fP -Specify the interface to listen on +Specify the interface (or comma separated list of interfaes) to listen on .TP \fB\-b\fP \fIbatmanif\fP Specify the batman-adv interface configured on the system (default: bat0). diff --git a/netsock.c b/netsock.c index b59b7b7..703334f 100644 --- a/netsock.c +++ b/netsock.c @@ -22,6 +22,7 @@ #include <sys/socket.h> #include <errno.h> #include <fcntl.h> +#include <net/ethernet.h> #include <net/if.h> #include <netinet/in.h> #include <stdio.h> @@ -29,28 +30,104 @@ #include <sys/ioctl.h> #include <sys/socket.h> #include <unistd.h> +#include <stdlib.h> +#include <sys/select.h> #include "alfred.h" #include "batadv_query.h" #include "packet.h" +#include "list.h" const struct in6_addr in6addr_localmcast = {{{ 0xff, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01 } } }; -int netsock_close(int sock) +void netsock_close_all(struct globals *globals) { - return close(sock); + struct interface *interface, *is; + + list_for_each_entry_safe(interface, is, &globals->interfaces, list) { + if (interface->netsock >= 0) + close(interface->netsock); + list_del(&interface->list); + free(interface->interface); + free(interface); + } +} + +struct interface *netsock_first_interface(struct globals *globals) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0) + return interface; + } + + return NULL; +} + +static struct interface *netsock_find_interface(struct globals *globals, + const char *name) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (strcmp(name, interface->interface) == 0) + return interface; + } + + return NULL; +} + +int netsock_set_interfaces(struct globals *globals, char *interfaces) +{ + char *input, *saveptr, *token; + struct interface *interface; + + netsock_close_all(globals); + + input = interfaces; + while ((token = strtok_r(input, ",", &saveptr))) { + input = NULL; + + interface = netsock_find_interface(globals, token); + if (interface) + continue; + + interface = malloc(sizeof(*interface)); + if (!interface) { + netsock_close_all(globals); + return -ENOMEM; + } + + memset(&interface->hwaddr, 0, sizeof(interface->hwaddr)); + memset(&interface->address, 0, sizeof(interface->address)); + interface->scope_id = 0; + interface->interface = NULL; + interface->netsock = -1; + + interface->interface = strdup(token); + if (!interface->interface) { + free(interface); + netsock_close_all(globals); + return -ENOMEM; + } + + list_add(&interface->list, &globals->interfaces); + } + + return 0; } -int netsock_open(struct globals *globals) +static int netsock_open(struct interface *interface) { int sock; struct sockaddr_in6 sin6; struct ifreq ifr; int ret; - globals->netsock = -1; + interface->netsock = -1; sock = socket(PF_INET6, SOCK_DGRAM, IPPROTO_UDP); if (sock < 0) { @@ -59,14 +136,14 @@ int netsock_open(struct globals *globals) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, interface->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { perror("can't get interface"); goto err; } - globals->scope_id = ifr.ifr_ifindex; + interface->scope_id = ifr.ifr_ifindex; memset(&sin6, 0, sizeof(sin6)); sin6.sin6_port = htons(ALFRED_PORT); @@ -79,11 +156,11 @@ int netsock_open(struct globals *globals) goto err; } - memcpy(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); - mac_to_ipv6(&globals->hwaddr, &globals->address); + memcpy(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6); + mac_to_ipv6(&interface->hwaddr, &interface->address); - if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, - globals->interface, strlen(globals->interface) + 1)) { + if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, interface->interface, + strlen(interface->interface) + 1)) { perror("can't bind to device"); goto err; } @@ -105,10 +182,94 @@ int netsock_open(struct globals *globals) goto err; } - globals->netsock = sock; + interface->netsock = sock; return 0; err: close(sock); return -1; } + +int netsock_open_all(struct globals *globals) +{ + int num_socks = 0; + int ret; + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + ret = netsock_open(interface); + if (ret >= 0) + num_socks++; + } + + return num_socks; +} + +void netsock_reopen(struct globals *globals) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock < 0) + netsock_open(interface); + } +} + +int netsock_prepare_select(struct globals *globals, fd_set *fds, int maxsock) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0) { + FD_SET(interface->netsock, fds); + if (maxsock < interface->netsock) + maxsock = interface->netsock; + } + } + + return maxsock; +} + +void netsock_check_error(struct globals *globals, fd_set *errfds) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0 && + FD_ISSET(interface->netsock, errfds)) { + fprintf(stderr, "Error on netsock detected\n"); + close(interface->netsock); + interface->netsock = -1; + } + } +} + +int netsock_receive_packet(struct globals *globals, fd_set *fds) +{ + struct interface *interface; + int recvs = 0; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (interface->netsock >= 0 && + FD_ISSET(interface->netsock, fds)) { + recv_alfred_packet(globals, interface); + recvs++; + } + } + + return recvs; +} + +int netsock_own_address(const struct globals *globals, + const struct in6_addr *address) +{ + struct interface *interface; + + list_for_each_entry(interface, &globals->interfaces, list) { + if (0 == memcmp(address, &interface->address, + sizeof(*address))) + return 1; + } + + return 0; +} diff --git a/packet.h b/packet.h index dc06d65..87ad263 100644 --- a/packet.h +++ b/packet.h @@ -149,13 +149,13 @@ struct alfred_modeswitch_v0 { /** * struct alfred_change_interface_v0 - Request to change the interface * @header: TLV header describing the complete packet - * @iface: interface name to be changed to + * @ifaces: interface list (comma separated) to be changed to * * Sent to the daemon by client */ struct alfred_change_interface_v0 { struct alfred_tlv header; - char iface[IFNAMSIZ]; + char ifaces[IFNAMSIZ * 16]; } __packed; diff --git a/recv.c b/recv.c index 2948547..6a257d7 100644 --- a/recv.c +++ b/recv.c @@ -287,6 +287,7 @@ process_alfred_announce_master(struct globals *globals, static int process_alfred_request(struct globals *globals, + struct interface *interface, struct in6_addr *source, struct alfred_request_v0 *request) { @@ -300,8 +301,8 @@ static int process_alfred_request(struct globals *globals, if (len != (sizeof(*request) - sizeof(request->header))) return -1; - push_data(globals, source, SOURCE_SYNCED, request->requested_type, - request->tx_id); + push_data(globals, interface, source, SOURCE_SYNCED, + request->requested_type, request->tx_id); return 0; } @@ -370,7 +371,7 @@ static int process_alfred_status_txend(struct globals *globals, } -int recv_alfred_packet(struct globals *globals) +int recv_alfred_packet(struct globals *globals, struct interface *interface) { uint8_t buf[MAX_PAYLOAD]; ssize_t length; @@ -378,11 +379,11 @@ int recv_alfred_packet(struct globals *globals) struct sockaddr_in6 source; socklen_t sourcelen; - if (globals->netsock < 0) + if (interface->netsock < 0) return -1; sourcelen = sizeof(source); - length = recvfrom(globals->netsock, buf, sizeof(buf), 0, + length = recvfrom(interface->netsock, buf, sizeof(buf), 0, (struct sockaddr *)&source, &sourcelen); if (length <= 0) { perror("read from network socket failed"); @@ -396,8 +397,7 @@ int recv_alfred_packet(struct globals *globals) return -1; /* drop packets from ourselves */ - if (0 == memcmp(&source.sin6_addr, &globals->address, - sizeof(source.sin6_addr))) + if (netsock_own_address(globals, &source.sin6_addr)) return -1; /* drop truncated packets */ @@ -418,7 +418,7 @@ int recv_alfred_packet(struct globals *globals) (struct alfred_announce_master_v0 *)packet); break; case ALFRED_REQUEST: - process_alfred_request(globals, &source.sin6_addr, + process_alfred_request(globals, interface, &source.sin6_addr, (struct alfred_request_v0 *)packet); break; case ALFRED_STATUS_TXEND: diff --git a/send.c b/send.c index 32b7cbb..c1379bd 100644 --- a/send.c +++ b/send.c @@ -26,30 +26,32 @@ #include <sys/socket.h> #include <errno.h> #include <stdio.h> +#include <unistd.h> #include "alfred.h" #include "hash.h" #include "packet.h" +#include "list.h" int announce_master(struct globals *globals) { struct alfred_announce_master_v0 announcement; + struct interface *interface; - if (globals->netsock < 0) - return -1; - - announcement.header.type = ALFRED_ANNOUNCE_MASTER; - announcement.header.version = ALFRED_VERSION; - announcement.header.length = htons(0); + list_for_each_entry(interface, &globals->interfaces, list) { + 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)); + send_alfred_packet(interface, &in6addr_localmcast, + &announcement, sizeof(announcement)); + } return 0; } -int push_data(struct globals *globals, struct in6_addr *destination, - enum data_source max_source_level, int type_filter, - uint16_t tx_id) +int push_data(struct globals *globals, struct interface *interface, + struct in6_addr *destination, enum data_source max_source_level, + int type_filter, uint16_t tx_id) { struct hash_it_t *hashit = NULL; uint8_t buf[MAX_PAYLOAD]; @@ -84,7 +86,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, tlv_length += sizeof(*push) - sizeof(push->header); push->header.length = htons(tlv_length); push->tx.seqno = htons(seqno++); - send_alfred_packet(globals, destination, push, + send_alfred_packet(interface, destination, push, sizeof(*push) + total_length); total_length = 0; } @@ -103,7 +105,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, tlv_length += sizeof(*push) - sizeof(push->header); push->header.length = htons(tlv_length); push->tx.seqno = htons(seqno++); - send_alfred_packet(globals, destination, push, + send_alfred_packet(interface, destination, push, sizeof(*push) + total_length); } @@ -117,7 +119,7 @@ int push_data(struct globals *globals, struct in6_addr *destination, status_end.tx.id = tx_id; status_end.tx.seqno = htons(seqno); - send_alfred_packet(globals, destination, &status_end, + send_alfred_packet(interface, destination, &status_end, sizeof(status_end)); } @@ -128,31 +130,40 @@ int push_data(struct globals *globals, struct in6_addr *destination, int sync_data(struct globals *globals) { struct hash_it_t *hashit = NULL; + struct interface *interface; /* send local data and data from our clients to (all) other servers */ - while (NULL != (hashit = hash_iterate(globals->server_hash, hashit))) { - struct server *server = hashit->bucket->data; - - push_data(globals, &server->address, SOURCE_FIRST_HAND, - NO_FILTER, get_random_id()); + list_for_each_entry(interface, &globals->interfaces, list) { + while (NULL != (hashit = hash_iterate(globals->server_hash, + hashit))) { + struct server *server = hashit->bucket->data; + + push_data(globals, interface, &server->address, + SOURCE_FIRST_HAND, NO_FILTER, + get_random_id()); + } } return 0; } int push_local_data(struct globals *globals) { + struct interface *interface; + /* no server - yet */ if (!globals->best_server) return -1; - push_data(globals, &globals->best_server->address, SOURCE_LOCAL, - NO_FILTER, get_random_id()); + list_for_each_entry(interface, &globals->interfaces, list) { + push_data(globals, interface, &globals->best_server->address, + SOURCE_LOCAL, NO_FILTER, get_random_id()); + } return 0; } -ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, - void *buf, int length) +ssize_t send_alfred_packet(struct interface *interface, + const struct in6_addr *dest, void *buf, int length) { ssize_t ret; struct sockaddr_in6 dest_addr; @@ -160,19 +171,19 @@ ssize_t send_alfred_packet(struct globals *globals, const struct in6_addr *dest, memset(&dest_addr, 0, sizeof(dest_addr)); dest_addr.sin6_family = AF_INET6; dest_addr.sin6_port = htons(ALFRED_PORT); - dest_addr.sin6_scope_id = globals->scope_id; + dest_addr.sin6_scope_id = interface->scope_id; memcpy(&dest_addr.sin6_addr, dest, sizeof(*dest)); - if (globals->netsock < 0) + if (interface->netsock < 0) return 0; - ret = sendto(globals->netsock, buf, length, 0, + ret = sendto(interface->netsock, buf, length, 0, (struct sockaddr *)&dest_addr, sizeof(struct sockaddr_in6)); if (ret == -EPERM) { perror("Error during sent"); - netsock_close(globals->netsock); - globals->netsock = -1; + close(interface->netsock); + interface->netsock = -1; } return ret; diff --git a/server.c b/server.c index 94e6145..e45bc8a 100644 --- a/server.c +++ b/server.c @@ -32,11 +32,13 @@ #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/time.h> +#include <sys/types.h> #include <unistd.h> #include <time.h> #include "alfred.h" #include "batadv_query.h" #include "hash.h" +#include "list.h" static int server_compare(void *d1, void *d2) { @@ -217,21 +219,12 @@ static int purge_data(struct globals *globals) return 0; } -static void check_if_socket(struct globals *globals) +static void check_if_socket(struct interface *interface) { - 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) + if (interface->netsock < 0) return; sock = socket(PF_INET6, SOCK_DGRAM, 0); @@ -241,17 +234,17 @@ static void check_if_socket(struct globals *globals) } memset(&ifr, 0, sizeof(ifr)); - strncpy(ifr.ifr_name, globals->interface, IFNAMSIZ); + strncpy(ifr.ifr_name, interface->interface, IFNAMSIZ); ifr.ifr_name[IFNAMSIZ - 1] = '\0'; if (ioctl(sock, SIOCGIFINDEX, &ifr) == -1) { perror("can't get interface, closing netsock"); goto close; } - if (globals->scope_id != (uint32_t)ifr.ifr_ifindex) { + if (interface->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); + interface->scope_id, ifr.ifr_ifindex); goto close; } @@ -260,7 +253,7 @@ static void check_if_socket(struct globals *globals) goto close; } - if (memcmp(&globals->hwaddr, &ifr.ifr_hwaddr.sa_data, 6) != 0) { + if (memcmp(&interface->hwaddr, &ifr.ifr_hwaddr.sa_data, 6) != 0) { fprintf(stderr, "iface mac changed, closing netsock\n"); goto close; } @@ -269,16 +262,34 @@ static void check_if_socket(struct globals *globals) return; close: - netsock_close(globals->netsock); - globals->netsock = -1; + close(interface->netsock); + interface->netsock = -1; close(sock); } +static void check_if_sockets(struct globals *globals) +{ + struct timespec now, diff; + struct interface *interface; + + 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; + + list_for_each_entry(interface, &globals->interfaces, list) + check_if_socket(interface); +} + int alfred_server(struct globals *globals) { - int maxsock, ret; + int maxsock, ret, recvs; struct timespec last_check, now, tv; fd_set fds, errfds; + int num_socks; if (create_hashes(globals)) return -1; @@ -286,7 +297,7 @@ int alfred_server(struct globals *globals) if (unix_sock_open_daemon(globals)) return -1; - if (!globals->interface) { + if (list_empty(&globals->interfaces)) { fprintf(stderr, "Can't start server: interface missing\n"); return -1; } @@ -295,8 +306,16 @@ int alfred_server(struct globals *globals) batadv_interface_check(globals->mesh_iface) < 0) return -1; - if (netsock_open(globals)) + num_socks = netsock_open_all(globals); + if (num_socks <= 0) { + fprintf(stderr, "Failed to open interfaces\n"); + return -1; + } + + if (num_socks > 1 && globals->opmode == OPMODE_SLAVE) { + fprintf(stderr, "More than one interface specified in slave mode\n"); return -1; + } clock_gettime(CLOCK_MONOTONIC, &last_check); globals->if_check = last_check; @@ -309,42 +328,31 @@ 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; - if (globals->unix_sock > maxsock) - maxsock = globals->unix_sock; + netsock_reopen(globals); FD_ZERO(&fds); FD_ZERO(&errfds); FD_SET(globals->unix_sock, &fds); - if (globals->netsock >= 0) { - FD_SET(globals->netsock, &fds); - FD_SET(globals->netsock, &errfds); - } + maxsock = globals->unix_sock; + + maxsock = netsock_prepare_select(globals, &fds, maxsock); + maxsock = netsock_prepare_select(globals, &errfds, maxsock); + ret = pselect(maxsock + 1, &fds, NULL, &errfds, &tv, NULL); if (ret == -1) { perror("main loop select failed ..."); } else if (ret) { - if (globals->netsock >= 0 && - FD_ISSET(globals->netsock, &errfds)) { - fprintf(stderr, "Error on netsock detected\n"); - netsock_close(globals->netsock); - globals->netsock = -1; - } + netsock_check_error(globals, &errfds); if (FD_ISSET(globals->unix_sock, &fds)) { printf("read unix socket\n"); unix_sock_read(globals); continue; - } else if (globals->netsock >= 0 && - FD_ISSET(globals->netsock, &fds)) { - recv_alfred_packet(globals); - continue; + } else { + recvs = netsock_receive_packet(globals, &fds); + if (recvs > 0) + continue; } } clock_gettime(CLOCK_MONOTONIC, &last_check); @@ -359,11 +367,10 @@ int alfred_server(struct globals *globals) push_local_data(globals); } purge_data(globals); - check_if_socket(globals); + check_if_sockets(globals); } - if (globals->netsock >= 0) - netsock_close(globals->netsock); + netsock_close_all(globals); unix_sock_close(globals); return 0; } diff --git a/unix_sock.c b/unix_sock.c index 516c0a5..8a99327 100644 --- a/unix_sock.c +++ b/unix_sock.c @@ -31,6 +31,7 @@ #include <sys/un.h> #include <time.h> #include <unistd.h> +#include <errno.h> #include "alfred.h" #include "hash.h" #include "packet.h" @@ -98,6 +99,11 @@ static int unix_sock_add_data(struct globals *globals, struct alfred_data *data; struct dataset *dataset; int len, data_len, ret = -1; + struct interface *interface; + + interface = netsock_first_interface(globals); + if (!interface) + goto err; len = ntohs(push->header.length); @@ -112,7 +118,7 @@ static int unix_sock_add_data(struct globals *globals, data = push->data; data_len = ntohs(data->header.length); - memcpy(data->source, &globals->hwaddr, sizeof(globals->hwaddr)); + memcpy(data->source, &interface->hwaddr, sizeof(interface->hwaddr)); if ((int)(data_len + sizeof(*data)) > len) goto err; @@ -204,6 +210,7 @@ static int unix_sock_req_data(struct globals *globals, int len; uint16_t id; struct transaction_head *head = NULL; + struct interface *interface; len = ntohs(request->header.length); @@ -212,8 +219,10 @@ static int unix_sock_req_data(struct globals *globals, id = ntohs(request->tx_id); + interface = netsock_first_interface(globals); + /* no server to send the request to, only give back what we have now. */ - if (!globals->best_server) + if (!globals->best_server || !interface) return unix_sock_req_data_reply(globals, client_sock, id, request->requested_type); @@ -229,7 +238,7 @@ static int unix_sock_req_data(struct globals *globals, head->client_socket = client_sock; head->requested_type = request->requested_type; - send_alfred_packet(globals, &globals->best_server->address, + send_alfred_packet(interface, &globals->best_server->address, request, sizeof(*request)); return 0; @@ -283,6 +292,9 @@ static int unix_sock_modesw(struct globals *globals, switch (modeswitch->mode) { case ALFRED_MODESWITCH_SLAVE: + if (!list_is_singular(&globals->interfaces)) + goto err; + globals->opmode = OPMODE_SLAVE; break; case ALFRED_MODESWITCH_MASTER: @@ -304,25 +316,21 @@ unix_sock_change_iface(struct globals *globals, 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); + if (globals->opmode == OPMODE_SLAVE) { + if (strstr(change_iface->ifaces, ",") != NULL) { + ret = -EINVAL; + fprintf(stderr, "Tried to set multiple interfaces in slave mode\n"); + goto err; + } + } - free(globals->interface); - globals->interface = iface; - netsock_open(globals); + netsock_set_interfaces(globals, change_iface->ifaces); ret = 0; err:

8 years, 4 months

[linux-merge]linux integration; annotated tag, v3.18-rc4, created. v3.18-rc4

by postmaster＠open-mesh.org

The annotated tag, v3.18-rc4 has been created at 5fe21907a952c3fa0afca6cd8237dd3386cff37f (tag) tagging 206c5f60a3d902bc4b56dab2de3e88de5eb06108 (commit) replaces v3.18-rc3 tagged by Linus Torvalds on Sun Nov 9 14:55:38 2014 -0800 - Shortlog ------------------------------------------------------------ Linux 3.18-rc4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQEcBAABAgAGBQJUX/DqAAoJEHm+PkMAQRiGLtQH/iAt3fRHlYDXjaJian/KG1Cb wVP0I+HWZmvVmmd0PzyaxCZLgRNwdmmYHEH4QLy2JwZ3jZfFHlxhy+hDWCgz+67t bIzkLs0Pf1T4kJ2+r8qW2kBEz9PWJHGTQw7NTqZ++Ts3rPptBA6Fg4mEJ6fQigXy qRIY68DpipUkXV9BWBWijnTmrvP5tt7JtPzBr4DC8frMjvWct8+XwYhc2k2tEv2j LwLYb1OW6PUpPv2BQBfWjqqH77vYNQVhJwuwGcDe2YZdI0UFkDheL24+RbbPcZ4f OnrLjJSSgzv6lBWkAaXZK7/WJ/JZbXxEqHzWZQ3xXoQov97bm7lEYJqqi5gDasQ= =6Qpa -----END PGP SIGNATURE----- ----------------------------------------------------------------------- -- linux integration

8 years, 4 months

[batman-adv] master's head updated: Merge branch 'next' (428493b)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 9ed2fc7 batman-adv: clear control block of received socket buffers 604adeb Merge branch 'maint' into next 428493b Merge branch 'next'

8 years, 4 months

[batman-adv] master: Merge branch 'next' (428493b)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : master >--------------------------------------------------------------- commit 428493b16ca8989b8f8d34fa2ad2bf1a19342a61 Merge: 882d728 604adeb Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 9 12:54:40 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 428493b16ca8989b8f8d34fa2ad2bf1a19342a61 main.c | 3 +++ 1 file changed, 3 insertions(+)

8 years, 4 months

[batman-adv] next's head updated: Merge branch 'maint' into next (604adeb)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'next' now includes: 9ed2fc7 batman-adv: clear control block of received socket buffers 604adeb Merge branch 'maint' into next

8 years, 4 months

[batman-adv] next: Merge branch 'maint' into next (604adeb)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : next >--------------------------------------------------------------- commit 604adeba4a10fdfdab6389babf28d173c21b5abc Merge: 44c3396 9ed2fc7 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 9 12:53:55 2014 +0800 Merge branch 'maint' into next >--------------------------------------------------------------- 604adeba4a10fdfdab6389babf28d173c21b5abc main.c | 3 +++ 1 file changed, 3 insertions(+)

8 years, 4 months

[batman-adv] maint: batman-adv: clear control block of received socket buffers (9ed2fc7)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv On branch : maint >--------------------------------------------------------------- commit 9ed2fc77a4f0ec36bdb7f56929f6af45a5abb173 Author: Martin Hundebøll <martin(a)hundeboll.net> Date: Wed Sep 17 08:56:19 2014 +0200 batman-adv: clear control block of received socket buffers Since other network components (and some drivers) uses the control block provided in skb's, the network coding feature might wrongly assume that an SKB has been decoded, and thus not try to code it with another packet again. This happens for instance when batman-adv is running on a bridge device. Fix this by clearing the control block for every received SKB. Introduced by 3c12de9a5c756b23fe7c9ab332474ece1568914c ("batman-adv: network coding - code and transmit packets if possible") Signed-off-by: Martin Hundebøll <martin(a)hundeboll.net> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 9ed2fc77a4f0ec36bdb7f56929f6af45a5abb173 main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/main.c b/main.c index d1183e8..244dfe9 100644 --- a/main.c +++ b/main.c @@ -403,6 +403,9 @@ int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev, goto err_free; } + /* reset control block to avoid left overs from previous users */ + memset(skb->cb, 0, sizeof(struct batadv_skb_cb)); + /* all receive handlers return whether they received or reused * the supplied skb. if not, we have to free the skb. */

8 years, 4 months

[batman-adv] master's head updated: Merge branch 'next' (882d728)

by postmaster＠open-mesh.org

Repository : ssh://git@open-mesh.org/batman-adv Branch 'master' now includes: 8a2ad52 batman-adv: fix delayed foreign originator recognition 44c3396 Merge branch 'maint' into next 882d728 Merge branch 'next'

8 years, 4 months

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2014