sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:richard.good/diameter_rx_media: ims_qos: Terminate dialog on CDP timeout events

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: 05040db1c74f9dd5270441739001ec4e973fedc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=05040db… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Mar 20 09:48:41 2013 +0200 ims_qos: Terminate dialog on CDP timeout events - On ims_qos calling the dialog is terminated if a CDP terminate event is received. This fix now also terminates the dialog if the CDP timeout event is received. --- modules/ims_qos/cdpeventprocessor.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/ims_qos/cdpeventprocessor.c b/modules/ims_qos/cdpeventprocessor.c index 3a70ba2..c3ea661 100644 --- a/modules/ims_qos/cdpeventprocessor.c +++ b/modules/ims_qos/cdpeventprocessor.c @@ -217,6 +217,13 @@ void cdp_cb_event_process() { p_session_data->registration_aor.len, p_session_data->registration_aor.s, p_session_data->domain.len, p_session_data->domain.s); LM_DBG("This is a media bearer session session"); + LM_DBG("Terminating dialog with callid, ftag, ttag: [%.*s], [%.*s], [%.*s]\n", + p_session_data->callid.len, p_session_data->callid.s, + p_session_data->ftag.len, p_session_data->ftag.s, + p_session_data->ttag.len, p_session_data->ttag.s); + dlgb.terminate_dlg(&p_session_data->callid, + &p_session_data->ftag, &p_session_data->ttag, NULL, + &release_reason); } break;

11 years, 7 months

git:richard.good/diameter_rx_media: ims_qos: changed log from ERR to DBG on calling

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: e73d4beac37094f49d1500cfe5ebb5c98dde476b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e73d4be… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Wed Mar 20 09:45:23 2013 +0200 ims_qos:changed log from ERR to DBG on calling - rx_send_str.c: When checking if auth session exists, changed log line from ERR to DBG. This is because it is not an error - If an STR is sent a CDP terminate event is triggered. This event usually triggers another STR to be sent but not if the auth session does not exist. --- modules/ims_qos/rx_str.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/ims_qos/rx_str.c b/modules/ims_qos/rx_str.c index 2d630a3..fc6763b 100644 --- a/modules/ims_qos/rx_str.c +++ b/modules/ims_qos/rx_str.c @@ -84,7 +84,7 @@ int rx_send_str(str *rx_session_id) { LM_DBG("About to try get Auth session\n"); auth = cdpb.AAAGetAuthSession(*rx_session_id); if (!auth) { - LM_ERR("Could not get Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s); + LM_DBG("Could not get Auth Session for session id: [%.*s] - this is fine as this might have been started by already sending an STR\n", rx_session_id->len, rx_session_id->s); return CSCF_RETURN_FALSE; }else{ LM_DBG("Retrieved Auth Session for session id: [%.*s]\n", rx_session_id->len, rx_session_id->s);

11 years, 7 months

Wiki "Set new password" feature not working

by Peter Dunkley

Hello, I have been trying to log into the wiki to update some of the documentation but I have forgotten my password. The "Set new password" feature doesn't seem to be working (I have tried it three or four times over the last few days). Regards, Peter

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: removed unused/ hardwired test variables

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: 274899c8d84c1767b4376939fe33ee3a334343f8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=274899c… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 19 20:11:58 2013 +0200 modules/ims_ro: removed unused/hardwired test variables --- modules/ims_ro/Ro_data.h | 4 +--- modules/ims_ro/ims_ro.c | 6 +++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/ims_ro/Ro_data.h b/modules/ims_ro/Ro_data.h index 17deb88..c469582 100644 --- a/modules/ims_ro/Ro_data.h +++ b/modules/ims_ro/Ro_data.h @@ -4,7 +4,7 @@ #include "../cdp/diameter.h" #include "../cdp/diameter_epc.h" -#ifndef WHARF + /** * Allocate and blank a memory area */ @@ -148,8 +148,6 @@ do{\ #define str_list_t_copy(dst,src,mem) \ str_dup((dst)->data,(src)->data,mem) -#endif /* WHARF */ - typedef struct { str *sip_method; str *event; diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 5385808..7d373aa 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -511,8 +511,8 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, subscr.type = Subscription_Type_IMPU; //TODO: need to check which direction. for ORIG we use from_uri. for TERM we use to_uri - subscr.id.s = from_uri.s; - subscr.id.len = from_uri.len; + subscr.id.s = from_uri->s; + subscr.id.len = from_uri->len; acc_record_type = AAA_ACCT_INTERIM; @@ -558,7 +558,7 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, LM_ERR("Problem adding User-Equipment data\n"); } - if (!Ro_add_subscription_id(acr, AVP_EPC_Subscription_Id_Type_End_User_SIP_URI, from_uri)) { + if (!Ro_add_subscription_id(acr, AVP_EPC_Subscription_Id_Type_End_User_SIP_URI, &(subscr.id))) { LM_ERR("Problem adding Subscription ID data\n"); }

11 years, 7 months

git:jason.penton/ims_ro_interface: modules/ims_ro: removed unused variables

by Jason Penton

Module: sip-router Branch: jason.penton/ims_ro_interface Commit: b4382c83a5004135efe12f44ccc69aead2a196ad URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b4382c8… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Tue Mar 19 16:51:29 2013 +0200 modules/ims_ro: removed unused variables --- modules/ims_ro/ims_ro.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/modules/ims_ro/ims_ro.c b/modules/ims_ro/ims_ro.c index 275a29e..5385808 100644 --- a/modules/ims_ro/ims_ro.c +++ b/modules/ims_ro/ims_ro.c @@ -365,8 +365,7 @@ int get_timestamps(struct sip_msg * req, struct sip_msg * reply, time_t * req_ti /* * creates the ro session for a session establishment - * @param aor: the aor to be handled - * @return: 0 - ok, -1 - error, -2 - out of memory + * */ Ro_CCR_t * dlg_create_ro_session(struct sip_msg * req, struct sip_msg * reply, AAASession ** authp, int dir) { @@ -414,8 +413,6 @@ Ro_CCR_t * dlg_create_ro_session(struct sip_msg * req, struct sip_msg * reply, A if (!(time_stamps = new_time_stamps(&req_timestamp, NULL, &reply_timestamp, NULL))) goto error; -// str tmp_from = str_init("sip:jason@ims.smilecoms.com"); -// str tmp_to = str_init("sip:27832837000@ims.smilecoms.com"); if (!(ims_info = new_ims_information(event_type, time_stamps, &callid, &callid, &from_uri, &to_uri, &icid, &orig_ioi, &term_ioi, dir))) goto error; event_type = 0; @@ -513,8 +510,9 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, event_type = 0; subscr.type = Subscription_Type_IMPU; - subscr.id.s = "sip:jason@ims.smilecoms.com"; //from_uri.s; /*TODO: hardwired for testing*/ - subscr.id.len = strlen("sip:jason@ims.smilecoms.com"); //from_uri.len; + //TODO: need to check which direction. for ORIG we use from_uri. for TERM we use to_uri + subscr.id.s = from_uri.s; + subscr.id.len = from_uri.len; acc_record_type = AAA_ACCT_INTERIM; @@ -540,7 +538,6 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, goto error; } - if (!(acr = Ro_new_ccr(auth, ro_ccr_data))) goto error; if (!Ro_add_vendor_specific_appid(acr, IMS_vendor_id_3GPP, IMS_Ro, 0 /*IMS_Ro*/)) { @@ -561,9 +558,6 @@ void send_ccr_interim(struct ro_session* ro_session, str* from_uri, str *to_uri, LM_ERR("Problem adding User-Equipment data\n"); } - //str sip_uri; - //sip_uri.s = "sip:jason@ims.smilecoms.com"; - //sip_uri.len = strlen(sip_uri.s); if (!Ro_add_subscription_id(acr, AVP_EPC_Subscription_Id_Type_End_User_SIP_URI, from_uri)) { LM_ERR("Problem adding Subscription ID data\n"); } @@ -786,7 +780,6 @@ int Ro_Send_CCR(struct sip_msg *msg, str* direction, str* charge_type, str* unit int dir = 0; Ro_CCA_t *ro_cca_data = 0; struct ro_session *new_session = 0; -// struct ro_session_entry *ro_session_entry = 0; int cc_event_number = 0; //According to IOT tests this should start at 0 int cc_event_type = RO_CC_START; @@ -902,17 +895,14 @@ int Ro_Send_CCR(struct sip_msg *msg, str* direction, str* charge_type, str* unit Ro_free_CCR(ro_ccr_data); Ro_free_CCA(ro_cca_data); -// ro_session_unlock(ro_session_table, ro_session_entry); link_ro_session(new_session, 1); //create extra ref for the fact that dialog has a handle in the callbacks unref_ro_session(new_session, 1); - cdp_avp->cdp->AAASessionsUnlock(auth->hash); return 0; error: LM_ERR("Ro_Send_CCR: Error sending request\n"); if (new_session) { -// ro_session_unlock(ro_session_table, ro_session_entry); unref_ro_session(new_session, 1); } @@ -936,7 +926,6 @@ void remove_aaa_session(str *session_id) { } } - int get_direction_as_int(str* direction) { char* p = direction->s;

11 years, 7 months

[tracker] Comment added: app_lua: add rpc reload command

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Víctor Seva (linuxmaniac) ---------- > It is not yet clear how you structured the global version per loaded script vs local version, probably I need more time to analyze the patch. The idea is that every script begins with version 0. When app_lua.reload command is called the shared var|s is|are incremented. When a child has to run a method, it compares his loaded version ( private memory ) with the shared var for each script loaded. If the variables are not equal the script is reloaded and the local loaded version is updated. I hope this is clear enough. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=270#comment791 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, 7 months

kamailio ims (dev) and fhoss/ unregister problems.

by Trey Ormsbee

Hello, I have an odd problem that I am not sure where to go with. I have setup kamailio dev (or the 4.0.0 branch) for IMS. I have a pcscf, icscf, and scscf using all the example config files. I also setup the fhoss for hss. This 'seems' to works great for the handful of test users I have created. The problem I have arises when a (or any) user logs out once logged out no user can logon or do anything again. If I dump all the users from the database and readd them; i am good to go again. A capture of a user trying to logon after wards always gives me this: 500 Server error on UAR select S-CSCF, which comes from the I-CSCF. I honestly have no idea what more to provide and Im not sure if this is an kamailio or hss problem... Also what is everyone using for an HSS... Do I even need an HSS can kamailio and the IMS modules do this already? Thanks,

11 years, 7 months

[tracker] Comment added: app_lua: add rpc reload command (Attachment added)

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#270 - app_lua: add rpc reload command User who did this - Víctor Seva (linuxmaniac) ---------- - kmi removed - memset fixed - reload index begins at 0. If no index o index < 0 reloads all scripts. I've added more debugging info and some more comments on the code. ---------- One or more files have been attached. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=270#comment790 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, 7 months

git:hpw/branch_failure_route: core: Initial revision of branch_failure_route

by Hugh Waite

Module: sip-router Branch: hpw/branch_failure_route Commit: a5946574cb9917f0a9a90ea547c9357f3f6477bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a594657… Author: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Committer: Hugh Waite <hugh.waite(a)crocodile-rcs.com> Date: Tue Mar 19 15:43:46 2013 +0000 core: Initial revision of branch_failure_route - New branch_failure_route defined - cfg route is called but xlog() causes segfault --- cfg.lex | 3 +++ cfg.y | 24 ++++++++++++++++++++++++ route.c | 4 ++++ route.h | 2 ++ script_cb.c | 2 +- script_cb.h | 5 +++-- 6 files changed, 37 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 5a7ce8a..bafab4b 100644 --- a/cfg.lex +++ b/cfg.lex @@ -200,6 +200,7 @@ ERROR error ROUTE route ROUTE_REQUEST request_route ROUTE_FAILURE failure_route +ROUTE_BRANCH_FAILURE branch_failure_route ROUTE_REPLY reply_route ROUTE_ONREPLY onreply_route ROUTE_BRANCH branch_route @@ -623,6 +624,8 @@ IMPORTFILE "import_file" <INITIAL>{ROUTE_REPLY} { count(); yylval.strval=yytext; return ROUTE_REPLY; } <INITIAL>{ROUTE_FAILURE} { count(); yylval.strval=yytext; return ROUTE_FAILURE; } +<INITIAL>{ROUTE_BRANCH_FAILURE} { count(); yylval.strval=yytext; + return ROUTE_BRANCH_FAILURE; } <INITIAL>{ROUTE_BRANCH} { count(); yylval.strval=yytext; return ROUTE_BRANCH; } <INITIAL>{ROUTE_SEND} { count(); yylval.strval=yytext; return ROUTE_SEND; } <INITIAL>{ROUTE_EVENT} { count(); yylval.strval=yytext; return ROUTE_EVENT; } diff --git a/cfg.y b/cfg.y index 0c4fb5d..477991f 100644 --- a/cfg.y +++ b/cfg.y @@ -314,6 +314,7 @@ extern char *finame; %token ROUTE %token ROUTE_REQUEST %token ROUTE_FAILURE +%token ROUTE_BRANCH_FAILURE %token ROUTE_ONREPLY %token ROUTE_REPLY %token ROUTE_BRANCH @@ -705,6 +706,7 @@ statement: | module_stm | {rt=REQUEST_ROUTE;} route_stm | {rt=FAILURE_ROUTE;} failure_route_stm + | {rt=BRANCH_FAILURE_ROUTE;} branch_failure_route_stm | onreply_route_stm | {rt=BRANCH_ROUTE;} branch_route_stm | {rt=ONSEND_ROUTE;} send_route_stm @@ -1970,6 +1972,28 @@ failure_route_stm: | ROUTE_FAILURE error { yyerror("invalid failure_route statement"); } ; +branch_failure_route_stm: + ROUTE_BRANCH_FAILURE LBRACK route_name RBRACK LBRACE actions RBRACE { + #ifdef SHM_MEM + if (!shm_initialized() && init_shm()<0) { + yyerror("Can't initialize shared memory"); + YYABORT; + } + #endif /* SHM_MEM */ + i_tmp=route_get(&branch_failure_rt, $3); + if (i_tmp==-1){ + yyerror("internal error"); + YYABORT; + } + if (branch_failure_rt.rlist[i_tmp]){ + yyerror("duplicate route"); + YYABORT; + } + push($6, &branch_failure_rt.rlist[i_tmp]); + } + | ROUTE_BRANCH_FAILURE error { yyerror("invalid branch_failure_route statement"); } + ; + route_reply_main: ROUTE_ONREPLY { ; } | ROUTE_REPLY { ; } diff --git a/route.c b/route.c index 17c1b56..42fc496 100644 --- a/route.c +++ b/route.c @@ -102,6 +102,7 @@ struct route_list main_rt; struct route_list onreply_rt; struct route_list failure_rt; +struct route_list branch_failure_rt; struct route_list branch_rt; struct route_list onsend_rt; struct route_list event_rt; @@ -142,6 +143,7 @@ void destroy_routes() destroy_rlist(&main_rt); destroy_rlist(&onreply_rt); destroy_rlist(&failure_rt); + destroy_rlist(&branch_failure_rt); destroy_rlist(&branch_rt); destroy_rlist(&event_rt); } @@ -210,6 +212,8 @@ int init_routes() goto error; if (init_rlist("failure", &failure_rt, FAILURE_RT_NO, RT_HASH_SIZE)<0) goto error; + if (init_rlist("branch_failure", &branch_failure_rt, FAILURE_RT_NO, RT_HASH_SIZE)<0) + goto error; if (init_rlist("branch", &branch_rt, BRANCH_RT_NO, RT_HASH_SIZE)<0) goto error; if (init_rlist("on_send", &onsend_rt, ONSEND_RT_NO, RT_HASH_SIZE)<0) diff --git a/route.h b/route.h index 8f25fe3..f824c0e 100644 --- a/route.h +++ b/route.h @@ -53,6 +53,7 @@ #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) #define CORE_ONREPLY_ROUTE (1 << 7) +#define BRANCH_FAILURE_ROUTE (1 << 8) #define ONREPLY_ROUTE (TM_ONREPLY_ROUTE|CORE_ONREPLY_ROUTE) #define EVENT_ROUTE REQUEST_ROUTE #define ANY_ROUTE (0xFFFFFFFF) @@ -85,6 +86,7 @@ extern struct route_list main_rt; /* main reply route table */ extern struct route_list onreply_rt; extern struct route_list failure_rt; +extern struct route_list branch_failure_rt; extern struct route_list branch_rt; extern struct route_list onsend_rt; extern struct route_list event_rt; diff --git a/script_cb.c b/script_cb.c index a10df7d..27156e2 100644 --- a/script_cb.c +++ b/script_cb.c @@ -53,7 +53,7 @@ #include "mem/mem.h" /* Number of cb types = last cb type */ -#define SCRIPT_CB_NUM EVENT_CB_TYPE +#define SCRIPT_CB_NUM (CB_TYPE_MAX-1) static struct script_cb *pre_script_cb[SCRIPT_CB_NUM]; static struct script_cb *post_script_cb[SCRIPT_CB_NUM]; diff --git a/script_cb.h b/script_cb.h index af557c7..596a503 100644 --- a/script_cb.h +++ b/script_cb.h @@ -49,14 +49,15 @@ typedef int (cb_function)(struct sip_msg *msg, unsigned int flags, void *param); */ enum script_cb_flag { REQUEST_CB=1, FAILURE_CB=2, ONREPLY_CB=4, BRANCH_CB=8, ONSEND_CB=16, ERROR_CB=32, - LOCAL_CB=64, EVENT_CB=128 }; + LOCAL_CB=64, EVENT_CB=128, BRANCH_FAILURE_CB=256 }; /* Callback types used for executing the callbacks. * Keep in sync with script_cb_flag!!! */ enum script_cb_type { REQUEST_CB_TYPE=1, FAILURE_CB_TYPE, ONREPLY_CB_TYPE, BRANCH_CB_TYPE, ONSEND_CB_TYPE, ERROR_CB_TYPE, - LOCAL_CB_TYPE, EVENT_CB_TYPE }; + LOCAL_CB_TYPE, EVENT_CB_TYPE, BRANCH_FAILURE_CB_TYPE, + CB_TYPE_MAX}; struct script_cb{ cb_function *cbf;

11 years, 7 months

git:3.3: rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv

by Henning Westerholt

Module: sip-router Branch: 3.3 Commit: 38556ad62e91467e563df2b7c5a6365297359a61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=38556ad… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Tue Mar 19 15:32:25 2013 +0100 rtpproxy: fix spelling error in docs, reported from Victor V. Kustov, coyote at bks dot tv (cherry picked from commit a0b01f77de163cf7ea9d71d5293a1bfa20d31fa6) --- modules/rtpproxy/README | 8 ++++---- modules/rtpproxy/doc/rtpproxy_admin.xml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/rtpproxy/README b/modules/rtpproxy/README index 61f4720..0719e37 100644 --- a/modules/rtpproxy/README +++ b/modules/rtpproxy/README @@ -70,7 +70,7 @@ Sas Ovidiu 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat 7. MI Commands @@ -136,7 +136,7 @@ Chapter 1. Admin Guide 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat 7. MI Commands @@ -588,9 +588,9 @@ start_recording(); 6. Exported Pseudo Variables - 6.1. $rtpstart + 6.1. $rtpstat -6.1. $rtpstart +6.1. $rtpstat Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy are provided as a string and it does contain several diff --git a/modules/rtpproxy/doc/rtpproxy_admin.xml b/modules/rtpproxy/doc/rtpproxy_admin.xml index 6b9577a..9606b3a 100644 --- a/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -692,7 +692,7 @@ start_recording(); <section> <title>Exported Pseudo Variables</title> <section> - <title><function moreinfo="none">$rtpstart</function></title> + <title><function moreinfo="none">$rtpstat</function></title> <para> Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy are provided as a string and it does contain several packet-counters. The statistics

11 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
43
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2013