Deleted Added
full compact
common.h (97856) common.h (97866)
1/*-
2 * Copyright (c) 1998 Dag-Erling Co�dan Sm�rgrav
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
1/*-
2 * Copyright (c) 1998 Dag-Erling Co�dan Sm�rgrav
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 11 unchanged lines hidden (view full) ---

20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 *
28 * $FreeBSD: head/lib/libfetch/common.h 97856 2002-06-05 10:05:03Z des $
28 * $FreeBSD: head/lib/libfetch/common.h 97866 2002-06-05 12:19:08Z des $
29 */
30
31#ifndef _COMMON_H_INCLUDED
32#define _COMMON_H_INCLUDED
33
34#define FTP_DEFAULT_PORT 21
35#define HTTP_DEFAULT_PORT 80
36#define FTP_DEFAULT_PROXY_PORT 21
37#define HTTP_DEFAULT_PROXY_PORT 3128
38
39#include <openssl/crypto.h>
40#include <openssl/x509.h>
41#include <openssl/pem.h>
42#include <openssl/ssl.h>
43#include <openssl/err.h>
44
45/* Connection */
46typedef struct fetchconn conn_t;
47struct fetchconn {
29 */
30
31#ifndef _COMMON_H_INCLUDED
32#define _COMMON_H_INCLUDED
33
34#define FTP_DEFAULT_PORT 21
35#define HTTP_DEFAULT_PORT 80
36#define FTP_DEFAULT_PROXY_PORT 21
37#define HTTP_DEFAULT_PROXY_PORT 3128
38
39#include <openssl/crypto.h>
40#include <openssl/x509.h>
41#include <openssl/pem.h>
42#include <openssl/ssl.h>
43#include <openssl/err.h>
44
45/* Connection */
46typedef struct fetchconn conn_t;
47struct fetchconn {
48 char *host; /* host name */
49 int port; /* port */
50 int af; /* address family */
51 int sd; /* socket descriptor */
52 char *buf; /* buffer */
53 size_t bufsize; /* buffer size */
54 size_t buflen; /* length of buffer contents */
55 int err; /* last protocol reply code */
48 int sd; /* socket descriptor */
49 char *buf; /* buffer */
50 size_t bufsize; /* buffer size */
51 size_t buflen; /* length of buffer contents */
52 int err; /* last protocol reply code */
56 SSL *ssl_ctx; /* SSL context if needed */
53 SSL *ssl; /* SSL handle */
54 SSL_CTX *ssl_ctx; /* SSL context */
57 X509 *ssl_cert; /* server certificate */
58 SSL_METHOD *ssl_meth; /* SSL method */
59};
60
61/* Structure used for error message lists */
62struct fetcherr {
63 const int num;
64 const int cat;
65 const char *string;
66};
67
68void _fetch_seterr(struct fetcherr *, int);
69void _fetch_syserr(void);
70void _fetch_info(const char *, ...);
71int _fetch_default_port(const char *);
72int _fetch_default_proxy_port(const char *);
73conn_t *_fetch_connect(const char *, int, int, int);
55 X509 *ssl_cert; /* server certificate */
56 SSL_METHOD *ssl_meth; /* SSL method */
57};
58
59/* Structure used for error message lists */
60struct fetcherr {
61 const int num;
62 const int cat;
63 const char *string;
64};
65
66void _fetch_seterr(struct fetcherr *, int);
67void _fetch_syserr(void);
68void _fetch_info(const char *, ...);
69int _fetch_default_port(const char *);
70int _fetch_default_proxy_port(const char *);
71conn_t *_fetch_connect(const char *, int, int, int);
72conn_t *_fetch_reopen(int sd);
73ssize_t _fetch_read(conn_t *, char *, size_t);
74int _fetch_getln(conn_t *);
74int _fetch_getln(conn_t *);
75ssize_t _fetch_write(conn_t *, const char *, size_t);
75int _fetch_putln(conn_t *, const char *, size_t);
76int _fetch_close(conn_t *);
77int _fetch_add_entry(struct url_ent **, int *, int *,
78 const char *, struct url_stat *);
79
80#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n)
81#define _http_seterr(n) _fetch_seterr(_http_errlist, n)
82#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n)

--- 28 unchanged lines hidden ---
76int _fetch_putln(conn_t *, const char *, size_t);
77int _fetch_close(conn_t *);
78int _fetch_add_entry(struct url_ent **, int *, int *,
79 const char *, struct url_stat *);
80
81#define _ftp_seterr(n) _fetch_seterr(_ftp_errlist, n)
82#define _http_seterr(n) _fetch_seterr(_http_errlist, n)
83#define _netdb_seterr(n) _fetch_seterr(_netdb_errlist, n)

--- 28 unchanged lines hidden ---