X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups%2Fhttp-support.c;h=21776d70e18f4d0304ae57cf69e307de3a88f8cd;hb=b2e0131860ddc0e5a669690d58adb34d4218034b;hp=677dbfd56c9a5d6bdaff2c639a8ea3bea00c56a1;hpb=88f9aafc49f9c4feb55d1d10daa0e494c22946fc;p=thirdparty%2Fcups.git diff --git a/cups/http-support.c b/cups/http-support.c index 677dbfd56..21776d70e 100644 --- a/cups/http-support.c +++ b/cups/http-support.c @@ -1,48 +1,16 @@ /* - * "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $" + * HTTP support routines for CUPS. * - * HTTP support routines for CUPS. + * Copyright 2007-2016 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". - * - * This file is subject to the Apple OS-Developed Software exception. - * - * Contents: - * - * httpAssembleURI() - Assemble a uniform resource identifier from its - * components. - * httpAssembleURIf() - Assemble a uniform resource identifier from its - * components with a formatted resource. - * _httpAssembleUUID() - Make a UUID URI conforming to RFC 4122. - * httpDecode64() - Base64-decode a string. - * httpDecode64_2() - Base64-decode a string. - * httpEncode64() - Base64-encode a string. - * httpEncode64_2() - Base64-encode a string. - * httpGetDateString() - Get a formatted date/time string from a time value. - * httpGetDateString2() - Get a formatted date/time string from a time value. - * httpGetDateTime() - Get a time value from a formatted date/time string. - * httpSeparate() - Separate a Universal Resource Identifier into its - * components. - * httpSeparate2() - Separate a Universal Resource Identifier into its - * components. - * httpSeparateURI() - Separate a Universal Resource Identifier into its - * components. - * httpStatus() - Return a short string describing a HTTP status code. - * _cups_hstrerror() - hstrerror() emulation function for Solaris and - * others. - * _httpDecodeURI() - Percent-decode a HTTP request URI. - * _httpEncodeURI() - Percent-encode a HTTP request URI. - * _httpResolveURI() - Resolve a DNS-SD URI. - * http_copy_decode() - Copy and decode a URI. - * http_copy_encode() - Copy and encode a URI. - * http_resolve_cb() - Build a device URI for the given service name. + * This file is subject to the Apple OS-Developed Software exception. */ /* @@ -59,6 +27,10 @@ # else # include # endif /* WIN32 */ +#elif defined(HAVE_AVAHI) +# include +# include +# include #endif /* HAVE_DNSSD */ @@ -68,9 +40,14 @@ typedef struct _http_uribuf_s /* URI buffer */ { - char *buffer; /* Pointer to buffer */ - size_t bufsize; /* Size of buffer */ - int options; /* Options passed to _httpResolveURI */ +#ifdef HAVE_AVAHI + AvahiSimplePoll *poll; /* Poll state */ +#endif /* HAVE_AVAHI */ + char *buffer; /* Pointer to buffer */ + size_t bufsize; /* Size of buffer */ + int options; /* Options passed to _httpResolveURI */ + const char *resource; /* Resource from URI */ + const char *uuid; /* UUID from URI */ } _http_uribuf_t; @@ -78,7 +55,7 @@ typedef struct _http_uribuf_s /* URI buffer */ * Local globals... */ -static const char * const http_days[7] = +static const char * const http_days[7] =/* Days of the week */ { "Sun", "Mon", @@ -89,7 +66,7 @@ static const char * const http_days[7] = "Sat" }; static const char * const http_months[12] = - { + { /* Months of the year */ "Jan", "Feb", "Mar", @@ -103,6 +80,26 @@ static const char * const http_months[12] = "Nov", "Dec" }; +static const char * const http_states[] = + { /* HTTP state strings */ + "HTTP_STATE_ERROR", + "HTTP_STATE_WAITING", + "HTTP_STATE_OPTIONS", + "HTTP_STATE_GET", + "HTTP_STATE_GET_SEND", + "HTTP_STATE_HEAD", + "HTTP_STATE_POST", + "HTTP_STATE_POST_RECV", + "HTTP_STATE_POST_SEND", + "HTTP_STATE_PUT", + "HTTP_STATE_PUT_RECV", + "HTTP_STATE_DELETE", + "HTTP_STATE_TRACE", + "HTTP_STATE_CONNECT", + "HTTP_STATE_STATUS", + "HTTP_STATE_UNKNOWN_METHOD", + "HTTP_STATE_UNKNOWN_VERSION" + }; /* @@ -127,6 +124,22 @@ static void DNSSD_API http_resolve_cb(DNSServiceRef sdRef, void *context); #endif /* HAVE_DNSSD */ +#ifdef HAVE_AVAHI +static void http_client_cb(AvahiClient *client, + AvahiClientState state, void *simple_poll); +static int http_poll_cb(struct pollfd *pollfds, unsigned int num_pollfds, + int timeout, void *context); +static void http_resolve_cb(AvahiServiceResolver *resolver, + AvahiIfIndex interface, + AvahiProtocol protocol, + AvahiResolverEvent event, + const char *name, const char *type, + const char *domain, const char *host_name, + const AvahiAddress *address, uint16_t port, + AvahiStringList *txt, + AvahiLookupResultFlags flags, void *context); +#endif /* HAVE_AVAHI */ + /* * 'httpAssembleURI()' - Assemble a uniform resource identifier from its @@ -137,7 +150,7 @@ static void DNSSD_API http_resolve_cb(DNSServiceRef sdRef, * place of traditional string functions whenever you need to create a * URI string. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -164,7 +177,7 @@ httpAssembleURI( if (uri) *uri = '\0'; - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); } /* @@ -177,10 +190,10 @@ httpAssembleURI( if (!ptr) goto assemble_overflow; - if (!strcmp(scheme, "mailto")) + if (!strcmp(scheme, "geo") || !strcmp(scheme, "mailto") || !strcmp(scheme, "tel")) { /* - * mailto: only has :, no //... + * geo:, mailto:, and tel: only have :, no //... */ if (ptr < end) @@ -191,7 +204,7 @@ httpAssembleURI( else { /* - * Schemes other than mailto: all have //... + * Schemes other than geo:, mailto:, and tel: typically have //... */ if ((ptr + 2) < end) @@ -210,13 +223,16 @@ httpAssembleURI( if (host) { + const char *hostptr; /* Pointer into hostname */ + int have_ipv6; /* Do we have an IPv6 address? */ + if (username && *username) { /* * Add username@ first... */ - ptr = http_copy_encode(ptr, username, end, "/?@", NULL, + ptr = http_copy_encode(ptr, username, end, "/?#[]@", NULL, encoding & HTTP_URI_CODING_USERNAME); if (!ptr) @@ -237,13 +253,23 @@ httpAssembleURI( * too... */ - if (host[0] != '[' && strchr(host, ':') && !strstr(host, "._tcp")) + for (hostptr = host, + have_ipv6 = strchr(host, ':') && !strstr(host, "._tcp"); + *hostptr && have_ipv6; + hostptr ++) + if (*hostptr != ':' && !isxdigit(*hostptr & 255)) + { + have_ipv6 = *hostptr == '%'; + break; + } + + if (have_ipv6) { /* * We have a raw IPv6 address... */ - if (strchr(host, '%')) + if (strchr(host, '%') && !(encoding & HTTP_URI_CODING_RFC6874)) { /* * We have a link-local address, add "[v1." prefix... @@ -262,7 +288,7 @@ httpAssembleURI( else { /* - * We have a normal address, add "[" prefix... + * We have a normal (or RFC 6874 link-local) address, add "[" prefix... */ if (ptr < end) @@ -278,8 +304,23 @@ httpAssembleURI( while (ptr < end && *host) { if (*host == '%') - { - *ptr++ = '+'; /* Convert zone separator */ + { + /* + * Convert/encode zone separator + */ + + if (encoding & HTTP_URI_CODING_RFC6874) + { + if (ptr >= (end - 2)) + goto assemble_overflow; + + *ptr++ = '%'; + *ptr++ = '2'; + *ptr++ = '5'; + } + else + *ptr++ = '+'; + host ++; } else @@ -297,10 +338,12 @@ httpAssembleURI( else { /* - * Otherwise, just copy the host string... + * Otherwise, just copy the host string (the extra chars are not in the + * "reg-name" ABNF rule; anything <= SP or >= DEL plus % gets automatically + * percent-encoded. */ - ptr = http_copy_encode(ptr, host, end, ":/?#[]@\\\"", NULL, + ptr = http_copy_encode(ptr, host, end, "\"#/:<>?@[\\]^`{|}", NULL, encoding & HTTP_URI_CODING_HOSTNAME); if (!ptr) @@ -313,7 +356,7 @@ httpAssembleURI( if (port > 0) { - snprintf(ptr, end - ptr + 1, ":%d", port); + snprintf(ptr, (size_t)(end - ptr + 1), ":%d", port); ptr += strlen(ptr); if (ptr >= end) @@ -363,7 +406,7 @@ httpAssembleURI( *ptr = '\0'; - return (HTTP_URI_OK); + return (HTTP_URI_STATUS_OK); /* * Clear the URI string and return an overflow error; I don't usually @@ -373,7 +416,7 @@ httpAssembleURI( assemble_overflow: *uri = '\0'; - return (HTTP_URI_OVERFLOW); + return (HTTP_URI_STATUS_OVERFLOW); } @@ -387,7 +430,7 @@ httpAssembleURI( * this function in place of traditional string functions whenever * you need to create a URI string. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - URI status */ @@ -416,7 +459,7 @@ httpAssembleURIf( if (uri) *uri = '\0'; - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); } /* @@ -427,10 +470,10 @@ httpAssembleURIf( bytes = vsnprintf(resource, sizeof(resource), resourcef, ap); va_end(ap); - if (bytes >= sizeof(resource)) + if ((size_t)bytes >= sizeof(resource)) { *uri = '\0'; - return (HTTP_URI_OVERFLOW); + return (HTTP_URI_STATUS_OVERFLOW); } else return (httpAssembleURI(encoding, uri, urilen, scheme, username, host, @@ -439,18 +482,24 @@ httpAssembleURIf( /* - * '_httpAssembleUUID()' - Make a UUID URI conforming to RFC 4122. + * 'httpAssembleUUID()' - Assemble a name-based UUID URN conforming to RFC 4122. + * + * This function creates a unique 128-bit identifying number using the server + * name, port number, random data, and optionally an object name and/or object + * number. The result is formatted as a UUID URN as defined in RFC 4122. * * The buffer needs to be at least 46 bytes in size. + * + * @since CUPS 1.7/macOS 10.9@ */ char * /* I - UUID string */ -_httpAssembleUUID(const char *server, /* I - Server name */ - int port, /* I - Port number */ - const char *name, /* I - Object name or NULL */ - int number, /* I - Object number or 0 */ - char *buffer, /* I - String buffer */ - size_t bufsize) /* I - Size of buffer */ +httpAssembleUUID(const char *server, /* I - Server name */ + int port, /* I - Port number */ + const char *name, /* I - Object name or NULL */ + int number, /* I - Object number or 0 */ + char *buffer, /* I - String buffer */ + size_t bufsize) /* I - Size of buffer */ { char data[1024]; /* Source string for MD5 */ _cups_md5_state_t md5state; /* MD5 state */ @@ -466,10 +515,10 @@ _httpAssembleUUID(const char *server, /* I - Server name */ snprintf(data, sizeof(data), "%s:%d:%s:%d:%04x:%04x", server, port, name ? name : server, number, - CUPS_RAND() & 0xffff, CUPS_RAND() & 0xffff); + (unsigned)CUPS_RAND() & 0xffff, (unsigned)CUPS_RAND() & 0xffff); _cupsMD5Init(&md5state); - _cupsMD5Append(&md5state, (unsigned char *)data, strlen(data)); + _cupsMD5Append(&md5state, (unsigned char *)data, (int)strlen(data)); _cupsMD5Finish(&md5state, md5sum); /* @@ -517,7 +566,7 @@ httpDecode64(char *out, /* I - String to write to */ /* * 'httpDecode64_2()' - Base64-decode a string. * - * @since CUPS 1.1.21/Mac OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Decoded string */ @@ -525,10 +574,10 @@ httpDecode64_2(char *out, /* I - String to write to */ int *outlen, /* IO - Size of output string */ const char *in) /* I - String to read from */ { - int pos, /* Bit position */ - base64; /* Value of this character */ - char *outptr, /* Output pointer */ - *outend; /* End of output buffer */ + int pos; /* Bit position */ + unsigned base64; /* Value of this character */ + char *outptr, /* Output pointer */ + *outend; /* End of output buffer */ /* @@ -557,11 +606,11 @@ httpDecode64_2(char *out, /* I - String to write to */ */ if (*in >= 'A' && *in <= 'Z') - base64 = *in - 'A'; + base64 = (unsigned)(*in - 'A'); else if (*in >= 'a' && *in <= 'z') - base64 = *in - 'a' + 26; + base64 = (unsigned)(*in - 'a' + 26); else if (*in >= '0' && *in <= '9') - base64 = *in - '0' + 52; + base64 = (unsigned)(*in - '0' + 52); else if (*in == '+') base64 = 62; else if (*in == '/') @@ -579,26 +628,26 @@ httpDecode64_2(char *out, /* I - String to write to */ { case 0 : if (outptr < outend) - *outptr = base64 << 2; + *outptr = (char)(base64 << 2); pos ++; break; case 1 : if (outptr < outend) - *outptr++ |= (base64 >> 4) & 3; + *outptr++ |= (char)((base64 >> 4) & 3); if (outptr < outend) - *outptr = (base64 << 4) & 255; + *outptr = (char)((base64 << 4) & 255); pos ++; break; case 2 : if (outptr < outend) - *outptr++ |= (base64 >> 2) & 15; + *outptr++ |= (char)((base64 >> 2) & 15); if (outptr < outend) - *outptr = (base64 << 6) & 255; + *outptr = (char)((base64 << 6) & 255); pos ++; break; case 3 : if (outptr < outend) - *outptr++ |= base64; + *outptr++ |= (char)base64; pos = 0; break; } @@ -636,7 +685,7 @@ httpEncode64(char *out, /* I - String to write to */ /* * 'httpEncode64_2()' - Base64-encode a string. * - * @since CUPS 1.1.21/Mac OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ */ char * /* O - Encoded string */ @@ -745,7 +794,7 @@ httpGetDateString(time_t t) /* I - UNIX time */ /* * 'httpGetDateString2()' - Get a formatted date/time string from a time value. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ const char * /* O - Date/time string */ @@ -757,10 +806,10 @@ httpGetDateString2(time_t t, /* I - UNIX time */ tdate = gmtime(&t); - snprintf(s, slen, "%s, %02d %s %d %02d:%02d:%02d GMT", - http_days[tdate->tm_wday], tdate->tm_mday, - http_months[tdate->tm_mon], tdate->tm_year + 1900, - tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + if (tdate) + snprintf(s, (size_t)slen, "%s, %02d %s %d %02d:%02d:%02d GMT", http_days[tdate->tm_wday], tdate->tm_mday, http_months[tdate->tm_mon], tdate->tm_year + 1900, tdate->tm_hour, tdate->tm_min, tdate->tm_sec); + else + s[0] = '\0'; return (s); } @@ -862,7 +911,7 @@ httpSeparate(const char *uri, /* I - Universal Resource Identifier */ * * This function is deprecated; use the httpSeparateURI() function instead. * - * @since CUPS 1.1.21/Mac OS X 10.4@ + * @since CUPS 1.1.21/macOS 10.4@ * @deprecated@ */ @@ -887,7 +936,7 @@ httpSeparate2(const char *uri, /* I - Universal Resource Identifier */ * 'httpSeparateURI()' - Separate a Universal Resource Identifier into its * components. * - * @since CUPS 1.2/Mac OS X 10.5@ + * @since CUPS 1.2/macOS 10.5@ */ http_uri_status_t /* O - Result of separation */ @@ -936,16 +985,16 @@ httpSeparateURI( if (!uri || !port || !scheme || schemelen <= 0 || !username || usernamelen <= 0 || !host || hostlen <= 0 || !resource || resourcelen <= 0) - return (HTTP_URI_BAD_ARGUMENTS); + return (HTTP_URI_STATUS_BAD_ARGUMENTS); if (!*uri) - return (HTTP_URI_BAD_URI); + return (HTTP_URI_STATUS_BAD_URI); /* * Grab the scheme portion of the URI... */ - status = HTTP_URI_OK; + status = HTTP_URI_STATUS_OK; if (!strncmp(uri, "//", 2)) { @@ -953,8 +1002,8 @@ httpSeparateURI( * Workaround for HP IPP client bug... */ - strlcpy(scheme, "ipp", schemelen); - status = HTTP_URI_MISSING_SCHEME; + strlcpy(scheme, "ipp", (size_t)schemelen); + status = HTTP_URI_STATUS_MISSING_SCHEME; } else if (*uri == '/') { @@ -962,8 +1011,8 @@ httpSeparateURI( * Filename... */ - strlcpy(scheme, "file", schemelen); - status = HTTP_URI_MISSING_SCHEME; + strlcpy(scheme, "file", (size_t)schemelen); + status = HTTP_URI_STATUS_MISSING_SCHEME; } else { @@ -985,7 +1034,7 @@ httpSeparateURI( if (*uri != ':') { *scheme = '\0'; - return (HTTP_URI_BAD_SCHEME); + return (HTTP_URI_STATUS_BAD_SCHEME); } uri ++; @@ -1005,8 +1054,8 @@ httpSeparateURI( *port = 515; else if (!strcmp(scheme, "socket")) /* Not yet registered with IANA... */ *port = 9100; - else if (strcmp(scheme, "file") && strcmp(scheme, "mailto")) - status = HTTP_URI_UNKNOWN_SCHEME; + else if (strcmp(scheme, "file") && strcmp(scheme, "mailto") && strcmp(scheme, "tel")) + status = HTTP_URI_STATUS_UNKNOWN_SCHEME; /* * Now see if we have a hostname... @@ -1036,7 +1085,7 @@ httpSeparateURI( if (!uri) { *username = '\0'; - return (HTTP_URI_BAD_USERNAME); + return (HTTP_URI_STATUS_BAD_USERNAME); } uri ++; @@ -1053,8 +1102,25 @@ httpSeparateURI( */ uri ++; - if (!strncmp(uri, "v1.", 3)) - uri += 3; /* Skip IPvN leader... */ + if (*uri == 'v') + { + /* + * Skip IPvFuture ("vXXXX.") prefix... + */ + + uri ++; + + while (isxdigit(*uri & 255)) + uri ++; + + if (*uri != '.') + { + *host = '\0'; + return (HTTP_URI_STATUS_BAD_HOSTNAME); + } + + uri ++; + } uri = http_copy_decode(host, uri, hostlen, "]", decoding & HTTP_URI_CODING_HOSTNAME); @@ -1062,7 +1128,7 @@ httpSeparateURI( if (!uri) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } /* @@ -1072,7 +1138,7 @@ httpSeparateURI( if (*uri != ']') { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } uri ++; @@ -1087,10 +1153,18 @@ httpSeparateURI( *ptr = '%'; break; } + else if (*ptr == '%') + { + /* + * Stop at zone separator (RFC 6874) + */ + + break; + } else if (*ptr != ':' && *ptr != '.' && !isxdigit(*ptr & 255)) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } } else @@ -1102,15 +1176,16 @@ httpSeparateURI( for (ptr = (char *)uri; *ptr; ptr ++) if (strchr(":?/", *ptr)) break; - else if (!strchr("abcdefghijklmnopqrstuvwxyz" - "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "0123456789" - "-._~" - "%" - "!$&'()*+,;=\\", *ptr)) + else if (!strchr("abcdefghijklmnopqrstuvwxyz" /* unreserved */ + "ABCDEFGHIJKLMNOPQRSTUVWXYZ" /* unreserved */ + "0123456789" /* unreserved */ + "-._~" /* unreserved */ + "%" /* pct-encoded */ + "!$&'()*+,;=" /* sub-delims */ + "\\", *ptr)) /* SMB domain */ { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } /* @@ -1123,7 +1198,7 @@ httpSeparateURI( if (!uri) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } } @@ -1135,7 +1210,7 @@ httpSeparateURI( if (!strcmp(scheme, "file") && strcmp(host, "localhost") && host[0]) { *host = '\0'; - return (HTTP_URI_BAD_HOSTNAME); + return (HTTP_URI_STATUS_BAD_HOSTNAME); } /* @@ -1151,15 +1226,21 @@ httpSeparateURI( if (!isdigit(uri[1] & 255)) { *port = 0; - return (HTTP_URI_BAD_PORT); + return (HTTP_URI_STATUS_BAD_PORT); } - *port = strtol(uri + 1, (char **)&uri, 10); + *port = (int)strtol(uri + 1, (char **)&uri, 10); + + if (*port <= 0 || *port > 65535) + { + *port = 0; + return (HTTP_URI_STATUS_BAD_PORT); + } if (*uri != '/' && *uri) { *port = 0; - return (HTTP_URI_BAD_PORT); + return (HTTP_URI_STATUS_BAD_PORT); } } } @@ -1174,7 +1255,7 @@ httpSeparateURI( * Hostname but no path... */ - status = HTTP_URI_MISSING_RESOURCE; + status = HTTP_URI_STATUS_MISSING_RESOURCE; *resource = '/'; /* @@ -1200,15 +1281,16 @@ httpSeparateURI( char *resptr = resource + strlen(resource); - uri = http_copy_decode(resptr, uri, resourcelen - (int)(resptr - resource), - NULL, decoding & HTTP_URI_CODING_QUERY); + uri = http_copy_decode(resptr, uri, + resourcelen - (int)(resptr - resource), NULL, + decoding & HTTP_URI_CODING_QUERY); } } if (!uri) { *resource = '\0'; - return (HTTP_URI_BAD_RESOURCE); + return (HTTP_URI_STATUS_BAD_RESOURCE); } /* @@ -1220,92 +1302,107 @@ httpSeparateURI( /* - * 'httpStatus()' - Return a short string describing a HTTP status code. + * 'httpStateString()' - Return the string describing a HTTP state value. * - * The returned string is localized to the current POSIX locale and is based - * on the status strings defined in RFC 2616. + * @since CUPS 2.0/OS 10.10@ + */ + +const char * /* O - State string */ +httpStateString(http_state_t state) /* I - HTTP state value */ +{ + if (state < HTTP_STATE_ERROR || state > HTTP_STATE_UNKNOWN_VERSION) + return ("HTTP_STATE_???"); + else + return (http_states[state - HTTP_STATE_ERROR]); +} + + +/* + * '_httpStatus()' - Return the localized string describing a HTTP status code. + * + * The returned string is localized using the passed message catalog. */ const char * /* O - Localized status string */ -httpStatus(http_status_t status) /* I - HTTP status code */ +_httpStatus(cups_lang_t *lang, /* I - Language */ + http_status_t status) /* I - HTTP status code */ { const char *s; /* Status string */ - _cups_globals_t *cg = _cupsGlobals(); /* Global data */ - if (!cg->lang_default) - cg->lang_default = cupsLangDefault(); - switch (status) { - case HTTP_CONTINUE : + case HTTP_STATUS_ERROR : + s = strerror(errno); + break; + case HTTP_STATUS_CONTINUE : s = _("Continue"); break; - case HTTP_SWITCHING_PROTOCOLS : + case HTTP_STATUS_SWITCHING_PROTOCOLS : s = _("Switching Protocols"); break; - case HTTP_OK : + case HTTP_STATUS_OK : s = _("OK"); break; - case HTTP_CREATED : + case HTTP_STATUS_CREATED : s = _("Created"); break; - case HTTP_ACCEPTED : + case HTTP_STATUS_ACCEPTED : s = _("Accepted"); break; - case HTTP_NO_CONTENT : + case HTTP_STATUS_NO_CONTENT : s = _("No Content"); break; - case HTTP_MOVED_PERMANENTLY : + case HTTP_STATUS_MOVED_PERMANENTLY : s = _("Moved Permanently"); break; - case HTTP_SEE_OTHER : + case HTTP_STATUS_SEE_OTHER : s = _("See Other"); break; - case HTTP_NOT_MODIFIED : + case HTTP_STATUS_NOT_MODIFIED : s = _("Not Modified"); break; - case HTTP_BAD_REQUEST : + case HTTP_STATUS_BAD_REQUEST : s = _("Bad Request"); break; - case HTTP_UNAUTHORIZED : - case HTTP_AUTHORIZATION_CANCELED : + case HTTP_STATUS_UNAUTHORIZED : + case HTTP_STATUS_CUPS_AUTHORIZATION_CANCELED : s = _("Unauthorized"); break; - case HTTP_FORBIDDEN : + case HTTP_STATUS_FORBIDDEN : s = _("Forbidden"); break; - case HTTP_NOT_FOUND : + case HTTP_STATUS_NOT_FOUND : s = _("Not Found"); break; - case HTTP_REQUEST_TOO_LARGE : + case HTTP_STATUS_REQUEST_TOO_LARGE : s = _("Request Entity Too Large"); break; - case HTTP_URI_TOO_LONG : + case HTTP_STATUS_URI_TOO_LONG : s = _("URI Too Long"); break; - case HTTP_UPGRADE_REQUIRED : + case HTTP_STATUS_UPGRADE_REQUIRED : s = _("Upgrade Required"); break; - case HTTP_NOT_IMPLEMENTED : + case HTTP_STATUS_NOT_IMPLEMENTED : s = _("Not Implemented"); break; - case HTTP_NOT_SUPPORTED : + case HTTP_STATUS_NOT_SUPPORTED : s = _("Not Supported"); break; - case HTTP_EXPECTATION_FAILED : + case HTTP_STATUS_EXPECTATION_FAILED : s = _("Expectation Failed"); break; - case HTTP_SERVICE_UNAVAILABLE : + case HTTP_STATUS_SERVICE_UNAVAILABLE : s = _("Service Unavailable"); break; - case HTTP_SERVER_ERROR : + case HTTP_STATUS_SERVER_ERROR : s = _("Internal Server Error"); break; - case HTTP_PKI_ERROR : + case HTTP_STATUS_CUPS_PKI_ERROR : s = _("SSL/TLS Negotiation Error"); break; - case HTTP_WEBIF_DISABLED : + case HTTP_STATUS_CUPS_WEBIF_DISABLED : s = _("Web Interface is Disabled"); break; @@ -1314,6 +1411,90 @@ httpStatus(http_status_t status) /* I - HTTP status code */ break; } + return (_cupsLangString(lang, s)); +} + + +/* + * 'httpStatus()' - Return a short string describing a HTTP status code. + * + * The returned string is localized to the current POSIX locale and is based + * on the status strings defined in RFC 2616. + */ + +const char * /* O - Localized status string */ +httpStatus(http_status_t status) /* I - HTTP status code */ +{ + _cups_globals_t *cg = _cupsGlobals(); /* Global data */ + + + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); + + return (_httpStatus(cg->lang_default, status)); +} + +/* + * 'httpURIStatusString()' - Return a string describing a URI status code. + * + * @since CUPS 2.0/OS 10.10@ + */ + +const char * /* O - Localized status string */ +httpURIStatusString( + http_uri_status_t status) /* I - URI status code */ +{ + const char *s; /* Status string */ + _cups_globals_t *cg = _cupsGlobals(); /* Global data */ + + + if (!cg->lang_default) + cg->lang_default = cupsLangDefault(); + + switch (status) + { + case HTTP_URI_STATUS_OVERFLOW : + s = _("URI too large"); + break; + case HTTP_URI_STATUS_BAD_ARGUMENTS : + s = _("Bad arguments to function"); + break; + case HTTP_URI_STATUS_BAD_RESOURCE : + s = _("Bad resource in URI"); + break; + case HTTP_URI_STATUS_BAD_PORT : + s = _("Bad port number in URI"); + break; + case HTTP_URI_STATUS_BAD_HOSTNAME : + s = _("Bad hostname/address in URI"); + break; + case HTTP_URI_STATUS_BAD_USERNAME : + s = _("Bad username in URI"); + break; + case HTTP_URI_STATUS_BAD_SCHEME : + s = _("Bad scheme in URI"); + break; + case HTTP_URI_STATUS_BAD_URI : + s = _("Bad/empty URI"); + break; + case HTTP_URI_STATUS_OK : + s = _("OK"); + break; + case HTTP_URI_STATUS_MISSING_SCHEME : + s = _("Missing scheme in URI"); + break; + case HTTP_URI_STATUS_UNKNOWN_SCHEME : + s = _("Unknown scheme in URI"); + break; + case HTTP_URI_STATUS_MISSING_RESOURCE : + s = _("Missing resource in URI"); + break; + + default: + s = _("Unknown"); + break; + } + return (_cupsLangString(cg->lang_default, s)); } @@ -1397,9 +1578,7 @@ _httpResolveURI( #endif /* DEBUG */ - DEBUG_printf(("4_httpResolveURI(uri=\"%s\", resolved_uri=%p, " - "resolved_size=" CUPS_LLFMT ")", uri, resolved_uri, - CUPS_LLCAST resolved_size)); + DEBUG_printf(("_httpResolveURI(uri=\"%s\", resolved_uri=%p, resolved_size=" CUPS_LLFMT ", options=0x%x, cb=%p, context=%p)", uri, (void *)resolved_uri, CUPS_LLCAST resolved_size, options, (void *)cb, context)); /* * Get the device URI... @@ -1409,19 +1588,19 @@ _httpResolveURI( if ((status = httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, - sizeof(resource))) < HTTP_URI_OK) + sizeof(resource))) < HTTP_URI_STATUS_OK) #else if (httpSeparateURI(HTTP_URI_CODING_ALL, uri, scheme, sizeof(scheme), userpass, sizeof(userpass), hostname, sizeof(hostname), &port, resource, - sizeof(resource)) < HTTP_URI_OK) + sizeof(resource)) < HTTP_URI_STATUS_OK) #endif /* DEBUG */ { if (options & _HTTP_RESOLVE_STDERR) _cupsLangPrintFilter(stderr, "ERROR", _("Bad device-uri \"%s\"."), uri); - DEBUG_printf(("6_httpResolveURI: httpSeparateURI returned %d!", status)); - DEBUG_puts("5_httpResolveURI: Returning NULL"); + DEBUG_printf(("2_httpResolveURI: httpSeparateURI returned %d!", status)); + DEBUG_puts("2_httpResolveURI: Returning NULL"); return (NULL); } @@ -1431,24 +1610,33 @@ _httpResolveURI( if (strstr(hostname, "._tcp")) { -#ifdef HAVE_DNSSD -# ifdef WIN32 -# pragma comment(lib, "dnssd.lib") -# endif /* WIN32 */ - DNSServiceRef ref, /* DNS-SD master service reference */ - domainref, /* DNS-SD service reference for domain */ - localref; /* DNS-SD service reference for .local */ - int domainsent = 0, /* Send the domain resolve? */ - offline = 0; /* offline-report state set? */ +#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) char *regtype, /* Pointer to type in hostname */ - *domain; /* Pointer to domain in hostname */ + *domain, /* Pointer to domain in hostname */ + *uuid, /* Pointer to UUID in URI */ + *uuidend; /* Pointer to end of UUID in URI */ _http_uribuf_t uribuf; /* URI buffer */ -#ifdef HAVE_POLL + int offline = 0; /* offline-report state set? */ +# ifdef HAVE_DNSSD +# ifdef WIN32 +# pragma comment(lib, "dnssd.lib") +# endif /* WIN32 */ + DNSServiceRef ref, /* DNS-SD master service reference */ + domainref = NULL,/* DNS-SD service reference for domain */ + ippref = NULL, /* DNS-SD service reference for network IPP */ + ippsref = NULL, /* DNS-SD service reference for network IPPS */ + localref; /* DNS-SD service reference for .local */ + int extrasent = 0; /* Send the domain/IPP/IPPS resolves? */ +# ifdef HAVE_POLL struct pollfd polldata; /* Polling data */ -#else /* select() */ +# else /* select() */ fd_set input_set; /* Input set for select() */ struct timeval stimeout; /* Timeout value for select() */ -#endif /* HAVE_POLL */ +# endif /* HAVE_POLL */ +# elif defined(HAVE_AVAHI) + AvahiClient *client; /* Client information */ + int error; /* Status */ +# endif /* HAVE_DNSSD */ if (options & _HTTP_RESOLVE_STDERR) fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname); @@ -1472,7 +1660,7 @@ _httpResolveURI( if (regtype <= hostname) { - DEBUG_puts("5_httpResolveURI: Bad hostname, returning NULL"); + DEBUG_puts("2_httpResolveURI: Bad hostname, returning NULL"); return (NULL); } @@ -1485,12 +1673,23 @@ _httpResolveURI( if (domain) *domain++ = '\0'; + if ((uuid = strstr(resource, "?uuid=")) != NULL) + { + *uuid = '\0'; + uuid += 6; + if ((uuidend = strchr(uuid, '&')) != NULL) + *uuidend = '\0'; + } + + resolved_uri[0] = '\0'; + uribuf.buffer = resolved_uri; uribuf.bufsize = resolved_size; uribuf.options = options; - resolved_uri[0] = '\0'; + uribuf.resource = resource; + uribuf.uuid = uuid; - DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " + DEBUG_printf(("2_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", " "domain=\"%s\"\n", hostname, regtype, domain)); if (options & _HTTP_RESOLVE_STDERR) { @@ -1501,57 +1700,71 @@ _httpResolveURI( uri = NULL; +# ifdef HAVE_DNSSD if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError) { + uint32_t myinterface = kDNSServiceInterfaceIndexAny; + /* Lookup on any interface */ + + if (!strcmp(scheme, "ippusb")) + myinterface = kDNSServiceInterfaceIndexLocalOnly; + localref = ref; - if (DNSServiceResolve(&localref, kDNSServiceFlagsShareConnection, 0, - hostname, regtype, "local.", http_resolve_cb, + if (DNSServiceResolve(&localref, + kDNSServiceFlagsShareConnection, myinterface, + hostname, regtype, "local.", http_resolve_cb, &uribuf) == kDNSServiceErr_NoError) { int fds; /* Number of ready descriptors */ time_t timeout, /* Poll timeout */ - start_time = time(NULL);/* Start time */ + start_time = time(NULL),/* Start time */ + end_time = start_time + 90; + /* End time */ - for (;;) + while (time(NULL) < end_time) { if (options & _HTTP_RESOLVE_STDERR) _cupsLangPrintFilter(stderr, "INFO", _("Looking for printer.")); if (cb && !(*cb)(context)) { - DEBUG_puts("5_httpResolveURI: callback returned 0 (stop)"); + DEBUG_puts("2_httpResolveURI: callback returned 0 (stop)"); break; } /* - * For the first minute (or forever if we have a callback), wakeup - * every 2 seconds to emit a "looking for printer" message... + * Wakeup every 2 seconds to emit a "looking for printer" message... */ - timeout = (time(NULL) < (start_time + 60) || cb) ? 2000 : -1; + if ((timeout = end_time - time(NULL)) > 2) + timeout = 2; -#ifdef HAVE_POLL +# ifdef HAVE_POLL polldata.fd = DNSServiceRefSockFD(ref); polldata.events = POLLIN; - fds = poll(&polldata, 1, timeout); + fds = poll(&polldata, 1, (int)(1000 * timeout)); -#else /* select() */ +# else /* select() */ FD_ZERO(&input_set); FD_SET(DNSServiceRefSockFD(ref), &input_set); - stimeout.tv_sec = ((int)timeout) / 1000; - stimeout.tv_usec = ((int)(timeout) * 1000) % 1000000; +# ifdef WIN32 + stimeout.tv_sec = (long)timeout; +# else + stimeout.tv_sec = timeout; +# endif /* WIN32 */ + stimeout.tv_usec = 0; fds = select(DNSServiceRefSockFD(ref)+1, &input_set, NULL, NULL, - timeout < 0.0 ? NULL : &stimeout); -#endif /* HAVE_POLL */ + &stimeout); +# endif /* HAVE_POLL */ if (fds < 0) { if (errno != EINTR && errno != EAGAIN) { - DEBUG_printf(("5_httpResolveURI: poll error: %s", strerror(errno))); + DEBUG_printf(("2_httpResolveURI: poll error: %s", strerror(errno))); break; } } @@ -1562,7 +1775,7 @@ _httpResolveURI( * comes in, do an additional domain resolution... */ - if (domainsent == 0 && (domain && _cups_strcasecmp(domain, "local."))) + if (extrasent == 0 && domain && _cups_strcasecmp(domain, "local.")) { if (options & _HTTP_RESOLVE_STDERR) fprintf(stderr, @@ -1571,11 +1784,38 @@ _httpResolveURI( domain ? domain : ""); domainref = ref; - if (DNSServiceResolve(&domainref, kDNSServiceFlagsShareConnection, - 0, hostname, regtype, domain, - http_resolve_cb, &uribuf) - == kDNSServiceErr_NoError) - domainsent = 1; + if (DNSServiceResolve(&domainref, + kDNSServiceFlagsShareConnection, + myinterface, hostname, regtype, domain, + http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 1; + } + else if (extrasent == 0 && !strcmp(scheme, "ippusb")) + { + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"_ipps._tcp\", domain=\"local.\"...\n", hostname); + + ippsref = ref; + if (DNSServiceResolve(&ippsref, + kDNSServiceFlagsShareConnection, + kDNSServiceInterfaceIndexAny, hostname, + "_ipps._tcp", domain, http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 1; + } + else if (extrasent == 1 && !strcmp(scheme, "ippusb")) + { + if (options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Resolving \"%s\", regtype=\"_ipp._tcp\", domain=\"local.\"...\n", hostname); + + ippref = ref; + if (DNSServiceResolve(&ippref, + kDNSServiceFlagsShareConnection, + kDNSServiceInterfaceIndexAny, hostname, + "_ipp._tcp", domain, http_resolve_cb, + &uribuf) == kDNSServiceErr_NoError) + extrasent = 2; } /* @@ -1592,7 +1832,8 @@ _httpResolveURI( } else { - if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError) + if (DNSServiceProcessResult(ref) == kDNSServiceErr_NoError && + resolved_uri[0]) { uri = resolved_uri; break; @@ -1600,35 +1841,114 @@ _httpResolveURI( } } - if (domainsent) - DNSServiceRefDeallocate(domainref); + if (extrasent) + { + if (domainref) + DNSServiceRefDeallocate(domainref); + if (ippref) + DNSServiceRefDeallocate(ippref); + if (ippsref) + DNSServiceRefDeallocate(ippsref); + } DNSServiceRefDeallocate(localref); } DNSServiceRefDeallocate(ref); } +# else /* HAVE_AVAHI */ + if ((uribuf.poll = avahi_simple_poll_new()) != NULL) + { + avahi_simple_poll_set_func(uribuf.poll, http_poll_cb, NULL); + + if ((client = avahi_client_new(avahi_simple_poll_get(uribuf.poll), + 0, http_client_cb, + &uribuf, &error)) != NULL) + { + if (avahi_service_resolver_new(client, AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, hostname, + regtype, "local.", AVAHI_PROTO_UNSPEC, 0, + http_resolve_cb, &uribuf) != NULL) + { + time_t start_time = time(NULL), + /* Start time */ + end_time = start_time + 90; + /* End time */ + int pstatus; /* Poll status */ + + pstatus = avahi_simple_poll_iterate(uribuf.poll, 2000); + + if (pstatus == 0 && !resolved_uri[0] && domain && + _cups_strcasecmp(domain, "local.")) + { + /* + * Resolve for .local hasn't returned anything, try the listed + * domain... + */ + + avahi_service_resolver_new(client, AVAHI_IF_UNSPEC, + AVAHI_PROTO_UNSPEC, hostname, + regtype, domain, AVAHI_PROTO_UNSPEC, 0, + http_resolve_cb, &uribuf); + } + + while (!pstatus && !resolved_uri[0] && time(NULL) < end_time) + { + if ((pstatus = avahi_simple_poll_iterate(uribuf.poll, 2000)) != 0) + break; + + /* + * If it hasn't resolved within 5 seconds set the offline-report + * printer-state-reason... + */ + + if ((options & _HTTP_RESOLVE_STDERR) && offline == 0 && + time(NULL) > (start_time + 5)) + { + fputs("STATE: +offline-report\n", stderr); + offline = 1; + } + } + + /* + * Collect the result (if we got one). + */ + + if (resolved_uri[0]) + uri = resolved_uri; + } + + avahi_client_free(client); + } + + avahi_simple_poll_free(uribuf.poll); + } +# endif /* HAVE_DNSSD */ if (options & _HTTP_RESOLVE_STDERR) { if (uri) + { fprintf(stderr, "DEBUG: Resolved as \"%s\"...\n", uri); + fputs("STATE: -connecting-to-device,offline-report\n", stderr); + } else + { fputs("DEBUG: Unable to resolve URI\n", stderr); - - fputs("STATE: -connecting-to-device,offline-report\n", stderr); + fputs("STATE: -connecting-to-device\n", stderr); + } } -#else +#else /* HAVE_DNSSD || HAVE_AVAHI */ /* * No DNS-SD support... */ uri = NULL; -#endif /* HAVE_DNSSD */ +#endif /* HAVE_DNSSD || HAVE_AVAHI */ if ((options & _HTTP_RESOLVE_STDERR) && !uri) - _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer.")); + _cupsLangPrintFilter(stderr, "INFO", _("Unable to find printer.")); } else { @@ -1640,12 +1960,41 @@ _httpResolveURI( uri = resolved_uri; } - DEBUG_printf(("5_httpResolveURI: Returning \"%s\"", uri)); + DEBUG_printf(("2_httpResolveURI: Returning \"%s\"", uri)); return (uri); } +#ifdef HAVE_AVAHI +/* + * 'http_client_cb()' - Client callback for resolving URI. + */ + +static void +http_client_cb( + AvahiClient *client, /* I - Client information */ + AvahiClientState state, /* I - Current state */ + void *context) /* I - Pointer to URI buffer */ +{ + DEBUG_printf(("7http_client_cb(client=%p, state=%d, context=%p)", client, + state, context)); + + /* + * If the connection drops, quit. + */ + + if (state == AVAHI_CLIENT_FAILURE) + { + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ + + avahi_simple_poll_quit(uribuf->poll); + } +} +#endif /* HAVE_AVAHI */ + + /* * 'http_copy_decode()' - Copy and decode a URI. */ @@ -1692,7 +2041,7 @@ http_copy_decode(char *dst, /* O - Destination buffer */ else quoted |= *src - '0'; - *ptr++ = quoted; + *ptr++ = (char)quoted; } else { @@ -1704,6 +2053,11 @@ http_copy_decode(char *dst, /* O - Destination buffer */ return (NULL); } } + else if ((*src & 255) <= 0x20 || (*src & 255) >= 0x7f) + { + *ptr = '\0'; + return (NULL); + } else *ptr++ = *src; } @@ -1781,22 +2135,44 @@ http_resolve_cb( const unsigned char *txtRecord, /* I - TXT record data */ void *context) /* I - Pointer to URI buffer */ { + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ const char *scheme, /* URI scheme */ - *hostptr; /* Pointer into hostTarget */ - char rp[257], /* Remote printer */ + *hostptr, /* Pointer into hostTarget */ + *reskey, /* "rp" or "rfo" */ + *resdefault; /* Default path */ + char resource[257], /* Remote path */ fqdn[256]; /* FQDN of the .local name */ const void *value; /* Value from TXT record */ uint8_t valueLen; /* Length of value */ - _http_uribuf_t *uribuf; /* URI buffer */ - DEBUG_printf(("7http_resolve_cb(sdRef=%p, flags=%x, interfaceIndex=%u, " - "errorCode=%d, fullName=\"%s\", hostTarget=\"%s\", port=%u, " - "txtLen=%u, txtRecord=%p, context=%p)", sdRef, flags, - interfaceIndex, errorCode, fullName, hostTarget, port, txtLen, - txtRecord, context)); + DEBUG_printf(("4http_resolve_cb(sdRef=%p, flags=%x, interfaceIndex=%u, errorCode=%d, fullName=\"%s\", hostTarget=\"%s\", port=%u, txtLen=%u, txtRecord=%p, context=%p)", (void *)sdRef, flags, interfaceIndex, errorCode, fullName, hostTarget, port, txtLen, (void *)txtRecord, context)); - uribuf = (_http_uribuf_t *)context; + /* + * If we have a UUID, compare it... + */ + + if (uribuf->uuid && + (value = TXTRecordGetValuePtr(txtLen, txtRecord, "UUID", + &valueLen)) != NULL) + { + char uuid[256]; /* UUID value */ + + memcpy(uuid, value, valueLen); + uuid[valueLen] = '\0'; + + if (_cups_strcasecmp(uuid, uribuf->uuid)) + { + if (uribuf->options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Found UUID %s, looking for %s.", uuid, + uribuf->uuid); + + DEBUG_printf(("5http_resolve_cb: Found UUID %s, looking for %s.", uuid, + uribuf->uuid)); + return; + } + } /* * Figure out the scheme from the full name... @@ -1821,19 +2197,50 @@ http_resolve_cb( * Extract the "remote printer" key from the TXT record... */ - if ((value = TXTRecordGetValuePtr(txtLen, txtRecord, "rp", + if ((uribuf->options & _HTTP_RESOLVE_FAXOUT) && + (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !TXTRecordGetValuePtr(txtLen, txtRecord, "printer-type", &valueLen)) + { + reskey = "rfo"; + resdefault = "/ipp/faxout"; + } + else + { + reskey = "rp"; + resdefault = "/"; + } + + if ((value = TXTRecordGetValuePtr(txtLen, txtRecord, reskey, &valueLen)) != NULL) + { + if (((char *)value)[0] == '/') + { + /* + * Value (incorrectly) has a leading slash already... + */ + + memcpy(resource, value, valueLen); + resource[valueLen] = '\0'; + } + else + { + /* + * Convert to resource by concatenating with a leading "/"... + */ + + resource[0] = '/'; + memcpy(resource + 1, value, valueLen); + resource[valueLen + 1] = '\0'; + } + } + else { /* - * Convert to resource by concatenating with a leading "/"... + * Use the default value... */ - rp[0] = '/'; - memcpy(rp + 1, value, valueLen); - rp[valueLen + 1] = '\0'; + strlcpy(resource, resdefault, sizeof(resource)); } - else - rp[0] = '\0'; /* * Lookup the FQDN if needed... @@ -1851,20 +2258,18 @@ http_resolve_cb( http_addrlist_t *addrlist, /* List of addresses */ *addr; /* Current address */ - DEBUG_printf(("8http_resolve_cb: Looking up \"%s\".", hostTarget)); + DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget)); snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) { for (addr = addrlist; addr; addr = addr->next) { - int error = getnameinfo(&(addr->addr.addr), - httpAddrLength(&(addr->addr)), - fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); + int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); if (!error) { - DEBUG_printf(("8http_resolve_cb: Found \"%s\".", fqdn)); + DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn)); if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || _cups_strcasecmp(hostptr, ".local")) @@ -1875,11 +2280,13 @@ http_resolve_cb( } #ifdef DEBUG else - DEBUG_printf(("8http_resolve_cb: \"%s\" did not resolve: %d", + DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d", httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), error)); #endif /* DEBUG */ } + + httpAddrFreeList(addrlist); } } @@ -1887,14 +2294,248 @@ http_resolve_cb( * Assemble the final device URI... */ - httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, uribuf->bufsize, scheme, - NULL, hostTarget, ntohs(port), rp); + if ((!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !strcmp(uribuf->resource, "/cups")) + httpAssembleURIf(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, NULL, hostTarget, ntohs(port), "%s?snmp=false", resource); + else + httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, NULL, hostTarget, ntohs(port), resource); - DEBUG_printf(("8http_resolve_cb: Resolved URI is \"%s\"...", uribuf->buffer)); + DEBUG_printf(("5http_resolve_cb: Resolved URI is \"%s\"...", uribuf->buffer)); +} + +#elif defined(HAVE_AVAHI) +/* + * 'http_poll_cb()' - Wait for input on the specified file descriptors. + * + * Note: This function is needed because avahi_simple_poll_iterate is broken + * and always uses a timeout of 0 (!) milliseconds. + * (Avahi Ticket #364) + */ + +static int /* O - Number of file descriptors matching */ +http_poll_cb( + struct pollfd *pollfds, /* I - File descriptors */ + unsigned int num_pollfds, /* I - Number of file descriptors */ + int timeout, /* I - Timeout in milliseconds (used) */ + void *context) /* I - User data (unused) */ +{ + (void)timeout; + (void)context; + + return (poll(pollfds, num_pollfds, 2000)); } -#endif /* HAVE_DNSSD */ /* - * End of "$Id: http-support.c 7952 2008-09-17 00:56:20Z mike $". + * 'http_resolve_cb()' - Build a device URI for the given service name. */ + +static void +http_resolve_cb( + AvahiServiceResolver *resolver, /* I - Resolver (unused) */ + AvahiIfIndex interface, /* I - Interface index (unused) */ + AvahiProtocol protocol, /* I - Network protocol (unused) */ + AvahiResolverEvent event, /* I - Event (found, etc.) */ + const char *name, /* I - Service name */ + const char *type, /* I - Registration type */ + const char *domain, /* I - Domain (unused) */ + const char *hostTarget, /* I - Hostname */ + const AvahiAddress *address, /* I - Address (unused) */ + uint16_t port, /* I - Port number */ + AvahiStringList *txt, /* I - TXT record */ + AvahiLookupResultFlags flags, /* I - Lookup flags (unused) */ + void *context) /* I - Pointer to URI buffer */ +{ + _http_uribuf_t *uribuf = (_http_uribuf_t *)context; + /* URI buffer */ + const char *scheme, /* URI scheme */ + *hostptr, /* Pointer into hostTarget */ + *reskey, /* "rp" or "rfo" */ + *resdefault; /* Default path */ + char resource[257], /* Remote path */ + fqdn[256]; /* FQDN of the .local name */ + AvahiStringList *pair; /* Current TXT record key/value pair */ + char *value; /* Value for "rp" key */ + size_t valueLen = 0; /* Length of "rp" key */ + + + DEBUG_printf(("4http_resolve_cb(resolver=%p, " + "interface=%d, protocol=%d, event=%d, name=\"%s\", " + "type=\"%s\", domain=\"%s\", hostTarget=\"%s\", address=%p, " + "port=%d, txt=%p, flags=%d, context=%p)", + resolver, interface, protocol, event, name, type, domain, + hostTarget, address, port, txt, flags, context)); + + if (event != AVAHI_RESOLVER_FOUND) + { + avahi_service_resolver_free(resolver); + avahi_simple_poll_quit(uribuf->poll); + return; + } + + /* + * If we have a UUID, compare it... + */ + + if (uribuf->uuid && (pair = avahi_string_list_find(txt, "UUID")) != NULL) + { + char uuid[256]; /* UUID value */ + + avahi_string_list_get_pair(pair, NULL, &value, &valueLen); + + memcpy(uuid, value, valueLen); + uuid[valueLen] = '\0'; + + if (_cups_strcasecmp(uuid, uribuf->uuid)) + { + if (uribuf->options & _HTTP_RESOLVE_STDERR) + fprintf(stderr, "DEBUG: Found UUID %s, looking for %s.", uuid, + uribuf->uuid); + + DEBUG_printf(("5http_resolve_cb: Found UUID %s, looking for %s.", uuid, + uribuf->uuid)); + return; + } + } + + /* + * Figure out the scheme from the full name... + */ + + if (strstr(type, "_ipp.")) + scheme = "ipp"; + else if (strstr(type, "_printer.")) + scheme = "lpd"; + else if (strstr(type, "_pdl-datastream.")) + scheme = "socket"; + else + scheme = "riousbprint"; + + if (!strncmp(type, "_ipps.", 6) || !strncmp(type, "_ipp-tls.", 9)) + scheme = "ipps"; + else if (!strncmp(type, "_ipp.", 5) || !strncmp(type, "_fax-ipp.", 9)) + scheme = "ipp"; + else if (!strncmp(type, "_http.", 6)) + scheme = "http"; + else if (!strncmp(type, "_https.", 7)) + scheme = "https"; + else if (!strncmp(type, "_printer.", 9)) + scheme = "lpd"; + else if (!strncmp(type, "_pdl-datastream.", 16)) + scheme = "socket"; + else + { + avahi_service_resolver_free(resolver); + avahi_simple_poll_quit(uribuf->poll); + return; + } + + /* + * Extract the remote resource key from the TXT record... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FAXOUT) && + (!strcmp(scheme, "ipp") || !strcmp(scheme, "ipps")) && + !avahi_string_list_find(txt, "printer-type")) + { + reskey = "rfo"; + resdefault = "/ipp/faxout"; + } + else + { + reskey = "rp"; + resdefault = "/"; + } + + if ((pair = avahi_string_list_find(txt, reskey)) != NULL) + { + avahi_string_list_get_pair(pair, NULL, &value, &valueLen); + + if (value[0] == '/') + { + /* + * Value (incorrectly) has a leading slash already... + */ + + memcpy(resource, value, valueLen); + resource[valueLen] = '\0'; + } + else + { + /* + * Convert to resource by concatenating with a leading "/"... + */ + + resource[0] = '/'; + memcpy(resource + 1, value, valueLen); + resource[valueLen + 1] = '\0'; + } + } + else + { + /* + * Use the default value... + */ + + strlcpy(resource, resdefault, sizeof(resource)); + } + + /* + * Lookup the FQDN if needed... + */ + + if ((uribuf->options & _HTTP_RESOLVE_FQDN) && + (hostptr = hostTarget + strlen(hostTarget) - 6) > hostTarget && + !_cups_strcasecmp(hostptr, ".local")) + { + /* + * OK, we got a .local name but the caller needs a real domain. Start by + * getting the IP address of the .local name and then do reverse-lookups... + */ + + http_addrlist_t *addrlist, /* List of addresses */ + *addr; /* Current address */ + + DEBUG_printf(("5http_resolve_cb: Looking up \"%s\".", hostTarget)); + + snprintf(fqdn, sizeof(fqdn), "%d", ntohs(port)); + if ((addrlist = httpAddrGetList(hostTarget, AF_UNSPEC, fqdn)) != NULL) + { + for (addr = addrlist; addr; addr = addr->next) + { + int error = getnameinfo(&(addr->addr.addr), (socklen_t)httpAddrLength(&(addr->addr)), fqdn, sizeof(fqdn), NULL, 0, NI_NAMEREQD); + + if (!error) + { + DEBUG_printf(("5http_resolve_cb: Found \"%s\".", fqdn)); + + if ((hostptr = fqdn + strlen(fqdn) - 6) <= fqdn || + _cups_strcasecmp(hostptr, ".local")) + { + hostTarget = fqdn; + break; + } + } +#ifdef DEBUG + else + DEBUG_printf(("5http_resolve_cb: \"%s\" did not resolve: %d", + httpAddrString(&(addr->addr), fqdn, sizeof(fqdn)), + error)); +#endif /* DEBUG */ + } + + httpAddrFreeList(addrlist); + } + } + + /* + * Assemble the final device URI using the resolved hostname... + */ + + httpAssembleURI(HTTP_URI_CODING_ALL, uribuf->buffer, (int)uribuf->bufsize, scheme, + NULL, hostTarget, port, resource); + DEBUG_printf(("5http_resolve_cb: Resolved URI is \"%s\".", uribuf->buffer)); + + avahi_simple_poll_quit(uribuf->poll); +} +#endif /* HAVE_DNSSD */