sr-dev January 2015

sr-dev@lists.kamailio.org

38 participants
531 discussions

Registrar - check for local path
by Charles Chance 09 Jan '15

09 Jan '15

Hi All, Can anyone see a problem with doing (something like) the following, to handle the situation like http://lists.sip-router.org/pipermail/sr-users/2014-October/085251.html? Admittedly, it is probably a less common use case, but it has been raised several times on the list so I believe it is a genuine one. diff --git a/modules/registrar/lookup.c b/modules/registrar/lookup.c index 794d968..66730b4 100644 --- a/modules/registrar/lookup.c +++ b/modules/registrar/lookup.c @@ -41,6 +41,7 @@ #include "../../action.h" #include "../../mod_fix.h" #include "../../parser/parse_rr.h" +#include "../../forward.h" #include "../usrloc/usrloc.h" #include "common.h" #include "regtime.h" @@ -121,6 +122,7 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) sr_xavp_t *list=NULL; str xname = {"ruid", 4}; sr_xval_t xval; + sip_uri_t path_uri; ret = -1; @@ -265,6 +267,14 @@ int lookup_helper(struct sip_msg* _m, udomain_t* _d, str* _uri, int _mode) ret = -3; goto done; } + if (parse_uri(path_dst.s, path_dst.len, &path_uri) < 0){ + LM_ERR("failed to parse the Path URI\n"); + ret = -3; + goto done; + } + } + /* Only use path-uri if non-local */ + if (path_uri.host.s && !check_self(&(path_uri.host), 0, 0)) { if (set_path_vector(_m, &ptr->path) < 0) { LM_ERR("failed to set path vector\n"); ret = -3; The above needs to be repeated in lookup_branches function of same file, but I wanted to check others' opinions first. Best regards, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

4 18

git:master:d28fdbb8: htable: regenerated readme
by Charles Chance 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: d28fdbb810fff638a1e0acce2dc1e3e5377ead37 URL: https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-01-09T17:08:46Z htable: regenerated readme --- Modified: modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e… Patch: https://github.com/kamailio/kamailio/commit/d28fdbb810fff638a1e0acce2dc1e3e…

1 0

git:master:95a7d147: htable: update documentation to reiterate importance of loading DMQ module first if enable_dmq is set
by Charles Chance 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: 95a7d14716bdcc7c8fd27bcf8f2449e719a02eac URL: https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-01-09T17:06:14Z htable: update documentation to reiterate importance of loading DMQ module first if enable_dmq is set - previously only mentioned in module dependency section --- Modified: modules/htable/doc/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e… Patch: https://github.com/kamailio/kamailio/commit/95a7d14716bdcc7c8fd27bcf8f2449e… --- diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 2e78d0c..9007813 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -633,6 +633,11 @@ modparam("htable", "db_expires", 1) table definition (size, autoexpire etc.) is identical across all instances. </para> <para> + <emphasis> + Important: If this parameter is enabled, the DMQ module must be loaded first - otherwise, startup will fail. + </emphasis> + </para> + <para> Currently, values are not replicated on load from DB as it is expected that in these cases, all servers will load their values from the same DB. </para>

1 0

git:master:c32f75cc: Makefile.groups: added grou for jansson modules
by Daniel-Constantin Mierla 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: c32f75cc1a02537474614f52cecfd5a19c56184d URL: https://github.com/kamailio/kamailio/commit/c32f75cc1a02537474614f52cecfd5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-09T17:58:12+01:00 Makefile.groups: added grou for jansson modules --- Modified: Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/c32f75cc1a02537474614f52cecfd5a… Patch: https://github.com/kamailio/kamailio/commit/c32f75cc1a02537474614f52cecfd5a… --- diff --git a/Makefile.groups b/Makefile.groups index b3229ad..283b693 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -131,9 +131,12 @@ mod_list_sqlite=db_sqlite # - modules depending on oracle library mod_list_oracle=db_oracle -# - modules depending on json library +# - modules depending on json (+libevent) library mod_list_json=json jsonrpc-c +# - modules depending on jansson (+libevent) library +mod_list_jansson=jansson janssonrpc-c + # - modules depending on redis library mod_list_redis=ndb_redis @@ -196,7 +199,8 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_sctp) $(mod_list_autheph) \ $(mod_list_gzcompress) $(mod_list_uuid) \ $(mod_list_ev) $(mod_list_kazoo) \ - $(mod_list_mongodb) $(mod_list_cnxcc)) + $(mod_list_mongodb) $(mod_list_cnxcc) \ + $(mod_list_jansson)) @@ -330,6 +334,9 @@ module_group_ksqlite=$(mod_list_sqlite) # K json modules module_group_kjson=$(mod_list_json) +# K jansson modules +module_group_kjansson=$(mod_list_jansson) + # pkg redis module module_group_kredis=$(mod_list_redis)

1 0

git:master:9b4bdad0: janssonrpc-c: new jsonrpc client module using jansson library
by Daniel-Constantin Mierla 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: 9b4bdad0f23f47d28d3cabe1771d8bbc7590f86f URL: https://github.com/kamailio/kamailio/commit/9b4bdad0f23f47d28d3cabe1771d8bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-09T17:24:49+01:00 janssonrpc-c: new jsonrpc client module using jansson library - alternative to jsonrpc-c module, refactored to use jansson and libevent libraries - rescued from branch mgw/json --- Added: modules/janssonrpc-c/Makefile Added: modules/janssonrpc-c/README Added: modules/janssonrpc-c/doc/Makefile Added: modules/janssonrpc-c/doc/janssonrpc-c.xml Added: modules/janssonrpc-c/doc/janssonrpc-c_admin.xml Added: modules/janssonrpc-c/janssonrpc.h Added: modules/janssonrpc-c/janssonrpc_connect.c Added: modules/janssonrpc-c/janssonrpc_connect.h Added: modules/janssonrpc-c/janssonrpc_funcs.c Added: modules/janssonrpc-c/janssonrpc_funcs.h Added: modules/janssonrpc-c/janssonrpc_global.c Added: modules/janssonrpc-c/janssonrpc_io.c Added: modules/janssonrpc-c/janssonrpc_io.h Added: modules/janssonrpc-c/janssonrpc_mod.c Added: modules/janssonrpc-c/janssonrpc_request.c Added: modules/janssonrpc-c/janssonrpc_request.h Added: modules/janssonrpc-c/janssonrpc_server.c Added: modules/janssonrpc-c/janssonrpc_server.h Added: modules/janssonrpc-c/janssonrpc_srv.c Added: modules/janssonrpc-c/janssonrpc_srv.h Added: modules/janssonrpc-c/netstring.c Added: modules/janssonrpc-c/netstring.h Added: modules/janssonrpc-c/test/mem-test.sh Added: modules/janssonrpc-c/test/run-tests.sh Added: modules/janssonrpc-c/test/test.cfg Added: modules/janssonrpc-c/unit_tests/Makefile Added: modules/janssonrpc-c/unit_tests/netstring.c Added: modules/janssonrpc-c/unit_tests/seatest/license.txt Added: modules/janssonrpc-c/unit_tests/seatest/seatest.c Added: modules/janssonrpc-c/unit_tests/seatest/seatest.h Added: modules/janssonrpc-c/unit_tests/test.h --- Diff: https://github.com/kamailio/kamailio/commit/9b4bdad0f23f47d28d3cabe1771d8bb… Patch: https://github.com/kamailio/kamailio/commit/9b4bdad0f23f47d28d3cabe1771d8bb…

1 0

git:master:2e6af40e: jansson: new module for json doc handling using jansson library
by Daniel-Constantin Mierla 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: 2e6af40ed023c5dac59e39c18e85244e9308945e URL: https://github.com/kamailio/kamailio/commit/2e6af40ed023c5dac59e39c18e85244… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-01-09T17:17:23+01:00 jansson: new module for json doc handling using jansson library - alternative to existing json module, but with support for json-path expressions - rescued from branch mgw/json --- Added: modules/jansson/Makefile Added: modules/jansson/README Added: modules/jansson/doc/Makefile Added: modules/jansson/doc/jansson.xml Added: modules/jansson/doc/jansson_admin.xml Added: modules/jansson/jansson_funcs.c Added: modules/jansson/jansson_funcs.h Added: modules/jansson/jansson_mod.c Added: modules/jansson/jansson_path.c Added: modules/jansson/jansson_path.h Added: modules/jansson/jansson_utils.c Added: modules/jansson/jansson_utils.h --- Diff: https://github.com/kamailio/kamailio/commit/2e6af40ed023c5dac59e39c18e85244… Patch: https://github.com/kamailio/kamailio/commit/2e6af40ed023c5dac59e39c18e85244…

1 0

git:4.2:840d15e0: dmq: Don't delete the original notification_peer on timeout
by Charles Chance 09 Jan '15

09 Jan '15

Module: kamailio Branch: 4.2 Commit: 840d15e03523413282426135175e25761488bcac URL: https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e257… Author: Alex Hermann <alex(a)speakup.nl> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-01-09T15:56:51Z dmq: Don't delete the original notification_peer on timeout (cherry picked from commit e73aa4032873b3fca88bb809d6d4ce4f28c0f237) (cherry picked from commit 69dc8ec9fce8628cdf9bf39f7a25136544ae9a29) --- Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e257… Patch: https://github.com/kamailio/kamailio/commit/840d15e03523413282426135175e257… --- diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 85584d2..2acb9a8 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -296,9 +296,12 @@ int notification_resp_callback_f(struct sip_msg* msg, int code, if(code == 408) { /* deleting node - the server did not respond */ LM_ERR("deleting server %.*s because of failed request\n", STR_FMT(&node->orig_uri)); + if (STR_EQ(node->orig_uri, dmq_notification_address)) { + LM_ERR("not deleting notification_peer\n"); + return 0; + } ret = del_dmq_node(node_list, node); LM_DBG("del_dmq_node returned %d\n", ret); } return 0; } -

1 0

git:4.2:120bf4a4: dmq: force to send replicated messages from configured server address - as reported on list by Victor Kustov
by Charles Chance 09 Jan '15

09 Jan '15

Module: kamailio Branch: 4.2 Commit: 120bf4a4f6854592bd910334d4d0bd97c9f94974 URL: https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd9… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-01-09T15:55:20Z dmq: force to send replicated messages from configured server address - as reported on list by Victor Kustov (cherry picked from commit 7b5f79f9f384bfe3c16c399184281ebe63bb7785) --- Modified: modules/dmq/dmq_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd9… Patch: https://github.com/kamailio/kamailio/commit/120bf4a4f6854592bd910334d4d0bd9… --- diff --git a/modules/dmq/dmq_funcs.c b/modules/dmq/dmq_funcs.c index 4b323c2..7430193 100644 --- a/modules/dmq/dmq_funcs.c +++ b/modules/dmq/dmq_funcs.c @@ -383,6 +383,7 @@ int cfg_dmq_bcast_message(struct sip_msg* msg, char* peer, char* body, char* con int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) { dmq_node_t* node; + struct socket_info* sock; int i = 0; /* avoid loops - do not replicate if message has come from another node @@ -394,6 +395,12 @@ int cfg_dmq_t_replicate(struct sip_msg* msg, char* s) return -1; } + /* TODO - backup/restore original send socket */ + sock = lookup_local_socket(&dmq_server_socket); + if (sock) { + set_force_socket(msg, sock); + } + lock_get(&node_list->lock); node = node_list->nodes; while(node) {

1 0

git:master:8d7b9db5: pua_dialoginfo: do not free dlginfo_cell too early
by Charles Chance 09 Jan '15

09 Jan '15

Module: kamailio Branch: master Commit: 8d7b9db5d3b290c9f180dac8610a61a7cee9d192 URL: https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2015-01-09T14:20:07Z pua_dialoginfo: do not free dlginfo_cell too early - it is required later in the dialog callbacks - it will be freed anyway during dialog destruction --- Modified: modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a… Patch: https://github.com/kamailio/kamailio/commit/8d7b9db5d3b290c9f180dac8610a61a… --- diff --git a/modules/pua_dialoginfo/pua_dialoginfo.c b/modules/pua_dialoginfo/pua_dialoginfo.c index 6761a72..7bed1998 100644 --- a/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/modules/pua_dialoginfo/pua_dialoginfo.c @@ -598,7 +598,6 @@ __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) (include_req_uri)?&(dlg->req_uri):&(dlg->to_uri), &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0); - free_dlginfo_cell(dlginfo); }

1 0

Segfault in pua_dialoginfo
by Charles Chance 09 Jan '15

09 Jan '15

Hello, I am investigating a crash which is happening since: commit 0c11f4f9c235bf791ac39446c293483462a99354 Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Dec 29 22:26:46 2014 +0100 pua_dialoginfo: load dialogs for dialoginfo event upon restart - based on a patch by Kristian HÃ¸gh, FS#360 The problem appears to be that in this function of pua_dialoginfo.c... static void __dialog_created(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) { struct sip_msg *request = _params->req; struct dlginfo_cell *dlginfo; if (request->REQ_METHOD != METHOD_INVITE) return; if(send_publish_flag > -1 && !(request->flags & (1<<send_publish_flag))) return; LM_DBG("new INVITE dialog created: from=%.*s\n", dlg->from_uri.len, dlg->from_uri.s); dlginfo=get_dialog_data(dlg, type); if(dlginfo==NULL) return; dialog_publish_multi("Trying", dlginfo->pubruris_caller, &(dlg->from_uri), (include_req_uri)?&(dlg->req_uri):&(dlg->to_uri), &(dlg->callid), 1, dlginfo->lifetime, 0, 0, 0, 0, (send_publish_flag==-1)?1:0); free_dlginfo_cell(dlginfo); } ...dlginfo is freed, but is still being referenced in the callback registered here... struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) { ... /* register dialog callbacks which triggers sending PUBLISH */ if (dlg_api.register_dlgcb(dlg, DLGCB_FAILED| DLGCB_CONFIRMED_NA | DLGCB_TERMINATED | DLGCB_EXPIRED | DLGCB_REQ_WITHIN | DLGCB_EARLY, __dialog_sendpublish, dlginfo, free_dlginfo_cell) != 0) { LM_ERR("cannot register callback for interesting dialog types\n"); free_dlginfo_cell(dlginfo); return NULL; } ... return(dlginfo); } Can the freeing of this structure simply be left up to the dialog module when the dialog is eventually destroyed? All the best, Charles -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Faraday Wharf, Innovation Birmingham Campus, Holt Street, Birmingham Science Park, Birmingham B7 4BB.

2 1

← Newer
1
...
32
33
34
35
36
37
38
...
54
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2015