215a27f1a4
simply not trying to return exactly what the caller asked for - just return whatever we got and let the caller be the judge of whether it was enough. If an error occurs or the connection times out after we already received some data, return a short read, under the assumption that the next call will fail or time out before we read anything. As it turns out, none of the code that calls fetch_read() assumes an all-or-nothing result anyway, except for a couple of lines where we read the CR LF at the end of a hunk in HTTP hunked encoding, so the changes outside of fetch_read() and http_readfn() are minimal. While there, replace select(2) with poll(2). MFC after: 3 days
129 lines
4.3 KiB
C
129 lines
4.3 KiB
C
/*-
|
|
* Copyright (c) 1998-2011 Dag-Erling Smørgrav
|
|
* All rights reserved.
|
|
*
|
|
* Redistribution and use in source and binary forms, with or without
|
|
* modification, are permitted provided that the following conditions
|
|
* are met:
|
|
* 1. Redistributions of source code must retain the above copyright
|
|
* notice, this list of conditions and the following disclaimer
|
|
* in this position and unchanged.
|
|
* 2. Redistributions in binary form must reproduce the above copyright
|
|
* notice, this list of conditions and the following disclaimer in the
|
|
* documentation and/or other materials provided with the distribution.
|
|
* 3. The name of the author may not be used to endorse or promote products
|
|
* derived from this software without specific prior written permission
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
|
|
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
|
|
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
|
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
|
|
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
*
|
|
* $FreeBSD$
|
|
*/
|
|
|
|
#ifndef _COMMON_H_INCLUDED
|
|
#define _COMMON_H_INCLUDED
|
|
|
|
#define FTP_DEFAULT_PORT 21
|
|
#define HTTP_DEFAULT_PORT 80
|
|
#define FTP_DEFAULT_PROXY_PORT 21
|
|
#define HTTP_DEFAULT_PROXY_PORT 3128
|
|
|
|
#ifdef WITH_SSL
|
|
#include <openssl/crypto.h>
|
|
#include <openssl/x509.h>
|
|
#include <openssl/pem.h>
|
|
#include <openssl/ssl.h>
|
|
#include <openssl/err.h>
|
|
#endif
|
|
|
|
/* Connection */
|
|
typedef struct fetchconn conn_t;
|
|
struct fetchconn {
|
|
int sd; /* socket descriptor */
|
|
char *buf; /* buffer */
|
|
size_t bufsize; /* buffer size */
|
|
size_t buflen; /* length of buffer contents */
|
|
int err; /* last protocol reply code */
|
|
#ifdef WITH_SSL
|
|
SSL *ssl; /* SSL handle */
|
|
SSL_CTX *ssl_ctx; /* SSL context */
|
|
X509 *ssl_cert; /* server certificate */
|
|
const SSL_METHOD *ssl_meth; /* SSL method */
|
|
#endif
|
|
int ref; /* reference count */
|
|
};
|
|
|
|
/* Structure used for error message lists */
|
|
struct fetcherr {
|
|
const int num;
|
|
const int cat;
|
|
const char *string;
|
|
};
|
|
|
|
/* for fetch_writev */
|
|
struct iovec;
|
|
|
|
void fetch_seterr(struct fetcherr *, int);
|
|
void fetch_syserr(void);
|
|
void fetch_info(const char *, ...);
|
|
int fetch_default_port(const char *);
|
|
int fetch_default_proxy_port(const char *);
|
|
int fetch_bind(int, int, const char *);
|
|
conn_t *fetch_connect(const char *, int, int, int);
|
|
conn_t *fetch_reopen(int);
|
|
conn_t *fetch_ref(conn_t *);
|
|
#ifdef WITH_SSL
|
|
int fetch_ssl_cb_verify_crt(int, X509_STORE_CTX*);
|
|
#endif
|
|
int fetch_ssl(conn_t *, const struct url *, int);
|
|
ssize_t fetch_read(conn_t *, char *, size_t);
|
|
int fetch_getln(conn_t *);
|
|
ssize_t fetch_write(conn_t *, const char *, size_t);
|
|
ssize_t fetch_writev(conn_t *, struct iovec *, int);
|
|
int fetch_putln(conn_t *, const char *, size_t);
|
|
int fetch_close(conn_t *);
|
|
int fetch_add_entry(struct url_ent **, int *, int *,
|
|
const char *, struct url_stat *);
|
|
int fetch_netrc_auth(struct url *url);
|
|
int fetch_no_proxy_match(const char *);
|
|
|
|
#define ftp_seterr(n) fetch_seterr(ftp_errlist, n)
|
|
#define http_seterr(n) fetch_seterr(http_errlist, n)
|
|
#define netdb_seterr(n) fetch_seterr(netdb_errlist, n)
|
|
#define url_seterr(n) fetch_seterr(url_errlist, n)
|
|
|
|
#ifndef NDEBUG
|
|
#define DEBUG(x) do { if (fetchDebug) { x; } } while (0)
|
|
#else
|
|
#define DEBUG(x) do { } while (0)
|
|
#endif
|
|
|
|
/*
|
|
* I don't really like exporting http_request() and ftp_request(),
|
|
* but the HTTP and FTP code occasionally needs to cross-call
|
|
* eachother, and this saves me from adding a lot of special-case code
|
|
* to handle those cases.
|
|
*
|
|
* Note that _*_request() free purl, which is way ugly but saves us a
|
|
* whole lot of trouble.
|
|
*/
|
|
FILE *http_request(struct url *, const char *,
|
|
struct url_stat *, struct url *, const char *);
|
|
FILE *ftp_request(struct url *, const char *,
|
|
struct url_stat *, struct url *, const char *);
|
|
|
|
/*
|
|
* Check whether a particular flag is set
|
|
*/
|
|
#define CHECK_FLAG(x) (flags && strchr(flags, (x)))
|
|
|
|
#endif
|