diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/rexmpp_http_upload.c | 1 | ||||
| -rw-r--r-- | src/rexmpp_openpgp.c | 1 | ||||
| -rw-r--r-- | src/rexmpp_tls.c | 11 | ||||
| -rw-r--r-- | src/rexmpp_tls.h | 5 |
4 files changed, 16 insertions, 2 deletions
diff --git a/src/rexmpp_http_upload.c b/src/rexmpp_http_upload.c index 5d13f97..18a3302 100644 --- a/src/rexmpp_http_upload.c +++ b/src/rexmpp_http_upload.c @@ -66,6 +66,7 @@ void rexmpp_http_upload_slot_cb (rexmpp_t *s, curl_easy_setopt(ce, CURLOPT_UPLOAD, 1); curl_easy_setopt(ce, CURLOPT_READDATA, task->fh); curl_easy_setopt(ce, CURLOPT_URL, put_url); + curl_easy_setopt(ce, CURLOPT_INFILESIZE, task->fsize); rexmpp_xml_t *header = rexmpp_xml_first_elem_child(put); while (header) { diff --git a/src/rexmpp_openpgp.c b/src/rexmpp_openpgp.c index 14e2d35..72fd38b 100644 --- a/src/rexmpp_openpgp.c +++ b/src/rexmpp_openpgp.c @@ -48,6 +48,7 @@ Possible future improvements: #include <gpgme.h> #endif #include <gcrypt.h> +#include <errno.h> #include "rexmpp.h" #include "rexmpp_xml.h" diff --git a/src/rexmpp_tls.c b/src/rexmpp_tls.c index 2a7c903..29bbc96 100644 --- a/src/rexmpp_tls.c +++ b/src/rexmpp_tls.c @@ -28,11 +28,13 @@ #include "rexmpp_digest.h" #include "rexmpp_tls.h" +#ifdef ENABLE_CALLS rexmpp_tls_t *rexmpp_jingle_component_dtls(void *p); ssize_t rexmpp_jingle_dtls_push_func (void *p, const void *data, size_t size); int rexmpp_jingle_dtls_pull_timeout_func (void *p, unsigned int ms); +#endif #if defined(USE_OPENSSL) rexmpp_tls_err_t rexmpp_process_openssl_ret (rexmpp_t *s, @@ -66,7 +68,6 @@ rexmpp_tls_t *rexmpp_tls_ctx_new (rexmpp_t *s, int dtls) { return NULL; } #if defined(USE_GNUTLS) - (void)dtls; int err; tls_ctx->tls_session_data = NULL; tls_ctx->tls_session_data_size = 0; @@ -175,6 +176,7 @@ void rexmpp_tls_deinit (rexmpp_t *s) { } } +#ifdef ENABLE_CALLS #if defined(USE_GNUTLS) ssize_t rexmpp_dtls_jingle_pull_func_gnutls (gnutls_transport_ptr_t p, @@ -228,6 +230,7 @@ long rexmpp_dtls_openssl_bio_cb(BIO *b, int oper, const char *argp, return ret; } #endif +#endif #if defined(USE_OPENSSL) int rexmpp_openssl_verify_accept_all (int preverify_ok, @@ -239,6 +242,7 @@ int rexmpp_openssl_verify_accept_all (int preverify_ok, } #endif +#ifdef ENABLE_CALLS rexmpp_tls_err_t rexmpp_dtls_connect (rexmpp_t *s, rexmpp_tls_t *tls_ctx, @@ -327,6 +331,7 @@ void rexmpp_dtls_feed(rexmpp_t *s, rexmpp_tls_t *tls_ctx, uint8_t *buf, size_t l (void)len; #endif } +#endif rexmpp_tls_err_t rexmpp_tls_handshake (rexmpp_t *s, rexmpp_tls_t *tls_ctx) { #if defined(USE_GNUTLS) @@ -535,6 +540,7 @@ rexmpp_tls_disconnect (rexmpp_t *s, rexmpp_tls_t *tls_ctx) { #endif } +#ifdef ENABLE_CALLS int rexmpp_tls_srtp_get_keys (rexmpp_t *s, rexmpp_tls_t *tls_ctx, @@ -574,6 +580,7 @@ rexmpp_tls_srtp_get_keys (rexmpp_t *s, return -1; #endif } +#endif rexmpp_tls_err_t rexmpp_tls_send (rexmpp_t *s, @@ -651,6 +658,7 @@ rexmpp_tls_recv (rexmpp_t *s, #endif } +#ifdef ENABLE_CALLS unsigned int rexmpp_dtls_timeout (rexmpp_t *s, rexmpp_tls_t *tls_ctx) { (void)s; #if defined(USE_GNUTLS) @@ -660,6 +668,7 @@ unsigned int rexmpp_dtls_timeout (rexmpp_t *s, rexmpp_tls_t *tls_ctx) { return -1; #endif } +#endif int rexmpp_tls_fds (rexmpp_t *s, fd_set *read_fds, fd_set *write_fds) { #if defined(USE_GNUTLS) diff --git a/src/rexmpp_tls.h b/src/rexmpp_tls.h index 4a966ca..ff4bca6 100644 --- a/src/rexmpp_tls.h +++ b/src/rexmpp_tls.h @@ -80,6 +80,7 @@ void rexmpp_tls_session_free (rexmpp_tls_t *tls_ctx); rexmpp_tls_err_t rexmpp_tls_connect (rexmpp_t *s); rexmpp_tls_err_t rexmpp_tls_handshake (rexmpp_t *s, rexmpp_tls_t *tls_ctx); rexmpp_tls_err_t rexmpp_tls_disconnect (rexmpp_t *s, rexmpp_tls_t *tls_ctx); +#ifdef ENABLE_CALLS rexmpp_tls_err_t rexmpp_dtls_connect (rexmpp_t *s, rexmpp_tls_t *tls_ctx, @@ -93,6 +94,7 @@ rexmpp_tls_srtp_get_keys (rexmpp_t *s, size_t key_len, size_t salt_len, unsigned char *key_mat); +#endif rexmpp_tls_err_t rexmpp_tls_send (rexmpp_t *s, @@ -106,8 +108,9 @@ rexmpp_tls_recv (rexmpp_t *s, void *data, size_t data_size, ssize_t *received); - +#ifdef ENABLE_CALLS unsigned int rexmpp_dtls_timeout (rexmpp_t *s, rexmpp_tls_t *tls_ctx); +#endif int rexmpp_tls_fds(rexmpp_t *s, fd_set *read_fds, fd_set *write_fds); /** |