1 diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c
2 --- cups-2.0rc1/cups/http-support.c.avahi-address 2014-08-28 17:37:22.000000000 +0200
3 +++ cups-2.0rc1/cups/http-support.c 2014-09-12 15:31:45.062950696 +0200
4 @@ -2342,7 +2342,7 @@ http_resolve_cb(
5 const char *type, /* I - Registration type */
6 const char *domain, /* I - Domain (unused) */
7 const char *hostTarget, /* I - Hostname */
8 - const AvahiAddress *address, /* I - Address (unused) */
9 + const AvahiAddress *address, /* I - Address */
10 uint16_t port, /* I - Port number */
11 AvahiStringList *txt, /* I - TXT record */
12 AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */
13 @@ -2495,39 +2495,62 @@ http_resolve_cb(
14 * getting the IP address of the .local name and then do reverse-lookups...
17 - http_addrlist_t *addrlist, /* List of addresses */
18 - *addr; /* Current address */
23 DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
25 - snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
26 - if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
27 + switch (address->proto)
29 - for (addr = addrlist; addr; addr = addr->next)
30 + case AVAHI_PROTO_INET:
31 + addr.ipv4.sin_family = AF_INET;
32 + addrlen = sizeof (addr.ipv4.sin_addr);
33 + memcpy (&addr.ipv4.sin_addr, &address->data, addrlen);
35 + case AVAHI_PROTO_INET6:
36 + addr.ipv6.sin6_family = AF_INET6;
37 + addrlen = sizeof (addr.ipv6.sin6_addr);
38 + memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen);
41 + DEBUG_printf(("8http_resolve_cb: unknown address family %d",
47 + error = getnameinfo(&addr.addr, httpAddrLength (&addr),
48 + fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
52 - int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
53 + DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
57 - DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
58 + if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
59 + _cups_strcasecmp(hostptr, ".local"))
61 - if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
62 - _cups_strcasecmp(hostptr, ".local"))
71 + avahi_address_snprint (fqdn, sizeof (fqdn), address);
76 - DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
77 - httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
79 + DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
84 - httpAddrFreeList(addrlist);
88 + * Use the IP address that responded...
91 + avahi_address_snprint (fqdn, sizeof (fqdn), address);