github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-14 18:57:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Some Discovery Service Renaming

Browse source
This commit is contained in:
Florian Märkl 2019-08-12 13:42:01 +02:00
commit 2fd2f0d733
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
3 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/include/chiaki/discoveryservice.h
View file

@ -27,25 +27,29 @@ extern "C" {
typedef struct chiaki_discovery_service_options_t
{
size_t servers_max;
size_t hosts_max;
uint64_t ping_ms;
struct sockaddr *send_addr;
size_t send_addr_size;
} ChiakiDiscoveryServiceOptions;
typedef struct chiaki_discovery_service_server_t
typedef struct chiaki_discovery_service_host_discovery_info_t
{
uint64_t last_ping_index;
} ChiakiDiscoveryServiceServer;
} ChiakiDiscoveryServiceHostDiscoveryInfo;
typedef struct chiaki_discovery_service_t
{
ChiakiLog *log;
ChiakiDiscoveryServiceOptions options;
ChiakiDiscovery discovery;
uint64_t ping_index;
ChiakiDiscoveryServiceServer *servers;
size_t servers_count;
ChiakiDiscoveryHost *hosts;
ChiakiDiscoveryServiceHostDiscoveryInfo *host_discovery_infos;
size_t hosts_count;
ChiakiMutex state_mutex;
ChiakiThread thread;
ChiakiBoolPredCond stop_cond;
} ChiakiDiscoveryService;

14
lib/src/discoveryservice.c
View file

@ -20,18 +20,19 @@
#include <string.h>
static void *discovery_service_thread_func(void *user);
static void discovery_service_ping(ChiakiDiscoveryService *service);
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_service_init(ChiakiDiscoveryService *service, ChiakiDiscoveryServiceOptions *options, ChiakiLog *log)
{
service->options = *options;
service->servers = calloc(service->options.servers_max, sizeof(ChiakiDiscoveryServiceServer));
if(!service->servers)
service->host_discovery_infos = calloc(service->options.hosts_max, sizeof(ChiakiDiscoveryServiceHostDiscoveryInfo));
if(!service->host_discovery_infos)
return CHIAKI_ERR_MEMORY;
service->options.send_addr = malloc(service->options.send_addr_size);
if(!service->options.send_addr)
goto error_servers;
memcpy(service->options.send_addr, options->send_addr, service->options.send_addr_size);
service->servers_count = 0;
service->hosts_count = 0;
ChiakiErrorCode err = chiaki_discovery_init(&service->discovery, log, service->options.send_addr->sa_family);
if(err != CHIAKI_ERR_SUCCESS)
@ -55,7 +56,7 @@ error_discovery:
error_send_addr:
free(service->options.send_addr);
error_servers:
free(service->servers);
free(service->host_discovery_infos);
return err;
}
@ -65,12 +66,10 @@ CHIAKI_EXPORT void chiaki_discovery_service_fini(ChiakiDiscoveryService *service
chiaki_thread_join(&service->thread, NULL);
chiaki_bool_pred_cond_fini(&service->stop_cond);
chiaki_discovery_fini(&service->discovery);
free(service->servers);
free(service->host_discovery_infos);
free(service->options.send_addr);
}
static void discovery_service_ping(ChiakiDiscoveryService *service);
static void *discovery_service_thread_func(void *user)
{
ChiakiDiscoveryService *service = user;
@ -93,6 +92,7 @@ static void *discovery_service_thread_func(void *user)
static void discovery_service_ping(ChiakiDiscoveryService *service)
{
CHIAKI_LOGV(service->log, "Discovery Service sending ping");
ChiakiDiscoveryPacket packet = { 0 };
packet.cmd = CHIAKI_DISCOVERY_CMD_SRCH;
chiaki_discovery_send(&service->discovery, &packet, service->options.send_addr, service->options.send_addr_size);