sr-dev October 2013

sr-dev@lists.kamailio.org

33 participants
254 discussions

git:tmp/ims_charging: ims_charging: read diameter AVP MAC value dynamically from $avp
by Carlos Ruiz Diaz 03 Oct '13

03 Oct '13

Module: sip-router Branch: tmp/ims_charging Commit: 639ce584258f2c2ad4331bbd9ae2599a86edc80b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=639ce58… Author: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Committer: Carlos Ruiz Diaz <carlos.ruizdiaz(a)gmail.com> Date: Thu Oct 3 11:56:13 2013 -0400 ims_charging: read diameter AVP MAC value dynamically from $avp - $avp(ro_mac_value) can be either present or not. In case it is not, default value is … [View More]used - $avp(cca_result_code) now supports interpolation --- modules/ims_charging/ims_ro.c | 47 ++++++++++++++++++++----------- modules/ims_charging/mod.h | 3 ++ modules/ims_charging/ro_session_hash.c | 11 ++++++- modules/ims_charging/ro_session_hash.h | 8 +++++- 4 files changed, 49 insertions(+), 20 deletions(-) diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 1df9537..9cd2c08 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -53,6 +53,7 @@ static int create_cca_return_code(int result); static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs); static void resume_on_interim_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs); static void resume_on_termination_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs); +static int get_mac_avp_value(struct sip_msg *msg, str *value); void credit_control_session_callback(int event, void* session) { switch (event) { @@ -602,11 +603,8 @@ void send_ccr_interim(struct ro_session* ro_session, unsigned int used, unsigned if (!Ro_add_event_timestamp(ccr, time(NULL))) { LM_ERR("Problem adding Event-Timestamp data\n"); } - str mac; - mac.s = "00:00:00:00:00:00"; - mac.len = strlen(mac.s); //TODO - this is terrible - if (!Ro_add_user_equipment_info(ccr, AVP_EPC_User_Equipment_Info_Type_MAC, mac)) { + if (!Ro_add_user_equipment_info(ccr, AVP_EPC_User_Equipment_Info_Type_MAC, ro_session->avp_value.mac)) { LM_ERR("Problem adding User-Equipment data\n"); } @@ -787,12 +785,8 @@ void send_ccr_stop(struct ro_session *ro_session) { if (!Ro_add_event_timestamp(ccr, time(NULL))) { LM_ERR("Problem adding Event-Timestamp data\n"); } - - str mac; - mac.s = "00:00:00:00:00:00"; /*TODO: this is just a hack becuase we dont use this avp right now - if yuo like you can get the mac or some other info */ - mac.len = strlen(mac.s); - if (!Ro_add_user_equipment_info(ccr, AVP_EPC_User_Equipment_Info_Type_MAC, mac)) { + if (!Ro_add_user_equipment_info(ccr, AVP_EPC_User_Equipment_Info_Type_MAC, ro_session->avp_value.mac)) { LM_ERR("Problem adding User-Equipment data\n"); } @@ -910,9 +904,13 @@ int Ro_Send_CCR(struct sip_msg *msg, str* direction, str* charge_type, str* unit dir = get_direction_as_int(direction); + str mac = {0,0}; + if (get_mac_avp_value(msg, &mac) != 0) + LM_DBG(RO_MAC_AVP_NAME" was not set. Using default."); + //create a session object without auth and diameter session id - we will add this later. new_session = build_new_ro_session(dir, 0, 0, &session_id, &dlg->callid, - &asserted_id_uri, &msg->first_line.u.request.uri, dlg->h_entry, dlg->h_id, + &asserted_id_uri, &msg->first_line.u.request.uri, &mac, dlg->h_entry, dlg->h_id, reservation_units, 0); if (!new_session) { @@ -952,10 +950,6 @@ int Ro_Send_CCR(struct sip_msg *msg, str* direction, str* charge_type, str* unit goto error; } - str mac; //TODO - this is terrible - mac.s = "00:00:00:00:00:00"; - mac.len = strlen(mac.s); - if (!Ro_add_user_equipment_info(ccr, AVP_EPC_User_Equipment_Info_Type_MAC, mac)) { LM_ERR("Problem adding User-Equipment data\n"); goto error; @@ -1137,7 +1131,7 @@ static int create_cca_return_code(int result) { avp_val.n = result; - /*switch(result) { + switch(result) { case RO_RETURN_FALSE: avp_val.s.s = RO_RETURN_FALSE_STR; break; @@ -1148,12 +1142,14 @@ static int create_cca_return_code(int result) { if (result >= 0) break; + LM_ERR("Unknown result code: %d", result); avp_val.s.s = "??"; } - avp_val.s.len = 2; */ + if (result < 0) + avp_val.s.len = 2; - rc = add_avp(AVP_NAME_STR/*|AVP_VAL_STR*/, avp_name, avp_val); + rc = add_avp(AVP_NAME_STR|AVP_VAL_STR, avp_name, avp_val); if (rc < 0) LM_ERR("Couldn't create ["RO_AVP_CCA_RETURN_CODE"] AVP\n"); @@ -1162,3 +1158,20 @@ static int create_cca_return_code(int result) { return 1; } + +static int get_mac_avp_value(struct sip_msg *msg, str *value) { + str mac_avp_name_str = str_init(RO_MAC_AVP_NAME); + pv_spec_t avp_spec; + pv_value_t val; + + pv_parse_spec2(&mac_avp_name_str, &avp_spec, 1); + if (pv_get_spec_value(msg, &avp_spec, &val) != 0 || val.rs.len == 0) { + + value->s = "00:00:00:00:00:00"; + value->len = sizeof("00:00:00:00:00:00") - 1; + return -1; + } + + *value = val.rs; + return 0; +} diff --git a/modules/ims_charging/mod.h b/modules/ims_charging/mod.h index 50c8bc1..9c445f2 100644 --- a/modules/ims_charging/mod.h +++ b/modules/ims_charging/mod.h @@ -31,4 +31,7 @@ #define RO_AVP_CCA_RETURN_CODE "cca_return_code" #define RO_AVP_CCA_RETURN_CODE_LENGTH 15 + +#define RO_MAC_AVP_NAME "$avp(ro_mac_value)" + #endif /* MOD_H_ */ diff --git a/modules/ims_charging/ro_session_hash.c b/modules/ims_charging/ro_session_hash.c index 56ed5d9..c79d3b2 100644 --- a/modules/ims_charging/ro_session_hash.c +++ b/modules/ims_charging/ro_session_hash.c @@ -138,6 +138,8 @@ inline void destroy_ro_session(struct ro_session *ro_session) { if (ro_session->ro_session_id.s && (ro_session->ro_session_id.len > 0)) { shm_free(ro_session->ro_session_id.s); } + + shm_free(ro_session); } @@ -172,10 +174,10 @@ void destroy_dlg_table(void) { return; } -struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_session_type, str *session_id, str *callid, str *from_uri, str* to_uri, unsigned int dlg_h_entry, unsigned int dlg_h_id, unsigned int requested_secs, unsigned int validity_timeout){ +struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_session_type, str *session_id, str *callid, str *from_uri, str* to_uri, str* mac, unsigned int dlg_h_entry, unsigned int dlg_h_id, unsigned int requested_secs, unsigned int validity_timeout){ LM_DBG("Building Ro Session **********"); char *p; - unsigned int len = session_id->len + callid->len + from_uri->len + to_uri->len + sizeof (struct ro_session); + unsigned int len = session_id->len + callid->len + from_uri->len + to_uri->len + mac->len + sizeof (struct ro_session); struct ro_session *new_ro_session = (struct ro_session*) shm_malloc(len); if (!new_ro_session) { @@ -228,6 +230,11 @@ struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_ memcpy(p, to_uri->s, to_uri->len); p += to_uri->len; + new_ro_session->avp_value.mac.s = p; + new_ro_session->avp_value.mac.len = mac->len; + memcpy(p, mac->s, mac->len); + + p += mac->len; if (p != (((char*) new_ro_session) + len)) { LM_ERR("buffer overflow\n"); diff --git a/modules/ims_charging/ro_session_hash.h b/modules/ims_charging/ro_session_hash.h index f91f23a..d57ef28 100644 --- a/modules/ims_charging/ro_session_hash.h +++ b/modules/ims_charging/ro_session_hash.h @@ -19,6 +19,10 @@ enum ro_session_event_type { unknown_error }; +struct diameter_avp_value { + str mac; +}; + struct ro_session { str cdp_session_id; volatile int ref; @@ -43,6 +47,8 @@ struct ro_session { int auth_appid; int auth_session_type; int active; + + struct diameter_avp_value avp_value; }; /*! entries in the main ro_session table */ @@ -164,7 +170,7 @@ void link_ro_session(struct ro_session *ro_session, int n); void remove_aaa_session(str *session_id); -struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_session_type, str *session_id, str *callid, str *from_uri, str* to_uri, unsigned int dlg_h_entry, unsigned int dlg_h_id, unsigned int requested_secs, unsigned int validity_timeout); +struct ro_session* build_new_ro_session(int direction, int auth_appid, int auth_session_type, str *session_id, str *callid, str *from_uri, str* to_uri, str* mac, unsigned int dlg_h_entry, unsigned int dlg_h_id, unsigned int requested_secs, unsigned int validity_timeout); /*! * \brief Refefence a ro_session with locking [View Less]

1 0

git:tteras/mohqueue: modules/mohqueue: pull changes from upstream
by Timo Teras 03 Oct '13

03 Oct '13

Module: sip-router Branch: tteras/mohqueue Commit: 753e93d3ad1658c104963c208c4e36b23c1dd307 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=753e93d… Author: Robert Boisvert <rdboisvert(a)gmail.com> Committer: Timo Teräs <timo.teras(a)iki.fi> Date: Thu Oct 3 09:22:54 2013 +0300 modules/mohqueue: pull changes from upstream Merges up to upstream commit a3f679430d853d5b1b71ba92d8547ca2c86509ec. Changes in code: * fixes RTP stop not being sent * use … [View More]

1 0

this was sent to me instead of the list, juha
by Juha Heinanen 03 Oct '13

03 Oct '13

From: Joseph Watson <joseph.watson(a)veranetworks.com> To: jh(a)tutpro.com Subject: unmatched_cancel documentation Date: Wed, 2 Oct 2013 18:00:18 -0400 Hello, I just wanted to take a moment to notify you that we found a mistake in the tm module documentation for the 4.x and stable docmentation. According to the documentation for unmatched_cancel the option in the param is a string which would require surounding quotes. However we found that the paramater is expecting an intiger instead … [View More]

1 0

git:master: dmq: regenerated readme
by Charles Chance 03 Oct '13

03 Oct '13

Module: sip-router Branch: master Commit: 9978906d39071908234f0236ea8693844a3c5ba1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9978906… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Oct 3 05:59:09 2013 +0100 dmq: regenerated readme --- modules/dmq/README | 29 +++++++++++++++++------------ 1 files changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/… [View More]dmq/README b/modules/dmq/README index d5de540..650616d 100644 --- a/modules/dmq/README +++ b/modules/dmq/README @@ -39,17 +39,19 @@ Charles Chance 4. Functions 4.1. dmq_handle_message() - 4.2. dmq_send_message(peer, node, body) + 4.2. dmq_send_message(peer, node, body, content_type) 2. Developer Guide 1. dmq_load_api(dmq_api_t* api) 2. register_dmq_peer(dmq_peer_t* peer) 3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, - dmq_resp_cback_t* resp_cback, int max_forwards) + dmq_resp_cback_t* resp_cback, int max_forwards, str* + content_type) 4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, - dmq_resp_cback_t* resp_cback, int max_forwards) + dmq_resp_cback_t* resp_cback, int max_forwards, str* + content_type) List of Examples @@ -84,7 +86,7 @@ Chapter 1. Admin Guide 4. Functions 4.1. dmq_handle_message() - 4.2. dmq_send_message(peer, node, body) + 4.2. dmq_send_message(peer, node, body, content_type) 1. Overview @@ -176,7 +178,7 @@ modparam("dmq", "ping_interval", 90) 4. Functions 4.1. dmq_handle_message() - 4.2. dmq_send_message(peer, node, body) + 4.2. dmq_send_message(peer, node, body, content_type) 4.1. dmq_handle_message() @@ -193,7 +195,7 @@ modparam("dmq", "ping_interval", 90) } ... -4.2. dmq_send_message(peer, node, body) +4.2. dmq_send_message(peer, node, body, content_type) Sends a DMQ message directly from config file. @@ -201,13 +203,14 @@ modparam("dmq", "ping_interval", 90) * peer - name of peer that should handle the message. * node - the node to which the message should be sent. * body - the message body. + * content_type - the MIME type of the message body. This function can be used from any route. Example 1.6. dmq_send_message usage ... - dmq_send_message("peer_name", "sip:10.0.0.21:5060", "Message body...\n") -; + dmq_send_message("peer_name", "sip:10.0.0.21:5060", "Message body...", " +text/plain"); ... Chapter 2. Developer Guide @@ -217,10 +220,12 @@ Chapter 2. Developer Guide 1. dmq_load_api(dmq_api_t* api) 2. register_dmq_peer(dmq_peer_t* peer) 3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, - dmq_resp_cback_t* resp_cback, int max_forwards) + dmq_resp_cback_t* resp_cback, int max_forwards, str* + content_type) 4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, - dmq_resp_cback_t* resp_cback, int max_forwards) + dmq_resp_cback_t* resp_cback, int max_forwards, str* + content_type) The module provides the following functions that can be used in other Kamailio modules. @@ -250,7 +255,7 @@ typedef struct dmq_api { ... 3. bcast_message(dmq_peer_t* peer, str* body, dmq_node_t* except, -dmq_resp_cback_t* resp_cback, int max_forwards) +dmq_resp_cback_t* resp_cback, int max_forwards, str* content_type) Broadcast a DMQ message to all nodes in the DMQ bus excluding self, inactive nodes and "except" if specified. @@ -261,7 +266,7 @@ dmq_resp_cback_t* resp_cback, int max_forwards) ... 4. send_message(dmq_peer_t* peer, str* body, dmq_node_t* node, -dmq_resp_cback_t* resp_cback, int max_forwards) +dmq_resp_cback_t* resp_cback, int max_forwards, str* content_type) Send a DMQ message to a single node. [View Less]

1 0

git:master: dmq: add content-type header
by Charles Chance 03 Oct '13

03 Oct '13

Module: sip-router Branch: master Commit: 3f6445f4620e3866dc859b9cfb6710e28bd407e5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f6445f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: Thu Oct 3 05:54:01 2013 +0100 dmq: add content-type header --- modules/dmq/bind_dmq.h | 4 ++-- modules/dmq/dmq.c | 2 +- modules/dmq/dmq_funcs.c | … [View More]

1 0

git:master: pkg/kamailio/centos: put core files in /tmp on CentOS
by Peter Dunkley 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 127bf3d5be959a1287ae0fac91cf89e27ed01f42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=127bf3d… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Oct 2 22:14:15 2013 +0100 pkg/kamailio/centos: put core files in /tmp on CentOS --- pkg/kamailio/centos/6/kamailio.init | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) … [View More]

1 0

git:master: core: don't attempt srv lookup for proto ws or wss
by Daniel-Constantin Mierla 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: 1c74725dc14fc40d9b553950e212241821351878 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c74725… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 1 23:18:07 2013 +0200 core: don't attempt srv lookup for proto ws or wss --- dns_cache.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dns_cache.c b/… [View More]

3 4

mohqueue docs and suggestions
by Olle E. Johansson 02 Oct '13

02 Oct '13

A few comments: I think the module name should be "queue". The moh-part is a just a nice way of handling the queue... From reading the docs: - The example on 3.4. moh_maxcalls illustrates usage of mohdir. - Change "from the main (request) route" to "a request route". Routes can call routes. I would love for this module to expose the queue in an xavp (as an alternative to the database) so I can manipulate weights and stuff. Queues need management. I would also like to be able to pick a call … [View More]

5 8

status of db_mysql transaction stuff
by Juha Heinanen 02 Oct '13

02 Oct '13

couple of weeks ago there was discussion on this list regarding db_mysql transaction implementation, but there has been no comments from authors of the current code. based on the earlier discussion, transactions in mysql should be started with command SET autocommit=0 instead of BEGIN or START TRANSACTION and ending or aborting of transaction with COMMIT or ROLLBACK should be followed by command SET autocommit=1 if authors agree, please commit the necessary changes. -- juha

3 4

git:master: modules/db_mysql: use autocommit var to start and stop transactions
by Juha Heinanen 02 Oct '13

02 Oct '13

Module: sip-router Branch: master Commit: b2c5c598a38c770c2c4a7aef7c8267ad43fc6cd7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2c5c59… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Oct 2 20:39:22 2013 +0300 modules/db_mysql: use autocommit var to start and stop transactions --- modules/db_mysql/km_dbase.c | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 deletions(-) diff --… [View More]

1 0

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2013