sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

New commits on branch 4.1
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f03a94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 4 09:43:39 2014 +0100 geoip: for safety checks for the case when geoip_match() is not executed - but the geoip pv is accessed - reported by Juha Heinanen (cherry picked from commit 56ed48bf48c3d78ff5d214833e09a5759f0b5928) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e1d6ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 3 19:15:30 2014 +0100 uac_redirect: select the contacts with highest q when a limit is set - reported by Stefan Prelle, FS#349 (cherry picked from commit a9b3286a5ace0f66852054634b46c0647c8d1271) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7745bf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 2 15:40:17 2014 +0100 tm: t_continue() polishing - variables declared at beginning of function to work on old C standard compilers - log messages compacted - function name and log level are prefixed automatically - stay under 80 chars per line to fit in text terminals (cherry picked from commit 47f6cfd76a9d801a83ca14b55926d389f6c3c2da) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c99b81f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 1 10:46:57 2014 +0100 tm: 487 Request Terminated has priority when transaction is cancelled and no reply received from downstream - for cancel_b_method 1, timeout was sent back even when transaction was canceled (cherry picked from commit 6c3725d5535e0b5bff5c63251d37e7139f92321c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02c9964… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 27 08:48:42 2014 +0100 geoip: safety check to see if the result structure is filled - return $null if not - reported by Juha Heinanen (cherry picked from commit 721ffe3576e8e7891c27f8578eb244a857ede759) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6d8aa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 26 20:30:34 2014 +0100 parser/parse_fline: print offset in log message when failing to parse first line (cherry picked from commit a111b33ae7b64dbf9486f2fc4b7f3007f4015e77) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dadf3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Feb 26 10:45:24 2014 +0100 mtree: enahced docs to specify that the mtree parameter can be set many times (cherry picked from commit 0b122416932030c9459f16d46438489b115941aa) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6f6a050… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 24 19:15:13 2014 +0100 dialog: don't add dialog profiles when loading from db and state is terminated (cherry picked from commit 9b88eb7ee2d243882383a44f601baa21fd679cd5) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5499306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 24 18:53:55 2014 +0100 dialog: remove dialog from profile as soon as gets to terminated state (cherry picked from commit edf61acb57ed5e8ee0ca9ec1f796e43ce993be48) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0b05cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 24 18:17:00 2014 +0100 mtree: reset tree statistics upon reload - related to FS#398, reported by JoshE (cherry picked from commit 94bad4414b36334061ef0d3ec42747d672eaf058) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4cf30f… Author: David M. Lee <dlee(a)digium.com> Date: Mon Feb 10 15:22:11 2014 -0600 call_control: Passthrough sip_application Current patches being submitted to CDRTool and the call_control daemon allow for SIP application type to be specified. This allows audio or video services to be rated differently, or even different ratings for application subtypes (audio.inbound vs. audio.outbound). This patch allows the sip_application value to be passed through to the call_control daemon. (cherry picked from commit 0a4519af5c1ea3f61362fba7451eb4acc479d488) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=100b1f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 21 18:26:34 2014 +0100 topoh: let replies for CANCEL requests be handled - CANCEL is hop by hop, but can have the call-id hidden when sending out (cherry picked from commit 376d8b3972d96b70d1e12cc57104475b2ee7ade8) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3eb337b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 21 17:58:19 2014 +0100 topoh: don't encode/decode content for local generated messages - requests generated by kamailio don't have headers that should be hidden - replies to them don't have anything hidden - update as part of report from FS#390 (cherry picked from commit 41f12e01b20a6b32d26297fbdf6ce17d40823ef2) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=008e43e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Feb 3 11:40:43 2014 +0100 db_cluster: updated the old application name in doc examples (cherry picked from commit 32f688659fcc6f7c44d9095e585951780e277522) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ae3db7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 30 12:14:48 2014 +0100 core: test the limits of nested select level before accessing array value (cherry picked from commit b61f173a8dc40592809912e137e42d8ffe1154fa) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=46f2ebd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 30 12:12:44 2014 +0100 utils/db_berkeley: release file description in error cases (cherry picked from commit e7a0840a1334280650d4abb865843da0072adec6) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92a0157… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 29 22:10:09 2014 +0100 sercmd: memset with proper size (cherry picked from commit d0ebc7fa4b4b20bee83f57b3f0d0e6e75b5f0b08) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b06c12f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:54:50 2014 +0100 core: avoid warning of using bitwise operator with boolean result - on a report generated by cppcheck sent by David Binderman (cherry picked from commit cfb815e440804c2870126c1c098362d5a117f97c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f8bb8cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:47:42 2014 +0100 core/parse_methods: removed duplicate check for same characters - on a report generated by cppcheck sent by David Binderman (cherry picked from commit 935f06eb8c34fe5fe82588cdd5b4af2f68c51466) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4599ae5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:43:13 2014 +0100 xhttp: check first the possition limits then access the data - in the eval function for the transformation - on a report generated by cppcheck sent by David Binderman (cherry picked from commit 79bfabdc2ae35a5b280c6a23ff611a005dac333c) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90c7829… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:39:19 2014 +0100 db_postgres: fixed condition checking the parameter for db uri parsing - on a report generated by cppcheck sent by David Binderman (cherry picked from commit 480b6d4dfc954fbbb8afb9dbbbf17b80dcdf71ce) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=75203ca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:36:21 2014 +0100 db_mysql: fixed condition checking the parameter for db uri parsing - on a report generated by cppcheck sent by David Binderman (cherry picked from commit c0b2e567b2a27d5d29ede39409d6299f7d375d87)

1 0

git:4.1: db_cluster: fix caseness in testing the connection flags for reading
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: 5556a88594d46030d978987eb387427f63875d73 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5556a88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 28 18:30:30 2014 +0100 db_cluster: fix caseness in testing the connection flags for reading - on a report generated by cppcheck sent by David Binderman (cherry picked from commit 88a1a1b25b5228ef2e34ee01e0dd5d4e4f6ffe20) --- modules/db_cluster/dbcl_data.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/db_cluster/dbcl_data.c b/modules/db_cluster/dbcl_data.c index 5ef3b63..ca821bc 100644 --- a/modules/db_cluster/dbcl_data.c +++ b/modules/db_cluster/dbcl_data.c @@ -249,7 +249,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) goto error; } i = s.s[0] - '0'; - if(s.s[1]!='s' && s.s[1]!='S' && s.s[1]!='r' && s.s[1]!='r') + if(s.s[1]!='s' && s.s[1]!='S' && s.s[1]!='r' && s.s[1]!='R') { LM_ERR("invalid parameter [%.*s] for connection id [%.*s]\n", pit->body.len, pit->body.s, @@ -277,7 +277,7 @@ int dbcl_cls_set_connections(dbcl_cls_t *cls, str *cons) goto error; } i = s.s[2] - '0'; - if(s.s[3]!='s' && s.s[3]!='S' && s.s[3]!='r' && s.s[3]!='r' + if(s.s[3]!='s' && s.s[3]!='S' && s.s[3]!='r' && s.s[3]!='R' && s.s[3]!='p' && s.s[3]!='P') { LM_ERR("invalid parameter [%.*s] for connection id [%.*s]\n",

1 0

git:4.1: modules/presence: fix crash in main/ attendant process when using presence module in library mode
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: b64064b15759217821d936732e2da0c129cf89d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b64064b… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 23 17:25:04 2014 +0200 modules/presence: fix crash in main/attendant process when using presence module in library mode (cherry picked from commit 20302744b22858e0e215e74e2a6656677881bb4a) --- modules/presence/presence.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/presence/presence.c b/modules/presence/presence.c index 6a87776..a35fcec 100644 --- a/modules/presence/presence.c +++ b/modules/presence/presence.c @@ -422,6 +422,11 @@ static int child_init(int rank) if (rank==PROC_INIT || rank==PROC_TCP_MAIN) return 0; + pid = my_pid(); + + if(library_mode) + return 0; + if (rank == PROC_MAIN) { int i; @@ -445,11 +450,6 @@ static int child_init(int rank) return 0; } - pid = my_pid(); - - if(library_mode) - return 0; - if (pa_dbf.init==0) { LM_CRIT("child_init: database not bound\n");

1 0

git:4.1: tm: free from and to display names that can be set for local request from seas module
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: 3c8fe5c1a8f7b4469657199adc4056539fdf47d8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c8fe5c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jan 20 17:24:18 2014 +0100 tm: free from and to display names that can be set for local request from seas module - reported and patch by Ziad Habchi (cherry picked from commit 1b53001ad3ad1e9bfd3e64f8e03c35d4e5f54e8d) --- modules/tm/dlg.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/dlg.c b/modules/tm/dlg.c index 647e34f..05e7d48 100644 --- a/modules/tm/dlg.c +++ b/modules/tm/dlg.c @@ -1216,6 +1216,9 @@ void free_dlg(dlg_t* _d) if (_d->rem_target.s) shm_free(_d->rem_target.s); if (_d->dst_uri.s) shm_free(_d->dst_uri.s); + if (_d->loc_dname.s) shm_free(_d->loc_dname.s); + if (_d->rem_dname.s) shm_free(_d->rem_dname.s); + /* Free all routes in the route set */ shm_free_rr(&_d->route_set); shm_free(_d);

1 0

git:4.1: modules/rls: changed default hash size from 512 to 9 to avoid overflow
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: b5e78a88838702088b9f0f0559aced1a5431281f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b5e78a8… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 23 17:21:04 2014 +0200 modules/rls: changed default hash size from 512 to 9 to avoid overflow (cherry picked from commit 48bb4b562d7d7ec20b45dbe555836bb8969b988d) --- modules/rls/rls.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/rls/rls.c b/modules/rls/rls.c index 08dedcf..453b43e 100644 --- a/modules/rls/rls.c +++ b/modules/rls/rls.c @@ -89,7 +89,7 @@ int *rls_notifier_id = NULL; str db_url = str_init(DEFAULT_DB_URL); str xcap_db_url = str_init(""); str rlpres_db_url = str_init(""); -int hash_size = 512; +int hash_size = 9; shtable_t rls_table; contains_event_t pres_contains_event; search_event_t pres_search_event;

1 0

[tracker] Comment added: Coredump on using jsonrpc_request
by sip-router 05 Mar '14

05 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#404 - Coredump on using jsonrpc_request User who did this - davy van de moere (davyvdm) ---------- With your patch, I can't get kamailio to crash anymore. However, I do have an issue with the jsonrpc-c module, perhaps I'm doing it wrong, but just in case it would be a related bug, it might be relevant to touch it: I added this in the kamailio routing (a bit before pushing it to RELAY): xlog("L_INFO", "Pre jsonrpc request"); jsonrpc_request("bar.dosmth", "{'ru':'$rU','rb':'$rb'}", "JSONRESPONSE", "JSONERROR", "$var(result)"); xlog("L_INFO","Post jsonrpc request"); In the log file I can see the Pre jsonrpc request being printed, and I can have things executed in the JSONRESPONSE part, and I do see the request go out and be responded, but the processing of the SIP packet stops at the jsonrpc_request. Am I using jsonrpc_request wrongly? Or is smth broken? grtz, Davy ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=404#comment1336 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: modules/ims_charging: updated documentation for new parameter: single_ro_session_per_dialog
by Richard Good 05 Mar '14

05 Mar '14

Module: sip-router Branch: master Commit: eb8551205f651263f6c7cdf3afa41ad4b77a87e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb85512… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Mar 5 13:40:24 2014 +0200 modules/ims_charging: updated documentation for new parameter: single_ro_session_per_dialog --- modules/ims_charging/doc/ims_charging_admin.xml | 28 ++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/modules/ims_charging/doc/ims_charging_admin.xml b/modules/ims_charging/doc/ims_charging_admin.xml index a6ef005..7fd6b89 100644 --- a/modules/ims_charging/doc/ims_charging_admin.xml +++ b/modules/ims_charging/doc/ims_charging_admin.xml @@ -338,6 +338,28 @@ modparam("ims_charging", "cdp_event_latency_log", 1) </section> <section> <title> + <varname>single_ro_session_per_dialog</varname>(integer)</title> + <para>This tells the module whether it should do a single ro session per dialog no matter + how many times Ro_send_CCR is called from the config file or initiate an ro session + each time Ro_send_CCR is called. It is useful for IMS charging where you might want + to charge for on-net originating and off-net originating calls but always have only + a single ro session. + </para> + <para> + <emphasis>Default value is 0.</emphasis> + </para> + <example> + <title> + <varname>single_ro_session_per_dialog</varname>parameter usage</title> + <programlisting format="linespecific"> +... +modparam("ims_charging", "single_ro_session_per_dialog", 1) +... + </programlisting> + </example> + </section> + <section> + <title> <varname>origin_host</varname>(string)</title> <para>Origin host to be used in Diameter messages to charging-server.</para> <para> @@ -519,7 +541,7 @@ modparam("ims_charging", "service_context_id_release", "262") <section> <title> <function moreinfo="none">Ro_CCR(route_name, direction, charge_type, unit_type, - reservation_units)</function> + reservation_units, domain</function> </title> <para>Perform a CCR on Diameter Ro interface for Charging</para> <para>Meaning of the parameters is as follows:</para> @@ -549,6 +571,10 @@ modparam("ims_charging", "service_context_id_release", "262") <emphasis>reservation_units</emphasis>how many units (at the moment seconds) should be reservated at the moment.</para> </listitem> + <listitem> + <para><emphasis>domain</emphasis>- Logical domain within + registrar.</para> + </listitem> </itemizedlist> <para>This function can be used from REQUEST_ROUTE.</para> <para>This method is executed asynchronously. See example on how to retrieve return

1 0

git:master: modules/ims_charging: new capability to add dialog data to contact when charging session is created
by Richard Good 05 Mar '14

05 Mar '14

Module: sip-router Branch: master Commit: 909a898ab518dc8ca213cfc2e55b8d01b1f8b59b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=909a898… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Mar 5 13:37:05 2014 +0200 modules/ims_charging: new capability to add dialog data to contact when charging session is created When charging session is created dialog data is added to contact in usrloc (to be removed if contact is removed) New exported parameter: single_ro_session_per_dialog allows to call Ro_CCR on term and orig in config file but only 1 charging session is created --- modules/ims_charging/dialog.c | 121 ++++++++++++++++++++--- modules/ims_charging/dialog.h | 2 + modules/ims_charging/ims_ro.c | 24 +---- modules/ims_charging/ims_ro.h | 4 +- modules/ims_charging/mod.c | 170 ++++++++++++++++++++++++++++++-- modules/ims_charging/ro_session_hash.c | 12 ++- modules/ims_charging/ro_session_hash.h | 11 ++ 7 files changed, 297 insertions(+), 47 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=909…

1 0

git:master: modules/ims_usrloc_scscf: add dialog data to contact and tear down dialog when contact is removed
by Richard Good 05 Mar '14

05 Mar '14

Module: sip-router Branch: master Commit: 7ba6a2af28651ba363059cb444832b6cfce9a9db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7ba6a2a… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Mar 5 13:31:57 2014 +0200 modules/ims_usrloc_scscf: add dialog data to contact and tear down dialog when contact is removed Added info to contact structure to store active dialogs for contact When contact is removed terminate all active dialogs Added new API functions: api->add_dialog_data_to_contact and api->remove_dialog_data_from_contact --- modules/ims_usrloc_scscf/impurecord.c | 12 +++++ modules/ims_usrloc_scscf/ucontact.c | 73 +++++++++++++++++++++++++++++++++ modules/ims_usrloc_scscf/ucontact.h | 4 ++ modules/ims_usrloc_scscf/ul_mod.c | 18 ++++++++- modules/ims_usrloc_scscf/usrloc.c | 2 + modules/ims_usrloc_scscf/usrloc.h | 19 +++++++++ 6 files changed, 127 insertions(+), 1 deletions(-) diff --git a/modules/ims_usrloc_scscf/impurecord.c b/modules/ims_usrloc_scscf/impurecord.c index bdabe20..184c4a3 100644 --- a/modules/ims_usrloc_scscf/impurecord.c +++ b/modules/ims_usrloc_scscf/impurecord.c @@ -58,6 +58,8 @@ #include "subscribe.h" #include "usrloc_db.h" #include "../../lib/ims/useful_defs.h" +#include "../../modules/dialog_ng/dlg_load.h" +#include "../../modules/dialog_ng/dlg_hash.h" /*! contact matching mode */ int matching_mode = CONTACT_ONLY; @@ -72,6 +74,8 @@ extern int db_mode; extern int sub_dialog_hash_size; extern shtable_t sub_dialog_table; +extern struct dlg_binds dlgb; + /*! * \brief Create and initialize new record structure * \param _dom domain name @@ -322,6 +326,14 @@ void mem_remove_ucontact(impurecord_t* _r, ucontact_t* _c) { * \param _c deleted contact */ void mem_delete_ucontact(impurecord_t* _r, ucontact_t* _c) { + + struct contact_dialog_data *dialog_data; + //tear down dialogs in dialog data list + for (dialog_data = _c->first_dialog_data; dialog_data;) { + dlgb.lookup_terminate_dlg(dialog_data->h_entry, dialog_data->h_id, NULL ); + dialog_data = dialog_data->next; + } + mem_remove_ucontact(_r, _c); if_update_stat(_r->slot, _r->slot->d->contacts, -1); free_ucontact(_c); diff --git a/modules/ims_usrloc_scscf/ucontact.c b/modules/ims_usrloc_scscf/ucontact.c index 42e085b..6699a8a 100644 --- a/modules/ims_usrloc_scscf/ucontact.c +++ b/modules/ims_usrloc_scscf/ucontact.c @@ -133,6 +133,7 @@ error: */ void free_ucontact(ucontact_t* _c) { struct ul_callback *cbp, *cbp_tmp; + struct contact_dialog_data *dialog_data, *tmp_dialog_data; if (!_c) return; if (_c->path.s) shm_free(_c->path.s); @@ -141,6 +142,13 @@ void free_ucontact(ucontact_t* _c) { if (_c->callid.s) shm_free(_c->callid.s); if (_c->c.s) shm_free(_c->c.s); + //free dialog data + for (dialog_data = _c->first_dialog_data; dialog_data;) { + tmp_dialog_data = dialog_data; + dialog_data = dialog_data->next; + shm_free(tmp_dialog_data); + } + //free callback list for (cbp = _c->cbs->first; cbp;) { cbp_tmp = cbp; @@ -355,3 +363,68 @@ int update_ucontact(struct impurecord* _r, ucontact_t* _c, ucontact_info_t* _ci) return 0; } + + +/*! + * \brief Add dialog data to contact + * used when this contact is part of a confirmed dialog so we can tear down the dialog if the contact is removed + */ +int add_dialog_data_to_contact(ucontact_t* _c, unsigned int h_entry, unsigned int h_id) { + + struct contact_dialog_data *dialog_data = (struct contact_dialog_data*)shm_malloc(sizeof( struct contact_dialog_data)); + + LM_DBG("Adding dialog data to contact <%.*s> with h_entry <%d> and h_id <%d>", _c->c.len, _c->c.s, h_entry, h_id); + + memset(dialog_data, 0, sizeof( struct contact_dialog_data)); + + dialog_data->h_entry = h_entry; + dialog_data->h_id = h_id; + dialog_data->next = 0; + dialog_data->prev = 0; + + if(_c->first_dialog_data==0){ + //first entry in the list + _c->first_dialog_data = dialog_data; + _c->last_dialog_data = dialog_data; + }else { + //not first entry in list + _c->last_dialog_data->next = dialog_data; + dialog_data->prev = _c->last_dialog_data; + _c->last_dialog_data = dialog_data; + } + + return 0; + +} + +/*! + * \brief Add dialog data to contact + * used when this contact is part of a confirmed dialog so we can tear down the dialog if the contact is removed + */ +int remove_dialog_data_from_contact(ucontact_t* _c, unsigned int h_entry, unsigned int h_id) { + struct contact_dialog_data *dialog_data, *tmp_dialog_data; + LM_DBG("Removing dialog data from contact <%.*s> with h_entry <%d> and h_id <%d>", _c->c.len, _c->c.s, h_entry, h_id); + + for (dialog_data = _c->first_dialog_data; dialog_data;) { + tmp_dialog_data = dialog_data; + dialog_data = dialog_data->next; + if(tmp_dialog_data->h_entry == h_entry && tmp_dialog_data->h_id == h_id){ + LM_DBG("Found matching dialog data so will remove it"); + if(tmp_dialog_data->prev) { + tmp_dialog_data->prev->next = tmp_dialog_data->next; + } else { + _c->first_dialog_data = tmp_dialog_data->next; + } + if(tmp_dialog_data->next){ + tmp_dialog_data->next->prev = tmp_dialog_data->prev; + }else{ + _c->last_dialog_data = tmp_dialog_data->prev; + } + shm_free(tmp_dialog_data); + return 0; + } + + } + LM_DBG("Did not find dialog data to remove from contact"); + return 0; +} diff --git a/modules/ims_usrloc_scscf/ucontact.h b/modules/ims_usrloc_scscf/ucontact.h index b799a80..52369c3 100644 --- a/modules/ims_usrloc_scscf/ucontact.h +++ b/modules/ims_usrloc_scscf/ucontact.h @@ -107,4 +107,8 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t *_ci); */ int update_ucontact(struct impurecord* _r, ucontact_t* _c, ucontact_info_t* _ci); +int remove_dialog_data_from_contact(ucontact_t* _c, unsigned int h_entry, unsigned int h_id); + +int add_dialog_data_to_contact(ucontact_t* _c, unsigned int h_entry, unsigned int h_id); + #endif diff --git a/modules/ims_usrloc_scscf/ul_mod.c b/modules/ims_usrloc_scscf/ul_mod.c index d1c95c1..e06d72a 100644 --- a/modules/ims_usrloc_scscf/ul_mod.c +++ b/modules/ims_usrloc_scscf/ul_mod.c @@ -64,6 +64,9 @@ #include "../presence/bind_presence.h" #include "../presence/hash.h" +#include "../../modules/dialog_ng/dlg_load.h" +#include "../../modules/dialog_ng/dlg_hash.h" + MODULE_VERSION #define DEFAULT_DBG_FILE "/var/log/usrloc_debug" @@ -105,6 +108,8 @@ str db_url = str_init(DEFAULT_DB_URL); /*!< Database URL */ unsigned int nat_bflag = (unsigned int)-1; unsigned int init_flag = 0; +struct dlg_binds dlgb; + int sub_dialog_hash_size = 9; shtable_t sub_dialog_table; @@ -184,6 +189,7 @@ struct module_exports exports = { */ static int mod_init(void) { + load_dlg_f load_dlg; if (usrloc_debug){ LM_INFO("Logging usrloc records to %.*s\n", usrloc_debug_file.len, usrloc_debug_file.s); debug_file = fopen(usrloc_debug_file.s, "a"); @@ -302,7 +308,17 @@ static int mod_init(void) { } } - + if (!(load_dlg = (load_dlg_f) find_export("load_dlg", 0, 0))) { /* bind to dialog module */ + LM_ERR("can not import load_dlg. This module requires Kamailio dialog module.\n"); + } + if (load_dlg(&dlgb) == -1) { + return -1; + } + if (load_dlg_api(&dlgb) != 0) { /* load the dialog API */ + LM_ERR("can't load Dialog API\n"); + return -1; + } + /* Register cache timer */ register_timer(timer, 0, timer_interval); diff --git a/modules/ims_usrloc_scscf/usrloc.c b/modules/ims_usrloc_scscf/usrloc.c index 8f2f7e9..14cfcba 100644 --- a/modules/ims_usrloc_scscf/usrloc.c +++ b/modules/ims_usrloc_scscf/usrloc.c @@ -89,6 +89,8 @@ int bind_usrloc(usrloc_api_t* api) { api->delete_ucontact = delete_ucontact; api->get_ucontact = get_ucontact; api->update_ucontact = update_ucontact; + api->add_dialog_data_to_contact = add_dialog_data_to_contact; + api->remove_dialog_data_from_contact = remove_dialog_data_from_contact; api->get_subscriber = get_subscriber; api->add_subscriber = add_subscriber; diff --git a/modules/ims_usrloc_scscf/usrloc.h b/modules/ims_usrloc_scscf/usrloc.h index df07781..1ace70d 100644 --- a/modules/ims_usrloc_scscf/usrloc.h +++ b/modules/ims_usrloc_scscf/usrloc.h @@ -271,6 +271,15 @@ typedef struct security { float q; } security_t; +/*! \brief Structure to hold dialog data used when this contact is part of a confirmed dialog so we can tear down the dialog if the contact is removed */ +typedef struct contact_dialog_data { + unsigned int h_entry; + unsigned int h_id; + + struct contact_dialog_data* next; /*!< Next contact in the linked list */ + struct contact_dialog_data* prev; /*!< Previous contact in the linked list */ +} contact_dialog_data_t; + /*! \brief Main structure for handling of registered Contact data */ typedef struct ucontact { str* domain; /*!< Pointer to domain name (NULL terminated) */ @@ -296,6 +305,9 @@ typedef struct ucontact { security_t *security; /**< Security-Client Information */ struct ulcb_head_list* cbs; /**< individual callbacks per contact */ + + struct contact_dialog_data *first_dialog_data; + struct contact_dialog_data *last_dialog_data; struct ucontact* next; /*!< Next contact in the linked list */ struct ucontact* prev; /*!< Previous contact in the linked list */ @@ -392,6 +404,10 @@ typedef int (*delete_ucontact_t)(struct impurecord* _r, struct ucontact* _c); typedef int (*get_ucontact_t)(struct impurecord* _r, str* _c, str* _callid, str* _path, int _cseq, struct ucontact** _co); +typedef int (*add_dialog_data_to_contact_t)(struct ucontact* _c, unsigned int h_entry, unsigned int h_id); + +typedef int (*remove_dialog_data_from_contact_t)(struct ucontact* _c, unsigned int h_entry, unsigned int h_id); + typedef void (*lock_udomain_t)(struct udomain* _d, str *_aor); typedef void (*unlock_udomain_t)(struct udomain* _d, str *_aor); @@ -447,6 +463,9 @@ typedef struct usrloc_api { get_all_ucontacts_t get_all_ucontacts; update_ucontact_t update_ucontact; //update_user_profile_t update_user_profile; + + add_dialog_data_to_contact_t add_dialog_data_to_contact; + remove_dialog_data_from_contact_t remove_dialog_data_from_contact; add_subscriber_t add_subscriber; update_subscriber_t update_subscriber;

1 0

git:4.1: db_cassandra: clone key in a zero-termniated local buffer
by Daniel-Constantin Mierla 05 Mar '14

05 Mar '14

Module: sip-router Branch: 4.1 Commit: e742cb638363ca2936b1f75fa7226f0127332146 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e742cb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Feb 6 16:03:27 2014 +0100 db_cassandra: clone key in a zero-termniated local buffer - rework from a patch by Jay Binks (cherry picked from commit 3cde37cf10795b4eb785ffd141a8b28e64864f5d) --- modules/db_cassandra/dbcassa_base.cpp | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/modules/db_cassandra/dbcassa_base.cpp b/modules/db_cassandra/dbcassa_base.cpp index ffa9e3b..1a721bb 100644 --- a/modules/db_cassandra/dbcassa_base.cpp +++ b/modules/db_cassandra/dbcassa_base.cpp @@ -440,6 +440,7 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, int key_len=0, seckey_len = 0; int no_kc, no_sec_kc; dbcassa_table_p tbc; + char pk[256]; /** Lock table schema and construct primary and secondary key **/ if(_k) { @@ -496,7 +497,14 @@ ColumnVecPtr cassa_translate_query(const db1_con_t* _h, const db_key_t* _k, } else { /* the table doesn't have any secondary key defined */ if(_c) { for(int i=0; i< _nc; i++) { - sp.column_names.push_back(_c[i]->s); + /*sp.column_names.push_back(_c[i]->s);*/ + if(_c[i]->len>255) { + LM_ERR("column key is too long [%.*s]\n", _c[i]->len, _c[i]->s); + return ColumnVecPtr(NULL); + } + memcpy(pk, _c[i]->s, _c[i]->len); + pk[_c[i]->len] = '\0'; + sp.column_names.push_back(pk); LM_DBG("Query col: %s\n", _c[i]->s); } LM_DBG("get %d columns\n", _nc);

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
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 March 2014