sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
243 discussions

Playing with TCP
by Olle E. Johansson 29 Oct '12

29 Oct '12

Setup: One kamailio behind a NAT, one on public IP. I register a client using the inside Kamailio as an outbound proxy. It adds a path header and forwards over TCP to the public server. This server saves the registration with the path header and send a response, which reaches the client fine. Calling from the client to it's own number, the INVITE is sent over the inside proxy to the outside, it looks up the location database then drops the request. It doesn't realize that it has a TCP connection it can reuse open. The error message - a timeout - is sent back over the connection. In my dream world, the server would reuse the open TCP connection to get back across the NAT. If we can get the response across, we should be able to get a new request back. Now, I don't know the inner workings of TCP connection handling here. I guess I should test having the client open a connection directly to the outside proxy and see if that works. Would it be possible with the current architecture to get Kamailio to reuse an existing TCP connection like this? I started digging down the TCP code, but lost attention because of the complexity and fixed speling erors in other parts instead... Will try again. /O

3 11

git:master: permissions - change openser => kamailio
by Olle E. Johansson 28 Oct '12

28 Oct '12

Module: sip-router Branch: master Commit: 212cf0d3c0d220affbafa545795ff5d0bf03b97d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=212cf0d… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 28 21:09:51 2012 +0100 permissions - change openser => kamailio --- modules_k/permissions/README | 2 +- modules_k/permissions/doc/permissions_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index 83cacc9..cf8498d 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -274,7 +274,7 @@ Chapter 1. Admin Guide 1.4. Address Permissions The module can be used to determine if an address (IP address and port) - matches any of the IP subnets stored in cached openser database table. + matches any of the IP subnets stored in cached Kamailio database table. Port 0 in cached database table matches any port. IP address and port to be matched can be either taken from the request (allow_source_address) or given as pvar arguments (allow_address). diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 6e16bd2..5788dfb 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -170,7 +170,7 @@ <para> The module can be used to determine if an address (IP address and port) matches any of the IP subnets - stored in cached openser database table. + stored in cached &kamailio; database table. Port 0 in cached database table matches any port. IP address and port to be matched can be either taken from the request (allow_source_address) or given as pvar

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by Olle E. Johansson 28 Oct '12

28 Oct '12

Module: sip-router Branch: master Commit: 7bd4eda6d169c89e8a42cbd94e8d008700109ceb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7bd4eda… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: Sun Oct 28 21:12:03 2012 +0100 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: modules_k/nathelper: add_contact_alias ipv6 fix lib/srdb1/schema: use &ip_addr_len; entity in address and lcr_gw schema ---

1 0

NEW: new module: xhttp_pi
by Ovidiu Sas 28 Oct '12

28 Oct '12

Hello all, A new module is available in trunk. It provides a web provisioning interface: http://kamailio.org/docs/modules/devel/modules/xhttp_pi.html A sample config example is provided in the source tree: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob_plain;f=ex… An additional xml file is required for web config framework (what to configure, where and how). A sample xml file is provided in the source tree for dispatcher and dialplan tables: http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob_plain;f=ex… When kamailio is up and running, a web provisioning interface for managing db records will be available. No supplementary web server needs to be installed in order to manage the db records. Also, it provides a tight control over what can be modified and how. Testing and feedback is appreciated. Regards, Ovidiu Sas -- VoIP Embedded, Inc. http://www.voipembedded.com

1 0

git:master: modules_k/nathelper: add_contact_alias ipv6 fix
by admin＠sip-router.org 28 Oct '12

28 Oct '12

Module: sip-router Branch: master Commit: c70f884988c3f9298fa4d40ef12c69eea9da26a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c70f884… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Oct 28 16:07:25 2012 +0200 modules_k/nathelper: add_contact_alias ipv6 fix - When add_contact_alias() is called without arguments, it now adds brackets around received ipv6 address in order to make $du syntactically valid. --- modules_k/nathelper/nathelper.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index c0ab7e8..27bc1d2 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -855,7 +855,8 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2) } /* Compare source ip and port against contact uri */ - if ((ip = str2ip(&(uri.host))) == NULL) { + if (((ip = str2ip(&(uri.host))) == NULL) && + ((ip = str2ip6(&(uri.host))) == NULL)) { LM_DBG("contact uri host is not an ip address\n"); } else { if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && @@ -895,8 +896,8 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2) } /* Create ;alias param */ - param_len = SALIAS_LEN + IP6_MAX_STR_SIZE + 1 /* ~ */ + 5 /* port */ + - 1 /* ~ */ + 1 /* proto */ + 1 /* closing > */; + param_len = SALIAS_LEN + 1 /* [ */ + IP6_MAX_STR_SIZE + 1 /* ] */ + + 1 /* ~ */ + 5 /* port */ + 1 /* ~ */ + 1 /* proto */ + 1 /* > */; param = (char*)pkg_malloc(param_len); if (!param) { LM_ERR("no pkg memory left for alias param\n"); @@ -905,12 +906,16 @@ add_contact_alias_0_f(struct sip_msg* msg, char* str1, char* str2) at = param; /* ip address */ append_str(at, SALIAS, SALIAS_LEN); + if (msg->rcv.src_ip.af == AF_INET6) + append_chr(at, '['); ip_len = ip_addr2sbuf(&(msg->rcv.src_ip), at, param_len - SALIAS_LEN); if (ip_len <= 0) { LM_ERR("failed to copy source ip\n"); goto err; } at = at + ip_len; + if (msg->rcv.src_ip.af == AF_INET6) + append_chr(at, ']'); /* port */ append_chr(at, '~'); port = int2str(msg->rcv.src_port, &len);

1 0

git:master: lib/srdb1/schema: use &ip_addr_len; entity in address and lcr_gw schema
by admin＠sip-router.org 28 Oct '12

28 Oct '12

Module: sip-router Branch: master Commit: dba0691a98a329be489d83dfc1cd9560419bc35e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dba0691… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun Oct 28 14:32:36 2012 +0200 lib/srdb1/schema: use &ip_addr_len; entity in address and lcr_gw schema --- lib/srdb1/schema/address.xml | 4 ++-- lib/srdb1/schema/lcr_gw.xml | 4 ++-- modules/lcr/lcr_mod.c | 2 +- modules_k/permissions/address.c | 2 +- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/db_sqlite/lcr-create.sql | 4 ++-- utils/kamctl/db_sqlite/permissions-create.sql | 4 ++-- utils/kamctl/dbtext/kamailio/version | 4 ++-- utils/kamctl/mysql/lcr-create.sql | 4 ++-- utils/kamctl/mysql/permissions-create.sql | 4 ++-- utils/kamctl/oracle/lcr-create.sql | 4 ++-- utils/kamctl/oracle/permissions-create.sql | 4 ++-- utils/kamctl/postgres/lcr-create.sql | 4 ++-- utils/kamctl/postgres/permissions-create.sql | 4 ++-- 14 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/srdb1/schema/address.xml b/lib/srdb1/schema/address.xml index be380ee..d757f1a 100644 --- a/lib/srdb1/schema/address.xml +++ b/lib/srdb1/schema/address.xml @@ -9,7 +9,7 @@ <table id="address" xmlns:db="http://docbook.org/ns/docbook"> <name>address</name> - <version>5</version> + <version>6</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the permissions module. More information is available at: &KAMAILIO_MOD_DOC;permissions.html @@ -38,7 +38,7 @@ <column> <name>ip_addr</name> <type>string</type> - <size>48</size> + <size>&ip_add_len;</size> <description>IP address</description> </column> diff --git a/lib/srdb1/schema/lcr_gw.xml b/lib/srdb1/schema/lcr_gw.xml index 3c9513b..cb8a8c0 100644 --- a/lib/srdb1/schema/lcr_gw.xml +++ b/lib/srdb1/schema/lcr_gw.xml @@ -10,7 +10,7 @@ <table id="lcr_gw" xmlns:db="http://docbook.org/ns/docbook"> <name>lcr_gw</name> - <version>2</version> + <version>3</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by lcr (Least Cost Routing) module @@ -46,7 +46,7 @@ <column id="ip_addr"> <name>ip_addr</name> <type>string</type> - <size>47</size> + <size>&ip_add_len;</size> <null/> <description>IPv4 or IPv6 Address of the gateway</description> </column> diff --git a/modules/lcr/lcr_mod.c b/modules/lcr/lcr_mod.c index 6574229..757734d 100644 --- a/modules/lcr/lcr_mod.c +++ b/modules/lcr/lcr_mod.c @@ -91,7 +91,7 @@ MODULE_VERSION */ #define LCR_RULE_TABLE_VERSION 2 #define LCR_RULE_TARGET_TABLE_VERSION 1 -#define LCR_GW_TABLE_VERSION 2 +#define LCR_GW_TABLE_VERSION 3 /* database defaults */ diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 3279310..5dbe547 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -44,7 +44,7 @@ #include "../../ut.h" #include "../../resolve.h" -#define TABLE_VERSION 5 +#define TABLE_VERSION 6 struct addr_list ***addr_hash_table; /* Ptr to current hash table ptr */ struct addr_list **addr_hash_table_1; /* Pointer to hash table 1 */ diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 4d0e5ee..61f4be3 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -13,7 +13,7 @@ acc|4 active_watchers| active_watchers|11 address| -address|5 +address|6 aliases| aliases|6 carrier_name| @@ -61,7 +61,7 @@ imc_members|1 imc_rooms| imc_rooms|1 lcr_gw| -lcr_gw|2 +lcr_gw|3 lcr_rule| lcr_rule|2 lcr_rule_target| diff --git a/utils/kamctl/db_sqlite/lcr-create.sql b/utils/kamctl/db_sqlite/lcr-create.sql index 63eb37d..b660922 100644 --- a/utils/kamctl/db_sqlite/lcr-create.sql +++ b/utils/kamctl/db_sqlite/lcr-create.sql @@ -1,9 +1,9 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','3'); CREATE TABLE lcr_gw ( id INTEGER PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(47), + ip_addr VARCHAR(50), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64), diff --git a/utils/kamctl/db_sqlite/permissions-create.sql b/utils/kamctl/db_sqlite/permissions-create.sql index e0c3f59..0875431 100644 --- a/utils/kamctl/db_sqlite/permissions-create.sql +++ b/utils/kamctl/db_sqlite/permissions-create.sql @@ -9,11 +9,11 @@ CREATE TABLE trusted ( CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','5'); +INSERT INTO version (table_name, table_version) values ('address','6'); CREATE TABLE address ( id INTEGER PRIMARY KEY NOT NULL, grp INTEGER DEFAULT 1 NOT NULL, - ip_addr VARCHAR(48) NOT NULL, + ip_addr VARCHAR(50) NOT NULL, mask INTEGER DEFAULT 32 NOT NULL, port SMALLINT DEFAULT 0 NOT NULL, tag VARCHAR(64) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 996c37f..b362eef 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,7 +1,7 @@ table_name(string) table_version(int) acc:4 active_watchers:11 -address:5 +address:6 aliases:6 carrier_name:1 carrierfailureroute:2 @@ -25,7 +25,7 @@ grp:2 htable:2 imc_members:1 imc_rooms:1 -lcr_gw:2 +lcr_gw:3 lcr_rule:2 lcr_rule_target:1 location:6 diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index efa65b2..f6e2037 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -1,9 +1,9 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','3'); CREATE TABLE lcr_gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(47), + ip_addr VARCHAR(50), hostname VARCHAR(64), port SMALLINT UNSIGNED, params VARCHAR(64), diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index 660ac6f..dfa158c 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -9,11 +9,11 @@ CREATE TABLE trusted ( CREATE INDEX peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','5'); +INSERT INTO version (table_name, table_version) values ('address','6'); CREATE TABLE address ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, grp INT(11) UNSIGNED DEFAULT 1 NOT NULL, - ip_addr VARCHAR(48) NOT NULL, + ip_addr VARCHAR(50) NOT NULL, mask INT DEFAULT 32 NOT NULL, port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL, tag VARCHAR(64) diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index 5fe88a0..8c022d8 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -1,9 +1,9 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','3'); CREATE TABLE lcr_gw ( id NUMBER(10) PRIMARY KEY, lcr_id NUMBER(5), gw_name VARCHAR2(128), - ip_addr VARCHAR2(47), + ip_addr VARCHAR2(50), hostname VARCHAR2(64), port NUMBER(5), params VARCHAR2(64), diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 6b934cc..32ccb22 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -17,11 +17,11 @@ BEGIN map2users('trusted'); END; / CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','5'); +INSERT INTO version (table_name, table_version) values ('address','6'); CREATE TABLE address ( id NUMBER(10) PRIMARY KEY, grp NUMBER(10) DEFAULT 1 NOT NULL, - ip_addr VARCHAR2(48), + ip_addr VARCHAR2(50), mask NUMBER(10) DEFAULT 32 NOT NULL, port NUMBER(5) DEFAULT 0 NOT NULL, tag VARCHAR2(64) diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 958213a..655d116 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -1,9 +1,9 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','3'); CREATE TABLE lcr_gw ( id SERIAL PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, gw_name VARCHAR(128), - ip_addr VARCHAR(47), + ip_addr VARCHAR(50), hostname VARCHAR(64), port SMALLINT, params VARCHAR(64), diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 9e48623..95f13de 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -9,11 +9,11 @@ CREATE TABLE trusted ( CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','5'); +INSERT INTO version (table_name, table_version) values ('address','6'); CREATE TABLE address ( id SERIAL PRIMARY KEY NOT NULL, grp INTEGER DEFAULT 1 NOT NULL, - ip_addr VARCHAR(48) NOT NULL, + ip_addr VARCHAR(50) NOT NULL, mask INTEGER DEFAULT 32 NOT NULL, port SMALLINT DEFAULT 0 NOT NULL, tag VARCHAR(64)

1 0

git:master: fix default db in docbook
by Ovidiu Sas 27 Oct '12

27 Oct '12

Module: sip-router Branch: master Commit: 0c130b85e8081af15188ec87d5e55d70c96de46f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c130b8… Author: osas <osas(a)centos.(none)> Committer: osas <osas(a)centos.(none)> Date: Sat Oct 27 12:08:49 2012 -0400 fix default db in docbook --- docbook/entities.xml | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docbook/entities.xml b/docbook/entities.xml index 9bd1679..1c59cdb 100644 --- a/docbook/entities.xml +++ b/docbook/entities.xml @@ -63,8 +63,8 @@ <!ENTITY serusersmail "<email>sr-users(a)lists.sip-router.org</email>"> <!ENTITY serdevmail "<email>sr-dev(a)lists.sip-router.org</email>"> -<!ENTITY defaultdb "mysql://openser:openserrw@localhost/openser"> -<!ENTITY defaultrodb "mysql://openserro:openserro@localhost/openser"> +<!ENTITY defaultdb "mysql://kamailio:kamailiorw@localhost/kamailio"> +<!ENTITY defaultrodb "mysql://kamailioro:kamailioro@localhost/kamailio"> <!ENTITY exampledb "dbdriver://username:password@dbhost/dbname"> <!ENTITY exampleotherdb "postgres://proxy:frog23@db.sip-router.org/sipdb">

1 0

git:master: fix test directory after openser to kamailio migration
by Ovidiu Sas 27 Oct '12

27 Oct '12

Module: sip-router Branch: master Commit: e4453d91f612a8d651176d62529bc24edb54bf59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e4453d9… Author: osas <osas(a)centos.(none)> Committer: osas <osas(a)centos.(none)> Date: Sat Oct 27 12:05:18 2012 -0400 fix test directory after openser to kamailio migration --- test/unit/16.sh | 2 +- test/unit/19.cfg | 2 +- test/unit/20.cfg | 2 +- test/unit/21.cfg | 2 +- test/unit/22.sh | 2 +- test/unit/23.sh | 2 +- test/unit/29.sh | 2 +- test/unit/32.sh | 2 +- test/unit/35.cfg | 2 +- test/unit/38.sh | 2 +- test/unit/39.sh | 2 +- test/unit/40.cfg | 2 +- test/unit/41.cfg | 2 +- test/unit/44.sh | 2 +- test/unit/45.cfg | 2 +- test/unit/7.cfg | 18 +++++++++--------- test/unit/include/database | 8 ++++---- test/unit/presence.cfg | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e44…

1 0

git:master: more openser to kamailio migration
by Ovidiu Sas 27 Oct '12

27 Oct '12

Module: sip-router Branch: master Commit: 923b738f8f021c349b0d0ba4faaac1b0c6bcf246 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=923b738… Author: osas <osas(a)centos.(none)> Committer: osas <osas(a)centos.(none)> Date: Sat Oct 27 12:00:28 2012 -0400 more openser to kamailio migration --- config.h | 4 ++-- etc/kamailio.cfg | 2 +- utils/kamctl/kamctl.dbtext | 2 +- utils/kamctl/kamctl.sqlbase | 8 ++++---- utils/kamctl/kamctlrc | 10 +++++----- utils/kamctl/kamdbctl.base | 10 +++++----- utils/kamctl/kamdbctl.mysql | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/config.h b/config.h index 72761e9..8fde9b5 100644 --- a/config.h +++ b/config.h @@ -192,9 +192,9 @@ #if defined KAMAILIO_MOD_INTERFACE || defined OPENSER_MOD_INTERFACE || \ defined MOD_INTERFACE_V1 - #define DEFAULT_DB_URL "mysql://openser:openserrw@localhost/openser" + #define DEFAULT_DB_URL "mysql://kamailio:kamailiorw@localhost/kamailio" #define DEFAULT_DB_URL_LEN (sizeof(DEFAULT_DB_URL) - 1) - #define DEFAULT_RODB_URL "mysql://openserro:openserro@localhost/openser" + #define DEFAULT_RODB_URL "mysql://kamailio:kamailiorw@localhost/okamailio" #define DEFAULT_RODB_URL_LEN (sizeof(DEFAULT_RODB_URL) - 1) #else #define DEFAULT_DB_URL "mysql://ser:heslo@localhost/ser" diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 20db35b..247ddd9 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -109,7 +109,7 @@ import_file "kamailio-local.cfg" # - database URL - used to connect to database server by modules such # as: auth_db, acc, usrloc, a.s.o. #!ifndef DBURL -#!define DBURL "mysql://openser:openserrw@localhost/openser" +#!define DBURL "mysql://kamailio:kamailiorw@localhost/kamailio" #!endif #!endif #!ifdef WITH_MULTIDOMAIN diff --git a/utils/kamctl/kamctl.dbtext b/utils/kamctl/kamctl.dbtext index f25bed6..0c1ac9a 100644 --- a/utils/kamctl/kamctl.dbtext +++ b/utils/kamctl/kamctl.dbtext @@ -20,7 +20,7 @@ fi; # path to the dbtext database if [ -z "$DBTEXT_PATH" ] ; then - DBTEXT_PATH="/usr/local/share/kamailio/dbtext/openser" + DBTEXT_PATH="/usr/local/share/kamailio/dbtext/kamailio" fi export DBTEXT_PATH diff --git a/utils/kamctl/kamctl.sqlbase b/utils/kamctl/kamctl.sqlbase index e1de2c6..b1615b9 100644 --- a/utils/kamctl/kamctl.sqlbase +++ b/utils/kamctl/kamctl.sqlbase @@ -9,21 +9,21 @@ ### common variables and functions for SQL engines if [ -z "$DBNAME" ] ; then - DBNAME=openser + DBNAME=kamailio fi if [ -z "$DBHOST" ] ; then DBHOST=localhost fi if [ -z "$DBRWUSER" ] ; then - DBRWUSER=openser + DBRWUSER=kamailio fi # the read-only user for whom password may be stored here if [ -z "$DBROUSER" ] ; then - DBROUSER=openserro + DBROUSER=kamailioro fi if [ -z "$DBROPW" ] ; then - DBROPW=openserro + DBROPW=kamailioro fi # full privileges SQL user diff --git a/utils/kamctl/kamctlrc b/utils/kamctl/kamctlrc index e075436..259f8e9 100644 --- a/utils/kamctl/kamctlrc +++ b/utils/kamctl/kamctlrc @@ -23,22 +23,22 @@ # DBHOST=localhost ## database name (for ORACLE this is TNS name) -# DBNAME=openser +# DBNAME=kamailio # database path used by dbtext, db_berkeley or sqlite # DB_PATH="/usr/local/etc/kamailio/dbtext" ## database read/write user -# DBRWUSER=openser +# DBRWUSER=kamailio ## password for database read/write user -# DBRWPW="openserrw" +# DBRWPW="kamailiorw" ## database read only user -# DBROUSER=openserro +# DBROUSER=kamailioro ## password for database read only user -# DBROPW=openserro +# DBROPW=kamailioro ## database super user (for ORACLE this is 'scheme-creator' user) # DBROOTUSER="root" diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 60a0849..8e367be 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -3,22 +3,22 @@ PATH=$PATH:/usr/local/sbin # config vars # name of the database to be used by Kamailio -DBNAME=${DBNAME:-openser} +DBNAME=${DBNAME:-kamailio} # address of database server DBHOST=${DBHOST:-localhost} # user with full privileges over DBNAME database -DBRWUSER=${DBRWUSER:-openser} +DBRWUSER=${DBRWUSER:-kamailio} # password user with full privileges over DBNAME database -DBRWPW=${DBRWPW:-openserrw} +DBRWPW=${DBRWPW:-kamailiorw} # read-only user -DBROUSER=${DBROUSER:-openserro} +DBROUSER=${DBROUSER:-kamailioro} # password for read-only user -DBROPW=${DBROPW:-openserro} +DBROPW=${DBROPW:-kamailioro} # user name column USERCOL=${USERCOL:-username} diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 52996e5..5f66337 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -137,7 +137,7 @@ db_charset_test minfo "creating database $1 ..." -# Users: openser is the regular user, openserro only for reading +# 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';

1 0

git:master: xhttp_pi: new web provisioning interface module
by Ovidiu Sas 27 Oct '12

27 Oct '12

Module: sip-router Branch: master Commit: e7a75db1982a48efb83bd9ba96036dbb6da541e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e7a75db… Author: osas <osas(a)centos.(none)> Committer: osas <osas(a)centos.(none)> Date: Sat Oct 27 11:39:29 2012 -0400 xhttp_pi: new web provisioning interface module --- examples/pi_framework.xml | 324 ++++ examples/xhttp.cfg | 38 + modules/xhttp_pi/Makefile | 20 + modules/xhttp_pi/doc/Makefile | 4 + modules/xhttp_pi/doc/xhttp_pi.xml | 37 + modules/xhttp_pi/doc/xhttp_pi_admin.xml | 366 ++++ modules/xhttp_pi/http_db_handler.c | 102 ++ modules/xhttp_pi/http_db_handler.h | 33 + modules/xhttp_pi/xhttp_pi.c | 392 ++++ modules/xhttp_pi/xhttp_pi.h | 71 + modules/xhttp_pi/xhttp_pi_fnc.c | 2934 +++++++++++++++++++++++++++++++ modules/xhttp_pi/xhttp_pi_fnc.h | 113 ++ 12 files changed, 4434 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e7a…

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012