sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

git:master:e3e0e52c: tls: document matching on server_id for oubound connections
by Daniel-Constantin Mierla 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: e3e0e52ca4a06f72f5139623116d1c8bc119b1e3 URL: https://github.com/kamailio/kamailio/commit/e3e0e52ca4a06f72f5139623116d1c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-12T14:42:12+01:00 tls: document matching on server_id for oubound connections --- Modified: modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/e3e0e52ca4a06f72f5139623116d1c8… Patch: https://github.com/kamailio/kamailio/commit/e3e0e52ca4a06f72f5139623116d1c8… --- diff --git a/modules/tls/doc/params.xml b/modules/tls/doc/params.xml index dc40322..397e83f 100644 --- a/modules/tls/doc/params.xml +++ b/modules/tls/doc/params.xml @@ -1031,8 +1031,17 @@ modparam("tls", "renegotiation", 1) <listitem><para>crl</para></listitem> <listitem><para>cipher_list</para></listitem> <listitem><para>server_name</para></listitem> + <listitem><para>server_id</para></listitem> </itemizedlist> <para> + The value for server_id can be any string, being used to match TLS + client config profile, overriding the match on ip:port and + server_name. This is the recommended way for selecting a specific + TLS client config profile, because the local or remote port is hard + to predict for a stream connection - see parameter xavp_cfg to learn + how to enable it. + </para> + <para> All the parameters that take filenames as values will be resolved using the same rules as for the tls config filename itself: starting with a '.' means relative to the working directory, a '/' means an @@ -1071,6 +1080,16 @@ verify_depth = 3 ca_list = local_ca.pem server_name = kamailio.org +[client:127.0.0.1:5061] +method = TLSv1 +verify_certificate = yes +require_certificate = yes +private_key = default_key.pem +certificate = default_cert.pem +ca_list = default_ca.pem +crl = default_crl.pem +server_name = kamailio.org +server_id = kamailio.org </programlisting> </example> <para> @@ -1108,6 +1127,12 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") </para> <itemizedlist> <listitem><para>server_name - SNI to be used for outbound connections</para></listitem> + <listitem><para>server_id - string value to be used to match TLS config profile + for client (outbound) connections. If it is set, matching the TLS config + profile is done first on server_id and then on ip:port and server_name. + This is the recommended way for selecting a specific TLS client config + profile as the local or remote port is hard to predict for a stream + connection.</para></listitem> </itemizedlist> <para> The default value is empty (not set). @@ -1119,6 +1144,7 @@ modparam("tls", "config", "/usr/local/etc/kamailio/tls.cfg") modparam("tls", "xavp_cfg", "tls") ... $xavp(tls=>server_name) = "kamailio.org"; + $xavp(tls=>server_id) = "kamailio.org"; $du = "sip:kamailio.org:5061;transport=tls"; route(RELAY); ...

1 0

git:master:0f55ff03: Merge pull request #397 from UserAd/master
by Alexandr Dubovikov 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 0f55ff0351382eeb88df956e190459b73bc6ef4d URL: https://github.com/kamailio/kamailio/commit/0f55ff0351382eeb88df956e190459b… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2015-11-12T14:00:56+01:00 Merge pull request #397 from UserAd/master sipcapture: add async support --- Modified: modules/sipcapture/README Modified: modules/sipcapture/doc/sipcapture_admin.xml Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/0f55ff0351382eeb88df956e190459b… Patch: https://github.com/kamailio/kamailio/commit/0f55ff0351382eeb88df956e190459b… --- diff --git a/modules/sipcapture/README b/modules/sipcapture/README index 1f9fa2d..bef4af4 100644 --- a/modules/sipcapture/README +++ b/modules/sipcapture/README @@ -235,6 +235,10 @@ modparam("sipcapture", "hash_source", "to_user") when the DB driver has support for it. If no INSERT DELAYED support is offered by DB driver, then standard INSERT is used. + If set to 2, use ASYNC INSERT to store sip message into capture table + when the DB driver has support for it. If no ASYNC INSERT support is + offered by DB driver, then standard INSERT is used. + Default value is 0 (no INSERT DELAYED). Example 1.5. db_insert_mode example diff --git a/modules/sipcapture/doc/sipcapture_admin.xml b/modules/sipcapture/doc/sipcapture_admin.xml index 7a835bd..2723acf 100644 --- a/modules/sipcapture/doc/sipcapture_admin.xml +++ b/modules/sipcapture/doc/sipcapture_admin.xml @@ -168,6 +168,11 @@ modparam("sipcapture", "hash_source", "to_user") is offered by DB driver, then standard INSERT is used. </para> <para> + If set to 2, use ASYNC INSERT to store sip message into capture table + when the DB driver has support for it. If no ASYNC INSERT support is + offered by DB driver, then standard INSERT is used. + </para> + <para> Default value is 0 (no INSERT DELAYED). </para> <example> diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 256ddc7..d373de0 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1491,6 +1491,8 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu if (db_insert_mode == 1 && c->db_funcs.insert_delayed != NULL) insert = c->db_funcs.insert_delayed; + else if (db_insert_mode == 2 && c->db_funcs.insert_async != NULL) + insert = c->db_funcs.insert_async; else insert = c->db_funcs.insert; ret = insert(c->db_con, db_keys, db_vals, NR_KEYS); @@ -2362,6 +2364,11 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re LM_ERR("failed to insert delayed into database\n"); goto error; } + } else if (db_insert_mode==2 && c->db_funcs.insert_async!=NULL) { + if (c->db_funcs.insert_async(c->db_con, db_keys, db_vals, RTCP_NR_KEYS) < 0) { + LM_ERR("failed to insert async into database\n"); + goto error; + } } else if (c->db_funcs.insert(c->db_con, db_keys, db_vals, RTCP_NR_KEYS) < 0) { LM_ERR("failed to insert into database\n"); goto error;

1 0

git:master:fc90242d: sipcapture: add async support
by Konstantin Tumalevich 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: fc90242ddd046a3cfd545a50cf636454de173d6f URL: https://github.com/kamailio/kamailio/commit/fc90242ddd046a3cfd545a50cf63645… Author: Konstantin Tumalevich <userad(a)gmail.com> Committer: Konstantin Tumalevich <userad(a)gmail.com> Date: 2015-11-12T16:58:48+05:00 sipcapture: add async support - Add support for storing in asynchronous mode if supported by database backend --- Modified: modules/sipcapture/README Modified: modules/sipcapture/doc/sipcapture_admin.xml Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/fc90242ddd046a3cfd545a50cf63645… Patch: https://github.com/kamailio/kamailio/commit/fc90242ddd046a3cfd545a50cf63645… --- diff --git a/modules/sipcapture/README b/modules/sipcapture/README index 1f9fa2d..bef4af4 100644 --- a/modules/sipcapture/README +++ b/modules/sipcapture/README @@ -235,6 +235,10 @@ modparam("sipcapture", "hash_source", "to_user") when the DB driver has support for it. If no INSERT DELAYED support is offered by DB driver, then standard INSERT is used. + If set to 2, use ASYNC INSERT to store sip message into capture table + when the DB driver has support for it. If no ASYNC INSERT support is + offered by DB driver, then standard INSERT is used. + Default value is 0 (no INSERT DELAYED). Example 1.5. db_insert_mode example diff --git a/modules/sipcapture/doc/sipcapture_admin.xml b/modules/sipcapture/doc/sipcapture_admin.xml index 7a835bd..2723acf 100644 --- a/modules/sipcapture/doc/sipcapture_admin.xml +++ b/modules/sipcapture/doc/sipcapture_admin.xml @@ -168,6 +168,11 @@ modparam("sipcapture", "hash_source", "to_user") is offered by DB driver, then standard INSERT is used. </para> <para> + If set to 2, use ASYNC INSERT to store sip message into capture table + when the DB driver has support for it. If no ASYNC INSERT support is + offered by DB driver, then standard INSERT is used. + </para> + <para> Default value is 0 (no INSERT DELAYED). </para> <example> diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 256ddc7..d373de0 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -1491,6 +1491,8 @@ static int sip_capture_store(struct _sipcapture_object *sco, str *dtable, _captu if (db_insert_mode == 1 && c->db_funcs.insert_delayed != NULL) insert = c->db_funcs.insert_delayed; + else if (db_insert_mode == 2 && c->db_funcs.insert_async != NULL) + insert = c->db_funcs.insert_async; else insert = c->db_funcs.insert; ret = insert(c->db_con, db_keys, db_vals, NR_KEYS); @@ -2362,6 +2364,11 @@ int receive_logging_json_msg(char * buf, unsigned int len, struct hep_generic_re LM_ERR("failed to insert delayed into database\n"); goto error; } + } else if (db_insert_mode==2 && c->db_funcs.insert_async!=NULL) { + if (c->db_funcs.insert_async(c->db_con, db_keys, db_vals, RTCP_NR_KEYS) < 0) { + LM_ERR("failed to insert async into database\n"); + goto error; + } } else if (c->db_funcs.insert(c->db_con, db_keys, db_vals, RTCP_NR_KEYS) < 0) { LM_ERR("failed to insert into database\n"); goto error;

1 0

[kamailio] sipcapture: add async support (#397)
by Konstantin Tumalevich 12 Nov '15

12 Nov '15

- Add support for storing in asynchronous mode if supported by database backend You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/397 -- Commit Summary -- * sipcapture: add async support -- File Changes -- M modules/sipcapture/README (4) M modules/sipcapture/doc/sipcapture_admin.xml (5) M modules/sipcapture/sipcapture.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/397.patch https://github.com/kamailio/kamailio/pull/397.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/397

2 1

[kamailio] Add async insert support (#396)
by Konstantin Tumalevich 12 Nov '15

12 Nov '15

Add asynchronous support for sipcapture module You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/396 -- Commit Summary -- * Add async insert support -- File Changes -- M modules/sipcapture/README (5) M modules/sipcapture/doc/sipcapture_admin.xml (51) M modules/sipcapture/sipcapture.c (608) -- Patch Links -- https://github.com/kamailio/kamailio/pull/396.patch https://github.com/kamailio/kamailio/pull/396.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/396

3 5

git:master:d493d3fa: Merge pull request #395 from mslehto/ims_clang_errors
by Daniel-Constantin Mierla 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: d493d3fa4f052bb3958599b395f7a4d2fe0a9d91 URL: https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-12T12:10:59+01:00 Merge pull request #395 from mslehto/ims_clang_errors patches to fix some clang errors and warnings --- Modified: modules/ims_charging/ro_session_hash.h Modified: modules/ims_charging/ro_timer.c Modified: modules/ims_registrar_scscf/cxdx_sar.c Modified: modules/ims_usrloc_scscf/hslot.h --- Diff: https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d… Patch: https://github.com/kamailio/kamailio/commit/d493d3fa4f052bb3958599b395f7a4d… --- diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index 7257721..7aa1b89 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -175,7 +175,8 @@ int init_ro_session_table(unsigned int size); /*! * \brief Destroy the ro_session dialog table */ -void destroy_ro_session_table(void); +void destroy_ro_session(struct ro_session *ro_session); + /*! * \brief Link a ro_session structure diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index df1fc59..f5978d6 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -409,7 +409,7 @@ void ro_session_ontimeout(struct ro_tl *tl) { counter_add(ims_charging_cnts_h.billed_secs, used_secs); if (ro_session->callid.s != NULL - && ro_session->dlg_h_entry >= 0 + && ro_session->dlg_h_entry > 0 && ro_session->dlg_h_id > 0 && ro_session->ro_session_id.s != NULL) { LM_DBG("Found a session to re-apply for timing [%.*s] and user is [%.*s]\n", diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index d6ded97..bfdc09d 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -330,7 +330,7 @@ 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))); + 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_usrloc_scscf/hslot.h b/modules/ims_usrloc_scscf/hslot.h index 614962d..3379360 100644 --- a/modules/ims_usrloc_scscf/hslot.h +++ b/modules/ims_usrloc_scscf/hslot.h @@ -47,6 +47,7 @@ #define HSLOT_H #include "../../locking.h" +#include "../../atomic/atomic_common.h" #include "udomain.h" #include "impurecord.h"

1 0

git:master:57338351: modules/ims_usrloc_scscf: to avoid clang warning, include atomic_t declaration
by Mikko Lehto 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 57338351a3575f2ba0c38071179daf02bcba2b7f URL: https://github.com/kamailio/kamailio/commit/57338351a3575f2ba0c38071179daf0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-11-11T23:03:40+02:00 modules/ims_usrloc_scscf: to avoid clang warning, include atomic_t declaration --- Modified: modules/ims_usrloc_scscf/hslot.h --- Diff: https://github.com/kamailio/kamailio/commit/57338351a3575f2ba0c38071179daf0… Patch: https://github.com/kamailio/kamailio/commit/57338351a3575f2ba0c38071179daf0… --- diff --git a/modules/ims_usrloc_scscf/hslot.h b/modules/ims_usrloc_scscf/hslot.h index 614962d..3379360 100644 --- a/modules/ims_usrloc_scscf/hslot.h +++ b/modules/ims_usrloc_scscf/hslot.h @@ -47,6 +47,7 @@ #define HSLOT_H #include "../../locking.h" +#include "../../atomic/atomic_common.h" #include "udomain.h" #include "impurecord.h"

1 0

git:master:b0c609e6: modules/ims_registrar_scscf: adds missing jump to error1 label
by Mikko Lehto 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: b0c609e68bdaf300c681b7f4f3a5a857988c1de1 URL: https://github.com/kamailio/kamailio/commit/b0c609e68bdaf300c681b7f4f3a5a85… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-11-11T22:54:14+02:00 modules/ims_registrar_scscf: adds missing jump to error1 label --- Modified: modules/ims_registrar_scscf/cxdx_sar.c --- Diff: https://github.com/kamailio/kamailio/commit/b0c609e68bdaf300c681b7f4f3a5a85… Patch: https://github.com/kamailio/kamailio/commit/b0c609e68bdaf300c681b7f4f3a5a85… --- diff --git a/modules/ims_registrar_scscf/cxdx_sar.c b/modules/ims_registrar_scscf/cxdx_sar.c index d6ded97..bfdc09d 100644 --- a/modules/ims_registrar_scscf/cxdx_sar.c +++ b/modules/ims_registrar_scscf/cxdx_sar.c @@ -330,7 +330,7 @@ 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))); + 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;

1 0

git:master:5e6cec1d: modules/ims_charging: fixes always true comparison of unsigned int
by Mikko Lehto 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 5e6cec1d01e676d78c4a21e48de3e0908e39de8f URL: https://github.com/kamailio/kamailio/commit/5e6cec1d01e676d78c4a21e48de3e09… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-11-11T22:46:30+02:00 modules/ims_charging: fixes always true comparison of unsigned int --- Modified: modules/ims_charging/ro_timer.c --- Diff: https://github.com/kamailio/kamailio/commit/5e6cec1d01e676d78c4a21e48de3e09… Patch: https://github.com/kamailio/kamailio/commit/5e6cec1d01e676d78c4a21e48de3e09… --- diff --git a/modules/ims_charging/ro_timer.c b/modules/ims_charging/ro_timer.c index df1fc59..f5978d6 100644 --- a/modules/ims_charging/ro_timer.c +++ b/modules/ims_charging/ro_timer.c @@ -409,7 +409,7 @@ void ro_session_ontimeout(struct ro_tl *tl) { counter_add(ims_charging_cnts_h.billed_secs, used_secs); if (ro_session->callid.s != NULL - && ro_session->dlg_h_entry >= 0 + && ro_session->dlg_h_entry > 0 && ro_session->dlg_h_id > 0 && ro_session->ro_session_id.s != NULL) { LM_DBG("Found a session to re-apply for timing [%.*s] and user is [%.*s]\n",

1 0

git:master:485351dc: modules/ims_charging: fixes prototype declatation for destroy_ro_session()
by Mikko Lehto 12 Nov '15

12 Nov '15

Module: kamailio Branch: master Commit: 485351dcfb1e5432f3a4e4e4af857f0d27ae8c74 URL: https://github.com/kamailio/kamailio/commit/485351dcfb1e5432f3a4e4e4af857f0… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-11-11T22:45:30+02:00 modules/ims_charging: fixes prototype declatation for destroy_ro_session() --- Modified: modules/ims_charging/ro_session_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/485351dcfb1e5432f3a4e4e4af857f0… Patch: https://github.com/kamailio/kamailio/commit/485351dcfb1e5432f3a4e4e4af857f0… --- diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index 7257721..7aa1b89 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -175,7 +175,8 @@ int init_ro_session_table(unsigned int size); /*! * \brief Destroy the ro_session dialog table */ -void destroy_ro_session_table(void); +void destroy_ro_session(struct ro_session *ro_session); + /*! * \brief Link a ro_session structure

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015