sr-dev June 2017

sr-dev@lists.kamailio.org

28 participants
390 discussions

git:master:e7c03ce6: tls: dynamic locks not needed for openssl v1.1.0+
by Daniel-Constantin Mierla 28 Jun '17

28 Jun '17

Module: kamailio Branch: master Commit: e7c03ce6ce61119fbf5cb9f41b7abcd4c7138d58 URL: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-28T10:26:43+02:00 tls: dynamic locks not needed for openssl v1.1.0+ - openssl v1.1.0 is thread safe - fixes the compile warnings for libssl 1.1.0 --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… Patch: https://github.com/kamailio/kamailio/commit/e7c03ce6ce61119fbf5cb9f41b7abcd… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 9d8e8acec5..38c028fd2f 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -32,6 +32,9 @@ static int n_static_locks=0; static gen_lock_set_t* static_locks=0; +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L + /* "dynamic" locks */ struct CRYPTO_dynlock_value{ @@ -61,7 +64,6 @@ static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) } - static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, const char* file, int line) { @@ -116,6 +118,7 @@ static void locking_f(int mode, int n, const char* file, int line) } } +#endif /* openssl < 0x10100000L (1.1.0) */ void tls_destroy_locks() @@ -163,10 +166,14 @@ int tls_init_locks() } CRYPTO_set_locking_callback(locking_f); } + +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); +#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process

1 0

git:master:551413f0: kazoo: add json.count transformation
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 551413f0952429c3a360b5ccdeaeac48ea15ff8a URL: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:01:37+01:00 kazoo: add json.count transformation --- Modified: src/modules/kazoo/kz_json.c Modified: src/modules/kazoo/kz_json.h Modified: src/modules/kazoo/kz_trans.c Modified: src/modules/kazoo/kz_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4… Patch: https://github.com/kamailio/kamailio/commit/551413f0952429c3a360b5ccdeaeac4…

1 0

git:master:d5c60245: kazoo: add $kzRK to accdess routing key of the payload
by lazedo 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: d5c602454a9af6ebce852f44dc88c4efa4bf036f URL: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-06-27T23:00:43+01:00 kazoo: add $kzRK to accdess routing key of the payload --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e… Patch: https://github.com/kamailio/kamailio/commit/d5c602454a9af6ebce852f44dc88c4e…

1 0

[kamailio/kamailio] dispatcher: runtime status access from script (#1166)
by lazedo 27 Jun '17

27 Jun '17

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1166 -- Commit Summary -- * dispatcher: runtime status access from script -- File Changes -- M src/modules/dispatcher/dispatch.c (94) M src/modules/dispatcher/dispatch.h (4) M src/modules/dispatcher/dispatcher.c (139) M src/modules/dispatcher/doc/dispatcher_admin.xml (98) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1166.patch https://github.com/kamailio/kamailio/pull/1166.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/1166

2 5

git:master:a1d64dea: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: a1d64dea035c1b54c285c4d2d16add414db46795 URL: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:46:21+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README --- Diff: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… Patch: https://github.com/kamailio/kamailio/commit/a1d64dea035c1b54c285c4d2d16add4… --- diff --git a/src/modules/path/README b/src/modules/path/README index d3e88f878e..d2e3d69398 100644 --- a/src/modules/path/README +++ b/src/modules/path/README @@ -49,7 +49,7 @@ Richard Fuchs 1.1. Add Supported header 1.2. Set use_received parameter 1.3. Set received_format parameter - 1.4. Set use_received parameter + 1.4. Set enable_r2 parameter 1.5. add_path usage 1.6. add_path(user) usage 1.7. add_path(user, parameters) usage @@ -208,9 +208,9 @@ modparam("path", "received_format", 1) Default value is 0. - Example 1.4. Set use_received parameter + Example 1.4. Set enable_r2 parameter ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... 4. Functions

1 0

git:master:43f91aa7: path: fixed the name of the parameter in enable_r2 example
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 43f91aa76fd293eb08442a710baa8cb63146e067 URL: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:43:38+02:00 path: fixed the name of the parameter in enable_r2 example --- Modified: src/modules/path/doc/path_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… Patch: https://github.com/kamailio/kamailio/commit/43f91aa76fd293eb08442a710baa8cb… --- diff --git a/src/modules/path/doc/path_admin.xml b/src/modules/path/doc/path_admin.xml index 4712a09716..a623e55d95 100644 --- a/src/modules/path/doc/path_admin.xml +++ b/src/modules/path/doc/path_admin.xml @@ -192,10 +192,10 @@ modparam("path", "received_format", 1) </emphasis> </para> <example> - <title>Set <varname>use_received</varname> parameter</title> + <title>Set <varname>enable_r2</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("path", "use_received", 1) +modparam("path", "enable_r2", 1) ... </programlisting> </example>

1 0

git:master:7fc44593: modules: readme files regenerated - path ... [skip ci]
by Kamailio Dev 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 7fc44593b6e2f7b554de7aa2acc9037b6da045e6 URL: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-06-27T16:31:28+02:00 modules: readme files regenerated - path ... [skip ci] --- Modified: src/modules/path/README Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037… Patch: https://github.com/kamailio/kamailio/commit/7fc44593b6e2f7b554de7aa2acc9037…

1 0

git:master:e1df9208: pv: new variables - $RAu and $RAut
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: e1df92080a631b8c97c110d1e87f74fa1cd5ec9e URL: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:15:43+02:00 pv: new variables - $RAu and $RAut - $RAu - URI format for local socket where the SIP message was received, without trasport parameter for UDP, using the advertised address if available - $RAut - URI format for local socket where the SIP message was received, always with transport parameter, using the advertised address if available --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_core.c Modified: src/modules/pv/pv_core.h --- Diff: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… Patch: https://github.com/kamailio/kamailio/commit/e1df92080a631b8c97c110d1e87f74f… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4e4eddfecf..c85d2015eb 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -387,6 +387,12 @@ static pv_export_t mod_pvs[] = { {{"RAp", (sizeof("RAp")-1)}, /* */ PVT_OTHER, pv_get_rcv_advertised_port, 0, 0, 0, 0, 0}, + {{"RAu", (sizeof("RAu")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri, 0, + 0, 0, 0, 0}, + {{"RAut", (sizeof("RAut")-1)}, /* */ + PVT_OTHER, pv_get_rcvadv_uri_full, 0, + 0, 0, 0, 0}, {{"sf", (sizeof("sf")-1)}, /* */ PVT_OTHER, pv_get_sflags, pv_set_sflags, 0, 0, 0, 0}, diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index b49de912d7..34b03a411f 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -760,7 +760,7 @@ int pv_get_rcvaddr_uri_helper(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; - if(get_rcv_socket_uri(msg, tmode, &uri)<0) + if(get_rcv_socket_uri(msg, tmode, &uri, 0)<0) return pv_get_null(msg, param, res); if (uri.len + 1 >= pv_get_buffer_size()) @@ -820,6 +820,62 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, return pv_get_rcvport(msg, param, res); } +int pv_get_rcvadv_uri_helper(struct sip_msg *msg, pv_param_t *param, + int tmode, pv_value_t *res) +{ + str uri; + str sr; + + if(msg==NULL) + return -1; + + if(get_rcv_socket_uri(msg, tmode, &uri, 1)<0) + return pv_get_null(msg, param, res); + + if (uri.len + 1 >= pv_get_buffer_size()) + { + LM_ERR("local buffer size exceeded\n"); + return pv_get_null(msg, param, res); + } + + sr.s = pv_get_buffer(); + strncpy(sr.s, uri.s, uri.len); + sr.len = uri.len; + sr.s[sr.len] = '\0'; + + return pv_get_strval(msg, param, res, &sr); +} + +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 0, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 0, res); +} + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + if(msg==NULL) + return -1; + + if(msg->rcv.bind_address!=NULL + && (msg->rcv.bind_address->useinfo.address_str.len > 0 + || msg->rcv.bind_address->useinfo.port_no_str.len > 0)) { + return pv_get_rcvadv_uri_helper(msg, param, 1, res); + } + + return pv_get_rcvaddr_uri_helper(msg, param, 1, res); +} + /** * */ diff --git a/src/modules/pv/pv_core.h b/src/modules/pv/pv_core.h index 81c86f02a8..ac36ef315a 100644 --- a/src/modules/pv/pv_core.h +++ b/src/modules/pv/pv_core.h @@ -157,6 +157,12 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_rcvadv_uri(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + +int pv_get_rcvadv_uri_full(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_force_sock(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:aa9129b7: core: parser - get_rcv_socket_uri() with option to use advertised address
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: aa9129b71bb009176571a8cb5bde7221b2f92b75 URL: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:14:52+02:00 core: parser - get_rcv_socket_uri() with option to use advertised address --- Modified: src/core/parser/msg_parser.c Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… Patch: https://github.com/kamailio/kamailio/commit/aa9129b71bb009176571a8cb5bde722… --- diff --git a/src/core/parser/msg_parser.c b/src/core/parser/msg_parser.c index 84a7ba6ff5..be137652de 100644 --- a/src/core/parser/msg_parser.c +++ b/src/core/parser/msg_parser.c @@ -1105,8 +1105,9 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri) /** * get received-on-socket ip, port and protocol in SIP URI format * - tmode - 0: short format (transport=udp is not added, being default) + * - atype - 0: listen address; 1: advertised address */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype) { static char buf[MAX_URI_SIZE]; char* p; @@ -1139,11 +1140,21 @@ int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri) } } - ip.s = m->rcv.bind_address->address_str.s; - ip.len = m->rcv.bind_address->address_str.len; + if(atype==0 || m->rcv.bind_address->useinfo.address_str.len<=0) { + ip.s = m->rcv.bind_address->address_str.s; + ip.len = m->rcv.bind_address->address_str.len; + } else { + ip.s = m->rcv.bind_address->useinfo.address_str.s; + ip.len = m->rcv.bind_address->useinfo.address_str.len; + } - port.s = m->rcv.bind_address->port_no_str.s; - port.len = m->rcv.bind_address->port_no_str.len; + if(atype==0|| m->rcv.bind_address->useinfo.port_no_str.len <= 0) { + port.s = m->rcv.bind_address->port_no_str.s; + port.len = m->rcv.bind_address->port_no_str.len; + } else { + port.s = m->rcv.bind_address->useinfo.port_no_str.s; + port.len = m->rcv.bind_address->useinfo.port_no_str.len; + } len = 4 + ip.len + 2*(m->rcv.src_ip.af==AF_INET6)+ 1 + port.len; if (proto.s) { diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index dd5f498a12..41e6deeb33 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -501,6 +501,6 @@ int get_src_uri(sip_msg_t *m, int tmode, str *uri); /** * get received-on-socket ip, port and protocol in SIP URI format */ -int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri); +int get_rcv_socket_uri(sip_msg_t *m, int tmode, str *uri, int atype); #endif

1 0

git:master:55b5b354: pv: $RAp returns also the int value for advertised port when available
by Daniel-Constantin Mierla 27 Jun '17

27 Jun '17

Module: kamailio Branch: master Commit: 55b5b35430ccb7de904f6b1c48ff71e691344b9e URL: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-06-27T16:00:08+02:00 pv: $RAp returns also the int value for advertised port when available --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… Patch: https://github.com/kamailio/kamailio/commit/55b5b35430ccb7de904f6b1c48ff71e… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 8e0074fca4..b49de912d7 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -797,7 +797,8 @@ int pv_get_rcv_advertised_ip(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.address_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.address_str); + return pv_get_strval(msg, param, res, + &msg->rcv.bind_address->useinfo.address_str); } return pv_get_rcvip(msg, param, res); @@ -811,7 +812,9 @@ int pv_get_rcv_advertised_port(struct sip_msg *msg, pv_param_t *param, if(msg->rcv.bind_address!=NULL && msg->rcv.bind_address->useinfo.port_no_str.len > 0) { - return pv_get_strval(msg, param, res, &msg->rcv.bind_address->useinfo.port_no_str); + return pv_get_intstrval(msg, param, res, + (int)msg->rcv.bind_address->useinfo.port_no, + &msg->rcv.bind_address->useinfo.port_no_str); } return pv_get_rcvport(msg, param, res);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
39
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2017