sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: modules/cdp: Initial framework for Credit Control Application

by Jason Penton

Module: sip-router Branch: master Commit: ee2cdfdaf8e2dc177fed64c6f4ab05a85f9fb0c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee2cdfd… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Apr 17 16:49:21 2013 +0200 modules/cdp: Initial framework for Credit Control Application - inital support for RFC 4006 - this will be used to build IMS Ro charging interface TS32.299 --- modules/cdp/acctstatemachine.c | 255 +++++++++++++++++++++++++++ modules/cdp/acctstatemachine.h | 19 ++ modules/cdp/authstatemachine.c | 66 +------ modules/cdp/authstatemachine.h | 2 - modules/cdp/cdp_load.c | 11 +- modules/cdp/cdp_load.h | 6 + modules/cdp/common.c | 52 ++++++ modules/cdp/common.h | 19 ++ modules/cdp/configexample/ConfigExample.xml | 2 +- modules/cdp/mod.c | 6 + modules/cdp/peerstatemachine.c | 20 ++ modules/cdp/session.c | 184 +++++++++++++++++++- modules/cdp/session.h | 112 +++++++++--- 13 files changed, 661 insertions(+), 93 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=ee2…

11 years, 8 months

git:master: modules/dialog_ng: API added function to get current dialog from msg

by Jason Penton

Module: sip-router Branch: master Commit: e237f9573435a8a11672b155c1cf9a64638b87d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e237f95… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Apr 17 16:40:32 2013 +0200 modules/dialog_ng: API added function to get current dialog from msg --- modules/dialog_ng/dialog.c | 1 + modules/dialog_ng/dlg_handlers.c | 26 ++++++++++++++++++++++++++ modules/dialog_ng/dlg_handlers.h | 8 +++++++- modules/dialog_ng/dlg_load.h | 4 ++++ 4 files changed, 38 insertions(+), 1 deletions(-) diff --git a/modules/dialog_ng/dialog.c b/modules/dialog_ng/dialog.c index 748515d..4042cbf 100644 --- a/modules/dialog_ng/dialog.c +++ b/modules/dialog_ng/dialog.c @@ -252,6 +252,7 @@ int load_dlg(struct dlg_binds *dlgb) { dlgb->get_dlg_var = api_get_dlg_variable; dlgb->terminate_dlg = w_api_terminate_dlg; dlgb->get_dlg_expires = api_get_dlg_expires; + dlgb->get_dlg = dlg_get_msg_dialog; return 1; } diff --git a/modules/dialog_ng/dlg_handlers.c b/modules/dialog_ng/dlg_handlers.c index 7536725..7f89bda 100644 --- a/modules/dialog_ng/dlg_handlers.c +++ b/modules/dialog_ng/dlg_handlers.c @@ -1423,3 +1423,29 @@ void print_all_dlgs() { } +struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg) +{ + struct dlg_cell *dlg = NULL; + str callid; + str ftag; + str ttag; + unsigned int dir; + + /* Retrieve the current dialog */ + dlg = dlg_get_ctx_dialog(); + if (dlg != NULL ) + return dlg; + + if (pre_match_parse(msg, &callid, &ftag, &ttag, 0) < 0) + return NULL ; + dir = DLG_DIR_NONE; + dlg = get_dlg(&callid, &ftag, &ttag, &dir); + if (dlg == NULL ) { + LM_DBG("dlg with callid '%.*s' not found\n", + msg->callid->body.len, msg->callid->body.s); + return NULL ; + } + return dlg; +} + + diff --git a/modules/dialog_ng/dlg_handlers.h b/modules/dialog_ng/dlg_handlers.h index 210ed8f..e4d3999 100644 --- a/modules/dialog_ng/dlg_handlers.h +++ b/modules/dialog_ng/dlg_handlers.h @@ -179,7 +179,13 @@ void print_all_dlgs(); * \param dlg dialog cell * \return void */ - void internal_print_all_dlg(struct dlg_cell *dlg); +/*! + * \get the current dialog based on the current SIP message + * \param msg SIP message + * \return current dialog, null if none. + */ +struct dlg_cell *dlg_get_msg_dialog(sip_msg_t *msg); + #endif diff --git a/modules/dialog_ng/dlg_load.h b/modules/dialog_ng/dlg_load.h index 80e97d6..dc8407e 100644 --- a/modules/dialog_ng/dlg_load.h +++ b/modules/dialog_ng/dlg_load.h @@ -35,6 +35,9 @@ /* terminate_dlg function prototype */ typedef int (*terminate_dlg_f)(str *callid, str *ftag, str *ttag, str *hdrs, str *reason); +/* get the current dialog based on message function prototype */ +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); @@ -45,6 +48,7 @@ struct dlg_binds { 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; };

11 years, 8 months

[tracker] Task closed: duplicate entry for key ruid_idx

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#285 - duplicate entry for key ruid_idx User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Hopefylly properly fixed by commmit 2190c572cd1bc4b57a3c2dd5241e556b834c728c More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=285 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.

11 years, 8 months

[tracker] Comment added: add_contact_alias doesn't translate address when sending NOTIFY

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#286 - add_contact_alias doesn't translate address when sending NOTIFY User who did this - Sander van Grieken (accumulator) ---------- Since add_contact_alias should not be the cause, I suspect the notify sending part of the publish/subscribe mechanism.. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=286#comment827 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.

11 years, 8 months

[tracker] Comment added: add_contact_alias doesn't translate address when sending NOTIFY

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#286 - add_contact_alias doesn't translate address when sending NOTIFY User who did this - Sander van Grieken (accumulator) ---------- I know add_contact_alias doesn't treat different methods differently, and that's what puzzles me. I see SUBSCRIBEs arriving, and a reply is sent back on the correctly translated address, but all NOTIFYs right after that are sent on the RFC1918 address.. I verified with xlog that the add_contact_alias IS called for SUBSCRIBE. I also noticed in the active_watchers table, that there's no ;nat=yes added to the contact column, maybe that's of importance. I can send you a pcap file with the exchange, preferably privately :) ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=286#comment826 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.

11 years, 8 months

[tracker] Comment added: add_contact_alias doesn't translate address when sending NOTIFY

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#286 - add_contact_alias doesn't translate address when sending NOTIFY User who did this - Juha Heinanen (jh) ---------- i checked the source and add_contact_alias does not treat different methods differently. check with wireshark how the incoming and outgoing notify look like, check from which ip/port it comes from and compare to contact. finally, make sure e.g. using xlog messages that you really call add_contact_alias on the request. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=286#comment825 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.

11 years, 8 months

[tracker] Task opened: add_contact_alias doesn't translate address when sending NOTIFY

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Sander van Grieken (accumulator) Attached to Project - sip-router Summary - add_contact_alias doesn't translate address when sending NOTIFY Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - The presence functionality doesn't work when using add_contact_alias in my NATDETECT route. It sends the NOTIFY to the internal/original IP address of the connected client (192.168.x.x). When I use fix_nated_contact instead, the outgoing NOTIFYs are correctly translated. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=286 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.

11 years, 8 months

git:4.0: modules/usrloc: init _ul_sruid also in mi_child_init

by Juha Heinanen

Module: sip-router Branch: 4.0 Commit: 9d39d8b86576ca9784b96ebb43161c3174754876 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d39d8b… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 16 14:28:59 2013 +0300 modules/usrloc: init _ul_sruid also in mi_child_init (cherry picked from commit 2190c572cd1bc4b57a3c2dd5241e556b834c728c) --- modules/usrloc/ul_mod.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 307c887..36c1842 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -463,6 +463,9 @@ static int mi_child_init(void) return -1; } } + + if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) + return -1; done = 1; return 0;

11 years, 8 months

[tracker] Task opened: duplicate entry for key ruid_idx

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - duplicate entry for key ruid_idx Task Type - Bug Report Category - Module Status - New Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - start kamailio in usrloc db_mode=1 with empty location table. give the two ul_add commands below and the second will result into duplicate entry for key ruid_idx error. this test was done with master, but the bug may also exist in 4.0. Apr 13 11:26:04 siika /usr/sbin/sip-proxy[12270]: INFO: Handling XMLRPC POST from <127.0.0.1> with body <<?xml version="1.0" ?><methodCall><methodName>mi</methodName><params><param><value><string>ul_add</string></value></param><param><value><string>location</string></value></param><param><value><string>jh(a)test.fi</string></value></param><param><value><string>sip:jh@as.test.fi</string></value></param><param><value><int>0</int></value></param><param><value><string>0.10</string></value></param><param><value><int>0</int></value></param><param><value><int>0</int></value></param><param><value><int>16</int></value></param><param><value><int>15</int></value></param></params></methodCall>> Apr 13 11:26:10 siika /usr/sbin/sip-proxy[12276]: INFO: Handling XMLRPC POST from <127.0.0.1> with body <<?xml version="1.0" ?><methodCall><methodName>mi</methodName><params><param><value><string>ul_add</string></value></param><param><value><string>location</string></value></param><param><value><string>jh(a)test.fi</string></value></param><param><value><string>sip:jh@vm.test.fi</string></value></param><param><value><int>0</int></value></param><param><value><string>0.50</string></value></param><param><value><int>0</int></value></param><param><value><int>0</int></value></param><param><value><int>16</int></value></param><param><value><int>15</int></value></param></params></methodCall>> Apr 13 11:26:10 siika /usr/sbin/sip-proxy[12276]: ERROR: db_mysql [km_dbase.c:122]: driver error on query: Duplicate entry 'ulcx-51691678-2fc1-1' for key 'ruid_idx' Apr 13 11:26:10 siika /usr/sbin/sip-proxy[12276]: ERROR: <core> [db_query.c:235]: error while submitting query Apr 13 11:26:10 siika /usr/sbin/sip-proxy[12276]: ERROR: usrloc [ucontact.c:615]: inserting contact in db failed Apr 13 11:26:10 siika /usr/sbin/sip-proxy[12276]: ERROR: usrloc [urecord.c:480]: failed to insert in database More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=285 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.

11 years, 8 months

git:master: modules/usrloc: init _ul_sruid also in mi_child_init

by Juha Heinanen

Module: sip-router Branch: master Commit: 2190c572cd1bc4b57a3c2dd5241e556b834c728c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2190c57… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Apr 16 14:28:59 2013 +0300 modules/usrloc: init _ul_sruid also in mi_child_init --- modules/usrloc/ul_mod.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/usrloc/ul_mod.c b/modules/usrloc/ul_mod.c index 6f13bf5..a9b0a09 100644 --- a/modules/usrloc/ul_mod.c +++ b/modules/usrloc/ul_mod.c @@ -467,6 +467,9 @@ static int mi_child_init(void) return -1; } } + + if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) + return -1; done = 1; return 0;

11 years, 8 months

← Newer
1
...
18
19
20
21
22
23
24
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013