Deleted Added
full compact
common.h (253680) common.h (261230)
1/*-
2 * Copyright (c) 1998-2011 Dag-Erling 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-2011 Dag-Erling 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 253680 2013-07-26 15:53:43Z des $
28 * $FreeBSD: head/lib/libfetch/common.h 261230 2014-01-28 12:48:17Z 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

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

47/* Connection */
48typedef struct fetchconn conn_t;
49struct fetchconn {
50 int sd; /* socket descriptor */
51 char *buf; /* buffer */
52 size_t bufsize; /* buffer size */
53 size_t buflen; /* length of buffer contents */
54 int err; /* last protocol reply code */
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

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

47/* Connection */
48typedef struct fetchconn conn_t;
49struct fetchconn {
50 int sd; /* socket descriptor */
51 char *buf; /* buffer */
52 size_t bufsize; /* buffer size */
53 size_t buflen; /* length of buffer contents */
54 int err; /* last protocol reply code */
55 struct { /* data cached after an interrupted
56 read */
57 char *buf;
58 size_t size;
59 size_t pos;
60 size_t len;
61 } cache;
62#ifdef WITH_SSL
63 SSL *ssl; /* SSL handle */
64 SSL_CTX *ssl_ctx; /* SSL context */
65 X509 *ssl_cert; /* server certificate */
66 const SSL_METHOD *ssl_meth; /* SSL method */
67#endif
68 int ref; /* reference count */
69};

--- 66 unchanged lines hidden ---
55#ifdef WITH_SSL
56 SSL *ssl; /* SSL handle */
57 SSL_CTX *ssl_ctx; /* SSL context */
58 X509 *ssl_cert; /* server certificate */
59 const SSL_METHOD *ssl_meth; /* SSL method */
60#endif
61 int ref; /* reference count */
62};

--- 66 unchanged lines hidden ---