|
 |
6dd0746 |
diff -up cups-2.0rc1/cups/http-support.c.avahi-address cups-2.0rc1/cups/http-support.c
|
|
|
6dd0746 |
--- cups-2.0rc1/cups/http-support.c.avahi-address 2014-08-28 17:37:22.000000000 +0200
|
|
|
6dd0746 |
+++ cups-2.0rc1/cups/http-support.c 2014-09-12 15:31:45.062950696 +0200
|
|
|
6dd0746 |
@@ -2342,7 +2342,7 @@ http_resolve_cb(
|
|
 |
55c9869 |
const char *type, /* I - Registration type */
|
|
|
55c9869 |
const char *domain, /* I - Domain (unused) */
|
|
|
55c9869 |
const char *hostTarget, /* I - Hostname */
|
|
|
55c9869 |
- const AvahiAddress *address, /* I - Address (unused) */
|
|
|
55c9869 |
+ const AvahiAddress *address, /* I - Address */
|
|
|
55c9869 |
uint16_t port, /* I - Port number */
|
|
|
55c9869 |
AvahiStringList *txt, /* I - TXT record */
|
|
|
55c9869 |
AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */
|
|
|
6dd0746 |
@@ -2495,39 +2495,62 @@ http_resolve_cb(
|
|
|
d2f0289 |
* getting the IP address of the .local name and then do reverse-lookups...
|
|
|
d2f0289 |
*/
|
|
|
d2f0289 |
|
|
|
d2f0289 |
- http_addrlist_t *addrlist, /* List of addresses */
|
|
|
d2f0289 |
- *addr; /* Current address */
|
|
|
d2f0289 |
+ http_addr_t addr;
|
|
|
d2f0289 |
+ size_t addrlen;
|
|
|
d2f0289 |
+ int error;
|
|
|
55c9869 |
|
|
|
55c9869 |
DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget));
|
|
|
55c9869 |
|
|
|
55c9869 |
- snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port));
|
|
|
55c9869 |
- if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL)
|
|
|
d2f0289 |
+ switch (address->proto)
|
|
|
55c9869 |
{
|
|
|
55c9869 |
- for (addr = addrlist; addr; addr = addr->next)
|
|
|
d2f0289 |
+ case AVAHI_PROTO_INET:
|
|
|
d2f0289 |
+ addr.ipv4.sin_family = AF_INET;
|
|
|
d2f0289 |
+ addrlen = sizeof (addr.ipv4.sin_addr);
|
|
|
d2f0289 |
+ memcpy (&addr.ipv4.sin_addr, &address->data, addrlen);
|
|
|
d2f0289 |
+ break;
|
|
|
d2f0289 |
+ case AVAHI_PROTO_INET6:
|
|
|
d2f0289 |
+ addr.ipv6.sin6_family = AF_INET6;
|
|
|
d2f0289 |
+ addrlen = sizeof (addr.ipv6.sin6_addr);
|
|
|
d2f0289 |
+ memcpy (&addr.ipv6.sin6_addr, &address->data, addrlen);
|
|
|
d2f0289 |
+ break;
|
|
|
d2f0289 |
+ default:
|
|
|
d2f0289 |
+ DEBUG_printf(("8http_resolve_cb: unknown address family %d",
|
|
|
d2f0289 |
+ address->proto));
|
|
|
d2f0289 |
+ addrlen = 0;
|
|
|
d2f0289 |
+ }
|
|
|
55c9869 |
+
|
|
|
d2f0289 |
+ if (addrlen > 0) {
|
|
|
d2f0289 |
+ error = getnameinfo(&addr.addr, httpAddrLength (&addr),
|
|
|
d2f0289 |
+ fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
|
|
|
d2f0289 |
+
|
|
|
d2f0289 |
+ if (!error)
|
|
|
55c9869 |
{
|
|
|
6dd0746 |
- int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD);
|
|
|
d2f0289 |
+ DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
|
|
|
d2f0289 |
|
|
|
55c9869 |
- if (!error)
|
|
|
6dd0746 |
- {
|
|
|
6dd0746 |
- DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn));
|
|
|
d2f0289 |
+ if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
|
|
|
d2f0289 |
+ _cups_strcasecmp(hostptr, ".local"))
|
|
|
6dd0746 |
|
|
|
55c9869 |
- if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn ||
|
|
|
55c9869 |
- _cups_strcasecmp(hostptr, ".local"))
|
|
|
55c9869 |
- {
|
|
|
55c9869 |
- hostTarget = fqdn;
|
|
|
55c9869 |
- break;
|
|
|
55c9869 |
- }
|
|
|
6dd0746 |
+ {
|
|
|
d2f0289 |
+ hostTarget = fqdn;
|
|
|
d2f0289 |
}
|
|
|
d2f0289 |
+ } else {
|
|
|
d2f0289 |
+ avahi_address_snprint (fqdn, sizeof (fqdn), address);
|
|
|
55c9869 |
+ hostTarget = fqdn;
|
|
|
6dd0746 |
+
|
|
|
55c9869 |
#ifdef DEBUG
|
|
|
55c9869 |
- else
|
|
|
55c9869 |
- DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
|
|
|
55c9869 |
- httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)),
|
|
|
55c9869 |
- error));
|
|
|
d2f0289 |
+ DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d",
|
|
|
d2f0289 |
+ fqdn, error));
|
|
|
55c9869 |
#endif /* DEBUG */
|
|
|
d2f0289 |
}
|
|
|
6dd0746 |
|
|
|
d2f0289 |
- httpAddrFreeList(addrlist);
|
|
|
d2f0289 |
}
|
|
|
55c9869 |
+ } else {
|
|
|
55c9869 |
+ /*
|
|
|
55c9869 |
+ * Use the IP address that responded...
|
|
|
55c9869 |
+ */
|
|
|
d2f0289 |
+
|
|
|
55c9869 |
+ avahi_address_snprint (fqdn, sizeof (fqdn), address);
|
|
|
55c9869 |
+ hostTarget = fqdn;
|
|
|
55c9869 |
}
|
|
|
55c9869 |
|
|
|
55c9869 |
/*
|