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

Use Stop Pipe in Discovery

Browse source
This commit is contained in:
Florian Märkl 2019-06-14 11:37:18 +02:00
commit 5b2b760dea
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
2 changed files with 36 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/include/chiaki/discovery.h
View file

@ -20,6 +20,8 @@
#include "common.h" #include "common.h"
#include "thread.h" #include "thread.h"
#include "stoppipe.h"
#include "log.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/socket.h> #include <sys/socket.h>
@ -46,11 +48,12 @@ CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, Chiaki
typedef struct chiaki_discovery_t typedef struct chiaki_discovery_t
{ {
ChiakiLog *log;
int socket; int socket;
struct sockaddr local_addr; struct sockaddr local_addr;
} ChiakiDiscovery; } ChiakiDiscovery;
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_init(ChiakiDiscovery *discovery, sa_family_t family); CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_init(ChiakiDiscovery *discovery, ChiakiLog *log, sa_family_t family);
CHIAKI_EXPORT void chiaki_discovery_fini(ChiakiDiscovery *discovery); CHIAKI_EXPORT void chiaki_discovery_fini(ChiakiDiscovery *discovery);
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_send(ChiakiDiscovery *discovery, ChiakiDiscoveryPacket *packet, struct sockaddr *addr, size_t addr_size); CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_send(ChiakiDiscovery *discovery, ChiakiDiscoveryPacket *packet, struct sockaddr *addr, size_t addr_size);
@ -58,6 +61,7 @@ typedef struct chiaki_discovery_thread_t
{ {
ChiakiDiscovery *discovery; ChiakiDiscovery *discovery;
ChiakiThread thread; ChiakiThread thread;
ChiakiStopPipe stop_pipe;
} ChiakiDiscoveryThread; } ChiakiDiscoveryThread;
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_start(ChiakiDiscoveryThread *thread, ChiakiDiscovery *discovery); CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_start(ChiakiDiscoveryThread *thread, ChiakiDiscovery *discovery);

37
lib/src/discovery.c
View file

@ -16,11 +16,13 @@
*/ */
#include <chiaki/discovery.h> #include <chiaki/discovery.h>
#include <chiaki/log.h>
#include <string.h> #include <string.h>
#include <unistd.h> #include <unistd.h>
#include <netdb.h> #include <netdb.h>
#include <stdio.h> #include <stdio.h>
#include <fcntl.h>
CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, ChiakiDiscoveryPacket *packet) CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, ChiakiDiscoveryPacket *packet)
@ -36,14 +38,19 @@ CHIAKI_EXPORT int chiaki_discovery_packet_fmt(char *buf, size_t buf_size, Chiaki
} }
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_init(ChiakiDiscovery *discovery, sa_family_t family) CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_init(ChiakiDiscovery *discovery, ChiakiLog *log, sa_family_t family)
{ {
if(family != AF_INET && family != AF_INET6) if(family != AF_INET && family != AF_INET6)
return CHIAKI_ERR_INVALID_DATA; return CHIAKI_ERR_INVALID_DATA;
discovery->log = log;
discovery->socket = socket(AF_INET, SOCK_DGRAM, 0); discovery->socket = socket(AF_INET, SOCK_DGRAM, 0);
if(discovery->socket < 0) if(discovery->socket < 0)
{
CHIAKI_LOGE(discovery->log, "Discovery failed to create socket\n");
return CHIAKI_ERR_NETWORK; return CHIAKI_ERR_NETWORK;
}
memset(&discovery->local_addr, 0, sizeof(discovery->local_addr)); memset(&discovery->local_addr, 0, sizeof(discovery->local_addr));
discovery->local_addr.sa_family = family; discovery->local_addr.sa_family = family;
@ -64,12 +71,15 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_init(ChiakiDiscovery *discovery,
int r = bind(discovery->socket, &discovery->local_addr, sizeof(discovery->local_addr)); int r = bind(discovery->socket, &discovery->local_addr, sizeof(discovery->local_addr));
if(r < 0) if(r < 0)
{ {
CHIAKI_LOGE(discovery->log, "Discovery failed to bind\n");
close(discovery->socket); close(discovery->socket);
return CHIAKI_ERR_NETWORK; return CHIAKI_ERR_NETWORK;
} }
const int broadcast = 1; const int broadcast = 1;
setsockopt(discovery->socket, SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast)); r = setsockopt(discovery->socket, SOL_SOCKET, SO_BROADCAST, &broadcast, sizeof(broadcast));
if(r < 0)
CHIAKI_LOGE(discovery->log, "Discovery failed to setsockopt SO_BROADCAST\n");
return CHIAKI_ERR_SUCCESS; return CHIAKI_ERR_SUCCESS;
} }
@ -104,16 +114,31 @@ CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_start(ChiakiDiscoveryThrea
{ {
thread->discovery = discovery; thread->discovery = discovery;
// TODO: stop pipe ChiakiErrorCode err = chiaki_stop_pipe_init(&thread->stop_pipe);
if(err != CHIAKI_ERR_SUCCESS)
{
CHIAKI_LOGE(discovery->log, "Discovery (thread) failed to create pipe\n");
return err;
}
return chiaki_thread_create(&thread->thread, discovery_thread_func, thread); err = chiaki_thread_create(&thread->thread, discovery_thread_func, thread);
if(err != CHIAKI_ERR_SUCCESS)
{
chiaki_stop_pipe_fini(&thread->stop_pipe);
return err;
}
return CHIAKI_ERR_SUCCESS;
} }
CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_stop(ChiakiDiscoveryThread *thread) CHIAKI_EXPORT ChiakiErrorCode chiaki_discovery_thread_stop(ChiakiDiscoveryThread *thread)
{ {
// TODO ChiakiErrorCode err = chiaki_thread_join(&thread->thread, NULL);
if(err != CHIAKI_ERR_SUCCESS)
return err;
return chiaki_thread_join(&thread->thread, NULL); chiaki_stop_pipe_fini(&thread->stop_pipe);
return CHIAKI_ERR_SUCCESS;
} }
static void *discovery_thread_func(void *user) static void *discovery_thread_func(void *user)