sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
241 discussions

git:master: modules_k/xcap_client: Added new #define for xcap-directory auid
by Peter Dunkley 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: f6a38aa7f80cdc02431bdd3d314c82663a3d33a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6a38aa… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Thu Oct 25 17:32:43 2012 +0100 modules_k/xcap_client: Added new #define for xcap-directory auid --- modules_k/xcap_client/xcap_callbacks.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/xcap_client/xcap_callbacks.h b/modules_k/xcap_client/xcap_callbacks.h index 833ae93..34a83fb 100644 --- a/modules_k/xcap_client/xcap_callbacks.h +++ b/modules_k/xcap_client/xcap_callbacks.h @@ -39,6 +39,7 @@ #define USER_PROFILE 1<<6 #define PRES_CONTENT 1<<7 #define SEARCH 1<<8 +#define DIRECTORY 1<<9 /* callback function prototype */ typedef int (xcap_cb)(int doc_type, str xid, char* doc);

1 0

git:master: Core: added DNSSEC support for DNS queries
by Marius Zbihlei 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 73103df8fcffa0f92dfc4699c52d5dd9474084ea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=73103df… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Oct 10 17:53:02 2012 +0300 Core: added DNSSEC support for DNS queries This is available by setting the USE_DNSSEC compile flag. It requires libval-threads and libres (part of dnssec-tools dnssec-tools.org) The custom resolvers were replaced by val_gethostbyname, val_gethostbyname and val_res_query (for SRV). --- Makefile.defs | 9 +++++++-- resolve.c | 18 ++++++++++++++++++ resolve.h | 22 ++++++++++++++++++++++ 3 files changed, 47 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 1645c34..2b7f332 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -1,4 +1,4 @@ -# $Id$ + # # makefile defs (CC, LD,a.s.o) # @@ -1751,7 +1751,12 @@ ifeq ($(OS), linux) LIBS+=-lpthread endif endif - # check for >= 2.5.44 + ifeq (,$(findstring -DUSE_DNSSEC, $(C_DEFS))) + LIBS+=-lval-threads -lcrypto -lsres -lpthread +$(info "using libval for DNSSEC validation") + endif + # check for >= 2.5.44 + ifeq ($(shell [ $(OSREL_N) -ge 2005044 ] && echo has_epoll), has_epoll) ifeq ($(NO_EPOLL),) C_DEFS+=-DHAVE_EPOLL diff --git a/resolve.c b/resolve.c index 17772b7..36a2992 100644 --- a/resolve.c +++ b/resolve.c @@ -713,6 +713,10 @@ struct rdata* get_record(char* name, int type, int flags) int name_len; struct rdata* fullname_rd; +#ifdef USE_DNSSEC + val_status_t val_status; +#endif + if (cfg_get(core, core_cfg, dns_search_list)==0) { search_list_used=0; name_len=0; @@ -722,7 +726,21 @@ struct rdata* get_record(char* name, int type, int flags) } fullname_rd=0; +#ifndef USE_DNSSEC size=res_search(name, C_IN, type, buff.buff, sizeof(buff)); +#else + size=val_res_query((val_context_t *) NULL, + (char *) name, + (int) C_IN, + (int) type, + (unsigned char *) buff.buff, + (int) sizeof(buff), + &val_status); + if(!val_istrusted(val_status)){ + LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); + } +#endif + if (unlikely(size<0)) { DBG("get_record: lookup(%s, %d) failed\n", name, type); goto not_found; diff --git a/resolve.h b/resolve.h index 8ce68e6..66fd3ff 100644 --- a/resolve.h +++ b/resolve.h @@ -58,6 +58,10 @@ #include "dns_wrappers.h" #endif +#ifdef USE_DNSSEC +#include "validator/validator.h" +#endif + /* define RESOLVE_DBG for debugging info (very noisy) */ #define RESOLVE_DBG /* define NAPTR_DBG for naptr related debugging info (very noisy) */ @@ -400,6 +404,9 @@ static inline struct hostent* _resolvehost(char* name) #endif #endif #ifdef DNS_IP_HACK +#ifdef USE_DNSSEC + val_status_t val_status; +#endif struct ip_addr* ip; str s; @@ -430,7 +437,15 @@ static inline struct hostent* _resolvehost(char* name) #endif #endif /* ipv4 */ +#ifndef USE_DNSSEC he=gethostbyname(name); +#else + he=val_gethostbyname( (val_context_t *) 0, name, &val_status); + if(!val_istrusted(val_status)){ + LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); + } +#endif + #ifdef USE_IPV6 if(he==0 && cfg_get(core, core_cfg, dns_try_ipv6)){ #ifndef DNS_IP_HACK @@ -438,7 +453,14 @@ skip_ipv4: #endif /*try ipv6*/ #ifdef HAVE_GETHOSTBYNAME2 + #ifndef USE_DNSSEC he=gethostbyname2(name, AF_INET6); + #else + he=val_gethostbyname2((val_context_t*)0, name, AF_INET6, &val_status); + if(!val_istrusted(val_status)){ + LOG(L_INFO, "INFO: got not trusted record when resolving %s\n",name); + } + #endif //!USE_DNSSEC #elif defined HAVE_GETIPNODEBYNAME /* on solaris 8 getipnodebyname has a memory leak, * after some time calls to it will fail with err=3

8 18

The @kamailio twitter account
by Olle E. Johansson 25 Oct '12

25 Oct '12

There's a @kamailio twitter account that is not used. Anyone knows who has control over it, if it's connected to the project at all? /O

1 0

git:master: xcap_server: use a static table to keep the list of supported auids
by Daniel-Constantin Mierla 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 5f813fdab34cb7507bc4dcc1b66ff87f90f69c9a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f813fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 25 10:56:41 2012 +0200 xcap_server: use a static table to keep the list of supported auids - adding new auid requires an entry in this table and define of the internal type --- modules_k/xcap_server/xcap_misc.c | 99 +++++++++++++++++++++---------------- 1 files changed, 57 insertions(+), 42 deletions(-) diff --git a/modules_k/xcap_server/xcap_misc.c b/modules_k/xcap_server/xcap_misc.c index 146e941..9e294c0 100644 --- a/modules_k/xcap_server/xcap_misc.c +++ b/modules_k/xcap_server/xcap_misc.c @@ -40,6 +40,59 @@ extern str xcaps_root; static param_t *_xcaps_xpath_ns_root = NULL; +typedef struct xcaps_auid_list { + str auid; /* auid value */ + char term; /* ending char (next one after auid) */ + int type; /* internaly type id for auid */ +} xcaps_auid_list_t; + +/* list of supported auid */ +static xcaps_auid_list_t _xcaps_auid_list[] = { + { { "pres-rules", 10 }, + '/', PRES_RULES }, + { { "org.openmobilealliance.pres-rules", 33 }, + '/', PRES_RULES }, + { { "rls-services", 12 }, + '/', RLS_SERVICE }, + { { "pidf-manipulation", 17 }, + '/', PIDF_MANIPULATION }, + { { "resource-lists", 14 }, + '/', RESOURCE_LIST }, + { { "xcap-caps", 9 }, + '/', XCAP_CAPS }, + { { "org.openmobilealliance.user-profile", 35}, + '/', USER_PROFILE }, + { { "org.openmobilealliance.pres-content", 15}, + '/', PRES_CONTENT }, + { { "org.openmobilealliance.search", 29}, + '?', SEARCH }, + + { { 0, 0 }, 0, 0 } +}; + +static int xcaps_find_auid(str *s, xcap_uri_t *xuri) +{ + int i; + for(i=0; _xcaps_auid_list[i].auid.s!=NULL; i++) + { + if(s->len > _xcaps_auid_list[i].auid.len + && s->s[_xcaps_auid_list[i].auid.len] == _xcaps_auid_list[i].term + && strncmp(s->s, _xcaps_auid_list[i].auid.s, + _xcaps_auid_list[i].auid.len) == 0) + { + LM_DBG("matched %.*s\n", _xcaps_auid_list[i].auid.len, + _xcaps_auid_list[i].auid.s); + xuri->type = _xcaps_auid_list[i].type; + xuri->auid.s = s->s; + xuri->auid.len = _xcaps_auid_list[i].auid.len; + return 0; + } + } + LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len, + xuri->uri.s); + return -1; +} + /** * parse xcap uri */ @@ -127,45 +180,11 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) } /* auid */ - xuri->auid.s = s.s; - if(s.len>11 && strncmp(s.s, "pres-rules/", 11)==0) - { - LM_DBG("matched pres-rules\n"); - xuri->type = PRES_RULES; - xuri->auid.len = 10; - } else if(s.len>34 && strncmp(s.s, "org.openmobilealliance.pres-rules/", 34)==0) { - LM_DBG("matched oma pres-rules\n"); - xuri->type = PRES_RULES; - xuri->auid.len = 33; - } else if(s.len>13 && strncmp(s.s, "rls-services/", 13)==0) { - LM_DBG("matched rls-services\n"); - xuri->type = RLS_SERVICE; - xuri->auid.len = 12; - } else if(s.len>18 && strncmp(s.s, "pidf-manipulation/", 18)==0) { - LM_DBG("matched pidf-manipulation\n"); - xuri->type = PIDF_MANIPULATION; - xuri->auid.len = 17; - } else if(s.len>15 && strncmp(s.s, "resource-lists/", 15)==0) { - LM_DBG("matched resource-lists\n"); - xuri->type = RESOURCE_LIST; - xuri->auid.len = 14; - } else if(s.len>10 && strncmp(s.s, "xcap-caps/", 10)==0) { - LM_DBG("matched xcap-caps\n"); - xuri->type = XCAP_CAPS; - xuri->auid.len = 9; - } else if(s.len> 36 && strncmp(s.s, "org.openmobilealliance.user-profile/", 36)==0) { - LM_DBG("matched oma user-profile\n"); - xuri->type = USER_PROFILE; - xuri->auid.len = 35; - } else if(s.len> 36 && strncmp(s.s, "org.openmobilealliance.pres-content/", 36)==0) { - LM_DBG("matched oma pres-content\n"); - xuri->type = PRES_CONTENT; - xuri->auid.len = 35; - } else if(s.len> 30 && strncmp(s.s, "org.openmobilealliance.search?", 30)==0) { - LM_DBG("matched oma search\n"); - xuri->type = SEARCH; - xuri->auid.len = 29; + if(xcaps_find_auid(&s, xuri)<0) + return -1; + /* handling special auids */ + if(xuri->type == SEARCH) { s.s += xuri->auid.len + 1; s.len -= xuri->auid.len + 1; @@ -197,10 +216,6 @@ int xcap_parse_uri(str *huri, str *xroot, xcap_uri_t *xuri) } return 0; - } else { - LM_ERR("unsupported auid in [%.*s]\n", xuri->uri.len, - xuri->uri.s); - return -1; } s.s += xuri->auid.len + 1;

2 3

scap server supported auids
by Daniel-Constantin Mierla 25 Oct '12

25 Oct '12

Hello Peter, regarding your email with supported auids: http://lists.sip-router.org/pipermail/sr-users/2012-September/074850.html You mention that org.openmobilealliance.search is not supported, but in the source code it is parsed. Is it that just is not complete implementation? I saw there is some special handling when this auid is matched. Btw, I refactored a bit the auid discovery, using a static table that contains the list of supported auids: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5f813fd… Hopefully I haven't introduced any issue, having limited testing capabilities for xcap at this moment (just commit fixes if you find some). Also, if you know the auids that imply static documents (as you wrote in the email), feel free to add them when you get some spare time, it would be good to support them in xcap_server even the presence modules have to be extended as well. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu

2 1

[tracker] Comment added: Internal timer lags real time by the startup time
by sip-router 25 Oct '12

25 Oct '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#243 - Internal timer lags real time by the startup time User who did this - Daniel-Constantin Mierla (miconda) ---------- Go ahead and apply the change to auth module, it is safer. Looks like ser_time() is using some local vars, which may not be updated outside of timer process. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=243#comment738 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

[tracker] Task closed: bug in s.replace?
by sip-router 25 Oct '12

25 Oct '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#227 - bug in s.replace? User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=227 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

[tracker] Task closed: Typo in acc module documentation
by sip-router 25 Oct '12

25 Oct '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#251 - Typo in acc module documentation User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Thanks, fixed in master branch for now. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=251 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: acc(k): fixed typo in acc_db_request() example
by Daniel-Constantin Mierla 25 Oct '12

25 Oct '12

Module: sip-router Branch: master Commit: 3bd01c035d5f4c6be55a9995103c0da689d5df18 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bd01c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Oct 25 10:01:08 2012 +0200 acc(k): fixed typo in acc_db_request() example - reported by Bernie Höneisen, FS#251 --- modules_k/acc/README | 4 ++-- modules_k/acc/doc/acc_admin.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/acc/README b/modules_k/acc/README index 88a6eda..eda8bab 100644 --- a/modules_k/acc/README +++ b/modules_k/acc/README @@ -1184,8 +1184,8 @@ acc_log_request("Some comment"); Example 1.46. acc_db_request usage ... -acc_log_request("Some comment", "SomeTable"); -acc_log_request("Some comment", "acc_$time(year)_$time(mon)"); +acc_db_request("Some comment", "SomeTable"); +acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); ... 7.3. acc_rad_request(comment) diff --git a/modules_k/acc/doc/acc_admin.xml b/modules_k/acc/doc/acc_admin.xml index 96edd55..269f5f8 100644 --- a/modules_k/acc/doc/acc_admin.xml +++ b/modules_k/acc/doc/acc_admin.xml @@ -1297,8 +1297,8 @@ acc_log_request("Some comment"); <title>acc_db_request usage</title> <programlisting format="linespecific"> ... -acc_log_request("Some comment", "SomeTable"); -acc_log_request("Some comment", "acc_$time(year)_$time(mon)"); +acc_db_request("Some comment", "SomeTable"); +acc_db_request("Some comment", "acc_$time(year)_$time(mon)"); ... </programlisting> </example>

1 0

[tracker] Task closed: Kamailio crash when about 300, 000 tls connections opened.
by sip-router 25 Oct '12

25 Oct '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#236 - Kamailio crash when about 300,000 tls connections opened. User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Reported issue is fixed in 3.3.x. Create a new issue if you still face slow processing with latest 3.3.x, adding details from benchmark as suggested. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=236 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
...
4
5
6
7
8
9
10
...
25
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012