From 6f697bc54184e99c5a8b3e4cb6e27424aa29005f Mon Sep 17 00:00:00 2001
From: phil <me@filou.se>
Date: Wed, 7 Apr 2021 16:39:31 +0200
Subject: [PATCH] process timeout fixup
---
src/utils/mdns-avahi.c | 104 ++++++++++++++++++++++++++--
src/utils/mdns-dnssd.c | 9 ++-
src/utils/rav-lookup/rav-lookup.c | 2 +-
src/utils/rav-publish/rav-publish.c | 14 ++--
4 files changed, 114 insertions(+), 15 deletions(-)
diff --git a/src/utils/mdns-avahi.c b/src/utils/mdns-avahi.c
index 2c31fa7..8e93f84 100644
--- a/src/utils/mdns-avahi.c
+++ b/src/utils/mdns-avahi.c
@@ -24,6 +24,7 @@
#include <avahi-client/client.h>
#include <avahi-client/lookup.h>
+#include <avahi-client/publish.h>
#include <avahi-common/simple-watch.h>
#include <avahi-common/malloc.h>
#include <avahi-common/error.h>
@@ -282,9 +283,32 @@ static void client_callback(AvahiClient *c, AvahiClientState state, AVAHI_GCC_UN
context_t * context = userdata;
/* Called whenever the client or server state changes */
- if (state == AVAHI_CLIENT_FAILURE) {
- fprintf(stderr, "Server connection failure: %s\n", avahi_strerror(avahi_client_errno(context->client)));
- avahi_simple_poll_quit(context->simple_poll);
+
+ switch (state) {
+ case AVAHI_CLIENT_S_RUNNING:
+ /* The server has startup successfully and registered its host
+ * name on the network, so it's time to create our services */
+// create_services(c);
+ break;
+ case AVAHI_CLIENT_FAILURE:
+ fprintf(stderr, "Client failure: %s\n", avahi_strerror(avahi_client_errno(c)));
+ avahi_simple_poll_quit(context->simple_poll);
+ break;
+ case AVAHI_CLIENT_S_COLLISION:
+ /* Let's drop our registered services. When the server is back
+ * in AVAHI_SERVER_RUNNING state we will register them
+ * again with the new host name. */
+ case AVAHI_CLIENT_S_REGISTERING:
+ /* The server records are now being established. This
+ * might be caused by a host name change. We need to wait
+ * for our own records to register until the host name is
+ * properly esatblished. */
+ //TODO reset all registered services
+// if (group)
+// avahi_entry_group_reset(group);
+ break;
+ case AVAHI_CLIENT_CONNECTING:
+ ;
}
}
@@ -416,11 +440,83 @@ aes67_mdns_resolve2_start(aes67_mdns_context_t ctx, const char *type, const char
return res;
}
+
+static void entry_group_callback(AvahiEntryGroup *g, AvahiEntryGroupState state, AVAHI_GCC_UNUSED void *userdata) {
+ assert(userdata);
+
+ resource_t * res = userdata;
+
+ /* Called whenever the entry group state changes */
+ switch (state) {
+ case AVAHI_ENTRY_GROUP_ESTABLISHED :
+ /* The entry group has been established successfully */
+ fprintf(stderr, "Service 'asdf' successfully established.\n");
+ res->type = restype_register_done;
+ break;
+
+ case AVAHI_ENTRY_GROUP_COLLISION : {
+// char *n;
+// /* A service name collision with a remote service
+// * happened. Let's pick a new name */
+// n = avahi_alternative_service_name(name);
+// avahi_free(name);
+// name = n;
+// fprintf(stderr, "Service name collision, renaming service to '%s'\n", name);
+// /* And recreate the services */
+// create_services(avahi_entry_group_get_client(g));
+ break;
+ }
+ case AVAHI_ENTRY_GROUP_FAILURE :
+ fprintf(stderr, "Entry group failure: %s\n", avahi_strerror(avahi_client_errno(avahi_entry_group_get_client(g))));
+ /* Some kind of failure happened while we were registering our services */
+// avahi_simple_poll_quit(res->context->simple_poll);
+ break;
+ case AVAHI_ENTRY_GROUP_UNCOMMITED:
+ case AVAHI_ENTRY_GROUP_REGISTERING:
+ ;
+ }
+}
+
aes67_mdns_resource_t
aes67_mdns_service_start(aes67_mdns_context_t ctx, const char *type, const char *name, const char *domain,
const char * host, u16_t port, u16_t txtlen, const u8_t * txt, aes67_mdns_service_callback callback, void *user_data)
{
- return NULL;
+ assert(ctx);
+
+ context_t * context = ctx;
+
+ if (avahi_client_get_state(context->client) != AVAHI_CLIENT_S_RUNNING){
+ return NULL;
+ }
+
+ resource_t * res = resource_new(context, restype_register_pending, callback, user_data);
+
+ AvahiEntryGroup * group = res->res = avahi_entry_group_new(context->client, entry_group_callback, res);
+
+ if (!group) {
+ fprintf(stderr, "avahi_entry_group_new() failed: %s\n", avahi_strerror(avahi_client_errno(context->client)));
+ free(res);
+ return NULL;
+ }
+
+ AvahiIfIndex interface = AVAHI_IF_UNSPEC;
+ AvahiProtocol protocol = AVAHI_PROTO_UNSPEC;
+
+ AvahiPublishFlags flags = 0;
+
+ int ret = avahi_entry_group_add_service(group, interface, protocol, flags, name, type, domain, host, port, txt, txtlen, NULL);
+ if (ret < 0){
+ if (ret == AVAHI_ERR_COLLISION){
+
+ }
+ free(res);
+ return NULL;
+ }
+
+
+ resource_link(context, res);
+
+ return res;
}
aes67_mdns_resource_t
diff --git a/src/utils/mdns-dnssd.c b/src/utils/mdns-dnssd.c
index 97c2e2c..f34bc18 100644
--- a/src/utils/mdns-dnssd.c
+++ b/src/utils/mdns-dnssd.c
@@ -694,7 +694,14 @@ void aes67_mdns_process(aes67_mdns_context_t ctx, int timeout_msec)
FD_ZERO(&fds);
FD_SET(__ctx->sockfd, &fds);
- int retval = select(nfds, &fds, NULL, &fds, NULL);
+ struct timeval tv = {
+ .tv_usec = (timeout_msec % 1000) * 1000,
+ .tv_sec = timeout_msec / 1000
+ };
+
+ struct timeval * ptv = timeout_msec < 0 ? NULL : &tv;
+
+ int retval = select(nfds, &fds, NULL, &fds, ptv);
if (retval > 0){
DNSServiceProcessResult(__ctx->sharedRef);
}
diff --git a/src/utils/rav-lookup/rav-lookup.c b/src/utils/rav-lookup/rav-lookup.c
index 4f59ab1..d0037cf 100644
--- a/src/utils/rav-lookup/rav-lookup.c
+++ b/src/utils/rav-lookup/rav-lookup.c
@@ -341,7 +341,7 @@ int main(int argc, char * argv[])
signal(SIGINT, sig_int);
keep_running = true;
while(keep_running){
- aes67_mdns_process(ctx, 0);
+ aes67_mdns_process(ctx, 1000);
}
aes67_mdns_delete(ctx);
diff --git a/src/utils/rav-publish/rav-publish.c b/src/utils/rav-publish/rav-publish.c
index ade1a73..5a3ca1f 100644
--- a/src/utils/rav-publish/rav-publish.c
+++ b/src/utils/rav-publish/rav-publish.c
@@ -29,10 +29,12 @@
#include <stdbool.h>
#include <assert.h>
#include <fcntl.h>
+#include <signal.h>
#include <ctype.h>
#include <sys/stat.h>
#include <sys/socket.h>
-#include <dns_util.h>
+#include <netinet/in.h>
+//#include <dns_util.h>
typedef struct sdpres_st {
char * name;
@@ -431,7 +433,7 @@ int main(int argc, char * argv[])
while(keep_running){
int nfds = rtsp.sockfd;
- struct fd_set fds;
+ fd_set fds;
// sigset_t sigmask;
FD_ZERO(&fds);
@@ -454,13 +456,7 @@ int main(int argc, char * argv[])
// just wait until something interesting happens
select(nfds, &fds, NULL, &fds, NULL);
-
-
- struct timeval tv = {
- .tv_usec = 0,
- .tv_sec = 0
- };
- aes67_mdns_process(mdns, &tv);
+ aes67_mdns_process(mdns, 0);
rtsp_process();
}
--
GitLab