mirror of
https://github.com/zerotier/ZeroTierOne.git
synced 2024-12-22 06:17:48 +00:00
Merge branch 'dev' into zeroidc
This commit is contained in:
commit
9ef75c0e13
@ -1,6 +1,22 @@
|
|||||||
ZeroTier Release Notes
|
ZeroTier Release Notes
|
||||||
======
|
======
|
||||||
|
|
||||||
|
# 2021-11-23 -- Version 1.8.4
|
||||||
|
|
||||||
|
* Happy 🦃 week to our USA users!
|
||||||
|
* This release is now less of a 🦃 on 32-bit Windows and actually installs.
|
||||||
|
* Fixed an ugly font problem on some older macOS versions.
|
||||||
|
* Fixed a bug that could cause the desktop tray app control panel to stop opening after a while on Windows.
|
||||||
|
* Fixed a possible double "release" in macOS tray app code that crashed on older macOS versions.
|
||||||
|
|
||||||
|
# 2021-11-15 -- Version 1.8.3
|
||||||
|
|
||||||
|
* Remove problematic spinlock, which was only used on x86_64 anyway. Just use pthread always.
|
||||||
|
* Fix fd leak on MacOS that caused non-responsiveness after some time.
|
||||||
|
* Fix Debian install scripts to set /usr/sbin/nologin as shell on service user.
|
||||||
|
* Fix regression that could prevent managed routes from being deleted.
|
||||||
|
* DesktopUI: Remove NSDate:now() call, now works on MacOS 10.13 or newer!
|
||||||
|
|
||||||
# 2021-11-08 -- Version 1.8.2
|
# 2021-11-08 -- Version 1.8.2
|
||||||
|
|
||||||
* Fix multicast on linux.
|
* Fix multicast on linux.
|
||||||
|
12
debian/changelog
vendored
12
debian/changelog
vendored
@ -1,3 +1,15 @@
|
|||||||
|
zerotier-one (1.8.4) unstable; urgency=medium
|
||||||
|
|
||||||
|
* See RELEASE-NOTES.md for release notes.
|
||||||
|
|
||||||
|
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Mon, 23 Nov 2021 01:00:00 -0700
|
||||||
|
|
||||||
|
zerotier-one (1.8.3) unstable; urgency=medium
|
||||||
|
|
||||||
|
* See RELEASE-NOTES.md for release notes.
|
||||||
|
|
||||||
|
-- Adam Ierymenko <adam.ierymenko@zerotier.com> Mon, 15 Nov 2021 01:00:00 -0700
|
||||||
|
|
||||||
zerotier-one (1.8.2) unstable; urgency=medium
|
zerotier-one (1.8.2) unstable; urgency=medium
|
||||||
|
|
||||||
* See RELEASE-NOTES.md for release notes.
|
* See RELEASE-NOTES.md for release notes.
|
||||||
|
2
debian/postinst
vendored
2
debian/postinst
vendored
@ -3,7 +3,7 @@
|
|||||||
case "$1" in
|
case "$1" in
|
||||||
configure)
|
configure)
|
||||||
if ! id zerotier-one >>/dev/null 2>&1; then
|
if ! id zerotier-one >>/dev/null 2>&1; then
|
||||||
useradd --system --user-group --home-dir /var/lib/zerotier-one --no-create-home zerotier-one
|
useradd --system --user-group --home-dir /var/lib/zerotier-one --shell /usr/sbin/nologin --no-create-home zerotier-one
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -1,77 +0,0 @@
|
|||||||
#ifndef __CURL_CURLVER_H
|
|
||||||
#define __CURL_CURLVER_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/* This header file contains nothing but libcurl version info, generated by
|
|
||||||
a script at release-time. This was made its own header file in 7.11.2 */
|
|
||||||
|
|
||||||
/* This is the global package copyright */
|
|
||||||
#define LIBCURL_COPYRIGHT "1996 - 2017 Daniel Stenberg, <daniel@haxx.se>."
|
|
||||||
|
|
||||||
/* This is the version number of the libcurl package from which this header
|
|
||||||
file origins: */
|
|
||||||
#define LIBCURL_VERSION "7.58.0"
|
|
||||||
|
|
||||||
/* The numeric version number is also available "in parts" by using these
|
|
||||||
defines: */
|
|
||||||
#define LIBCURL_VERSION_MAJOR 7
|
|
||||||
#define LIBCURL_VERSION_MINOR 58
|
|
||||||
#define LIBCURL_VERSION_PATCH 0
|
|
||||||
|
|
||||||
/* This is the numeric version of the libcurl version number, meant for easier
|
|
||||||
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
|
|
||||||
always follow this syntax:
|
|
||||||
|
|
||||||
0xXXYYZZ
|
|
||||||
|
|
||||||
Where XX, YY and ZZ are the main version, release and patch numbers in
|
|
||||||
hexadecimal (using 8 bits each). All three numbers are always represented
|
|
||||||
using two digits. 1.2 would appear as "0x010200" while version 9.11.7
|
|
||||||
appears as "0x090b07".
|
|
||||||
|
|
||||||
This 6-digit (24 bits) hexadecimal number does not show pre-release number,
|
|
||||||
and it is always a greater number in a more recent release. It makes
|
|
||||||
comparisons with greater than and less than work.
|
|
||||||
|
|
||||||
Note: This define is the full hex number and _does not_ use the
|
|
||||||
CURL_VERSION_BITS() macro since curl's own configure script greps for it
|
|
||||||
and needs it to contain the full number.
|
|
||||||
*/
|
|
||||||
#define LIBCURL_VERSION_NUM 0x073a00
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the date and time when the full source package was created. The
|
|
||||||
* timestamp is not stored in git, as the timestamp is properly set in the
|
|
||||||
* tarballs by the maketgz script.
|
|
||||||
*
|
|
||||||
* The format of the date follows this template:
|
|
||||||
*
|
|
||||||
* "2007-11-23"
|
|
||||||
*/
|
|
||||||
#define LIBCURL_TIMESTAMP "2018-01-24"
|
|
||||||
|
|
||||||
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
|
|
||||||
#define CURL_AT_LEAST_VERSION(x,y,z) \
|
|
||||||
(LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
|
|
||||||
|
|
||||||
#endif /* __CURL_CURLVER_H */
|
|
@ -1,102 +0,0 @@
|
|||||||
#ifndef __CURL_EASY_H
|
|
||||||
#define __CURL_EASY_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CURL_EXTERN CURL *curl_easy_init(void);
|
|
||||||
CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
|
|
||||||
CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
|
|
||||||
CURL_EXTERN void curl_easy_cleanup(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_getinfo()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Request internal information from the curl session with this function. The
|
|
||||||
* third argument MUST be a pointer to a long, a pointer to a char * or a
|
|
||||||
* pointer to a double (as the documentation describes elsewhere). The data
|
|
||||||
* pointed to will be filled in accordingly and can be relied upon only if the
|
|
||||||
* function returns CURLE_OK. This function is intended to get used *AFTER* a
|
|
||||||
* performed transfer, all results from this function are undefined until the
|
|
||||||
* transfer is completed.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_duphandle()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Creates a new curl session handle with the same options set for the handle
|
|
||||||
* passed in. Duplicating a handle could only be a matter of cloning data and
|
|
||||||
* options, internal state info and things like persistent connections cannot
|
|
||||||
* be transferred. It is useful in multithreaded applications when you can run
|
|
||||||
* curl_easy_duphandle() for each new thread to avoid a series of identical
|
|
||||||
* curl_easy_setopt() invokes in every thread.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_reset()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Re-initializes a CURL handle to the default values. This puts back the
|
|
||||||
* handle to the same state as it was in when it was just created.
|
|
||||||
*
|
|
||||||
* It does keep: live connections, the Session ID cache, the DNS cache and the
|
|
||||||
* cookies.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN void curl_easy_reset(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_recv()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Receives data from the connected socket. Use after successful
|
|
||||||
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
|
|
||||||
size_t *n);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_send()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Sends data over the connected socket. Use after successful
|
|
||||||
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
|
|
||||||
size_t buflen, size_t *n);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,50 +0,0 @@
|
|||||||
#ifndef __CURL_MPRINTF_H
|
|
||||||
#define __CURL_MPRINTF_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h> /* needed for FILE */
|
|
||||||
#include "curl.h" /* for CURL_EXTERN */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CURL_EXTERN int curl_mprintf(const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
|
|
||||||
const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
|
|
||||||
const char *format, va_list args);
|
|
||||||
CURL_EXTERN char *curl_maprintf(const char *format, ...);
|
|
||||||
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CURL_MPRINTF_H */
|
|
@ -1,439 +0,0 @@
|
|||||||
#ifndef __CURL_MULTI_H
|
|
||||||
#define __CURL_MULTI_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
/*
|
|
||||||
This is an "external" header file. Don't give away any internals here!
|
|
||||||
|
|
||||||
GOALS
|
|
||||||
|
|
||||||
o Enable a "pull" interface. The application that uses libcurl decides where
|
|
||||||
and when to ask libcurl to get/send data.
|
|
||||||
|
|
||||||
o Enable multiple simultaneous transfers in the same thread without making it
|
|
||||||
complicated for the application.
|
|
||||||
|
|
||||||
o Enable the application to select() on its own file descriptors and curl's
|
|
||||||
file descriptors simultaneous easily.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This header file should not really need to include "curl.h" since curl.h
|
|
||||||
* itself includes this file and we expect user applications to do #include
|
|
||||||
* <curl/curl.h> without the need for especially including multi.h.
|
|
||||||
*
|
|
||||||
* For some reason we added this include here at one point, and rather than to
|
|
||||||
* break existing (wrongly written) libcurl applications, we leave it as-is
|
|
||||||
* but with this warning attached.
|
|
||||||
*/
|
|
||||||
#include "curl.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER)
|
|
||||||
typedef struct Curl_multi CURLM;
|
|
||||||
#else
|
|
||||||
typedef void CURLM;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
|
|
||||||
curl_multi_socket*() soon */
|
|
||||||
CURLM_OK,
|
|
||||||
CURLM_BAD_HANDLE, /* the passed-in handle is not a valid CURLM handle */
|
|
||||||
CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
|
|
||||||
CURLM_OUT_OF_MEMORY, /* if you ever get this, you're in deep sh*t */
|
|
||||||
CURLM_INTERNAL_ERROR, /* this is a libcurl bug */
|
|
||||||
CURLM_BAD_SOCKET, /* the passed in socket argument did not match */
|
|
||||||
CURLM_UNKNOWN_OPTION, /* curl_multi_setopt() with unsupported option */
|
|
||||||
CURLM_ADDED_ALREADY, /* an easy handle already added to a multi handle was
|
|
||||||
attempted to get added - again */
|
|
||||||
CURLM_LAST
|
|
||||||
} CURLMcode;
|
|
||||||
|
|
||||||
/* just to make code nicer when using curl_multi_socket() you can now check
|
|
||||||
for CURLM_CALL_MULTI_SOCKET too in the same style it works for
|
|
||||||
curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
|
|
||||||
#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
|
|
||||||
|
|
||||||
/* bitmask bits for CURLMOPT_PIPELINING */
|
|
||||||
#define CURLPIPE_NOTHING 0L
|
|
||||||
#define CURLPIPE_HTTP1 1L
|
|
||||||
#define CURLPIPE_MULTIPLEX 2L
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
CURLMSG_NONE, /* first, not used */
|
|
||||||
CURLMSG_DONE, /* This easy handle has completed. 'result' contains
|
|
||||||
the CURLcode of the transfer */
|
|
||||||
CURLMSG_LAST /* last, not used */
|
|
||||||
} CURLMSG;
|
|
||||||
|
|
||||||
struct CURLMsg {
|
|
||||||
CURLMSG msg; /* what this message means */
|
|
||||||
CURL *easy_handle; /* the handle it concerns */
|
|
||||||
union {
|
|
||||||
void *whatever; /* message-specific data */
|
|
||||||
CURLcode result; /* return code for transfer */
|
|
||||||
} data;
|
|
||||||
};
|
|
||||||
typedef struct CURLMsg CURLMsg;
|
|
||||||
|
|
||||||
/* Based on poll(2) structure and values.
|
|
||||||
* We don't use pollfd and POLL* constants explicitly
|
|
||||||
* to cover platforms without poll(). */
|
|
||||||
#define CURL_WAIT_POLLIN 0x0001
|
|
||||||
#define CURL_WAIT_POLLPRI 0x0002
|
|
||||||
#define CURL_WAIT_POLLOUT 0x0004
|
|
||||||
|
|
||||||
struct curl_waitfd {
|
|
||||||
curl_socket_t fd;
|
|
||||||
short events;
|
|
||||||
short revents; /* not supported yet */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_init()
|
|
||||||
*
|
|
||||||
* Desc: inititalize multi-style curl usage
|
|
||||||
*
|
|
||||||
* Returns: a new CURLM handle to use in all 'curl_multi' functions.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLM *curl_multi_init(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_add_handle()
|
|
||||||
*
|
|
||||||
* Desc: add a standard curl handle to the multi stack
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
|
|
||||||
CURL *curl_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_remove_handle()
|
|
||||||
*
|
|
||||||
* Desc: removes a curl handle from the multi stack again
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
|
|
||||||
CURL *curl_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_fdset()
|
|
||||||
*
|
|
||||||
* Desc: Ask curl for its fd_set sets. The app can use these to select() or
|
|
||||||
* poll() on. We want curl_multi_perform() called as soon as one of
|
|
||||||
* them are ready.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
|
|
||||||
fd_set *read_fd_set,
|
|
||||||
fd_set *write_fd_set,
|
|
||||||
fd_set *exc_fd_set,
|
|
||||||
int *max_fd);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_wait()
|
|
||||||
*
|
|
||||||
* Desc: Poll on all fds within a CURLM set as well as any
|
|
||||||
* additional fds passed to the function.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle,
|
|
||||||
struct curl_waitfd extra_fds[],
|
|
||||||
unsigned int extra_nfds,
|
|
||||||
int timeout_ms,
|
|
||||||
int *ret);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_perform()
|
|
||||||
*
|
|
||||||
* Desc: When the app thinks there's data available for curl it calls this
|
|
||||||
* function to read/write whatever there is right now. This returns
|
|
||||||
* as soon as the reads and writes are done. This function does not
|
|
||||||
* require that there actually is data available for reading or that
|
|
||||||
* data can be written, it can be called just in case. It returns
|
|
||||||
* the number of handles that still transfer data in the second
|
|
||||||
* argument's integer-pointer.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code. *NOTE* that this only
|
|
||||||
* returns errors etc regarding the whole multi stack. There might
|
|
||||||
* still have occurred problems on invidual transfers even when this
|
|
||||||
* returns OK.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_cleanup()
|
|
||||||
*
|
|
||||||
* Desc: Cleans up and removes a whole multi stack. It does not free or
|
|
||||||
* touch any individual easy handles in any way. We need to define
|
|
||||||
* in what state those handles will be if this function is called
|
|
||||||
* in the middle of a transfer.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_info_read()
|
|
||||||
*
|
|
||||||
* Desc: Ask the multi handle if there's any messages/informationals from
|
|
||||||
* the individual transfers. Messages include informationals such as
|
|
||||||
* error code from the transfer or just the fact that a transfer is
|
|
||||||
* completed. More details on these should be written down as well.
|
|
||||||
*
|
|
||||||
* Repeated calls to this function will return a new struct each
|
|
||||||
* time, until a special "end of msgs" struct is returned as a signal
|
|
||||||
* that there is no more to get at this point.
|
|
||||||
*
|
|
||||||
* The data the returned pointer points to will not survive calling
|
|
||||||
* curl_multi_cleanup().
|
|
||||||
*
|
|
||||||
* The 'CURLMsg' struct is meant to be very simple and only contain
|
|
||||||
* very basic information. If more involved information is wanted,
|
|
||||||
* we will provide the particular "transfer handle" in that struct
|
|
||||||
* and that should/could/would be used in subsequent
|
|
||||||
* curl_easy_getinfo() calls (or similar). The point being that we
|
|
||||||
* must never expose complex structs to applications, as then we'll
|
|
||||||
* undoubtably get backwards compatibility problems in the future.
|
|
||||||
*
|
|
||||||
* Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
|
|
||||||
* of structs. It also writes the number of messages left in the
|
|
||||||
* queue (after this read) in the integer the second argument points
|
|
||||||
* to.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
|
|
||||||
int *msgs_in_queue);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_strerror()
|
|
||||||
*
|
|
||||||
* Desc: The curl_multi_strerror function may be used to turn a CURLMcode
|
|
||||||
* value into the equivalent human readable error string. This is
|
|
||||||
* useful for printing meaningful error messages.
|
|
||||||
*
|
|
||||||
* Returns: A pointer to a zero-terminated error message.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_socket() and
|
|
||||||
* curl_multi_socket_all()
|
|
||||||
*
|
|
||||||
* Desc: An alternative version of curl_multi_perform() that allows the
|
|
||||||
* application to pass in one of the file descriptors that have been
|
|
||||||
* detected to have "action" on them and let libcurl perform.
|
|
||||||
* See man page for details.
|
|
||||||
*/
|
|
||||||
#define CURL_POLL_NONE 0
|
|
||||||
#define CURL_POLL_IN 1
|
|
||||||
#define CURL_POLL_OUT 2
|
|
||||||
#define CURL_POLL_INOUT 3
|
|
||||||
#define CURL_POLL_REMOVE 4
|
|
||||||
|
|
||||||
#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
|
|
||||||
|
|
||||||
#define CURL_CSELECT_IN 0x01
|
|
||||||
#define CURL_CSELECT_OUT 0x02
|
|
||||||
#define CURL_CSELECT_ERR 0x04
|
|
||||||
|
|
||||||
typedef int (*curl_socket_callback)(CURL *easy, /* easy handle */
|
|
||||||
curl_socket_t s, /* socket */
|
|
||||||
int what, /* see above */
|
|
||||||
void *userp, /* private callback
|
|
||||||
pointer */
|
|
||||||
void *socketp); /* private socket
|
|
||||||
pointer */
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_timer_callback
|
|
||||||
*
|
|
||||||
* Desc: Called by libcurl whenever the library detects a change in the
|
|
||||||
* maximum number of milliseconds the app is allowed to wait before
|
|
||||||
* curl_multi_socket() or curl_multi_perform() must be called
|
|
||||||
* (to allow libcurl's timed events to take place).
|
|
||||||
*
|
|
||||||
* Returns: The callback should return zero.
|
|
||||||
*/
|
|
||||||
typedef int (*curl_multi_timer_callback)(CURLM *multi, /* multi handle */
|
|
||||||
long timeout_ms, /* see above */
|
|
||||||
void *userp); /* private callback
|
|
||||||
pointer */
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
|
|
||||||
curl_socket_t s,
|
|
||||||
int ev_bitmask,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
|
|
||||||
/* This macro below was added in 7.16.3 to push users who recompile to use
|
|
||||||
the new curl_multi_socket_action() instead of the old curl_multi_socket()
|
|
||||||
*/
|
|
||||||
#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_timeout()
|
|
||||||
*
|
|
||||||
* Desc: Returns the maximum number of milliseconds the app is allowed to
|
|
||||||
* wait before curl_multi_socket() or curl_multi_perform() must be
|
|
||||||
* called (to allow libcurl's timed events to take place).
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
|
|
||||||
long *milliseconds);
|
|
||||||
|
|
||||||
#undef CINIT /* re-using the same name as in curl.h */
|
|
||||||
|
|
||||||
#ifdef CURL_ISOCPP
|
|
||||||
#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
|
|
||||||
#else
|
|
||||||
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
|
||||||
#define LONG CURLOPTTYPE_LONG
|
|
||||||
#define OBJECTPOINT CURLOPTTYPE_OBJECTPOINT
|
|
||||||
#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
|
|
||||||
#define OFF_T CURLOPTTYPE_OFF_T
|
|
||||||
#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
/* This is the socket callback function pointer */
|
|
||||||
CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
|
|
||||||
|
|
||||||
/* This is the argument passed to the socket callback */
|
|
||||||
CINIT(SOCKETDATA, OBJECTPOINT, 2),
|
|
||||||
|
|
||||||
/* set to 1 to enable pipelining for this multi handle */
|
|
||||||
CINIT(PIPELINING, LONG, 3),
|
|
||||||
|
|
||||||
/* This is the timer callback function pointer */
|
|
||||||
CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
|
|
||||||
|
|
||||||
/* This is the argument passed to the timer callback */
|
|
||||||
CINIT(TIMERDATA, OBJECTPOINT, 5),
|
|
||||||
|
|
||||||
/* maximum number of entries in the connection cache */
|
|
||||||
CINIT(MAXCONNECTS, LONG, 6),
|
|
||||||
|
|
||||||
/* maximum number of (pipelining) connections to one host */
|
|
||||||
CINIT(MAX_HOST_CONNECTIONS, LONG, 7),
|
|
||||||
|
|
||||||
/* maximum number of requests in a pipeline */
|
|
||||||
CINIT(MAX_PIPELINE_LENGTH, LONG, 8),
|
|
||||||
|
|
||||||
/* a connection with a content-length longer than this
|
|
||||||
will not be considered for pipelining */
|
|
||||||
CINIT(CONTENT_LENGTH_PENALTY_SIZE, OFF_T, 9),
|
|
||||||
|
|
||||||
/* a connection with a chunk length longer than this
|
|
||||||
will not be considered for pipelining */
|
|
||||||
CINIT(CHUNK_LENGTH_PENALTY_SIZE, OFF_T, 10),
|
|
||||||
|
|
||||||
/* a list of site names(+port) that are blacklisted from
|
|
||||||
pipelining */
|
|
||||||
CINIT(PIPELINING_SITE_BL, OBJECTPOINT, 11),
|
|
||||||
|
|
||||||
/* a list of server types that are blacklisted from
|
|
||||||
pipelining */
|
|
||||||
CINIT(PIPELINING_SERVER_BL, OBJECTPOINT, 12),
|
|
||||||
|
|
||||||
/* maximum number of open connections in total */
|
|
||||||
CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
|
|
||||||
|
|
||||||
/* This is the server push callback function pointer */
|
|
||||||
CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
|
|
||||||
|
|
||||||
/* This is the argument passed to the server push callback */
|
|
||||||
CINIT(PUSHDATA, OBJECTPOINT, 15),
|
|
||||||
|
|
||||||
CURLMOPT_LASTENTRY /* the last unused */
|
|
||||||
} CURLMoption;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_setopt()
|
|
||||||
*
|
|
||||||
* Desc: Sets options for the multi handle.
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
|
|
||||||
CURLMoption option, ...);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_assign()
|
|
||||||
*
|
|
||||||
* Desc: This function sets an association in the multi handle between the
|
|
||||||
* given socket and a private pointer of the application. This is
|
|
||||||
* (only) useful for curl_multi_socket uses.
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
|
|
||||||
curl_socket_t sockfd, void *sockp);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_push_callback
|
|
||||||
*
|
|
||||||
* Desc: This callback gets called when a new stream is being pushed by the
|
|
||||||
* server. It approves or denies the new stream.
|
|
||||||
*
|
|
||||||
* Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
|
|
||||||
*/
|
|
||||||
#define CURL_PUSH_OK 0
|
|
||||||
#define CURL_PUSH_DENY 1
|
|
||||||
|
|
||||||
struct curl_pushheaders; /* forward declaration only */
|
|
||||||
|
|
||||||
CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
|
|
||||||
size_t num);
|
|
||||||
CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
|
|
||||||
const char *name);
|
|
||||||
|
|
||||||
typedef int (*curl_push_callback)(CURL *parent,
|
|
||||||
CURL *easy,
|
|
||||||
size_t num_headers,
|
|
||||||
struct curl_pushheaders *headers,
|
|
||||||
void *userp);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* end of extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,33 +0,0 @@
|
|||||||
#ifndef __STDC_HEADERS_H
|
|
||||||
#define __STDC_HEADERS_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
size_t fread(void *, size_t, size_t, FILE *);
|
|
||||||
size_t fwrite(const void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
int strcasecmp(const char *, const char *);
|
|
||||||
int strncasecmp(const char *, const char *, size_t);
|
|
||||||
|
|
||||||
#endif /* __STDC_HEADERS_H */
|
|
@ -1,473 +0,0 @@
|
|||||||
#ifndef __CURL_SYSTEM_H
|
|
||||||
#define __CURL_SYSTEM_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Try to keep one section per platform, compiler and architecture, otherwise,
|
|
||||||
* if an existing section is reused for a different one and later on the
|
|
||||||
* original is adjusted, probably the piggybacking one can be adversely
|
|
||||||
* changed.
|
|
||||||
*
|
|
||||||
* In order to differentiate between platforms/compilers/architectures use
|
|
||||||
* only compiler built in predefined preprocessor symbols.
|
|
||||||
*
|
|
||||||
* curl_off_t
|
|
||||||
* ----------
|
|
||||||
*
|
|
||||||
* For any given platform/compiler curl_off_t must be typedef'ed to a 64-bit
|
|
||||||
* wide signed integral data type. The width of this data type must remain
|
|
||||||
* constant and independent of any possible large file support settings.
|
|
||||||
*
|
|
||||||
* As an exception to the above, curl_off_t shall be typedef'ed to a 32-bit
|
|
||||||
* wide signed integral data type if there is no 64-bit type.
|
|
||||||
*
|
|
||||||
* As a general rule, curl_off_t shall not be mapped to off_t. This rule shall
|
|
||||||
* only be violated if off_t is the only 64-bit data type available and the
|
|
||||||
* size of off_t is independent of large file support settings. Keep your
|
|
||||||
* build on the safe side avoiding an off_t gating. If you have a 64-bit
|
|
||||||
* off_t then take for sure that another 64-bit data type exists, dig deeper
|
|
||||||
* and you will find it.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__DJGPP__) || defined(__GO32__)
|
|
||||||
# if defined(__DJGPP__) && (__DJGPP__ > 1)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__SALFORDC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__BORLANDC__)
|
|
||||||
# if (__BORLANDC__ < 0x520)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__TURBOC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__WATCOMC__)
|
|
||||||
# if defined(__386__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__POCC__)
|
|
||||||
# if (__POCC__ < 280)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# elif defined(_MSC_VER)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__LCC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__SYMBIAN32__)
|
|
||||||
# if defined(__EABI__) /* Treat all ARM compilers equally */
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__CW32__)
|
|
||||||
# pragma longlong on
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__VC32__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
|
|
||||||
|
|
||||||
#elif defined(__MWERKS__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(_WIN32_WCE)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__MINGW32__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_WS2TCPIP_H 1
|
|
||||||
|
|
||||||
#elif defined(__VMS)
|
|
||||||
# if defined(__VAX)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
|
|
||||||
|
|
||||||
#elif defined(__OS400__)
|
|
||||||
# if defined(__ILEC400__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(__MVS__)
|
|
||||||
# if defined(__IBMC__) || defined(__IBMCPP__)
|
|
||||||
# if defined(_ILP32)
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# endif
|
|
||||||
# if defined(_LONG_LONG)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(__370__)
|
|
||||||
# if defined(__IBMC__) || defined(__IBMCPP__)
|
|
||||||
# if defined(_ILP32)
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# endif
|
|
||||||
# if defined(_LONG_LONG)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(TPF)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__TINYC__) /* also known as tcc */
|
|
||||||
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
#elif defined(__SUNPRO_C) /* Oracle Solaris Studio */
|
|
||||||
# if !defined(__LP64) && (defined(__ILP32) || \
|
|
||||||
defined(__i386) || defined(__sparcv8))
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__LP64) || \
|
|
||||||
defined(__amd64) || defined(__sparcv9)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
/* ===================================== */
|
|
||||||
/* KEEP MSVC THE PENULTIMATE ENTRY */
|
|
||||||
/* ===================================== */
|
|
||||||
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
/* ===================================== */
|
|
||||||
/* KEEP GENERIC GCC THE LAST ENTRY */
|
|
||||||
/* ===================================== */
|
|
||||||
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
# if !defined(__LP64__) && \
|
|
||||||
(defined(__ILP32__) || defined(__i386__) || defined(__hppa__) || \
|
|
||||||
defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || \
|
|
||||||
defined(__sparc__) || defined(__mips__) || defined(__sh__) || \
|
|
||||||
defined(__XTENSA__) || \
|
|
||||||
(defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4) || \
|
|
||||||
(defined(__LONG_MAX__) && __LONG_MAX__ == 2147483647L))
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__LP64__) || \
|
|
||||||
defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \
|
|
||||||
(defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 8) || \
|
|
||||||
(defined(__LONG_MAX__) && __LONG_MAX__ == 9223372036854775807L)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
#else
|
|
||||||
/* generic "safe guess" on old 32 bit style */
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _AIX
|
|
||||||
/* AIX needs <sys/poll.h> */
|
|
||||||
#define CURL_PULL_SYS_POLL_H
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* CURL_PULL_WS2TCPIP_H is defined above when inclusion of header file */
|
|
||||||
/* ws2tcpip.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_WS2TCPIP_H
|
|
||||||
# include <winsock2.h>
|
|
||||||
# include <windows.h>
|
|
||||||
# include <ws2tcpip.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */
|
|
||||||
/* sys/types.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */
|
|
||||||
/* sys/socket.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_SOCKET_H
|
|
||||||
# include <sys/socket.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_POLL_H is defined above when inclusion of header file */
|
|
||||||
/* sys/poll.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_POLL_H
|
|
||||||
# include <sys/poll.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Data type definition of curl_socklen_t. */
|
|
||||||
#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
|
|
||||||
typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Data type definition of curl_off_t. */
|
|
||||||
|
|
||||||
#ifdef CURL_TYPEOF_CURL_OFF_T
|
|
||||||
typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
|
|
||||||
* these to be visible and exported by the external libcurl interface API,
|
|
||||||
* while also making them visible to the library internals, simply including
|
|
||||||
* curl_setup.h, without actually needing to include curl.h internally.
|
|
||||||
* If some day this section would grow big enough, all this should be moved
|
|
||||||
* to its own header file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Figure out if we can use the ## preprocessor operator, which is supported
|
|
||||||
* by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
|
|
||||||
* or __cplusplus so we need to carefully check for them too.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
|
|
||||||
defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
|
|
||||||
defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
|
|
||||||
defined(__ILEC400__)
|
|
||||||
/* This compiler is believed to have an ISO compatible preprocessor */
|
|
||||||
#define CURL_ISOCPP
|
|
||||||
#else
|
|
||||||
/* This compiler is believed NOT to have an ISO compatible preprocessor */
|
|
||||||
#undef CURL_ISOCPP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Macros for minimum-width signed and unsigned curl_off_t integer constants.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(x) x
|
|
||||||
# define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
|
|
||||||
# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
|
|
||||||
__CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
|
|
||||||
# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
|
|
||||||
__CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
|
|
||||||
#else
|
|
||||||
# ifdef CURL_ISOCPP
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
|
|
||||||
# else
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
|
|
||||||
# endif
|
|
||||||
# define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
|
|
||||||
# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
|
|
||||||
# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CURL_SYSTEM_H */
|
|
@ -1,683 +0,0 @@
|
|||||||
#ifndef __CURL_TYPECHECK_GCC_H
|
|
||||||
#define __CURL_TYPECHECK_GCC_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/* wraps curl_easy_setopt() with typechecking */
|
|
||||||
|
|
||||||
/* To add a new kind of warning, add an
|
|
||||||
* if(_curl_is_sometype_option(_curl_opt))
|
|
||||||
* if(!_curl_is_sometype(value))
|
|
||||||
* _curl_easy_setopt_err_sometype();
|
|
||||||
* block and define _curl_is_sometype_option, _curl_is_sometype and
|
|
||||||
* _curl_easy_setopt_err_sometype below
|
|
||||||
*
|
|
||||||
* NOTE: We use two nested 'if' statements here instead of the && operator, in
|
|
||||||
* order to work around gcc bug #32061. It affects only gcc 4.3.x/4.4.x
|
|
||||||
* when compiling with -Wlogical-op.
|
|
||||||
*
|
|
||||||
* To add an option that uses the same type as an existing option, you'll just
|
|
||||||
* need to extend the appropriate _curl_*_option macro
|
|
||||||
*/
|
|
||||||
#define curl_easy_setopt(handle, option, value) \
|
|
||||||
__extension__ ({ \
|
|
||||||
__typeof__(option) _curl_opt = option; \
|
|
||||||
if(__builtin_constant_p(_curl_opt)) { \
|
|
||||||
if(_curl_is_long_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_long(value)) \
|
|
||||||
_curl_easy_setopt_err_long(); \
|
|
||||||
if(_curl_is_off_t_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_off_t(value)) \
|
|
||||||
_curl_easy_setopt_err_curl_off_t(); \
|
|
||||||
if(_curl_is_string_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_string(value)) \
|
|
||||||
_curl_easy_setopt_err_string(); \
|
|
||||||
if(_curl_is_write_cb_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_write_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_write_callback(); \
|
|
||||||
if((_curl_opt) == CURLOPT_READFUNCTION) \
|
|
||||||
if(!_curl_is_read_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_read_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_IOCTLFUNCTION) \
|
|
||||||
if(!_curl_is_ioctl_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_ioctl_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SOCKOPTFUNCTION) \
|
|
||||||
if(!_curl_is_sockopt_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_sockopt_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION) \
|
|
||||||
if(!_curl_is_opensocket_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_opensocket_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_PROGRESSFUNCTION) \
|
|
||||||
if(!_curl_is_progress_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_progress_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_DEBUGFUNCTION) \
|
|
||||||
if(!_curl_is_debug_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_debug_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION) \
|
|
||||||
if(!_curl_is_ssl_ctx_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_ssl_ctx_cb(); \
|
|
||||||
if(_curl_is_conv_cb_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_conv_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_conv_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SEEKFUNCTION) \
|
|
||||||
if(!_curl_is_seek_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_seek_cb(); \
|
|
||||||
if(_curl_is_cb_data_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_cb_data(value)) \
|
|
||||||
_curl_easy_setopt_err_cb_data(); \
|
|
||||||
if((_curl_opt) == CURLOPT_ERRORBUFFER) \
|
|
||||||
if(!_curl_is_error_buffer(value)) \
|
|
||||||
_curl_easy_setopt_err_error_buffer(); \
|
|
||||||
if((_curl_opt) == CURLOPT_STDERR) \
|
|
||||||
if(!_curl_is_FILE(value)) \
|
|
||||||
_curl_easy_setopt_err_FILE(); \
|
|
||||||
if(_curl_is_postfields_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_postfields(value)) \
|
|
||||||
_curl_easy_setopt_err_postfields(); \
|
|
||||||
if((_curl_opt) == CURLOPT_HTTPPOST) \
|
|
||||||
if(!_curl_is_arr((value), struct curl_httppost)) \
|
|
||||||
_curl_easy_setopt_err_curl_httpost(); \
|
|
||||||
if((_curl_opt) == CURLOPT_MIMEPOST) \
|
|
||||||
if(!_curl_is_ptr((value), curl_mime)) \
|
|
||||||
_curl_easy_setopt_err_curl_mimepost(); \
|
|
||||||
if(_curl_is_slist_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_arr((value), struct curl_slist)) \
|
|
||||||
_curl_easy_setopt_err_curl_slist(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SHARE) \
|
|
||||||
if(!_curl_is_ptr((value), CURLSH)) \
|
|
||||||
_curl_easy_setopt_err_CURLSH(); \
|
|
||||||
} \
|
|
||||||
curl_easy_setopt(handle, _curl_opt, value); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/* wraps curl_easy_getinfo() with typechecking */
|
|
||||||
/* FIXME: don't allow const pointers */
|
|
||||||
#define curl_easy_getinfo(handle, info, arg) \
|
|
||||||
__extension__ ({ \
|
|
||||||
__typeof__(info) _curl_info = info; \
|
|
||||||
if(__builtin_constant_p(_curl_info)) { \
|
|
||||||
if(_curl_is_string_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), char *)) \
|
|
||||||
_curl_easy_getinfo_err_string(); \
|
|
||||||
if(_curl_is_long_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), long)) \
|
|
||||||
_curl_easy_getinfo_err_long(); \
|
|
||||||
if(_curl_is_double_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), double)) \
|
|
||||||
_curl_easy_getinfo_err_double(); \
|
|
||||||
if(_curl_is_slist_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_slist *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_slist(); \
|
|
||||||
if(_curl_is_tlssessioninfo_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_tlssessioninfo *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_tlssesssioninfo(); \
|
|
||||||
if(_curl_is_certinfo_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_certinfo *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_certinfo(); \
|
|
||||||
if(_curl_is_socket_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), curl_socket_t)) \
|
|
||||||
_curl_easy_getinfo_err_curl_socket(); \
|
|
||||||
if(_curl_is_off_t_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), curl_off_t)) \
|
|
||||||
_curl_easy_getinfo_err_curl_off_t(); \
|
|
||||||
} \
|
|
||||||
curl_easy_getinfo(handle, _curl_info, arg); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
|
|
||||||
* for now just make sure that the functions are called with three
|
|
||||||
* arguments
|
|
||||||
*/
|
|
||||||
#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
|
|
||||||
#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
|
|
||||||
|
|
||||||
|
|
||||||
/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
|
|
||||||
* functions */
|
|
||||||
|
|
||||||
/* To define a new warning, use _CURL_WARNING(identifier, "message") */
|
|
||||||
#define _CURL_WARNING(id, message) \
|
|
||||||
static void __attribute__((__warning__(message))) \
|
|
||||||
__attribute__((__unused__)) __attribute__((__noinline__)) \
|
|
||||||
id(void) { __asm__(""); }
|
|
||||||
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_long,
|
|
||||||
"curl_easy_setopt expects a long argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
|
|
||||||
"curl_easy_setopt expects a curl_off_t argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_string,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"string ('char *' or char[]) argument for this option"
|
|
||||||
)
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_write_callback,
|
|
||||||
"curl_easy_setopt expects a curl_write_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_read_cb,
|
|
||||||
"curl_easy_setopt expects a curl_read_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
|
|
||||||
"curl_easy_setopt expects a curl_ioctl_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
|
|
||||||
"curl_easy_setopt expects a curl_sockopt_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"curl_opensocket_callback argument for this option"
|
|
||||||
)
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
|
|
||||||
"curl_easy_setopt expects a curl_progress_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
|
|
||||||
"curl_easy_setopt expects a curl_debug_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
|
|
||||||
"curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
|
|
||||||
"curl_easy_setopt expects a curl_conv_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
|
|
||||||
"curl_easy_setopt expects a curl_seek_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_cb_data,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"private data pointer as argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"char buffer of CURL_ERROR_SIZE as argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_FILE,
|
|
||||||
"curl_easy_setopt expects a 'FILE *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_postfields,
|
|
||||||
"curl_easy_setopt expects a 'void *' or 'char *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
|
|
||||||
"curl_easy_setopt expects a 'struct curl_httppost *' "
|
|
||||||
"argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_mimepost,
|
|
||||||
"curl_easy_setopt expects a 'curl_mime *' "
|
|
||||||
"argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
|
|
||||||
"curl_easy_setopt expects a 'struct curl_slist *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
|
|
||||||
"curl_easy_setopt expects a CURLSH* argument for this option")
|
|
||||||
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_string,
|
|
||||||
"curl_easy_getinfo expects a pointer to 'char *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_long,
|
|
||||||
"curl_easy_getinfo expects a pointer to long for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_double,
|
|
||||||
"curl_easy_getinfo expects a pointer to double for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
|
|
||||||
"curl_easy_getinfo expects a pointer to 'struct curl_slist *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_tlssesssioninfo,
|
|
||||||
"curl_easy_getinfo expects a pointer to "
|
|
||||||
"'struct curl_tlssessioninfo *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_certinfo,
|
|
||||||
"curl_easy_getinfo expects a pointer to "
|
|
||||||
"'struct curl_certinfo *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_socket,
|
|
||||||
"curl_easy_getinfo expects a pointer to curl_socket_t for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
|
|
||||||
"curl_easy_getinfo expects a pointer to curl_off_t for this info")
|
|
||||||
|
|
||||||
/* groups of curl_easy_setops options that take the same type of argument */
|
|
||||||
|
|
||||||
/* To add a new option to one of the groups, just add
|
|
||||||
* (option) == CURLOPT_SOMETHING
|
|
||||||
* to the or-expression. If the option takes a long or curl_off_t, you don't
|
|
||||||
* have to do anything
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a long argument */
|
|
||||||
#define _curl_is_long_option(option) \
|
|
||||||
(0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
|
|
||||||
|
|
||||||
#define _curl_is_off_t_option(option) \
|
|
||||||
((option) > CURLOPTTYPE_OFF_T)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a char* argument */
|
|
||||||
#define _curl_is_string_option(option) \
|
|
||||||
((option) == CURLOPT_ABSTRACT_UNIX_SOCKET || \
|
|
||||||
(option) == CURLOPT_ACCEPT_ENCODING || \
|
|
||||||
(option) == CURLOPT_CAINFO || \
|
|
||||||
(option) == CURLOPT_CAPATH || \
|
|
||||||
(option) == CURLOPT_COOKIE || \
|
|
||||||
(option) == CURLOPT_COOKIEFILE || \
|
|
||||||
(option) == CURLOPT_COOKIEJAR || \
|
|
||||||
(option) == CURLOPT_COOKIELIST || \
|
|
||||||
(option) == CURLOPT_CRLFILE || \
|
|
||||||
(option) == CURLOPT_CUSTOMREQUEST || \
|
|
||||||
(option) == CURLOPT_DEFAULT_PROTOCOL || \
|
|
||||||
(option) == CURLOPT_DNS_INTERFACE || \
|
|
||||||
(option) == CURLOPT_DNS_LOCAL_IP4 || \
|
|
||||||
(option) == CURLOPT_DNS_LOCAL_IP6 || \
|
|
||||||
(option) == CURLOPT_DNS_SERVERS || \
|
|
||||||
(option) == CURLOPT_EGDSOCKET || \
|
|
||||||
(option) == CURLOPT_FTPPORT || \
|
|
||||||
(option) == CURLOPT_FTP_ACCOUNT || \
|
|
||||||
(option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \
|
|
||||||
(option) == CURLOPT_INTERFACE || \
|
|
||||||
(option) == CURLOPT_ISSUERCERT || \
|
|
||||||
(option) == CURLOPT_KEYPASSWD || \
|
|
||||||
(option) == CURLOPT_KRBLEVEL || \
|
|
||||||
(option) == CURLOPT_LOGIN_OPTIONS || \
|
|
||||||
(option) == CURLOPT_MAIL_AUTH || \
|
|
||||||
(option) == CURLOPT_MAIL_FROM || \
|
|
||||||
(option) == CURLOPT_NETRC_FILE || \
|
|
||||||
(option) == CURLOPT_NOPROXY || \
|
|
||||||
(option) == CURLOPT_PASSWORD || \
|
|
||||||
(option) == CURLOPT_PINNEDPUBLICKEY || \
|
|
||||||
(option) == CURLOPT_PRE_PROXY || \
|
|
||||||
(option) == CURLOPT_PROXY || \
|
|
||||||
(option) == CURLOPT_PROXYPASSWORD || \
|
|
||||||
(option) == CURLOPT_PROXYUSERNAME || \
|
|
||||||
(option) == CURLOPT_PROXYUSERPWD || \
|
|
||||||
(option) == CURLOPT_PROXY_CAINFO || \
|
|
||||||
(option) == CURLOPT_PROXY_CAPATH || \
|
|
||||||
(option) == CURLOPT_PROXY_CRLFILE || \
|
|
||||||
(option) == CURLOPT_PROXY_KEYPASSWD || \
|
|
||||||
(option) == CURLOPT_PROXY_PINNEDPUBLICKEY || \
|
|
||||||
(option) == CURLOPT_PROXY_SERVICE_NAME || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLCERT || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLCERTTYPE || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLKEY || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLKEYTYPE || \
|
|
||||||
(option) == CURLOPT_PROXY_SSL_CIPHER_LIST || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_PASSWORD || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_USERNAME || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_TYPE || \
|
|
||||||
(option) == CURLOPT_RANDOM_FILE || \
|
|
||||||
(option) == CURLOPT_RANGE || \
|
|
||||||
(option) == CURLOPT_REFERER || \
|
|
||||||
(option) == CURLOPT_RTSP_SESSION_ID || \
|
|
||||||
(option) == CURLOPT_RTSP_STREAM_URI || \
|
|
||||||
(option) == CURLOPT_RTSP_TRANSPORT || \
|
|
||||||
(option) == CURLOPT_SERVICE_NAME || \
|
|
||||||
(option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \
|
|
||||||
(option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \
|
|
||||||
(option) == CURLOPT_SSH_KNOWNHOSTS || \
|
|
||||||
(option) == CURLOPT_SSH_PRIVATE_KEYFILE || \
|
|
||||||
(option) == CURLOPT_SSH_PUBLIC_KEYFILE || \
|
|
||||||
(option) == CURLOPT_SSLCERT || \
|
|
||||||
(option) == CURLOPT_SSLCERTTYPE || \
|
|
||||||
(option) == CURLOPT_SSLENGINE || \
|
|
||||||
(option) == CURLOPT_SSLKEY || \
|
|
||||||
(option) == CURLOPT_SSLKEYTYPE || \
|
|
||||||
(option) == CURLOPT_SSL_CIPHER_LIST || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_PASSWORD || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_TYPE || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_USERNAME || \
|
|
||||||
(option) == CURLOPT_UNIX_SOCKET_PATH || \
|
|
||||||
(option) == CURLOPT_URL || \
|
|
||||||
(option) == CURLOPT_USERAGENT || \
|
|
||||||
(option) == CURLOPT_USERNAME || \
|
|
||||||
(option) == CURLOPT_USERPWD || \
|
|
||||||
(option) == CURLOPT_XOAUTH2_BEARER || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a curl_write_callback argument */
|
|
||||||
#define _curl_is_write_cb_option(option) \
|
|
||||||
((option) == CURLOPT_HEADERFUNCTION || \
|
|
||||||
(option) == CURLOPT_WRITEFUNCTION)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a curl_conv_callback argument */
|
|
||||||
#define _curl_is_conv_cb_option(option) \
|
|
||||||
((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION || \
|
|
||||||
(option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION || \
|
|
||||||
(option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a data argument to pass to a callback */
|
|
||||||
#define _curl_is_cb_data_option(option) \
|
|
||||||
((option) == CURLOPT_CHUNK_DATA || \
|
|
||||||
(option) == CURLOPT_CLOSESOCKETDATA || \
|
|
||||||
(option) == CURLOPT_DEBUGDATA || \
|
|
||||||
(option) == CURLOPT_FNMATCH_DATA || \
|
|
||||||
(option) == CURLOPT_HEADERDATA || \
|
|
||||||
(option) == CURLOPT_INTERLEAVEDATA || \
|
|
||||||
(option) == CURLOPT_IOCTLDATA || \
|
|
||||||
(option) == CURLOPT_OPENSOCKETDATA || \
|
|
||||||
(option) == CURLOPT_PRIVATE || \
|
|
||||||
(option) == CURLOPT_PROGRESSDATA || \
|
|
||||||
(option) == CURLOPT_READDATA || \
|
|
||||||
(option) == CURLOPT_SEEKDATA || \
|
|
||||||
(option) == CURLOPT_SOCKOPTDATA || \
|
|
||||||
(option) == CURLOPT_SSH_KEYDATA || \
|
|
||||||
(option) == CURLOPT_SSL_CTX_DATA || \
|
|
||||||
(option) == CURLOPT_WRITEDATA || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a POST data argument (void* or char*) */
|
|
||||||
#define _curl_is_postfields_option(option) \
|
|
||||||
((option) == CURLOPT_POSTFIELDS || \
|
|
||||||
(option) == CURLOPT_COPYPOSTFIELDS || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a struct curl_slist * argument */
|
|
||||||
#define _curl_is_slist_option(option) \
|
|
||||||
((option) == CURLOPT_HTTP200ALIASES || \
|
|
||||||
(option) == CURLOPT_HTTPHEADER || \
|
|
||||||
(option) == CURLOPT_MAIL_RCPT || \
|
|
||||||
(option) == CURLOPT_POSTQUOTE || \
|
|
||||||
(option) == CURLOPT_PREQUOTE || \
|
|
||||||
(option) == CURLOPT_PROXYHEADER || \
|
|
||||||
(option) == CURLOPT_QUOTE || \
|
|
||||||
(option) == CURLOPT_RESOLVE || \
|
|
||||||
(option) == CURLOPT_TELNETOPTIONS || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* groups of curl_easy_getinfo infos that take the same type of argument */
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to char * argument */
|
|
||||||
#define _curl_is_string_info(info) \
|
|
||||||
(CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to long argument */
|
|
||||||
#define _curl_is_long_info(info) \
|
|
||||||
(CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to double argument */
|
|
||||||
#define _curl_is_double_info(info) \
|
|
||||||
(CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_slist * argument */
|
|
||||||
#define _curl_is_slist_info(info) \
|
|
||||||
(((info) == CURLINFO_SSL_ENGINES) || ((info) == CURLINFO_COOKIELIST))
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_tlssessioninfo * argument */
|
|
||||||
#define _curl_is_tlssessioninfo_info(info) \
|
|
||||||
(((info) == CURLINFO_TLS_SSL_PTR) || ((info) == CURLINFO_TLS_SESSION))
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_certinfo * argument */
|
|
||||||
#define _curl_is_certinfo_info(info) ((info) == CURLINFO_CERTINFO)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_socket_t argument */
|
|
||||||
#define _curl_is_socket_info(info) \
|
|
||||||
(CURLINFO_SOCKET < (info) && (info) < CURLINFO_OFF_T)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to curl_off_t argument */
|
|
||||||
#define _curl_is_off_t_info(info) \
|
|
||||||
(CURLINFO_OFF_T < (info))
|
|
||||||
|
|
||||||
|
|
||||||
/* typecheck helpers -- check whether given expression has requested type*/
|
|
||||||
|
|
||||||
/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
|
|
||||||
* otherwise define a new macro. Search for __builtin_types_compatible_p
|
|
||||||
* in the GCC manual.
|
|
||||||
* NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
|
|
||||||
* the actual expression passed to the curl_easy_setopt macro. This
|
|
||||||
* means that you can only apply the sizeof and __typeof__ operators, no
|
|
||||||
* == or whatsoever.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* XXX: should evaluate to true iff expr is a pointer */
|
|
||||||
#define _curl_is_any_ptr(expr) \
|
|
||||||
(sizeof(expr) == sizeof(void *))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is NULL */
|
|
||||||
/* XXX: must not evaluate expr, so this check is not accurate */
|
|
||||||
#define _curl_is_NULL(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is type*, const type* or NULL */
|
|
||||||
#define _curl_is_ptr(expr, type) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), type *) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), const type *))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is one of type[], type*, NULL or const type* */
|
|
||||||
#define _curl_is_arr(expr, type) \
|
|
||||||
(_curl_is_ptr((expr), type) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), type []))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is a string */
|
|
||||||
#define _curl_is_string(expr) \
|
|
||||||
(_curl_is_arr((expr), char) || \
|
|
||||||
_curl_is_arr((expr), signed char) || \
|
|
||||||
_curl_is_arr((expr), unsigned char))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is a long (no matter the signedness)
|
|
||||||
* XXX: for now, int is also accepted (and therefore short and char, which
|
|
||||||
* are promoted to int when passed to a variadic function) */
|
|
||||||
#define _curl_is_long(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed char) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned char))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_off_t */
|
|
||||||
#define _curl_is_off_t(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
|
|
||||||
/* XXX: also check size of an char[] array? */
|
|
||||||
#define _curl_is_error_buffer(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char *) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char[]))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type (const) void* or (const) FILE* */
|
|
||||||
#if 0
|
|
||||||
#define _curl_is_cb_data(expr) \
|
|
||||||
(_curl_is_ptr((expr), void) || \
|
|
||||||
_curl_is_ptr((expr), FILE))
|
|
||||||
#else /* be less strict */
|
|
||||||
#define _curl_is_cb_data(expr) \
|
|
||||||
_curl_is_any_ptr(expr)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type FILE* */
|
|
||||||
#define _curl_is_FILE(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), FILE *)))
|
|
||||||
|
|
||||||
/* evaluates to true if expr can be passed as POST data (void* or char*) */
|
|
||||||
#define _curl_is_postfields(expr) \
|
|
||||||
(_curl_is_ptr((expr), void) || \
|
|
||||||
_curl_is_arr((expr), char))
|
|
||||||
|
|
||||||
/* FIXME: the whole callback checking is messy...
|
|
||||||
* The idea is to tolerate char vs. void and const vs. not const
|
|
||||||
* pointers in arguments at least
|
|
||||||
*/
|
|
||||||
/* helper: __builtin_types_compatible_p distinguishes between functions and
|
|
||||||
* function pointers, hide it */
|
|
||||||
#define _curl_callback_compatible(func, type) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(func), type) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(func) *, type))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_read_callback or "similar" */
|
|
||||||
#define _curl_is_read_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), __typeof__(fread) *) || \
|
|
||||||
_curl_callback_compatible((expr), curl_read_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback6))
|
|
||||||
typedef size_t (*_curl_read_callback1)(char *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_read_callback2)(char *, size_t, size_t, const void *);
|
|
||||||
typedef size_t (*_curl_read_callback3)(char *, size_t, size_t, FILE *);
|
|
||||||
typedef size_t (*_curl_read_callback4)(void *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_read_callback5)(void *, size_t, size_t, const void *);
|
|
||||||
typedef size_t (*_curl_read_callback6)(void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_write_callback or "similar" */
|
|
||||||
#define _curl_is_write_cb(expr) \
|
|
||||||
(_curl_is_read_cb(expr) || \
|
|
||||||
_curl_callback_compatible((expr), __typeof__(fwrite) *) || \
|
|
||||||
_curl_callback_compatible((expr), curl_write_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback6))
|
|
||||||
typedef size_t (*_curl_write_callback1)(const char *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_write_callback2)(const char *, size_t, size_t,
|
|
||||||
const void *);
|
|
||||||
typedef size_t (*_curl_write_callback3)(const char *, size_t, size_t, FILE *);
|
|
||||||
typedef size_t (*_curl_write_callback4)(const void *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_write_callback5)(const void *, size_t, size_t,
|
|
||||||
const void *);
|
|
||||||
typedef size_t (*_curl_write_callback6)(const void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
|
|
||||||
#define _curl_is_ioctl_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_ioctl_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback4))
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback1)(CURL *, int, void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback2)(CURL *, int, const void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback3)(CURL *, curliocmd, void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback4)(CURL *, curliocmd, const void *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
|
|
||||||
#define _curl_is_sockopt_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_sockopt_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_sockopt_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_sockopt_callback2))
|
|
||||||
typedef int (*_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
|
|
||||||
typedef int (*_curl_sockopt_callback2)(const void *, curl_socket_t,
|
|
||||||
curlsocktype);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_opensocket_callback or
|
|
||||||
"similar" */
|
|
||||||
#define _curl_is_opensocket_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_opensocket_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback4))
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback1)
|
|
||||||
(void *, curlsocktype, struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback2)
|
|
||||||
(void *, curlsocktype, const struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback3)
|
|
||||||
(const void *, curlsocktype, struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback4)
|
|
||||||
(const void *, curlsocktype, const struct curl_sockaddr *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_progress_callback or "similar" */
|
|
||||||
#define _curl_is_progress_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_progress_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_progress_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_progress_callback2))
|
|
||||||
typedef int (*_curl_progress_callback1)(void *,
|
|
||||||
double, double, double, double);
|
|
||||||
typedef int (*_curl_progress_callback2)(const void *,
|
|
||||||
double, double, double, double);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_debug_callback or "similar" */
|
|
||||||
#define _curl_is_debug_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_debug_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback6) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback7) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback8))
|
|
||||||
typedef int (*_curl_debug_callback1) (CURL *,
|
|
||||||
curl_infotype, char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback2) (CURL *,
|
|
||||||
curl_infotype, char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback3) (CURL *,
|
|
||||||
curl_infotype, const char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback4) (CURL *,
|
|
||||||
curl_infotype, const char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback5) (CURL *,
|
|
||||||
curl_infotype, unsigned char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback6) (CURL *,
|
|
||||||
curl_infotype, unsigned char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback7) (CURL *,
|
|
||||||
curl_infotype, const unsigned char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback8) (CURL *,
|
|
||||||
curl_infotype, const unsigned char *, size_t, const void *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
|
|
||||||
/* this is getting even messier... */
|
|
||||||
#define _curl_is_ssl_ctx_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_ssl_ctx_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback6) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback7) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback1)(CURL *, void *, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback4)(CURL *, const void *,
|
|
||||||
const void *);
|
|
||||||
#ifdef HEADER_SSL_H
|
|
||||||
/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
|
|
||||||
* this will of course break if we're included before OpenSSL headers...
|
|
||||||
*/
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
|
|
||||||
const void *);
|
|
||||||
#else
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_conv_callback or "similar" */
|
|
||||||
#define _curl_is_conv_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_conv_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback4))
|
|
||||||
typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_seek_callback or "similar" */
|
|
||||||
#define _curl_is_seek_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_seek_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_seek_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_seek_callback2))
|
|
||||||
typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
|
|
||||||
typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* __CURL_TYPECHECK_GCC_H */
|
|
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load Diff
@ -1,77 +0,0 @@
|
|||||||
#ifndef __CURL_CURLVER_H
|
|
||||||
#define __CURL_CURLVER_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/* This header file contains nothing but libcurl version info, generated by
|
|
||||||
a script at release-time. This was made its own header file in 7.11.2 */
|
|
||||||
|
|
||||||
/* This is the global package copyright */
|
|
||||||
#define LIBCURL_COPYRIGHT "1996 - 2017 Daniel Stenberg, <daniel@haxx.se>."
|
|
||||||
|
|
||||||
/* This is the version number of the libcurl package from which this header
|
|
||||||
file origins: */
|
|
||||||
#define LIBCURL_VERSION "7.58.0"
|
|
||||||
|
|
||||||
/* The numeric version number is also available "in parts" by using these
|
|
||||||
defines: */
|
|
||||||
#define LIBCURL_VERSION_MAJOR 7
|
|
||||||
#define LIBCURL_VERSION_MINOR 58
|
|
||||||
#define LIBCURL_VERSION_PATCH 0
|
|
||||||
|
|
||||||
/* This is the numeric version of the libcurl version number, meant for easier
|
|
||||||
parsing and comparions by programs. The LIBCURL_VERSION_NUM define will
|
|
||||||
always follow this syntax:
|
|
||||||
|
|
||||||
0xXXYYZZ
|
|
||||||
|
|
||||||
Where XX, YY and ZZ are the main version, release and patch numbers in
|
|
||||||
hexadecimal (using 8 bits each). All three numbers are always represented
|
|
||||||
using two digits. 1.2 would appear as "0x010200" while version 9.11.7
|
|
||||||
appears as "0x090b07".
|
|
||||||
|
|
||||||
This 6-digit (24 bits) hexadecimal number does not show pre-release number,
|
|
||||||
and it is always a greater number in a more recent release. It makes
|
|
||||||
comparisons with greater than and less than work.
|
|
||||||
|
|
||||||
Note: This define is the full hex number and _does not_ use the
|
|
||||||
CURL_VERSION_BITS() macro since curl's own configure script greps for it
|
|
||||||
and needs it to contain the full number.
|
|
||||||
*/
|
|
||||||
#define LIBCURL_VERSION_NUM 0x073a00
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This is the date and time when the full source package was created. The
|
|
||||||
* timestamp is not stored in git, as the timestamp is properly set in the
|
|
||||||
* tarballs by the maketgz script.
|
|
||||||
*
|
|
||||||
* The format of the date follows this template:
|
|
||||||
*
|
|
||||||
* "2007-11-23"
|
|
||||||
*/
|
|
||||||
#define LIBCURL_TIMESTAMP "2018-01-24"
|
|
||||||
|
|
||||||
#define CURL_VERSION_BITS(x,y,z) ((x)<<16|(y)<<8|z)
|
|
||||||
#define CURL_AT_LEAST_VERSION(x,y,z) \
|
|
||||||
(LIBCURL_VERSION_NUM >= CURL_VERSION_BITS(x, y, z))
|
|
||||||
|
|
||||||
#endif /* __CURL_CURLVER_H */
|
|
@ -1,102 +0,0 @@
|
|||||||
#ifndef __CURL_EASY_H
|
|
||||||
#define __CURL_EASY_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CURL_EXTERN CURL *curl_easy_init(void);
|
|
||||||
CURL_EXTERN CURLcode curl_easy_setopt(CURL *curl, CURLoption option, ...);
|
|
||||||
CURL_EXTERN CURLcode curl_easy_perform(CURL *curl);
|
|
||||||
CURL_EXTERN void curl_easy_cleanup(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_getinfo()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Request internal information from the curl session with this function. The
|
|
||||||
* third argument MUST be a pointer to a long, a pointer to a char * or a
|
|
||||||
* pointer to a double (as the documentation describes elsewhere). The data
|
|
||||||
* pointed to will be filled in accordingly and can be relied upon only if the
|
|
||||||
* function returns CURLE_OK. This function is intended to get used *AFTER* a
|
|
||||||
* performed transfer, all results from this function are undefined until the
|
|
||||||
* transfer is completed.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_getinfo(CURL *curl, CURLINFO info, ...);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_duphandle()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Creates a new curl session handle with the same options set for the handle
|
|
||||||
* passed in. Duplicating a handle could only be a matter of cloning data and
|
|
||||||
* options, internal state info and things like persistent connections cannot
|
|
||||||
* be transferred. It is useful in multithreaded applications when you can run
|
|
||||||
* curl_easy_duphandle() for each new thread to avoid a series of identical
|
|
||||||
* curl_easy_setopt() invokes in every thread.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURL *curl_easy_duphandle(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_reset()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Re-initializes a CURL handle to the default values. This puts back the
|
|
||||||
* handle to the same state as it was in when it was just created.
|
|
||||||
*
|
|
||||||
* It does keep: live connections, the Session ID cache, the DNS cache and the
|
|
||||||
* cookies.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN void curl_easy_reset(CURL *curl);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_recv()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Receives data from the connected socket. Use after successful
|
|
||||||
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_recv(CURL *curl, void *buffer, size_t buflen,
|
|
||||||
size_t *n);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* NAME curl_easy_send()
|
|
||||||
*
|
|
||||||
* DESCRIPTION
|
|
||||||
*
|
|
||||||
* Sends data over the connected socket. Use after successful
|
|
||||||
* curl_easy_perform() with CURLOPT_CONNECT_ONLY option.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLcode curl_easy_send(CURL *curl, const void *buffer,
|
|
||||||
size_t buflen, size_t *n);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,50 +0,0 @@
|
|||||||
#ifndef __CURL_MPRINTF_H
|
|
||||||
#define __CURL_MPRINTF_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <stdarg.h>
|
|
||||||
#include <stdio.h> /* needed for FILE */
|
|
||||||
#include "curl.h" /* for CURL_EXTERN */
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
CURL_EXTERN int curl_mprintf(const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_mfprintf(FILE *fd, const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_msprintf(char *buffer, const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_msnprintf(char *buffer, size_t maxlength,
|
|
||||||
const char *format, ...);
|
|
||||||
CURL_EXTERN int curl_mvprintf(const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvfprintf(FILE *fd, const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvsprintf(char *buffer, const char *format, va_list args);
|
|
||||||
CURL_EXTERN int curl_mvsnprintf(char *buffer, size_t maxlength,
|
|
||||||
const char *format, va_list args);
|
|
||||||
CURL_EXTERN char *curl_maprintf(const char *format, ...);
|
|
||||||
CURL_EXTERN char *curl_mvaprintf(const char *format, va_list args);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CURL_MPRINTF_H */
|
|
@ -1,439 +0,0 @@
|
|||||||
#ifndef __CURL_MULTI_H
|
|
||||||
#define __CURL_MULTI_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
/*
|
|
||||||
This is an "external" header file. Don't give away any internals here!
|
|
||||||
|
|
||||||
GOALS
|
|
||||||
|
|
||||||
o Enable a "pull" interface. The application that uses libcurl decides where
|
|
||||||
and when to ask libcurl to get/send data.
|
|
||||||
|
|
||||||
o Enable multiple simultaneous transfers in the same thread without making it
|
|
||||||
complicated for the application.
|
|
||||||
|
|
||||||
o Enable the application to select() on its own file descriptors and curl's
|
|
||||||
file descriptors simultaneous easily.
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* This header file should not really need to include "curl.h" since curl.h
|
|
||||||
* itself includes this file and we expect user applications to do #include
|
|
||||||
* <curl/curl.h> without the need for especially including multi.h.
|
|
||||||
*
|
|
||||||
* For some reason we added this include here at one point, and rather than to
|
|
||||||
* break existing (wrongly written) libcurl applications, we leave it as-is
|
|
||||||
* but with this warning attached.
|
|
||||||
*/
|
|
||||||
#include "curl.h"
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(BUILDING_LIBCURL) || defined(CURL_STRICTER)
|
|
||||||
typedef struct Curl_multi CURLM;
|
|
||||||
#else
|
|
||||||
typedef void CURLM;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
CURLM_CALL_MULTI_PERFORM = -1, /* please call curl_multi_perform() or
|
|
||||||
curl_multi_socket*() soon */
|
|
||||||
CURLM_OK,
|
|
||||||
CURLM_BAD_HANDLE, /* the passed-in handle is not a valid CURLM handle */
|
|
||||||
CURLM_BAD_EASY_HANDLE, /* an easy handle was not good/valid */
|
|
||||||
CURLM_OUT_OF_MEMORY, /* if you ever get this, you're in deep sh*t */
|
|
||||||
CURLM_INTERNAL_ERROR, /* this is a libcurl bug */
|
|
||||||
CURLM_BAD_SOCKET, /* the passed in socket argument did not match */
|
|
||||||
CURLM_UNKNOWN_OPTION, /* curl_multi_setopt() with unsupported option */
|
|
||||||
CURLM_ADDED_ALREADY, /* an easy handle already added to a multi handle was
|
|
||||||
attempted to get added - again */
|
|
||||||
CURLM_LAST
|
|
||||||
} CURLMcode;
|
|
||||||
|
|
||||||
/* just to make code nicer when using curl_multi_socket() you can now check
|
|
||||||
for CURLM_CALL_MULTI_SOCKET too in the same style it works for
|
|
||||||
curl_multi_perform() and CURLM_CALL_MULTI_PERFORM */
|
|
||||||
#define CURLM_CALL_MULTI_SOCKET CURLM_CALL_MULTI_PERFORM
|
|
||||||
|
|
||||||
/* bitmask bits for CURLMOPT_PIPELINING */
|
|
||||||
#define CURLPIPE_NOTHING 0L
|
|
||||||
#define CURLPIPE_HTTP1 1L
|
|
||||||
#define CURLPIPE_MULTIPLEX 2L
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
CURLMSG_NONE, /* first, not used */
|
|
||||||
CURLMSG_DONE, /* This easy handle has completed. 'result' contains
|
|
||||||
the CURLcode of the transfer */
|
|
||||||
CURLMSG_LAST /* last, not used */
|
|
||||||
} CURLMSG;
|
|
||||||
|
|
||||||
struct CURLMsg {
|
|
||||||
CURLMSG msg; /* what this message means */
|
|
||||||
CURL *easy_handle; /* the handle it concerns */
|
|
||||||
union {
|
|
||||||
void *whatever; /* message-specific data */
|
|
||||||
CURLcode result; /* return code for transfer */
|
|
||||||
} data;
|
|
||||||
};
|
|
||||||
typedef struct CURLMsg CURLMsg;
|
|
||||||
|
|
||||||
/* Based on poll(2) structure and values.
|
|
||||||
* We don't use pollfd and POLL* constants explicitly
|
|
||||||
* to cover platforms without poll(). */
|
|
||||||
#define CURL_WAIT_POLLIN 0x0001
|
|
||||||
#define CURL_WAIT_POLLPRI 0x0002
|
|
||||||
#define CURL_WAIT_POLLOUT 0x0004
|
|
||||||
|
|
||||||
struct curl_waitfd {
|
|
||||||
curl_socket_t fd;
|
|
||||||
short events;
|
|
||||||
short revents; /* not supported yet */
|
|
||||||
};
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_init()
|
|
||||||
*
|
|
||||||
* Desc: inititalize multi-style curl usage
|
|
||||||
*
|
|
||||||
* Returns: a new CURLM handle to use in all 'curl_multi' functions.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLM *curl_multi_init(void);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_add_handle()
|
|
||||||
*
|
|
||||||
* Desc: add a standard curl handle to the multi stack
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_add_handle(CURLM *multi_handle,
|
|
||||||
CURL *curl_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_remove_handle()
|
|
||||||
*
|
|
||||||
* Desc: removes a curl handle from the multi stack again
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_remove_handle(CURLM *multi_handle,
|
|
||||||
CURL *curl_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_fdset()
|
|
||||||
*
|
|
||||||
* Desc: Ask curl for its fd_set sets. The app can use these to select() or
|
|
||||||
* poll() on. We want curl_multi_perform() called as soon as one of
|
|
||||||
* them are ready.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_fdset(CURLM *multi_handle,
|
|
||||||
fd_set *read_fd_set,
|
|
||||||
fd_set *write_fd_set,
|
|
||||||
fd_set *exc_fd_set,
|
|
||||||
int *max_fd);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_wait()
|
|
||||||
*
|
|
||||||
* Desc: Poll on all fds within a CURLM set as well as any
|
|
||||||
* additional fds passed to the function.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_wait(CURLM *multi_handle,
|
|
||||||
struct curl_waitfd extra_fds[],
|
|
||||||
unsigned int extra_nfds,
|
|
||||||
int timeout_ms,
|
|
||||||
int *ret);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_perform()
|
|
||||||
*
|
|
||||||
* Desc: When the app thinks there's data available for curl it calls this
|
|
||||||
* function to read/write whatever there is right now. This returns
|
|
||||||
* as soon as the reads and writes are done. This function does not
|
|
||||||
* require that there actually is data available for reading or that
|
|
||||||
* data can be written, it can be called just in case. It returns
|
|
||||||
* the number of handles that still transfer data in the second
|
|
||||||
* argument's integer-pointer.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code. *NOTE* that this only
|
|
||||||
* returns errors etc regarding the whole multi stack. There might
|
|
||||||
* still have occurred problems on invidual transfers even when this
|
|
||||||
* returns OK.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_perform(CURLM *multi_handle,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_cleanup()
|
|
||||||
*
|
|
||||||
* Desc: Cleans up and removes a whole multi stack. It does not free or
|
|
||||||
* touch any individual easy handles in any way. We need to define
|
|
||||||
* in what state those handles will be if this function is called
|
|
||||||
* in the middle of a transfer.
|
|
||||||
*
|
|
||||||
* Returns: CURLMcode type, general multi error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_cleanup(CURLM *multi_handle);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_info_read()
|
|
||||||
*
|
|
||||||
* Desc: Ask the multi handle if there's any messages/informationals from
|
|
||||||
* the individual transfers. Messages include informationals such as
|
|
||||||
* error code from the transfer or just the fact that a transfer is
|
|
||||||
* completed. More details on these should be written down as well.
|
|
||||||
*
|
|
||||||
* Repeated calls to this function will return a new struct each
|
|
||||||
* time, until a special "end of msgs" struct is returned as a signal
|
|
||||||
* that there is no more to get at this point.
|
|
||||||
*
|
|
||||||
* The data the returned pointer points to will not survive calling
|
|
||||||
* curl_multi_cleanup().
|
|
||||||
*
|
|
||||||
* The 'CURLMsg' struct is meant to be very simple and only contain
|
|
||||||
* very basic information. If more involved information is wanted,
|
|
||||||
* we will provide the particular "transfer handle" in that struct
|
|
||||||
* and that should/could/would be used in subsequent
|
|
||||||
* curl_easy_getinfo() calls (or similar). The point being that we
|
|
||||||
* must never expose complex structs to applications, as then we'll
|
|
||||||
* undoubtably get backwards compatibility problems in the future.
|
|
||||||
*
|
|
||||||
* Returns: A pointer to a filled-in struct, or NULL if it failed or ran out
|
|
||||||
* of structs. It also writes the number of messages left in the
|
|
||||||
* queue (after this read) in the integer the second argument points
|
|
||||||
* to.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMsg *curl_multi_info_read(CURLM *multi_handle,
|
|
||||||
int *msgs_in_queue);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_strerror()
|
|
||||||
*
|
|
||||||
* Desc: The curl_multi_strerror function may be used to turn a CURLMcode
|
|
||||||
* value into the equivalent human readable error string. This is
|
|
||||||
* useful for printing meaningful error messages.
|
|
||||||
*
|
|
||||||
* Returns: A pointer to a zero-terminated error message.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN const char *curl_multi_strerror(CURLMcode);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_socket() and
|
|
||||||
* curl_multi_socket_all()
|
|
||||||
*
|
|
||||||
* Desc: An alternative version of curl_multi_perform() that allows the
|
|
||||||
* application to pass in one of the file descriptors that have been
|
|
||||||
* detected to have "action" on them and let libcurl perform.
|
|
||||||
* See man page for details.
|
|
||||||
*/
|
|
||||||
#define CURL_POLL_NONE 0
|
|
||||||
#define CURL_POLL_IN 1
|
|
||||||
#define CURL_POLL_OUT 2
|
|
||||||
#define CURL_POLL_INOUT 3
|
|
||||||
#define CURL_POLL_REMOVE 4
|
|
||||||
|
|
||||||
#define CURL_SOCKET_TIMEOUT CURL_SOCKET_BAD
|
|
||||||
|
|
||||||
#define CURL_CSELECT_IN 0x01
|
|
||||||
#define CURL_CSELECT_OUT 0x02
|
|
||||||
#define CURL_CSELECT_ERR 0x04
|
|
||||||
|
|
||||||
typedef int (*curl_socket_callback)(CURL *easy, /* easy handle */
|
|
||||||
curl_socket_t s, /* socket */
|
|
||||||
int what, /* see above */
|
|
||||||
void *userp, /* private callback
|
|
||||||
pointer */
|
|
||||||
void *socketp); /* private socket
|
|
||||||
pointer */
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_timer_callback
|
|
||||||
*
|
|
||||||
* Desc: Called by libcurl whenever the library detects a change in the
|
|
||||||
* maximum number of milliseconds the app is allowed to wait before
|
|
||||||
* curl_multi_socket() or curl_multi_perform() must be called
|
|
||||||
* (to allow libcurl's timed events to take place).
|
|
||||||
*
|
|
||||||
* Returns: The callback should return zero.
|
|
||||||
*/
|
|
||||||
typedef int (*curl_multi_timer_callback)(CURLM *multi, /* multi handle */
|
|
||||||
long timeout_ms, /* see above */
|
|
||||||
void *userp); /* private callback
|
|
||||||
pointer */
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket(CURLM *multi_handle, curl_socket_t s,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket_action(CURLM *multi_handle,
|
|
||||||
curl_socket_t s,
|
|
||||||
int ev_bitmask,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_socket_all(CURLM *multi_handle,
|
|
||||||
int *running_handles);
|
|
||||||
|
|
||||||
#ifndef CURL_ALLOW_OLD_MULTI_SOCKET
|
|
||||||
/* This macro below was added in 7.16.3 to push users who recompile to use
|
|
||||||
the new curl_multi_socket_action() instead of the old curl_multi_socket()
|
|
||||||
*/
|
|
||||||
#define curl_multi_socket(x,y,z) curl_multi_socket_action(x,y,0,z)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_timeout()
|
|
||||||
*
|
|
||||||
* Desc: Returns the maximum number of milliseconds the app is allowed to
|
|
||||||
* wait before curl_multi_socket() or curl_multi_perform() must be
|
|
||||||
* called (to allow libcurl's timed events to take place).
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_timeout(CURLM *multi_handle,
|
|
||||||
long *milliseconds);
|
|
||||||
|
|
||||||
#undef CINIT /* re-using the same name as in curl.h */
|
|
||||||
|
|
||||||
#ifdef CURL_ISOCPP
|
|
||||||
#define CINIT(name,type,num) CURLMOPT_ ## name = CURLOPTTYPE_ ## type + num
|
|
||||||
#else
|
|
||||||
/* The macro "##" is ISO C, we assume pre-ISO C doesn't support it. */
|
|
||||||
#define LONG CURLOPTTYPE_LONG
|
|
||||||
#define OBJECTPOINT CURLOPTTYPE_OBJECTPOINT
|
|
||||||
#define FUNCTIONPOINT CURLOPTTYPE_FUNCTIONPOINT
|
|
||||||
#define OFF_T CURLOPTTYPE_OFF_T
|
|
||||||
#define CINIT(name,type,number) CURLMOPT_/**/name = type + number
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef enum {
|
|
||||||
/* This is the socket callback function pointer */
|
|
||||||
CINIT(SOCKETFUNCTION, FUNCTIONPOINT, 1),
|
|
||||||
|
|
||||||
/* This is the argument passed to the socket callback */
|
|
||||||
CINIT(SOCKETDATA, OBJECTPOINT, 2),
|
|
||||||
|
|
||||||
/* set to 1 to enable pipelining for this multi handle */
|
|
||||||
CINIT(PIPELINING, LONG, 3),
|
|
||||||
|
|
||||||
/* This is the timer callback function pointer */
|
|
||||||
CINIT(TIMERFUNCTION, FUNCTIONPOINT, 4),
|
|
||||||
|
|
||||||
/* This is the argument passed to the timer callback */
|
|
||||||
CINIT(TIMERDATA, OBJECTPOINT, 5),
|
|
||||||
|
|
||||||
/* maximum number of entries in the connection cache */
|
|
||||||
CINIT(MAXCONNECTS, LONG, 6),
|
|
||||||
|
|
||||||
/* maximum number of (pipelining) connections to one host */
|
|
||||||
CINIT(MAX_HOST_CONNECTIONS, LONG, 7),
|
|
||||||
|
|
||||||
/* maximum number of requests in a pipeline */
|
|
||||||
CINIT(MAX_PIPELINE_LENGTH, LONG, 8),
|
|
||||||
|
|
||||||
/* a connection with a content-length longer than this
|
|
||||||
will not be considered for pipelining */
|
|
||||||
CINIT(CONTENT_LENGTH_PENALTY_SIZE, OFF_T, 9),
|
|
||||||
|
|
||||||
/* a connection with a chunk length longer than this
|
|
||||||
will not be considered for pipelining */
|
|
||||||
CINIT(CHUNK_LENGTH_PENALTY_SIZE, OFF_T, 10),
|
|
||||||
|
|
||||||
/* a list of site names(+port) that are blacklisted from
|
|
||||||
pipelining */
|
|
||||||
CINIT(PIPELINING_SITE_BL, OBJECTPOINT, 11),
|
|
||||||
|
|
||||||
/* a list of server types that are blacklisted from
|
|
||||||
pipelining */
|
|
||||||
CINIT(PIPELINING_SERVER_BL, OBJECTPOINT, 12),
|
|
||||||
|
|
||||||
/* maximum number of open connections in total */
|
|
||||||
CINIT(MAX_TOTAL_CONNECTIONS, LONG, 13),
|
|
||||||
|
|
||||||
/* This is the server push callback function pointer */
|
|
||||||
CINIT(PUSHFUNCTION, FUNCTIONPOINT, 14),
|
|
||||||
|
|
||||||
/* This is the argument passed to the server push callback */
|
|
||||||
CINIT(PUSHDATA, OBJECTPOINT, 15),
|
|
||||||
|
|
||||||
CURLMOPT_LASTENTRY /* the last unused */
|
|
||||||
} CURLMoption;
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_setopt()
|
|
||||||
*
|
|
||||||
* Desc: Sets options for the multi handle.
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_setopt(CURLM *multi_handle,
|
|
||||||
CURLMoption option, ...);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_multi_assign()
|
|
||||||
*
|
|
||||||
* Desc: This function sets an association in the multi handle between the
|
|
||||||
* given socket and a private pointer of the application. This is
|
|
||||||
* (only) useful for curl_multi_socket uses.
|
|
||||||
*
|
|
||||||
* Returns: CURLM error code.
|
|
||||||
*/
|
|
||||||
CURL_EXTERN CURLMcode curl_multi_assign(CURLM *multi_handle,
|
|
||||||
curl_socket_t sockfd, void *sockp);
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Name: curl_push_callback
|
|
||||||
*
|
|
||||||
* Desc: This callback gets called when a new stream is being pushed by the
|
|
||||||
* server. It approves or denies the new stream.
|
|
||||||
*
|
|
||||||
* Returns: CURL_PUSH_OK or CURL_PUSH_DENY.
|
|
||||||
*/
|
|
||||||
#define CURL_PUSH_OK 0
|
|
||||||
#define CURL_PUSH_DENY 1
|
|
||||||
|
|
||||||
struct curl_pushheaders; /* forward declaration only */
|
|
||||||
|
|
||||||
CURL_EXTERN char *curl_pushheader_bynum(struct curl_pushheaders *h,
|
|
||||||
size_t num);
|
|
||||||
CURL_EXTERN char *curl_pushheader_byname(struct curl_pushheaders *h,
|
|
||||||
const char *name);
|
|
||||||
|
|
||||||
typedef int (*curl_push_callback)(CURL *parent,
|
|
||||||
CURL *easy,
|
|
||||||
size_t num_headers,
|
|
||||||
struct curl_pushheaders *headers,
|
|
||||||
void *userp);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
} /* end of extern "C" */
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif
|
|
@ -1,33 +0,0 @@
|
|||||||
#ifndef __STDC_HEADERS_H
|
|
||||||
#define __STDC_HEADERS_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
size_t fread(void *, size_t, size_t, FILE *);
|
|
||||||
size_t fwrite(const void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
int strcasecmp(const char *, const char *);
|
|
||||||
int strncasecmp(const char *, const char *, size_t);
|
|
||||||
|
|
||||||
#endif /* __STDC_HEADERS_H */
|
|
@ -1,473 +0,0 @@
|
|||||||
#ifndef __CURL_SYSTEM_H
|
|
||||||
#define __CURL_SYSTEM_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Try to keep one section per platform, compiler and architecture, otherwise,
|
|
||||||
* if an existing section is reused for a different one and later on the
|
|
||||||
* original is adjusted, probably the piggybacking one can be adversely
|
|
||||||
* changed.
|
|
||||||
*
|
|
||||||
* In order to differentiate between platforms/compilers/architectures use
|
|
||||||
* only compiler built in predefined preprocessor symbols.
|
|
||||||
*
|
|
||||||
* curl_off_t
|
|
||||||
* ----------
|
|
||||||
*
|
|
||||||
* For any given platform/compiler curl_off_t must be typedef'ed to a 64-bit
|
|
||||||
* wide signed integral data type. The width of this data type must remain
|
|
||||||
* constant and independent of any possible large file support settings.
|
|
||||||
*
|
|
||||||
* As an exception to the above, curl_off_t shall be typedef'ed to a 32-bit
|
|
||||||
* wide signed integral data type if there is no 64-bit type.
|
|
||||||
*
|
|
||||||
* As a general rule, curl_off_t shall not be mapped to off_t. This rule shall
|
|
||||||
* only be violated if off_t is the only 64-bit data type available and the
|
|
||||||
* size of off_t is independent of large file support settings. Keep your
|
|
||||||
* build on the safe side avoiding an off_t gating. If you have a 64-bit
|
|
||||||
* off_t then take for sure that another 64-bit data type exists, dig deeper
|
|
||||||
* and you will find it.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__DJGPP__) || defined(__GO32__)
|
|
||||||
# if defined(__DJGPP__) && (__DJGPP__ > 1)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__SALFORDC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__BORLANDC__)
|
|
||||||
# if (__BORLANDC__ < 0x520)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__TURBOC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__WATCOMC__)
|
|
||||||
# if defined(__386__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__POCC__)
|
|
||||||
# if (__POCC__ < 280)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# elif defined(_MSC_VER)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__LCC__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__SYMBIAN32__)
|
|
||||||
# if defined(__EABI__) /* Treat all ARM compilers equally */
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__CW32__)
|
|
||||||
# pragma longlong on
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__VC32__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
|
|
||||||
|
|
||||||
#elif defined(__MWERKS__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(_WIN32_WCE)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__MINGW32__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_WS2TCPIP_H 1
|
|
||||||
|
|
||||||
#elif defined(__VMS)
|
|
||||||
# if defined(__VAX)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T unsigned int
|
|
||||||
|
|
||||||
#elif defined(__OS400__)
|
|
||||||
# if defined(__ILEC400__)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(__MVS__)
|
|
||||||
# if defined(__IBMC__) || defined(__IBMCPP__)
|
|
||||||
# if defined(_ILP32)
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# endif
|
|
||||||
# if defined(_LONG_LONG)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(__370__)
|
|
||||||
# if defined(__IBMC__) || defined(__IBMCPP__)
|
|
||||||
# if defined(_ILP32)
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# endif
|
|
||||||
# if defined(_LONG_LONG)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(_LP64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
# endif
|
|
||||||
|
|
||||||
#elif defined(TPF)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
#elif defined(__TINYC__) /* also known as tcc */
|
|
||||||
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
#elif defined(__SUNPRO_C) /* Oracle Solaris Studio */
|
|
||||||
# if !defined(__LP64) && (defined(__ILP32) || \
|
|
||||||
defined(__i386) || defined(__sparcv8))
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__LP64) || \
|
|
||||||
defined(__amd64) || defined(__sparcv9)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
/* ===================================== */
|
|
||||||
/* KEEP MSVC THE PENULTIMATE ENTRY */
|
|
||||||
/* ===================================== */
|
|
||||||
|
|
||||||
#elif defined(_MSC_VER)
|
|
||||||
# if (_MSC_VER >= 900) && (_INTEGRAL_MAX_BITS >= 64)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T __int64
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "I64d"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "I64u"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T i64
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ui64
|
|
||||||
# else
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
|
|
||||||
/* ===================================== */
|
|
||||||
/* KEEP GENERIC GCC THE LAST ENTRY */
|
|
||||||
/* ===================================== */
|
|
||||||
|
|
||||||
#elif defined(__GNUC__)
|
|
||||||
# if !defined(__LP64__) && \
|
|
||||||
(defined(__ILP32__) || defined(__i386__) || defined(__hppa__) || \
|
|
||||||
defined(__ppc__) || defined(__powerpc__) || defined(__arm__) || \
|
|
||||||
defined(__sparc__) || defined(__mips__) || defined(__sh__) || \
|
|
||||||
defined(__XTENSA__) || \
|
|
||||||
(defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 4) || \
|
|
||||||
(defined(__LONG_MAX__) && __LONG_MAX__ == 2147483647L))
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "lld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "llu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T LL
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU ULL
|
|
||||||
# elif defined(__LP64__) || \
|
|
||||||
defined(__x86_64__) || defined(__ppc64__) || defined(__sparc64__) || \
|
|
||||||
(defined(__SIZEOF_LONG__) && __SIZEOF_LONG__ == 8) || \
|
|
||||||
(defined(__LONG_MAX__) && __LONG_MAX__ == 9223372036854775807L)
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# endif
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T socklen_t
|
|
||||||
# define CURL_PULL_SYS_TYPES_H 1
|
|
||||||
# define CURL_PULL_SYS_SOCKET_H 1
|
|
||||||
|
|
||||||
#else
|
|
||||||
/* generic "safe guess" on old 32 bit style */
|
|
||||||
# define CURL_TYPEOF_CURL_OFF_T long
|
|
||||||
# define CURL_FORMAT_CURL_OFF_T "ld"
|
|
||||||
# define CURL_FORMAT_CURL_OFF_TU "lu"
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_T L
|
|
||||||
# define CURL_SUFFIX_CURL_OFF_TU UL
|
|
||||||
# define CURL_TYPEOF_CURL_SOCKLEN_T int
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _AIX
|
|
||||||
/* AIX needs <sys/poll.h> */
|
|
||||||
#define CURL_PULL_SYS_POLL_H
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/* CURL_PULL_WS2TCPIP_H is defined above when inclusion of header file */
|
|
||||||
/* ws2tcpip.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_WS2TCPIP_H
|
|
||||||
# include <winsock2.h>
|
|
||||||
# include <windows.h>
|
|
||||||
# include <ws2tcpip.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_TYPES_H is defined above when inclusion of header file */
|
|
||||||
/* sys/types.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_TYPES_H
|
|
||||||
# include <sys/types.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_SOCKET_H is defined above when inclusion of header file */
|
|
||||||
/* sys/socket.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_SOCKET_H
|
|
||||||
# include <sys/socket.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* CURL_PULL_SYS_POLL_H is defined above when inclusion of header file */
|
|
||||||
/* sys/poll.h is required here to properly make type definitions below. */
|
|
||||||
#ifdef CURL_PULL_SYS_POLL_H
|
|
||||||
# include <sys/poll.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Data type definition of curl_socklen_t. */
|
|
||||||
#ifdef CURL_TYPEOF_CURL_SOCKLEN_T
|
|
||||||
typedef CURL_TYPEOF_CURL_SOCKLEN_T curl_socklen_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Data type definition of curl_off_t. */
|
|
||||||
|
|
||||||
#ifdef CURL_TYPEOF_CURL_OFF_T
|
|
||||||
typedef CURL_TYPEOF_CURL_OFF_T curl_off_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* CURL_ISOCPP and CURL_OFF_T_C definitions are done here in order to allow
|
|
||||||
* these to be visible and exported by the external libcurl interface API,
|
|
||||||
* while also making them visible to the library internals, simply including
|
|
||||||
* curl_setup.h, without actually needing to include curl.h internally.
|
|
||||||
* If some day this section would grow big enough, all this should be moved
|
|
||||||
* to its own header file.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Figure out if we can use the ## preprocessor operator, which is supported
|
|
||||||
* by ISO/ANSI C and C++. Some compilers support it without setting __STDC__
|
|
||||||
* or __cplusplus so we need to carefully check for them too.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus) || \
|
|
||||||
defined(__HP_aCC) || defined(__BORLANDC__) || defined(__LCC__) || \
|
|
||||||
defined(__POCC__) || defined(__SALFORDC__) || defined(__HIGHC__) || \
|
|
||||||
defined(__ILEC400__)
|
|
||||||
/* This compiler is believed to have an ISO compatible preprocessor */
|
|
||||||
#define CURL_ISOCPP
|
|
||||||
#else
|
|
||||||
/* This compiler is believed NOT to have an ISO compatible preprocessor */
|
|
||||||
#undef CURL_ISOCPP
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Macros for minimum-width signed and unsigned curl_off_t integer constants.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__BORLANDC__) && (__BORLANDC__ == 0x0551)
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(x) x
|
|
||||||
# define __CURL_OFF_T_C_HLPR1(x) __CURL_OFF_T_C_HLPR2(x)
|
|
||||||
# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
|
|
||||||
__CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_T)
|
|
||||||
# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val) ## \
|
|
||||||
__CURL_OFF_T_C_HLPR1(CURL_SUFFIX_CURL_OFF_TU)
|
|
||||||
#else
|
|
||||||
# ifdef CURL_ISOCPP
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val ## Suffix
|
|
||||||
# else
|
|
||||||
# define __CURL_OFF_T_C_HLPR2(Val,Suffix) Val/**/Suffix
|
|
||||||
# endif
|
|
||||||
# define __CURL_OFF_T_C_HLPR1(Val,Suffix) __CURL_OFF_T_C_HLPR2(Val,Suffix)
|
|
||||||
# define CURL_OFF_T_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_T)
|
|
||||||
# define CURL_OFF_TU_C(Val) __CURL_OFF_T_C_HLPR1(Val,CURL_SUFFIX_CURL_OFF_TU)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#endif /* __CURL_SYSTEM_H */
|
|
@ -1,683 +0,0 @@
|
|||||||
#ifndef __CURL_TYPECHECK_GCC_H
|
|
||||||
#define __CURL_TYPECHECK_GCC_H
|
|
||||||
/***************************************************************************
|
|
||||||
* _ _ ____ _
|
|
||||||
* Project ___| | | | _ \| |
|
|
||||||
* / __| | | | |_) | |
|
|
||||||
* | (__| |_| | _ <| |___
|
|
||||||
* \___|\___/|_| \_\_____|
|
|
||||||
*
|
|
||||||
* Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.
|
|
||||||
*
|
|
||||||
* This software is licensed as described in the file COPYING, which
|
|
||||||
* you should have received as part of this distribution. The terms
|
|
||||||
* are also available at https://curl.haxx.se/docs/copyright.html.
|
|
||||||
*
|
|
||||||
* You may opt to use, copy, modify, merge, publish, distribute and/or sell
|
|
||||||
* copies of the Software, and permit persons to whom the Software is
|
|
||||||
* furnished to do so, under the terms of the COPYING file.
|
|
||||||
*
|
|
||||||
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
|
|
||||||
* KIND, either express or implied.
|
|
||||||
*
|
|
||||||
***************************************************************************/
|
|
||||||
|
|
||||||
/* wraps curl_easy_setopt() with typechecking */
|
|
||||||
|
|
||||||
/* To add a new kind of warning, add an
|
|
||||||
* if(_curl_is_sometype_option(_curl_opt))
|
|
||||||
* if(!_curl_is_sometype(value))
|
|
||||||
* _curl_easy_setopt_err_sometype();
|
|
||||||
* block and define _curl_is_sometype_option, _curl_is_sometype and
|
|
||||||
* _curl_easy_setopt_err_sometype below
|
|
||||||
*
|
|
||||||
* NOTE: We use two nested 'if' statements here instead of the && operator, in
|
|
||||||
* order to work around gcc bug #32061. It affects only gcc 4.3.x/4.4.x
|
|
||||||
* when compiling with -Wlogical-op.
|
|
||||||
*
|
|
||||||
* To add an option that uses the same type as an existing option, you'll just
|
|
||||||
* need to extend the appropriate _curl_*_option macro
|
|
||||||
*/
|
|
||||||
#define curl_easy_setopt(handle, option, value) \
|
|
||||||
__extension__ ({ \
|
|
||||||
__typeof__(option) _curl_opt = option; \
|
|
||||||
if(__builtin_constant_p(_curl_opt)) { \
|
|
||||||
if(_curl_is_long_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_long(value)) \
|
|
||||||
_curl_easy_setopt_err_long(); \
|
|
||||||
if(_curl_is_off_t_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_off_t(value)) \
|
|
||||||
_curl_easy_setopt_err_curl_off_t(); \
|
|
||||||
if(_curl_is_string_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_string(value)) \
|
|
||||||
_curl_easy_setopt_err_string(); \
|
|
||||||
if(_curl_is_write_cb_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_write_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_write_callback(); \
|
|
||||||
if((_curl_opt) == CURLOPT_READFUNCTION) \
|
|
||||||
if(!_curl_is_read_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_read_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_IOCTLFUNCTION) \
|
|
||||||
if(!_curl_is_ioctl_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_ioctl_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SOCKOPTFUNCTION) \
|
|
||||||
if(!_curl_is_sockopt_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_sockopt_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_OPENSOCKETFUNCTION) \
|
|
||||||
if(!_curl_is_opensocket_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_opensocket_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_PROGRESSFUNCTION) \
|
|
||||||
if(!_curl_is_progress_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_progress_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_DEBUGFUNCTION) \
|
|
||||||
if(!_curl_is_debug_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_debug_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SSL_CTX_FUNCTION) \
|
|
||||||
if(!_curl_is_ssl_ctx_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_ssl_ctx_cb(); \
|
|
||||||
if(_curl_is_conv_cb_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_conv_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_conv_cb(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SEEKFUNCTION) \
|
|
||||||
if(!_curl_is_seek_cb(value)) \
|
|
||||||
_curl_easy_setopt_err_seek_cb(); \
|
|
||||||
if(_curl_is_cb_data_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_cb_data(value)) \
|
|
||||||
_curl_easy_setopt_err_cb_data(); \
|
|
||||||
if((_curl_opt) == CURLOPT_ERRORBUFFER) \
|
|
||||||
if(!_curl_is_error_buffer(value)) \
|
|
||||||
_curl_easy_setopt_err_error_buffer(); \
|
|
||||||
if((_curl_opt) == CURLOPT_STDERR) \
|
|
||||||
if(!_curl_is_FILE(value)) \
|
|
||||||
_curl_easy_setopt_err_FILE(); \
|
|
||||||
if(_curl_is_postfields_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_postfields(value)) \
|
|
||||||
_curl_easy_setopt_err_postfields(); \
|
|
||||||
if((_curl_opt) == CURLOPT_HTTPPOST) \
|
|
||||||
if(!_curl_is_arr((value), struct curl_httppost)) \
|
|
||||||
_curl_easy_setopt_err_curl_httpost(); \
|
|
||||||
if((_curl_opt) == CURLOPT_MIMEPOST) \
|
|
||||||
if(!_curl_is_ptr((value), curl_mime)) \
|
|
||||||
_curl_easy_setopt_err_curl_mimepost(); \
|
|
||||||
if(_curl_is_slist_option(_curl_opt)) \
|
|
||||||
if(!_curl_is_arr((value), struct curl_slist)) \
|
|
||||||
_curl_easy_setopt_err_curl_slist(); \
|
|
||||||
if((_curl_opt) == CURLOPT_SHARE) \
|
|
||||||
if(!_curl_is_ptr((value), CURLSH)) \
|
|
||||||
_curl_easy_setopt_err_CURLSH(); \
|
|
||||||
} \
|
|
||||||
curl_easy_setopt(handle, _curl_opt, value); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/* wraps curl_easy_getinfo() with typechecking */
|
|
||||||
/* FIXME: don't allow const pointers */
|
|
||||||
#define curl_easy_getinfo(handle, info, arg) \
|
|
||||||
__extension__ ({ \
|
|
||||||
__typeof__(info) _curl_info = info; \
|
|
||||||
if(__builtin_constant_p(_curl_info)) { \
|
|
||||||
if(_curl_is_string_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), char *)) \
|
|
||||||
_curl_easy_getinfo_err_string(); \
|
|
||||||
if(_curl_is_long_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), long)) \
|
|
||||||
_curl_easy_getinfo_err_long(); \
|
|
||||||
if(_curl_is_double_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), double)) \
|
|
||||||
_curl_easy_getinfo_err_double(); \
|
|
||||||
if(_curl_is_slist_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_slist *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_slist(); \
|
|
||||||
if(_curl_is_tlssessioninfo_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_tlssessioninfo *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_tlssesssioninfo(); \
|
|
||||||
if(_curl_is_certinfo_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), struct curl_certinfo *)) \
|
|
||||||
_curl_easy_getinfo_err_curl_certinfo(); \
|
|
||||||
if(_curl_is_socket_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), curl_socket_t)) \
|
|
||||||
_curl_easy_getinfo_err_curl_socket(); \
|
|
||||||
if(_curl_is_off_t_info(_curl_info)) \
|
|
||||||
if(!_curl_is_arr((arg), curl_off_t)) \
|
|
||||||
_curl_easy_getinfo_err_curl_off_t(); \
|
|
||||||
} \
|
|
||||||
curl_easy_getinfo(handle, _curl_info, arg); \
|
|
||||||
})
|
|
||||||
|
|
||||||
/* TODO: typechecking for curl_share_setopt() and curl_multi_setopt(),
|
|
||||||
* for now just make sure that the functions are called with three
|
|
||||||
* arguments
|
|
||||||
*/
|
|
||||||
#define curl_share_setopt(share,opt,param) curl_share_setopt(share,opt,param)
|
|
||||||
#define curl_multi_setopt(handle,opt,param) curl_multi_setopt(handle,opt,param)
|
|
||||||
|
|
||||||
|
|
||||||
/* the actual warnings, triggered by calling the _curl_easy_setopt_err*
|
|
||||||
* functions */
|
|
||||||
|
|
||||||
/* To define a new warning, use _CURL_WARNING(identifier, "message") */
|
|
||||||
#define _CURL_WARNING(id, message) \
|
|
||||||
static void __attribute__((__warning__(message))) \
|
|
||||||
__attribute__((__unused__)) __attribute__((__noinline__)) \
|
|
||||||
id(void) { __asm__(""); }
|
|
||||||
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_long,
|
|
||||||
"curl_easy_setopt expects a long argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_off_t,
|
|
||||||
"curl_easy_setopt expects a curl_off_t argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_string,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"string ('char *' or char[]) argument for this option"
|
|
||||||
)
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_write_callback,
|
|
||||||
"curl_easy_setopt expects a curl_write_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_read_cb,
|
|
||||||
"curl_easy_setopt expects a curl_read_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_ioctl_cb,
|
|
||||||
"curl_easy_setopt expects a curl_ioctl_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_sockopt_cb,
|
|
||||||
"curl_easy_setopt expects a curl_sockopt_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_opensocket_cb,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"curl_opensocket_callback argument for this option"
|
|
||||||
)
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_progress_cb,
|
|
||||||
"curl_easy_setopt expects a curl_progress_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_debug_cb,
|
|
||||||
"curl_easy_setopt expects a curl_debug_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_ssl_ctx_cb,
|
|
||||||
"curl_easy_setopt expects a curl_ssl_ctx_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_conv_cb,
|
|
||||||
"curl_easy_setopt expects a curl_conv_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_seek_cb,
|
|
||||||
"curl_easy_setopt expects a curl_seek_callback argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_cb_data,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"private data pointer as argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_error_buffer,
|
|
||||||
"curl_easy_setopt expects a "
|
|
||||||
"char buffer of CURL_ERROR_SIZE as argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_FILE,
|
|
||||||
"curl_easy_setopt expects a 'FILE *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_postfields,
|
|
||||||
"curl_easy_setopt expects a 'void *' or 'char *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_httpost,
|
|
||||||
"curl_easy_setopt expects a 'struct curl_httppost *' "
|
|
||||||
"argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_mimepost,
|
|
||||||
"curl_easy_setopt expects a 'curl_mime *' "
|
|
||||||
"argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_curl_slist,
|
|
||||||
"curl_easy_setopt expects a 'struct curl_slist *' argument for this option")
|
|
||||||
_CURL_WARNING(_curl_easy_setopt_err_CURLSH,
|
|
||||||
"curl_easy_setopt expects a CURLSH* argument for this option")
|
|
||||||
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_string,
|
|
||||||
"curl_easy_getinfo expects a pointer to 'char *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_long,
|
|
||||||
"curl_easy_getinfo expects a pointer to long for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_double,
|
|
||||||
"curl_easy_getinfo expects a pointer to double for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
|
|
||||||
"curl_easy_getinfo expects a pointer to 'struct curl_slist *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_tlssesssioninfo,
|
|
||||||
"curl_easy_getinfo expects a pointer to "
|
|
||||||
"'struct curl_tlssessioninfo *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_certinfo,
|
|
||||||
"curl_easy_getinfo expects a pointer to "
|
|
||||||
"'struct curl_certinfo *' for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_socket,
|
|
||||||
"curl_easy_getinfo expects a pointer to curl_socket_t for this info")
|
|
||||||
_CURL_WARNING(_curl_easy_getinfo_err_curl_off_t,
|
|
||||||
"curl_easy_getinfo expects a pointer to curl_off_t for this info")
|
|
||||||
|
|
||||||
/* groups of curl_easy_setops options that take the same type of argument */
|
|
||||||
|
|
||||||
/* To add a new option to one of the groups, just add
|
|
||||||
* (option) == CURLOPT_SOMETHING
|
|
||||||
* to the or-expression. If the option takes a long or curl_off_t, you don't
|
|
||||||
* have to do anything
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a long argument */
|
|
||||||
#define _curl_is_long_option(option) \
|
|
||||||
(0 < (option) && (option) < CURLOPTTYPE_OBJECTPOINT)
|
|
||||||
|
|
||||||
#define _curl_is_off_t_option(option) \
|
|
||||||
((option) > CURLOPTTYPE_OFF_T)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a char* argument */
|
|
||||||
#define _curl_is_string_option(option) \
|
|
||||||
((option) == CURLOPT_ABSTRACT_UNIX_SOCKET || \
|
|
||||||
(option) == CURLOPT_ACCEPT_ENCODING || \
|
|
||||||
(option) == CURLOPT_CAINFO || \
|
|
||||||
(option) == CURLOPT_CAPATH || \
|
|
||||||
(option) == CURLOPT_COOKIE || \
|
|
||||||
(option) == CURLOPT_COOKIEFILE || \
|
|
||||||
(option) == CURLOPT_COOKIEJAR || \
|
|
||||||
(option) == CURLOPT_COOKIELIST || \
|
|
||||||
(option) == CURLOPT_CRLFILE || \
|
|
||||||
(option) == CURLOPT_CUSTOMREQUEST || \
|
|
||||||
(option) == CURLOPT_DEFAULT_PROTOCOL || \
|
|
||||||
(option) == CURLOPT_DNS_INTERFACE || \
|
|
||||||
(option) == CURLOPT_DNS_LOCAL_IP4 || \
|
|
||||||
(option) == CURLOPT_DNS_LOCAL_IP6 || \
|
|
||||||
(option) == CURLOPT_DNS_SERVERS || \
|
|
||||||
(option) == CURLOPT_EGDSOCKET || \
|
|
||||||
(option) == CURLOPT_FTPPORT || \
|
|
||||||
(option) == CURLOPT_FTP_ACCOUNT || \
|
|
||||||
(option) == CURLOPT_FTP_ALTERNATIVE_TO_USER || \
|
|
||||||
(option) == CURLOPT_INTERFACE || \
|
|
||||||
(option) == CURLOPT_ISSUERCERT || \
|
|
||||||
(option) == CURLOPT_KEYPASSWD || \
|
|
||||||
(option) == CURLOPT_KRBLEVEL || \
|
|
||||||
(option) == CURLOPT_LOGIN_OPTIONS || \
|
|
||||||
(option) == CURLOPT_MAIL_AUTH || \
|
|
||||||
(option) == CURLOPT_MAIL_FROM || \
|
|
||||||
(option) == CURLOPT_NETRC_FILE || \
|
|
||||||
(option) == CURLOPT_NOPROXY || \
|
|
||||||
(option) == CURLOPT_PASSWORD || \
|
|
||||||
(option) == CURLOPT_PINNEDPUBLICKEY || \
|
|
||||||
(option) == CURLOPT_PRE_PROXY || \
|
|
||||||
(option) == CURLOPT_PROXY || \
|
|
||||||
(option) == CURLOPT_PROXYPASSWORD || \
|
|
||||||
(option) == CURLOPT_PROXYUSERNAME || \
|
|
||||||
(option) == CURLOPT_PROXYUSERPWD || \
|
|
||||||
(option) == CURLOPT_PROXY_CAINFO || \
|
|
||||||
(option) == CURLOPT_PROXY_CAPATH || \
|
|
||||||
(option) == CURLOPT_PROXY_CRLFILE || \
|
|
||||||
(option) == CURLOPT_PROXY_KEYPASSWD || \
|
|
||||||
(option) == CURLOPT_PROXY_PINNEDPUBLICKEY || \
|
|
||||||
(option) == CURLOPT_PROXY_SERVICE_NAME || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLCERT || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLCERTTYPE || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLKEY || \
|
|
||||||
(option) == CURLOPT_PROXY_SSLKEYTYPE || \
|
|
||||||
(option) == CURLOPT_PROXY_SSL_CIPHER_LIST || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_PASSWORD || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_USERNAME || \
|
|
||||||
(option) == CURLOPT_PROXY_TLSAUTH_TYPE || \
|
|
||||||
(option) == CURLOPT_RANDOM_FILE || \
|
|
||||||
(option) == CURLOPT_RANGE || \
|
|
||||||
(option) == CURLOPT_REFERER || \
|
|
||||||
(option) == CURLOPT_RTSP_SESSION_ID || \
|
|
||||||
(option) == CURLOPT_RTSP_STREAM_URI || \
|
|
||||||
(option) == CURLOPT_RTSP_TRANSPORT || \
|
|
||||||
(option) == CURLOPT_SERVICE_NAME || \
|
|
||||||
(option) == CURLOPT_SOCKS5_GSSAPI_SERVICE || \
|
|
||||||
(option) == CURLOPT_SSH_HOST_PUBLIC_KEY_MD5 || \
|
|
||||||
(option) == CURLOPT_SSH_KNOWNHOSTS || \
|
|
||||||
(option) == CURLOPT_SSH_PRIVATE_KEYFILE || \
|
|
||||||
(option) == CURLOPT_SSH_PUBLIC_KEYFILE || \
|
|
||||||
(option) == CURLOPT_SSLCERT || \
|
|
||||||
(option) == CURLOPT_SSLCERTTYPE || \
|
|
||||||
(option) == CURLOPT_SSLENGINE || \
|
|
||||||
(option) == CURLOPT_SSLKEY || \
|
|
||||||
(option) == CURLOPT_SSLKEYTYPE || \
|
|
||||||
(option) == CURLOPT_SSL_CIPHER_LIST || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_PASSWORD || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_TYPE || \
|
|
||||||
(option) == CURLOPT_TLSAUTH_USERNAME || \
|
|
||||||
(option) == CURLOPT_UNIX_SOCKET_PATH || \
|
|
||||||
(option) == CURLOPT_URL || \
|
|
||||||
(option) == CURLOPT_USERAGENT || \
|
|
||||||
(option) == CURLOPT_USERNAME || \
|
|
||||||
(option) == CURLOPT_USERPWD || \
|
|
||||||
(option) == CURLOPT_XOAUTH2_BEARER || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a curl_write_callback argument */
|
|
||||||
#define _curl_is_write_cb_option(option) \
|
|
||||||
((option) == CURLOPT_HEADERFUNCTION || \
|
|
||||||
(option) == CURLOPT_WRITEFUNCTION)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a curl_conv_callback argument */
|
|
||||||
#define _curl_is_conv_cb_option(option) \
|
|
||||||
((option) == CURLOPT_CONV_TO_NETWORK_FUNCTION || \
|
|
||||||
(option) == CURLOPT_CONV_FROM_NETWORK_FUNCTION || \
|
|
||||||
(option) == CURLOPT_CONV_FROM_UTF8_FUNCTION)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a data argument to pass to a callback */
|
|
||||||
#define _curl_is_cb_data_option(option) \
|
|
||||||
((option) == CURLOPT_CHUNK_DATA || \
|
|
||||||
(option) == CURLOPT_CLOSESOCKETDATA || \
|
|
||||||
(option) == CURLOPT_DEBUGDATA || \
|
|
||||||
(option) == CURLOPT_FNMATCH_DATA || \
|
|
||||||
(option) == CURLOPT_HEADERDATA || \
|
|
||||||
(option) == CURLOPT_INTERLEAVEDATA || \
|
|
||||||
(option) == CURLOPT_IOCTLDATA || \
|
|
||||||
(option) == CURLOPT_OPENSOCKETDATA || \
|
|
||||||
(option) == CURLOPT_PRIVATE || \
|
|
||||||
(option) == CURLOPT_PROGRESSDATA || \
|
|
||||||
(option) == CURLOPT_READDATA || \
|
|
||||||
(option) == CURLOPT_SEEKDATA || \
|
|
||||||
(option) == CURLOPT_SOCKOPTDATA || \
|
|
||||||
(option) == CURLOPT_SSH_KEYDATA || \
|
|
||||||
(option) == CURLOPT_SSL_CTX_DATA || \
|
|
||||||
(option) == CURLOPT_WRITEDATA || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a POST data argument (void* or char*) */
|
|
||||||
#define _curl_is_postfields_option(option) \
|
|
||||||
((option) == CURLOPT_POSTFIELDS || \
|
|
||||||
(option) == CURLOPT_COPYPOSTFIELDS || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* evaluates to true if option takes a struct curl_slist * argument */
|
|
||||||
#define _curl_is_slist_option(option) \
|
|
||||||
((option) == CURLOPT_HTTP200ALIASES || \
|
|
||||||
(option) == CURLOPT_HTTPHEADER || \
|
|
||||||
(option) == CURLOPT_MAIL_RCPT || \
|
|
||||||
(option) == CURLOPT_POSTQUOTE || \
|
|
||||||
(option) == CURLOPT_PREQUOTE || \
|
|
||||||
(option) == CURLOPT_PROXYHEADER || \
|
|
||||||
(option) == CURLOPT_QUOTE || \
|
|
||||||
(option) == CURLOPT_RESOLVE || \
|
|
||||||
(option) == CURLOPT_TELNETOPTIONS || \
|
|
||||||
0)
|
|
||||||
|
|
||||||
/* groups of curl_easy_getinfo infos that take the same type of argument */
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to char * argument */
|
|
||||||
#define _curl_is_string_info(info) \
|
|
||||||
(CURLINFO_STRING < (info) && (info) < CURLINFO_LONG)
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to long argument */
|
|
||||||
#define _curl_is_long_info(info) \
|
|
||||||
(CURLINFO_LONG < (info) && (info) < CURLINFO_DOUBLE)
|
|
||||||
|
|
||||||
/* evaluates to true if info expects a pointer to double argument */
|
|
||||||
#define _curl_is_double_info(info) \
|
|
||||||
(CURLINFO_DOUBLE < (info) && (info) < CURLINFO_SLIST)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_slist * argument */
|
|
||||||
#define _curl_is_slist_info(info) \
|
|
||||||
(((info) == CURLINFO_SSL_ENGINES) || ((info) == CURLINFO_COOKIELIST))
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_tlssessioninfo * argument */
|
|
||||||
#define _curl_is_tlssessioninfo_info(info) \
|
|
||||||
(((info) == CURLINFO_TLS_SSL_PTR) || ((info) == CURLINFO_TLS_SESSION))
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_certinfo * argument */
|
|
||||||
#define _curl_is_certinfo_info(info) ((info) == CURLINFO_CERTINFO)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to struct curl_socket_t argument */
|
|
||||||
#define _curl_is_socket_info(info) \
|
|
||||||
(CURLINFO_SOCKET < (info) && (info) < CURLINFO_OFF_T)
|
|
||||||
|
|
||||||
/* true if info expects a pointer to curl_off_t argument */
|
|
||||||
#define _curl_is_off_t_info(info) \
|
|
||||||
(CURLINFO_OFF_T < (info))
|
|
||||||
|
|
||||||
|
|
||||||
/* typecheck helpers -- check whether given expression has requested type*/
|
|
||||||
|
|
||||||
/* For pointers, you can use the _curl_is_ptr/_curl_is_arr macros,
|
|
||||||
* otherwise define a new macro. Search for __builtin_types_compatible_p
|
|
||||||
* in the GCC manual.
|
|
||||||
* NOTE: these macros MUST NOT EVALUATE their arguments! The argument is
|
|
||||||
* the actual expression passed to the curl_easy_setopt macro. This
|
|
||||||
* means that you can only apply the sizeof and __typeof__ operators, no
|
|
||||||
* == or whatsoever.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* XXX: should evaluate to true iff expr is a pointer */
|
|
||||||
#define _curl_is_any_ptr(expr) \
|
|
||||||
(sizeof(expr) == sizeof(void *))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is NULL */
|
|
||||||
/* XXX: must not evaluate expr, so this check is not accurate */
|
|
||||||
#define _curl_is_NULL(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), __typeof__(NULL)))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is type*, const type* or NULL */
|
|
||||||
#define _curl_is_ptr(expr, type) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), type *) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), const type *))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is one of type[], type*, NULL or const type* */
|
|
||||||
#define _curl_is_arr(expr, type) \
|
|
||||||
(_curl_is_ptr((expr), type) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), type []))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is a string */
|
|
||||||
#define _curl_is_string(expr) \
|
|
||||||
(_curl_is_arr((expr), char) || \
|
|
||||||
_curl_is_arr((expr), signed char) || \
|
|
||||||
_curl_is_arr((expr), unsigned char))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is a long (no matter the signedness)
|
|
||||||
* XXX: for now, int is also accepted (and therefore short and char, which
|
|
||||||
* are promoted to int when passed to a variadic function) */
|
|
||||||
#define _curl_is_long(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned long) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned int) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned short) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), signed char) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), unsigned char))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_off_t */
|
|
||||||
#define _curl_is_off_t(expr) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), curl_off_t))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is abuffer suitable for CURLOPT_ERRORBUFFER */
|
|
||||||
/* XXX: also check size of an char[] array? */
|
|
||||||
#define _curl_is_error_buffer(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char *) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(expr), char[]))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type (const) void* or (const) FILE* */
|
|
||||||
#if 0
|
|
||||||
#define _curl_is_cb_data(expr) \
|
|
||||||
(_curl_is_ptr((expr), void) || \
|
|
||||||
_curl_is_ptr((expr), FILE))
|
|
||||||
#else /* be less strict */
|
|
||||||
#define _curl_is_cb_data(expr) \
|
|
||||||
_curl_is_any_ptr(expr)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type FILE* */
|
|
||||||
#define _curl_is_FILE(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(expr), FILE *)))
|
|
||||||
|
|
||||||
/* evaluates to true if expr can be passed as POST data (void* or char*) */
|
|
||||||
#define _curl_is_postfields(expr) \
|
|
||||||
(_curl_is_ptr((expr), void) || \
|
|
||||||
_curl_is_arr((expr), char))
|
|
||||||
|
|
||||||
/* FIXME: the whole callback checking is messy...
|
|
||||||
* The idea is to tolerate char vs. void and const vs. not const
|
|
||||||
* pointers in arguments at least
|
|
||||||
*/
|
|
||||||
/* helper: __builtin_types_compatible_p distinguishes between functions and
|
|
||||||
* function pointers, hide it */
|
|
||||||
#define _curl_callback_compatible(func, type) \
|
|
||||||
(__builtin_types_compatible_p(__typeof__(func), type) || \
|
|
||||||
__builtin_types_compatible_p(__typeof__(func) *, type))
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_read_callback or "similar" */
|
|
||||||
#define _curl_is_read_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), __typeof__(fread) *) || \
|
|
||||||
_curl_callback_compatible((expr), curl_read_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_read_callback6))
|
|
||||||
typedef size_t (*_curl_read_callback1)(char *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_read_callback2)(char *, size_t, size_t, const void *);
|
|
||||||
typedef size_t (*_curl_read_callback3)(char *, size_t, size_t, FILE *);
|
|
||||||
typedef size_t (*_curl_read_callback4)(void *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_read_callback5)(void *, size_t, size_t, const void *);
|
|
||||||
typedef size_t (*_curl_read_callback6)(void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_write_callback or "similar" */
|
|
||||||
#define _curl_is_write_cb(expr) \
|
|
||||||
(_curl_is_read_cb(expr) || \
|
|
||||||
_curl_callback_compatible((expr), __typeof__(fwrite) *) || \
|
|
||||||
_curl_callback_compatible((expr), curl_write_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_write_callback6))
|
|
||||||
typedef size_t (*_curl_write_callback1)(const char *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_write_callback2)(const char *, size_t, size_t,
|
|
||||||
const void *);
|
|
||||||
typedef size_t (*_curl_write_callback3)(const char *, size_t, size_t, FILE *);
|
|
||||||
typedef size_t (*_curl_write_callback4)(const void *, size_t, size_t, void *);
|
|
||||||
typedef size_t (*_curl_write_callback5)(const void *, size_t, size_t,
|
|
||||||
const void *);
|
|
||||||
typedef size_t (*_curl_write_callback6)(const void *, size_t, size_t, FILE *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_ioctl_callback or "similar" */
|
|
||||||
#define _curl_is_ioctl_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_ioctl_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ioctl_callback4))
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback1)(CURL *, int, void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback2)(CURL *, int, const void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback3)(CURL *, curliocmd, void *);
|
|
||||||
typedef curlioerr (*_curl_ioctl_callback4)(CURL *, curliocmd, const void *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_sockopt_callback or "similar" */
|
|
||||||
#define _curl_is_sockopt_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_sockopt_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_sockopt_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_sockopt_callback2))
|
|
||||||
typedef int (*_curl_sockopt_callback1)(void *, curl_socket_t, curlsocktype);
|
|
||||||
typedef int (*_curl_sockopt_callback2)(const void *, curl_socket_t,
|
|
||||||
curlsocktype);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_opensocket_callback or
|
|
||||||
"similar" */
|
|
||||||
#define _curl_is_opensocket_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_opensocket_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_opensocket_callback4))
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback1)
|
|
||||||
(void *, curlsocktype, struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback2)
|
|
||||||
(void *, curlsocktype, const struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback3)
|
|
||||||
(const void *, curlsocktype, struct curl_sockaddr *);
|
|
||||||
typedef curl_socket_t (*_curl_opensocket_callback4)
|
|
||||||
(const void *, curlsocktype, const struct curl_sockaddr *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_progress_callback or "similar" */
|
|
||||||
#define _curl_is_progress_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_progress_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_progress_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_progress_callback2))
|
|
||||||
typedef int (*_curl_progress_callback1)(void *,
|
|
||||||
double, double, double, double);
|
|
||||||
typedef int (*_curl_progress_callback2)(const void *,
|
|
||||||
double, double, double, double);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_debug_callback or "similar" */
|
|
||||||
#define _curl_is_debug_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_debug_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback6) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback7) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_debug_callback8))
|
|
||||||
typedef int (*_curl_debug_callback1) (CURL *,
|
|
||||||
curl_infotype, char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback2) (CURL *,
|
|
||||||
curl_infotype, char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback3) (CURL *,
|
|
||||||
curl_infotype, const char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback4) (CURL *,
|
|
||||||
curl_infotype, const char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback5) (CURL *,
|
|
||||||
curl_infotype, unsigned char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback6) (CURL *,
|
|
||||||
curl_infotype, unsigned char *, size_t, const void *);
|
|
||||||
typedef int (*_curl_debug_callback7) (CURL *,
|
|
||||||
curl_infotype, const unsigned char *, size_t, void *);
|
|
||||||
typedef int (*_curl_debug_callback8) (CURL *,
|
|
||||||
curl_infotype, const unsigned char *, size_t, const void *);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_ssl_ctx_callback or "similar" */
|
|
||||||
/* this is getting even messier... */
|
|
||||||
#define _curl_is_ssl_ctx_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_ssl_ctx_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback4) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback5) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback6) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback7) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_ssl_ctx_callback8))
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback1)(CURL *, void *, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback2)(CURL *, void *, const void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback3)(CURL *, const void *, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback4)(CURL *, const void *,
|
|
||||||
const void *);
|
|
||||||
#ifdef HEADER_SSL_H
|
|
||||||
/* hack: if we included OpenSSL's ssl.h, we know about SSL_CTX
|
|
||||||
* this will of course break if we're included before OpenSSL headers...
|
|
||||||
*/
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback5)(CURL *, SSL_CTX, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback6)(CURL *, SSL_CTX, const void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback7)(CURL *, const SSL_CTX, void *);
|
|
||||||
typedef CURLcode (*_curl_ssl_ctx_callback8)(CURL *, const SSL_CTX,
|
|
||||||
const void *);
|
|
||||||
#else
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback5;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback6;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback7;
|
|
||||||
typedef _curl_ssl_ctx_callback1 _curl_ssl_ctx_callback8;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_conv_callback or "similar" */
|
|
||||||
#define _curl_is_conv_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_conv_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback2) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback3) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_conv_callback4))
|
|
||||||
typedef CURLcode (*_curl_conv_callback1)(char *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback2)(const char *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback3)(void *, size_t length);
|
|
||||||
typedef CURLcode (*_curl_conv_callback4)(const void *, size_t length);
|
|
||||||
|
|
||||||
/* evaluates to true if expr is of type curl_seek_callback or "similar" */
|
|
||||||
#define _curl_is_seek_cb(expr) \
|
|
||||||
(_curl_is_NULL(expr) || \
|
|
||||||
_curl_callback_compatible((expr), curl_seek_callback) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_seek_callback1) || \
|
|
||||||
_curl_callback_compatible((expr), _curl_seek_callback2))
|
|
||||||
typedef CURLcode (*_curl_seek_callback1)(void *, curl_off_t, int);
|
|
||||||
typedef CURLcode (*_curl_seek_callback2)(const void *, curl_off_t, int);
|
|
||||||
|
|
||||||
|
|
||||||
#endif /* __CURL_TYPECHECK_GCC_H */
|
|
Binary file not shown.
Binary file not shown.
@ -701,7 +701,7 @@
|
|||||||
<key>USE_HFS+_COMPRESSION</key>
|
<key>USE_HFS+_COMPRESSION</key>
|
||||||
<false/>
|
<false/>
|
||||||
<key>VERSION</key>
|
<key>VERSION</key>
|
||||||
<string>1.8.2</string>
|
<string>1.8.4</string>
|
||||||
</dict>
|
</dict>
|
||||||
<key>TYPE</key>
|
<key>TYPE</key>
|
||||||
<integer>0</integer>
|
<integer>0</integer>
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
|
||||||
<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="18.8" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
|
<DOCUMENT Type="Advanced Installer" CreateVersion="10.9" version="18.8.1" Modules="enterprise" RootPath="." Language="en" Id="{DC564647-6BF0-4550-87F4-89C938D0159C}">
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
|
||||||
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
|
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
|
||||||
<ROW Property="AI_CURRENT_YEAR" Value="2021" ValueLocId="-"/>
|
<ROW Property="AI_CURRENT_YEAR" Value="2021" ValueLocId="-"/>
|
||||||
@ -26,10 +26,10 @@
|
|||||||
<ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
|
<ROW Property="LIMITUI" MultiBuildValue="DefaultBuild:1"/>
|
||||||
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
|
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
|
||||||
<ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
|
<ROW Property="Manufacturer" Value="ZeroTier, Inc."/>
|
||||||
<ROW Property="ProductCode" Value="1033:{2B153F53-2BD3-42C7-9972-D57F94E3CB8D} " Type="16"/>
|
<ROW Property="ProductCode" Value="1033:{3F647F12-3A58-40B2-8DE4-15E8D8D19950} " Type="16"/>
|
||||||
<ROW Property="ProductLanguage" Value="1033"/>
|
<ROW Property="ProductLanguage" Value="1033"/>
|
||||||
<ROW Property="ProductName" Value="ZeroTier One"/>
|
<ROW Property="ProductName" Value="ZeroTier One"/>
|
||||||
<ROW Property="ProductVersion" Value="1.8.2" Type="32"/>
|
<ROW Property="ProductVersion" Value="1.8.4" Type="32"/>
|
||||||
<ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
|
<ROW Property="REBOOT" MultiBuildValue="DefaultBuild:ReallySuppress"/>
|
||||||
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
|
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
|
||||||
<ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
|
<ROW Property="UpgradeCode" Value="{B0E2A5F3-88B6-4E77-B922-CB4739B4C4C8}"/>
|
||||||
@ -55,6 +55,7 @@
|
|||||||
<ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~2|ProgramMenuFolder" IsPseudoRoot="1"/>
|
<ROW Directory="ProgramMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="PROGRA~2|ProgramMenuFolder" IsPseudoRoot="1"/>
|
||||||
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
|
<ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
|
||||||
<ROW Directory="ZeroTier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="ZeroTier"/>
|
<ROW Directory="ZeroTier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="ZeroTier"/>
|
||||||
|
<ROW Directory="i686_1_Dir" Directory_Parent="ProgramMenuFolder" DefaultDir=".:i686"/>
|
||||||
<ROW Directory="i686_Dir" Directory_Parent="APPDIR" DefaultDir=".:i686" DirectoryOptions="3"/>
|
<ROW Directory="i686_Dir" Directory_Parent="APPDIR" DefaultDir=".:i686" DirectoryOptions="3"/>
|
||||||
<ROW Directory="networks.d_Dir" Directory_Parent="One_Dir" DefaultDir="networks.d"/>
|
<ROW Directory="networks.d_Dir" Directory_Parent="One_Dir" DefaultDir="networks.d"/>
|
||||||
<ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier"/>
|
<ROW Directory="regid.201001.com.zerotier_Dir" Directory_Parent="CommonAppDataFolder" DefaultDir="REGID2~1.ZER|regid.2010-01.com.zerotier"/>
|
||||||
@ -64,13 +65,14 @@
|
|||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
|
||||||
<ROW Component="A918597FE054CCCB65ABDBA0AD8F63C" ComponentId="{458A5336-4527-4409-BB9D-D074790820A6}" Directory_="APPDIR" Attributes="4" KeyPath="A918597FE054CCCB65ABDBA0AD8F63C" Options="2"/>
|
<ROW Component="A918597FE054CCCB65ABDBA0AD8F63C" ComponentId="{458A5336-4527-4409-BB9D-D074790820A6}" Directory_="APPDIR" Attributes="4" KeyPath="A918597FE054CCCB65ABDBA0AD8F63C" Options="2"/>
|
||||||
<ROW Component="AI_CustomARPName" ComponentId="{C78C4531-4AD8-4862-AA18-D3275DD575A3}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
|
<ROW Component="AI_CustomARPName" ComponentId="{E6686BFD-BF8A-49F4-A9D6-2DB3918E98E9}" Directory_="APPDIR" Attributes="4" KeyPath="DisplayName" Options="1"/>
|
||||||
<ROW Component="AI_DisableModify" ComponentId="{46FFA8C5-A0CB-4E05-9AD3-911D543DE8CA}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
|
<ROW Component="AI_DisableModify" ComponentId="{46FFA8C5-A0CB-4E05-9AD3-911D543DE8CA}" Directory_="APPDIR" Attributes="4" KeyPath="NoModify" Options="1"/>
|
||||||
<ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
|
<ROW Component="AI_ExePath" ComponentId="{8E02B36C-7A19-429B-A93E-77A9261AC918}" Directory_="APPDIR" Attributes="4" KeyPath="AI_ExePath"/>
|
||||||
<ROW Component="APPDIR" ComponentId="{4DD7907D-D7FE-4CD6-B1A0-B5C1625F5133}" Directory_="APPDIR" Attributes="0"/>
|
<ROW Component="APPDIR" ComponentId="{4DD7907D-D7FE-4CD6-B1A0-B5C1625F5133}" Directory_="APPDIR" Attributes="0"/>
|
||||||
<ROW Component="C4FE6FD5B7C4D07B3A313E754A9A6A8" ComponentId="{7A501107-9EEE-45A6-9609-F5E1A7372448}" Directory_="APPDIR" Attributes="4" KeyPath="C4FE6FD5B7C4D07B3A313E754A9A6A8" Options="2"/>
|
<ROW Component="C4FE6FD5B7C4D07B3A313E754A9A6A8" ComponentId="{7A501107-9EEE-45A6-9609-F5E1A7372448}" Directory_="APPDIR" Attributes="4" KeyPath="C4FE6FD5B7C4D07B3A313E754A9A6A8" Options="2"/>
|
||||||
<ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
|
<ROW Component="ProductInformation" ComponentId="{DB078D04-EA8E-4A7C-9001-89BAD932F9D9}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
|
||||||
<ROW Component="RequiredApplication" ComponentId="{92E37C98-F8B3-4A85-AE77-3D8D9A223776}" Directory_="APPDIR" Attributes="4" Condition="VersionNT >= 1000" KeyPath="RequiredApplication" Options="2"/>
|
<ROW Component="RequiredApplication" ComponentId="{92E37C98-F8B3-4A85-AE77-3D8D9A223776}" Directory_="APPDIR" Attributes="4" Condition="VersionNT >= 1000" KeyPath="RequiredApplication" Options="2"/>
|
||||||
|
<ROW Component="i686" ComponentId="{6EC46014-3BFD-4017-ACBC-C4417D1D6361}" Directory_="i686_1_Dir" Attributes="0"/>
|
||||||
<ROW Component="networks.d" ComponentId="{EF54D0DF-889F-41DC-AF5C-4E7F96AB1C8B}" Directory_="networks.d_Dir" Attributes="0"/>
|
<ROW Component="networks.d" ComponentId="{EF54D0DF-889F-41DC-AF5C-4E7F96AB1C8B}" Directory_="networks.d_Dir" Attributes="0"/>
|
||||||
<ROW Component="regid.201001.com.zerotier" ComponentId="{A39C80FC-6A8F-454F-9052-10DAC3C3B139}" Directory_="regid.201001.com.zerotier_Dir" Attributes="0"/>
|
<ROW Component="regid.201001.com.zerotier" ComponentId="{A39C80FC-6A8F-454F-9052-10DAC3C3B139}" Directory_="regid.201001.com.zerotier_Dir" Attributes="0"/>
|
||||||
<ROW Component="zerotier_desktop_ui.exe" ComponentId="{61A7F53C-C6C3-418D-A652-2E4D9F8173AA}" Directory_="APPDIR" Attributes="256" Condition="ZTHEADLESS = "No" AND VersionNT64" KeyPath="zerotier_desktop_ui.exe"/>
|
<ROW Component="zerotier_desktop_ui.exe" ComponentId="{61A7F53C-C6C3-418D-A652-2E4D9F8173AA}" Directory_="APPDIR" Attributes="256" Condition="ZTHEADLESS = "No" AND VersionNT64" KeyPath="zerotier_desktop_ui.exe"/>
|
||||||
@ -255,6 +257,7 @@
|
|||||||
<ROW Directory_="networks.d_Dir" Component_="networks.d" ManualDelete="false"/>
|
<ROW Directory_="networks.d_Dir" Component_="networks.d" ManualDelete="false"/>
|
||||||
<ROW Directory_="regid.201001.com.zerotier_Dir" Component_="regid.201001.com.zerotier" ManualDelete="false"/>
|
<ROW Directory_="regid.201001.com.zerotier_Dir" Component_="regid.201001.com.zerotier" ManualDelete="false"/>
|
||||||
<ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
|
<ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
|
||||||
|
<ROW Directory_="i686_1_Dir" Component_="i686" ManualDelete="false"/>
|
||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
|
||||||
<ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
|
<ROW Action="AI_AppSearchEx" Type="1" Source="Prereq.dll" Target="DoAppSearchEx"/>
|
||||||
@ -349,6 +352,7 @@
|
|||||||
<ROW Feature_="C4FE6FD5B7C4D07B3A313E754A9A6A8" Component_="C4FE6FD5B7C4D07B3A313E754A9A6A8"/>
|
<ROW Feature_="C4FE6FD5B7C4D07B3A313E754A9A6A8" Component_="C4FE6FD5B7C4D07B3A313E754A9A6A8"/>
|
||||||
<ROW Feature_="RequiredApplication" Component_="RequiredApplication"/>
|
<ROW Feature_="RequiredApplication" Component_="RequiredApplication"/>
|
||||||
<ROW Feature_="ZeroTierOne" Component_="AI_ExePath"/>
|
<ROW Feature_="ZeroTierOne" Component_="AI_ExePath"/>
|
||||||
|
<ROW Feature_="ZeroTierOne" Component_="i686"/>
|
||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
|
||||||
<ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
|
<ROW Name="ZeroTierIcon.exe" SourcePath="..\..\..\artwork\ZeroTierIcon.ico" Index="0"/>
|
||||||
@ -465,7 +469,8 @@
|
|||||||
<ROW ServiceInstall="zerotierone_x86.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x86.exe" Description="Ethernet Virtualization Service"/>
|
<ROW ServiceInstall="zerotierone_x86.exe" Name="ZeroTierOneService" DisplayName="ZeroTier One" ServiceType="16" StartType="2" ErrorControl="32769" Component_="zerotierone_x86.exe" Description="Ethernet Virtualization Service"/>
|
||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
|
||||||
<ROW Shortcut="ZeroTier" Directory_="ProgramMenuFolder" Name="ZeroTier" Component_="zerotier_desktop_ui.exe" Target="[#zerotier_desktop_ui.exe]" Description="ZeroTier Tray Application" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
|
<ROW Shortcut="ZeroTier" Directory_="ProgramMenuFolder" Name="ZeroTier" Component_="zerotier_desktop_ui.exe" Target="[#zerotier_desktop_ui.exe]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="APPDIR"/>
|
||||||
|
<ROW Shortcut="ZeroTier_1" Directory_="i686_1_Dir" Name="ZeroTier" Component_="zerotier_desktop_ui.exe_1" Target="[#zerotier_desktop_ui.exe_1]" Hotkey="0" Icon_="ZeroTierIcon.exe" IconIndex="0" ShowCmd="1" WkDir="i686_Dir"/>
|
||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
|
||||||
<ATTRIBUTE name="UsedTheme" value="classic"/>
|
<ATTRIBUTE name="UsedTheme" value="classic"/>
|
||||||
@ -510,7 +515,7 @@
|
|||||||
<ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
|
<ROW XmlAttribute="xsischemaLocation" XmlElement="swidsoftware_identification_tag" Name="xsi:schemaLocation" Flags="14" Order="3" Value="http://standards.iso.org/iso/19770/-2/2008/schema.xsd software_identification_tag.xsd"/>
|
||||||
</COMPONENT>
|
</COMPONENT>
|
||||||
<COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
|
<COMPONENT cid="caphyon.advinst.msicomp.XmlElementComponent">
|
||||||
<ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="2" UpdateIndexInParent="0"/>
|
<ROW XmlElement="swidbuild" ParentElement="swidnumeric" Name="swid:build" Condition="1" Order="2" Flags="14" Text="4" UpdateIndexInParent="0"/>
|
||||||
<ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false" UpdateIndexInParent="0"/>
|
<ROW XmlElement="swidentitlement_required_indicator" ParentElement="swidsoftware_identification_tag" Name="swid:entitlement_required_indicator" Condition="1" Order="0" Flags="14" Text="false" UpdateIndexInParent="0"/>
|
||||||
<ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1" UpdateIndexInParent="0"/>
|
<ROW XmlElement="swidmajor" ParentElement="swidnumeric" Name="swid:major" Condition="1" Order="0" Flags="14" Text="1" UpdateIndexInParent="0"/>
|
||||||
<ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="8" UpdateIndexInParent="0"/>
|
<ROW XmlElement="swidminor" ParentElement="swidnumeric" Name="swid:minor" Condition="1" Order="1" Flags="14" Text="8" UpdateIndexInParent="0"/>
|
||||||
|
@ -24,69 +24,6 @@
|
|||||||
|
|
||||||
namespace ZeroTier {
|
namespace ZeroTier {
|
||||||
|
|
||||||
#if defined(__GNUC__) && (defined(__amd64) || defined(__amd64__) || defined(__x86_64) || defined(__x86_64__) || defined(__AMD64) || defined(__AMD64__) || defined(_M_X64))
|
|
||||||
|
|
||||||
// Inline ticket lock on x64 systems with GCC and CLANG (Mac, Linux) -- this is really fast as long as locking durations are very short
|
|
||||||
class Mutex
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Mutex() :
|
|
||||||
nextTicket(0),
|
|
||||||
nowServing(0)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void lock() const
|
|
||||||
{
|
|
||||||
const uint16_t myTicket = __sync_fetch_and_add(&(const_cast<Mutex *>(this)->nextTicket),1);
|
|
||||||
while (nowServing != myTicket) {
|
|
||||||
__asm__ __volatile__("rep;nop"::);
|
|
||||||
__asm__ __volatile__("":::"memory");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void unlock() const
|
|
||||||
{
|
|
||||||
++(const_cast<Mutex *>(this)->nowServing);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Uses C++ contexts and constructor/destructor to lock/unlock automatically
|
|
||||||
*/
|
|
||||||
class Lock
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
Lock(Mutex &m) :
|
|
||||||
_m(&m)
|
|
||||||
{
|
|
||||||
m.lock();
|
|
||||||
}
|
|
||||||
|
|
||||||
Lock(const Mutex &m) :
|
|
||||||
_m(const_cast<Mutex *>(&m))
|
|
||||||
{
|
|
||||||
_m->lock();
|
|
||||||
}
|
|
||||||
|
|
||||||
~Lock()
|
|
||||||
{
|
|
||||||
_m->unlock();
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
Mutex *const _m;
|
|
||||||
};
|
|
||||||
|
|
||||||
private:
|
|
||||||
Mutex(const Mutex &) {}
|
|
||||||
const Mutex &operator=(const Mutex &) { return *this; }
|
|
||||||
|
|
||||||
uint16_t nextTicket;
|
|
||||||
uint16_t nowServing;
|
|
||||||
};
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
// libpthread based mutex lock
|
// libpthread based mutex lock
|
||||||
class Mutex
|
class Mutex
|
||||||
{
|
{
|
||||||
@ -142,11 +79,9 @@ private:
|
|||||||
pthread_mutex_t _mh;
|
pthread_mutex_t _mh;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
} // namespace ZeroTier
|
} // namespace ZeroTier
|
||||||
|
|
||||||
#endif // Apple / Linux
|
#endif
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
|
|
||||||
|
@ -368,7 +368,7 @@ class Binder {
|
|||||||
else {
|
else {
|
||||||
interfacesEnumerated = false;
|
interfacesEnumerated = false;
|
||||||
}
|
}
|
||||||
#if defined(__unix__) && !defined(__LINUX__)
|
#if (defined(__unix__) || defined(__APPLE__)) && !defined(__LINUX__)
|
||||||
close(infoSock);
|
close(infoSock);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -330,7 +330,7 @@ MacKextEthernetTap::MacKextEthernetTap(
|
|||||||
Mutex::Lock _gl(globalTapCreateLock);
|
Mutex::Lock _gl(globalTapCreateLock);
|
||||||
|
|
||||||
if (::stat("/dev/zt0",&stattmp)) {
|
if (::stat("/dev/zt0",&stattmp)) {
|
||||||
long kextpid = (long)vfork();
|
long kextpid = (long)fork();
|
||||||
if (kextpid == 0) {
|
if (kextpid == 0) {
|
||||||
::chdir(homePath);
|
::chdir(homePath);
|
||||||
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
||||||
@ -405,7 +405,7 @@ MacKextEthernetTap::MacKextEthernetTap(
|
|||||||
OSUtils::ztsnprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
|
OSUtils::ztsnprintf(ethaddr,sizeof(ethaddr),"%.2x:%.2x:%.2x:%.2x:%.2x:%.2x",(int)mac[0],(int)mac[1],(int)mac[2],(int)mac[3],(int)mac[4],(int)mac[5]);
|
||||||
OSUtils::ztsnprintf(mtustr,sizeof(mtustr),"%u",_mtu);
|
OSUtils::ztsnprintf(mtustr,sizeof(mtustr),"%u",_mtu);
|
||||||
OSUtils::ztsnprintf(metstr,sizeof(metstr),"%u",_metric);
|
OSUtils::ztsnprintf(metstr,sizeof(metstr),"%u",_metric);
|
||||||
long cpid = (long)vfork();
|
long cpid = (long)fork();
|
||||||
if (cpid == 0) {
|
if (cpid == 0) {
|
||||||
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),"lladdr",ethaddr,"mtu",mtustr,"metric",metstr,"up",(const char *)0);
|
||||||
::_exit(-1);
|
::_exit(-1);
|
||||||
@ -459,7 +459,7 @@ MacKextEthernetTap::~MacKextEthernetTap()
|
|||||||
|
|
||||||
char tmp[16384];
|
char tmp[16384];
|
||||||
sprintf(tmp,"%s/%s",_homePath.c_str(),"tap.kext");
|
sprintf(tmp,"%s/%s",_homePath.c_str(),"tap.kext");
|
||||||
long kextpid = (long)vfork();
|
long kextpid = (long)fork();
|
||||||
if (kextpid == 0) {
|
if (kextpid == 0) {
|
||||||
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
OSUtils::redirectUnixOutputs("/dev/null",(const char *)0);
|
||||||
::execl("/sbin/kextunload","/sbin/kextunload",tmp,(const char *)0);
|
::execl("/sbin/kextunload","/sbin/kextunload",tmp,(const char *)0);
|
||||||
@ -488,7 +488,7 @@ bool MacKextEthernetTap::addIp(const InetAddress &ip)
|
|||||||
if (!ip)
|
if (!ip)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
long cpid = (long)vfork();
|
long cpid = (long)fork();
|
||||||
if (cpid == 0) {
|
if (cpid == 0) {
|
||||||
char tmp[128];
|
char tmp[128];
|
||||||
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),(ip.ss_family == AF_INET6) ? "inet6" : "inet",ip.toString(tmp),"alias",(const char *)0);
|
::execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),(ip.ss_family == AF_INET6) ? "inet6" : "inet",ip.toString(tmp),"alias",(const char *)0);
|
||||||
@ -509,7 +509,7 @@ bool MacKextEthernetTap::removeIp(const InetAddress &ip)
|
|||||||
std::vector<InetAddress> allIps(ips());
|
std::vector<InetAddress> allIps(ips());
|
||||||
for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
|
for(std::vector<InetAddress>::iterator i(allIps.begin());i!=allIps.end();++i) {
|
||||||
if (*i == ip) {
|
if (*i == ip) {
|
||||||
long cpid = (long)vfork();
|
long cpid = (long)fork();
|
||||||
if (cpid == 0) {
|
if (cpid == 0) {
|
||||||
char tmp[128];
|
char tmp[128];
|
||||||
execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),(ip.ss_family == AF_INET6) ? "inet6" : "inet",ip.toIpString(tmp),"-alias",(const char *)0);
|
execl("/sbin/ifconfig","/sbin/ifconfig",_dev.c_str(),(ip.ss_family == AF_INET6) ? "inet6" : "inet",ip.toIpString(tmp),"-alias",(const char *)0);
|
||||||
@ -626,7 +626,7 @@ void MacKextEthernetTap::setMtu(unsigned int mtu)
|
|||||||
{
|
{
|
||||||
if (mtu != _mtu) {
|
if (mtu != _mtu) {
|
||||||
_mtu = mtu;
|
_mtu = mtu;
|
||||||
long cpid = (long)vfork();
|
long cpid = (long)fork();
|
||||||
if (cpid == 0) {
|
if (cpid == 0) {
|
||||||
char tmp[64];
|
char tmp[64];
|
||||||
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%u",mtu);
|
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%u",mtu);
|
||||||
|
@ -405,7 +405,9 @@ ManagedRoute::ManagedRoute(const InetAddress &target,const InetAddress &via,cons
|
|||||||
}
|
}
|
||||||
|
|
||||||
ManagedRoute::~ManagedRoute()
|
ManagedRoute::~ManagedRoute()
|
||||||
{}
|
{
|
||||||
|
this->remove();
|
||||||
|
}
|
||||||
|
|
||||||
/* Linux NOTE: for default route override, some Linux distributions will
|
/* Linux NOTE: for default route override, some Linux distributions will
|
||||||
* require a change to the rp_filter parameter. A value of '1' will prevent
|
* require a change to the rp_filter parameter. A value of '1' will prevent
|
||||||
|
@ -1,14 +1,27 @@
|
|||||||
name: zerotier
|
name: zerotier
|
||||||
summary: ZeroTier is a software-based managed Ethernet switch for planet Earth.
|
summary: Securely connect any device, anywhere.
|
||||||
description: |
|
description: |
|
||||||
It erases the LAN/WAN distinction and makes VPNs, tunnels, proxies, and other kludges arising from the inflexible nature of physical networks obsolete. Everything is encrypted end-to-end and traffic takes the most direct (peer to peer) path available.
|
|
||||||
This snap contains ZeroTier One, a service that provides ZeroTier network connectivity and makes joining virtual networks as easy as joining IRC or Slack channels.
|
ZeroTier is a software-based managed Ethernet switch for planet Earth. Use it to connect your
|
||||||
Visit ZeroTier's site for more information and pre-built binary packages. Apps for Android and iOS are available for free in the Google Play and Apple app stores.
|
desktop clients, servers, phones, NAS, or even individual applications (using our SDK).
|
||||||
|
|
||||||
|
This snap contains ZeroTier One, a service that provides ZeroTier network connectivity and
|
||||||
|
makes joining virtual networks as easy as joining IRC or Slack channels. Apps for Android
|
||||||
|
and iOS are available for free in the Google Play and Apple app stores.
|
||||||
|
|
||||||
|
ZeroTier eliminates the LAN/WAN distinction and makes VPNs, tunnels, proxies, and other kludges
|
||||||
|
arising from the inflexible nature of physical networks obsolete. Everything is encrypted
|
||||||
|
end-to-end and traffic takes the most direct (peer to peer) path available.
|
||||||
|
|
||||||
Install
|
Install
|
||||||
|
|
||||||
sudo snap install zerotier
|
sudo snap install zerotier
|
||||||
|
|
||||||
Join your network
|
Join your network
|
||||||
sudo zerotier.cli join 8056c2e21c000001
|
|
||||||
sudo zerotier.cli status
|
sudo zerotier join <nwid>
|
||||||
|
sudo zerotier status
|
||||||
|
|
||||||
Approve your new node in ZeroTier Central (https://my.zerotier.com)! Welcome online!
|
Approve your new node in ZeroTier Central (https://my.zerotier.com)! Welcome online!
|
||||||
|
|
||||||
adopt-info: one
|
adopt-info: one
|
||||||
@ -28,11 +41,18 @@ apps:
|
|||||||
- network-bind
|
- network-bind
|
||||||
- network-control
|
- network-control
|
||||||
|
|
||||||
|
# For backwards compatibility with old package (e.g. zerotier.cli)
|
||||||
|
# Should be removed someday
|
||||||
cli:
|
cli:
|
||||||
command: usr/sbin/zerotier-cli
|
command: usr/sbin/zerotier-cli
|
||||||
plugs:
|
plugs:
|
||||||
- network
|
- network
|
||||||
|
|
||||||
|
zerotier:
|
||||||
|
command: usr/sbin/zerotier-cli
|
||||||
|
plugs:
|
||||||
|
- network
|
||||||
|
|
||||||
idtool:
|
idtool:
|
||||||
command: usr/sbin/zerotier-idtool
|
command: usr/sbin/zerotier-idtool
|
||||||
plugs:
|
plugs:
|
||||||
@ -46,7 +66,6 @@ parts:
|
|||||||
one:
|
one:
|
||||||
plugin: make
|
plugin: make
|
||||||
source: .
|
source: .
|
||||||
source-type: git
|
|
||||||
build-packages:
|
build-packages:
|
||||||
- build-essential
|
- build-essential
|
||||||
- libc++-dev
|
- libc++-dev
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
/**
|
/**
|
||||||
* Revision
|
* Revision
|
||||||
*/
|
*/
|
||||||
#define ZEROTIER_ONE_VERSION_REVISION 2
|
#define ZEROTIER_ONE_VERSION_REVISION 4
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Build version
|
* Build version
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
Name: zerotier-one
|
Name: zerotier-one
|
||||||
Version: 1.8.2
|
Version: 1.8.4
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: ZeroTier network virtualization service
|
Summary: ZeroTier network virtualization service
|
||||||
|
|
||||||
@ -152,6 +152,12 @@ esac
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Nov 23 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.4
|
||||||
|
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||||
|
|
||||||
|
* Mon Nov 15 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.3
|
||||||
|
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||||
|
|
||||||
* Mon Nov 08 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.2
|
* Mon Nov 08 2021 Adam Ierymenko <adam.ierymenko@zerotier.com> - 1.8.2
|
||||||
- see https://github.com/zerotier/ZeroTierOne for release notes
|
- see https://github.com/zerotier/ZeroTierOne for release notes
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user