March 2009 - sr-dev - kamailio.org

TLS merge
by Jan Janak 14 Aug '09

14 Aug '09

Hello, If we want to make the sip-router core usable in both projects, we would also need to merge both tls implementations. In SER we moved the the TLS implementation into tls module. In Kamailio it appears that the tls implementation is in tls subdirectory in the core and then there is tlsops module which contains pseudovariables used to retrieve information from TLS certificates. Unless somebody has a better idea, I would propose that we merge the tls implementation from kamailio core into ser tls module. In addition to that we could merge the implementation of tls related pseudovariables from tlsops into the tls module and then put the tls module into the sip-router repository. What do you think? I volunteer to do this if nobody objects. Jan.

5 10

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

git:master: dns: EBL records support
by Andrei Pelinescu-Onciul 31 Mar '09

31 Mar '09

Module: sip-router Branch: master Commit: 2c2dd816c422e7959531d9974d59f14228d974bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2c2dd81… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 31 19:07:44 2009 +0200 dns: EBL records support - support for EBL records - dns cache support for EBLs - dns.delete_ebl rpc added --- core_cmd.c | 8 +++ dns_cache.c | 161 +++++++++++++++++++++++++++++++++++++++++++++++++--------- resolve.c | 72 ++++++++++++++++++++++++++- resolve.h | 17 ++++++ 4 files changed, 232 insertions(+), 26 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2c2…

1 0

git:master: Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/ sip-router
by Andrei Pelinescu-Onciul 31 Mar '09

31 Mar '09

Module: sip-router Branch: master Commit: a633737cf21a9581f1238067ba6c331bad93ab85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a633737… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 31 19:26:41 2009 +0200 Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router * 'ser_core_cvs' of ssh://git.sip-router.org/sip-router: dns: minor fixes Static buffer is resetted before calling the route block -- Thanks to Jan. Missing include is added. Conflicts: modules/tm/t_suspend.c : sip-router version uses i run_top_route() ---

1 0

git:ser_core_cvs: dns: minor fixes
by Andrei Pelinescu-Onciul 31 Mar '09

31 Mar '09

Module: sip-router Branch: ser_core_cvs Commit: 6082a27973483a25ffe2a091b3b1f2b261361aba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6082a27… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Mar 31 17:06:00 2009 +0000 dns: minor fixes - some dns record parsers need only the record end for their internal overflow checks, while others need also the message end (anything that expands compressed strings). --- resolve.c | 30 +++++++++++++++++------------- 1 files changed, 17 insertions(+), 13 deletions(-) diff --git a/resolve.c b/resolve.c index 9f55f3d..3504f0d 100644 --- a/resolve.c +++ b/resolve.c @@ -230,6 +230,7 @@ unsigned char* dns_skipname(unsigned char* p, unsigned char* end) /* parses the srv record into a srv_rdata structure * msg - pointer to the dns message * end - pointer to the end of the message + * eor - pointer to the end of the record/rdata * rdata - pointer to the rdata part of the srv answer * returns 0 on error, or a dyn. alloc'ed srv_rdata structure */ /* SRV rdata format: @@ -248,6 +249,7 @@ unsigned char* dns_skipname(unsigned char* p, unsigned char* end) * +----------------+ */ struct srv_rdata* dns_srv_parser( unsigned char* msg, unsigned char* end, + unsigned char* eor, unsigned char* rdata) { struct srv_rdata* srv; @@ -258,7 +260,7 @@ struct srv_rdata* dns_srv_parser( unsigned char* msg, unsigned char* end, char name[MAX_DNS_NAME]; srv=0; - if ((rdata+6+1)>end) goto error; + if ((rdata+6+1)>eor) goto error; memcpy((void*)&priority, rdata, 2); memcpy((void*)&weight, rdata+2, 2); @@ -292,6 +294,7 @@ error: /* parses the naptr record into a naptr_rdata structure * msg - pointer to the dns message * end - pointer to the end of the message + * eor - pointer to the end of the record/rdata * rdata - pointer to the rdata part of the naptr answer * returns 0 on error, or a dyn. alloc'ed naptr_rdata structure */ /* NAPTR rdata format: @@ -316,7 +319,8 @@ error: * +----------------+ */ struct naptr_rdata* dns_naptr_parser( unsigned char* msg, unsigned char* end, - unsigned char* rdata) + unsigned char* eor, + unsigned char* rdata) { struct naptr_rdata* naptr; unsigned char* flags; @@ -331,20 +335,20 @@ struct naptr_rdata* dns_naptr_parser( unsigned char* msg, unsigned char* end, char repl[MAX_DNS_NAME]; naptr = 0; - if ((rdata + 7 + 1)>end) goto error; + if ((rdata + 7 + 1)>eor) goto error; memcpy((void*)&order, rdata, 2); memcpy((void*)&pref, rdata + 2, 2); flags_len = rdata[4]; - if ((rdata + 7 + 1 + flags_len) > end) + if ((rdata + 7 + 1 + flags_len) > eor) goto error; flags=rdata+5; services_len = rdata[5 + flags_len]; - if ((rdata + 7 + 1 + flags_len + services_len) > end) + if ((rdata + 7 + 1 + flags_len + services_len) > eor) goto error; services=rdata + 6 + flags_len; regexp_len = rdata[6 + flags_len + services_len]; - if ((rdata + 7 +1 + flags_len + services_len + regexp_len) > end) + if ((rdata + 7 +1 + flags_len + services_len + regexp_len) > eor) goto error; regexp=rdata + 7 + flags_len + services_len; rdata = rdata + 7 + flags_len + services_len + regexp_len; @@ -418,11 +422,11 @@ error: /* parses an A record rdata into an a_rdata structure * returns 0 on error or a dyn. alloc'ed a_rdata struct */ -struct a_rdata* dns_a_parser(unsigned char* rdata, unsigned char* end) +struct a_rdata* dns_a_parser(unsigned char* rdata, unsigned char* eor) { struct a_rdata* a; - if (rdata+4>end) goto error; + if (rdata+4>eor) goto error; a=(struct a_rdata*)local_malloc(sizeof(struct a_rdata)); if (a==0){ LOG(L_ERR, "ERROR: dns_a_parser: out of memory\n"); @@ -438,11 +442,11 @@ error: /* parses an AAAA (ipv6) record rdata into an aaaa_rdata structure * returns 0 on error or a dyn. alloc'ed aaaa_rdata struct */ -struct aaaa_rdata* dns_aaaa_parser(unsigned char* rdata, unsigned char* end) +struct aaaa_rdata* dns_aaaa_parser(unsigned char* rdata, unsigned char* eor) { struct aaaa_rdata* aaaa; - if (rdata+16>end) goto error; + if (rdata+16>eor) goto error; aaaa=(struct aaaa_rdata*)local_malloc(sizeof(struct aaaa_rdata)); if (aaaa==0){ LOG(L_ERR, "ERROR: dns_aaaa_parser: out of memory\n"); @@ -641,7 +645,7 @@ again: } switch(rtype){ case T_SRV: - srv_rd= dns_srv_parser(buff.buff, rd_end, p); + srv_rd= dns_srv_parser(buff.buff, end, rd_end, p); rd->rdata=(void*)srv_rd; if (unlikely(srv_rd==0)) goto error_parse; @@ -678,13 +682,13 @@ again: last=&(rd->next); break; case T_CNAME: - rd->rdata=(void*) dns_cname_parser(buff.buff, rd_end, p); + rd->rdata=(void*) dns_cname_parser(buff.buff, end, p); if(unlikely(rd->rdata==0)) goto error_parse; *last=rd; last=&(rd->next); break; case T_NAPTR: - rd->rdata=(void*) dns_naptr_parser(buff.buff, rd_end, p); + rd->rdata=(void*)dns_naptr_parser(buff.buff, end, rd_end, p); if(unlikely(rd->rdata==0)) goto error_parse; *last=rd; last=&(rd->next);

1 0

git:ser_core_cvs: Static buffer is resetted before calling the route block -- Thanks to Jan.
by Andrei Pelinescu-Onciul 31 Mar '09

31 Mar '09

Module: sip-router Branch: ser_core_cvs Commit: 131ecc8c0cbf9c81c92a884fb17d005f6cab2179 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=131ecc8… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Mar 31 12:33:38 2009 +0000 Static buffer is resetted before calling the route block -- Thanks to Jan. --- modules/tm/t_suspend.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 9b418c1..dd85c4d 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -30,6 +30,8 @@ * */ +#include "../../select_buf.h" /* reset_static_buffer() */ + #include "sip_msg.h" #include "t_reply.h" #include "h_table.h" @@ -148,6 +150,7 @@ int t_continue(unsigned int hash_index, unsigned int label, } faked_env( t, &faked_req); + reset_static_buffer(); init_run_actions_ctx(&ra_ctx); if (run_actions(&ra_ctx, route, &faked_req)<0) LOG(L_ERR, "ERROR: t_continue: Error in run_action\n");

1 0

git:ser_core_cvs: Missing include is added.
by Andrei Pelinescu-Onciul 31 Mar '09

31 Mar '09

Module: sip-router Branch: ser_core_cvs Commit: 4c5be40d553010ae8d0dff30bf3539463c39ffba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c5be40… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Mar 31 12:32:31 2009 +0000 Missing include is added. --- select_buf.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/select_buf.h b/select_buf.h index 5e1cbe7..12343ce 100644 --- a/select_buf.h +++ b/select_buf.h @@ -35,6 +35,8 @@ #ifndef SELECT_BUFFER_H #define SELECT_BUFFER_H +#include "str.h" + /* * Request for space from buffer *

1 0

Patch: utils module compile fixes
by Henning Westerholt 31 Mar '09

31 Mar '09

Hi, attached patch fixes the msg_send usage for the utils module. It uses the forward_request function, instead of doing it manually with msg_send. Its against the kamailio-3.0 repository. I also attached a patch that implements a mk_proxy in shared memory and the necessary utility functions. The kamailio implementation used to allocates fewer parts of the struct. I simply did a replace for /pkg_/shm_/ on the existing proxy implementation, so suggestions for improvements are welcome. This patch is against the sr core, but perhaps its more appropriate to place it in the libkcore library. Please apply, thanks, Henning

2 4

New k. modules that compile
by Jan Janak 31 Mar '09

31 Mar '09

Hello, Four new kamailio modules now compile with the sr core: * pv (Converted by Daniel) * domain * permissions * perl * perlvdb I've also fixed the search_next_avp issue in acc module reported by Ovidiu, so I marked it as OK again in the wiki. Jan.

2 14

git:master: Shared memory versions of mk_proxy and free_proxy.
by Jan Janak 31 Mar '09

31 Mar '09

Module: sip-router Branch: master Commit: 346a9a0551e546189048d379ebe1f630db910d7c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=346a9a0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 31 02:47:44 2009 +0200 Shared memory versions of mk_proxy and free_proxy. This patch adds function mk_shm_proxy, which is the shared memory version of function mk_proxy. In addition to that it adds function free_shm_proxy which is the shared memory version of free_proxy. To avoid code duplication, we turned the body of the original hostent_cpy function into macro called HOSTENT_CPY, the macro takes malloc and free functions as parameters. The macro is then called in the body of hostent_cpy with pkg_malloc and pkg_free as parameters and in the body of hostent_shm_cpy with shm_malloc and shm_free as parameters. We did the same to mk_proxy function. The original body of the function was converted into macro MK_PROXY which, again, takes memory allocation functions as we all the hostent copy function as parameters. --- proxy.c | 284 ++++++++++++++++++++++++++++++++++++-------------------------- proxy.h | 2 + 2 files changed, 167 insertions(+), 119 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=346…

1 0