From 9091a2b0fa7f91be6d0d4b03ec8d7ef8cbe1e559 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Thu, 28 Aug 2014 12:14:37 +0200 Subject: [PATCH] more ttl related changes. prereq for goodbye messages Signed-off-by: John Crispin --- dns.c | 6 +++--- service.c | 28 ++++++++++++++-------------- service.h | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/dns.c b/dns.c index 6fac7d1..0d192ac 100644 --- a/dns.c +++ b/dns.c @@ -325,12 +325,12 @@ parse_question(struct interface *iface, char *name, struct dns_question *q) switch (q->type) { case TYPE_ANY: if (!strcmp(name, mdns_hostname_local)) - service_reply(iface, NULL); + service_reply(iface, NULL, announce_ttl); break; case TYPE_PTR: service_announce_services(iface, name); - service_reply(iface, name); + service_reply(iface, name, announce_ttl); break; case TYPE_AAAA: @@ -339,7 +339,7 @@ parse_question(struct interface *iface, char *name, struct dns_question *q) if (host) *host = '\0'; if (!strcmp(mdns_hostname, name)) - service_reply_a(iface, q->type); + service_reply_a(iface, q->type, announce_ttl); break; }; } diff --git a/service.c b/service.c index e4ec319..bd36132 100644 --- a/service.c +++ b/service.c @@ -79,18 +79,18 @@ service_name(const char *domain) } static void -service_add_ptr(const char *host) +service_add_ptr(const char *host, int ttl) { int len = dn_comp(host, mdns_buf, sizeof(mdns_buf), NULL, NULL); if (len < 1) return; - dns_add_answer(TYPE_PTR, mdns_buf, len, announce_ttl); + dns_add_answer(TYPE_PTR, mdns_buf, len, ttl); } static void -service_add_srv(struct service *s) +service_add_srv(struct service *s, int ttl) { struct dns_srv_data *sd = (struct dns_srv_data *) mdns_buf; int len = sizeof(*sd); @@ -100,7 +100,7 @@ service_add_srv(struct service *s) return; sd->port = cpu_to_be16(s->port); - dns_add_answer(TYPE_SRV, mdns_buf, len, announce_ttl); + dns_add_answer(TYPE_SRV, mdns_buf, len, ttl); } #define TOUT_LOOKUP 60 @@ -119,7 +119,7 @@ service_timeout(struct service *s) } void -service_reply_a(struct interface *iface, int type) +service_reply_a(struct interface *iface, int type, int ttl) { struct ifaddrs *ifap, *ifa; struct sockaddr_in *sa; @@ -136,7 +136,7 @@ service_reply_a(struct interface *iface, int type) sa = (struct sockaddr_in *) ifa->ifa_addr; addr = inet_ntoa(sa->sin_addr); printf("Interface: %s\tAddress4: %s\n", ifa->ifa_name, addr); - dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, announce_ttl); + dns_add_answer(TYPE_A, (uint8_t *) &sa->sin_addr, 4, ttl); } if (ifa->ifa_addr->sa_family==AF_INET6) { uint8_t ll_prefix[] = {0xfe, 0x80 }; @@ -145,7 +145,7 @@ service_reply_a(struct interface *iface, int type) if (!memcmp(&sa6->sin6_addr, &ll_prefix, 2)) { if (inet_ntop(AF_INET6, &sa6->sin6_addr, buf, 64)) printf("Interface: %s\tAddress6: %s\n", ifa->ifa_name, buf); - dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, announce_ttl); + dns_add_answer(TYPE_AAAA, (uint8_t *) &sa6->sin6_addr, 16, ttl); } } } @@ -155,7 +155,7 @@ service_reply_a(struct interface *iface, int type) } void -service_reply(struct interface *iface, const char *match) +service_reply(struct interface *iface, const char *match, int ttl) { struct service *s; @@ -172,20 +172,20 @@ service_reply(struct interface *iface, const char *match) continue; dns_init_answer(); - service_add_ptr(service_name(s->service)); + service_add_ptr(service_name(s->service), ttl); dns_send_answer(iface, service); dns_init_answer(); - service_add_srv(s); + service_add_srv(s, ttl); if (s->txt && s->txt_len) - dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len, announce_ttl); + dns_add_answer(TYPE_TXT, (uint8_t *) s->txt, s->txt_len, ttl); dns_send_answer(iface, host); } if (match) return; - service_reply_a(iface, TYPE_A); + service_reply_a(iface, TYPE_A, ttl); } void @@ -206,12 +206,12 @@ service_announce_services(struct interface *iface, const char *service) continue; s->t = 0; dns_init_answer(); - service_add_ptr(s->service); + 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); + service_reply(iface, s->service, announce_ttl); } } diff --git a/service.h b/service.h index 734e711..cc49abe 100644 --- a/service.h +++ b/service.h @@ -18,7 +18,7 @@ extern void service_init(void); extern void service_cleanup(void); extern void service_announce(struct interface *iface); extern void service_announce_services(struct interface *iface, const char *service); -extern void service_reply(struct interface *iface, const char *match); -extern void service_reply_a(struct interface *iface, int type); +extern void service_reply(struct interface *iface, const char *match, int ttl); +extern void service_reply_a(struct interface *iface, int type, int ttl); #endif -- 2.30.2