sr-dev June 2015

sr-dev@lists.kamailio.org

34 participants
274 discussions

git:master:2a42a17d: Merge pull request #216 from kamailio/db_text_raw_query
by Daniel-Constantin Mierla 19 Jun '15

19 Jun '15

Module: kamailio Branch: master Commit: 2a42a17d4ff434da065a988be1c8b9cdaa1938ed URL: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-19T10:04:48+02:00 Merge pull request #216 from kamailio/db_text_raw_query db_text : support 'order by' in raw query --- Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… Patch: https://github.com/kamailio/kamailio/commit/2a42a17d4ff434da065a988be1c8b9c… --- diff --git a/modules/db_text/dbt_raw_query.c b/modules/db_text/dbt_raw_query.c index 143a585..ef62503 100644 --- a/modules/db_text/dbt_raw_query.c +++ b/modules/db_text/dbt_raw_query.c @@ -41,6 +41,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) char* fields_end_ptr = NULL; char* fields_ptr = NULL; char* where_ptr = NULL; + char* order_start_ptr = NULL; char** tokens = NULL; str table; dbt_table_p _tbc = NULL; @@ -52,6 +53,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) db_key_t* _k = NULL; db_op_t* _op = NULL; db_val_t* _v = NULL; + str order; + db_key_t k_order = NULL; + + LM_DBG("SQLRAW : %.*s\n", _s->len, _s->s); fields_end_ptr = strcasestr(_s->s, " from "); if(fields_end_ptr == NULL) @@ -63,6 +68,11 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) fields_ptr[len] = '\0'; fields_ptr = dbt_trim(fields_ptr); + order_start_ptr = strcasestr(_s->s, " order by "); + if(order_start_ptr != NULL) { + *order_start_ptr = '\0'; + order_start_ptr += 10; + } where_ptr = strcasestr(_s->s, " where "); @@ -80,6 +90,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) table.s = table_ptr; table.len = len; + LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) { LM_ERR("use table is invalid %.*s\n", table.len, table.s); @@ -120,9 +131,13 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); - _tbc = NULL; - - res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, NULL, _r); + _tbc = NULL; + if(order_start_ptr != NULL) { + order.s = order_start_ptr; + order.len = strlen(order_start_ptr); + k_order = &order; + } + res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, k_order, _r); error: diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index f000f3b..97012cc 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -31,7 +31,8 @@ #include "dbt_raw_util.h" -static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +//static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(['\"])?([^'\"]*)(['\"])?"; char** dbt_str_split(char* a_str, const char a_delim, int* c) {

1 0

git:master:fa4169db: db_text : support 'order by' in raw query
by Luis Azedo 19 Jun '15

19 Jun '15

Module: kamailio Branch: master Commit: fa4169dbcaec92b8093bef149fdebb08be44b8f7 URL: https://github.com/kamailio/kamailio/commit/fa4169dbcaec92b8093bef149fdebb0… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-18T16:06:58+01:00 db_text : support 'order by' in raw query --- Modified: modules/db_text/dbt_raw_query.c Modified: modules/db_text/dbt_raw_util.c --- Diff: https://github.com/kamailio/kamailio/commit/fa4169dbcaec92b8093bef149fdebb0… Patch: https://github.com/kamailio/kamailio/commit/fa4169dbcaec92b8093bef149fdebb0… --- diff --git a/modules/db_text/dbt_raw_query.c b/modules/db_text/dbt_raw_query.c index 143a585..ef62503 100644 --- a/modules/db_text/dbt_raw_query.c +++ b/modules/db_text/dbt_raw_query.c @@ -41,6 +41,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) char* fields_end_ptr = NULL; char* fields_ptr = NULL; char* where_ptr = NULL; + char* order_start_ptr = NULL; char** tokens = NULL; str table; dbt_table_p _tbc = NULL; @@ -52,6 +53,10 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) db_key_t* _k = NULL; db_op_t* _op = NULL; db_val_t* _v = NULL; + str order; + db_key_t k_order = NULL; + + LM_DBG("SQLRAW : %.*s\n", _s->len, _s->s); fields_end_ptr = strcasestr(_s->s, " from "); if(fields_end_ptr == NULL) @@ -63,6 +68,11 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) fields_ptr[len] = '\0'; fields_ptr = dbt_trim(fields_ptr); + order_start_ptr = strcasestr(_s->s, " order by "); + if(order_start_ptr != NULL) { + *order_start_ptr = '\0'; + order_start_ptr += 10; + } where_ptr = strcasestr(_s->s, " where "); @@ -80,6 +90,7 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) table.s = table_ptr; table.len = len; + LM_DBG("using table '%.*s'\n", table.len, table.s); if(dbt_use_table(_h, &table) != 0) { LM_ERR("use table is invalid %.*s\n", table.len, table.s); @@ -120,9 +131,13 @@ int dbt_raw_query_select(db1_con_t* _h, str* _s, db1_res_t** _r) dbt_release_table(DBT_CON_CONNECTION(_h), CON_TABLE(_h)); - _tbc = NULL; - - res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, NULL, _r); + _tbc = NULL; + if(order_start_ptr != NULL) { + order.s = order_start_ptr; + order.len = strlen(order_start_ptr); + k_order = &order; + } + res = dbt_query(_h, _k, _op, _v, result_cols, nc, cols, k_order, _r); error: diff --git a/modules/db_text/dbt_raw_util.c b/modules/db_text/dbt_raw_util.c index f000f3b..97012cc 100644 --- a/modules/db_text/dbt_raw_util.c +++ b/modules/db_text/dbt_raw_util.c @@ -31,7 +31,8 @@ #include "dbt_raw_util.h" -static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +//static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(')?([a-zA-Z0-9_-]*)(')?"; +static const char* _regexp = "\\s*(and|or)?\\s*(\\w*)\\s*(>=|<=|<>|=|>|<)\\s*(['\"])?([^'\"]*)(['\"])?"; char** dbt_str_split(char* a_str, const char a_delim, int* c) {

1 0

[kamailio] db_text : support 'order by' in raw query (#216)
by lazedo 19 Jun '15

19 Jun '15

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/216 -- Commit Summary -- * db_text : support 'order by' in raw query -- File Changes -- M modules/db_text/dbt_raw_query.c (21) M modules/db_text/dbt_raw_util.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/216.patch https://github.com/kamailio/kamailio/pull/216.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/216

2 1

git:master:d0d753a6: kazoo : support alternative federated exchanges
by Luis Azedo 18 Jun '15

18 Jun '15

Module: kamailio Branch: master Commit: d0d753a6d7cf8a6991e4d8ddeb74951fcb6c4f62 URL: https://github.com/kamailio/kamailio/commit/d0d753a6d7cf8a6991e4d8ddeb74951… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2015-06-18T23:10:53+01:00 kazoo : support alternative federated exchanges --- Modified: modules/kazoo/const.h Modified: modules/kazoo/kazoo.c Modified: modules/kazoo/kz_amqp.c Modified: modules/kazoo/kz_amqp.h --- Diff: https://github.com/kamailio/kamailio/commit/d0d753a6d7cf8a6991e4d8ddeb74951… Patch: https://github.com/kamailio/kamailio/commit/d0d753a6d7cf8a6991e4d8ddeb74951…

1 0

[kamailio] P-Charging-Vector handling as RFC3455 (#214)
by Emmanuel BUU 18 Jun '15

18 Jun '15

Here are some proposed modifications to handle the P-Charging-Vector header as defined in rfc3455 section 4.6 to - parse charging vector from SIP message - generate new unique charging vector - remove a charging vector header a new pseudo variable pseudo variables are exported and enable Read onlly access to charging vector fields $pcv = whole field $pcv.value = icid-value field (see RFC3455 section 5.6) $pcv.genaddr = icid-generated-at field (see RFC3455 section 5.6) a new function acc_charging_vector() - g = generate a new charging vector or forward the orginal one - f = generate a new charging vector regardless of the orginal charging vector - r = remote the P-Charging vector header from the packet You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/214 -- Commit Summary -- * P-Charging-Vector implementation * Merge remote branch 'upstream/master' -- File Changes -- A modules/acc/chargingvector.c (435) A modules/acc/chargingvector.h (18) -- Patch Links -- https://github.com/kamailio/kamailio/pull/214.patch https://github.com/kamailio/kamailio/pull/214.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/214

1 2

git:master:b9a5eb25: Merge pull request #213 from mslehto/fbsd-makefile
by Daniel-Constantin Mierla 18 Jun '15

18 Jun '15

Module: kamailio Branch: master Commit: b9a5eb253a53eacb7e27d4b659d7207363609d3f URL: https://github.com/kamailio/kamailio/commit/b9a5eb253a53eacb7e27d4b659d7207… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-06-18T15:12:12+02:00 Merge pull request #213 from mslehto/fbsd-makefile Makefile.defs: fixes indentation --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b9a5eb253a53eacb7e27d4b659d7207… Patch: https://github.com/kamailio/kamailio/commit/b9a5eb253a53eacb7e27d4b659d7207… --- diff --git a/Makefile.defs b/Makefile.defs index dcd95bc..ee0ded0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -892,11 +892,8 @@ else # CC_NAME, gcc ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM - CFLAGS+=-g -m32 - $(CC_OPT) \ - \ - -mtune=$(CPU) - LDFLAGS+=-m32 + CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPU) + LDFLAGS+=-m32 else # CC_NAME, clang ifeq ($(CC_NAME), icc) C_DEFS+=-DCC_GCC_LIKE_ASM

1 0

[kamailio] Makefile.defs: fixes indentation (#213)
by Mikko Lehto 18 Jun '15

18 Jun '15

Makefile.defs:896: *** missing separator (did you mean TAB instead of 8 spaces?). Stop. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/213 -- Commit Summary -- * Makefile.defs: fixes indentation -- File Changes -- M Makefile.defs (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/213.patch https://github.com/kamailio/kamailio/pull/213.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/213

2 1

git:master:89633c4c: Makefile.defs: fixes indentation
by Mikko Lehto 18 Jun '15

18 Jun '15

Module: kamailio Branch: master Commit: 89633c4c85a6a44df3bbe4a80cf5ca595b59c196 URL: https://github.com/kamailio/kamailio/commit/89633c4c85a6a44df3bbe4a80cf5ca5… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-06-18T15:22:56+03:00 Makefile.defs: fixes indentation --- Modified: Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/89633c4c85a6a44df3bbe4a80cf5ca5… Patch: https://github.com/kamailio/kamailio/commit/89633c4c85a6a44df3bbe4a80cf5ca5… --- diff --git a/Makefile.defs b/Makefile.defs index dcd95bc..ee0ded0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -892,11 +892,8 @@ else # CC_NAME, gcc ifeq ($(CC_NAME), clang) $(call set_if_empty,CPU,athlon64) C_DEFS+=-DCC_GCC_LIKE_ASM - CFLAGS+=-g -m32 - $(CC_OPT) \ - \ - -mtune=$(CPU) - LDFLAGS+=-m32 + CFLAGS+=-g -m32 $(CC_OPT) -mtune=$(CPU) + LDFLAGS+=-m32 else # CC_NAME, clang ifeq ($(CC_NAME), icc) C_DEFS+=-DCC_GCC_LIKE_ASM

1 0

git:master:f995edfb: pdb: new protocol between pdb_server and kama pdb module
by Stefan Mititelu 18 Jun '15

18 Jun '15

Module: kamailio Branch: master Commit: f995edfb7fc9305dc72a6b04575e6112cd873473 URL: https://github.com/kamailio/kamailio/commit/f995edfb7fc9305dc72a6b04575e611… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-06-18T13:28:16+03:00 pdb: new protocol between pdb_server and kama pdb module Modified the communication protocol between the pdb clent <-> server such that the server will give more feedback on scenarios like "pdb_id not found" or "request number contains letters". New msg types or reply codes can be easily added. Curent version of the protocol is 1 (0x01). Also backwards compatibility is maintained when the first received byte is different than the known versions (now, just 0x01). Updated the http link for the get_carrier_germany script. Created a new perl script to get german carrier id. Updated doku (utils/pdbt/docs/network_protocol.txt). added the perls script --- Added: modules/pdb/common.h Added: utils/pdbt/common.c Added: utils/pdbt/scripts/get_carrier_names_germany.pl Modified: modules/pdb/doc/pdb_admin.xml Modified: modules/pdb/pdb.c Modified: utils/pdbt/Makefile Modified: utils/pdbt/common.h Modified: utils/pdbt/docs/network_protocol.txt Modified: utils/pdbt/log.c Modified: utils/pdbt/log.h Modified: utils/pdbt/pdb_server.c Modified: utils/pdbt/pdbt.c Modified: utils/pdbt/scripts/get_carrier_names_germany.sh --- Diff: https://github.com/kamailio/kamailio/commit/f995edfb7fc9305dc72a6b04575e611… Patch: https://github.com/kamailio/kamailio/commit/f995edfb7fc9305dc72a6b04575e611…

1 0

git:master:96e5a6aa: modules/ims_qos: improve reliability of active media sessions stat
by Richard Good 18 Jun '15

18 Jun '15

Module: kamailio Branch: master Commit: 96e5a6aa5d3c00d0020315f5455b6c98c73d4a19 URL: https://github.com/kamailio/kamailio/commit/96e5a6aa5d3c00d0020315f5455b6c9… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2015-06-18T08:56:20+02:00 modules/ims_qos: improve reliability of active media sessions stat --- Modified: modules/ims_qos/cdpeventprocessor.c Modified: modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/96e5a6aa5d3c00d0020315f5455b6c9… Patch: https://github.com/kamailio/kamailio/commit/96e5a6aa5d3c00d0020315f5455b6c9… --- diff --git a/modules/ims_qos/cdpeventprocessor.c b/modules/ims_qos/cdpeventprocessor.c index 2b38050..ae683c6 100644 --- a/modules/ims_qos/cdpeventprocessor.c +++ b/modules/ims_qos/cdpeventprocessor.c @@ -262,8 +262,11 @@ void cdp_cb_event_process() { } } else { LM_DBG("This is a media bearer session session"); + if(p_session_data->session_has_been_opened) { + LM_DBG("Session was opened so decrementing active_media_rx_sessions\n"); + counter_add(ims_qos_cnts_h.active_media_rx_sessions, -1); + } - counter_add(ims_qos_cnts_h.active_media_rx_sessions, -1); //we only terminate the dialog if this was triggered from the transport plane or timeout - i.e. if must_terminate_dialog is set //if this was triggered from the signalling plane (i.e. someone hanging up) then we don'y need to terminate the dialog if (p_session_data->must_terminate_dialog) { diff --git a/modules/ims_qos/rx_aar.c b/modules/ims_qos/rx_aar.c index fcc91de..4871dc5 100644 --- a/modules/ims_qos/rx_aar.c +++ b/modules/ims_qos/rx_aar.c @@ -98,6 +98,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps struct cell *t = 0; unsigned int cdp_result; int result = CSCF_RETURN_ERROR; + AAASession *auth = 0; + rx_authsessiondata_t* p_session_data = 0; LM_DBG("Received AAR callback\n"); saved_transaction_t* data = (saved_transaction_t*) param; @@ -145,8 +147,29 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps LM_DBG("Auth session ID [%.*s]", aaa->sessionId->data.len, aaa->sessionId->data.s); if(!data->aar_update) { - LM_DBG("This is an AAA response to an initial AAR"); + LM_DBG("This is an AAA response to an initial AAR - active_media_rx_sessions"); + + //need to set Rx auth data to say this session has been successfully opened + //This is used elsewhere to prevent acting on termination events when the session has not been opened + //getting auth session + auth = cdpb.AAAGetAuthSession(aaa->sessionId->data); + if (!auth) { + LM_DBG("Could not get Auth Session for session id: [%.*s]\n", aaa->sessionId->data.len, aaa->sessionId->data.s); + goto error; + } + //getting session data + p_session_data = (rx_authsessiondata_t*) auth->u.auth.generic_data; + if (!p_session_data) { + LM_DBG("Could not get session data on Auth Session for session id: [%.*s]\n", aaa->sessionId->data.len, aaa->sessionId->data.s); + if (auth) cdpb.AAASessionsUnlock(auth->hash); + goto error; + } + + LM_DBG("Setting session_has_been_opened and incrementing active_media_rx_sessions\n"); + p_session_data->session_has_been_opened = 1; counter_inc(ims_qos_cnts_h.active_media_rx_sessions); + + if (auth) cdpb.AAASessionsUnlock(auth->hash); str * passed_rx_session_id = shm_malloc(sizeof (struct _str)); passed_rx_session_id->s = 0; @@ -252,7 +275,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e if (cdp_result >= 2000 && cdp_result < 3000) { counter_inc(ims_qos_cnts_h.successful_registration_aars); - if (is_rereg) { + if (is_rereg) { LM_DBG("this is a re-registration, therefore we don't need to do anything except know that the the subscription was successful\n"); result = CSCF_RETURN_TRUE; create_return_code(result); @@ -273,7 +296,7 @@ void async_aar_reg_callback(int is_timeout, void *param, AAAMessage *aaa, long e if (auth) cdpb.AAASessionsUnlock(auth->hash); goto error; } - p_session_data->session_has_been_opened = 1; + p_session_data->session_has_been_opened = 1; counter_inc(ims_qos_cnts_h.active_registration_rx_sessions); if (auth) cdpb.AAASessionsUnlock(auth->hash);

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
28
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2015