sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/pointer_alias_warnings: core: avp aliasing warning fixes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: d103cf3a85bf8346e9c5a0ea1c9bf75caeab03b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d103cf3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jan 28 19:52:37 2010 +0100 core: avp aliasing warning fixes - fixed bug introduced in e95c077. --- usr_avp.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/usr_avp.c b/usr_avp.c index a759664..28f19af 100644 --- a/usr_avp.c +++ b/usr_avp.c @@ -296,6 +296,8 @@ int add_avp_before(avp_t *avp, avp_flags_t flags, avp_name_t name, avp_value_t v /* get value functions */ inline str* get_avp_name(avp_t *avp) { + struct str_int_data *sid; + struct str_str_data *ssd; switch ( avp->flags&(AVP_NAME_STR|AVP_VAL_STR) ) { @@ -306,10 +308,12 @@ inline str* get_avp_name(avp_t *avp) return 0; case AVP_NAME_STR: /* avp type str, int value */ - return &((struct str_int_data*)avp->d.p)->name; + sid = (struct str_int_data*)&avp->d.data[0]; + return &sid->name; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - return &((struct str_str_data*)avp->d.p)->name; + ssd = (struct str_str_data*)&avp->d.data[0]; + return &ssd->name; } LOG(L_ERR,"BUG:avp:get_avp_name: unknown avp type (name&val) %d\n", @@ -320,6 +324,9 @@ inline str* get_avp_name(avp_t *avp) inline void get_avp_val(avp_t *avp, avp_value_t *val) { + str *s; + struct str_int_data *sid; + struct str_str_data *ssd; if (avp==0 || val==0) return; @@ -331,15 +338,18 @@ inline void get_avp_val(avp_t *avp, avp_value_t *val) break; case AVP_NAME_STR: /* avp type str, int value */ - val->n = ((struct str_int_data*)avp->d.p)->val; + sid = (struct str_int_data*)&avp->d.data[0]; + val->n = sid->val; break; case AVP_VAL_STR: /* avp type ID, str value */ - val->s = *(str*)avp->d.p; + s = (str*)&avp->d.data[0]; + val->s = *s; break; case AVP_NAME_STR|AVP_VAL_STR: /* avp type str, str value */ - val->s = ((struct str_str_data*)avp->d.p)->val; + ssd = (struct str_str_data*)&avp->d.data[0]; + val->s = ssd->val; break; } }

15 years

git:andrei/pointer_alias_warnings: rr(s): fix recently introduced avp_cookie name bug

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/pointer_alias_warnings Commit: 1c588c85a086aff42da5aa2a7da5ad663c896de1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c588c8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jan 28 19:58:06 2010 +0100 rr(s): fix recently introduced avp_cookie name bug - fix bug introduced in 34dc702 (while trying to fix pointer aliasing warnings) --- modules_s/rr/avp_cookie.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules_s/rr/avp_cookie.c b/modules_s/rr/avp_cookie.c index 1e9d027..c7e1fb4 100644 --- a/modules_s/rr/avp_cookie.c +++ b/modules_s/rr/avp_cookie.c @@ -56,6 +56,9 @@ str *rr_get_avp_cookies(void) { str *avp_name; str *result = 0; rr_avp_flags_t avp_flags; + struct str_int_data *sid; + struct str_str_data *ssd; + len = sizeof(crc); for (avp_list_no=0; avp_list_no<MAX_AVP_DIALOG_LISTS; avp_list_no++) { @@ -66,11 +69,13 @@ str *rr_get_avp_cookies(void) { if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == AVP_NAME_STR) { /* avp type str, int value */ - avp_name = & ((struct str_int_data*)avp->d.p)->name; + sid = (struct str_int_data*)&avp->d.data[0]; + avp_name = &sid->name; } else if ((avp->flags&(AVP_NAME_STR|AVP_VAL_STR)) == (AVP_NAME_STR|AVP_VAL_STR)) { /* avp type str, str value */ - avp_name = & ((struct str_str_data*)avp->d.p)->name; + ssd = (struct str_str_data*)&avp->d.data[0]; + avp_name = &ssd->name; } else avp_name = 0; /* dummy */

15 years

git:master: pv(k): use $TV(Sn) for string timeval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 070f8f313b73d4fd168bef2800e4c17561c9e34d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=070f8f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 19:43:50 2010 +0100 pv(k): use $TV(Sn) for string timeval - previous commit introduced a naming conflict on 'sn' --- modules_k/pv/pv_time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index 8f532f9..7ea0d23 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -283,7 +283,7 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "un", 2)==0) sp->pvp.pvn.u.isname.name.n = 3; - else if(strncmp(in->s, "sn", 2)==0) + else if(strncmp(in->s, "Sn", 2)==0) sp->pvp.pvn.u.isname.name.n = 4; else goto error; break;

15 years

git:master: pv(k): added $PV(sn)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 11f8cf6edfa4a79b398cd159c6af3c2215b20b8e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11f8cf6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 19:35:10 2010 +0100 pv(k): added $PV(sn) - string representation of current timeval (not cached) - idea by Klaus Darilion --- modules_k/pv/pv_time.c | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv_time.c b/modules_k/pv/pv_time.c index 0bc62a2..8f532f9 100644 --- a/modules_k/pv/pv_time.c +++ b/modules_k/pv/pv_time.c @@ -200,11 +200,13 @@ int pv_get_timef(struct sip_msg *msg, pv_param_t *param, static struct timeval _timeval_ts; static unsigned int _timeval_msg_id = 0; +static char _timeval_ts_buf[32]; int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { struct timeval tv; + str s; if(msg==NULL || param==NULL) return -1; @@ -236,6 +238,18 @@ int pv_get_timeval(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } return pv_get_uintval(msg, param, res, (unsigned int)tv.tv_usec); + case 4: + if(gettimeofday(&tv, NULL)!=0) + { + LM_ERR("unable to get time val attributes\n"); + return pv_get_null(msg, param, res); + } + s.len = snprintf(_timeval_ts_buf, 32, "%u.%u", + (unsigned int)tv.tv_sec, (unsigned int)tv.tv_usec); + if(s.len<0) + return pv_get_null(msg, param, res); + s.s = _timeval_ts_buf; + return pv_get_strval(msg, param, res, &s); default: if(_timeval_msg_id != msg->id) { @@ -269,6 +283,8 @@ int pv_parse_timeval_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 2; else if(strncmp(in->s, "un", 2)==0) sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "sn", 2)==0) + sp->pvp.pvn.u.isname.name.n = 4; else goto error; break; default:

15 years

git:master: kamctl: added mtree sql scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a5763a67a53fd3e33dc75cc7b2b3870caad5f4d1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5763a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 18:57:39 2010 +0100 kamctl: added mtree sql scripts --- utils/kamctl/mysql/mtree-create.sql | 8 ++++++++ utils/kamctl/oracle/mtree-create.sql | 16 ++++++++++++++++ utils/kamctl/postgres/mtree-create.sql | 8 ++++++++ 3 files changed, 32 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/mysql/mtree-create.sql b/utils/kamctl/mysql/mtree-create.sql new file mode 100644 index 0000000..d3ecf46 --- /dev/null +++ b/utils/kamctl/mysql/mtree-create.sql @@ -0,0 +1,8 @@ +INSERT INTO version (table_name, table_version) values ('mtree','1'); +CREATE TABLE mtree ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + tprefix VARCHAR(32) DEFAULT '' NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT tprefix_idx UNIQUE (tprefix) +) ENGINE=MyISAM; + diff --git a/utils/kamctl/oracle/mtree-create.sql b/utils/kamctl/oracle/mtree-create.sql new file mode 100644 index 0000000..7b74db4 --- /dev/null +++ b/utils/kamctl/oracle/mtree-create.sql @@ -0,0 +1,16 @@ +INSERT INTO version (table_name, table_version) values ('mtree','1'); +CREATE TABLE mtree ( + id NUMBER(10) PRIMARY KEY, + tprefix VARCHAR2(32) DEFAULT '', + tvalue VARCHAR2(128) DEFAULT '', + CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) +); + +CREATE OR REPLACE TRIGGER mtree_tr +before insert on mtree FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END mtree_tr; +/ +BEGIN map2users('mtree'); END; +/ diff --git a/utils/kamctl/postgres/mtree-create.sql b/utils/kamctl/postgres/mtree-create.sql new file mode 100644 index 0000000..6d60f20 --- /dev/null +++ b/utils/kamctl/postgres/mtree-create.sql @@ -0,0 +1,8 @@ +INSERT INTO version (table_name, table_version) values ('mtree','1'); +CREATE TABLE mtree ( + id SERIAL PRIMARY KEY NOT NULL, + tprefix VARCHAR(32) DEFAULT '' NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) +); +

15 years

git:master: mtree: added db table definition

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a35308172a9a38b5ab47077f06199a21c0e18228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a353081… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 18:54:08 2010 +0100 mtree: added db table definition --- lib/srdb1/schema/kamailio-mtree.xml | 12 ++++++++ lib/srdb1/schema/mtree.xml | 50 +++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/kamailio-mtree.xml b/lib/srdb1/schema/kamailio-mtree.xml new file mode 100644 index 0000000..c10f26c --- /dev/null +++ b/lib/srdb1/schema/kamailio-mtree.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>MTree keys-values</name> + <xi:include href="mtree.xml"/> +</database> diff --git a/lib/srdb1/schema/mtree.xml b/lib/srdb1/schema/mtree.xml new file mode 100644 index 0000000..3592cc7 --- /dev/null +++ b/lib/srdb1/schema/mtree.xml @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="mtree" xmlns:db="http://docbook.org/ns/docbook"> + <name>mtree</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by the mtree module to load values in the shared memory tree at start up. More information about the mtree module can be found at: &KAMAILIO_MOD_DOC;mtree.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="tprefix"> + <name>tprefix</name> + <type>string</type> + <size>32</size> + <default/> + <description>Key to be used to index the values in the tree, usually a DID or prefix.</description> + </column> + + <column id="tvalue"> + <name>tvalue</name> + <type>string</type> + <size>128</size> + <default/> + <description>The value of the key</description> + </column> + + <index> + <name>tprefix_idx</name> + <colref linkend="tprefix"/> + <unique/> + </index> +</table>

15 years

git:master: pv(k): new PV class to select next hop attributes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cb2e9ed2900ead3ae92dbdcb8204e83a225a8f6e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb2e9ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 12:53:08 2010 +0100 pv(k): new PV class to select next hop attributes - use dst_uri if set otherwise new r-uri or original r-uri - $nh(u) - uri - $nh(U) - username - $nh(d) - domain - $nh(p) - port - $nh(P) - protocol --- modules_k/pv/pv.c | 2 + modules_k/pv/pv_branch.c | 91 ++++++++++++++++++++++++++++++++++++++++++++++ modules_k/pv/pv_branch.h | 4 ++ 3 files changed, 97 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 6455a93..11a6c9d 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -366,6 +366,8 @@ static pv_export_t mod_pvs[] = { 0, pv_parse_time_name, 0, 0, 0}, { {"TV", (sizeof("TV")-1)}, PVT_OTHER, pv_get_timeval, 0, pv_parse_timeval_name, 0, 0, 0}, + { {"nh", (sizeof("nh")-1)}, PVT_OTHER, pv_get_nh, + 0, pv_parse_nh_name, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; diff --git a/modules_k/pv/pv_branch.c b/modules_k/pv/pv_branch.c index 163fc73..5fa399e 100644 --- a/modules_k/pv/pv_branch.c +++ b/modules_k/pv/pv_branch.c @@ -21,9 +21,11 @@ */ +#include "../../parser/parse_uri.h" #include "../../dset.h" #include "../../onsend.h" +#include "pv_core.h" #include "pv_branch.h" int pv_get_branchx(struct sip_msg *msg, pv_param_t *param, @@ -223,3 +225,92 @@ error: return -1; } +int pv_get_nh(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + struct sip_uri parsed_uri; + str uri; + + if(msg==NULL || res==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have r/d-uri */ + return pv_get_null(msg, param, res); + + if (msg->dst_uri.s != NULL && msg->dst_uri.len>0) + { + uri = msg->dst_uri; + } else { + if (msg->new_uri.s!=NULL && msg->new_uri.len>0) + { + uri = msg->new_uri; + } else { + uri = msg->first_line.u.request.uri; + } + } + if(param->pvn.u.isname.name.n==0) /* uri */ + { + return pv_get_strval(msg, param, res, &uri); + } + if(parse_uri(uri.s, uri.len, &parsed_uri)!=0) + { + LM_ERR("failed to parse nh uri [%.*s]\n", uri.len, uri.s); + return pv_get_null(msg, param, res); + } + if(param->pvn.u.isname.name.n==1) /* username */ + { + if(parsed_uri.user.s==NULL || parsed_uri.user.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &parsed_uri.user); + } else if(param->pvn.u.isname.name.n==2) /* domain */ { + if(parsed_uri.host.s==NULL || parsed_uri.host.len<=0) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &parsed_uri.host); + } else if(param->pvn.u.isname.name.n==3) /* port */ { + if(parsed_uri.port.s==NULL) + return pv_get_5060(msg, param, res); + return pv_get_strintval(msg, param, res, &parsed_uri.port, + (int)parsed_uri.port_no); + } else if(param->pvn.u.isname.name.n==4) /* protocol */ { + if(parsed_uri.transport_val.s==NULL) + return pv_get_udp(msg, param, res); + return pv_get_strintval(msg, param, res, &parsed_uri.transport_val, + (int)parsed_uri.proto); + } + LM_ERR("unknown specifier\n"); + return pv_get_null(msg, param, res); +} + +int pv_parse_nh_name(pv_spec_p sp, str *in) +{ + if(sp==NULL || in==NULL || in->len<=0) + return -1; + + switch(in->len) + { + case 1: + if(strncmp(in->s, "u", 1)==0) + sp->pvp.pvn.u.isname.name.n = 0; + else if(strncmp(in->s, "U", 1)==0) + sp->pvp.pvn.u.isname.name.n = 1; + else if(strncmp(in->s, "d", 1)==0) + sp->pvp.pvn.u.isname.name.n = 2; + else if(strncmp(in->s, "p", 1)==0) + sp->pvp.pvn.u.isname.name.n = 3; + else if(strncmp(in->s, "P", 1)==0) + sp->pvp.pvn.u.isname.name.n = 4; + else goto error; + break; + default: + goto error; + } + sp->pvp.pvn.type = PV_NAME_INTSTR; + sp->pvp.pvn.u.isname.type = 0; + + return 0; + +error: + LM_ERR("unknown PV nh name %.*s\n", in->len, in->s); + return -1; +} + diff --git a/modules_k/pv/pv_branch.h b/modules_k/pv/pv_branch.h index 7b22ba4..d8e3fbc 100644 --- a/modules_k/pv/pv_branch.h +++ b/modules_k/pv/pv_branch.h @@ -35,5 +35,9 @@ int pv_get_snd(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); int pv_parse_snd_name(pv_spec_p sp, str *in); +int pv_get_nh(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); +int pv_parse_nh_name(pv_spec_p sp, str *in); + #endif

15 years

git:master: kamctl: added files for uac remote registrations

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dc95326f228e0276c7a0b749120015e38b194027 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc95326… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 15:49:07 2010 +0100 kamctl: added files for uac remote registrations --- utils/kamctl/mysql/uac-create.sql | 16 ++++++++++++++++ utils/kamctl/oracle/uac-create.sql | 24 ++++++++++++++++++++++++ utils/kamctl/postgres/uac-create.sql | 16 ++++++++++++++++ 3 files changed, 56 insertions(+), 0 deletions(-) diff --git a/utils/kamctl/mysql/uac-create.sql b/utils/kamctl/mysql/uac-create.sql new file mode 100644 index 0000000..b72b5e6 --- /dev/null +++ b/utils/kamctl/mysql/uac-create.sql @@ -0,0 +1,16 @@ +INSERT INTO version (table_name, table_version) values ('uacreg','1'); +CREATE TABLE uacreg ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + l_uuid VARCHAR(64) DEFAULT '' NOT NULL, + l_username VARCHAR(64) DEFAULT '' NOT NULL, + l_domain VARCHAR(128) DEFAULT '' NOT NULL, + r_username VARCHAR(64) DEFAULT '' NOT NULL, + r_domain VARCHAR(128) DEFAULT '' NOT NULL, + realm VARCHAR(64) DEFAULT '' NOT NULL, + auth_username VARCHAR(64) DEFAULT '' NOT NULL, + auth_password VARCHAR(64) DEFAULT '' NOT NULL, + auth_proxy VARCHAR(64) DEFAULT '' NOT NULL, + expires INT DEFAULT 0 NOT NULL, + CONSTRAINT l_uuid_idx UNIQUE (l_uuid) +) ENGINE=MyISAM; + diff --git a/utils/kamctl/oracle/uac-create.sql b/utils/kamctl/oracle/uac-create.sql new file mode 100644 index 0000000..f27a269 --- /dev/null +++ b/utils/kamctl/oracle/uac-create.sql @@ -0,0 +1,24 @@ +INSERT INTO version (table_name, table_version) values ('uacreg','1'); +CREATE TABLE uacreg ( + id NUMBER(10) PRIMARY KEY, + l_uuid VARCHAR2(64) DEFAULT '', + l_username VARCHAR2(64) DEFAULT '', + l_domain VARCHAR2(128) DEFAULT '', + r_username VARCHAR2(64) DEFAULT '', + r_domain VARCHAR2(128) DEFAULT '', + realm VARCHAR2(64) DEFAULT '', + auth_username VARCHAR2(64) DEFAULT '', + auth_password VARCHAR2(64) DEFAULT '', + auth_proxy VARCHAR2(64) DEFAULT '', + expires NUMBER(10) DEFAULT 0 NOT NULL, + CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) +); + +CREATE OR REPLACE TRIGGER uacreg_tr +before insert on uacreg FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END uacreg_tr; +/ +BEGIN map2users('uacreg'); END; +/ diff --git a/utils/kamctl/postgres/uac-create.sql b/utils/kamctl/postgres/uac-create.sql new file mode 100644 index 0000000..19d0ca7 --- /dev/null +++ b/utils/kamctl/postgres/uac-create.sql @@ -0,0 +1,16 @@ +INSERT INTO version (table_name, table_version) values ('uacreg','1'); +CREATE TABLE uacreg ( + id SERIAL PRIMARY KEY NOT NULL, + l_uuid VARCHAR(64) DEFAULT '' NOT NULL, + l_username VARCHAR(64) DEFAULT '' NOT NULL, + l_domain VARCHAR(128) DEFAULT '' NOT NULL, + r_username VARCHAR(64) DEFAULT '' NOT NULL, + r_domain VARCHAR(128) DEFAULT '' NOT NULL, + realm VARCHAR(64) DEFAULT '' NOT NULL, + auth_username VARCHAR(64) DEFAULT '' NOT NULL, + auth_password VARCHAR(64) DEFAULT '' NOT NULL, + auth_proxy VARCHAR(64) DEFAULT '' NOT NULL, + expires INTEGER DEFAULT 0 NOT NULL, + CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) +); +

15 years

git:master: uac(k): added table for remote user registration

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 56802d2851a5574130f4681560306161ff96cf1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=56802d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 28 15:47:02 2010 +0100 uac(k): added table for remote user registration - xml files to generate db schema for uac module for remote server registrations --- lib/srdb1/schema/kamailio-uac.xml | 12 +++ lib/srdb1/schema/uacreg.xml | 113 +++++++++++++++++++++++++++++ utils/kamctl/db_berkeley/kamailio/version | 6 +- utils/kamctl/dbtext/kamailio/version | 3 +- 4 files changed, 131 insertions(+), 3 deletions(-) diff --git a/lib/srdb1/schema/kamailio-uac.xml b/lib/srdb1/schema/kamailio-uac.xml new file mode 100644 index 0000000..9971ffd --- /dev/null +++ b/lib/srdb1/schema/kamailio-uac.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE database PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + + <!ENTITY % entities SYSTEM "entities.xml"> + %entities; +]> + +<database xmlns:xi="http://www.w3.org/2001/XInclude"> + <name>UAC remote registrations</name> + <xi:include href="uacreg.xml"/> +</database> diff --git a/lib/srdb1/schema/uacreg.xml b/lib/srdb1/schema/uacreg.xml new file mode 100644 index 0000000..7f690b6 --- /dev/null +++ b/lib/srdb1/schema/uacreg.xml @@ -0,0 +1,113 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE table PUBLIC "-//kamailio.org//DTD DBSchema V1.1//EN" + "http://kamailio.org/pub/kamailio/dbschema/dtd/1.1/dbschema.dtd" [ + +<!ENTITY % entities SYSTEM "entities.xml"> +%entities; + +]> + +<table id="uacreg" xmlns:db="http://docbook.org/ns/docbook"> + <name>uacreg</name> + <version>1</version> + <type db="mysql">&MYSQL_TABLE_TYPE;</type> + <description> + <db:para>This table is used by theuac module to load user details for remote server registration: &KAMAILIO_MOD_DOC;uac.html + </db:para> + </description> + + <column id="id"> + <name>id</name> + <type>unsigned int</type> + <size>&table_id_len;</size> + <autoincrement/> + <primary/> + <type db="dbtext">int,auto</type> + <description>Unique ID</description> + </column> + + <column id="l_uuid"> + <name>l_uuid</name> + <type>string</type> + <size>64</size> + <default/> + <description>Local unique id used to build and match contact addresses.</description> + </column> + + <column id="l_username"> + <name>l_username</name> + <type>string</type> + <size>64</size> + <default/> + <description>Local username</description> + </column> + + <column id="l_domain"> + <name>l_domain</name> + <type>string</type> + <size>128</size> + <default/> + <description>Local domain</description> + </column> + + <column id="r_username"> + <name>r_username</name> + <type>string</type> + <size>64</size> + <default/> + <description>Remote username</description> + </column> + + <column id="r_domain"> + <name>r_domain</name> + <type>string</type> + <size>128</size> + <default/> + <description>Remote domain</description> + </column> + + <column id="realm"> + <name>realm</name> + <type>string</type> + <size>64</size> + <default/> + <description>Remote username</description> + </column> + + <column id="auth_username"> + <name>auth_username</name> + <type>string</type> + <size>64</size> + <default/> + <description>Authentication username</description> + </column> + + <column id="auth_password"> + <name>auth_password</name> + <type>string</type> + <size>64</size> + <default/> + <description>Authentication password</description> + </column> + + <column id="auth_proxy"> + <name>auth_proxy</name> + <type>string</type> + <size>64</size> + <default/> + <description>Outbound proxy SIP address</description> + </column> + + <column id="expires"> + <name>expires</name> + <type>int</type> + <default>0</default> + <description>Expiration time (in seconds, 0 means disabled)</description> + </column> + + <index> + <name>l_uuid_idx</name> + <colref linkend="l_uuid"/> + <unique/> + </index> +</table> diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 88278aa..539e2ff 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -16,10 +16,10 @@ address| address|3 aliases| aliases|1004 -carrier_name| -carrier_name|1 carrierfailureroute| carrierfailureroute|2 +carrier_name| +carrier_name|1 carrierroute| carrierroute|3 cpl| @@ -88,6 +88,8 @@ subscriber| subscriber|6 trusted| trusted|5 +uacreg| +uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 685386f..788c7c0 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,8 +3,8 @@ acc:4 active_watchers:9 address:3 aliases:1004 -carrier_name:1 carrierfailureroute:2 +carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 @@ -39,6 +39,7 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 +uacreg:1 uri:1 userblacklist:1 usr_preferences:2

15 years

default cfg file name on git

by Daniel-Constantin Mierla

Hello, I noticed that default cfg for sip-router (ser) was called sip-router-basic.cfg in source tree, while there is another one sip-router.cfg more advanced. Is it ok to swap them? I added to makefile to be able to install different default cfg based on flavour and looks more natural to have the default one matching the application name, even in source tree. With git from now, the sip-router.cfg is installed instead of -basic.cfg until we get to a decision. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

15 years

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev