sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:1a8a18dc: modules: readme files regenerated - sca ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 1a8a18dcfce643f2e730dacf24e97b03040900c4 URL: https://github.com/kamailio/kamailio/commit/1a8a18dcfce643f2e730dacf24e97b0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-24T18:01:13+02:00 modules: readme files regenerated - sca ... --- Modified: modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/1a8a18dcfce643f2e730dacf24e97b0… Patch: https://github.com/kamailio/kamailio/commit/1a8a18dcfce643f2e730dacf24e97b0… --- diff --git a/modules/sca/README b/modules/sca/README index 299e3fd..37d9449 100644 --- a/modules/sca/README +++ b/modules/sca/README @@ -261,8 +261,9 @@ modparam( "sca", "db_update_interval", 120 ) 3.8. onhold_bflag (integer) - Which branch flag should be used by the module to identify if the call - is on-hold instead of parsing the sdp. + When bflag is set the media will be treated as on-hold and sdp parse + will be skipped. If the bflag is not set the sdp will be parsed to + detect on-hold. Default value is -1 (disabled).

7 years, 8 months

git:master:5c1677ac: sca: onhold_blfag as a way to force onhold detection but fallback to previous behavior if not set

by Victor Seva

Module: kamailio Branch: master Commit: 5c1677acb36f20624cd2c6a3aaba19980c3451e2 URL: https://github.com/kamailio/kamailio/commit/5c1677acb36f20624cd2c6a3aaba199… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-24T17:54:58+02:00 sca: onhold_blfag as a way to force onhold detection but fallback to previous behavior if not set --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca_util.c --- Diff: https://github.com/kamailio/kamailio/commit/5c1677acb36f20624cd2c6a3aaba199… Patch: https://github.com/kamailio/kamailio/commit/5c1677acb36f20624cd2c6a3aaba199… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index 6ff3944..f436332 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -266,8 +266,9 @@ modparam( "sca", "db_update_interval", 120 ) <section id="sca.p.onhold_bflag"> <title><varname>onhold_bflag</varname> (integer)</title> <para> - Which branch flag should be used by the module to identify if the call - is on-hold instead of parsing the sdp. + When bflag is set the media will be treated as on-hold and sdp + parse will be skipped. If the bflag is not set the + sdp will be parsed to detect on-hold. </para> <para> <emphasis> diff --git a/modules/sca/sca_util.c b/modules/sca/sca_util.c index 87ec2a1..f4df0ff 100644 --- a/modules/sca/sca_util.c +++ b/modules/sca/sca_util.c @@ -444,8 +444,10 @@ int sca_call_is_held(sip_msg_t *msg) int rc; if(sca->cfg->onhold_bflag >= 0) { - LM_DBG("sca_call_is_held: skip parse_sdp and use onhold_bflag\n"); - return isbflagset(0, (flag_t)sca->cfg->onhold_bflag); + if (isbflagset(0, (flag_t)sca->cfg->onhold_bflag)==1) { + LM_DBG("onhold_bflag set, skip parse_sdp and set held\n"); + return ( 1 ); + } } rc = parse_sdp(msg); if (rc < 0) { @@ -464,6 +466,7 @@ int sca_call_is_held(sip_msg_t *msg) stream != NULL; n_str++, stream = get_sdp_stream(msg, n_sess, n_str)) { if (stream->is_on_hold) { + LM_DBG("sca_call_is_held: parse_sdp detected stream is on hold\n"); is_held = 1; goto done; }

7 years, 8 months

git:master:e638326f: sca: fix sca_call_info_update() [to|from] optional parameters

by Victor Seva

Module: kamailio Branch: master Commit: e638326f628fb6ad8bc4415972f9982b351d281c URL: https://github.com/kamailio/kamailio/commit/e638326f628fb6ad8bc4415972f9982… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-24T16:56:13+02:00 sca: fix sca_call_info_update() [to|from] optional parameters * use str values * need to build struct to_body and free memory afterwards --- Modified: modules/sca/sca.c Modified: modules/sca/sca_call_info.c Modified: modules/sca/sca_call_info.h Modified: modules/sca/sca_util.c Modified: modules/sca/sca_util.h --- Diff: https://github.com/kamailio/kamailio/commit/e638326f628fb6ad8bc4415972f9982… Patch: https://github.com/kamailio/kamailio/commit/e638326f628fb6ad8bc4415972f9982…

7 years, 8 months

[kamailio/kamailio] sca: fix sca_call_info_update() [to|from] optional parameters (#827)

by Victor Seva

* use str values * need to build struct to_body and free memory afterwards You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/827 -- Commit Summary -- * sca: fix sca_call_info_update() [to|from] optional parameters -- File Changes -- M modules/sca/sca.c (22) M modules/sca/sca_call_info.c (42) M modules/sca/sca_call_info.h (2) M modules/sca/sca_util.c (64) M modules/sca/sca_util.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/827.patch https://github.com/kamailio/kamailio/pull/827.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/827

7 years, 8 months

git:master:48039965: sca: use To header as target if SUBSCRIBE is in-dialog

by Victor Seva

Module: kamailio Branch: master Commit: 480399653e00fdbb3a6352045814a7fbf3277060 URL: https://github.com/kamailio/kamailio/commit/480399653e00fdbb3a6352045814a7f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2016-10-24T16:54:59+02:00 sca: use To header as target if SUBSCRIBE is in-dialog --- Modified: modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/480399653e00fdbb3a6352045814a7f… Patch: https://github.com/kamailio/kamailio/commit/480399653e00fdbb3a6352045814a7f… --- diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index efa931c..e9fb461 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1082,14 +1082,17 @@ int sca_subscription_from_request(sca_mod *scam, sip_msg_t *msg, int event_type, goto error; } } + if (sca_uri_extract_aor(ruri, &req_sub->target_aor) < 0) { + LM_ERR("Failed to extract AoR from RURI %.*s\n", STR_FMT(ruri)); + goto error; + } + } + else { + /* we are in-dialog */ + req_sub->target_aor = to->uri; } req_sub->subscriber = contact_uri; - if (sca_uri_extract_aor(ruri, &req_sub->target_aor) < 0) { - LM_ERR("Failed to extract AoR from RURI %.*s\n", - STR_FMT(ruri)); - goto error; - } req_sub->event = event_type; req_sub->index = SCA_CALL_INFO_APPEARANCE_INDEX_ANY; req_sub->expires = expires;

7 years, 8 months

[kamailio/kamailio] sca: use To header as target if SUBSCRIBE is in-dialog (#828)

by Victor Seva

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/828 -- Commit Summary -- * sca: use To header as target if SUBSCRIBE is in-dialog -- File Changes -- M modules/sca/sca_subscribe.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/828.patch https://github.com/kamailio/kamailio/pull/828.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/828

7 years, 8 months

git:master:8873743c: modules: readme files regenerated - sca ...

by Kamailio Dev

Module: kamailio Branch: master Commit: 8873743c41b5af6453a8c0c3dd11586ec7527fa1 URL: https://github.com/kamailio/kamailio/commit/8873743c41b5af6453a8c0c3dd11586… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2016-10-24T10:46:26+02:00 modules: readme files regenerated - sca ... --- Modified: modules/sca/README --- Diff: https://github.com/kamailio/kamailio/commit/8873743c41b5af6453a8c0c3dd11586… Patch: https://github.com/kamailio/kamailio/commit/8873743c41b5af6453a8c0c3dd11586… --- diff --git a/modules/sca/README b/modules/sca/README index a4f4889..299e3fd 100644 --- a/modules/sca/README +++ b/modules/sca/README @@ -274,7 +274,7 @@ modparam("sca", "onhold_bflag", 15) 3.9. server_address (string) The server address which will become the value of Contact header filed - for NOTIFY messages. + for reply messages. Default value is "" (disabled).

7 years, 8 months

git:master:abae6142: Merge branch 'master' of https://github.com/kamailio/kamailio

by The Root

Module: kamailio Branch: master Commit: abae614277a723e79814966d412965ebc5359142 URL: https://github.com/kamailio/kamailio/commit/abae614277a723e79814966d412965e… Author: The Root <root(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2016-10-24T10:46:19+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio # By Victor Seva # Via Victor Seva * 'master' of https://github.com/kamailio/kamailio: sca: obey server_address param at subscription replies --- Modified: modules/sca/doc/sca_admin.xml Modified: modules/sca/sca_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/abae614277a723e79814966d412965e… Patch: https://github.com/kamailio/kamailio/commit/abae614277a723e79814966d412965e… --- diff --git a/modules/sca/doc/sca_admin.xml b/modules/sca/doc/sca_admin.xml index bf212a3..6ff3944 100644 --- a/modules/sca/doc/sca_admin.xml +++ b/modules/sca/doc/sca_admin.xml @@ -288,7 +288,7 @@ modparam("sca", "onhold_bflag", 15) <title><varname>server_address</varname> (string)</title> <para> The server address which will become the value of Contact header filed - for NOTIFY messages. + for reply messages. </para> <para> <emphasis> diff --git a/modules/sca/sca_subscribe.c b/modules/sca/sca_subscribe.c index 37b46b4..efa931c 100644 --- a/modules/sca/sca_subscribe.c +++ b/modules/sca/sca_subscribe.c @@ -1377,7 +1377,12 @@ int sca_subscription_reply(sca_mod *scam, int status_code, char *status_msg, extra_headers.len = len; SCA_STR_APPEND_CSTR(&extra_headers, "Contact: "); - SCA_STR_APPEND(&extra_headers, &REQ_LINE(msg).uri); + if (sca->cfg->server_address != NULL) { + SCA_STR_APPEND( &extra_headers, sca->cfg->server_address); + } + else { + SCA_STR_APPEND( &extra_headers, &REQ_LINE( msg ).uri ); + } SCA_STR_APPEND_CSTR(&extra_headers, CRLF); SCA_STR_COPY_CSTR(&extra_headers,

7 years, 8 months

git:master:d79b1917: Merge branch 'master' of https://github.com/kamailio/kamailio

by The Root

Module: kamailio Branch: master Commit: d79b191709ad3b52d7fef38fce5d6bb86c1485a6 URL: https://github.com/kamailio/kamailio/commit/d79b191709ad3b52d7fef38fce5d6bb… Author: The Root <root(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2016-10-21T11:16:10+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio # By Daniel-Constantin Mierla # Via Daniel-Constantin Mierla * 'master' of https://github.com/kamailio/kamailio: auth_db: use domain considered when flags is not provided to find function --- Modified: modules/alias_db/alias_db.c --- Diff: https://github.com/kamailio/kamailio/commit/d79b191709ad3b52d7fef38fce5d6bb… Patch: https://github.com/kamailio/kamailio/commit/d79b191709ad3b52d7fef38fce5d6bb… --- diff --git a/modules/alias_db/alias_db.c b/modules/alias_db/alias_db.c index ce92d88..4f74601 100644 --- a/modules/alias_db/alias_db.c +++ b/modules/alias_db/alias_db.c @@ -1,4 +1,4 @@ -/* +/* * ALIAS_DB Module * * Copyright (C) 2004 Voice Sistem SRL @@ -58,9 +58,12 @@ static int find_fixup(void** param, int param_no); static int w_alias_db_lookup1(struct sip_msg* _msg, char* _table, char* p2); static int w_alias_db_lookup2(struct sip_msg* _msg, char* _table, char* flags); -static int w_alias_db_find(struct sip_msg* _msg, char* _table, char* _in, +static int w_alias_db_find3(struct sip_msg* _msg, char* _table, char* _in, + char* _out); +static int w_alias_db_find4(struct sip_msg* _msg, char* _table, char* _in, char* _out, char* flags); + /* Module parameter variables */ static str db_url = str_init(DEFAULT_RODB_URL); str user_column = str_init("username"); @@ -80,9 +83,9 @@ static cmd_export_t cmds[] = { REQUEST_ROUTE|FAILURE_ROUTE}, {"alias_db_lookup", (cmd_function)w_alias_db_lookup2, 2, lookup_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"alias_db_find", (cmd_function)w_alias_db_find, 3, find_fixup, 0, + {"alias_db_find", (cmd_function)w_alias_db_find3, 3, find_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, - {"alias_db_find", (cmd_function)w_alias_db_find, 4, find_fixup, 0, + {"alias_db_find", (cmd_function)w_alias_db_find4, 4, find_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {"bind_alias_db", (cmd_function)bind_alias_db, 1, 0, 0, 0}, @@ -291,7 +294,26 @@ static int w_alias_db_lookup2(struct sip_msg* _msg, char* _table, char* flags) return alias_db_lookup_ex(_msg, table_s, (unsigned long)flags); } -static int w_alias_db_find(struct sip_msg* _msg, char* _table, char* _in, +static int w_alias_db_find3(struct sip_msg* _msg, char* _table, char* _in, + char* _out) +{ + str table_s; + unsigned long flags; + + flags = 0; + if(alias_db_use_domain) { + flags |= ALIAS_DOMAIN_FLAG; + } + + if(_table==NULL || fixup_get_svalue(_msg, (gparam_p)_table, &table_s)!=0) { + LM_ERR("invalid table parameter\n"); + return -1; + } + + return alias_db_find(_msg, table_s, _in, _out, (char*)flags); +} + +static int w_alias_db_find4(struct sip_msg* _msg, char* _table, char* _in, char* _out, char* flags) { str table_s;

7 years, 8 months

git:master:c0d380df: Merge branch 'master' of https://github.com/kamailio/kamailio

by The Root

Module: kamailio Branch: master Commit: c0d380dfedc17ee01dffe58a64e7af1c303ef11a URL: https://github.com/kamailio/kamailio/commit/c0d380dfedc17ee01dffe58a64e7af1… Author: The Root <root(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2016-10-21T09:31:21+02:00 Merge branch 'master' of https://github.com/kamailio/kamailio # By Daniel-Constantin Mierla # Via Daniel-Constantin Mierla * 'master' of https://github.com/kamailio/kamailio: alias_db: take in consideration use_domain when flags param is not used for lookup --- Modified: modules/alias_db/alias_db.c --- Diff: https://github.com/kamailio/kamailio/commit/c0d380dfedc17ee01dffe58a64e7af1… Patch: https://github.com/kamailio/kamailio/commit/c0d380dfedc17ee01dffe58a64e7af1…

7 years, 8 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016