sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

[kamailio/kamailio] Fix redis pipeline (#1102)

by Paul Claudiu Boriga

Hello, I have found some bugs with the original commit that adds redis_pipe_cmd. If a command to the server fails, this may leave the redisContext in an invalid state, and this means that a reconnect to the server needs to be performed. The problem is that when reconnecting, a new context is created, and all the contents of old redisContext is lost, including the hiredis output buffer (obuf) which stored the piped commands. This means that all the commands are lost, and when a second retry is made this contains no commands and may fail, leaving the redisContext in an invalid state. This can in some cases break the REDIS pipelining feature, and cause all commands sent using redis_pipe_cmd()/redis_execute() to fail from that point onwards. The solution is to make sure that the connection is active when adding commands to the hiredis output buffer. For this, commands are stored in a separate buffer, and are only added to the redisContext when actually sending the command (when calling redis_execute). This way it is possible to see if any errors exist by checking the err member of the redisContext structure before appending the commands, and also commands are not lost since they are stored separately and if reconnecting the new commands can be appended to the output buffer of the new redisContext. Commands are stored in buffers using the sds format hiredis offers (by calling redisFormatCommand function offered by hiredis). This way they can be directly appended to the output buffer using redisAppendFormattedCommand. There is a problem on older hiredis versions (older than 0.12) because redisAppendFormattedCommand was not exported to the library API, so for older hiredis version the buffers are appended in our code. We tested the code using hiredis library version 0.10.1 and 0.12.1 and there is no problem with this approach. In the second commit we fixed a memory leak when re-using reply ids in the same pipeline command sequence occurs. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1102 -- Commit Summary -- * ndb_redis: fix connection problems with pipelining * ndb_redis: fix memory leak -- File Changes -- M src/modules/ndb_redis/redis_client.c (118) M src/modules/ndb_redis/redis_client.h (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1102.patch https://github.com/kamailio/kamailio/pull/1102.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/1102

7 years, 7 months

git:5.0:3bd91a27: tls: add a level of libressl compatibility

by Timo TerÃ¤s

Module: kamailio Branch: 5.0 Commit: 3bd91a27ddd731d2e741dfc5d34bcaf432afbbc7 URL: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T13:01:54+03:00 tls: add a level of libressl compatibility libressl is the openbsd openssl fork that is getting more popular. It defines OPENSSL_VERSION_NUMBER 0x20000000L and introduces a new LIBRESSL_VERSION_NUMBER that reflects the true libressl version. As openssl made major changes between 1.0.1 and 1.1.0, and libressl being closer to 1.0.1 series, it needs to be specifically detected in certain cases. This commit updates the compat logic to implement missing api functions as inline function where sensible needed in order to minimize the #ifdef clutter and make the code more readable and less prone to bugs. (cherry picked from commit 0a87b5a9b0af5e3a277e462d41a8ffc3ca3f246e) --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… Patch: https://github.com/kamailio/kamailio/commit/3bd91a27ddd731d2e741dfc5d34bcaf… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index ea4f6ec..567ed6f 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -63,7 +63,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s); static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2); -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) static BIO_METHOD tls_mbuf_method = { BIO_TYPE_TLS_MBUF, /* type */ "sr_tls_mbuf", /* name */ @@ -76,6 +76,27 @@ static BIO_METHOD tls_mbuf_method = { tls_bio_mbuf_free, /* destroy(free) function */ 0 /* ctrl callback */ }; + +static void *CRYPTO_zalloc(size_t num, const char *file, int line) +{ + void *ret = CRYPTO_malloc(num, file, line); + if (ret != NULL) + memset(ret, 0, num); + return ret; +} +# define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) +static void *BIO_get_data(BIO *b) +{ + return b->ptr; +} +static void BIO_set_data(BIO *b, void *ptr) +{ + b->ptr = ptr; +} +static void BIO_set_init(BIO *b, int init) +{ + b->init = init; +} #else static BIO_METHOD *tls_mbuf_method = NULL; #endif @@ -84,7 +105,7 @@ static BIO_METHOD *tls_mbuf_method = NULL; /** returns a custom tls_mbuf BIO. */ BIO_METHOD* tls_BIO_mbuf(void) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) return &tls_mbuf_method; #else if(tls_mbuf_method != NULL) { @@ -137,22 +158,14 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif if (unlikely(d == 0)){ BUG("null BIO ptr data\n"); return 0; } d->rd = rd; d->wr = wr; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 1; -#else BIO_set_init(b, 1); -#endif return 1; } @@ -167,25 +180,12 @@ static int tls_bio_mbuf_new(BIO* b) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 0; /* not initialized yet */ - b->num = 0; - b->ptr = 0; - b->flags = 0; - d = OPENSSL_malloc(sizeof(*d)); - if (unlikely(d == 0)) - return 0; - d->rd = 0; - d->wr = 0; - b->ptr = d; -#else BIO_set_init(b, 0); BIO_set_data(b, NULL); d = OPENSSL_zalloc(sizeof(*d)); if (unlikely(d == 0)) return 0; BIO_set_data(b, d); -#endif return 1; } @@ -200,13 +200,6 @@ static int tls_bio_mbuf_free(BIO* b) TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (likely(b->ptr)){ - OPENSSL_free(b->ptr); - b->ptr = 0; - b->init = 0; - } -#else do { struct tls_bio_mbuf_data* d; d = BIO_get_data(b); @@ -216,7 +209,6 @@ static int tls_bio_mbuf_free(BIO* b) BIO_set_init(b, 0); } } while(0); -#endif return 1; } @@ -235,11 +227,7 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) ret = 0; if (likely(dst)) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) @@ -291,11 +279,7 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) int ret; ret = 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fafaf70..2849e15 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -124,7 +124,7 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) /* libssl >= v1.1.0 */ DH_set0_pqg(dh, p, NULL, g); #else

7 years, 7 months

git:5.0:51f214f1: Add and fix #includes for more strict POSIX compliance

by Timo TerÃ¤s

Module: kamailio Branch: 5.0 Commit: 51f214f1c2a0b0e566ba367e5b1ac2557a05e8bd URL: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T13:01:47+03:00 Add and fix #includes for more strict POSIX compliance - sys/poll.h is non-standard, posix defines poll.h - sys/time.h is needed in addition to time.h for e.g. struct timeval Notable this fixes some build errors against musl libc (cherry picked from commit 4d485707f7e53e798466dc6ae2166eddbe874b95) --- Modified: src/core/tsend.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/tls/tls_server.c Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… Patch: https://github.com/kamailio/kamailio/commit/51f214f1c2a0b0e566ba367e5b1ac25… --- diff --git a/src/core/tsend.c b/src/core/tsend.c index 97463fc..60c70af 100644 --- a/src/core/tsend.c +++ b/src/core/tsend.c @@ -27,7 +27,7 @@ #include <string.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/modules/ldap/ld_session.h b/src/modules/ldap/ld_session.h index 08a752c..0591f79 100644 --- a/src/modules/ldap/ld_session.h +++ b/src/modules/ldap/ld_session.h @@ -28,6 +28,7 @@ #ifndef LD_SESSION_H #define LD_SESSION_H +#include <sys/time.h> #include <ldap.h> #include "iniparser.h" diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 05581d5..b9c720f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -25,7 +25,7 @@ #include <string.h>/*strcmp,memset*/ #include <errno.h>/*errno*/ #include <unistd.h>/*close(),read(),pipe,fork,pid_t*/ -#include <sys/poll.h>/*poll*/ +#include <poll.h>/*poll*/ #include <signal.h>/*signal*/ #include <time.h>/*time*/ #include <string.h>/*memcmp*/ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index da04f08..5b713ec 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -26,7 +26,7 @@ */ -#include <sys/poll.h> +#include <poll.h> #include <openssl/err.h> #include <openssl/ssl.h> #include "../../core/dprint.h" diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 56124ca..08fb3b2 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -41,6 +41,7 @@ #include <netdb.h> /* gethostbyname */ #include <fcntl.h> #include <time.h> /* time */ +#include <sys/time.h> #ifdef USE_READLINE #include <readline/readline.h>

7 years, 7 months

git:master:4f839fbf: utils: exported functions to kemi framework

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4f839fbf3793cd605dc9d185e18467a708092c02 URL: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T11:20:17+02:00 utils: exported functions to kemi framework --- Modified: src/modules/utils/utils.c --- Diff: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… Patch: https://github.com/kamailio/kamailio/commit/4f839fbf3793cd605dc9d185e18467a… --- diff --git a/src/modules/utils/utils.c b/src/modules/utils/utils.c index d5aed32..026eb23 100644 --- a/src/modules/utils/utils.c +++ b/src/modules/utils/utils.c @@ -44,6 +44,7 @@ #include "../../core/resolve.h" #include "../../core/locking.h" #include "../../core/script_cb.h" +#include "../../core/kemi.h" #include "../../core/mem/shm_mem.h" #include "../../lib/srdb1/db.h" @@ -322,6 +323,29 @@ int utils_forward(struct sip_msg *msg, int id, int proto) return ret; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_utils_exports[] = { + { str_init("utils"), str_init("xcap_auth_status"), + SR_KEMIP_INT, ki_xcap_auth_status, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } +}; +/* clang-format on */ + +/** + * + */ +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + sr_kemi_modules_add(sr_kemi_utils_exports); + return 0; +} #ifdef MI_REMOVED /* FIFO functions */

7 years, 7 months

git:master:f352a0e0: utils: use spve fixup - more flexibility in allowing strings and variables

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f352a0e0b785e42100ba967b385911a266e84bfc URL: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T11:16:26+02:00 utils: use spve fixup - more flexibility in allowing strings and variables --- Modified: src/modules/utils/utils.c Modified: src/modules/utils/xcap_auth.c Modified: src/modules/utils/xcap_auth.h --- Diff: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a… Patch: https://github.com/kamailio/kamailio/commit/f352a0e0b785e42100ba967b385911a…

7 years, 7 months

git:master:ad3ce52d: xmlrpc: exported functions to kemi interface

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: ad3ce52d25185c021d01a91100690ec7efa36d7e URL: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T10:55:50+02:00 xmlrpc: exported functions to kemi interface --- Modified: src/modules/xmlrpc/xmlrpc.c --- Diff: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec… Patch: https://github.com/kamailio/kamailio/commit/ad3ce52d25185c021d01a91100690ec…

7 years, 7 months

git:master:08f8e0bc: db_cluster: free allocated structure at init time

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 08f8e0bc72b9f16f76b78110c9c95b1ba7f1ce25 URL: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T09:37:16+02:00 db_cluster: free allocated structure at init time - avoid reopening driver db connections if already set --- Modified: src/modules/db_cluster/dbcl_api.c Modified: src/modules/db_cluster/dbcl_data.c --- Diff: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… Patch: https://github.com/kamailio/kamailio/commit/08f8e0bc72b9f16f76b78110c9c95b1… --- diff --git a/src/modules/db_cluster/dbcl_api.c b/src/modules/db_cluster/dbcl_api.c index 1f24cc5..6ef6ec4 100644 --- a/src/modules/db_cluster/dbcl_api.c +++ b/src/modules/db_cluster/dbcl_api.c @@ -311,10 +311,12 @@ void db_cluster_close(db1_con_t* _h) LM_DBG("executing db cluster close command\n"); cls = (dbcl_cls_t*)_h->tail; cls->ref--; - if(cls->ref > 0) - return; - /* close connections */ - dbcl_close_connections(cls); + if(cls->ref <= 0) { + /* close connections */ + dbcl_close_connections(cls); + } + /* free _h - allocated for each db_cluster_init() */ + pkg_free(_h); return; } diff --git a/src/modules/db_cluster/dbcl_data.c b/src/modules/db_cluster/dbcl_data.c index 534030c..47f9444 100644 --- a/src/modules/db_cluster/dbcl_data.c +++ b/src/modules/db_cluster/dbcl_data.c @@ -442,7 +442,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) { for(j=0; j<cls->rlist[i].clen; j++) { - if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0) + if(cls->rlist[i].clist[j] != NULL && cls->rlist[i].clist[j]->flags!=0 + && cls->rlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up read connection [%.*s]\n", cls->rlist[i].clist[j]->name.len, @@ -459,7 +460,8 @@ int dbcl_init_connections(dbcl_cls_t *cls) } for(j=0; j<cls->wlist[i].clen; j++) { - if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0) + if(cls->wlist[i].clist[j] != NULL && cls->wlist[i].clist[j]->flags!=0 + && cls->wlist[i].clist[j]->dbh==NULL) { LM_DBG("setting up write connection [%.*s]\n", cls->wlist[i].clist[j]->name.len,

7 years, 7 months

git:master:0a87b5a9: tls: add a level of libressl compatibility

by Timo TerÃ¤s

Module: kamailio Branch: master Commit: 0a87b5a9b0af5e3a277e462d41a8ffc3ca3f246e URL: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T10:18:32+03:00 tls: add a level of libressl compatibility libressl is the openbsd openssl fork that is getting more popular. It defines OPENSSL_VERSION_NUMBER 0x20000000L and introduces a new LIBRESSL_VERSION_NUMBER that reflects the true libressl version. As openssl made major changes between 1.0.1 and 1.1.0, and libressl being closer to 1.0.1 series, it needs to be specifically detected in certain cases. This commit updates the compat logic to implement missing api functions as inline function where sensible needed in order to minimize the #ifdef clutter and make the code more readable and less prone to bugs. --- Modified: src/modules/tls/tls_bio.c Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… Patch: https://github.com/kamailio/kamailio/commit/0a87b5a9b0af5e3a277e462d41a8ffc… --- diff --git a/src/modules/tls/tls_bio.c b/src/modules/tls/tls_bio.c index ea4f6ec..567ed6f 100644 --- a/src/modules/tls/tls_bio.c +++ b/src/modules/tls/tls_bio.c @@ -63,7 +63,7 @@ static int tls_bio_mbuf_puts(BIO* b, const char* s); static long tls_bio_mbuf_ctrl(BIO* b, int cmd, long arg1, void* arg2); -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) static BIO_METHOD tls_mbuf_method = { BIO_TYPE_TLS_MBUF, /* type */ "sr_tls_mbuf", /* name */ @@ -76,6 +76,27 @@ static BIO_METHOD tls_mbuf_method = { tls_bio_mbuf_free, /* destroy(free) function */ 0 /* ctrl callback */ }; + +static void *CRYPTO_zalloc(size_t num, const char *file, int line) +{ + void *ret = CRYPTO_malloc(num, file, line); + if (ret != NULL) + memset(ret, 0, num); + return ret; +} +# define OPENSSL_zalloc(num) CRYPTO_zalloc(num, __FILE__, __LINE__) +static void *BIO_get_data(BIO *b) +{ + return b->ptr; +} +static void BIO_set_data(BIO *b, void *ptr) +{ + b->ptr = ptr; +} +static void BIO_set_init(BIO *b, int init) +{ + b->init = init; +} #else static BIO_METHOD *tls_mbuf_method = NULL; #endif @@ -84,7 +105,7 @@ static BIO_METHOD *tls_mbuf_method = NULL; /** returns a custom tls_mbuf BIO. */ BIO_METHOD* tls_BIO_mbuf(void) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) return &tls_mbuf_method; #else if(tls_mbuf_method != NULL) { @@ -137,22 +158,14 @@ int tls_BIO_mbuf_set(BIO* b, struct tls_mbuf* rd, struct tls_mbuf* wr) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_BIO_mbuf_set called (%p => %p, %p)\n", b, rd, wr); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif if (unlikely(d == 0)){ BUG("null BIO ptr data\n"); return 0; } d->rd = rd; d->wr = wr; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 1; -#else BIO_set_init(b, 1); -#endif return 1; } @@ -167,25 +180,12 @@ static int tls_bio_mbuf_new(BIO* b) struct tls_bio_mbuf_data* d; TLS_BIO_DBG("tls_bio_mbuf_new called (%p)\n", b); -#if OPENSSL_VERSION_NUMBER < 0x010100000L - b->init = 0; /* not initialized yet */ - b->num = 0; - b->ptr = 0; - b->flags = 0; - d = OPENSSL_malloc(sizeof(*d)); - if (unlikely(d == 0)) - return 0; - d->rd = 0; - d->wr = 0; - b->ptr = d; -#else BIO_set_init(b, 0); BIO_set_data(b, NULL); d = OPENSSL_zalloc(sizeof(*d)); if (unlikely(d == 0)) return 0; BIO_set_data(b, d); -#endif return 1; } @@ -200,13 +200,6 @@ static int tls_bio_mbuf_free(BIO* b) TLS_BIO_DBG("tls_bio_mbuf_free called (%p)\n", b); if (unlikely( b == 0)) return 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (likely(b->ptr)){ - OPENSSL_free(b->ptr); - b->ptr = 0; - b->init = 0; - } -#else do { struct tls_bio_mbuf_data* d; d = BIO_get_data(b); @@ -216,7 +209,6 @@ static int tls_bio_mbuf_free(BIO* b) BIO_set_init(b, 0); } } while(0); -#endif return 1; } @@ -235,11 +227,7 @@ static int tls_bio_mbuf_read(BIO* b, char* dst, int dst_len) ret = 0; if (likely(dst)) { -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->rd->buf == 0)) { if (d == 0) @@ -291,11 +279,7 @@ static int tls_bio_mbuf_write(BIO* b, const char* src, int src_len) int ret; ret = 0; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - d = b->ptr; -#else d = BIO_get_data(b); -#endif BIO_clear_retry_flags(b); if (unlikely(d == 0 || d->wr->buf == 0)) { if (d == 0) diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fafaf70..2849e15 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -124,7 +124,7 @@ static void setup_dh(SSL_CTX *ctx) return; } -#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) +#if (OPENSSL_VERSION_NUMBER >= 0x1010000fL) && !defined(LIBRESSL_VERSION_NUMBER) /* libssl >= v1.1.0 */ DH_set0_pqg(dh, p, NULL, g); #else

7 years, 7 months

git:master:1051a1bb: htable: close db connection in some error cases for rpc command

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1051a1bbc70cf84d6ebd7aa76a9b1ebd2e17e710 URL: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-28T09:10:04+02:00 htable: close db connection in some error cases for rpc command --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… Patch: https://github.com/kamailio/kamailio/commit/1051a1bbc70cf84d6ebd7aa76a9b1eb… --- diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index 18a3ab8..f4c4e96 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -1064,12 +1064,14 @@ static void htable_rpc_reload(rpc_t* rpc, void* c) if (rpc->scan(c, "S", &htname) < 1) { + ht_db_close_con(); rpc->fault(c, 500, "No htable name given"); return; } ht = ht_get_table(&htname); if(ht==NULL) { + ht_db_close_con(); rpc->fault(c, 500, "No such htable"); return; }

7 years, 7 months

git:master:4d485707: Add and fix #includes for more strict POSIX compliance

by Timo TerÃ¤s

Module: kamailio Branch: master Commit: 4d485707f7e53e798466dc6ae2166eddbe874b95 URL: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… Author: Timo TerÃ¤s <timo.teras(a)iki.fi> Committer: Timo TerÃ¤s <timo.teras(a)iki.fi> Date: 2017-04-28T10:02:40+03:00 Add and fix #includes for more strict POSIX compliance - sys/poll.h is non-standard, posix defines poll.h - sys/time.h is needed in addition to time.h for e.g. struct timeval Notable this fixes some build errors against musl libc --- Modified: src/core/tsend.c Modified: src/modules/ldap/ld_session.h Modified: src/modules/seas/event_dispatcher.c Modified: src/modules/tls/tls_server.c Modified: utils/kamcmd/kamcmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… Patch: https://github.com/kamailio/kamailio/commit/4d485707f7e53e798466dc6ae2166ed… --- diff --git a/src/core/tsend.c b/src/core/tsend.c index 97463fc..60c70af 100644 --- a/src/core/tsend.c +++ b/src/core/tsend.c @@ -27,7 +27,7 @@ #include <string.h> #include <errno.h> -#include <sys/poll.h> +#include <poll.h> #include <sys/types.h> #include <sys/socket.h> diff --git a/src/modules/ldap/ld_session.h b/src/modules/ldap/ld_session.h index 08a752c..0591f79 100644 --- a/src/modules/ldap/ld_session.h +++ b/src/modules/ldap/ld_session.h @@ -28,6 +28,7 @@ #ifndef LD_SESSION_H #define LD_SESSION_H +#include <sys/time.h> #include <ldap.h> #include "iniparser.h" diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index 05581d5..b9c720f 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -25,7 +25,7 @@ #include <string.h>/*strcmp,memset*/ #include <errno.h>/*errno*/ #include <unistd.h>/*close(),read(),pipe,fork,pid_t*/ -#include <sys/poll.h>/*poll*/ +#include <poll.h>/*poll*/ #include <signal.h>/*signal*/ #include <time.h>/*time*/ #include <string.h>/*memcmp*/ diff --git a/src/modules/tls/tls_server.c b/src/modules/tls/tls_server.c index da04f08..5b713ec 100644 --- a/src/modules/tls/tls_server.c +++ b/src/modules/tls/tls_server.c @@ -26,7 +26,7 @@ */ -#include <sys/poll.h> +#include <poll.h> #include <openssl/err.h> #include <openssl/ssl.h> #include "../../core/dprint.h" diff --git a/utils/kamcmd/kamcmd.c b/utils/kamcmd/kamcmd.c index 56124ca..08fb3b2 100644 --- a/utils/kamcmd/kamcmd.c +++ b/utils/kamcmd/kamcmd.c @@ -41,6 +41,7 @@ #include <netdb.h> /* gethostbyname */ #include <fcntl.h> #include <time.h> /* time */ +#include <sys/time.h> #ifdef USE_READLINE #include <readline/readline.h>

7 years, 7 months

← Newer
1
...
6
7
8
9
10
11
12
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017