sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
426 discussions

git:master:1e37b31f: pv: declare the pv_empty as buffer with size

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 1e37b31f8a28ccc6f44eaf75e5f02e836df20411 URL: https://github.com/kamailio/kamailio/commit/1e37b31f8a28ccc6f44eaf75e5f02e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-07T15:37:07+02:00 pv: declare the pv_empty as buffer with size - otherwise it can crash when code tries to write in it, if pointing to static empty string - reported by Juha Heinanen --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/1e37b31f8a28ccc6f44eaf75e5f02e8… Patch: https://github.com/kamailio/kamailio/commit/1e37b31f8a28ccc6f44eaf75e5f02e8… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 6ad9a97..25723bd 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -50,7 +50,7 @@ #include "pv_trans.h" -static char _empty_str[] = ""; +static char _empty_str[2] = {0}; static str _tr_empty = { _empty_str, 0 }; static str _tr_uri = {0, 0}; static struct sip_uri _tr_parsed_uri;

7 years, 7 months

git:master:60aa7ec1: modules: readme files regenerated - sdpops ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 60aa7ec193950249a1610a943b767421e310fb10 URL: https://github.com/kamailio/kamailio/commit/60aa7ec193950249a1610a943b76742… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-04-07T11:16:43+02:00 modules: readme files regenerated - sdpops ... [skip ci] --- Modified: src/modules/sdpops/README --- Diff: https://github.com/kamailio/kamailio/commit/60aa7ec193950249a1610a943b76742… Patch: https://github.com/kamailio/kamailio/commit/60aa7ec193950249a1610a943b76742… --- diff --git a/src/modules/sdpops/README b/src/modules/sdpops/README index 4f1737f..573e1fc 100644 --- a/src/modules/sdpops/README +++ b/src/modules/sdpops/README @@ -298,6 +298,26 @@ if(sdp_with_active_media("video")) Remove the streams that match on 'm=type ...' line. The parameter can be static string or variable holding the media type. + Note: If this is executed on a request, the callee should reply without + the Media too. However, RFC 3264 mandates, that the reply should + contain the exact same number of "m=" lines as the request. + + + 6 Generating the Answer + + [...] + + For each "m=" line in the offer, there MUST be a corresponding "m=" + line in the answer. The answer MUST contain exactly the same number of + "m=" lines as the offer. This allows for streams to be matched up based + on their order. This implies that if the offer contained zero "m=" + lines, the answer MUST contain zero "m=" lines. + + --RFC 3264 + + So this may not work with all Endpoints, especially if they follow RFC + 3264 precisely (e.g. JSSIP). + This function can be used from ANY_ROUTE. Example 1.8. sdp_remove_media usage

7 years, 7 months

git:master:8a38f369: sdpops: Add note about sdp_remove_media() and RFC compliance

by Carsten Bock

Module: kamailio Branch: master Commit: 8a38f369b01a642b92704cc0e6efeb6e108f8a02 URL: https://github.com/kamailio/kamailio/commit/8a38f369b01a642b92704cc0e6efeb6… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-07T11:09:14+02:00 sdpops: Add note about sdp_remove_media() and RFC compliance --- Modified: src/modules/sdpops/doc/sdpops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8a38f369b01a642b92704cc0e6efeb6… Patch: https://github.com/kamailio/kamailio/commit/8a38f369b01a642b92704cc0e6efeb6… --- diff --git a/src/modules/sdpops/doc/sdpops_admin.xml b/src/modules/sdpops/doc/sdpops_admin.xml index a4bf378..53a2552 100644 --- a/src/modules/sdpops/doc/sdpops_admin.xml +++ b/src/modules/sdpops/doc/sdpops_admin.xml @@ -278,6 +278,31 @@ if(sdp_with_active_media("video")) Remove the streams that match on 'm=type ...' line. The parameter can be static string or variable holding the media type. </para> + <para> + Note: If this is executed on a request, the callee should reply + without the Media too. However, RFC 3264 mandates, that the reply + should contain the exact same number of "m=" lines as the + request. + </para> +<blockquote><attribution>RFC 3264</attribution> + <para> +6 Generating the Answer + </para> + <para> + [...] + </para> + <para> + For each "m=" line in the offer, there MUST be a corresponding "m=" + line in the answer. The answer MUST contain exactly the same number + of "m=" lines as the offer. This allows for streams to be matched up + based on their order. This implies that if the offer contained zero + "m=" lines, the answer MUST contain zero "m=" lines. + </para> +</blockquote> + <para> + So this may not work with all Endpoints, especially if they + follow RFC 3264 precisely (e.g. JSSIP). + </para> <para> This function can be used from ANY_ROUTE. </para>

7 years, 7 months

git:master:e444f6f8: tmx: new vars - $T(id_index_n) and $T(id_label_n)

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e444f6f821dcbd56e58442f9ee1b970feb52395f URL: https://github.com/kamailio/kamailio/commit/e444f6f821dcbd56e58442f9ee1b970… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T22:20:00+02:00 tmx: new vars - $T(id_index_n) and $T(id_label_n) - similar to $T(id_index) and $T(id_label), but if transaction doesn't exit yet, it is created --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/e444f6f821dcbd56e58442f9ee1b970… Patch: https://github.com/kamailio/kamailio/commit/e444f6f821dcbd56e58442f9ee1b970… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index edd377d..47e300a 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -668,6 +668,10 @@ int pv_parse_t_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "reply_type", 10)==0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "id_label_n", 10)==0) + sp->pvp.pvn.u.isname.name.n = 8; + else if(strncmp(in->s, "id_index_n", 10)==0) + sp->pvp.pvn.u.isname.name.n = 9; else goto error; break; case 12: @@ -709,7 +713,19 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, t = _tmx_tmb.t_gett(); if(t==NULL || t==T_UNDEFINED) { /* no T */ - return pv_get_null(msg, param, res); + if(param->pvn.u.isname.name.n==8 || param->pvn.u.isname.name.n==9) { + /* id_label_n or id_index_n - attempt to create transaction */ + if(_tmx_tmb.t_newtran(msg)<0) { + LM_ERR("cannot create the transaction\n"); + return pv_get_null(msg, param, res); + } + t = _tmx_tmb.t_gett(); + if (t==NULL || t==T_UNDEFINED) { + return pv_get_null(msg, param, res); + } + } else { + return pv_get_null(msg, param, res); + } } switch(param->pvn.u.isname.name.n) { @@ -723,6 +739,10 @@ int pv_get_t(struct sip_msg *msg, pv_param_t *param, return pv_get_uintval(msg, param, res, 1); } return pv_get_uintval(msg, param, res, 0); + case 8: + return pv_get_uintval(msg, param, res, t->label); + case 9: + return pv_get_uintval(msg, param, res, t->hash_index); default: return pv_get_uintval(msg, param, res, t->label); }

7 years, 7 months

git:master:196537b0: dialog: exported dlg_manage() to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 196537b0a226ed8da690d40a0f9526b6fb2a443e URL: https://github.com/kamailio/kamailio/commit/196537b0a226ed8da690d40a0f9526b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T21:57:17+02:00 dialog: exported dlg_manage() to kemi --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/196537b0a226ed8da690d40a0f9526b… Patch: https://github.com/kamailio/kamailio/commit/196537b0a226ed8da690d40a0f9526b… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index e784db1..2dc30d8 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -56,6 +56,7 @@ #include "../../core/pvar.h" #include "../../core/mod_fix.h" #include "../../core/script_cb.h" +#include "../../core/kemi.h" #include "../../core/fmsg.h" #include "../../core/hashes.h" #include "../../core/counters.h" @@ -1428,6 +1429,30 @@ static int fixup_dlg_remote_profile(void** param, int param_no) return 0; } +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_dialog_exports[] = { + { str_init("dialog"), str_init("dlg_manage"), + SR_KEMIP_INT, dlg_manage, + { SR_KEMIP_NONE, SR_KEMIP_NONE, 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_dialog_exports); + return 0; +} + /**************************** RPC functions ******************************/ /*! * \brief Helper method that outputs a dialog via the RPC interface

7 years, 7 months

git:master:491d9cba: evapi: export non-async functions to kemi

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 491d9cbae477c7b12bf768abadf7169fd25e2262 URL: https://github.com/kamailio/kamailio/commit/491d9cbae477c7b12bf768abadf7169… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T21:16:35+02:00 evapi: export non-async functions to kemi --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/491d9cbae477c7b12bf768abadf7169… Patch: https://github.com/kamailio/kamailio/commit/491d9cbae477c7b12bf768abadf7169… --- diff --git a/src/modules/evapi/evapi_mod.c b/src/modules/evapi/evapi_mod.c index 39e7dd7..353027f 100644 --- a/src/modules/evapi/evapi_mod.c +++ b/src/modules/evapi/evapi_mod.c @@ -36,6 +36,7 @@ #include "../../core/mod_fix.h" #include "../../core/pvar.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/kemi.h" #include "../../core/fmsg.h" #include "../../modules/tm/tm_load.h" @@ -579,3 +580,72 @@ static int w_evapi_set_tag(sip_msg_t* msg, char* ptag, char* p2) return -1; return 1; } + +/** + * + */ +static int ki_evapi_relay(sip_msg_t *msg, str *sdata) +{ + return evapi_relay(sdata); +} + +/** + * + */ +static int ki_evapi_relay_unicast(sip_msg_t *msg, str *sdata, str *stag) +{ + return evapi_relay_unicast(sdata, stag); +} + +/** + * + */ +static int ki_evapi_relay_multicast(sip_msg_t *msg, str *sdata, str *stag) +{ + return evapi_relay_multicast(sdata, stag); +} + +/** + * + */ +/* clang-format off */ +static sr_kemi_t sr_kemi_evapi_exports[] = { + { str_init("evapi"), str_init("relay"), + SR_KEMIP_INT, ki_evapi_relay, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("evapi"), str_init("relay_unicast"), + SR_KEMIP_INT, ki_evapi_relay_unicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("evapi"), str_init("relay_multicast"), + SR_KEMIP_INT, ki_evapi_relay_multicast, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("evapi"), str_init("close"), + SR_KEMIP_INT, evapi_cfg_close, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("evapi"), str_init("set_tag"), + SR_KEMIP_INT, evapi_set_tag, + { SR_KEMIP_STR, SR_KEMIP_NONE, 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_evapi_exports); + return 0; +} +

7 years, 7 months

git:master:e4a11d71: dialog: check if dialog exists after event route execution

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e4a11d715e3d4e47aa82b7e8e358000948e26c4c URL: https://github.com/kamailio/kamailio/commit/e4a11d715e3d4e47aa82b7e8e358000… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T17:06:37+02:00 dialog: check if dialog exists after event route execution - done for dlg_onroute(), as an extra safety for early detection of races, related to GH #1059 --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/e4a11d715e3d4e47aa82b7e8e358000… Patch: https://github.com/kamailio/kamailio/commit/e4a11d715e3d4e47aa82b7e8e358000… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index 539d248..2eb36f5 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -1226,12 +1226,14 @@ dlg_cell_t *dlg_get_msg_dialog(sip_msg_t *msg) */ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) { - dlg_cell_t *dlg; - dlg_iuid_t *iuid; + dlg_cell_t *dlg = NULL; + dlg_cell_t *dlg0 = NULL; + dlg_iuid_t *iuid = NULL; str val, callid, ftag, ttag; - int h_entry, h_id, new_state, old_state, unref, event, timeout, reset; - unsigned int dir; - int ret = 0; + int h_entry=0, h_id=0, new_state=0, old_state=0; + int unref=0, event=0, timeout=0, reset=0; + unsigned int dir=0; + int ret=0; dlg = dlg_get_ctx_dialog(); if (dlg!=NULL) { @@ -1321,8 +1323,10 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) /* set current dialog - re-use ref increment from dlg_get() above */ set_current_dialog( req, dlg); - _dlg_ctx.iuid.h_entry = dlg->h_entry; - _dlg_ctx.iuid.h_id = dlg->h_id; + h_entry = dlg->h_entry; + h_id = dlg->h_id; + _dlg_ctx.iuid.h_entry = h_entry; + _dlg_ctx.iuid.h_id = h_id; if(dlg->iflags & DLG_IFLAG_CSEQ_DIFF) { if(dlg_cseq_refresh(req, dlg, dir)<0) { @@ -1364,6 +1368,15 @@ void dlg_onroute(struct sip_msg* req, str *route_params, void *param) dlg_run_event_route(dlg, req, old_state, new_state); + dlg0 = dlg_lookup(h_entry, h_id); + if (dlg0==0) { + LM_ALERT("after event route - dialog not found [%u:%u] (%d/%d) (%p)\n", + h_entry, h_id, old_state, new_state, dlg); + return; + } else { + dlg_release(dlg0); + } + /* delay deletion of dialog until transaction has died off in order * to absorb in-air messages */ if (new_state==DLG_STATE_DELETED && old_state!=DLG_STATE_DELETED) {

7 years, 7 months

git:4.4:459efbd4: kamailio.cfg: handle retransmissions also for request within dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: 459efbd4f32e69001afadd85087cb87b0410b955 URL: https://github.com/kamailio/kamailio/commit/459efbd4f32e69001afadd85087cb87… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T15:19:59+02:00 kamailio.cfg: handle retransmissions also for request within dialog - skip ACK, it is not a standard transaction by itself (cherry picked from commit 868f9996f39dd76707ed09fce980893bab7c31bc) (cherry picked from commit a5e3a8822bf491516ac3d7ff0fc8ed18f5e26124) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/459efbd4f32e69001afadd85087cb87… Patch: https://github.com/kamailio/kamailio/commit/459efbd4f32e69001afadd85087cb87… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 86ac524..f3c51de 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -471,18 +471,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH);

7 years, 7 months

git:5.0:a5e3a882: kamailio.cfg: handle retransmissions also for request within dialog

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.0 Commit: a5e3a8822bf491516ac3d7ff0fc8ed18f5e26124 URL: https://github.com/kamailio/kamailio/commit/a5e3a8822bf491516ac3d7ff0fc8ed1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T15:18:34+02:00 kamailio.cfg: handle retransmissions also for request within dialog - skip ACK, it is not a standard transaction by itself (cherry picked from commit 868f9996f39dd76707ed09fce980893bab7c31bc) --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/a5e3a8822bf491516ac3d7ff0fc8ed1… Patch: https://github.com/kamailio/kamailio/commit/a5e3a8822bf491516ac3d7ff0fc8ed1… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index cf8df43..b176b54 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -470,18 +470,20 @@ request_route { exit; } + # handle retransmissions + if (!is_method("ACK")) { + if(t_precheck_trans()) { + t_check_trans(); + exit; + } + t_check_trans(); + } + # handle requests within SIP dialogs route(WITHINDLG); ### only initial requests (no To tag) - # handle retransmissions - if(t_precheck_trans()) { - t_check_trans(); - exit; - } - t_check_trans(); - # authentication route(AUTH);

7 years, 7 months

git:master:09fe281b: kamailio.cfg: version updated to 5.1 in top comments

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 09fe281bd5bea0d484a41e13b18fd3d206d2ebd9 URL: https://github.com/kamailio/kamailio/commit/09fe281bd5bea0d484a41e13b18fd3d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-06T15:17:47+02:00 kamailio.cfg: version updated to 5.1 in top comments --- Modified: etc/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/09fe281bd5bea0d484a41e13b18fd3d… Patch: https://github.com/kamailio/kamailio/commit/09fe281bd5bea0d484a41e13b18fd3d… --- diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index b176b54..99b6cc9 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v5.0 - default configuration script +# Kamailio (OpenSER) SIP Server v5.1 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org #

7 years, 7 months

← Newer
1
...
31
32
33
34
35
36
37
...
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