#include <stdio.h>
#include <time.h>
-#include <uci.h>
-#include <uci_blob.h>
-
+#include <libubus.h>
#include <libubox/vlist.h>
#include <libubox/uloop.h>
#include <libubox/avl-cmp.h>
#include <libubox/blobmsg_json.h>
+#include "ubus.h"
#include "dns.h"
#include "service.h"
#include "util.h"
#include "announce.h"
enum {
+ SERVICE_SERVICE,
SERVICE_PORT,
SERVICE_TXT,
__SERVICE_MAX,
time_t t;
+ const char *id;
const char *service;
- const char *daemon;
const uint8_t *txt;
int txt_len;
int port;
};
static const struct blobmsg_policy service_policy[__SERVICE_MAX] = {
+ [SERVICE_SERVICE] = { .name = "service", .type = BLOBMSG_TYPE_STRING },
[SERVICE_PORT] = { .name = "port", .type = BLOBMSG_TYPE_INT32 },
[SERVICE_TXT] = { .name = "txt", .type = BLOBMSG_TYPE_ARRAY },
};
#define TOUT_LOOKUP 60
-static int
+static time_t
service_timeout(struct service *s)
{
- time_t t = time(NULL);
+ time_t t = monotonic_time();
if (t - s->t <= TOUT_LOOKUP)
return 0;
- s->t = t;
-
- return 1;
+ return t;
}
void
-service_reply_a(struct interface *iface, int type, int ttl)
+service_reply_a(struct interface *iface, int ttl)
{
struct ifaddrs *ifap, *ifa;
struct sockaddr_in *sa;
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (strcmp(ifa->ifa_name, iface->name))
continue;
- if (ifa->ifa_addr->sa_family==AF_INET) {
+ if (ifa->ifa_addr->sa_family == AF_INET) {
sa = (struct sockaddr_in *) ifa->ifa_addr;
dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, ttl);
}
- if (ifa->ifa_addr->sa_family==AF_INET6) {
+ if (ifa->ifa_addr->sa_family == AF_INET6) {
uint8_t ll_prefix[] = {0xfe, 0x80 };
sa6 = (struct sockaddr_in6 *) ifa->ifa_addr;
if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2))
{
const char *host = service_name(s->service);
char *service = strstr(host, "._");
+ time_t t = service_timeout(s);
- if (!force && (!s->active || !service || !service_timeout(s)))
+
+ if (!force && (!s->active || !service || !t))
return;
service++;
if (match && strcmp(match, s->service))
return;
+ s->t = t;
+
dns_init_answer();
service_add_ptr(service_name(s->service), ttl);
dns_send_answer(iface, service);
if (match)
return;
- service_reply_a(iface, TYPE_A, ttl);
+ if (ttl)
+ service_reply_a(iface, ttl);
}
void
-service_announce_services(struct interface *iface, const char *service)
+service_announce_services(struct interface *iface, const char *service, int ttl)
{
struct service *s;
int tcp = 1;
if (!strstr(s->service, "._udp") && !tcp)
continue;
s->t = 0;
- dns_init_answer();
- service_add_ptr(s->service, announce_ttl);
- if (tcp)
- dns_send_answer(iface, sdtcp);
- else
- dns_send_answer(iface, sdudp);
- service_reply(iface, s->service, announce_ttl);
+ if (ttl) {
+ dns_init_answer();
+ service_add_ptr(s->service, ttl);
+ if (tcp)
+ dns_send_answer(iface, sdtcp);
+ else
+ dns_send_answer(iface, sdudp);
+ }
+ service_reply(iface, s->service, ttl);
}
}
void
-service_announce(struct interface *iface)
+service_announce(struct interface *iface, int ttl)
{
- service_announce_services(iface, sdudp);
- service_announce_services(iface, sdtcp);
+ service_announce_services(iface, sdudp, ttl);
+ service_announce_services(iface, sdtcp, ttl);
}
static void
}
static void
+service_load_blob(struct blob_attr *b)
+{
+ struct blob_attr *txt, *_tb[__SERVICE_MAX];
+ struct service *s;
+ char *d_service, *d_id;
+ uint8_t *d_txt;
+ int rem2;
+ int txt_len = 0;
+
+ blobmsg_parse(service_policy, ARRAY_SIZE(service_policy),
+ _tb, blobmsg_data(b), blobmsg_data_len(b));
+ if (!_tb[SERVICE_PORT] || !_tb[SERVICE_SERVICE])
+ return;
+
+ if (_tb[SERVICE_SERVICE])
+ blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
+ txt_len += 1 + strlen(blobmsg_get_string(txt));
+
+ s = calloc_a(sizeof(*s),
+ &d_id, strlen(blobmsg_name(b)) + 1,
+ &d_service, strlen(blobmsg_get_string(_tb[SERVICE_SERVICE])) + 1,
+ &d_txt, txt_len);
+ if (!s)
+ return;
+
+ s->port = blobmsg_get_u32(_tb[SERVICE_PORT]);
+ s->id = strcpy(d_id, blobmsg_name(b));
+ s->service = strcpy(d_service, blobmsg_get_string(_tb[SERVICE_SERVICE]));
+ s->active = 1;
+ s->t = 0;
+ s->txt_len = txt_len;
+ s->txt = d_txt;
+
+ if (_tb[SERVICE_SERVICE])
+ blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
+ int len = strlen(blobmsg_get_string(txt));
+ if (!len)
+ return;
+ if (len > 0xff)
+ len = 0xff;
+ *d_txt = len;
+ d_txt++;
+ memcpy(d_txt, blobmsg_get_string(txt), len);
+ d_txt += len;
+ }
+
+ vlist_add(&services, &s->node, s->id);
+}
+
+static void
service_load(char *path)
{
- struct blob_attr *txt, *cur, *_tb[__SERVICE_MAX];
- int rem, i;
+ struct blob_attr *cur;
glob_t gl;
+ int i, rem;
if (glob(path, GLOB_NOESCAPE | GLOB_MARK, NULL, &gl))
return;
for (i = 0; i < gl.gl_pathc; i++) {
blob_buf_init(&b, 0);
+ if (blobmsg_add_json_from_file(&b, gl.gl_pathv[i]))
+ blob_for_each_attr(cur, b.head, rem)
+ service_load_blob(cur);
+ }
+ globfree(&gl);
+}
- if (!blobmsg_add_json_from_file(&b, gl.gl_pathv[i]))
- continue;
- blob_for_each_attr(cur, b.head, rem) {
- struct service *s;
- char *d_service, *d_daemon;
- uint8_t *d_txt;
- int rem2;
- int txt_len = 0;
-
- blobmsg_parse(service_policy, ARRAY_SIZE(service_policy),
- _tb, blobmsg_data(cur), blobmsg_data_len(cur));
- if (!_tb[SERVICE_PORT] || !_tb[SERVICE_TXT])
- continue;
+static void
+service_init_cb(struct ubus_request *req, int type, struct blob_attr *msg)
+{
+ struct blob_attr *cur;
+ int rem;
+
+ get_hostname();
+
+ vlist_update(&services);
+ service_load("/tmp/run/mdns/*");
+
+ blob_for_each_attr(cur, msg, rem) {
+ struct blob_attr *cur2;
+ int rem2;
- blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2)
- txt_len += 1 + strlen(blobmsg_get_string(txt));
+ blobmsg_for_each_attr(cur2, cur, rem2) {
+ struct blob_attr *cur3;
+ int rem3;
- s = calloc_a(sizeof(*s),
- &d_daemon, strlen(gl.gl_pathv[i]) + 1,
- &d_service, strlen(blobmsg_name(cur)) + 1,
- &d_txt, txt_len);
- if (!s)
+ if (strcmp(blobmsg_name(cur2), "instances"))
continue;
- s->port = blobmsg_get_u32(_tb[SERVICE_PORT]);
- s->service = strcpy(d_service, blobmsg_name(cur));
- s->daemon = strcpy(d_daemon, gl.gl_pathv[i]);
- s->active = 1;
- s->t = 0;
- s->txt_len = txt_len;
- s->txt = d_txt;
-
- blobmsg_for_each_attr(txt, _tb[SERVICE_TXT], rem2) {
- int len = strlen(blobmsg_get_string(txt));
- if (!len)
- continue;
- if (len > 0xff)
- len = 0xff;
- *d_txt = len;
- d_txt++;
- memcpy(d_txt, blobmsg_get_string(txt), len);
- d_txt += len;
+ blobmsg_for_each_attr(cur3, cur2, rem3) {
+ struct blob_attr *cur4;
+ int rem4;
+ int running = 0;
+
+ blobmsg_for_each_attr(cur4, cur3, rem4) {
+ const char *name = blobmsg_name(cur4);
+
+ if (!strcmp(name, "running")) {
+ running = blobmsg_get_bool(cur4);
+ } else if (running && !strcmp(name, "data")) {
+ struct blob_attr *cur5;
+ int rem5;
+
+ blobmsg_for_each_attr(cur5, cur4, rem5) {
+ struct blob_attr *cur6;
+ int rem6;
+
+ if (strcmp(blobmsg_name(cur5), "mdns"))
+ continue;
+
+ blobmsg_for_each_attr(cur6, cur5, rem6)
+ service_load_blob(cur6);
+ }
+ break;
+ }
+ }
}
-
- vlist_add(&services, &s->node, s->service);
}
}
+ vlist_flush(&services);
}
void
service_init(int announce)
{
- service_init_announce = announce;
-
get_hostname();
- vlist_update(&services);
- service_load("/tmp/run/mdnsd/*");
- vlist_flush(&services);
+ service_init_announce = announce;
+ ubus_service_list(service_init_cb);
}
void
projects / project / mdnsd.git / blobdiff