sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
239 discussions

git:master: core/parse/sdp: proper parsing of a=rtpmap line
by Daniel-Constantin Mierla 30 May '14

30 May '14

Module: sip-router Branch: master Commit: c842bda9dac46724c58b734d092391c79867f2fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c842bda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 30 13:34:08 2014 +0200 core/parse/sdp: proper parsing of a=rtpmap line - error handling when malformed line, avoiding crash to due to invalid offsetting when clockrate is missing - reported by Michael Ricordeau, FS#435 --- parser/sdp/sdp_helpr_funcs.c | 34 ++++++++++++++++++---------------- 1 files changed, 18 insertions(+), 16 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 64868c1..6436b85 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -142,6 +142,10 @@ other: +/** + * rfc4566: + * a=rtpmap:<payload type> <encoding name>/<clock rate> [/<encoding parameters>] + */ int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, str *rtpmap_clockrate, str *rtpmap_parmas) { @@ -179,30 +183,28 @@ int extract_rtpmap(str *body, rtpmap_encoding->s = cp; cp1 = (char*)ser_memmem(cp, "/", len, 1); - len -= cp1 - cp; - if (len <= 0 || cp == cp1) { - LM_ERR("invalid encoding in `a=rtpmap'\n"); + if(cp1==NULL) { + LM_ERR("invalid encoding in `a=rtpmap' at [%.*s]\n", len, cp); return -1; } + len -= cp1 - cp; rtpmap_encoding->len = cp1 - cp; - cp = cp1; + cp = cp1+1; /* skip '/' */ + len--; + rtpmap_clockrate->s = cp; cp1 = (char*)ser_memmem(cp, "/", len, 1); - len -= cp1 - cp; - if (len <= 0) { - LM_ERR("invalid encoding in `a=rtpmap:'\n"); - return -1; - } - - rtpmap_clockrate->s = cp + 1; /* skip '/' */ - rtpmap_clockrate->len = len -1; /* skip '/' */ - if ( cp == cp1) { + if(cp1==NULL) { + /* no encoding parameters */ + rtpmap_clockrate->len = len; rtpmap_parmas->s = NULL; rtpmap_parmas->len = 0; - } else { - rtpmap_parmas->s = cp1 + 1; - rtpmap_parmas->len = cp1 - cp; + return 0; } + rtpmap_clockrate->len = cp1 - cp; + len -= cp1 - cp; + rtpmap_parmas->s = cp1 + 1; /* skip '/' */ + rtpmap_parmas->len = len - 1; return 0; }

1 0

Anyone going to AstriCon this year
by Peter Dunkley 30 May '14

30 May '14

Hello, I submitted a proposal to speak at AstriCon today (deadline for submissions is this Saturday) and was just wondering if anyone else from the Kamailio community has submitted anything or is planning to be there? Regards, Peter -- Peter Dunkley Technical Director Acision

3 2

git:master: auth_radius: Improve error message to simplify debugging
by Olle E. Johansson 30 May '14

30 May '14

Module: sip-router Branch: master Commit: 6e51019b0a2c60178b9ca03b9bb2a5fef49ca7ba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e51019… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri May 30 09:20:49 2014 +0100 auth_radius: Improve error message to simplify debugging --- modules/auth_radius/sterman.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/auth_radius/sterman.c b/modules/auth_radius/sterman.c index be4dcf3..93cd416 100644 --- a/modules/auth_radius/sterman.c +++ b/modules/auth_radius/sterman.c @@ -409,7 +409,7 @@ int radius_authorize_sterman(struct sip_msg* _msg, dig_cred_t* _cred, str* _meth goto err; } #endif - LM_ERR("authorization failed\n"); + LM_ERR("authorization failed. RC auth returned %d\n", i); } err:

1 0

git:master: Arrghh. Poor memory. My apologies for this commit.
by Olle E. Johansson 30 May '14

30 May '14

Module: sip-router Branch: master Commit: 6bc322ee1abcd78a18be049c41e7981d920dec82 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6bc322e… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Fri May 30 09:21:24 2014 +0100 Arrghh. Poor memory. My apologies for this commit. Merge branch 'master' of ssh://git.sip-router.org/sip-router ---

1 0

git:4.1: pv: safety check for PAI header parsed structure
by Daniel-Constantin Mierla 29 May '14

29 May '14

Module: sip-router Branch: 4.1 Commit: 7bdaca008e1bddbe9ab4db9d70e835ba45f6a5ff URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bdaca0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 29 17:06:13 2014 +0200 pv: safety check for PAI header parsed structure - reported by Igor Potjevlesch (cherry picked from commit e633ca6b7e748a77825d3208e86bf9bce18944a5) --- modules/pv/pv_core.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index 3f48830..59a3539 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -991,6 +991,11 @@ int pv_get_pai(struct sip_msg *msg, pv_param_t *param, } pai_body = get_pai(msg); + if(pai_body==NULL || pai_body->id==NULL) + { + LM_DBG("no P-Asserted-Identity header or empty body\n"); + return pv_get_null(msg, param, res); + } pai_uri = &pai_body->id[0]; cur_id = 0; i = 0;

1 0

git:master: pv: safety check for PAI header parsed structure
by Daniel-Constantin Mierla 29 May '14

29 May '14

Module: sip-router Branch: master Commit: e633ca6b7e748a77825d3208e86bf9bce18944a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e633ca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 29 17:06:13 2014 +0200 pv: safety check for PAI header parsed structure - reported by Igor Potjevlesch --- modules/pv/pv_core.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/pv/pv_core.c b/modules/pv/pv_core.c index c472622..876a246 100644 --- a/modules/pv/pv_core.c +++ b/modules/pv/pv_core.c @@ -994,6 +994,11 @@ int pv_get_pai(struct sip_msg *msg, pv_param_t *param, } pai_body = get_pai(msg); + if(pai_body==NULL || pai_body->id==NULL) + { + LM_DBG("no P-Asserted-Identity header or empty body\n"); + return pv_get_null(msg, param, res); + } pai_uri = &pai_body->id[0]; cur_id = 0; i = 0;

1 0

[tracker] Comment added: crash in parser/sdp/sdp_helpr_funcs.c
by sip-router 29 May '14

29 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#435 - crash in parser/sdp/sdp_helpr_funcs.c User who did this - Daniel-Constantin Mierla (miconda) ---------- Anyhow, the parser should not crash -- the issue has to be detected and an error printed. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=435#comment1484 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

[tracker] Comment added: crash in parser/sdp/sdp_helpr_funcs.c
by sip-router 29 May '14

29 May '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#435 - crash in parser/sdp/sdp_helpr_funcs.c User who did this - Ovidiu Sas (osas) ---------- The INVITE is malformed. Content-Length: 416 v=0\r\no=- 3610278376 3610278376 IN IP4 64.200.200.20\r\ns=pjmedia\r\nb=AS:84\r\nt=0 0\r\na=X-nat:0\r\nm=audio 64400 RTP/AVP 8 0 9 103 102 104 101\r\nc=IN IP4 64.200.200.20\r\nb=TIAS:64000\r\na=rtcp:64401 IN IP4 64.200.200.20\r\na=sendrecv\r\na=rtpmap:8 PCMA/8000\r\na=rtpmap:0 PCMU/8000\r\na=rtpmap:9 G700\r\na=rtpmap:103 speex/16000\r\na=rtpmap:102 speex/8000\r\na=rtpmap:104 speex/32000\r\na=rtpmap:101 telephone-event/8000\r\na=fmtp:101 0-15\r\n-15\r\n The Content-Length header is not matching the actual SDP length and at the end of SDP there is a bogus extra line: a=fmtp:101 0-15\r\n-15\r\n Looks like the SDP was tempered with in a bad way. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=435#comment1483 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/cdp: added loadbalancing across diameter peers within the same realm and with the same metric
by Jason Penton 29 May '14

29 May '14

Module: sip-router Branch: master Commit: 79bcd31ae4f30a60c6d3f2a88b505a35ba0f6927 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79bcd31… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu May 29 13:04:33 2014 +0200 modules/cdp: added loadbalancing across diameter peers within the same realm and with the same metric --- modules/cdp/cdp_rpc.c | 32 ++++++++++++++++++++++++++++---- modules/cdp/diameter_comm.c | 2 +- modules/cdp/peer.h | 1 + modules/cdp/routing.c | 41 ++++++++++++++++++++++++++++++++++++++--- 4 files changed, 68 insertions(+), 8 deletions(-) diff --git a/modules/cdp/cdp_rpc.c b/modules/cdp/cdp_rpc.c index 0db5b26..8b7310c 100644 --- a/modules/cdp/cdp_rpc.c +++ b/modules/cdp/cdp_rpc.c @@ -66,7 +66,10 @@ static void cdp_rpc_list_peers(rpc_t* rpc, void* ctx) void *peers_header; void *peers_container; void *peerdetail_container; - peer *i; + void *peerapplication_container; + peer *i, *j; + int c; + char buf[100]; if (rpc->add(ctx, "{", &peers_header) < 0) { rpc->fault(ctx, 500, "Internal error creating top rpc"); @@ -91,19 +94,40 @@ static void cdp_rpc_list_peers(rpc_t* rpc, void* ctx) lock_get(peer_list_lock); i = peer_list->head; while (i) { - if (rpc->struct_add(peers_container, "S{", + lock_get(i->lock); + if (rpc->struct_add(peers_container, "S{", "FQDN", &i->fqdn, "Details", &peerdetail_container) < 0) { rpc->fault(ctx, 500, "Internal error creating peers container struct"); + lock_release(i->lock); return; } - if (rpc->struct_add(peerdetail_container, "ss", + if (rpc->struct_add(peerdetail_container, "ssd", "State", dp_states[(int)i->state], - "Disabled", i->disabled?"True":"False") < 0) { + "Disabled", i->disabled?"True":"False", + "Last used", i->last_selected) < 0) { rpc->fault(ctx, 500, "Internal error creating peer detail container struct"); + lock_release(i->lock); return; } + if (rpc->struct_add(peerdetail_container, "{", "Applications", &peerapplication_container) < 0) { + rpc->fault(ctx, 500, "Internal error creating peer application container struct"); + lock_release(i->lock); + return; + } + + for (c = 0; c < i->applications_cnt; c++) { + snprintf(buf, 100, "%d:%d", i->applications[c].id, i->applications[c].vendor); + if (rpc->struct_add(peerapplication_container, "s", + "appid:vendorid", buf) < 0) { + rpc->fault(ctx, 500, "Internal error creating appid/vendorid information"); + lock_release(i->lock); + return; + } + } + j=i; i = i->next; + lock_release(j->lock); } lock_release(peer_list_lock); } diff --git a/modules/cdp/diameter_comm.c b/modules/cdp/diameter_comm.c index 5e28e91..fc29596 100644 --- a/modules/cdp/diameter_comm.c +++ b/modules/cdp/diameter_comm.c @@ -195,7 +195,7 @@ AAAReturnCode AAASendMessageToPeer( LM_ERR("AAASendMessageToPeer(): can't add transaction callback for answer.\n"); } -// if (!peer_send_msg(p,message)) + p->last_selected = time(NULL); if (!sm_process(p,Send_Message,message,0,0)) goto error; diff --git a/modules/cdp/peer.h b/modules/cdp/peer.h index cf0451a..a16393a 100644 --- a/modules/cdp/peer.h +++ b/modules/cdp/peer.h @@ -111,6 +111,7 @@ typedef struct _peer_t{ int R_sock; /**< socket used as receiver */ time_t activity; /**< timestamp of last activity */ + time_t last_selected; /**< timestamp this peer was last selected for routing - used in least recently used load balancing across metric */ int is_dynamic; /**< whether this peer was accepted although it was not initially configured */ int disabled; /**< administratively enable/disable a peer - ie remove/re-add from service dynamically */ int waitingDWA; /**< if a Diameter Watch-dog Request was sent out and waiting for an answer */ diff --git a/modules/cdp/routing.c b/modules/cdp/routing.c index 4e84be2..499519a 100644 --- a/modules/cdp/routing.c +++ b/modules/cdp/routing.c @@ -48,7 +48,10 @@ #include "peermanager.h" #include "diameter_api.h" +#define LB_MAX_PEERS 20 /**< maximum peers that can be loadbalanced accross i.e. same metric */ + extern dp_config *config; /**< Configuration for this diameter peer */ +int gcount = 0; /** * Returns if the peer advertised support for an Application ID @@ -74,11 +77,19 @@ int peer_handles_application(peer *p,int app_id,int vendor_id) */ peer* get_first_connected_route(routing_entry *r,int app_id,int vendor_id) { + peer *peers[LB_MAX_PEERS]; + int peer_count=0; + int prev_metric=0; routing_entry *i; peer *p; + int j; + time_t least_recent_time; + LM_DBG("get_first_connected_route in list %p for app_id %d and vendor_id %d\n", r,app_id,vendor_id); for(i=r;i;i=i->next){ + if (peer_count >= LB_MAX_PEERS) + break; p = get_peer_by_fqdn(&(i->fqdn)); if (!p) LM_DBG("The peer %.*s does not seem to be connected or configured\n", @@ -88,10 +99,31 @@ peer* get_first_connected_route(routing_entry *r,int app_id,int vendor_id) (p->state==I_Open||p->state==R_Open)?"opened":"closed"); if (p && !p->disabled && (p->state==I_Open || p->state==R_Open) && peer_handles_application(p,app_id,vendor_id)) { LM_DBG("The peer %.*s matches - will forward there\n",i->fqdn.len,i->fqdn.s); - return p; + if (peer_count!=0) {//check the metric + if (i->metric != prev_metric) + break; + //metric must be the same + peers[peer_count++] = p; + } else {//we're first + prev_metric = i->metric; + peers[peer_count++] = p; + } } } - return 0; + + if (peer_count==0) + return 0; + + least_recent_time = peers[0]->last_selected; + p = peers[0]; + for (j=1; j<peer_count; j++) { + if (peers[j]->last_selected < least_recent_time) { + least_recent_time = peers[j]->last_selected; + p = peers[j]; + } + } + + return p; } /** @@ -153,7 +185,10 @@ peer* get_routing_peer(AAAMessage *m) if (destination_host.len){ /* There is a destination host present in the message try and route directly there */ p = get_peer_by_fqdn(&destination_host); - if (p && (p->state==I_Open || p->state==R_Open) && peer_handles_application(p,app_id,vendor_id)) return p; + if (p && (p->state==I_Open || p->state==R_Open) && peer_handles_application(p,app_id,vendor_id)) { + p->last_selected = time(NULL); + return p; + } /* the destination host peer is not connected at the moment, try a normal route then */ }

1 0

git:master: modules/ims_charging: possible crash fixed on CCR timeout and some cleanup
by Jason Penton 29 May '14

29 May '14

Module: sip-router Branch: master Commit: 5e9a4997841f328f20cb7459a08f643ad065412d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e9a499… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Thu May 29 12:57:16 2014 +0200 modules/ims_charging: possible crash fixed on CCR timeout and some cleanup - diameter destination realm correctly setup for routing/load balancing of request to multiple peers --- modules/ims_charging/ccr.c | 5 ++- modules/ims_charging/config.h | 1 - modules/ims_charging/ims_ro.c | 73 +++++++++++++--------------------------- modules/ims_charging/mod.c | 3 -- modules/ims_charging/ro_avp.c | 53 +++++++++++++++++++++++++++++ modules/ims_charging/ro_avp.h | 17 +++++++++ 6 files changed, 97 insertions(+), 55 deletions(-) diff --git a/modules/ims_charging/ccr.c b/modules/ims_charging/ccr.c index 51a8bf7..3621a75 100644 --- a/modules/ims_charging/ccr.c +++ b/modules/ims_charging/ccr.c @@ -2,8 +2,10 @@ #include "ccr.h" #include "Ro_data.h" +#include "ro_avp.h" extern cdp_avp_bind_t *cdp_avp; +extern struct cdp_binds cdpb; int Ro_write_event_type_avps(AAA_AVP_LIST * avp_list, event_type_t * x) { AAA_AVP_LIST aList = {0, 0}; @@ -187,9 +189,8 @@ AAAMessage * Ro_write_CCR_avps(AAAMessage * ccr, Ro_CCR_t* x) { if (!ccr) return 0; if (!cdp_avp->base.add_Origin_Host(&(ccr->avpList), x->origin_host, 0)) goto error; - if (!cdp_avp->base.add_Origin_Realm(&(ccr->avpList), x->origin_realm, 0)) goto error; - if (!cdp_avp->base.add_Destination_Realm(&(ccr->avpList), x->destination_realm, 0)) goto error; + if (!ro_add_destination_realm_avp(ccr, x->destination_realm)) goto error; if (!cdp_avp->base.add_Accounting_Record_Type(&(ccr->avpList), x->acct_record_type)) goto error; if (!cdp_avp->base.add_Accounting_Record_Number(&(ccr->avpList), x->acct_record_number)) goto error; diff --git a/modules/ims_charging/config.h b/modules/ims_charging/config.h index d3868b5..8ceabd4 100644 --- a/modules/ims_charging/config.h +++ b/modules/ims_charging/config.h @@ -5,7 +5,6 @@ typedef struct { str origin_host; str origin_realm; str destination_realm; - str destination_host; str * service_context_id; } client_ro_cfg; diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index f71dc98..59c3ab3 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -29,12 +29,14 @@ #include "config.h" #include "ro_session_hash.h" #include "stats.h" +#include "ro_avp.h" extern struct tm_binds tmb; extern struct cdp_binds cdpb; extern client_ro_cfg cfg; extern struct dlg_binds dlgb; extern cdp_avp_bind_t *cdp_avp; +extern str ro_forced_peer; struct session_setup_data { struct ro_session *ro_session; @@ -85,34 +87,6 @@ struct sip_msg * trans_get_request_from_current_reply() { } /** - * Create and add an AVP to a Diameter message. - * @param m - Diameter message to add to - * @param d - the payload data - * @param len - length of the payload data - * @param avp_code - the code of the AVP - * @param flags - flags for the AVP - * @param vendorid - the value of the vendor id or 0 if none - * @param data_do - what to do with the data when done - * @param func - the name of the calling function, for debugging purposes - * @returns 1 on success or 0 on failure - */ -static inline int Ro_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { - AAA_AVP *avp; - if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC; - avp = cdpb.AAACreateAVP(avp_code, flags, vendorid, d, len, data_do); - if (!avp) { - LM_ERR("%s: Failed creating avp\n", func); - return 0; - } - if (cdpb.AAAAddAVPToMessage(m, avp, m->avpList.tail) != AAA_ERR_SUCCESS) { - LM_ERR("%s: Failed adding avp to message\n", func); - cdpb.AAAFreeAVP(&avp); - return 0; - } - return 1; -} - -/** * Create and add an AVP to a list of AVPs. * @param list - the AVP list to add to * @param d - the payload data @@ -148,22 +122,6 @@ static inline int Ro_add_avp_list(AAA_AVP_LIST *list, char *d, int len, int avp_ return 1; } -/** - * Creates and adds a Destination-Realm AVP. - * @param msg - the Diameter message to add to. - * @param data - the value for the AVP payload - * @returns 1 on success or 0 on error - */ -inline int ro_add_destination_realm_avp(AAAMessage *msg, str data) { - return - Ro_add_avp(msg, data.s, data.len, - AVP_Destination_Realm, - AAA_AVP_FLAG_MANDATORY, - 0, - AVP_DUPLICATE_DATA, - __FUNCTION__); -} - inline int Ro_add_cc_request(AAAMessage *msg, unsigned int cc_request_type, unsigned int cc_request_number) { char x[4]; set_4bytes(x, cc_request_type); @@ -631,8 +589,11 @@ void send_ccr_interim(struct ro_session* ro_session, unsigned int used, unsigned cdpb.AAASessionsUnlock(auth->hash); - //AAAMessage *cca = cdpb.AAASendRecvMessageToPeer(ccr, &cfg.destination_host); - cdpb.AAASendMessageToPeer(ccr, &cfg.destination_host, resume_on_interim_ccr, (void *) i_req); + if (ro_forced_peer.len > 0) { + cdpb.AAASendMessageToPeer(ccr, &ro_forced_peer, resume_on_interim_ccr, (void *) i_req); + } else { + cdpb.AAASendMessage(ccr, resume_on_interim_ccr, (void *) i_req); + } // cdpb.AAASessionsUnlock(auth->hash); @@ -850,7 +811,12 @@ void send_ccr_stop(struct ro_session *ro_session) { } cdpb.AAASessionsUnlock(auth->hash); - cdpb.AAASendMessageToPeer(ccr, &cfg.destination_host, resume_on_termination_ccr, NULL); + + if (ro_forced_peer.len > 0) { + cdpb.AAASendMessageToPeer(ccr, &ro_forced_peer, resume_on_termination_ccr, NULL); + } else { + cdpb.AAASendMessage(ccr, resume_on_termination_ccr, NULL); + } Ro_free_CCR(ro_ccr_data); @@ -1050,7 +1016,14 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, str* charge_ LM_DBG("Sending CCR Diameter message.\n"); cdpb.AAASessionsUnlock(cc_acc_session->hash); - cdpb.AAASendMessageToPeer(ccr, &cfg.destination_host, resume_on_initial_ccr, (void *) ssd); + + if (ro_forced_peer.len > 0) { + LM_DBG("Sending message with Peer\n"); + cdpb.AAASendMessageToPeer(ccr, &ro_forced_peer, resume_on_initial_ccr, (void *) ssd); + } else { + LM_DBG("Sending message without Peer and realm is [%.*s]\n", ccr->dest_realm->data.len, ccr->dest_realm->data.s); + cdpb.AAASendMessage(ccr, resume_on_initial_ccr, (void *) ssd); + } Ro_free_CCR(ro_ccr_data); @@ -1177,7 +1150,9 @@ error0: LM_DBG("Trying to reserve credit on initial INVITE failed on cdp callback\n"); create_cca_return_code(error_code); - cdpb.AAAFreeMessage(&cca); + if (!is_timeout && cca) { + cdpb.AAAFreeMessage(&cca); + } if (t) tmb.unref_cell(t); diff --git a/modules/ims_charging/mod.c b/modules/ims_charging/mod.c index e305bb5..30442ba 100644 --- a/modules/ims_charging/mod.c +++ b/modules/ims_charging/mod.c @@ -150,9 +150,6 @@ int fix_parameters() { cfg.destination_realm.s = ro_destination_realm_s; cfg.destination_realm.len = strlen(ro_destination_realm_s); - cfg.destination_host.s = ro_destination_host_s; - cfg.destination_host.len = strlen(ro_destination_host_s); - cfg.service_context_id = shm_malloc(sizeof(str)); if (!cfg.service_context_id) { LM_ERR("fix_parameters:not enough shm memory\n"); diff --git a/modules/ims_charging/ro_avp.c b/modules/ims_charging/ro_avp.c new file mode 100644 index 0000000..25c37d2 --- /dev/null +++ b/modules/ims_charging/ro_avp.c @@ -0,0 +1,53 @@ +/* + * ro_avp.c + * + * Created on: 29 May 2014 + * Author: jaybeepee + */ +#include "ro_avp.h" + +extern struct cdp_binds cdpb; +/** + * Creates and adds a Destination-Realm AVP. + * @param msg - the Diameter message to add to. + * @param data - the value for the AVP payload + * @returns 1 on success or 0 on error + */ +int ro_add_destination_realm_avp(AAAMessage *msg, str data) { + return + Ro_add_avp(msg, data.s, data.len, + AVP_Destination_Realm, + AAA_AVP_FLAG_MANDATORY, + 0, + AVP_DUPLICATE_DATA, + __FUNCTION__); +} + +/** + * Create and add an AVP to a Diameter message. + * @param m - Diameter message to add to + * @param d - the payload data + * @param len - length of the payload data + * @param avp_code - the code of the AVP + * @param flags - flags for the AVP + * @param vendorid - the value of the vendor id or 0 if none + * @param data_do - what to do with the data when done + * @param func - the name of the calling function, for debugging purposes + * @returns 1 on success or 0 on failure + */ +int Ro_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func) { + AAA_AVP *avp; + if (vendorid != 0) flags |= AAA_AVP_FLAG_VENDOR_SPECIFIC; + avp = cdpb.AAACreateAVP(avp_code, flags, vendorid, d, len, data_do); + if (!avp) { + LM_ERR("%s: Failed creating avp\n", func); + return 0; + } + if (cdpb.AAAAddAVPToMessage(m, avp, m->avpList.tail) != AAA_ERR_SUCCESS) { + LM_ERR("%s: Failed adding avp to message\n", func); + cdpb.AAAFreeAVP(&avp); + return 0; + } + return 1; +} + diff --git a/modules/ims_charging/ro_avp.h b/modules/ims_charging/ro_avp.h new file mode 100644 index 0000000..d5cfede --- /dev/null +++ b/modules/ims_charging/ro_avp.h @@ -0,0 +1,17 @@ +/* + * ro_avp.h + * + * Created on: 29 May 2014 + * Author: jaybeepee + */ + +#ifndef RO_AVP_H_ +#define RO_AVP_H_ + +#include "../cdp/cdp_load.h" + +int ro_add_destination_realm_avp(AAAMessage *msg, str data); +int Ro_add_avp(AAAMessage *m, char *d, int len, int avp_code, int flags, int vendorid, int data_do, const char *func); + + +#endif /* RO_AVP_H_ */

1 0

← Newer
1
2
3
4
5
6
7
...
24
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014