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

Implement ChiakiDiscoveryService Sending

Browse source
This commit is contained in:
Florian Märkl 2019-06-28 14:25:14 +02:00
commit 08137faaff
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
2 changed files with 92 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,12 +25,32 @@
extern "C" { extern "C" {
#endif #endif
typedef struct chiaki_discovery_service_options_t
{
size_t servers_max;
uint64_t ping_ms;
struct sockaddr *send_addr;
size_t send_addr_size;
} ChiakiDiscoveryServiceOptions;
typedef struct chiaki_discovery_service_server_t
{
uint64_t last_ping_index;
} ChiakiDiscoveryServiceServer;
typedef struct chiaki_discovery_service_t typedef struct chiaki_discovery_service_t
{ {
ChiakiLog *log;
ChiakiDiscoveryServiceOptions options;
ChiakiDiscovery discovery; ChiakiDiscovery discovery;
uint64_t ping_index;
ChiakiDiscoveryServiceServer *servers;
size_t servers_count;
ChiakiThread thread;
ChiakiBoolPredCond stop_cond;
} ChiakiDiscoveryService; } ChiakiDiscoveryService;
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_service_init(ChiakiDiscoveryService *service, ChiakiLog *log, sa_family_t family); CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_service_init(ChiakiDiscoveryService *service, ChiakiDiscoveryServiceOptions *options, ChiakiLog *log);
CHIAKI_EXPORT void chiaki_discovery_service_fini(ChiakiDiscoveryService *service); CHIAKI_EXPORT void chiaki_discovery_service_fini(ChiakiDiscoveryService *service);
#ifdef __cplusplus #ifdef __cplusplus

73
lib/src/discoveryservice.c
View file

@ -17,12 +17,81 @@
#include <chiaki/discoveryservice.h> #include <chiaki/discoveryservice.h>
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_service_init(ChiakiDiscoveryService *service, ChiakiLog *log, sa_family_t family) #include <string.h>
static void *discovery_service_thread_func(void *user);
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_service_init(ChiakiDiscoveryService *service, ChiakiDiscoveryServiceOptions *options, ChiakiLog *log)
{ {
return chiaki_discovery_init(&service->discovery, log, family); service->options = *options;
service->servers = calloc(service->options.servers_max, sizeof(ChiakiDiscoveryServiceServer));
if(!service->servers)
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;
ChiakiErrorCode err = chiaki_discovery_init(&service->discovery, log, service->options.send_addr->sa_family);
if(err != CHIAKI_ERR_SUCCESS)
goto error_servers;
err = chiaki_bool_pred_cond_init(&service->stop_cond);
if(err != CHIAKI_ERR_SUCCESS)
goto error_discovery;
err = chiaki_thread_create(&service->thread, discovery_service_thread_func, service);
if(err != CHIAKI_ERR_SUCCESS)
goto error_stop_cond;
return CHIAKI_ERR_SUCCESS;
error_stop_cond:
chiaki_bool_pred_cond_fini(&service->stop_cond);
error_discovery:
chiaki_discovery_fini(&service->discovery);
error_send_addr:
free(service->options.send_addr);
error_servers:
free(service->servers);
return err;
} }
CHIAKI_EXPORT void chiaki_discovery_service_fini(ChiakiDiscoveryService *service) CHIAKI_EXPORT void chiaki_discovery_service_fini(ChiakiDiscoveryService *service)
{ {
chiaki_bool_pred_cond_signal(&service->stop_cond);
chiaki_thread_join(&service->thread, NULL);
chiaki_bool_pred_cond_fini(&service->stop_cond);
chiaki_discovery_fini(&service->discovery); chiaki_discovery_fini(&service->discovery);
free(service->servers);
free(service->options.send_addr);
}
static void discovery_service_ping(ChiakiDiscoveryService *service);
static void *discovery_service_thread_func(void *user)
{
ChiakiDiscoveryService *service = user;
ChiakiErrorCode err = chiaki_bool_pred_cond_lock(&service->stop_cond);
if(err != CHIAKI_ERR_SUCCESS)
return NULL;
while(service->stop_cond.pred)
{
err = chiaki_bool_pred_cond_timedwait(&service->stop_cond, service->options.ping_ms);
if(err != CHIAKI_ERR_TIMEOUT)
break;
discovery_service_ping(service);
}
chiaki_bool_pred_cond_unlock(&service->stop_cond);
return NULL;
}
static void discovery_service_ping(ChiakiDiscoveryService *service)
{
ChiakiDiscoveryPacket packet = { 0 };
packet.cmd = CHIAKI_DISCOVERY_CMD_SRCH;
chiaki_discovery_send(&service->discovery, &packet, service->options.send_addr, service->options.send_addr_size);
} }