sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

bug in utils/kamctl/Makefile
by rory 28 Jan '10

28 Jan '10

In the section install-modules: in the Makefile, you generate, via sed, several files and copy them to /tmp. If you are doing multiple builds on the same machine, this creates a build race condition. This can be fixed via mktemp or using an in-source temp directory. thx

1 0

git:master: Merge remote branch 'origin/andrei/pointer_alias_warnings'
by Andrei Pelinescu-Onciul 28 Jan '10

28 Jan '10

Module: sip-router Branch: master Commit: 6d17fe5a582be99e8b7d2dc771a36de3abf31dfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6d17fe5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Jan 28 20:19:49 2010 +0100 Merge remote branch 'origin/andrei/pointer_alias_warnings' compile warning fixes * origin/andrei/pointer_alias_warnings: rr(s): fix recently introduced avp_cookie name bug core: avp aliasing warning fixes group: fix pointer aliasing warnings rr: pointer aliasing warning fixes db_postgres: pointer aliasing warnings fixes core: pointer aliasing warnings fixed cfg: fixed pointer aliasing warnings Conflicts: cfg/cfg_ctx.h route.c ---

1 0

new bunch of PVs
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

Hello, I added a bunch of new variables to deal easier with next hop address and be able to retrieve micro-seconds in the config file. Check wiki at: http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#timeval http://sip-router.org/wiki/cookbooks/pseudo-variables/devel#next_hop_address Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

1 0

git:andrei/pointer_alias_warnings: rr(s): fix recently introduced avp_cookie name bug
by Andrei Pelinescu-Onciul 28 Jan '10

28 Jan '10

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 */

1 0

git:andrei/pointer_alias_warnings: core: avp aliasing warning fixes
by Andrei Pelinescu-Onciul 28 Jan '10

28 Jan '10

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; } }

1 0

git:master: pv(k): use $TV(Sn) for string timeval
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

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;

1 0

git:master: pv(k): added $PV(sn)
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

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:

1 0

git:master: mtree: added db table definition
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

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>

1 0

git:master: kamctl: added mtree sql scripts
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

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) +); +

1 0

git:master: pv(k): new PV class to select next hop attributes
by Daniel-Constantin Mierla 28 Jan '10

28 Jan '10

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

2 2

← Newer
1
2
3
4
5
6
7
...
29
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 2010