sr-dev May 2017

sr-dev@lists.kamailio.org

32 participants
298 discussions

git:master:5d628a40: kazoo: remove unused variable
by lazedo 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 5d628a4093fc4f7ecb1ad6bec7172879e331f2dc URL: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-19T16:25:54+01:00 kazoo: remove unused variable --- Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… Patch: https://github.com/kamailio/kamailio/commit/5d628a4093fc4f7ecb1ad6bec717287… --- diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 3f51cbf574..1211bc4b8c 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -123,7 +123,6 @@ struct json_object * kz_json_get_field_object(str* json, str* field) json_keys keys; json_key key; char* dup; - char* token; char f1[250], f2[250];//, f3[25]; int i, parts;

1 0

git:5.0:1293dc52: Revert "kazoo: add ksr_msg_env_reset after processing events"
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: 1293dc520b6f548bb6c75bb7ab32371ce8e7c3c5 URL: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… Author: Luis Azedo <luis(a)2600hz.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:10:00+01:00 Revert "kazoo: add ksr_msg_env_reset after processing events" This reverts commit a5e68b5697688f82edbc48e64f32e15f89c8b357. --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… Patch: https://github.com/kamailio/kamailio/commit/1293dc520b6f548bb6c75bb7ab32371… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index ca3a86a19c..da310893c9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,10 +42,6 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" -#include "../../core/route.h" -#include "../../core/receive.h" -#include "../../core/action.h" -#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2284,14 +2280,11 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); - exec_post_script_cb(fmsg, REQUEST_CB_TYPE); - ksr_msg_env_reset(); - } + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); set_route_type(rtb); return 0; + } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2415,7 +2408,6 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); - ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2427,7 +2419,6 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); - ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

2 2

git:5.0:a5e68b56: kazoo: add ksr_msg_env_reset after processing events
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: a5e68b5697688f82edbc48e64f32e15f89c8b357 URL: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:08:53+01:00 kazoo: add ksr_msg_env_reset after processing events (cherry picked from commit afed885f8591ebb505511dba750d9671081c5d64) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… Patch: https://github.com/kamailio/kamailio/commit/a5e68b5697688f82edbc48e64f32e15… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index da310893c9..ca3a86a19c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,6 +42,10 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" +#include "../../core/route.h" +#include "../../core/receive.h" +#include "../../core/action.h" +#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2280,11 +2284,14 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + ksr_msg_env_reset(); + } set_route_type(rtb); return 0; - } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2408,6 +2415,7 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2419,6 +2427,7 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

1 0

git:5.0:d75e3635: kazoo: avoid creating an empty route block structure
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 5.0 Commit: d75e3635c960ddfb32bb3201feb31c248f8375ea URL: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T16:08:32+01:00 kazoo: avoid creating an empty route block structure - use route_lookup() instead of route_get(), so the empty route block is not created if the route is not defined in the kamailio.cfg (cherry picked from commit ab346e80647228afdbcaf6884a8573c9221ca38b) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… Patch: https://github.com/kamailio/kamailio/commit/d75e3635c960ddfb32bb3201feb31c2… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index f7fc8c1ff1..da310893c9 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2401,14 +2401,22 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->cb_route); + int n = route_lookup(&main_rt, cmd->cb_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_get(&main_rt, cmd->err_route); + int n = route_lookup(&main_rt, cmd->err_route); + if(n==-1) { + /* route block not found in the configuration file */ + return; + } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); }

1 0

git:master:afed885f: kazoo: add ksr_msg_env_reset after processing events
by lazedo 19 May '17

19 May '17

Module: kamailio Branch: master Commit: afed885f8591ebb505511dba750d9671081c5d64 URL: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2017-05-19T16:04:45+01:00 kazoo: add ksr_msg_env_reset after processing events --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… Patch: https://github.com/kamailio/kamailio/commit/afed885f8591ebb505511dba750d967… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index da310893c9..ca3a86a19c 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -42,6 +42,10 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" #include "../tm/tm_load.h" +#include "../../core/route.h" +#include "../../core/receive.h" +#include "../../core/action.h" +#include "../../core/script_cb.h" #include "kz_amqp.h" @@ -2280,11 +2284,14 @@ int kz_amqp_consumer_fire_event(char *eventkey) fmsg = faked_msg_get_next(); rtb = get_route_type(); set_route_type(REQUEST_ROUTE); - init_run_actions_ctx(&ctx); - run_top_route(event_rt.rlist[rt], fmsg, 0); + if (exec_pre_script_cb(fmsg, REQUEST_CB_TYPE)!=0 ) { + init_run_actions_ctx(&ctx); + run_top_route(event_rt.rlist[rt], fmsg, 0); + exec_post_script_cb(fmsg, REQUEST_CB_TYPE); + ksr_msg_env_reset(); + } set_route_type(rtb); return 0; - } void kz_amqp_consumer_event(char *payload, char* event_key, char* event_subkey) @@ -2408,6 +2415,7 @@ void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) @@ -2419,6 +2427,7 @@ void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) } struct action *a = main_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); + ksr_msg_env_reset(); } int kz_send_worker_error_event(kz_amqp_cmd_ptr cmd)

1 0

git:master:dc47a6b2: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 19 May '17

19 May '17

Module: kamailio Branch: master Commit: dc47a6b284260c521c74dcf4a8cc967c108def30 URL: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-05-19T15:01:24+02:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… Patch: https://github.com/kamailio/kamailio/commit/dc47a6b284260c521c74dcf4a8cc967… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index 398921da83..4be5d66028 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -330,7 +330,7 @@ Chapter 1. Admin Guide 3.1. list_file (string) - Path to the file with destination sets. + Path to the file with destination sets (destination groups). Default value is “/etc/kamailio/dispatcher.list” or “/usr/local/etc/kamailio/dispatcher.list”. @@ -342,7 +342,7 @@ modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list") 3.2. db_url (string) - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter. Default value is “NULL” (disable DB support). @@ -354,7 +354,7 @@ modparam("dispatcher", "db_url", "mysql://user:passwb@localhost/database") 3.3. table_name (string) - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter as the database name. Default value is “dispatcher”. @@ -366,7 +366,7 @@ modparam("dispatcher", "table_name", "my_dispatcher") 3.4. setid_col (string) - The column's name in the database storing the gateway's group id. + The column's name in the database storing the gateway's set (group) id. Default value is “setid”. @@ -1233,8 +1233,8 @@ kamcmd dispatcher.ping_active 0 6.1. Destination List File Each destination point must be on one line. First token is the set id - (an integer value), followed by destination address (s string value in - SIP URI format). + (an integer value, also referenced by group id), followed by + destination address (string value in full SIP URI format). Optionally, these fields can be followed by: * flags (listed by index - can be bitwise mask of values): 0 (value @@ -1285,21 +1285,21 @@ setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attrs(str,opt) Example 1.43. dispatcher list file ... -# $Id$ -# dispatcher destination sets +# +# dispatcher destination sets (groups) # # line format -# setit(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(st +# setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(st r,opt) # proxies -2 sip:127.0.0.1:5080 -2 sip:127.0.0.1:5082 +2 sip:127.0.0.1:5080;transport=tcp 0 10 class=4;prefix=448;strip=2 +2 sip:127.0.0.1:5082;px=vx 0 5 duid=abc;socket=udp:192.168.0.125:5060;pipe=p10 # gateways -1 sip:127.0.0.1:7070 -1 sip:127.0.0.1:7072 +1 sip:127.0.0.1:7070 0 0 duid=xyz;maxload=20 +1 sip:127.0.0.1:7072 0 5 1 sip:127.0.0.1:7074 ...

1 0

git:master:45989d3c: dispatcher: updated the example of destinations list file
by Daniel-Constantin Mierla 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 45989d3c53242f8f5f29229333617c7bc00fd3ac URL: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-19T14:58:07+02:00 dispatcher: updated the example of destinations list file --- Modified: src/modules/dispatcher/doc/dispatcher.list Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… Patch: https://github.com/kamailio/kamailio/commit/45989d3c53242f8f5f29229333617c7… --- diff --git a/src/modules/dispatcher/doc/dispatcher.list b/src/modules/dispatcher/doc/dispatcher.list index 25e9c6ebf2..03fbb4e491 100644 --- a/src/modules/dispatcher/doc/dispatcher.list +++ b/src/modules/dispatcher/doc/dispatcher.list @@ -1,15 +1,15 @@ -# $Id$ -# dispatcher destination sets +# +# dispatcher destination sets (groups) # # line format -# setit(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(str,opt) +# setid(int) destination(sip uri) flags(int,opt) priority(int,opt) attributes(str,opt) # proxies -2 sip:127.0.0.1:5080 -2 sip:127.0.0.1:5082 +2 sip:127.0.0.1:5080;transport=tcp 0 10 class=4;prefix=448;strip=2 +2 sip:127.0.0.1:5082;px=vx 0 5 duid=abc;socket=udp:192.168.0.125:5060;pipe=p10 # gateways -1 sip:127.0.0.1:7070 -1 sip:127.0.0.1:7072 +1 sip:127.0.0.1:7070 0 0 duid=xyz;maxload=20 +1 sip:127.0.0.1:7072 0 5 1 sip:127.0.0.1:7074 diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index ab40fb5f00..b5315acc2d 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -77,7 +77,7 @@ <section id="dispatcher.p.list_file"> <title><varname>list_file</varname> (string)</title> <para> - Path to the file with destination sets. + Path to the file with destination sets (destination groups). </para> <para> <emphasis> @@ -98,7 +98,7 @@ modparam("dispatcher", "list_file", "/var/run/kamailio/dispatcher.list") <section id="dispatcher.p.db_url"> <title><varname>db_url</varname> (string)</title> <para> - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter. </para> <para> @@ -119,7 +119,7 @@ modparam("dispatcher", "db_url", "mysql://user:passwb@localhost/database") <section id="dispatcher.p.table_name"> <title><varname>table_name</varname> (string)</title> <para> - If you want to load the sets of gateways from the database you must set + If you want to load the list of gateways from the database you must set this parameter as the database name. </para> <para> @@ -140,7 +140,8 @@ modparam("dispatcher", "table_name", "my_dispatcher") <section id="dispatcher.p.setid_col"> <title><varname>setid_col</varname> (string)</title> <para> - The column's name in the database storing the gateway's group id. + The column's name in the database storing the gateway's set (group) + id. </para> <para> <emphasis> @@ -1524,8 +1525,8 @@ onreply_route { <title>Destination List File</title> <para> Each destination point must be on one line. First token is the set - id (an integer value), followed by destination address - (s string value in SIP URI format). + id (an integer value, also referenced by group id), followed by + destination address (string value in full SIP URI format). </para> <para> Optionally, these fields can be followed by:

1 0

git:master:6fb2dad3: tm: updated old style log macros
by Daniel-Constantin Mierla 19 May '17

19 May '17

Module: kamailio Branch: master Commit: 6fb2dad334850b2a616bb2500b4df2797f6ed54f URL: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-05-19T14:16:40+02:00 tm: updated old style log macros --- Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/tm_load.c Modified: src/modules/tm/tm_load.h Modified: src/modules/tm/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27… Patch: https://github.com/kamailio/kamailio/commit/6fb2dad334850b2a616bb2500b4df27…

1 0

[kamailio/kamailio] registrar: fix xavp_rcd memory consumption (#1111)
by lazedo 19 May '17

19 May '17

xavp_rcd keeps accumulating values leading to shm exaustion You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1111 -- Commit Summary -- * registrar: fix xavp_rcd memory consumption -- File Changes -- M src/modules/registrar/lookup.c (8) M src/modules/registrar/reply.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1111.patch https://github.com/kamailio/kamailio/pull/1111.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/1111

2 37

git:4.4:9e343f35: registrar: proper linking of xavps in the xavp_rcd
by Luis Azedo 19 May '17

19 May '17

Module: kamailio Branch: 4.4 Commit: 9e343f3585a148f9a117195f179723e74bc475e8 URL: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2017-05-19T12:45:17+01:00 registrar: proper linking of xavps in the xavp_rcd - avoid leaking of shm when using save() in async operations - part of PR #1111 (cherry picked from commit bb3840161acd3b2dbe41001ebfb2bd779bfd68d0) Conflicts: modules/registrar/lookup.c modules/registrar/reply.c --- Modified: modules/registrar/lookup.c Modified: modules/registrar/reply.c --- Diff: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… Patch: https://github.com/kamailio/kamailio/commit/9e343f3585a148f9a117195f179723e… --- diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index 50da15d622..62c0bf86a6 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -96,8 +96,9 @@ int lookup_to_dset(struct sip_msg* _m, udomain_t* _d, str* _uri) { * add xavp with details of the record (ruid, ...) */ int xavp_rcd_helper(ucontact_t* ptr) { - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname_ruid = {"ruid", 4}; str xname_received = { "received", 8}; str xname_contact = { "contact", 7}; @@ -105,34 +106,34 @@ int xavp_rcd_helper(ucontact_t* ptr) { if(ptr==NULL) return -1; - if(reg_xavp_rcd.s!=NULL) - { - list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; - memset(&xval, 0, sizeof(sr_xval_t)); - xval.type = SR_XTYPE_STR; - xval.v.s = ptr->ruid; - xavp_add_value(&xname_ruid, &xval, &xavp); - - if(ptr->received.len > 0) - { - memset(&xval, 0, sizeof(sr_xval_t)); - xval.type = SR_XTYPE_STR; - xval.v.s = ptr->received; - xavp_add_value(&xname_received, &xval, &xavp); - } + if(reg_xavp_rcd.s==NULL || reg_xavp_rcd.len<=0) return 0; + + list = xavp_get(&reg_xavp_rcd, NULL); + xavp = list ? &list->val.v.xavp : &new_xavp; + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = ptr->ruid; + xavp_add_value(&xname_ruid, &xval, xavp); + if(ptr->received.len > 0) { memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; - xval.v.s = ptr->c; - xavp_add_value(&xname_contact, &xval, &xavp); - - if(list==NULL) - { - /* no reg_xavp_rcd xavp in root list - add it */ - xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; - xavp_add_value(&reg_xavp_rcd, &xval, NULL); + xval.v.s = ptr->received; + xavp_add_value(&xname_received, &xval, xavp); + } + + memset(&xval, 0, sizeof(sr_xval_t)); + xval.type = SR_XTYPE_STR; + xval.v.s = ptr->c; + xavp_add_value(&xname_contact, &xval, xavp); + + if(list==NULL) { + /* no reg_xavp_rcd xavp in root list - add it */ + xval.type = SR_XTYPE_XAVP; + xval.v.xavp = *xavp; + if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { + LM_ERR("cannot add ruid xavp to root list\n"); + xavp_destroy_list(xavp); } } return 0; diff --git a/modules/registrar/reply.c b/modules/registrar/reply.c index 27cc6f3bca..884012b443 100644 --- a/modules/registrar/reply.c +++ b/modules/registrar/reply.c @@ -173,8 +173,9 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) unsigned int ahash; unsigned short digit; int mode; - sr_xavp_t *xavp=NULL; + sr_xavp_t **xavp=NULL; sr_xavp_t *list=NULL; + sr_xavp_t *new_xavp=NULL; str xname = {"ruid", 4}; sr_xval_t xval; @@ -212,7 +213,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) if(reg_xavp_rcd.s!=NULL) { list = xavp_get(&reg_xavp_rcd, NULL); - xavp = list; + xavp = list ? &list->val.v.xavp : &new_xavp; } fl = 0; @@ -334,7 +335,7 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_STR; xval.v.s = c->ruid; - if(xavp_add_value(&xname, &xval, &xavp)==NULL) { + if(xavp_add_value(&xname, &xval, xavp)==NULL) { LM_ERR("cannot add ruid value to xavp\n"); } } @@ -346,14 +347,13 @@ int build_contact(sip_msg_t *msg, ucontact_t* c, str *host) /* add xavp with details of the record (ruid, ...) */ if(reg_xavp_rcd.s!=NULL) { - if(list==NULL && xavp!=NULL) + if(list==NULL && *xavp!=NULL) { - /* no reg_xavp_rcd xavp in root list - add it */ xval.type = SR_XTYPE_XAVP; - xval.v.xavp = xavp; + xval.v.xavp = *xavp; if(xavp_add_value(&reg_xavp_rcd, &xval, NULL)==NULL) { LM_ERR("cannot add ruid xavp to root list\n"); - xavp_destroy_list(&xavp); + xavp_destroy_list(xavp); } } }

1 0

← Newer
1
...
12
13
14
15
16
17
18
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2017