sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:ser_core_cvs: make: workaround for make 3.80
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Module: sip-router Branch: ser_core_cvs Commit: a52cbf0afc214b21726082ce3cbb97db3a94d0cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a52cbf0… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 10:50:13 2009 +0000 make: workaround for make 3.80 - if make version is 3.80* replace $(realpath ...) with our own function (realpath is not supported in 3.80) --- Makefile.rules | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.rules b/Makefile.rules index af51b08..665fcf7 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -56,7 +56,7 @@ ALLDEP+=makecfg.lst # on some ser libs) ifneq ($(SER_LIBS),) -# abspath & realpath don't seem to work on darwin +# abspath & realpath don't work on make <= 3.80 SER_LIBS_DIRS:=$(dir $(SER_LIBS)) ifneq (,$(filter install install% %install, $(MAKECMDGOALS))) lib_compile_for_install=yes @@ -70,7 +70,14 @@ ifneq ($(LD_RPATH),) ifneq (,$(filter install install% %install, $(MAKECMDGOALS))) SER_RPATH_LST:=$(lib_target) else -SER_RPATH_LST:=$(realpath $(dir $(SER_LIBS))) +# realpath is not supported in make 3.80 or older +ifeq (,$(filter-out 3.80 3.80.%,$(MAKE_VERSION))) +fullpath=$(shell cd $(1); pwd) +else +fullpath=$(realpath $(1)) +endif + +SER_RPATH_LST:=$(call fullpath,$(dir $(SER_LIBS))) endif ifneq ($(strip $(SER_RPATH_LST)),) SER_RPATH:=$(addprefix $(LD_RPATH),$(SER_RPATH_LST))

1 0

K. module patch set
by Jan Janak 03 Apr '09

03 Apr '09

Hello, Just FYI, here is the full set of patches that we maintain on top of kamailio modules: http://sip-router.org/pub/k_patches/ So far we produced 364 patches. Jan.

1 0

[PATCH 2/2] port from kamailio, r4007
by Henning Westerholt 03 Apr '09

03 Apr '09

- when only module.so is given to loadmodule and mpath is set, try mpath/module/module.so if mpath/module.so is not found - useful when runing from sources tree - small adaptions because of renames in kamailio --- cfg.y | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/cfg.y b/cfg.y index 44074ab..22a7b74 100644 --- a/cfg.y +++ b/cfg.y @@ -104,6 +104,8 @@ #include <stdarg.h> #include <sys/types.h> #include <sys/socket.h> +#include <sys/stat.h> +#include <unistd.h> #include <netinet/in.h> #include <arpa/inet.h> #include <string.h> @@ -226,6 +228,7 @@ static int case_check_default(struct case_stms* stms); static char *mpath=NULL; static char mpath_buf[256]; static int mpath_len = 0; +static struct stat statf; %} @@ -1385,11 +1388,31 @@ cfg_var: } | ID DOT ID EQUAL error { yyerror("number or string expected"); } ; -module_stm: - LOADMODULE STRING { - if(*$2!='/' && mpath!=NULL && strlen($2)+mpath_len<255) - { +module_stm: LOADMODULE STRING { + if(*$2!='/' && mpath!=NULL && strlen($2)+mpath_len<255) { strcpy(mpath_buf+mpath_len, $2); + if (stat(mpath_buf, &statf) == -1) { + i_tmp = strlen(mpath_buf); + if(strchr($2, '/')==NULL && + strncmp(mpath_buf+i_tmp-3, ".so", 3)==0) + { + if(i_tmp+strlen($2)<255) + { + strcpy(mpath_buf+i_tmp-3, "/"); + strcpy(mpath_buf+i_tmp-2, $2); + if (stat(mpath_buf, &statf) == -1) { + mpath_buf[mpath_len]='\0'; + LOG(L_ERR, "module '%s' not found in '%s'\n", + $2, mpath_buf); + yyerror("failed to load module"); + } + } else { + yyerror("failed to load module - path too long"); + } + } else { + yyerror("failed to load module - not found"); + } + } DBG("loading module %s\n", mpath_buf); if (load_module(mpath_buf)!=0){ yyerror("failed to load module"); -- 1.5.6.5

3 6

git:master: remove wrong EXTRA_DEBUG definition on module loader
by Henning Westerholt 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: 43e96232189748a216c65ac8e13c3ced695830a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=43e9623… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 3 14:14:58 2009 +0200 remove wrong EXTRA_DEBUG definition on module loader --- sr_module.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/sr_module.c b/sr_module.c index e35ee36..24c1445 100644 --- a/sr_module.c +++ b/sr_module.c @@ -274,7 +274,6 @@ int load_module(char* path) strcat(path, modname); strcat(path, ".so"); -#ifdef EXTRA_DEBUG if (stat(path, &stat_buf) == -1) { DBG("load_module: module file not found <%s>\n", path); pkg_free(path); @@ -302,15 +301,6 @@ int load_module(char* path) goto error; } } -#else /* !EXTRA_DEBUG */ - if (stat(path, &stat_buf) == -1) { - DBG("load_module: module file not found <%s>\n", path); - pkg_free(path); - LOG(L_ERR, "ERROR: load_module: could not find module <%s>\n", - modname); - goto error; - } -#endif /* !EXTRA_DEBUG */ } retries=2; dlflags=RTLD_NOW;

1 0

[PATCH 1/2] port from kamailio, r68
by Henning Westerholt 03 Apr '09

03 Apr '09

- add support for 'mpath' argument, to avoid specifying a common module path over and over again - small adaption because of different structure in the sr cfg parser --- cfg.lex | 2 ++ cfg.y | 28 ++++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/cfg.lex b/cfg.lex index 9f42697..229c2b2 100644 --- a/cfg.lex +++ b/cfg.lex @@ -394,6 +394,7 @@ SERVER_ID "server_id" CFG_DESCRIPTION "description"|"descr"|"desc" +MPATH mpath LOADMODULE loadmodule LOADPATH loadpath MODPARAM modparam @@ -741,6 +742,7 @@ EAT_ABLE [\ \t\b\r] return MAX_WLOOPS; } <INITIAL>{SERVER_ID} { count(); yylval.strval=yytext; return SERVER_ID;} <INITIAL>{CFG_DESCRIPTION} { count(); yylval.strval=yytext; return CFG_DESCRIPTION; } +<INITIAL>{MPATH} { count(); yylval.strval=yytext; return MPATH; } <INITIAL>{LOADMODULE} { count(); yylval.strval=yytext; return LOADMODULE; } <INITIAL>{LOADPATH} { count(); yylval.strval=yytext; return LOADPATH; } <INITIAL>{MODPARAM} { count(); yylval.strval=yytext; return MODPARAM; } diff --git a/cfg.y b/cfg.y index de7643d..44074ab 100644 --- a/cfg.y +++ b/cfg.y @@ -223,6 +223,9 @@ static struct case_stms* mk_case_stm(struct rval_expr* ct, int is_re, static int case_check_type(struct case_stms* stms); static int case_check_default(struct case_stms* stms); +static char *mpath=NULL; +static char mpath_buf[256]; +static int mpath_len = 0; %} @@ -376,6 +379,7 @@ static int case_check_default(struct case_stms* stms); %token SERVER_SIGNATURE %token REPLY_TO_VIA %token LOADMODULE +%token MPATH %token LOADPATH %token MODPARAM %token MAXBUFFER @@ -1346,6 +1350,16 @@ assign_stm: | UDP_MTU_TRY_PROTO EQUAL error { yyerror("TCP, TLS, SCTP or UDP expected"); } | cfg_var + | MPATH EQUAL STRING { mpath=$3; strcpy(mpath_buf, $3); + mpath_len=strlen($3); + if(mpath_buf[mpath_len-1]!='/') { + mpath_buf[mpath_len]='/'; + mpath_len++; + mpath_buf[mpath_len]='\0'; + } + } + | MPATH EQUAL error { yyerror("string value expected"); } + | error EQUAL { yyerror("unknown config variable"); } ; cfg_var: @@ -1373,10 +1387,20 @@ cfg_var: ; module_stm: LOADMODULE STRING { - DBG("loading module %s\n", $2); - if (load_module($2)!=0) { + if(*$2!='/' && mpath!=NULL && strlen($2)+mpath_len<255) + { + strcpy(mpath_buf+mpath_len, $2); + DBG("loading module %s\n", mpath_buf); + if (load_module(mpath_buf)!=0){ yyerror("failed to load module"); } + mpath_buf[mpath_len]='\0'; + } else { + DBG("loading module %s\n", $2); + if (load_module($2)!=0){ + yyerror("failed to load module"); + } + } } | LOADMODULE error { yyerror("string expected"); } | LOADPATH STRING { -- 1.5.6.5

2 1

git:master: remove superflous ')' from previous commit
by Henning Westerholt 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: dabfcccafdc2a8c044fe005b355f3e711f35776b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dabfccc… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 3 10:48:01 2009 +0200 remove superflous ')' from previous commit --- cfg.y | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/cfg.y b/cfg.y index 5cd56ce..de7643d 100644 --- a/cfg.y +++ b/cfg.y @@ -2788,7 +2788,7 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_CRIT, "parse error in config file, from line %d, column %d to line %d, column %d): %s\n", + LOG(L_CRIT, "parse error in config file, from line %d, column %d to line %d, column %d: %s\n", p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) LOG(L_CRIT, "parse error in config file, line %d, column %d-%d: %s\n",

1 0

git:master: port from kamailio, r3528
by Henning Westerholt 03 Apr '09

03 Apr '09

Module: sip-router Branch: master Commit: bff528cc94cd5c2f5da8b56d04be12e7ca5bea6d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bff528c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Fri Apr 3 10:46:17 2009 +0200 port from kamailio, r3528 - make error messages generated for cfg warnings and errors more userfriendly --- cfg.y | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cfg.y b/cfg.y index f2383a2..5cd56ce 100644 --- a/cfg.y +++ b/cfg.y @@ -2766,13 +2766,13 @@ static void warn_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_WARN, "cfg. warning: (%d,%d-%d,%d): %s\n", + LOG(L_WARN, "warning in config file, from line %d, column %d to line %d, column %d: %s\n", p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) - LOG(L_WARN, "cfg. warning: (%d,%d-%d): %s\n", + LOG(L_WARN, "warning in config file, line %d, column %d-%d: %s\n", p->s_line, p->s_col, p->e_col, s); else - LOG(L_WARN, "cfg. warning: (%d,%d): %s\n", + LOG(L_WARN, "warning in config file, line %d, column %d: %s\n", p->s_line, p->s_col, s); cfg_warnings++; } @@ -2788,13 +2788,13 @@ static void yyerror_at(struct cfg_pos* p, char* format, ...) vsnprintf(s, sizeof(s), format, ap); va_end(ap); if (p->e_line!=p->s_line) - LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d-%d,%d): %s\n", + LOG(L_CRIT, "parse error in config file, from line %d, column %d to line %d, column %d): %s\n", p->s_line, p->s_col, p->e_line, p->e_col, s); else if (p->s_col!=p->e_col) - LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d-%d): %s\n", + LOG(L_CRIT, "parse error in config file, line %d, column %d-%d: %s\n", p->s_line, p->s_col, p->e_col, s); else - LOG(L_CRIT, "*** PARSE ERROR *** (%d,%d): %s\n", + LOG(L_CRIT, "parse error in config file, line %d, column %d: %s\n", p->s_line, p->s_col, s); cfg_errors++; }

1 0

EBL dns entries
by Andrei Pelinescu-Onciul 03 Apr '09

03 Apr '09

Hi *, Do you know of some dns server having some EBL records, that I can use for testing? (just a few queries) I'm writing right now EBL support for sip-router (the main differences from k are that dns caching EBLs is supported too and this requires a more compact structure without fixed size arrays). BTW: there seem to be 2 small bugs in the k code: dns_ebl_parser(...): 1. len = *rdata; ^^^^^^^^^^^^ this is the position and not the len if (rdata + 1 + len >= end) ^^^^^^^^^^^^^^^^^^^^^^^^^^ len being the position this is useless it should be something like: if (((rdata+4)>end)||((rdata+1+1+rdata[1]+2)>end)) goto error; (4 being the minimum size for an ebl and the other expression being ebl with minimum apex) 2. ebl->apex_len=dn_expand(msg, end, rdata, ebl->apex, MAX_DNS_NAME-1); ^^^^^^^^^ dn_expand returns the compressed len so this should be replaced by ebl->apex_len=strlen(ebl->apex). Also why >= instead of >? Andrei

2 1

[Kamailio-Users] MI_XMLRPC
by jh＠tutpro.com 02 Apr '09

02 Apr '09

Jason Penton writes: > Has anyone else noted poor stability with the mi_xmlrpc MI interface? We are > noticing that after a while (very little load) it stop responding. there has been reports like that also earlier. i personally have not noticed that. the library was somewhat hacked when it was include in openser and i don't think it has been upgraded since then. perhaps sip-router core will have a more robust implementation of xmlrpc server? -- juha

3 6

git:master: dns: PTR support
by Andrei Pelinescu-Onciul 01 Apr '09

01 Apr '09

Module: sip-router Branch: master Commit: d354557c249324874c413f7490fdf78a511b8184 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d354557… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Apr 1 18:48:52 2009 +0200 dns: PTR support - PTR resolve support - PTR dns cache support - rpc dns.delete_ptr (e.g. sercmd dns.delete_ptr 56.1.10.10.in-addr.arpa) --- core_cmd.c | 9 ++++++ dns_cache.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- resolve.c | 40 ++++++++++++++++++++++++++++ resolve.h | 8 +++++ 4 files changed, 137 insertions(+), 4 deletions(-) diff --git a/core_cmd.c b/core_cmd.c index c19502c..c4af7a7 100644 --- a/core_cmd.c +++ b/core_cmd.c @@ -61,6 +61,7 @@ void dns_cache_delete_naptr(rpc_t* rpc, void* ctx); void dns_cache_delete_cname(rpc_t* rpc, void* ctx); void dns_cache_delete_txt(rpc_t* rpc, void* ctx); void dns_cache_delete_ebl(rpc_t* rpc, void* ctx); +void dns_cache_delete_ptr(rpc_t* rpc, void* ctx); static const char* dns_cache_mem_info_doc[] = { @@ -142,6 +143,12 @@ static const char* dns_cache_delete_ebl_doc[] = { }; +static const char* dns_cache_delete_ptr_doc[] = { + "deletes an PTR record from the DNS cache", + 0 +}; + + #ifdef USE_DNS_CACHE_STATS void dns_cache_stats_get(rpc_t* rpc, void* ctx); @@ -747,6 +754,8 @@ rpc_export_t core_rpc_methods[] = { dns_cache_delete_txt_doc, 0 }, {"dns.delete_ebl", dns_cache_delete_ebl, dns_cache_delete_ebl_doc, 0 }, + {"dns.delete_ptr", dns_cache_delete_ptr, + dns_cache_delete_ptr_doc, 0 }, #ifdef USE_DNS_CACHE_STATS {"dns.stats_get", dns_cache_stats_get, dns_cache_stats_get_doc, 0 }, diff --git a/dns_cache.c b/dns_cache.c index 87aaf60..0a39438 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -46,6 +46,7 @@ aaaa) (andrei) * 2009-03-30 TXT record support, more rpcs (andrei) * 2009-03-30 EBL record support (andrei) + * 2009-04-01 PTR record support (andrei) */ #ifdef USE_DNS_CACHE @@ -1185,6 +1186,25 @@ inline static struct dns_hash_entry* dns_cache_mk_rd_entry(str* name, int type, * just been elimintated */ } break; + case T_PTR: + for(; *p;){ + if (!rec_matches((*p), type, name)){ + /* skip this record */ + p=&(*p)->next; /* advance */ + continue; + } + /* no padding */ + size+=ROUND_POINTER(sizeof(struct dns_rr)+ + PTR_RDATA_SIZE(*(struct ptr_rdata*)(*p)->rdata)); + /* add it to our tmp. lst */ + *tail=*p; + tail=&(*p)->next; + /* detach it from the rd list */ + *p=(*p)->next; + /* don't advance p, because the crt. elem. has + * just been elimintated */ + } + break; default: LOG(L_CRIT, "BUG: dns_cache_mk_rd_entry: type %d not " "supported\n", type); @@ -1359,6 +1379,20 @@ inline static struct dns_hash_entry* dns_cache_mk_rd_entry(str* name, int type, rr=rr->next; } break; + case T_PTR: + for(l=tmp_lst; l; l=l->next){ + ttl=FIX_TTL(l->ttl); + rr->expire=now+S_TO_TICKS(ttl); /* maximum expire */ + max_ttl=MAX(max_ttl, ttl); + rr->rdata=(void*)((char*)rr+sizeof(struct dns_rr)); + memcpy(rr->rdata, l->rdata, + PTR_RDATA_SIZE(*(struct ptr_rdata*)l->rdata)); + rr->next=(void*)((char*)rr+ROUND_POINTER(sizeof(struct dns_rr)+ + PTR_RDATA_SIZE(*(struct ptr_rdata*)l->rdata))); + tail_rr=&(rr->next); + rr=rr->next; + } + break; default: /* do nothing */ LOG(L_CRIT, "BUG: dns_cache_mk_rd_entry: create: type %d not " @@ -1484,6 +1518,11 @@ found: sizeof(struct dns_rr))+ EBL_RDATA_SIZE(*(struct ebl_rdata*)l->rdata)); break; + case T_PTR: + /* no padding */ + rec[r].size+=ROUND_POINTER(sizeof(struct dns_rr)+ + PTR_RDATA_SIZE(*(struct ptr_rdata*)l->rdata)); + break; default: LOG(L_CRIT, "BUG: dns_cache_mk_rd_entry: type %d not " "supported\n", l->type); @@ -1645,6 +1684,19 @@ found: rec[r].tail_rr=&(rec[r].rr->next); rec[r].rr=rec[r].rr->next; break; + case T_PTR: + rec[r].rr->expire=now+S_TO_TICKS(ttl); /* maximum expire */ + rec[r].max_ttl=MAX(rec[r].max_ttl, ttl); + rec[r].rr->rdata=(void*)((char*)rec[r].rr + +sizeof(struct dns_rr)); + memcpy(rec[r].rr->rdata, l->rdata, + PTR_RDATA_SIZE(*(struct ptr_rdata*)l->rdata)); + rec[r].rr->next=(void*)((char*)rec[r].rr+ + ROUND_POINTER(sizeof(struct dns_rr)+ + PTR_RDATA_SIZE(*(struct ptr_rdata*)l->rdata))); + rec[r].tail_rr=&(rec[r].rr->next); + rec[r].rr=rec[r].rr->next; + break; default: /* do nothing */ ; @@ -3599,6 +3651,10 @@ void dns_cache_debug_all(rpc_t* rpc, void* ctx) rpc->add(ctx, "ss", "ebl", ((struct ebl_rdata*)(rr->rdata))->apex); break; + case T_PTR: + rpc->add(ctx, "ss", "ptr", + ((struct ptr_rdata*)(rr->rdata))->ptrdname); + break; default: rpc->add(ctx, "ss", "unknown", "?"); } @@ -3630,8 +3686,10 @@ static char *print_type(unsigned short type) return "TXT"; case T_EBL: return "EBL"; + case T_PTR: + return "PTR"; default: - return "unkown"; + return "unknown"; } } @@ -3668,6 +3726,8 @@ static int dns_get_type(str* s) return T_TXT; else if (strncasecmp(t, "EBL", len)==0) return T_EBL; + else if (strncasecmp(t, "PTR", len)==0) + return T_PTR; break; case 5: if (strncasecmp(t, "NAPTR", len)==0) @@ -3693,9 +3753,7 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) now=get_ticks_raw(); expires = (s_ticks_t)(e->expire-now)<0?-1: TICKS_TO_S(e->expire-now); - if (expires < 0) { - return; - } + rpc->printf(ctx, "%sname: %s", SPACE_FORMAT, e->name); rpc->printf(ctx, "%stype: %s", SPACE_FORMAT, print_type(e->type)); rpc->printf(ctx, "%ssize (bytes): %d", SPACE_FORMAT, @@ -3770,6 +3828,10 @@ void dns_cache_print_entry(rpc_t* rpc, void* ctx, struct dns_hash_entry* e) rpc->printf(ctx, "%srr apex: %s", SPACE_FORMAT, ((struct ebl_rdata*)(rr->rdata))->apex); break; + case T_PTR: + rpc->printf(ctx, "%srr name: %s", SPACE_FORMAT, + ((struct ptr_rdata*)(rr->rdata))->ptrdname); + break; default: rpc->printf(ctx, "%sresource record: unknown", SPACE_FORMAT); @@ -3789,14 +3851,19 @@ void dns_cache_view(rpc_t* rpc, void* ctx) { int h; struct dns_hash_entry* e; + ticks_t now; if (!cfg_get(core, core_cfg, use_dns_cache)){ rpc->fault(ctx, 500, "dns cache support disabled (see use_dns_cache)"); return; } + now=get_ticks_raw(); LOCK_DNS_HASH(); for (h=0; h<DNS_HASH_SIZE; h++){ clist_foreach(&dns_hash[h], e, next){ + if (TICKS_LT(e->expire, now)) { + continue; + } rpc->printf(ctx, "{\n"); dns_cache_print_entry(rpc, ctx, e); rpc->printf(ctx, "}"); @@ -3872,6 +3939,9 @@ static struct dns_hash_entry *dns_cache_clone_entry(struct dns_hash_entry *e, case T_EBL: rr_size = ROUND_POINTER(sizeof(struct dns_rr)); break; + case T_PTR: + rr_size = sizeof(struct dns_rr); + break; default: LOG(L_ERR, "ERROR: dns_cache_clone_entry: type %d not " "supported\n", e->type); @@ -4021,6 +4091,7 @@ static void dns_cache_add_record(rpc_t* rpc, void* ctx, unsigned short type) case T_NAPTR: case T_TXT: case T_EBL: + case T_PTR: rpc->fault(ctx, 400, "not implemented"); return; default: @@ -4328,6 +4399,11 @@ void dns_cache_delete_ebl(rpc_t* rpc, void* ctx) dns_cache_delete_record(rpc, ctx, T_EBL); } +void dns_cache_delete_ptr(rpc_t* rpc, void* ctx) +{ + dns_cache_delete_record(rpc, ctx, T_PTR); +} + #ifdef DNS_WATCHDOG_SUPPORT diff --git a/resolve.c b/resolve.c index 9e8d98b..bb850b5 100644 --- a/resolve.c +++ b/resolve.c @@ -44,6 +44,9 @@ * 2008-01-31 resolver options use the configuration framework, and the * resolver is reinitialized when the options change (Miklos) * 2008-08-12 sctp preference support for NAPTR queries (andrei) + * 2009-03-30 TXT record support (andrei) + * 2009-03-31 EBL record support (andrei) + * 2009-04-01 PTR record support (andrei) */ @@ -591,6 +594,37 @@ error: +/* parses a PTR record into a ptr_rdata structure */ +struct ptr_rdata* dns_ptr_parser( unsigned char* msg, unsigned char* end, + unsigned char* rdata) +{ + struct ptr_rdata* pname; + int len; + char name[MAX_DNS_NAME]; + + pname=0; + if (dn_expand(msg, end, rdata, name, MAX_DNS_NAME-1)==-1) + goto error; + len=strlen(name); + if (len>255) + goto error; + /* alloc sizeof struct + space for the null terminated name */ + pname=local_malloc(sizeof(struct ptr_rdata)-1+len+1); + if(pname==0){ + LOG(L_ERR, "ERROR: dns_ptr_parser: out of memory\n"); + goto error; + } + pname->ptrdname_len=len; + memcpy(pname->ptrdname, name, pname->ptrdname_len); + pname->ptrdname[pname->ptrdname_len]=0; + return pname; +error: + if (pname) local_free(pname); + return 0; +} + + + /* frees completely a struct rdata list */ void free_rdata_list(struct rdata* head) { @@ -836,6 +870,12 @@ again: *last=rd; last=&(rd->next); break; + case T_PTR: + rd->rdata=(void*) dns_ptr_parser(buff.buff, end, p); + if(unlikely(rd->rdata==0)) goto error_parse; + *last=rd; + last=&(rd->next); + break; default: LOG(L_ERR, "WARNING: get_record: unknown type %d\n", rtype); rd->rdata=0; diff --git a/resolve.h b/resolve.h index b4cb90c..65bd0c0 100644 --- a/resolve.h +++ b/resolve.h @@ -188,6 +188,14 @@ struct ebl_rdata { (sizeof(struct ebl_rdata)-1+(s).separator_len+1+(s).apex_len+1) +struct ptr_rdata { + unsigned char ptrdname_len; /* name length w/o the terminating 0 */ + char ptrdname[1]; /* null terminated name (len=name_len+1) */ +}; +/* real size of the structure */ +#define PTR_RDATA_SIZE(s) (sizeof(struct ptr_rdata)-1+(s).ptrdname_len+1) + + #ifdef HAVE_RESOLV_RES int match_search_list(const struct __res_state* res, char* name); #endif

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009