sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:pd/outbound: modules/pv: can only retrieve $ruid for a request

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: 86440c81639e1aff66e7449a121ac8ae6d43197a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86440c8… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 11:14:06 2013 +0000 modules/pv: can only retrieve $ruid for a request - cache it in an avp for the request if you need it later --- modules/pv/pv_core.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 9c90902..36dfbba 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -1810,6 +1810,9 @@ int pv_get_ruid(struct sip_msg *msg, pv_param_t *param, if(msg==NULL) return -1; + if(msg->first_line.type == SIP_REPLY) + return pv_get_null(msg, param, res); + if(msg->ruid.len==0) { LM_DBG("no ruid\n");

11 years, 8 months

git:pd/outbound: modules/registrar: fixed lock usage in unregister()

by Peter Dunkley

Module: sip-router Branch: pd/outbound Commit: d6eac37fb61a79e7d99b749aa20ff903523ff2d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d6eac37… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri Mar 15 11:15:16 2013 +0000 modules/registrar: fixed lock usage in unregister() --- modules/registrar/save.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/modules/registrar/save.c b/modules/registrar/save.c index a164683..9c76ef7 100644 --- a/modules/registrar/save.c +++ b/modules/registrar/save.c @@ -988,15 +988,12 @@ int unregister(struct sip_msg* _m, udomain_t* _d, str* _uri, str *_ruid) } else { /* ruid provided - remove a specific contact */ - ul.lock_udomain(_d, &aor); if (ul.get_urecord_by_ruid(_d, ul.get_aorhash(&aor), _ruid, &r, &c) != 0) { - ul.unlock_udomain(_d, &aor); LM_WARN("AOR/Contact not found\n"); return -1; } if (ul.delete_ucontact(r, c) != 0) { - ul.unlock_udomain(_d, &aor); LM_WARN("could not delete contact\n"); return -1; }

11 years, 8 months

git:jason.penton/tm_async_reply_support DELETED: first work on async reply processing

by Jason Penton

Module: sip-router Branch: jason.penton/tm_async_reply_support DELETED Commit: 7199d849853dd89e2a1d7cc6415f83f8f1daae51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7199d84… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Thu Mar 14 16:48:29 2013 +0200 first work on async reply processing --- parser/msg_parser.h | 1 + receive.c | 12 ++++++++++-- route_struct.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 79194e3..49d91f6 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -119,6 +119,7 @@ typedef enum request_method { #define FL_SDP_BODY (1 << 12) /*!< msg has SDP in body */ #define FL_USE_UAC_FROM (1<<13) /* take FROM hdr from UAC instead of UAS*/ #define FL_USE_UAC_TO (1<<14) /* take TO hdr from UAC instead of UAS */ +#define FL_RPL_SUSPENDED (1<<15) /* for async reply processing */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */ diff --git a/receive.c b/receive.c index a4018ff..e107cfa 100644 --- a/receive.c +++ b/receive.c @@ -265,6 +265,12 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) STATS_RPL_FWD_DROP(); goto skip_send_reply; /* drop the message, no error */ } + + if (unlikely(ret==0 || msg->flags&FL_RPL_SUSPENDED)) { + goto skip_send_reply; + /* suspend the reply (async), no error */ + } + } /* send the msg */ forward_reply(msg); @@ -277,8 +283,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) DBG("successfully ran reply processing...(%d usec)\n", diff); #endif - /* execute post reply-script callbacks */ - exec_post_script_cb(msg, ONREPLY_CB_TYPE); + if (likely(!(msg->flags&FL_RPL_SUSPENDED))) { + /* execute post reply-script callbacks */ + exec_post_script_cb(msg, ONREPLY_CB_TYPE); + } } end: diff --git a/route_struct.h b/route_struct.h index e56f4c0..83d1eb0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -147,6 +147,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define SUSPEND_R_F 16 #define IGNORE_ON_BREAK_R_F 256

11 years, 8 months

git:tmp/tm_async_reply_support: tm: t_suspend/ t_continue for replies 1st draft

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: f1bf9fa2f21a7c800c16f40b530e8f4042a280ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1bf9fa… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 14 18:06:46 2013 +0200 tm: t_suspend/t_continue for replies 1st draft - First attempt at allowing tm functions: t_continue and t_suspend to be used on SIP responses (currently this only works on SIP requests) --- modules/tm/h_table.h | 5 ++- modules/tm/t_suspend.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 100 insertions(+), 5 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index f30bd45..2c65906 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -196,6 +196,8 @@ typedef struct ua_server for e2e cancels */ #endif /* CANCEL_REASON_SUPPORT */ unsigned int status; + + int suspended_request; }ua_server_type; @@ -251,6 +253,7 @@ typedef struct ua_client unsigned short on_failure; /* the onreply_route to be processed if registered to do so */ unsigned short on_reply; + int suspended_reply; }ua_client_type; @@ -444,7 +447,7 @@ typedef struct cell /* place holder for MD5checksum (meaningful only if syn_branch=0) */ char md5[0]; /* if syn_branch==0 then MD5_LEN bytes are extra alloc'ed*/ - + } tm_cell_t; diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 35adcb1..387e628 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -56,7 +56,8 @@ int t_suspend(struct sip_msg *msg, unsigned int *hash_index, unsigned int *label) { struct cell *t; - + int branch; + t = get_t(); if (!t || t == T_UNDEFINED) { LOG(L_ERR, "ERROR: t_suspend: " \ @@ -64,13 +65,14 @@ int t_suspend(struct sip_msg *msg, return -1; } - if (t->flags & T_CANCELED) { + if (t->flags & T_CANCELED) { /* The transaction has already been canceled */ LOG(L_DBG, "DEBUG: t_suspend: " \ "trying to suspend an already canceled transaction\n"); ser_error = E_CANCELED; return 1; } + if (msg->first_line.type==SIP_REQUEST){ /* send a 100 Trying reply, because the INVITE processing will probably take a long time */ @@ -103,10 +105,47 @@ int t_suspend(struct sip_msg *msg, "failed to add the blind UAC\n"); return -1; } - + /* set as suspend request for when we continue */ + t->uas.suspended_request = 1; + + return 0; + + }else if (msg->first_line.type==SIP_REPLY){ + + LOG(L_DBG,"DBG: This is a suspend on reply - setting msg flag to SUSPEND"); + msg->flags &= FL_RPL_SUSPENDED; + //this is a reply suspend find which branch + + if (t_check( msg , &branch )==-1){ + LOG(L_ERR, "ERROR: t_suspend: " \ + "failed find UAC branch\n"); + return -1; + } + LOG(L_DBG,"DBG: Found a a match with branch id [%d]", branch); + + LOG(L_DBG,"DBG: Assigning reply message to t->uac[branch].reply"); + t->uac[branch].reply=msg; + + if (save_msg_lumps(t->uac[branch].reply, msg)) { + LOG(L_ERR, "ERROR: t_suspend: " \ + "failed to save the message lumps\n"); + return -1; + } + + LOG(L_DBG,"DBG: Saving stuff to transaction"); + /* set as suspend reply for when we continue */ + t->uac[branch].suspended_reply=1; + /* save the message flags */ + //TODO do we need this? + t->uac[branch].reply->flags = msg->flags; + + LOG(L_DBG,"DBG: Saving transaction hash and label"); + *hash_index = t->hash_index; + *label = t->label; + LOG(L_DBG,"DBG: Done"); + } return 0; } - /* Continues the SIP request processing previously saved by * t_suspend(). The script does not continue from the same * point, but a separate route block is executed instead. @@ -120,6 +159,7 @@ int t_continue(unsigned int hash_index, unsigned int label, { struct cell *t; struct sip_msg faked_req; + struct sip_msg faked_reply; int branch; struct ua_client *uac =NULL; int ret; @@ -142,6 +182,7 @@ int t_continue(unsigned int hash_index, unsigned int label, * form calling t_continue() multiple times simultaneously */ LOCK_REPLIES(t); + if (t->uas.suspended_request==1){ /* Try to find the blind UAC, and cancel its fr timer. * We assume that the last blind uac called t_continue(). */ for ( branch = t->nr_of_outgoings-1; @@ -223,9 +264,60 @@ int t_continue(unsigned int hash_index, unsigned int label, goto kill_trans; } } - + + }else{ + LOG(L_DBG,"This a continue from a reply suspend - getting the correct branch as transaction has %d branches", t->nr_of_outgoings); + //this is a continue from a reply suspend! + for ( branch = 0; + branch < t->nr_of_outgoings; + branch++ + ) { + //TODO not sure if this will work yet - think we need to pass which branch to continue when we call t_continue! + if (t->uac[branch].suspended_reply==1){ + LOG(L_DBG,"Found branch that has suspend reply set!"); + + LOG(L_DBG,"Forwarding reply with status code %d", t->uac[branch].reply->first_line.u.reply.statuscode); + + //TODO forward message now + /* Not sure how to do this yet - probably need to fake the environment and then send a fake reply similar to way done for requests */ + + //This might work: + //forward_reply(t->uac[branch].reply); + + //Or we need to fake the environment and send: + //fake_reply(t, branch, t->uac[branch].reply->first_line.u.reply.statuscode); + + //faked_env( t, &faked_req); + // + /* The sip msg is a faked msg just like in failure route + * therefore execute the pre- and post-script callbacks + * of failure route (Miklos) + */ +// if (exec_pre_script_cb(&faked_rep, FAILURE_CB_TYPE)>0) { +// if (run_top_route(route, &faked_rep, 0)<0) +// LOG(L_ERR, "ERROR: t_continue: Error in run_top_route\n"); +// exec_post_script_cb(&faked_rep, FAILURE_CB_TYPE); +// } + + //faked_env( t, 0); + //free_faked_rer(&faked_rep, t); + + /* update the flags */ + //t->uac[branch].reply->flags = faked_rep.flags; + + } + } + if (branch == t->nr_of_outgoings) { + LOG(L_DBG,"Could not find a branch with suspend reply set"); + /* This is a continue on reply suspend but can not find a suspended reply!. */ + ret = 0; + goto kill_trans; + } + } + LOG(L_DBG,"Unlocking transaction mutex"); UNLOCK_REPLIES(t); - + + LOG(L_DBG,"Unreffing the transaction"); /* unref the transaction */ t_unref(t->uas.request);

11 years, 8 months

git:tmp/tm_async_reply_support: tm: removed unnecessary new flag in route_struct.h

by Richard Good

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 53fa5c010a7a287f1539935d2bfcdbfb734eb357 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=53fa5c0… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 14 18:06:13 2013 +0200 tm: removed unnecessary new flag in route_struct.h - Removed this flag: SUSPEND_R_F that was added by accident in first commit --- route_struct.h | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/route_struct.h b/route_struct.h index 83d1eb0..e56f4c0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -147,7 +147,6 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 -#define SUSPEND_R_F 16 #define IGNORE_ON_BREAK_R_F 256

11 years, 8 months

git:tmp/tm_async_reply_support: first work on async reply processing

by Jason Penton

Module: sip-router Branch: tmp/tm_async_reply_support Commit: 7199d849853dd89e2a1d7cc6415f83f8f1daae51 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7199d84… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Thu Mar 14 16:48:29 2013 +0200 first work on async reply processing --- parser/msg_parser.h | 1 + receive.c | 12 ++++++++++-- route_struct.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 79194e3..49d91f6 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -119,6 +119,7 @@ typedef enum request_method { #define FL_SDP_BODY (1 << 12) /*!< msg has SDP in body */ #define FL_USE_UAC_FROM (1<<13) /* take FROM hdr from UAC instead of UAS*/ #define FL_USE_UAC_TO (1<<14) /* take TO hdr from UAC instead of UAS */ +#define FL_RPL_SUSPENDED (1<<15) /* for async reply processing */ /* WARNING: Value (1 << 28) is temporarily reserved for use in kamailio call_control * module (flag FL_USE_CALL_CONTROL )! */ diff --git a/receive.c b/receive.c index a4018ff..e107cfa 100644 --- a/receive.c +++ b/receive.c @@ -265,6 +265,12 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) STATS_RPL_FWD_DROP(); goto skip_send_reply; /* drop the message, no error */ } + + if (unlikely(ret==0 || msg->flags&FL_RPL_SUSPENDED)) { + goto skip_send_reply; + /* suspend the reply (async), no error */ + } + } /* send the msg */ forward_reply(msg); @@ -277,8 +283,10 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) DBG("successfully ran reply processing...(%d usec)\n", diff); #endif - /* execute post reply-script callbacks */ - exec_post_script_cb(msg, ONREPLY_CB_TYPE); + if (likely(!(msg->flags&FL_RPL_SUSPENDED))) { + /* execute post reply-script callbacks */ + exec_post_script_cb(msg, ONREPLY_CB_TYPE); + } } end: diff --git a/route_struct.h b/route_struct.h index e56f4c0..83d1eb0 100644 --- a/route_struct.h +++ b/route_struct.h @@ -147,6 +147,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define SUSPEND_R_F 16 #define IGNORE_ON_BREAK_R_F 256

11 years, 8 months

git:4.0: ims_icscf: fix include list for BSD

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.0 Commit: 86f3f2755bcf63a97a8eabb8a72a06614c2dbf5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86f3f27… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 15 09:03:26 2013 +0100 ims_icscf: fix include list for BSD - patch by Victor V. Kustov (cherry picked from commit e930f94b71d2e5c40fa44d78738ce5efb747c5b1) --- modules/ims_icscf/cxdx_lir.c | 5 +++++ modules/ims_icscf/scscf_list.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index faabd85..24686e7 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,6 +51,11 @@ #include "mod.h" #include "location.h" +#if defined (__OS_freebsd) +#include "sys/limits.h" +#define MAXINT INT_MAX +#endif + //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { int rc; diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index bd5216c..8b6b79c 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,6 +47,11 @@ #include "db.h" #include "../../lib/ims/useful_defs.h" +#if defined (__OS_freebsd) +#include "sys/limits.h" +#define MAXINT INT_MAX +#endif + extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs

11 years, 8 months

git:master: ims_icscf: fix include list for BSD

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e930f94b71d2e5c40fa44d78738ce5efb747c5b1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e930f94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 15 09:03:26 2013 +0100 ims_icscf: fix include list for BSD - patch by Victor V. Kustov --- modules/ims_icscf/cxdx_lir.c | 5 +++++ modules/ims_icscf/scscf_list.c | 5 +++++ 2 files changed, 10 insertions(+), 0 deletions(-) diff --git a/modules/ims_icscf/cxdx_lir.c b/modules/ims_icscf/cxdx_lir.c index faabd85..24686e7 100644 --- a/modules/ims_icscf/cxdx_lir.c +++ b/modules/ims_icscf/cxdx_lir.c @@ -51,6 +51,11 @@ #include "mod.h" #include "location.h" +#if defined (__OS_freebsd) +#include "sys/limits.h" +#define MAXINT INT_MAX +#endif + //we use pseudo variables to communicate back to config file this takes the result and converys to a return code, publishes it a pseudo variable int create_lia_return_code(int result) { int rc; diff --git a/modules/ims_icscf/scscf_list.c b/modules/ims_icscf/scscf_list.c index bd5216c..8b6b79c 100644 --- a/modules/ims_icscf/scscf_list.c +++ b/modules/ims_icscf/scscf_list.c @@ -47,6 +47,11 @@ #include "db.h" #include "../../lib/ims/useful_defs.h" +#if defined (__OS_freebsd) +#include "sys/limits.h" +#define MAXINT INT_MAX +#endif + extern int scscf_entry_expiry; //time for scscf entries to remain the scscf_list extern struct tm_binds tmb; //Structure with pointers to tm funcs

11 years, 8 months

git:richard.good/diameter_rx_calling DELETED: ims_qos: bug fix for Rx flow-description AVP

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_calling DELETED Commit: 715c3a29fe990fbbf2193f44ea9dcde24421d833 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=715c3a2… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Thu Mar 14 18:55:52 2013 +0200 ims_qos: bug fix for Rx flow-description AVP - rx_avp.c: rx_create_media_subcomponent_avp removed options from flow-description AVP as per Rx 29.214 --- modules/ims_qos/rx_avp.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/ims_qos/rx_avp.c b/modules/ims_qos/rx_avp.c index 86a630f..d628192 100644 --- a/modules/ims_qos/rx_avp.c +++ b/modules/ims_qos/rx_avp.c @@ -505,8 +505,11 @@ static str permit_out = {"permit out ", 11}; static str permit_in = {"permit in ", 10}; static str from_s = {" from ", 6}; static str to_s = {" to ", 4}; -static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; -static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; +//removed final %s - this is options which Rx 29.214 says will not be used for flow-description AVP +static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u"; +//static char * permit_out_with_ports = "permit out %i from %.*s %u to %.*s %u %s"; +static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u"; +//static char * permit_in_with_ports = "permit in %i from %.*s %u to %.*s %u %s"; AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, str *ipA, str *portA, @@ -551,13 +554,13 @@ AAA_AVP *rx_create_media_subcomponent_avp(int number, char* proto, } set_4bytes(x, number); - + flow_number = cdpb.AAACreateAVP(AVP_IMS_Flow_Number, AAA_AVP_FLAG_MANDATORY | AAA_AVP_FLAG_VENDOR_SPECIFIC, IMS_vendor_id_3GPP, x, 4, AVP_DUPLICATE_DATA); cdpb.AAAAddAVPToList(&list, flow_number); - + /*IMS Flow descriptions*/ /*first flow is the receive flow*/ flow_data.len = snprintf(flow_data.s, len, permit_out_with_ports, proto_int,

11 years, 8 months

git:richard.good/diameter_rx_media: ims_qos: fixed return codes on error conditions

by Richard Good

Module: sip-router Branch: richard.good/diameter_rx_media Commit: cbbf7634c317b7cfd3927aed76a7093fa4394517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbbf763… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: Mon Mar 11 14:43:37 2013 +0200 ims_qos: fixed return codes on error conditions - Return CSCF_RETURN_ERROR on async diameter callback error instead of CSCF_RETURN_BREAK --- modules/ims_qos/mod.c | 3 +-- modules/ims_qos/rx_aar.c | 2 ++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/ims_qos/mod.c b/modules/ims_qos/mod.c index ac2c2ea..0d197ed 100644 --- a/modules/ims_qos/mod.c +++ b/modules/ims_qos/mod.c @@ -564,7 +564,6 @@ static int w_rx_aar(struct sip_msg *msg, char* str1, char* bar) { LM_ERR("Failed to send AAR\n"); tmb.t_cancel_suspend(saved_t_data->tindex, saved_t_data->tlabel); goto error; - return CSCF_RETURN_BREAK; } else { @@ -578,7 +577,7 @@ error: free_saved_transaction_global_data(saved_t_data); //only free global data if no AARs were sent. if one was sent we have to rely on the callback (CDP) to free //otherwise the callback will segfault - return CSCF_RETURN_BREAK; + return CSCF_RETURN_ERROR; } /* Wrapper to send AAR from config file - only used for registration */ diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index 9041172..f80fc00 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -101,6 +101,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps if (tmb.t_lookup_ident(&t, data->tindex, data->tlabel) < 0) { LM_ERR("t_continue: transaction not found\n"); goto error; + }else{ + LM_DBG("t_continue: transaction found\n"); } //we have T, lets restore our state (esp. for AVPs) set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from);

11 years, 8 months

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