sr-dev January 2013

sr-dev@lists.kamailio.org

46 participants
325 discussions

git:master: lib/srdb1: update custom sql functions for uid tables
by Daniel-Constantin Mierla 23 Jan '13

23 Jan '13

Module: sip-router Branch: master Commit: cb56b67788fc61f8de65d0335c6364c7aba15759 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb56b67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 23 12:55:51 2013 +0100 lib/srdb1: update custom sql functions for uid tables --- lib/srdb1/schema/uid_domain.xml | 4 ++-- lib/srdb1/schema/uid_uri.xml | 2 +- utils/kamctl/db_berkeley/kamailio/uid_global_attrs | 2 -- utils/kamctl/db_berkeley/kamailio/version | 2 ++ utils/kamctl/dbtext/kamailio/uid_global_attrs | 1 - utils/kamctl/dbtext/kamailio/version | 1 + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/srdb1/schema/uid_domain.xml b/lib/srdb1/schema/uid_domain.xml index ee7e417..b40be63 100644 --- a/lib/srdb1/schema/uid_domain.xml +++ b/lib/srdb1/schema/uid_domain.xml @@ -216,7 +216,7 @@ create function todomain (pdid varchar(64)) returns varchar(128) READS SQL DATA begin declare tdomain varchar(128) default NULL; - select domain into tdomain from domain where did=pdid and + select domain into tdomain from uid_domain where did=pdid and canonical(flags) limit 1; return tdomain; end @@ -238,7 +238,7 @@ create function todid (pdomain varchar(128)) returns varchar(64) READS SQL DATA begin declare tdid varchar(64) default NULL; - select did into tdid from domain where domain=pdomain and + select did into tdid from uid_domain where domain=pdomain and active(flags) limit 1; return tdid; end diff --git a/lib/srdb1/schema/uid_uri.xml b/lib/srdb1/schema/uid_uri.xml index 14df1ed..d6a00d5 100644 --- a/lib/srdb1/schema/uid_uri.xml +++ b/lib/srdb1/schema/uid_uri.xml @@ -124,7 +124,7 @@ begin set tdid = todid(substr(puri FROM i + 1)); set puri = left(puri, i - 1); end if; - select uid into tuid from uri where scheme=tscheme and + select uid into tuid from uid_uri where scheme=tscheme and username=puri and did=tdid and active(flags); return tuid; end diff --git a/utils/kamctl/db_berkeley/kamailio/uid_global_attrs b/utils/kamctl/db_berkeley/kamailio/uid_global_attrs index 1f38fd5..13286a5 100644 --- a/utils/kamctl/db_berkeley/kamailio/uid_global_attrs +++ b/utils/kamctl/db_berkeley/kamailio/uid_global_attrs @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|0|NIL|0 -uid_global_attrs| -uid_global_attrs|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index d943184..eb1d8e7 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -114,6 +114,8 @@ uid_domain| uid_domain|2 uid_domain_attrs| uid_domain_attrs|1 +uid_global_attrs| +uid_global_attrs|1 uid_uri| uid_uri|3 uid_uri_attrs| diff --git a/utils/kamctl/dbtext/kamailio/uid_global_attrs b/utils/kamctl/dbtext/kamailio/uid_global_attrs index 95f5806..46ab50c 100644 --- a/utils/kamctl/dbtext/kamailio/uid_global_attrs +++ b/utils/kamctl/dbtext/kamailio/uid_global_attrs @@ -1,2 +1 @@ id(int,auto) name(string) type(int) value(string,null) flags(int) -uid_global_attrs:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 714c133..9a3fe62 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -52,6 +52,7 @@ uacreg:1 uid_credentials:7 uid_domain:2 uid_domain_attrs:1 +uid_global_attrs:1 uid_uri:3 uid_uri_attrs:2 uid_user_attrs:3

1 0

git:master: kamctl: added option to grant sql access from a remote host
by Daniel-Constantin Mierla 23 Jan '13

23 Jan '13

Module: sip-router Branch: master Commit: 9a1d64bddbf3ec931d39a0e47370e8d46ec2aeb9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a1d64b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 23 12:49:16 2013 +0100 kamctl: added option to grant sql access from a remote host - set DBACCESSHOST in kamctlrc --- utils/kamctl/kamctlrc | 9 ++++++--- utils/kamctl/kamdbctl.mysql | 18 ++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index 99b9562..e5d8311 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -29,16 +29,19 @@ # DB_PATH="/usr/local/etc/kamailio/dbtext" ## database read/write user -# DBRWUSER=kamailio +# DBRWUSER="kamailio" ## password for database read/write user # DBRWPW="kamailiorw" ## database read only user -# DBROUSER=kamailioro +# DBROUSER="kamailioro" ## password for database read only user -# DBROPW=kamailioro +# DBROPW="kamailioro" + +## database access host (from where is kamctl used) +# DBACCESSHOST=192.168.0.1 ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index eabc8ea..e4825ab 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -170,6 +170,15 @@ kamailio_db_grant () # pars: <database name> exit 1 fi fi + + if [ ! -z "$DBACCESSHOST" ] ; then + sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW';" + if [ $? -ne 0 ] ; then + merr "granting access host privileges to database $1 failed!" + exit 1 + fi + fi } kamailio_db_revoke () # pars: <database name> @@ -198,6 +207,15 @@ kamailio_db_revoke () # pars: <database name> exit 1 fi fi + + if [ ! -z "$DBACCESSHOST" ] ; then + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; + REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + if [ $? -ne 0 ] ; then + merr "granting access host privileges to database $1 failed!" + exit 1 + fi + fi }

1 0

URL to LibJSON
by Olle E. Johansson 23 Jan '13

23 Jan '13

The URL to libjson-c in the documentation for the json module doesn't work any more. (http://metaparadigm.com/json-c/) What's the correct URL? /O

2 3

git:master: kamctl: added option to creat uid-related tables
by Daniel-Constantin Mierla 22 Jan '13

22 Jan '13

Module: sip-router Branch: master Commit: 1fd2b4ec865cbe738d92e72259fed27380d252ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1fd2b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 23 00:45:17 2013 +0100 kamctl: added option to creat uid-related tables - few more options to be able to create database only, grant or revoke privileges from command line - the extensions were added for mysql --- utils/kamctl/kamdbctl | 46 +++++++++ utils/kamctl/kamdbctl.base | 33 +++++-- utils/kamctl/kamdbctl.mysql | 230 +++++++++++++++++++++++++++---------------- 3 files changed, 215 insertions(+), 94 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=1fd…

1 0

git:master: kamctl: cleaned db creation
by Daniel-Constantin Mierla 22 Jan '13

22 Jan '13

Module: sip-router Branch: master Commit: 71d1f9b233559e12970019819323cdfb9427b836 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71d1f9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 22 23:09:47 2013 +0100 kamctl: cleaned db creation --- utils/kamctl/kamdbctl.mysql | 89 +++++++++++++++++++++++++++++------------- 1 files changed, 61 insertions(+), 28 deletions(-) diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 5f66337..818f8ab 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -84,18 +84,18 @@ sql_query() kamailio_drop() # pars: <database name> { -if [ $# -ne 1 ] ; then - merr "kamailio_drop function takes two params" - exit 1 -fi + if [ $# -ne 1 ] ; then + merr "kamailio_drop function takes two params" + exit 1 + fi -sql_query "" "drop database $1;" + sql_query "" "DROP DATABASE $1;" -if [ $? -ne 0 ] ; then - merr "Dropping database $1 failed!" - exit 1 -fi -minfo "Database $1 deleted" + if [ $? -ne 0 ] ; then + merr "Dropping database $1 failed!" + exit 1 + fi + minfo "Database $1 deleted" } @@ -123,33 +123,66 @@ db_charset_test() CHARSET=$CURRCHARSET } - -kamailio_create () # pars: <database name> +kamailio_db_create () # pars: <database name> { -if [ $# -ne 1 ] ; then - merr "kamailio_create function takes one param" - exit 1 -fi + if [ $# -ne 1 ] ; then + merr "kamailio_db_create function takes one param" + exit 1 + fi -minfo "test server charset" + minfo "test server charset" -db_charset_test + db_charset_test -minfo "creating database $1 ..." + minfo "creating database $1 ..." -# Users: kamailio is the regular user, kamailioro only for reading -sql_query "" "create database $1 character set $CHARSET; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '$DBROUSER' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW';" + sql_query "" "CREATE DATACASE $1 CHARACTER SET $CHARSET;" + if [ $? -ne 0 ] ; then + merr "Creating database $1 failed!" + exit 1 + fi +} -if [ $? -ne 0 ] ; then - merr "Creating core database and grant privileges failed!" +kamailio_db_grant () # pars: <database name> +{ + if [ $# -ne 1 ] ; then + merr "kamailio_db_grant function takes one param" + exit 1 + fi + + minfo "granting privileges to database $1 ..." + + # Users: kamailio is the regular user, kamailioro only for reading + sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW';" + + if [ $? -ne 0 ] ; then + merr "granting privileges to database $1 failed!" + exit 1 + fi + + if [ "$DBHOST" != "localhost" ] ; then + sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW';" + if [ $? -ne 0 ] ; then + merr "granting localhost privileges to database $1 failed!" + exit 1 + fi + fi +} + +kamailio_create () # pars: <database name> +{ +if [ $# -ne 1 ] ; then + merr "kamailio_create function takes one param" exit 1 fi +kamailio_db_create $1 + +kamailio_db_grant $1 + for TABLE in $STANDARD_MODULES; do mdbg "Creating core table: $TABLE" sql_query $1 < $DB_SCHEMA/$TABLE-create.sql @@ -224,7 +257,7 @@ for TABLE in $EXTRA_MODULES; do mdbg "Creating extra table: $TABLE" sql_query $1 < $DB_SCHEMA/$TABLE-create.sql if [ $? -ne 0 ] ; then - merr "Creating extra tables failed!" + merr "Creating extra tables failed at $TABLE!" exit 1 fi done

1 0

FOSDEM
by Peter Dunkley 22 Jan '13

22 Jan '13

Hello, Are there any plans for a Kamailio meal/get together on the Saturday evening this year? Peter

11 19

Websocket Error
by Ramaseshi reddy kolli 22 Jan '13

22 Jan '13

Hi, I am using kamailio dev version and find some issue with websocket and it is happening once in a day. Jan 2 10:26:56 kamailio-registrar /usr/local/kamailio/sbin/kamailio[1175]: ERROR: websocket [ws_conn.c:321]: getting TCP/TLS connection Jan 2 10:26:56 kamailio-registrar /usr/local/kamailio/sbin/kamailio[1175]: WARNING: websocket [ws_frame.c:785]: forcibly closing connection logs are spammed with that until we restart, looks like an infinite loop somewhere in the websocket code . I checked with tcpdump and didnt see any traffic on TCP port 5065 or 5060 coming . Could you please help me with this? Thanks Ram

2 3

[tracker] Comment added: dlg.profile_list is unable to handle numeric values properly
by sip-router 22 Jan '13

22 Jan '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#265 - dlg.profile_list is unable to handle numeric values properly User who did this - Marco Marzetti (evan) ---------- Ops! I'm sorry. It's my fault! It works like a charm Thank You ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=265#comment769 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: json: proper handling of empty values for json documents
by Daniel-Constantin Mierla 22 Jan '13

22 Jan '13

Module: sip-router Branch: master Commit: 15e1ae6720136a698326a0b53f6db8eef73e3e5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=15e1ae6… Author: Richard Brady <rnbrady(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 22 17:19:31 2013 +0100 json: proper handling of empty values for json documents --- modules/json/json_funcs.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules/json/json_funcs.c b/modules/json/json_funcs.c index 1c42656..a75704b 100644 --- a/modules/json/json_funcs.c +++ b/modules/json/json_funcs.c @@ -51,6 +51,12 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst) dst_pv = (pv_spec_t *)dst; struct json_object *j = json_tokener_parse(json_s.s); + + if (is_error(j)) { + LM_ERR("empty or invalid JSON\n"); + return -1; + } + char *value = (char*)json_object_to_json_string(json_object_object_get(j, field_s.s)); dst_val.rs.s = value;

1 0

[tracker] Comment added: dlg.profile_list is unable to handle numeric values properly
by sip-router 22 Jan '13

22 Jan '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#265 - dlg.profile_list is unable to handle numeric values properly User who did this - Daniel-Constantin Mierla (miconda) ---------- Found the answer in 'sercmd -h' -- I knew there was a way to tell that number parameters should be taken as string: <code> cmd: method [arg1 [arg2...]] arg: string or number; to force a number to be interpreted as string prefix it by "s:", e.g. s:1 </code> So instead of quotes use s: prefix. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=265#comment768 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

← Newer
1
2
3
4
5
6
7
8
9
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2013