sr-dev October 2016

sr-dev@lists.kamailio.org

28 participants
234 discussions

git:master:1a2918e2: core: parse addr spec - removed old style log message prefixes
by Daniel-Constantin Mierla 31 Oct '16

31 Oct '16

Module: kamailio Branch: master Commit: 1a2918e2d962e2a61a8c185974e49fe9cc09c631 URL: https://github.com/kamailio/kamailio/commit/1a2918e2d962e2a61a8c185974e49fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T11:44:03+01:00 core: parse addr spec - removed old style log message prefixes --- Modified: parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/1a2918e2d962e2a61a8c185974e49fe… Patch: https://github.com/kamailio/kamailio/commit/1a2918e2d962e2a61a8c185974e49fe…

1 0

git:master:7c43359e: core: parser - use square brakets for log messages of addr-spec parsing
by Daniel-Constantin Mierla 31 Oct '16

31 Oct '16

Module: kamailio Branch: master Commit: 7c43359e3c2ebe9aab8a69717225f83737d18345 URL: https://github.com/kamailio/kamailio/commit/7c43359e3c2ebe9aab8a69717225f83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-31T09:37:12+01:00 core: parser - use square brakets for log messages of addr-spec parsing - replace angle brakets, which can mislead because they are part of values --- Modified: parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/7c43359e3c2ebe9aab8a69717225f83… Patch: https://github.com/kamailio/kamailio/commit/7c43359e3c2ebe9aab8a69717225f83…

1 0

[kamailio/kamailio] sca: sca_call_info.c: Remove redundant code (#835)
by Kevin Scott Adams 28 Oct '16

28 Oct '16

- In reviewing the code block that I removed it is actually duplicated in the sca_create_cononical_aor_for_ua() function which is called from sca_create_canonical_aor() which is called inside this 'if' block, so why do it twice. The function sca_get_msg_contact_uri() is also called in sca_create_cononical_aor_for_ua() but it does not set or pass a 'contact' parameter so we still need it in sca_call_info_update() just don't need to check for errors because it will error out in sca_create_cononical_aor_for_ua() and do the same thing. - Maybe in the long run for the 'contact_uri' parameter, create a second function or add it as a setable paramter to the sca_create_cononical_aor_for_ua(). - Code change has been tested and running for about 2 months without issues. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/835 -- Commit Summary -- * sca: sca_call_info.c: Remove redundant code -- File Changes -- M modules/sca/sca_call_info.c (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/835.patch https://github.com/kamailio/kamailio/pull/835.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/835

3 10

git:master:61fdddf2: Merge pull request #836 from zecke/fix-sipcapture-log
by GitHub 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 61fdddf24b639903159b4cac33a74dc5330c5c06 URL: https://github.com/kamailio/kamailio/commit/61fdddf24b639903159b4cac33a74dc… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-10-28T16:44:37+02:00 Merge pull request #836 from zecke/fix-sipcapture-log sipcapture: Terminate the log line with a \n --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/61fdddf24b639903159b4cac33a74dc… Patch: https://github.com/kamailio/kamailio/commit/61fdddf24b639903159b4cac33a74dc… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 9b9af91..955e036 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2825,7 +2825,7 @@ static int pv_parse_hep_name (pv_spec_p sp, str *in) if(sp==NULL || in==NULL || in->len<=0) return -1; - LM_ERR("REQUEST, PRE, %.*s", in->len, in->s); + LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) {

1 0

[kamailio/kamailio] sipcapture: Terminate the log line with a \n (#836)
by Holger Freyther 28 Oct '16

28 Oct '16

Add a newline to avoid the log of other messages starting behind the REQUEST, PRE output. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/836 -- Commit Summary -- * sipcapture: Terminate the log line with a \n -- File Changes -- M modules/sipcapture/sipcapture.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/836.patch https://github.com/kamailio/kamailio/pull/836.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/836

2 2

git:master:6429a2d1: sipcapture: Terminate the log line with a \n
by Holger Hans Peter Freyther 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 6429a2d11e3639f049c7b32149cde5a89f5e9973 URL: https://github.com/kamailio/kamailio/commit/6429a2d11e3639f049c7b32149cde5a… Author: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Committer: Holger Hans Peter Freyther <holger(a)moiji-mobile.com> Date: 2016-10-28T16:40:36+02:00 sipcapture: Terminate the log line with a \n Add a newline to avoid the log of other messages starting behind the REQUEST, PRE output. --- Modified: modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/6429a2d11e3639f049c7b32149cde5a… Patch: https://github.com/kamailio/kamailio/commit/6429a2d11e3639f049c7b32149cde5a… --- diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 9b9af91..955e036 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -2825,7 +2825,7 @@ static int pv_parse_hep_name (pv_spec_p sp, str *in) if(sp==NULL || in==NULL || in->len<=0) return -1; - LM_ERR("REQUEST, PRE, %.*s", in->len, in->s); + LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) {

1 0

git:master:62c5d0d9: pua: fix propagation of ua_flag - it is func param, not in subs
by Daniel-Constantin Mierla 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 62c5d0d9cbd87a6b47c1a211588230ebc2652b8f URL: https://github.com/kamailio/kamailio/commit/62c5d0d9cbd87a6b47c1a211588230e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 pua: fix propagation of ua_flag - it is func param, not in subs --- Modified: modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/62c5d0d9cbd87a6b47c1a211588230e… Patch: https://github.com/kamailio/kamailio/commit/62c5d0d9cbd87a6b47c1a211588230e… --- diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c index bbb9e2c..00832ee 100644 --- a/modules/pua/send_subscribe.c +++ b/modules/pua/send_subscribe.c @@ -833,7 +833,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) } hentity->flag= subs->source_flag; hentity->event= subs->event; - hentity->ua_flag= subs->ua_flag; + hentity->ua_flag= ua_flag; hentity->cb_param= subs->cb_param; return hentity; @@ -930,7 +930,7 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) hentity->flag= subs->flag; hentity->event= subs->event; - hentity->ua_flag= subs->ua_flag; + hentity->ua_flag= ua_flag; hentity->cb_param= subs->cb_param; return hentity;

1 0

git:master:1e2060c0: pua: one more proper propagation of ua_flags in subs_cbparam_indlg()
by Daniel-Constantin Mierla 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 1e2060c0e0aa28fc1c2129d5e5fe3e210827e850 URL: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 pua: one more proper propagation of ua_flags in subs_cbparam_indlg() --- Modified: modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e2… Patch: https://github.com/kamailio/kamailio/commit/1e2060c0e0aa28fc1c2129d5e5fe3e2… --- diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c index 0998119..bbb9e2c 100644 --- a/modules/pua/send_subscribe.c +++ b/modules/pua/send_subscribe.c @@ -895,13 +895,13 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) memcpy(hentity->outbound_proxy->s, subs->outbound_proxy->s, subs->outbound_proxy->len); hentity->outbound_proxy->len= subs->outbound_proxy->len; size+= subs->outbound_proxy->len; - } + } if(subs->id.s) { CONT_COPY(hentity, hentity->id, subs->id) } - + if(subs->remote_contact.s) { CONT_COPY(hentity, hentity->remote_contact, subs->remote_contact) @@ -918,11 +918,11 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) size+= subs->extra_headers->len; } /* copy dialog information */ - + CONT_COPY(hentity, hentity->to_tag, subs->to_tag) CONT_COPY(hentity, hentity->from_tag, subs->from_tag) CONT_COPY(hentity, hentity->call_id, subs->call_id) - + if(expires< 0) hentity->desired_expires= 0; else @@ -930,12 +930,12 @@ ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) hentity->flag= subs->flag; hentity->event= subs->event; - hentity->ua_flag= hentity->ua_flag; + hentity->ua_flag= subs->ua_flag; hentity->cb_param= subs->cb_param; return hentity; -} +} /**

1 0

git:master:82e22fb3: pua: copy over subs flag in subscribe_cbparam()
by Daniel-Constantin Mierla 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 82e22fb36c5155d920b60e8cad689578eec8fb70 URL: https://github.com/kamailio/kamailio/commit/82e22fb36c5155d920b60e8cad68957… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 pua: copy over subs flag in subscribe_cbparam() --- Modified: modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/82e22fb36c5155d920b60e8cad68957… Patch: https://github.com/kamailio/kamailio/commit/82e22fb36c5155d920b60e8cad68957… --- diff --git a/modules/pua/send_subscribe.c b/modules/pua/send_subscribe.c index 84b69f8..0998119 100644 --- a/modules/pua/send_subscribe.c +++ b/modules/pua/send_subscribe.c @@ -755,14 +755,14 @@ void subs_cback_func(struct cell *t, int cb_type, struct tmcb_params *ps) } ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) -{ +{ ua_pres_t* hentity= NULL; int size; size= sizeof(ua_pres_t)+ 2*sizeof(str)+(subs->pres_uri->len+ subs->watcher_uri->len+ subs->contact->len+ subs->id.len+ 1)* sizeof(char); - + if(subs->outbound_proxy && subs->outbound_proxy->len && subs->outbound_proxy->s ) size+= sizeof(str)+ subs->outbound_proxy->len* sizeof(char); @@ -811,7 +811,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) memcpy(hentity->outbound_proxy->s, subs->outbound_proxy->s, subs->outbound_proxy->len); hentity->outbound_proxy->len= subs->outbound_proxy->len; size+= subs->outbound_proxy->len; - } + } if(subs->expires< 0) hentity->desired_expires= 0; else @@ -833,21 +833,21 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) } hentity->flag= subs->source_flag; hentity->event= subs->event; - hentity->ua_flag= hentity->ua_flag; + hentity->ua_flag= subs->ua_flag; hentity->cb_param= subs->cb_param; return hentity; -} +} ua_pres_t* subs_cbparam_indlg(ua_pres_t* subs, int expires, int ua_flag) -{ +{ ua_pres_t* hentity= NULL; int size; size= sizeof(ua_pres_t)+ 2*sizeof(str)+subs->pres_uri->len+ subs->watcher_uri->len+ subs->contact.len+ subs->id.len+ subs->to_tag.len+ subs->call_id.len+ subs->from_tag.len+ 1; - + if(subs->outbound_proxy && subs->outbound_proxy->len && subs->outbound_proxy->s ) size+= sizeof(str)+ subs->outbound_proxy->len;

1 0

git:master:13ff91b1: htable: earlier init of jdoc used for dmq for proper clean on error cases
by Daniel-Constantin Mierla 28 Oct '16

28 Oct '16

Module: kamailio Branch: master Commit: 13ff91b1955d7248f8aaaf350675275e425443dc URL: https://github.com/kamailio/kamailio/commit/13ff91b1955d7248f8aaaf350675275… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-10-28T16:09:40+02:00 htable: earlier init of jdoc used for dmq for proper clean on error cases --- Modified: modules/htable/ht_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/13ff91b1955d7248f8aaaf350675275… Patch: https://github.com/kamailio/kamailio/commit/13ff91b1955d7248f8aaaf350675275… --- diff --git a/modules/htable/ht_dmq.c b/modules/htable/ht_dmq.c index a88bad4..0983f61 100644 --- a/modules/htable/ht_dmq.c +++ b/modules/htable/ht_dmq.c @@ -104,6 +104,8 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq /* received dmq message */ LM_DBG("dmq message received\n"); + srjson_InitDoc(&jdoc, NULL); + if(!msg->content_length) { LM_ERR("no content length header found\n"); goto invalid; @@ -125,7 +127,6 @@ int ht_dmq_handle_msg(struct sip_msg* msg, peer_reponse_t* resp, dmq_node_t* dmq /* parse body */ LM_DBG("body: %.*s\n", body.len, body.s); - srjson_InitDoc(&jdoc, NULL); jdoc.buf = body; if(jdoc.root == NULL) {

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2016