sr-dev May 2019

sr-dev@lists.kamailio.org

29 participants
308 discussions

git:master:c84a89a3: core: pv - define the string printed for null value
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: c84a89a3ab5b3f3174203753e51926143b0309f8 URL: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T11:02:49+02:00 core: pv - define the string printed for null value - added function to return the str null value --- Modified: src/core/pvapi.c Modified: src/core/pvar.h --- Diff: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… Patch: https://github.com/kamailio/kamailio/commit/c84a89a3ab5b3f3174203753e519261… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 27a23612c7..bd0d3c2e98 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -674,7 +674,8 @@ static char pv_str_empty_buf[2]; static char pv_str_null_buf[8]; static str pv_str_empty = { "", 0 }; -static str pv_str_null = { "<null>", 6 }; +#define PV_STR_NULL_VAL "<null>" +static str pv_str_null = { PV_STR_NULL_VAL, sizeof(PV_STR_NULL_VAL)-1 }; int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { if(res==NULL) @@ -686,6 +687,14 @@ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return 0; } +/** + * + */ +str *pv_get_null_str(void) +{ + return &pv_str_null; +} + /** * */ @@ -2007,7 +2016,7 @@ int pv_init_api(void) pv_str_empty_buf[0] = '\0'; pv_str_empty_buf[1] = '\0'; pv_str_empty.s = pv_str_empty_buf; - strcpy(pv_str_null_buf, "<null>"); + strcpy(pv_str_null_buf, PV_STR_NULL_VAL); pv_str_null.s = pv_str_null_buf; if(register_pvars_mod("core", _core_pvs)<0) diff --git a/src/core/pvar.h b/src/core/pvar.h index 3e838e20f8..564bc03d90 100644 --- a/src/core/pvar.h +++ b/src/core/pvar.h @@ -209,6 +209,7 @@ int pv_free_extra_list(void); int pv_locate_name(str *in); pv_spec_t* pv_cache_get(str *name); str* pv_cache_get_name(pv_spec_t *spec); +str *pv_get_null_str(void); /*! \brief PV helper functions */ int pv_get_null(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

1 0

git:master:c37e0032: siptrace: free trace_to_database_flag on module destroy
by Daniel-Constantin Mierla 14 May '19

14 May '19

Module: kamailio Branch: master Commit: c37e00326969c4be565a030708778a64714926e5 URL: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-14T10:48:44+02:00 siptrace: free trace_to_database_flag on module destroy --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… Patch: https://github.com/kamailio/kamailio/commit/c37e00326969c4be565a030708778a6… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 92e2019917..dfdbdcd409 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -495,13 +495,16 @@ static int child_init(int rank) static void destroy(void) { - if(trace_to_database_flag != NULL && *trace_to_database_flag != 0) { - if(db_con != NULL) + if(trace_to_database_flag != NULL) { + if(db_con != NULL) { db_funcs.close(db_con); + } + shm_free(trace_to_database_flag); } - if(trace_on_flag) + if(trace_on_flag) { shm_free(trace_on_flag); + } } static inline str *siptrace_get_table(void)

1 0

git:master:659f822d: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 659f822d3bfd3d37a15ee928bff4420f37d64a0c URL: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2019-05-14T10:47:08+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… Patch: https://github.com/kamailio/kamailio/commit/659f822d3bfd3d37a15ee928bff4420… --- diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README index d6d9e33733..7ffcc90253 100644 --- a/src/modules/siptrace/README +++ b/src/modules/siptrace/README @@ -499,6 +499,10 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be + loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... 4.2. hlog([correlation_id,] message)

1 0

[kamailio/kamailio] siptrace: fix tracing messages to database when destination uri not set (#1951)
by Ionut Ionita 14 May '19

14 May '19

New additions to siptrace module broke previous functionality. If sip_trace was used with no param and destination uri was not set then the current message would not have been traced to database. The current fix traces always the current message if siptrace function was called.   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1951 -- Commit Summary -- * siptrace: fix tracing messages to database when destination uri not set -- File Changes -- M src/modules/siptrace/siptrace.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1951.patch https://github.com/kamailio/kamailio/pull/1951.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/1951

3 8

git:master:5436e1fe: Merge pull request #1951 from ionutionita92/siptrace-bugfix
by GitHub 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 5436e1fe824dee419f0ceb5db836ad3d523c7313 URL: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2019-05-14T10:38:09+02:00 Merge pull request #1951 from ionutionita92/siptrace-bugfix siptrace: fix tracing messages to database when destination uri not set --- Modified: src/modules/siptrace/doc/siptrace_admin.xml Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… Patch: https://github.com/kamailio/kamailio/commit/5436e1fe824dee419f0ceb5db836ad3… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 288824ba93..b3cb739130 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -556,6 +556,9 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... </programlisting> </example> </section> diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fc97290285..92e2019917 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1011,7 +1011,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } } - if(trace_is_off(msg)) { + if(trace_type != SIPTRACE_MESSAGE && trace_is_off(msg)) { LM_DBG("trace off...\n"); return 1; }

1 0

git:master:7ce22d2c: siptrace: add sip_trace example with trace type set to docs
by iionita 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 7ce22d2c7204e934601f577e0fc3cdf9a61dbd09 URL: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-05-14T11:22:32+03:00 siptrace: add sip_trace example with trace type set to docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… Patch: https://github.com/kamailio/kamailio/commit/7ce22d2c7204e934601f577e0fc3cdf… --- diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml index 288824ba93..b3cb739130 100644 --- a/src/modules/siptrace/doc/siptrace_admin.xml +++ b/src/modules/siptrace/doc/siptrace_admin.xml @@ -556,6 +556,9 @@ sip_trace("sip:10.1.1.2:5085"); ... sip_trace("sip:10.1.1.2:5085", "$ci-abc"); ... +/* trace current dialog; needs to be done on initial INVITE and dialog has to be loaded */ +sip_trace("sip:10.1.1.2:5085", "$ci-abc", "d"); +... </programlisting> </example> </section>

1 0

git:master:3ace6416: siptrace: fix tracing messages to database when destination uri not set
by iionita 14 May '19

14 May '19

Module: kamailio Branch: master Commit: 3ace6416387bcb487843f33bd45ec8f2344f60eb URL: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… Author: iionita <ionut-razvan.ionita(a)1and1.ro> Committer: iionita <ionut-razvan.ionita(a)1and1.ro> Date: 2019-05-14T11:22:22+03:00 siptrace: fix tracing messages to database when destination uri not set New additions to siptrace module broke previous functionality. If sip_trace was used with no param and destination uri was not set then the current message would not have been traced to database. The current fix traces always the current message if siptrace function was called. --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… Patch: https://github.com/kamailio/kamailio/commit/3ace6416387bcb487843f33bd45ec8f… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index fc97290285..92e2019917 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1011,7 +1011,7 @@ static int w_sip_trace3(sip_msg_t *msg, char *dest, char *correlation_id, char * } } - if(trace_is_off(msg)) { + if(trace_type != SIPTRACE_MESSAGE && trace_is_off(msg)) { LM_DBG("trace off...\n"); return 1; }

1 0

[kamailio/kamailio] subscribe > Notify without xml body (#1930)
by Denis 13 May '19

13 May '19

hello, trying to get user status using subscription. But for some reason the notification comes without a body xml ` SUBSCRIBE sip:dendy@xxxxxxxx:xxxxx;transport=tcp SIP/2.0 Via: SIP/2.0/TCP xxxxxx.x:xxxxx;rport;branch=z9hG4bKPjDQwwW-dtn73uWvfKqpQhAo.BwcQhtj.X;alias Max-Forwards: 70 From: sip:1203@xxxxxx;tag=E-xtzmcTcV5OkvKZG3e5pF671Rv0ntn5 To: sip:dendy@xxxxxx Contact: <sip:1203@xxxxxx:xxxxx>;transport=tcp Call-ID: jymDoKAg4ffapLjQREv4qDGNqFN35.jb CSeq: 6797 SUBSCRIBE Event: presence Expires: 36000 Accept: application/pidf+xml, application/xpidf+xml Allow-Events: presence Content-Length: 0 2019/04/19 14:17:31.261866 xxxxxx:xxxxxx -> xxxxxx:xxxx NOTIFY sip:1203@xxxxxx:xxxxxx SIP/2.0 Via: SIP/2.0/TCP xxxxxx:xxxxxx;branch=z9hG4bK1afa.0124b9a6000000000000000000000000.0 To: <sip:1203@xxxxxx>;tag=E-xtzmcTcV5OkvKZG3e5pF671Rv0ntn5 From: <sip:dendy@xxxxxx>;tag=dbcd16266fcdb51ae84a18eeabb1faa3-b21b CSeq: 2 NOTIFY Call-ID: jymDoKAg4ffapLjQREv4qDGNqFN35.jb Content-Length: 0 User-Agent: kamailio (5.2.2 (x86_64/linux)) Max-Forwards: 70 Event: presence Contact: <xxxxxx:xxxxxx;transport=tcp> Subscription-State: active;expires=3600 ` kamailio.cfg ..... #!define WITH_PRESENCE #!define WITH_NAT #!define WITH_USRLOCDB #!define WITH_XCAPSRV loadmodule "db_text.so" loadmodule "jsonrpcs.so" loadmodule "kex.so" loadmodule "corex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "cfg_rpc.so" loadmodule "acc.so" loadmodule "counters.so" ...... #!ifdef WITH_PRESENCE loadmodule "presence.so" loadmodule "presence_xml.so" #!endif ...... ` # ----- usrloc params ----- /* enable DB persistency for location entries */ #!ifdef WITH_USRLOCDB modparam("usrloc", "db_url", DBURL) modparam("usrloc", "db_mode", 2) modparam("usrloc", "use_domain", 0) #!endif ........... #!ifdef WITH_PRESENCE # ----- presence params ----- modparam("presence", "db_url", DBURL) modparam("presence", "server_address", "xxxxxx:xxxxx") # ----- presence_xml params ----- modparam("presence_xml", "db_url", DBURL) modparam("presence_xml", "force_active", 1) modparam("presence_xml", "integrated_xcap_server", 1) #!endif #!ifdef WITH_PRESENCE if (!t_newtran()) { sl_reply_error(); exit; } if(is_method("PUBLISH")) { handle_publish(); t_release(); } else if(is_method("SUBSCRIBE")) { handle_subscribe(); t_release(); } exit; #!endif ` I need to get the body of the form: ` <?xml version="1.0" encoding="UTF-8"?> <presence entity="sip:1201@xxxxxx:xxxxxx;transportTCP" xmlns="urn:ietf:params:xml:ns:pidf" xmlns:dm="urn:i f:params:xml:ns:pidf:data-model" xmlns:rpid="urn:ietf:pa ms:xml:ns:pidf:rpid"> <note>Ready</note> <tuple id="1201"> <status> <basic>open</basic> </status> <contact priority="1">sip:1203@хххх.com</contact> </tuple> <dm:person /> </presence> ` -- 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/1930

1 1

git:master:c836f8ba: rtpengine: allocate space for one more rtp relay control socket
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: c836f8ba2f4d3a32b8a4fecba332355df01daca6 URL: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T15:27:08+02:00 rtpengine: allocate space for one more rtp relay control socket - keep it as safety end place holder - should make it work again for the case when starting with no rtp engine in the database - GH #1940 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… Patch: https://github.com/kamailio/kamailio/commit/c836f8ba2f4d3a32b8a4fecba332355… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 21f03775d6..40844ddb2e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -1768,12 +1768,13 @@ static int build_rtpp_socks(int lmode, int rtest) { } rtpp_socks_size = current_rtpp_no; - rtpp_socks = (int*)pkg_reallocxf(rtpp_socks, sizeof(int)*(rtpp_socks_size)); + /* allocate one more to have a safety end place holder */ + rtpp_socks = (int*)pkg_reallocxf(rtpp_socks, sizeof(int)*(rtpp_socks_size+1)); if (!rtpp_socks) { LM_ERR("no more pkg memory for rtpp_socks\n"); return -1; } - memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size)); + memset(rtpp_socks, -1, sizeof(int)*(rtpp_socks_size+1)); rtpe_reload_lock_get(rtpp_set_list->rset_head_lock); _rtpe_list_vernum_local = _rtpe_list_version->vernum;

1 0

git:master:8e51acdd: core: adjust the value for _pv_cache_counter
by Daniel-Constantin Mierla 13 May '19

13 May '19

Module: kamailio Branch: master Commit: 8e51acdd73e8e4ab95c79cc69fb53add7c6cfd38 URL: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-05-13T12:40:24+02:00 core: adjust the value for _pv_cache_counter - reported by GH #1948 --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… Patch: https://github.com/kamailio/kamailio/commit/8e51acdd73e8e4ab95c79cc69fb53ad… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index 59a76831e8..27a23612c7 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -287,6 +287,7 @@ int pv_cache_drop(void) pvi->spec.pvp.pvn.nfree((void*)(&pvi->spec.pvp.pvn)); } pkg_free(pvi); + _pv_cache_counter--; return 1; } pvp = pvi; @@ -309,6 +310,7 @@ int pv_cache_drop(void) pvi->spec.pvp.pvn.nfree((void*)(&pvi->spec.pvp.pvn)); } pkg_free(pvi); + _pv_cache_counter--; return 1; } pvp = pvi; @@ -364,6 +366,7 @@ pv_spec_t* pv_cache_add(str *name) pvn->pvid = pvid; pvn->next = _pv_cache[pvid%PV_CACHE_SIZE]; _pv_cache[pvid%PV_CACHE_SIZE] = pvn; + _pv_cache_counter++; LM_DBG("pvar [%.*s] added in cache\n", name->len, name->s); return &pvn->spec;

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
31
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2019