commits November 2014

commits@lists.open-mesh.org

1 participants
63 discussions

[openwrt-feed-batman-adv] master: batman-adv-devel: Preserve configuration file on update (caf5c6a)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv On branch : master >--------------------------------------------------------------- commit caf5c6a29467d42b750c798b8d79f201615d7dc6 Author: Sven Eckelmann <sven(a)narfation.org> Date: Tue Nov 4 14:37:40 2014 +0100 batman-adv-devel: Preserve configuration file on update The configuration file of batman-adv should be marked as such to avoid that the old configuration options are overwritten when it is upgraded. Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- caf5c6a29467d42b750c798b8d79f201615d7dc6 batman-adv-devel/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 76f5861..34f4ba7 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -43,6 +43,10 @@ define KernelPackage/batman-adv-devel/config source "$(SOURCE)/Config.in" endef +define Package/kmod-batman-adv-devel/conffiles +/etc/config/batman-adv +endef + MAKE_BATMAN_ADV_ARGS += \ CROSS_COMPILE="$(TARGET_CROSS)" \ KERNELPATH="$(LINUX_DIR)" \

1 0

[batctl] master's head updated: Merge branch 'next' (36c6316)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl Branch 'master' now includes: 140882b batctl: Fix crash when parsing unknown TVLVs e5c2e7f batctl: Parse only TVLV when header is available 79f3061 batctl: Only parse TVLV data when length is valid 0505524 batctl: Parse non-variable TVLV only with correct length 5fda4d5 batctl: Only parse big enough TVLV TTv1 36c6316 Merge branch 'next'

1 0

[batctl] master: Merge branch 'next' (36c6316)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : master >--------------------------------------------------------------- commit 36c6316490f423d9ce767fa8dbe4ed55929778cb Merge: 7f4991e 5fda4d5 Author: Marek Lindner <mareklindner(a)neomailbox.ch> Date: Sun Nov 16 13:28:31 2014 +0800 Merge branch 'next' >--------------------------------------------------------------- 36c6316490f423d9ce767fa8dbe4ed55929778cb tcpdump.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 107 insertions(+), 29 deletions(-)

1 0

[batctl] next: batctl: Only parse big enough TVLV TTv1 (5fda4d5)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 5fda4d5b175fb5c345a30ed3c7ffb191668c3950 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 12 18:58:29 2014 +0100 batctl: Only parse big enough TVLV TTv1 A TTv1 has a constant header part and two variable parts. One is the defined by the number of VLANs and the rest are the changes. The TVLV can only be parsed when there is enough room for the constant header. Also the number of VLANs must be validated. Otherwise the TVLV parser can read invalid data outside of the buffer. This regression was introduced by 4c39fb823b86036df40187f8bd342fe5398c28ef ("batctl: tcpdump - parse TVLV containers"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 5fda4d5b175fb5c345a30ed3c7ffb191668c3950 tcpdump.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 361deb3..50ba010 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -142,13 +142,15 @@ static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), printf("\tTVLV NCv1: enabled\n"); } -static void batctl_tvlv_parse_tt_v1(void *buff, - ssize_t (buff_len)__attribute__((unused))) +static void batctl_tvlv_parse_tt_v1(void *buff, ssize_t buff_len) { struct batadv_tvlv_tt_data *tvlv = buff; struct batadv_tvlv_tt_vlan_data *vlan; int i, num_vlan, num_entry; const char *type; + size_t vlan_len; + + LEN_CHECK(buff_len, sizeof(*tvlv), "TVLV TTv1") if (tvlv->flags & BATADV_TT_OGM_DIFF) type = "OGM DIFF"; @@ -160,7 +162,10 @@ static void batctl_tvlv_parse_tt_v1(void *buff, type = "UNKNOWN"; num_vlan = ntohs(tvlv->num_vlan); - buff_len -= sizeof(*tvlv) + sizeof(*vlan) * num_vlan; + vlan_len = sizeof(*tvlv) + sizeof(*vlan) * num_vlan; + LEN_CHECK(buff_len, vlan_len, "TVLV TTv1 VLAN") + + buff_len -= vlan_len; num_entry = buff_len / sizeof(struct batadv_tvlv_tt_change); printf("\tTVLV TTv1: %s [%c] ttvn=%hhu vlan_num=%hu entry_num=%hu\n",

1 0

[batctl] next: batctl: Parse non-variable TVLV only with correct length (0505524)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 05055242aff223000d88937786f07c5272a5e59d Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 12 18:58:28 2014 +0100 batctl: Parse non-variable TVLV only with correct length The TVLV length has to be verified before the tvlv parser can start. Otherwise the tvlv parser might access invalid data. Doing the same for zero length TVLVs is just good practice and might help finding problems easier. This regression was introduced by 4c39fb823b86036df40187f8bd342fe5398c28ef ("batctl: tcpdump - parse TVLV containers"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 05055242aff223000d88937786f07c5272a5e59d tcpdump.c | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 443f671..361deb3 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -100,12 +100,17 @@ static int print_time(void) return 1; } -static void batctl_tvlv_parse_gw_v1(void *buff, - ssize_t (buff_len)__attribute__((unused))) +static void batctl_tvlv_parse_gw_v1(void *buff, ssize_t buff_len) { struct batadv_tvlv_gateway_data *tvlv = buff; uint32_t down, up; + if (buff_len != sizeof(*tvlv)) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (%zu): %zu\n", + "TVLV GWv1", sizeof(*tvlv), buff_len); + return; + } + down = ntohl(tvlv->bandwidth_down); up = ntohl(tvlv->bandwidth_up); @@ -114,14 +119,26 @@ static void batctl_tvlv_parse_gw_v1(void *buff, } static void batctl_tvlv_parse_dat_v1(void (*buff)__attribute__((unused)), - ssize_t (buff_len)__attribute__((unused))) + ssize_t buff_len) { + if (buff_len != 0) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (0): %zu\n", + "TVLV DATv1", buff_len); + return; + } + printf("\tTVLV DATv1: enabled\n"); } static void batctl_tvlv_parse_nc_v1(void (*buff)__attribute__((unused)), - ssize_t (buff_len)__attribute__((unused))) + ssize_t buff_len) { + if (buff_len != 0) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (0): %zu\n", + "TVLV NCv1", buff_len); + return; + } + printf("\tTVLV NCv1: enabled\n"); } @@ -159,11 +176,16 @@ static void batctl_tvlv_parse_tt_v1(void *buff, } } -static void batctl_tvlv_parse_roam_v1(void *buff, - ssize_t (buff_len)__attribute__((unused))) +static void batctl_tvlv_parse_roam_v1(void *buff, ssize_t buff_len) { struct batadv_tvlv_roam_adv *tvlv = buff; + if (buff_len != sizeof(*tvlv)) { + fprintf(stderr, "Warning - dropping received %s packet as it is not the correct size (%zu): %zu\n", + "TVLV ROAMv1", sizeof(*tvlv), buff_len); + return; + } + printf("\tTVLV ROAMv1: client %s, VLAN ID %d\n", get_name_by_macaddr((struct ether_addr *)tvlv->client, NO_FLAGS), BATADV_PRINT_VID(ntohs(tvlv->vid)));

1 0

[batctl] next: batctl: Only parse TVLV data when length is valid (79f3061)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 79f3061aa239f1bc8b50a62f403ab5e4dd0069d3 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 12 18:58:27 2014 +0100 batctl: Only parse TVLV data when length is valid The length in a TVLV field must be smaller or equal to the length of the remaining read data. Otherwise the parser can read outside of the valid data region. This regression was introduced by 4c39fb823b86036df40187f8bd342fe5398c28ef ("batctl: tcpdump - parse TVLV containers"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 79f3061aa239f1bc8b50a62f403ab5e4dd0069d3 tcpdump.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index 3e57544..443f671 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -258,15 +258,21 @@ static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + + /* data after TVLV header */ + ptr = (uint8_t *)(tvlv_hdr + 1); + tvlv_len -= sizeof(*tvlv_hdr); + len = ntohs(tvlv_hdr->len); + LEN_CHECK(tvlv_len, (size_t)len, "BAT UCAST TVLV"); parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); if (parser) - parser(tvlv_hdr + 1, len); + parser(ptr, len); /* go to the next container */ - ptr = (uint8_t *)(tvlv_hdr + 1) + len; - tvlv_len -= sizeof(*tvlv_hdr) + len; + ptr += len; + tvlv_len -= len; } } @@ -687,15 +693,21 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; + + /* data after TVLV header */ + ptr = (uint8_t *)(tvlv_hdr + 1); + tvlv_len -= sizeof(*tvlv_hdr); + len = ntohs(tvlv_hdr->len); + LEN_CHECK(tvlv_len, (size_t)len, "BAT IV OGM TVLV"); parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); if (parser) - parser(tvlv_hdr + 1, len); + parser(ptr, len); /* go to the next container */ - ptr = (uint8_t *)(tvlv_hdr + 1) + len; - tvlv_len -= sizeof(*tvlv_hdr) + len; + ptr += len; + tvlv_len -= len; } }

1 0

[batctl] next: batctl: Parse only TVLV when header is available (e5c2e7f)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit e5c2e7f3aeedac12e1e851c8a29feda8275d8d7d Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 12 18:58:26 2014 +0100 batctl: Parse only TVLV when header is available The TVLV must only start parsing an header when at least one TVLV header is available. Otherwise data behind the received data might be accessed. This regression was introduced by 4c39fb823b86036df40187f8bd342fe5398c28ef ("batctl: tcpdump - parse TVLV containers"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- e5c2e7f3aeedac12e1e851c8a29feda8275d8d7d tcpdump.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index c3c847e..3e57544 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -256,7 +256,7 @@ static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, ptr = (uint8_t *)(tvlv_packet + 1); - while (tvlv_len > 0) { + while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; len = ntohs(tvlv_hdr->len); @@ -685,7 +685,7 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int ptr = (uint8_t *)(batman_ogm_packet + 1); - while (tvlv_len > 0) { + while (tvlv_len >= (ssize_t)sizeof(*tvlv_hdr)) { tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; len = ntohs(tvlv_hdr->len);

1 0

[batctl] next: batctl: Fix crash when parsing unknown TVLVs (140882b)
by postmaster＠open-mesh.org 16 Nov '14

16 Nov '14

Repository : ssh://git@open-mesh.org/batctl On branch : next >--------------------------------------------------------------- commit 140882bda39c4ab891f2981e2d07146221c664a1 Author: Sven Eckelmann <sven(a)narfation.org> Date: Wed Nov 12 18:58:25 2014 +0100 batctl: Fix crash when parsing unknown TVLVs batctl tcpdump has an array with all known TVLVs and versions. The correct parser for the TVLV is chosen by getting the pointer from the address calculated by version and type. Unfortunately, the version and type was never validated to ensure that not an unknown TVLV (like mcast) was received. This missing validation makes it possible to crash batctl by injecting packets with an unknown type and/or version. batctl will try to get the parser, fetch a NULL pointer or random data and then try to dereferenced it. This is usually handled by the operating system with a segfault. But this might be exploitable in rare situations. An approach to handle this problem is by combining the simple selection step with the validation step. Only valid version+type will return a parser function pointer and the requesting function will only call the parser function pointer when it got one. This regression was introduced by 4c39fb823b86036df40187f8bd342fe5398c28ef ("batctl: tcpdump - parse TVLV containers"). Signed-off-by: Sven Eckelmann <sven(a)narfation.org> Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch> >--------------------------------------------------------------- 140882bda39c4ab891f2981e2d07146221c664a1 tcpdump.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 53 insertions(+), 14 deletions(-) diff --git a/tcpdump.c b/tcpdump.c index ad5469b..c3c847e 100644 --- a/tcpdump.c +++ b/tcpdump.c @@ -171,16 +171,53 @@ static void batctl_tvlv_parse_roam_v1(void *buff, typedef void (*batctl_tvlv_parser_t)(void *buff, ssize_t buff_len); -/* location [i][j] contains the parsing function for TVLV of type 'i' and - * version 'j + 1' - */ -batctl_tvlv_parser_t tvlv_parsers[][1] = { - [BATADV_TVLV_GW][0] = batctl_tvlv_parse_gw_v1, - [BATADV_TVLV_DAT][0] = batctl_tvlv_parse_dat_v1, - [BATADV_TVLV_NC][0] = batctl_tvlv_parse_nc_v1, - [BATADV_TVLV_TT][0] = batctl_tvlv_parse_tt_v1, - [BATADV_TVLV_ROAM][0] = batctl_tvlv_parse_roam_v1, -}; +static batctl_tvlv_parser_t tvlv_parser_get(uint8_t type, uint8_t version) +{ + switch (type) { + case BATADV_TVLV_GW: + switch (version) { + case 1: + return batctl_tvlv_parse_gw_v1; + default: + return NULL; + } + + case BATADV_TVLV_DAT: + switch (version) { + case 1: + return batctl_tvlv_parse_dat_v1; + default: + return NULL; + } + + case BATADV_TVLV_NC: + switch (version) { + case 1: + return batctl_tvlv_parse_nc_v1; + default: + return NULL; + } + + case BATADV_TVLV_TT: + switch (version) { + case 1: + return batctl_tvlv_parse_tt_v1; + default: + return NULL; + } + + case BATADV_TVLV_ROAM: + switch (version) { + case 1: + return batctl_tvlv_parse_roam_v1; + default: + return NULL; + } + + default: + return NULL; + } +} static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, int read_opt, int time_printed) @@ -223,8 +260,9 @@ static void dump_batman_ucast_tvlv(unsigned char *packet_buff, ssize_t buff_len, tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; len = ntohs(tvlv_hdr->len); - parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; - parser(tvlv_hdr + 1, len); + parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); + if (parser) + parser(tvlv_hdr + 1, len); /* go to the next container */ ptr = (uint8_t *)(tvlv_hdr + 1) + len; @@ -651,8 +689,9 @@ static void dump_batman_iv_ogm(unsigned char *packet_buff, ssize_t buff_len, int tvlv_hdr = (struct batadv_tvlv_hdr *)ptr; len = ntohs(tvlv_hdr->len); - parser = tvlv_parsers[tvlv_hdr->type][tvlv_hdr->version - 1]; - parser(tvlv_hdr + 1, len); + parser = tvlv_parser_get(tvlv_hdr->type, tvlv_hdr->version); + if (parser) + parser(tvlv_hdr + 1, len); /* go to the next container */ ptr = (uint8_t *)(tvlv_hdr + 1) + len;

1 0

[openwrt-feed-alfred] master: alfred: bump to latest trunk (e2b5467)
by postmaster＠open-mesh.org 13 Nov '14

13 Nov '14

Repository : ssh://git@open-mesh.org/openwrt-feed-alfred On branch : master >--------------------------------------------------------------- commit e2b54675a1c087739013057a418c1c96a96d8a1c Author: Simon Wunderlich <sw(a)simonwunderlich.de> Date: Thu Nov 13 12:46:43 2014 +0100 alfred: bump to latest trunk Add new feature: support for multiple interfaces (by Sven) Signed-off-by: Simon Wunderlich <sw(a)simonwunderlich.de> >--------------------------------------------------------------- e2b54675a1c087739013057a418c1c96a96d8a1c alfred/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alfred/Makefile b/alfred/Makefile index 20f91b8..3e07da2 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:=1 -PKG_REV:=babd772a36e186bf1a0d2e00239c6754ba240704 +PKG_RELEASE:=2 +PKG_REV:=45cbfaba455c92470100a9c3d767e1d32d73075e 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: Synchronize data only over correct interfaces (45cbfab)
by postmaster＠open-mesh.org 13 Nov '14

13 Nov '14

Repository : ssh://git@open-mesh.org/alfred On branch : master >--------------------------------------------------------------- commit 45cbfaba455c92470100a9c3d767e1d32d73075e 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> >--------------------------------------------------------------- 45cbfaba455c92470100a9c3d767e1d32d73075e 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)

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2014