sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:ed87ecb6: core: kemi - renamed KSR.drop() to KSR.set_drop()
by Daniel-Constantin Mierla 29 Mar '18

29 Mar '18

Module: kamailio Branch: master Commit: ed87ecb6fc3d7e12cd30b2c7a1b3f2b01e58c96c URL: https://github.com/kamailio/kamailio/commit/ed87ecb6fc3d7e12cd30b2c7a1b3f2b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-29T12:10:58+02:00 core: kemi - renamed KSR.drop() to KSR.set_drop() - avoid confusion with the native config drop(), which does an exit as well, not only setting the drop flag --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/ed87ecb6fc3d7e12cd30b2c7a1b3f2b… Patch: https://github.com/kamailio/kamailio/commit/ed87ecb6fc3d7e12cd30b2c7a1b3f2b… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 26e4e26b1b..a3922cae91 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -126,11 +126,11 @@ static int sr_kemi_core_log(sip_msg_t *msg, str *level, str *txt) /** * */ -int sr_kemi_core_drop(sip_msg_t *msg) +int sr_kemi_core_set_drop(sip_msg_t *msg) { if(_sr_kemi_act_ctx==NULL) return 0; - LM_DBG("drop action executed inside embedded interpreter\n"); + LM_DBG("set drop action executed inside embedded interpreter\n"); _sr_kemi_act_ctx->run_flags |= EXIT_R_F|DROP_R_F; return 0; } @@ -1016,8 +1016,8 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("drop"), - SR_KEMIP_NONE, sr_kemi_core_drop, + { str_init(""), str_init("set_drop"), + SR_KEMIP_NONE, sr_kemi_core_set_drop, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

[SR-Users] is t_flush_flags() really needed?
by Juha Heinanen 28 Mar '18

28 Mar '18

Juha Heinanen writes: > While testing xflags, i noticed that a regular flag that I set AFTER > calling t_newtrans() stays set in onreply_route even when I do not > call t_flush_flags(). I made the same test with xflags and they do require t_flush_xflags() call if an xflag is set after t_newtrans(); So the behavior is not the same with flags and xflags. This is confusing. The flags should behave the same way and I would prefer the flags way in order to avoid the flush call. I added sr-dev to this thread since it now deals also the new feature. -- Juha

2 2

git:master:4bfcc38c: modules: readme files regenerated - phonenum ... [skip ci]
by Kamailio Dev 28 Mar '18

28 Mar '18

Module: kamailio Branch: master Commit: 4bfcc38c665fd321aee8e6fea8324156ba583f84 URL: https://github.com/kamailio/kamailio/commit/4bfcc38c665fd321aee8e6fea832415… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-28T08:31:58+02:00 modules: readme files regenerated - phonenum ... [skip ci] --- Modified: src/modules/phonenum/README --- Diff: https://github.com/kamailio/kamailio/commit/4bfcc38c665fd321aee8e6fea832415… Patch: https://github.com/kamailio/kamailio/commit/4bfcc38c665fd321aee8e6fea832415… --- diff --git a/src/modules/phonenum/README b/src/modules/phonenum/README index 711a532e65..90f06f2a92 100644 --- a/src/modules/phonenum/README +++ b/src/modules/phonenum/README @@ -30,6 +30,7 @@ Daniel-Constantin Mierla 4. Functions 4.1. phonenum_match(num, pvc) + 4.2. phonenum_match(num, cnc, pvc) 5. Pseudo Variables @@ -37,6 +38,7 @@ Daniel-Constantin Mierla 1.1. Set smode parameter 1.2. phonenum_match usage + 1.3. phonenum_match_cn usage Chapter 1. Admin Guide @@ -55,6 +57,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. phonenum_match(num, pvc) + 4.2. phonenum_match(num, cnc, pvc) 5. Pseudo Variables @@ -107,6 +110,7 @@ modparam("phonenum", "smode", 0) 4. Functions 4.1. phonenum_match(num, pvc) + 4.2. phonenum_match(num, cnc, pvc) 4.1. phonenum_match(num, pvc) @@ -129,6 +133,28 @@ if(phonenum_match("1-484-555-8888", "src")) { } ... +4.2. phonenum_match(num, cnc, pvc) + + Match num against the libphonenumber and set the attributes inside the + pvc container, restricting the rules with a country name code (two + letter, e.g: "DE", "US", "ES"). The function has to be called before + accessing a key via: $phn(pvc=>key). + + The parameters can be static strings or strings with variables. + + It can be used from ANY_ROUTE. + + Example 1.3. phonenum_match_cn usage +... +if(phonenum_match_cn("1-484-555-8888", "US", "src")) { + if($phn(src=>valid)==1) { + xlog("number normalized to: $phn(src=>normalized)\n"); + } else { + xlog("number normalization error: $phn(src=>error)\n"); + } +} +... + 5. Pseudo Variables * $phn(pvc=>key) - pvc is an identifier for this query result; it is

1 0

git:master:4d2e1172: phonenum: documentation for phonenum_match_cn()
by Daniel-Constantin Mierla 28 Mar '18

28 Mar '18

Module: kamailio Branch: master Commit: 4d2e1172be1184666275cacb7481dd691071954d URL: https://github.com/kamailio/kamailio/commit/4d2e1172be1184666275cacb7481dd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-28T08:28:15+02:00 phonenum: documentation for phonenum_match_cn() --- Modified: src/modules/phonenum/doc/phonenum_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4d2e1172be1184666275cacb7481dd6… Patch: https://github.com/kamailio/kamailio/commit/4d2e1172be1184666275cacb7481dd6… --- diff --git a/src/modules/phonenum/doc/phonenum_admin.xml b/src/modules/phonenum/doc/phonenum_admin.xml index 16e85c5766..8715e821c1 100644 --- a/src/modules/phonenum/doc/phonenum_admin.xml +++ b/src/modules/phonenum/doc/phonenum_admin.xml @@ -68,7 +68,7 @@ </section> <section> <title>Parameters</title> - <section> + <section id="phonenum.p.smode"> <title><varname>smode</varname> (int)</title> <para> Phone number search mode. @@ -92,7 +92,7 @@ modparam("phonenum", "smode", 0) <section> <title>Functions</title> - <section> + <section id="phonenum.f.phonenum_match"> <title> <function moreinfo="none">phonenum_match(num, pvc)</function> </title> @@ -122,7 +122,37 @@ if(phonenum_match("1-484-555-8888", "src")) { </programlisting> </example> </section> - + <section id="phonenum.f.phonenum_match_cn"> + <title> + <function moreinfo="none">phonenum_match(num, cnc, pvc)</function> + </title> + <para> + Match num against the libphonenumber and set the attributes inside + the pvc container, restricting the rules with a country name code + (two letter, e.g: "DE", "US", "ES"). The function has to be called + before accessing a key via: $phn(pvc=>key). + </para> + <para> + The parameters can be static strings or strings with variables. + </para> + <para> + It can be used from ANY_ROUTE. + </para> + <example> + <title><function>phonenum_match_cn</function> usage</title> + <programlisting format="linespecific"> +... +if(phonenum_match_cn("1-484-555-8888", "US", "src")) { + if($phn(src=>valid)==1) { + xlog("number normalized to: $phn(src=>normalized)\n"); + } else { + xlog("number normalization error: $phn(src=>error)\n"); + } +} +... +</programlisting> + </example> + </section> </section> <section>

1 0

git:master:431e9821: phonenum: set the order of params for phonenum_match_cn()
by Daniel-Constantin Mierla 28 Mar '18

28 Mar '18

Module: kamailio Branch: master Commit: 431e982157f687789c65e7cb74e3f68939a05730 URL: https://github.com/kamailio/kamailio/commit/431e982157f687789c65e7cb74e3f68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-28T08:26:02+02:00 phonenum: set the order of params for phonenum_match_cn() --- Modified: src/modules/phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c Modified: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/431e982157f687789c65e7cb74e3f68… Patch: https://github.com/kamailio/kamailio/commit/431e982157f687789c65e7cb74e3f68… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 5c6c6c8294..5d74c5eec2 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -109,7 +109,7 @@ static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass) { phonenum_pv_reset(pvclass); - return phonenum_update_pv(tomatch, pvclass, NULL); + return phonenum_update_pv(tomatch, NULL, pvclass); } static int w_phonenum_match(sip_msg_t *msg, char *target, char *pvname) @@ -134,15 +134,15 @@ static int w_phonenum_match(sip_msg_t *msg, char *target, char *pvname) return phonenum_match(msg, &tomatch, &pvclass); } -static int phonenum_match_cn(sip_msg_t *msg, str *tomatch, str *pvclass, str *cc) +static int phonenum_match_cn(sip_msg_t *msg, str *tomatch, str *cnc, str *pvclass) { phonenum_pv_reset(pvclass); - return phonenum_update_pv(tomatch, pvclass, cc); + return phonenum_update_pv(tomatch, cnc, pvclass); } -static int w_phonenum_match_cn(sip_msg_t *msg, char *target, char *pvname, - char *cncstr) +static int w_phonenum_match_cn(sip_msg_t *msg, char *target, char *cncstr, + char *pvname) { str tomatch = STR_NULL; str pvclass = STR_NULL; @@ -157,16 +157,16 @@ static int w_phonenum_match_cn(sip_msg_t *msg, char *target, char *pvname, LM_ERR("cannot get the address\n"); return -1; } - if(fixup_get_svalue(msg, (gparam_t *)pvname, &pvclass) < 0) { - LM_ERR("cannot get the pv class\n"); - return -1; - } if(fixup_get_svalue(msg, (gparam_t *)cncstr, &cncval) < 0) { LM_ERR("cannot get the country code\n"); return -1; } + if(fixup_get_svalue(msg, (gparam_t *)pvname, &pvclass) < 0) { + LM_ERR("cannot get the pv class\n"); + return -1; + } - return phonenum_match_cn(msg, &tomatch, &pvclass, &cncval); + return phonenum_match_cn(msg, &tomatch, &cncval, &pvclass); } /** diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index 0de7b5250d..31f60a6428 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -289,7 +289,7 @@ void phonenum_pv_reset(str *name) memset(gr, 0, sizeof(sr_phonenum_record_t)); } -int phonenum_update_pv(str *tomatch, str *name, str *cncode) +int phonenum_update_pv(str *tomatch, str *cncode, str *name) { sr_phonenum_record_t *gr = NULL; diff --git a/src/modules/phonenum/phonenum_pv.h b/src/modules/phonenum/phonenum_pv.h index 2156c33be6..b56d6f47dd 100644 --- a/src/modules/phonenum/phonenum_pv.h +++ b/src/modules/phonenum/phonenum_pv.h @@ -33,7 +33,7 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, int phonenum_init_pv(int smode); void phonenum_destroy_pv(void); void phonenum_pv_reset(str *pvclass); -int phonenum_update_pv(str *tomatch, str *pvclass, str *cncode); +int phonenum_update_pv(str *tomatch, str *cncode, str *pvclass); #endif

1 0

git:master:cc7c066d: phonenum: new function phonenum_match_cn(...)
by Daniel-Constantin Mierla 28 Mar '18

28 Mar '18

Module: kamailio Branch: master Commit: cc7c066d98369e01ab6b8dfe699ce9131cfb239e URL: https://github.com/kamailio/kamailio/commit/cc7c066d98369e01ab6b8dfe699ce91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-28T08:14:37+02:00 phonenum: new function phonenum_match_cn(...) - match a phone number within a specific country provided by country code two letter --- Modified: src/modules/phonenum/phonenum_mod.c Modified: src/modules/phonenum/phonenum_pv.c Modified: src/modules/phonenum/phonenum_pv.h --- Diff: https://github.com/kamailio/kamailio/commit/cc7c066d98369e01ab6b8dfe699ce91… Patch: https://github.com/kamailio/kamailio/commit/cc7c066d98369e01ab6b8dfe699ce91… --- diff --git a/src/modules/phonenum/phonenum_mod.c b/src/modules/phonenum/phonenum_mod.c index 5a051842cb..5c6c6c8294 100644 --- a/src/modules/phonenum/phonenum_mod.c +++ b/src/modules/phonenum/phonenum_mod.c @@ -43,6 +43,8 @@ static int mod_init(void); static void mod_destroy(void); static int w_phonenum_match(struct sip_msg *msg, char *str1, char *str2); +static int w_phonenum_match_cn(struct sip_msg *msg, char *str1, char *str2, + char *str3); static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass); /* clang-format off */ @@ -55,6 +57,8 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"phonenum_match", (cmd_function)w_phonenum_match, 2, fixup_spve_spve, 0, ANY_ROUTE}, + {"phonenum_match_cn", (cmd_function)w_phonenum_match_cn, 3, fixup_spve_all, + 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -105,7 +109,7 @@ static int phonenum_match(sip_msg_t *msg, str *tomatch, str *pvclass) { phonenum_pv_reset(pvclass); - return phonenum_update_pv(tomatch, pvclass); + return phonenum_update_pv(tomatch, pvclass, NULL); } static int w_phonenum_match(sip_msg_t *msg, char *target, char *pvname) @@ -130,6 +134,41 @@ static int w_phonenum_match(sip_msg_t *msg, char *target, char *pvname) return phonenum_match(msg, &tomatch, &pvclass); } +static int phonenum_match_cn(sip_msg_t *msg, str *tomatch, str *pvclass, str *cc) +{ + phonenum_pv_reset(pvclass); + + return phonenum_update_pv(tomatch, pvclass, cc); +} + +static int w_phonenum_match_cn(sip_msg_t *msg, char *target, char *pvname, + char *cncstr) +{ + str tomatch = STR_NULL; + str pvclass = STR_NULL; + str cncval = STR_NULL; + + if(msg == NULL) { + LM_ERR("received null msg\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t *)target, &tomatch) < 0) { + LM_ERR("cannot get the address\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)pvname, &pvclass) < 0) { + LM_ERR("cannot get the pv class\n"); + return -1; + } + if(fixup_get_svalue(msg, (gparam_t *)cncstr, &cncval) < 0) { + LM_ERR("cannot get the country code\n"); + return -1; + } + + return phonenum_match_cn(msg, &tomatch, &pvclass, &cncval); +} + /** * */ diff --git a/src/modules/phonenum/phonenum_pv.c b/src/modules/phonenum/phonenum_pv.c index f4e2763bf0..0de7b5250d 100644 --- a/src/modules/phonenum/phonenum_pv.c +++ b/src/modules/phonenum/phonenum_pv.c @@ -289,7 +289,7 @@ void phonenum_pv_reset(str *name) memset(gr, 0, sizeof(sr_phonenum_record_t)); } -int phonenum_update_pv(str *tomatch, str *name) +int phonenum_update_pv(str *tomatch, str *name, str *cncode) { sr_phonenum_record_t *gr = NULL; @@ -310,7 +310,8 @@ int phonenum_update_pv(str *tomatch, str *name) strncpy(gr->tomatch, tomatch->s, tomatch->len); gr->tomatch[tomatch->len] = '\0'; LM_DBG("attempt to match: %s\n", gr->tomatch); - gr->record = telnum_parse(gr->tomatch, "ZZ"); + gr->record = telnum_parse(gr->tomatch, + (cncode && cncode->len>0)?cncode->s:"ZZ"); if(gr->record == NULL) { LM_DBG("no match for: %s\n", gr->tomatch); return -2; diff --git a/src/modules/phonenum/phonenum_pv.h b/src/modules/phonenum/phonenum_pv.h index 1decc95f4d..2156c33be6 100644 --- a/src/modules/phonenum/phonenum_pv.h +++ b/src/modules/phonenum/phonenum_pv.h @@ -33,7 +33,7 @@ int pv_get_phonenum(struct sip_msg *msg, pv_param_t *param, int phonenum_init_pv(int smode); void phonenum_destroy_pv(void); void phonenum_pv_reset(str *pvclass); -int phonenum_update_pv(str *tomatch, str *pvclass); +int phonenum_update_pv(str *tomatch, str *pvclass, str *cncode); #endif

1 0

git:master:b8a75c1c: keepalive: cleanup rpc output (#1476)
by Guillaume Bour 27 Mar '18

27 Mar '18

Module: kamailio Branch: master Commit: b8a75c1c4fda079515606eb59273945842aff1be URL: https://github.com/kamailio/kamailio/commit/b8a75c1c4fda079515606eb59273945… Author: Guillaume Bour <guillaume.bour(a)diabolocom.com> Committer: Guillaume Bour <guillaume.bour(a)diabolocom.com> Date: 2018-03-27T21:56:49+02:00 keepalive: cleanup rpc output (#1476) --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b8a75c1c4fda079515606eb59273945… Patch: https://github.com/kamailio/kamailio/commit/b8a75c1c4fda079515606eb59273945… --- diff --git a/src/modules/keepalive/keepalive_rpc.c b/src/modules/keepalive/keepalive_rpc.c index 3444cf05c8..8efe0fb117 100644 --- a/src/modules/keepalive/keepalive_rpc.c +++ b/src/modules/keepalive/keepalive_rpc.c @@ -63,26 +63,11 @@ static const char *keepalive_rpc_list_doc[2] = { static void keepalive_rpc_list(rpc_t *rpc, void *ctx) { - void *foo, *bar, *baz; void *sub; ka_dest_t *dest; char *_ctime; char *_utime; char *_dtime; - str text = str_init("foobar"); - - if(rpc->add(ctx, "Sd", &text, 42) < 0) - LM_ERR("failed creating RPC struct\n"); - if(rpc->add(ctx, "Sd", &text, 42) < 0) - LM_ERR("failed creating RPC struct\n"); - - rpc->add(ctx, "{", &foo); - rpc->struct_add(foo, "Sd", "text", &text, "number", 42); - - rpc->add(ctx, "{", &bar); - rpc->struct_add(bar, "[", "list", &baz); - rpc->struct_add(baz, "d", "nn", 17); - rpc->struct_add(baz, "d", "nn", 22); for(dest = ka_destinations_list->first; dest != NULL; dest = dest->next) { rpc->add(ctx, "{", &sub);

1 0

no luck with xflags
by Juha Heinanen 26 Mar '18

26 Mar '18

I tested xflags by making these calls in a route block: INFO(********** setting flag 19); setflag(19); INFO(********** setting xflag 19); setxflag(19); and these calls in onreply_route block: if (isflagset(19)) INFO(********* flag 19 is set); else INFO(********* flag 19 is NOT set); if (isxflagset(19)) INFO(********* xflag 19 is set); else INFO(********* xflag 19 is NOT set); The result to syslog was: Mar 25 10:51:50 trout /usr/bin/sip-proxy[17939]: INFO: ********** setting flag 19 Mar 25 10:51:50 trout /usr/bin/sip-proxy[17939]: INFO: ********** setting xflag 19 Mar 25 10:51:50 trout /usr/bin/sip-proxy[17867]: INFO: ********* flag 19 is set Mar 25 10:51:50 trout /usr/bin/sip-proxy[17867]: INFO: ********* xflag 19 is NOT set -- Juha

2 2

git:master:2af701f0: tm: set xflags in private clone for execution on reply route
by Daniel-Constantin Mierla 26 Mar '18

26 Mar '18

Module: kamailio Branch: master Commit: 2af701f0a1df5d3c705f614167c9e815ddcc1708 URL: https://github.com/kamailio/kamailio/commit/2af701f0a1df5d3c705f614167c9e81… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-26T09:37:19+02:00 tm: set xflags in private clone for execution on reply route --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/2af701f0a1df5d3c705f614167c9e81… Patch: https://github.com/kamailio/kamailio/commit/2af701f0a1df5d3c705f614167c9e81… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index ae6befd835..d7a102e014 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2342,7 +2342,11 @@ int reply_received( struct sip_msg *p_msg ) replies_locked=1; /* transfer transaction flag to message context */ - if (t->uas.request) p_msg->flags=t->uas.request->flags; + if (t->uas.request) { + p_msg->flags=t->uas.request->flags; + memcpy(p_msg->xflags, t->uas.request->xflags, + KSR_XFLAGS_SIZE * sizeof(flag_t)); + } /* set the as avp_list the one from transaction */ backup_uri_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, @@ -2387,7 +2391,11 @@ int reply_received( struct sip_msg *p_msg ) /* restore brach last_received as before executing onreply_route */ uac->last_received = last_uac_status; /* transfer current message context back to t */ - if (t->uas.request) t->uas.request->flags=p_msg->flags; + if (t->uas.request) { + t->uas.request->flags=p_msg->flags; + memcpy(t->uas.request->xflags, p_msg->xflags, + KSR_XFLAGS_SIZE * sizeof(flag_t)); + } getbflagsval(0, &uac->branch_flags); /* restore original avp list */

1 0

git:master:8bc037bc: dialog: skip printing profiles and vars in terminated state for rpc dialog list
by Daniel-Constantin Mierla 25 Mar '18

25 Mar '18

Module: kamailio Branch: master Commit: 8bc037bc87ced907b8b2e59a2c5fcb45291836fd URL: https://github.com/kamailio/kamailio/commit/8bc037bc87ced907b8b2e59a2c5fcb4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-25T06:34:49+02:00 dialog: skip printing profiles and vars in terminated state for rpc dialog list - they can be delelted at that point, not being referenced by the same field --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/8bc037bc87ced907b8b2e59a2c5fcb4… Patch: https://github.com/kamailio/kamailio/commit/8bc037bc87ced907b8b2e59a2c5fcb4… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index e6ff0e9bc3..7fb5013afb 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -1945,7 +1945,7 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, "socket", dlg->bind_addr[DLG_CALLEE_LEG] ? &dlg->bind_addr[DLG_CALLEE_LEG]->sock_str : &empty_str); if (rpc->struct_add(h, "[", "profiles", &sh) < 0) goto error; - for (pl = dlg->profile_links ; pl ; pl=pl->next) { + for (pl = dlg->profile_links ; pl && (dlg->state<DLG_STATE_DELETED) ; pl=pl->next) { if (pl->profile->has_value) { rpc->array_add(sh, "{", &ssh); rpc->struct_add(ssh, "S", pl->profile->name.s, &pl->hash_linker.value); @@ -1955,7 +1955,7 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, } if (rpc->struct_add(h, "[", "variables", &sh) < 0) goto error; - for(var=dlg->vars ; var ; var=var->next) { + for(var=dlg->vars ; var && (dlg->state<DLG_STATE_DELETED) ; var=var->next) { rpc->array_add(sh, "{", &ssh); rpc->struct_add(ssh, "S", var->key.s, &var->value); }

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2018