sr-dev June 2016

sr-dev@lists.kamailio.org

37 participants
345 discussions

git:master:730b4b0c: sca: add section ids
by Victor Seva 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: 730b4b0ca839bbcf248c3f7ddfee6974c1fa0c84 URL: https://github.com/kamailio/kamailio/commit/730b4b0ca839bbcf248c3f7ddfee697… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-27T13:12:34+02:00 sca: add section ids --- Modified: modules/sca/doc/sca_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/730b4b0ca839bbcf248c3f7ddfee697… Patch: https://github.com/kamailio/kamailio/commit/730b4b0ca839bbcf248c3f7ddfee697…

1 0

git:master:6e9061bc: sca: fix indent doc files
by Victor Seva 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: 6e9061bc101591d8ce8a9c7b7cbf696574d7545d URL: https://github.com/kamailio/kamailio/commit/6e9061bc101591d8ce8a9c7b7cbf696… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-06-27T13:12:34+02:00 sca: fix indent doc files --- Modified: modules/sca/doc/sca_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e9061bc101591d8ce8a9c7b7cbf696… Patch: https://github.com/kamailio/kamailio/commit/6e9061bc101591d8ce8a9c7b7cbf696… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index bbfe7ac..bfd7e02 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -167,7 +167,7 @@ modparam( "sca", "call_info_max_expires", 1800 ) <example> <title>Set <varname>line_seize_max_expires</varname>:</title> <programlisting format="linespecific"> -... +... modparam( "sca", "line_seize_max_expires", 30 ) ... </programlisting> @@ -196,7 +196,7 @@ modparam( "sca", "line_seize_max_expires", 30 ) <example> <title>Set <varname>purge_expired_interval</varname>:</title> <programlisting format="linespecific"> -... +... modparam( "sca", "purge_expired_interval", 60 ) ... </programlisting> @@ -235,7 +235,7 @@ modparam( "sca", "db_url", "&defaultdb;" ) <example> <title>Set <varname>subs_table</varname> parameter:</title> <programlisting format="linespecific"> -... +... modparam( "sca", "subs_table", "call_info_subscriptions" ) ... </programlisting> @@ -246,7 +246,7 @@ modparam( "sca", "subs_table", "call_info_subscriptions" ) <title><varname>db_update_interval</varname> (integer)</title> <para> Period in seconds between writes of call-info subscriber - information to the database. + information to the database. </para> <para> <emphasis> @@ -350,7 +350,7 @@ if ( is_method( "SUBSCRIBE" )) { <emphasis>1 - successful</emphasis> </para> </listitem> - + <listitem> <para> <emphasis>-1 - failed, error logged</emphasis> @@ -361,7 +361,7 @@ if ( is_method( "SUBSCRIBE" )) { <example> <title><function>sca_call_info_update</function> usage:</title> <programlisting format="linespecific"> -... +... route { ... @@ -389,7 +389,7 @@ failure_route[FAILURE_ROUTE] sca_call_info_update(); ... } -... +... </programlisting> </example> </section> @@ -496,7 +496,7 @@ failure_route[FAILURE_ROUTE] </listitem> <listitem> <para> - <emphasis>Appearance State</emphasis> + <emphasis>Appearance State</emphasis> (seized, ringing, progressing, active, held, held-private) </para> </listitem>

1 0

[kamailio/kamailio] log_custom module doesn't redirect all log messages (#680)
by logslie 27 Jun '16

27 Jun '16

Hi, I'm using log_custom module and I have it configured with **log_stderror=no** and **log_engine_type="udp"**. As far as I understand this module should send all log messages using udp, right? For instance: ``` request_route { log_udp("R-URI is $ru\n"); xlog("L_INFO", "This is a test message\n"); ... } ``` The UDP listener should receive: ``` R-URI is sip:test201@10.22.22.201:5060 This is a test message ``` But in my case the UDP listener only receives: ``` R-URI is sip:test201@10.22.22.201:5060 ``` This is, the messages sent using the method exported by the module (i.e **log_udp**). Am I doing something wrong? Thanks, Laura --- 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/issues/680

2 6

git:master:5fd2c91f: userblacklist: removed errorneous extra checks in fixup parameters function
by Daniel-Constantin Mierla 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: 5fd2c91f512b7311f11c76023da45758fb8c4365 URL: https://github.com/kamailio/kamailio/commit/5fd2c91f512b7311f11c76023da4575… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-27T13:04:50+02:00 userblacklist: removed errorneous extra checks in fixup parameters function - parsing the parameters should be enough for validity - no need to attempt to parse to integer first parameter, it's not expected and results in a crash for static string parameters - reported by Jan Hazenberg --- Modified: modules/userblacklist/userblacklist.c --- Diff: https://github.com/kamailio/kamailio/commit/5fd2c91f512b7311f11c76023da4575… Patch: https://github.com/kamailio/kamailio/commit/5fd2c91f512b7311f11c76023da4575… --- diff --git a/modules/userblacklist/userblacklist.c b/modules/userblacklist/userblacklist.c index 17aebc2..421f71f 100644 --- a/modules/userblacklist/userblacklist.c +++ b/modules/userblacklist/userblacklist.c @@ -208,22 +208,6 @@ static int check_user_blacklist_fixup(void** param, int param_no) return E_UNSPEC; } - if(model->spec==NULL || model->spec->getf==NULL) { - if(param_no == 1) { - if(str2int(&s, (unsigned int*)&model->spec->pvp.pvn.u.isname.name.n) != 0) { - LM_ERR("wrong value [%.*s] for parameter %d\n", s.len, s.s, param_no); - return E_UNSPEC; - } - } else { - if(param_no == 2 || param_no == 3) { - LM_ERR("wrong value [%.*s] for parameter %d\n", s.len, s.s, param_no); - return E_UNSPEC; - } else { - // only a string - return 0; - } - } - } *param = (void*)model; } else { LM_ERR("wrong number of parameters\n");

1 0

git:master:21321c70: auth_identity: include openssl/x509_vfy.h
by Daniel-Constantin Mierla 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: 21321c70358997f354326be048b22c7b2dfb045a URL: https://github.com/kamailio/kamailio/commit/21321c70358997f354326be048b22c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-27T11:54:08+02:00 auth_identity: include openssl/x509_vfy.h - looks like being required by openssl 1.1.0 to get the definition of X509_STORE_CTX - reported by Victor Seva, GH #685 --- Modified: modules/auth_identity/auth_crypt.c --- Diff: https://github.com/kamailio/kamailio/commit/21321c70358997f354326be048b22c7… Patch: https://github.com/kamailio/kamailio/commit/21321c70358997f354326be048b22c7… --- diff --git a/modules/auth_identity/auth_crypt.c b/modules/auth_identity/auth_crypt.c index 18abb4c..2aa6a0a 100644 --- a/modules/auth_identity/auth_crypt.c +++ b/modules/auth_identity/auth_crypt.c @@ -35,6 +35,7 @@ #include <openssl/sha.h> #include <openssl/x509.h> #include <openssl/x509v3.h> +#include <openssl/x509_vfy.h> #include "../../mem/mem.h" #include "../../parser/parse_uri.h"

1 0

git:master:be677c2f: http_client: removed unnecessary cloning of proxy parameter
by Daniel-Constantin Mierla 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: be677c2f8930f967277438b7b661baeacd7a5a53 URL: https://github.com/kamailio/kamailio/commit/be677c2f8930f967277438b7b661bae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-27T11:35:34+02:00 http_client: removed unnecessary cloning of proxy parameter - the value is already zero terminated and this way avoid memory leak - wrap returning code to cfg in order to avoid 0 values --- Modified: modules/http_client/functions.c Modified: modules/http_client/http_client.c --- Diff: https://github.com/kamailio/kamailio/commit/be677c2f8930f967277438b7b661bae… Patch: https://github.com/kamailio/kamailio/commit/be677c2f8930f967277438b7b661bae… --- diff --git a/modules/http_client/functions.c b/modules/http_client/functions.c index 332f625..258508d 100644 --- a/modules/http_client/functions.c +++ b/modules/http_client/functions.c @@ -554,7 +554,8 @@ int curl_con_query_url_f(struct sip_msg* _m, const str *connection, const str* u } /* Wrapper */ -int curl_con_query_url(struct sip_msg* _m, const str *connection, const str* url, str* result, const char *contenttype, const str* post) +int curl_con_query_url(struct sip_msg* _m, const str *connection, + const str* url, str* result, const char *contenttype, const str* post) { return curl_con_query_url_f(_m, connection, url, result, contenttype, post, 0); } @@ -586,8 +587,12 @@ int http_query(struct sip_msg* _m, char* _url, str* _dst, char* _post) query_params.http_follow_redirect = default_http_follow_redirect; query_params.oneline = 1; query_params.maxdatasize = 0; - query_params.http_proxy = as_asciiz(&default_http_proxy); - query_params.http_proxy_port = default_http_proxy_port; + if(default_http_proxy.s!=NULL && default_http_proxy.len>0) { + query_params.http_proxy = default_http_proxy.s; + if(default_http_proxy_port>0) { + query_params.http_proxy_port = default_http_proxy_port; + } + } res = curL_query_url(_m, _url, _dst, &query_params); diff --git a/modules/http_client/http_client.c b/modules/http_client/http_client.c index 8c2cab9..5e8fc24 100644 --- a/modules/http_client/http_client.c +++ b/modules/http_client/http_client.c @@ -530,7 +530,7 @@ static int w_curl_connect(struct sip_msg* _m, char* _con, char * _url, char* _re if (result.s != NULL) pkg_free(result.s); - return ret; + return (ret==0)?-1:ret; } /* @@ -573,7 +573,7 @@ static int w_curl_connect_post(struct sip_msg* _m, char* _con, char * _url, char if (result.s != NULL) pkg_free(result.s); - return ret; + return (ret==0)?-1:ret; } @@ -615,7 +615,7 @@ static int fixup_free_http_query_post(void** param, int param_no) if (param_no == 3) { return fixup_free_pvar_null(param, 1); } - + LM_ERR("invalid parameter number <%d>\n", param_no); return -1; } @@ -644,7 +644,7 @@ static int w_http_query(struct sip_msg* _m, char* _url, char* _result) { if (result.s != NULL) pkg_free(result.s); - return ret; + return (ret==0)?-1:ret; } @@ -676,7 +676,7 @@ static int w_http_query_post(struct sip_msg* _m, char* _url, char* _post, char* if (result.s != NULL) pkg_free(result.s); - return ret; + return (ret==0)?-1:ret; } /*! @@ -688,7 +688,6 @@ static int pv_parse_curlerror(pv_spec_p sp, str *in) if(sp==NULL || in==NULL || in->len<=0) return -1; - cerr = atoi(in->s); LM_DBG(" =====> CURL ERROR %d \n", cerr); sp->pvp.pvn.u.isname.name.n = cerr;

1 0

git:master:afb5bb99: utils: safe wrapper in case http status code is returned 0
by Daniel-Constantin Mierla 27 Jun '16

27 Jun '16

Module: kamailio Branch: master Commit: afb5bb99960d951217c6c94465cda92b10394e1a URL: https://github.com/kamailio/kamailio/commit/afb5bb99960d951217c6c94465cda92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-06-27T11:35:34+02:00 utils: safe wrapper in case http status code is returned 0 - returning it will stop config processing, replace the return code with -1 in such case --- Modified: modules/utils/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/afb5bb99960d951217c6c94465cda92… Patch: https://github.com/kamailio/kamailio/commit/afb5bb99960d951217c6c94465cda92… --- diff --git a/modules/utils/functions.c b/modules/utils/functions.c index 5de92ad..58f23cb 100644 --- a/modules/utils/functions.c +++ b/modules/utils/functions.c @@ -228,5 +228,5 @@ int http_query(struct sip_msg* _m, char* _url, char* _dst, char* _post, char* _h curl_easy_cleanup(curl); pkg_free(stream.buf); - return stat; + return (stat!=0)?stat:-1; }

1 0

[kamailio/kamailio] ims_registrar_scscf: Remove buggy AVP from SAR (#659)
by Federico Favaro 24 Jun '16

24 Jun '16

Remove buggy function to add "Call-ID" AVP which actually doesn't exists on SAR Diameter Message According to TS129.229, it actually exists "Call-ID-Sip-Header" AVP witch code 643 which is grouped into "Subscription-Info" AVP. According to the same TS, this AVP is used for restoration procedure. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/659 -- Commit Summary -- * ims_registrar_scscf: Remove buggy AVP from SAR -- File Changes -- M modules/ims_registrar_scscf/cxdx_avp.c (11) M modules/ims_registrar_scscf/cxdx_avp.h (1) M modules/ims_registrar_scscf/cxdx_sar.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/659.patch https://github.com/kamailio/kamailio/pull/659.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/659

4 13

[kamailio/kamailio] Fix i pv6 on rx (#677)
by Federico Favaro 24 Jun '16

24 Jun '16

Adds the support to IPv6 IP CAN on Rx interface towards PCRF You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/677 -- Commit Summary -- * ims_qos: Dynamically find IP ver in AF_SIGNALLING * ims_qos: Fix length of IPv6 prefix -- File Changes -- M modules/ims_qos/mod.c (29) M modules/ims_qos/rx_avp.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/677.patch https://github.com/kamailio/kamailio/pull/677.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/677

2 3

git:master:ed3bfa32: modules/ims_registrar_scscf: make modparam for using not-std call-id avp
by jaybeepee 24 Jun '16

24 Jun '16

Module: kamailio Branch: master Commit: ed3bfa32de50a6bca49eab23f7ad271001225654 URL: https://github.com/kamailio/kamailio/commit/ed3bfa32de50a6bca49eab23f7ad271… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-06-24T16:22:34+02:00 modules/ims_registrar_scscf: make modparam for using not-std call-id avp - avp called 'send_vs_callid_avp' - TODO: use std method for sending call-id as per TS129.229 - this has been done in such a way as to maintain backwards compatibility - will eventually be deprecated --- Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_registrar_scscf/reg_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ed3bfa32de50a6bca49eab23f7ad271… Patch: https://github.com/kamailio/kamailio/commit/ed3bfa32de50a6bca49eab23f7ad271… --- diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index 2e0b25b..7677558 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -67,6 +67,7 @@ #include "pvt_message.h" extern struct cdp_binds cdpb; +extern unsigned int send_vs_callid_avp; int create_return_code(int result) { int rc; @@ -345,7 +346,8 @@ int cxdx_send_sar(struct sip_msg *msg, str public_identity, str private_identity } if (!sar) goto error1; - if (!cxdx_add_call_id(sar, cscf_get_call_id(msg, &hdr))) goto error1; + if (send_vs_callid_avp) + if (!cxdx_add_call_id(sar, cscf_get_call_id(msg, &hdr))) goto error1; if (!cxdx_add_destination_realm(sar, cxdx_dest_realm)) goto error1; if (!cxdx_add_vendor_specific_appid(sar, IMS_vendor_id_3GPP, IMS_Cx, 0 /*IMS_Cx*/)) goto error1; diff --git a/modules/ims_registrar_scscf/reg_mod.c b/modules/ims_registrar_scscf/reg_mod.c index b3ddac3..e4d3f12 100644 --- a/modules/ims_registrar_scscf/reg_mod.c +++ b/modules/ims_registrar_scscf/reg_mod.c @@ -94,6 +94,7 @@ char *scscf_user_data_dtd = 0; /* Path to "CxDataType.dtd" */ char *scscf_user_data_xsd = 0; /* Path to "CxDataType_Rel6.xsd" or "CxDataType_Rel7.xsd" */ int scscf_support_wildcardPSI = 0; int store_data_on_dereg = 0; /**< should we store SAR data on de-registration */ +unsigned int send_vs_callid_avp = 1; /* flag to enable/disable proprietary use of a callid AVP. TODO: add call-id as per TS129.229 */ int ue_unsubscribe_on_dereg = 0; /*many UEs do not unsubscribe on de reg - therefore we should remove their subscription and not send a notify Some UEs do unsubscribe then everything is fine*/ @@ -271,7 +272,7 @@ static param_export_t params[] = { {"user_data_always", INT_PARAM, &user_data_always}, {"notification_list_size_threshold", INT_PARAM, &notification_list_size_threshold}, {"notification_processes", INT_PARAM, &notification_processes}, - + {"send_vs_callid_avp", INT_PARAM, &send_vs_callid_avp}, {0, 0, 0} };

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
35
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 2016