sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

git:tmp/ims_charging: ims_charging: added database support for ro sessions
by Carlos Ruiz Diaz 16 Nov '13

16 Nov '13

Module: sip-router Branch: tmp/ims_charging Commit: f34a1d6c7967aa697613dd84720dc25a68441aa5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f34a1d6… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Sat Nov 16 20:39:14 2013 -0300 ims_charging: added database support for ro sessions - every session is now stored on a db if wanted - timed out sessions are automatically terminated - every session that got to the point of sending interim ccrs are recoverable --- modules/ims_charging/Makefile | 1 + modules/ims_charging/charging_db.c | 516 ++++++++++++++++++++++++++++++++ modules/ims_charging/charging_db.h | 113 +++++++ modules/ims_charging/dialog.c | 30 ++- modules/ims_charging/dialog.h | 1 + modules/ims_charging/ims_ro.c | 62 ++++- modules/ims_charging/mod.c | 68 +++-- modules/ims_charging/ro_session_hash.c | 2 +- modules/ims_charging/ro_session_hash.h | 15 +- modules/ims_charging/ro_timer.c | 71 +++-- 10 files changed, 815 insertions(+), 64 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f34…

1 0

git:tmp/dialog_ng: dialog_ng: added lookup_dlg() function to dlg binds.
by Carlos Ruiz Diaz 16 Nov '13

16 Nov '13

Module: sip-router Branch: tmp/dialog_ng Commit: 7cdbeb7fea2b024924bc6b61d4edd714a884922a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7cdbeb7… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Sat Nov 16 20:11:07 2013 -0300 dialog_ng: added lookup_dlg() function to dlg binds. - lookup_dlg will be used by the ims_charging module to locate dialog cell using h_entry_id and h_id --- modules/dialog_ng/dialog.c | 1 + modules/dialog_ng/dlg_db_handler.c | 3 --- modules/dialog_ng/dlg_load.h | 5 ++++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 17ae591..844e1c6 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -337,6 +337,7 @@ int load_dlg(struct dlg_binds *dlgb) { dlgb->lookup_terminate_dlg = w_api_lookup_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; dlgb->get_dlg = dlg_get_msg_dialog; + dlgb->lookup_dlg = lookup_dlg; return 1; } diff --git a/modules/dialog_ng/dlg_db_handler.c b/modules/dialog_ng/dlg_db_handler.c index bdc06ac..594f0d4 100644 --- a/modules/dialog_ng/dlg_db_handler.c +++ b/modules/dialog_ng/dlg_db_handler.c @@ -126,7 +126,6 @@ extern int dlg_enable_stats; extern int active_dlgs_cnt; extern int early_dlgs_cnt; - #define GET_FIELD_IDX(_val, _idx)\ (_val + _idx) @@ -643,8 +642,6 @@ error: } - - static int select_entire_dialog_vars_table(db1_res_t ** res, int fetch_num_rows) { db_key_t query_cols[DIALOG_VARS_TABLE_COL_NO] = { diff --git a/modules/dialog_ng/dlg_load.h b/modules/dialog_ng/dlg_load.h index 5f9c8a1..465fab7 100644 --- a/modules/dialog_ng/dlg_load.h +++ b/modules/dialog_ng/dlg_load.h @@ -43,15 +43,18 @@ typedef struct dlg_cell *(*get_dlg_f)(struct sip_msg *msg); /* get_dlg_lifetime function prototype */ typedef time_t (*get_dlg_expires_f)(str *callid, str *ftag, str *ttag); +typedef struct dlg_cell* (*lookup_dlg_f)(unsigned int h_entry, unsigned int h_id); + struct dlg_binds { register_dlgcb_f register_dlgcb; register_dlgcb_nodlg_f register_dlgcb_nodlg; terminate_dlg_f terminate_dlg; - lookup_terminate_dlg_f lookup_terminate_dlg; + lookup_terminate_dlg_f lookup_terminate_dlg; set_dlg_variable_f set_dlg_var; get_dlg_variable_f get_dlg_var; get_dlg_expires_f get_dlg_expires; get_dlg_f get_dlg; + lookup_dlg_f lookup_dlg; };

1 0

git:4.1: modules/sca: fix hash entry deletion
by Andrew Mortensen 15 Nov '13

15 Nov '13

Module: sip-router Branch: 4.1 Commit: 7e74944eb6a55a5e9a817a894af1ebbbc8ce9733 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e74944… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Nov 15 16:06:25 2013 +0200 modules/sca: fix hash entry deletion sca_hash_table_slot_kv_delete_unsafe() uses internally sca_hash_entry but incorrectly called sca_hash_table_slot_kv_find_unsafe() to initialize the entry. That function returns the node value, not the node itself. Use instead sca_hash_table_slot_kv_find_entry_unsafe(). Should fix the crash in FS#366. (cherry picked from commit 56e4f4518028e73f9ebd053242a100a5c3b7eb53) --- modules/sca/sca_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_hash.c b/modules/sca/sca_hash.c index 996acd9..a92b6c4 100644 --- a/modules/sca/sca_hash.c +++ b/modules/sca/sca_hash.c @@ -264,7 +264,7 @@ sca_hash_table_slot_kv_delete_unsafe( sca_hash_slot *slot, str *key ) { sca_hash_entry *e; - e = sca_hash_table_slot_kv_find_unsafe( slot, key ); + e = sca_hash_table_slot_kv_find_entry_unsafe( slot, key ); if ( e == NULL ) { return( -1 ); }

1 0

git:4.0: modules/sca: fix hash entry deletion
by Andrew Mortensen 15 Nov '13

15 Nov '13

Module: sip-router Branch: 4.0 Commit: edd13668492c7c09242f19620ad763922e92a186 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edd1366… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Fri Nov 15 16:06:25 2013 +0200 modules/sca: fix hash entry deletion sca_hash_table_slot_kv_delete_unsafe() uses internally sca_hash_entry but incorrectly called sca_hash_table_slot_kv_find_unsafe() to initialize the entry. That function returns the node value, not the node itself. Use instead sca_hash_table_slot_kv_find_entry_unsafe(). Should fix the crash in FS#366. (cherry picked from commit 56e4f4518028e73f9ebd053242a100a5c3b7eb53) --- modules/sca/sca_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_hash.c b/modules/sca/sca_hash.c index 996acd9..a92b6c4 100644 --- a/modules/sca/sca_hash.c +++ b/modules/sca/sca_hash.c @@ -264,7 +264,7 @@ sca_hash_table_slot_kv_delete_unsafe( sca_hash_slot *slot, str *key ) { sca_hash_entry *e; - e = sca_hash_table_slot_kv_find_unsafe( slot, key ); + e = sca_hash_table_slot_kv_find_entry_unsafe( slot, key ); if ( e == NULL ) { return( -1 ); }

1 0

new compiler warning in 4.1
by Juha Heinanen 15 Nov '13

15 Nov '13

i compiled the newly created 4.1 branch and got compiler warning that i don't remember seeing earlier: CC (cc) [M sctp.so] sctp_mod.o sctp_mod.c:125:12: warning: 'sctp_mod_pre_init' defined but not used [-Wunused-function] -- juha

2 1

git:master: modules/sca: fix hash entry deletion
by Timo Teras 15 Nov '13

15 Nov '13

Module: sip-router Branch: master Commit: 56e4f4518028e73f9ebd053242a100a5c3b7eb53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56e4f45… Author: Timo Teräs <timo.teras(a)iki.fi> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Fri Nov 15 16:06:25 2013 +0200 modules/sca: fix hash entry deletion sca_hash_table_slot_kv_delete_unsafe() uses internally sca_hash_entry but incorrectly called sca_hash_table_slot_kv_find_unsafe() to initialize the entry. That function returns the node value, not the node itself. Use instead sca_hash_table_slot_kv_find_entry_unsafe(). Should fix the crash in FS#366. --- modules/sca/sca_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_hash.c b/modules/sca/sca_hash.c index 996acd9..a92b6c4 100644 --- a/modules/sca/sca_hash.c +++ b/modules/sca/sca_hash.c @@ -264,7 +264,7 @@ sca_hash_table_slot_kv_delete_unsafe( sca_hash_slot *slot, str *key ) { sca_hash_entry *e; - e = sca_hash_table_slot_kv_find_unsafe( slot, key ); + e = sca_hash_table_slot_kv_find_entry_unsafe( slot, key ); if ( e == NULL ) { return( -1 ); }

1 0

[PATCH] modules/sca: fix hash entry deletion
by Timo Teräs 15 Nov '13

15 Nov '13

sca_hash_table_slot_kv_delete_unsafe() uses internally sca_hash_entry but incorrectly called sca_hash_table_slot_kv_find_unsafe() to initialize the entry. That function returns the node value, not the node itself. Use instead sca_hash_table_slot_kv_find_entry_unsafe(). Should fix the crash in FS#366. --- amortensen: is it ok for me to commit this? modules/sca/sca_hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/sca/sca_hash.c b/modules/sca/sca_hash.c index 996acd9..a92b6c4 100644 --- a/modules/sca/sca_hash.c +++ b/modules/sca/sca_hash.c @@ -264,7 +264,7 @@ sca_hash_table_slot_kv_delete_unsafe( sca_hash_slot *slot, str *key ) { sca_hash_entry *e; - e = sca_hash_table_slot_kv_find_unsafe( slot, key ); + e = sca_hash_table_slot_kv_find_entry_unsafe( slot, key ); if ( e == NULL ) { return( -1 ); } -- 1.8.4.3

2 1

git:4.1: usrloc: fix crash while printing error log
by Ovidiu Sas 15 Nov '13

15 Nov '13

Module: sip-router Branch: 4.1 Commit: 85e9202d14eda0a43d566aa14c0df47a78eb24f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85e9202… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Nov 15 09:08:03 2013 -0500 usrloc: fix crash while printing error log - fix a copy/paste error that lead to a NULL pointer (cherry picked from commit 10115f88637d1371a8ddeb5fe9c36c31ada49fc4) --- modules/usrloc/urecord.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index 6423dd6..b9722d9 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -365,7 +365,7 @@ static inline void wb_timer(urecord_t* _r) if (db_delete_ucontact(t) < 0) { LM_ERR("failed to delete contact from the database" " (aor: %.*s)\n", - ptr->aor->len, ZSW(ptr->aor->s)); + t->aor->len, ZSW(t->aor->s)); } }

1 0

git:master: usrloc: fix crash while printing error log
by Ovidiu Sas 15 Nov '13

15 Nov '13

Module: sip-router Branch: master Commit: 10115f88637d1371a8ddeb5fe9c36c31ada49fc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10115f8… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Nov 15 09:08:03 2013 -0500 usrloc: fix crash while printing error log - fix a copy/paste error that lead to a NULL pointer --- modules/usrloc/urecord.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index 6423dd6..b9722d9 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -365,7 +365,7 @@ static inline void wb_timer(urecord_t* _r) if (db_delete_ucontact(t) < 0) { LM_ERR("failed to delete contact from the database" " (aor: %.*s)\n", - ptr->aor->len, ZSW(ptr->aor->s)); + t->aor->len, ZSW(t->aor->s)); } }

1 0

[tracker] Task opened: Handling t_on_reply when use in event_route
by sip-router 15 Nov '13

15 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Pawel Sternal (Sternik) Attached to Project - sip-router Summary - Handling t_on_reply when use in event_route Task Type - Bug Report Category - tm Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - Hi. I'm not sure it's a bug but feature, but we noticed when switching from kamailio 3.3.0 to kamailio 4.0.4 that t_on_reply when we use in event_route[tm:local-request] not working. It's something like that: event_route[tm:local-request]{ if(method eq "PUBLISH"){t_on_reply("LOCAL_REQUEST_PUBLISH");} } On kamailio 3.3.0 logs (working). First NOTICE is from reply_route{} another from reply_route["LOCAL_REQUEST_PUBLISH"]: {code} Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: NOTICE: <script>: LOG:1dfbbeff-9269@10.0.3.40 (reply route) Method: PUBLISH MB: SIP/2.0 200 OK Via: SIP/2.0/UDP 10.0.3.40;branch=z9hG4bK45f2.edb9c4d6000000000000000000000000.0 From: sip:sternik@sip.test3.avecezar.org;tag=78c0a98dc9d6010ef4b40939a5cbeaaf-b84b To: sip:sternik@sip.test3.avecezar.org;tag=0cbb1bd16584f535642862c6bd5e73c4.a66f CSeq: 10 PUBLISH Call-ID: 1dfbbeff-9269(a)10.0.3.40 Expires: 301 SIP-ETag: a.1384504071.25867.34.0 Server: kamailio (3.3.0 (i386/linux)) Content-Length: 0 Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: <core> [parser/parse_hname2.c:211]: beginning of SIP-If-Match: yet=0x2d706973 Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: <core> [parser/msg_parser.c:202]: DEBUG: get_hdr_body : content_length=0 Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: <core> [parser/msg_parser.c:104]: found end of header Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: tm [t_lookup.c:1079]: DEBUG: t_check_msg: msg id=22 global id=21 T start=0xffffffff Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: tm [t_lookup.c:965]: DEBUG: t_reply_matching: hash 12116 label 0 branch 0 Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: tm [t_lookup.c:1016]: DEBUG: t_reply_matching: reply matched (T=0xaab9f2a0)! Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: tm [t_lookup.c:1148]: DEBUG: t_check_msg: msg id=22 global id=22 T end=0xaab9f2a0 Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: DEBUG: tm [t_reply.c:2081]: DEBUG: reply_received: org. status uas=0, uac[0]=100 local=2 is_invite=0) Nov 15 11:39:27 node00 /usr/sbin/kamailio[9312]: NOTICE: <script>: LOG:1dfbbeff-9269@10.0.3.40 (reply route LOCAL_REQUEST_PUBLISH) ... {code} On kamailio 4.0.4: {code} Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: NOTICE: <script>: LOG:33a0f6fa-26313@10.0.6.40 (reply route) Method: PUBLISH MB: SIP/2.0 200 OK Via: SIP/2.0/UDP 10.0.6.40;branch=z9hG4bKdda8.9660eec7000000000000000000000000.0 From: sip:marczynskim1@sip.dev.avecezar.org;tag=b9735e7ecaf301aba65dcb34e702074e-fc45 To: sip:marczynskim1@sip.dev.avecezar.org;tag=f580a75e5a019550a9104768be7fc4fd.c482 CSeq: 10 PUBLISH Call-ID: 33a0f6fa-26313(a)10.0.6.40 Expires: 301 SIP-ETag: a.1384504049.29255.110.0 Server: kamailio (4.0.2 (i386/linux)) Content-Length: 0 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: <core> [parser/parse_hname2.c:189]: parse_hname2(): beginning of SIP-If-Match: yet=0x2d706973 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: <core> [parser/msg_parser.c:204]: get_hdr_field(): DEBUG: get_hdr_body : content_length=0 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: <core> [parser/msg_parser.c:106]: get_hdr_field(): found end of header Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_lookup.c:1100]: t_check_msg(): DEBUG: t_check_msg: msg id=162 global id=161 T start=0xffffffff Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_lookup.c:972]: t_reply_matching(): DEBUG: t_reply_matching: hash 35549 label 0 branch 0 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_lookup.c:1032]: t_reply_matching(): DEBUG: t_reply_matching: reply matched (T=0xa62bf6d4)! Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_lookup.c:1169]: t_check_msg(): DEBUG: t_check_msg: msg id=162 global id=162 T end=0xa62bf6d4 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_reply.c:2089]: reply_received(): DEBUG: reply_received: org. status uas=0, uac[0]=100 local=2 is_invite=0) Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_reply.c:1211]: t_should_relay_response(): ->>>>>>>>> T_code=0, new_code=200 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_reply.c:1969]: local_reply(): DEBUG: local_reply: branch=0, save=0, winner=0 Nov 15 11:40:56 node00 /usr/sbin/kamailio[26318]: DEBUG: tm [t_reply.c:2006]: local_reply(): DEBUG: local transaction completed ... {code} I'm looking at diff between 3.3.0 i 4.0.4 and I'm found something like this: {code} - onreply_route=t->on_reply; + onreply_route=uac->on_reply; {code} >From http://sip-router.1086192.n5.nabble.com/git-alexh-for4-0-modules-tm-Remembe… Unfortunately, when I'm recompile kamailio this isn't help. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=371 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

← Newer
1
...
7
8
9
10
11
12
13
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013