sr-dev August 2013

sr-dev@lists.kamailio.org

29 participants
149 discussions

git:master: imc: wrap bit shift defines in parenthesis
by Daniel-Constantin Mierla 04 Aug '13

04 Aug '13

Module: sip-router Branch: master Commit: e6e0419a46c3e5127d07c95390931d10b2a01c3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6e0419… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Aug 4 14:22:41 2013 +0200 imc: wrap bit shift defines in parenthesis - avoid priority conflicts when using the defines - reported by Shankar --- modules/imc/imc_mng.h | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/imc/imc_mng.h b/modules/imc/imc_mng.h index ead106f..f707343 100644 --- a/modules/imc/imc_mng.h +++ b/modules/imc/imc_mng.h @@ -37,11 +37,11 @@ #include "../../str.h" #include "../../parser/parse_from.h" -#define IMC_MEMBER_OWNER 1<<0 -#define IMC_MEMBER_ADMIN 1<<1 -#define IMC_MEMBER_INVITED 1<<2 -#define IMC_MEMBER_DELETED 1<<3 -#define IMC_MEMBER_SKIP 1<<4 +#define IMC_MEMBER_OWNER (1<<0) +#define IMC_MEMBER_ADMIN (1<<1) +#define IMC_MEMBER_INVITED (1<<2) +#define IMC_MEMBER_DELETED (1<<3) +#define IMC_MEMBER_SKIP (1<<4) typedef struct _imc_member { @@ -54,8 +54,8 @@ typedef struct _imc_member struct _imc_member * prev; } imc_member_t, *imc_member_p; -#define IMC_ROOM_PRIV 1<<0 -#define IMC_ROOM_DELETED 1<<1 +#define IMC_ROOM_PRIV (1<<0) +#define IMC_ROOM_DELETED (1<<1) typedef struct del_member { str room_name;

1 0

[tracker] Comment added: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 02 Aug '13

02 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. User who did this - Andrew Mortensen (admorten) ---------- Are you able to test with the admorten/sca branch? I believe this issue is fixed there. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=329#comment1042 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] User took ownership: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 02 Aug '13

02 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Andrew Mortensen has taken ownership of the following task: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=329 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: bugs in uac_redirect module
by sip-router 02 Aug '13

02 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#327 - bugs in uac_redirect module User who did this - Federico Cabiddu (lester) ---------- I tested the patches cherry picking from master to 4.0 and everything works fine. Thank you. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=327#comment1041 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: bugs in uac_redirect module
by sip-router 01 Aug '13

01 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#327 - bugs in uac_redirect module User who did this - Daniel-Constantin Mierla (miconda) ---------- I applied the second part of the patch, the one for db_flatstore. It is on master branch for now. I followed with another patch freeing allocated memory in case of failure and for safety reasons, to keep table name null terminated, as supposedly was when no local copy was done. Can you test to see if all goes ok with latest version? ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=327#comment1040 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: db_flatstore: free id pointer if no more space for table name
by Daniel-Constantin Mierla 01 Aug '13

01 Aug '13

Module: sip-router Branch: master Commit: 6a981d3d922c914054d4c8dc7e672bb6a4ddb5f5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a981d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 1 15:58:59 2013 +0200 db_flatstore: free id pointer if no more space for table name - related to previus commit on this module - keep table name null terminated --- modules/db_flatstore/km_flat_id.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/db_flatstore/km_flat_id.c b/modules/db_flatstore/km_flat_id.c index 11f9fbe..99f5a8b 100644 --- a/modules/db_flatstore/km_flat_id.c +++ b/modules/db_flatstore/km_flat_id.c @@ -52,9 +52,10 @@ struct flat_id* new_flat_id(char* dir, char* table) /* alloc memory for the table name */ t_len = strlen(table); - t = (char*)pkg_malloc(t_len); + t = (char*)pkg_malloc(t_len+1); if (!t) { LM_ERR("no pkg memory left\n"); + pkg_free(ptr); return 0; } memset(t, 0, t_len); @@ -62,6 +63,7 @@ struct flat_id* new_flat_id(char* dir, char* table) ptr->dir.s = dir; ptr->dir.len = strlen(dir); memcpy(t, table, t_len); + t[t_len] = '\0'; ptr->table.s = t; ptr->table.len = t_len;

1 0

git:master: db_flatstore: fixup for new_flat_id function
by Daniel-Constantin Mierla 01 Aug '13

01 Aug '13

Module: sip-router Branch: master Commit: 8fb0f711aaa611eac8b2776c7e5ae3c5e19243ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8fb0f71… Author: Federico Cabiddu <fcabiddu(a)orange-vallee.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Jul 29 07:59:34 2013 +0200 db_flatstore: fixup for new_flat_id function - locally copy table's name --- modules/db_flatstore/km_flat_id.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/modules/db_flatstore/km_flat_id.c b/modules/db_flatstore/km_flat_id.c index 3294528..11f9fbe 100644 --- a/modules/db_flatstore/km_flat_id.c +++ b/modules/db_flatstore/km_flat_id.c @@ -35,6 +35,8 @@ struct flat_id* new_flat_id(char* dir, char* table) { struct flat_id* ptr; + char* t; + int t_len; if (!dir || !table) { LM_ERR("invalid parameter(s)\n"); @@ -48,10 +50,20 @@ struct flat_id* new_flat_id(char* dir, char* table) } memset(ptr, 0, sizeof(struct flat_id)); + /* alloc memory for the table name */ + t_len = strlen(table); + t = (char*)pkg_malloc(t_len); + if (!t) { + LM_ERR("no pkg memory left\n"); + return 0; + } + memset(t, 0, t_len); + ptr->dir.s = dir; ptr->dir.len = strlen(dir); - ptr->table.s = table; - ptr->table.len = strlen(table); + memcpy(t, table, t_len); + ptr->table.s = t; + ptr->table.len = t_len; return ptr; } @@ -78,5 +90,7 @@ unsigned char cmp_flat_id(struct flat_id* id1, struct flat_id* id2) void free_flat_id(struct flat_id* id) { if (!id) return; + if (id->table.s) + pkg_free(id->table.s); pkg_free(id); }

1 0

git:master: kamctl: shortcut command to do q query to a database based on key and value
by Daniel-Constantin Mierla 01 Aug '13

01 Aug '13

Module: sip-router Branch: master Commit: 4bc07b15ae9a490273b2696b2860f78ebbd18104 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bc07b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 1 14:35:16 2013 +0200 kamctl: shortcut command to do q query to a database based on key and value - kamctl db smatch table key value - return the record from table that has column key matching the value as string (quoted value) - kamctl db nmatch table key value - return the record from table that has column key matching the value as non-quoted - examples: kamctl db smatch subscriber username test kamctl db nmatch subscriber id 123 --- utils/kamctl/kamctl | 18 ++++++++++++++++++ utils/kamctl/kamctl.sqlbase | 4 ++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index 0dee374..e25c6f2 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -992,6 +992,24 @@ db_ops() { QUERY="select * FROM $1\\G;" $DBROCMD "$QUERY" ;; + smatch) + shift + if [ $# -ne 3 ] ; then + merr "missing parameters" + exit 1 + fi + QUERY="SELECT * FROM $1 WHERE $2='$3'\\G;" + $DBROCMD "$QUERY" + ;; + nmatch) + shift + if [ $# -ne 3 ] ; then + merr "missing parameters" + exit 1 + fi + QUERY="SELECT * FROM $1 WHERE $2=$3\\G;" + $DBROCMD "$QUERY" + ;; *) usage_db_ops exit 1 diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index f07705f..6c43149 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -61,6 +61,10 @@ cat <<EOF \$id variable db show <table> ..................... display table content db showg <table> .................... display formatted table content + db smatch <table> <key> <value>...... display record from table that has + ........................... column key equal to value as string + db nmatch <table> <key> <value>...... display record from table that has + ........................... column key equal to value as non-string EOF } USAGE_FUNCTIONS="$USAGE_FUNCTIONS usage_db_ops"

1 0

git:master: acc: remove comment from previous patch
by Daniel-Constantin Mierla 01 Aug '13

01 Aug '13

Module: sip-router Branch: master Commit: 9a0147b8e050bb8ac7b443e4a3139bb326308cba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a0147b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 1 14:12:30 2013 +0200 acc: remove comment from previous patch - references to tracker should be in comments of the commit, not in the code - use tabs for indentation --- modules/acc/acc_logic.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index c9bdd20..50278fb 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -197,8 +197,7 @@ int acc_db_set_table_name(struct sip_msg *msg, void *param, str *table) return -1; } strncpy(db_table_name_buf, dbtable.s, dbtable.len); - /* FS#327: since the buffer is static terminate the table name */ - db_table_name_buf[dbtable.len] = '\0'; + db_table_name_buf[dbtable.len] = '\0'; env_set_text(db_table_name_buf, dbtable.len); } else { if(table==NULL) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2013