umdnsd: Replace strerror(errno) with %m.

[project/mdnsd.git] / announce.c

diff --git a/announce.c b/announce.c
index 4706cc2..3c8ea16 100644 (file)
--- a/announce.c
+++ b/announce.c
@@ -41,15 +41,12 @@ static void
 announce_timer(struct uloop_timeout *timeout)
 {
        struct interface *iface = container_of(timeout, struct interface, announce_timer);
 announce_timer(struct uloop_timeout *timeout)
 {
        struct interface *iface = container_of(timeout, struct interface, announce_timer);

-       char host[256];
-
-       snprintf(host, sizeof(host), "%s.local", hostname);

 
        switch (iface->announce_state) {
                case STATE_PROBE1:
                case STATE_PROBE2:
                case STATE_PROBE3:
 
        switch (iface->announce_state) {
                case STATE_PROBE1:
                case STATE_PROBE2:
                case STATE_PROBE3:

-                       dns_send_question(iface, host, TYPE_ANY);
+                       dns_send_question(iface, NULL, mdns_hostname_local, TYPE_ANY, 1);

                        uloop_timeout_set(timeout, 250);
                        iface->announce_state++;
                        break;
                        uloop_timeout_set(timeout, 250);
                        iface->announce_state++;
                        break;


@@ -60,14 +57,16 @@ announce_timer(struct uloop_timeout *timeout)
                        break;
 
                case STATE_PROBE_END:
                        break;
 
                case STATE_PROBE_END:

-                       if (cache_host_is_known(host)) {
-                               fprintf(stderr, "the host %s already exists. stopping announce service\n", host);
+                       if (cache_host_is_known(mdns_hostname_local)) {
+                               fprintf(stderr, "the host %s already exists. stopping announce service\n", mdns_hostname_local);

                                return;
                        }
                        iface->announce_state++;
                                return;
                        }
                        iface->announce_state++;

+                       /* Fall through */

 
                case STATE_ANNOUNCE:
 
                case STATE_ANNOUNCE:

-                       service_announce(iface);
+                       dns_reply_a(iface, NULL, announce_ttl);
+                       service_announce_services(iface, NULL, announce_ttl);

                        uloop_timeout_set(timeout, announce_ttl * 800);
                        break;
        }
                        uloop_timeout_set(timeout, announce_ttl * 800);
                        break;
        }