sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
298 discussions

git:master: xcap_server: use xml2-config to get include and libs compile flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3e502e2ac387999306d4a472784ed0699b8c7f77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e502e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 9 10:08:33 2011 +0200 xcap_server: use xml2-config to get include and libs compile flags --- modules_k/xcap_server/Makefile | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/modules_k/xcap_server/Makefile b/modules_k/xcap_server/Makefile index 660341e..600686e 100644 --- a/modules_k/xcap_server/Makefile +++ b/modules_k/xcap_server/Makefile @@ -10,9 +10,20 @@ auto_gen= NAME=xcap_server.so LIBS= -DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ - -I$(LOCALBASE)/include -LIBS+=-L$(LOCALBASE)/lib -lxml2 +XML2CFG=$(shell which xml2-config) + +ifneq ($(XML2CFG),) + + DEFS += $(shell $(XML2CFG) --cflags) + LIBS += $(shell $(XML2CFG) --libs) + +else + + DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include + LIBS+=-L$(LOCALBASE)/lib -lxml2 + +endif DEFS+=-DOPENSER_MOD_INTERFACE

13 years, 3 months

git:master: Makefile: version set to 3.2.0-pre2

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 59da3210b23cd376662c97bc3d18de78d4a88efa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59da321… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Sep 9 10:25:31 2011 +0200 Makefile: version set to 3.2.0-pre2 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index af34419..89f1f79 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre1 +EXTRAVERSION = -pre2 # memory debugger switcher # 0 - off (release mode)

13 years, 3 months

Freeze rules and undoing a needless string copy

by Alex Hermann

Hello, i'm not aware of the exact rules regarding the bug-fixing freeze of the master branch, hence this question. I accidentally introduced a needless string copy in sql_xquery(), sql_pvquery() and auth_db's load_credentials because i was unaware of the fact that pv_setf_t () already requires implementations to implement a string copy of their own. As this is not strrictly a bug (everything works well but just a little less efficient), would removing this needles copy violate the 'freeze' rules, or can i consider it a bug fix? The patch i'm proposing to commit is attached. -- Alex Hermann

13 years, 3 months

[regression] $Au is only available after successfull authentication

by Alex Hermann

Hello, in 1.x, $Au was available after any x_authorize() call found a digest with the requested realm, regardless of the result of the authgentication. In 3.x, $Au is only available after successfull authentication. I use $Au to get the digest username after pv_xxx_authorize() with dummy password, so i can use the username for caching into htable. This no longer works in 3.x Attached patch fixes this. Opinions on whether is should be committed? -- Alex Hermann

13 years, 3 months

Error reading AVP

by Carlos Ruiz Diaz

Hello. I'm currently developing an OpenSER module which does some business logic for the company I work for. For compatibility reasons we are working with openser-1.2.2-tls and we haven't been able to upgrade to newer version yet. In one block of the code I have to read an avp which is written inside the openser.cfg script using: OPENSER: avp_copy("sip:123@123.123.123:5060", "$avp(s:selectedroute)/g"); C CODE: if (is_response && is_invite_seq) { struct usr_avp* destavp = NULL; int_str destval; const str selected_route = { "selectedroute", 13 }; int attempts = 1, max_attempts = 3; for ( destavp = search_first_avp(AVP_NAME_STR | AVP_VAL_STR, (int_str) selected_route, NULL, 0); destavp != NULL; destavp = search_next_avp(destavp, NULL) ) { get_avp_val(destavp, &destval); } } The problem is that "selectedroute" avp cannot be found so I can't read its value. This happens sporadically and most of the time the code works just fine. I also checked for the list of available AVPs using get_avp_list() but it reports an empty list. Is there another way to read AVPs or is there something I'm missing which is causing this problem? Any help will be appreciated. Thanks in advance! Carlos.

13 years, 3 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7603a6aa4526a87cd2942d913cf9327a39aa3c33 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7603a6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 8 15:58:37 2011 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: lib/srdb1/schema/pr_xcap.xml: made doc_uri size match XCAP_MAX_URI_SIZE ---

13 years, 3 months

git:master: kamctl: regenerated sql scripts from latest db schema

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3dde3b652f8ceb7300cf8ac3b4ce4a04dcf6b642 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3dde3b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 8 16:05:42 2011 +0200 kamctl: regenerated sql scripts from latest db schema --- utils/kamctl/db_sqlite/mtree-create.sql | 9 +++++++++ utils/kamctl/db_sqlite/presence-create.sql | 2 +- utils/kamctl/mysql/mtree-create.sql | 9 +++++++++ utils/kamctl/mysql/presence-create.sql | 2 +- utils/kamctl/oracle/mtree-create.sql | 17 +++++++++++++++++ utils/kamctl/oracle/presence-create.sql | 2 +- utils/kamctl/postgres/mtree-create.sql | 9 +++++++++ utils/kamctl/postgres/presence-create.sql | 2 +- 8 files changed, 48 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/db_sqlite/mtree-create.sql b/utils/kamctl/db_sqlite/mtree-create.sql index 9b6f56f..77c0e38 100644 --- a/utils/kamctl/db_sqlite/mtree-create.sql +++ b/utils/kamctl/db_sqlite/mtree-create.sql @@ -6,3 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) ); +INSERT INTO version (table_name, table_version) values ('mtrees','1'); +CREATE TABLE mtrees ( + id INTEGER PRIMARY KEY NOT NULL, + tname VARCHAR(128) DEFAULT '' NOT NULL, + tprefix VARCHAR(32) DEFAULT '' NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) +); + diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index ae28db5..c99f3a9 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -60,7 +60,7 @@ CREATE TABLE xcap ( doc_type INTEGER NOT NULL, etag VARCHAR(64) NOT NULL, source INTEGER NOT NULL, - doc_uri VARCHAR(128) NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) ); diff --git a/utils/kamctl/mysql/mtree-create.sql b/utils/kamctl/mysql/mtree-create.sql index d3ecf46..8834163 100644 --- a/utils/kamctl/mysql/mtree-create.sql +++ b/utils/kamctl/mysql/mtree-create.sql @@ -6,3 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT tprefix_idx UNIQUE (tprefix) ) ENGINE=MyISAM; +INSERT INTO version (table_name, table_version) values ('mtrees','1'); +CREATE TABLE mtrees ( + id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, + tname VARCHAR(128) DEFAULT '' NOT NULL, + tprefix VARCHAR(32) DEFAULT '' NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT tname_tprefix_idx UNIQUE (tname, tprefix) +) ENGINE=MyISAM; + diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 6caa1f6..577ad81 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -60,7 +60,7 @@ CREATE TABLE xcap ( doc_type INT(11) NOT NULL, etag VARCHAR(64) NOT NULL, source INT(11) NOT NULL, - doc_uri VARCHAR(128) NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INT(11) NOT NULL, CONSTRAINT account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/mtree-create.sql b/utils/kamctl/oracle/mtree-create.sql index 7b74db4..f791897 100644 --- a/utils/kamctl/oracle/mtree-create.sql +++ b/utils/kamctl/oracle/mtree-create.sql @@ -14,3 +14,20 @@ END mtree_tr; / BEGIN map2users('mtree'); END; / +INSERT INTO version (table_name, table_version) values ('mtrees','1'); +CREATE TABLE mtrees ( + id NUMBER(10) PRIMARY KEY, + tname VARCHAR2(128) DEFAULT '', + tprefix VARCHAR2(32) DEFAULT '', + tvalue VARCHAR2(128) DEFAULT '', + CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) +); + +CREATE OR REPLACE TRIGGER mtrees_tr +before insert on mtrees FOR EACH ROW +BEGIN + auto_id(:NEW.id); +END mtrees_tr; +/ +BEGIN map2users('mtrees'); END; +/ diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 97d99de..cd3dbf5 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -84,7 +84,7 @@ CREATE TABLE xcap ( doc_type NUMBER(10), etag VARCHAR2(64), source NUMBER(10), - doc_uri VARCHAR2(128), + doc_uri VARCHAR2(255), port NUMBER(10), CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) ); diff --git a/utils/kamctl/postgres/mtree-create.sql b/utils/kamctl/postgres/mtree-create.sql index 6d60f20..a7d0164 100644 --- a/utils/kamctl/postgres/mtree-create.sql +++ b/utils/kamctl/postgres/mtree-create.sql @@ -6,3 +6,12 @@ CREATE TABLE mtree ( CONSTRAINT mtree_tprefix_idx UNIQUE (tprefix) ); +INSERT INTO version (table_name, table_version) values ('mtrees','1'); +CREATE TABLE mtrees ( + id SERIAL PRIMARY KEY NOT NULL, + tname VARCHAR(128) DEFAULT '' NOT NULL, + tprefix VARCHAR(32) DEFAULT '' NOT NULL, + tvalue VARCHAR(128) DEFAULT '' NOT NULL, + CONSTRAINT mtrees_tname_tprefix_idx UNIQUE (tname, tprefix) +); + diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 2c74fef..104e5bf 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -60,7 +60,7 @@ CREATE TABLE xcap ( doc_type INTEGER NOT NULL, etag VARCHAR(64) NOT NULL, source INTEGER NOT NULL, - doc_uri VARCHAR(128) NOT NULL, + doc_uri VARCHAR(255) NOT NULL, port INTEGER NOT NULL, CONSTRAINT xcap_account_doc_type_idx UNIQUE (username, domain, doc_type, doc_uri) );

13 years, 3 months

git:master: xcap_server: ability to insert new nodes in xcap docs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b123fcd6009a7d13091233556963f84d2a850ed5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b123fcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 8 16:02:49 2011 +0200 xcap_server: ability to insert new nodes in xcap docs - xpath cannot do it alone when the selected node is missing - reported by Laura Testi - credits for testing and further patching --- modules_k/xcap_server/xcap_misc.c | 97 +++++++++++++++++++++++++++---------- 1 files changed, 72 insertions(+), 25 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 57abf3f..f8a0228 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -433,13 +433,18 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) xmlNodePtr parent = NULL; int size; int i; + char *p; doc = xmlParseMemory(inbuf->s, inbuf->len); if(doc == NULL) return -1; if(val!=NULL) + { newnode = xmlParseMemory(val->s, val->len); + if(newnode==NULL) + goto error; + } outbuf->s = NULL; outbuf->len = 0; @@ -459,15 +464,56 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) LM_ERR("unable to evaluate xpath expression [%s]\n", xpaths->s); goto error; } - nodes = xpathObj->nodesetval; - if(nodes==NULL) + nodes = xpathObj->nodesetval; + if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL) { + /* no selection for xpath expression */ LM_DBG("no selection for xpath expression [%s]\n", xpaths->s); - goto done; - } - size = nodes->nodeNr; - if(val!=NULL) - value = (const xmlChar*)val->s; + if(val==NULL) + goto done; + /* could be an insert - locate the selection of parent node */ + p = strrchr(xpaths->s, '/'); + if(p==NULL) + goto done; + /* evaluate xpath expression for parrent node */ + *p = 0; + xpathObj = xmlXPathEvalExpression( + (const xmlChar*)xpaths->s, xpathCtx); + if(xpathObj == NULL) + { + LM_DBG("unable to evaluate xpath parent expression [%s]\n", + xpaths->s); + *p = '/'; + goto done; + } + *p = '/'; + nodes = xpathObj->nodesetval; + if(nodes==NULL || nodes->nodeNr==0 || nodes->nodeTab == NULL) + { + LM_DBG("no selection for xpath parent expression [%s]\n", + xpaths->s); + goto done; + } + /* add the new content as child to first selected element node */ + if(nodes->nodeTab[0]==NULL) + { + LM_DBG("selection for xpath parent expression has first child" + " NULL [%s]\n", xpaths->s); + goto done; + } + if(nodes->nodeTab[0]->type==XML_ELEMENT_NODE) + { + xmlAddChild(nodes->nodeTab[0], xmlCopyNode(newnode->children, 1)); + } else { + LM_DBG("selection for xpath parent expression is not element" + " node [%s]\n", xpaths->s); + goto done; + } + } else { + /* selection for xpath expression */ + size = nodes->nodeNr; + if(val!=NULL) + value = (const xmlChar*)val->s; /* * NOTE: the nodes are processed in reverse order, i.e. reverse document @@ -477,22 +523,22 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) * they get removed. Mixing XPath and modifications on a tree must be * done carefully ! */ - for(i = size - 1; i >= 0; i--) { - if(nodes->nodeTab[i]==NULL) - continue; - - if(nodes->nodeTab[i]->type==XML_ELEMENT_NODE) - { - parent = nodes->nodeTab[i]->parent; - xmlUnlinkNode(nodes->nodeTab[i]); - if(val!=NULL && newnode!=NULL) - xmlAddChild(parent, xmlCopyNode(newnode->children, 1)); - } else { - if(val!=NULL) - xmlNodeSetContent(nodes->nodeTab[i], value); - else - xmlNodeSetContent(nodes->nodeTab[i], (const xmlChar*)""); - } + for(i = size - 1; i >= 0; i--) { + if(nodes->nodeTab[i]==NULL) + continue; + + if(nodes->nodeTab[i]->type==XML_ELEMENT_NODE) + { + parent = nodes->nodeTab[i]->parent; + xmlUnlinkNode(nodes->nodeTab[i]); + if(val!=NULL && newnode!=NULL) + xmlAddChild(parent, xmlCopyNode(newnode->children, 1)); + } else { + if(val!=NULL) + xmlNodeSetContent(nodes->nodeTab[i], value); + else + xmlNodeSetContent(nodes->nodeTab[i], (const xmlChar*)""); + } /* * All the elements returned by an XPath query are pointers to * elements from the tree *except* namespace nodes where the XPath @@ -510,8 +556,9 @@ int xcaps_xpath_set(str *inbuf, str *xpaths, str *val, str *outbuf) * - remove the reference to the modified nodes from the node set * as they are processed, if they are not namespace nodes. */ - if (nodes->nodeTab[i]->type != XML_NAMESPACE_DECL) - nodes->nodeTab[i] = NULL; + if (nodes->nodeTab[i]->type != XML_NAMESPACE_DECL) + nodes->nodeTab[i] = NULL; + } } xmlDocDumpMemory(doc, &xmem, &size);

13 years, 3 months

git:master: xcap_server: remove invalid lib dir from Makefile

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7e1564b7e67a25eb22c26f4ae235d9b380ce8417 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7e1564b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 7 21:57:03 2011 +0200 xcap_server: remove invalid lib dir from Makefile --- modules_k/xcap_server/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/xcap_server/Makefile b/modules_k/xcap_server/Makefile index 8a85ed0..660341e 100644 --- a/modules_k/xcap_server/Makefile +++ b/modules_k/xcap_server/Makefile @@ -12,7 +12,7 @@ LIBS= DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ -I$(LOCALBASE)/include -LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -lxml2 +LIBS+=-L$(LOCALBASE)/lib -lxml2 DEFS+=-DOPENSER_MOD_INTERFACE

13 years, 3 months

10 Years SER Conference - Presentations

by Daniel-Constantin Mierla

Hello, the presentations from 10 Years SER Conference I received so far were uploaded at: * http://www.kamailio.org/events/2011-10yearsSER/ Expect the rest during the next days. The recording of the talk about Gemeinschaft 4 by Stefan Wintermeyer is available on youtube: * http://www.youtube.com/watch?v=mbGn5N_y4rw Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

13 years, 3 months

← Newer
1
...
19
20
21
22
23
24
25
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011