sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

by Andrei Pelinescu-Onciul

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

15 years, 9 months

Patch: utils module compile fixes

by Henning Westerholt

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

15 years, 9 months

New k. modules that compile

by Jan Janak

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.

15 years, 9 months

git:master: Shared memory versions of mk_proxy and free_proxy.

by Jan Janak

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…

15 years, 9 months

git:master: An update to the methods parser

by Jan Janak

Module: sip-router Branch: master Commit: 28e95087c242a0743fb633ce732e45d1f7d40335 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=28e9508… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 31 13:32:31 2009 +0200 An update to the methods parser List if changes: * METHOD_REFER defined in msg_parser.h * Changed the prototype of parse_method to use enum request_type * Define ALL_METHODS macro * Replace METH_* with METHOD_* --- parser/msg_parser.h | 2 +- parser/parse_methods.c | 30 +++++++++++++++--------------- parser/parse_methods.h | 24 +++--------------------- 3 files changed, 19 insertions(+), 37 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 1b250df..8624035 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -79,7 +79,7 @@ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_ACK=4, METHOD_BYE=8, METHOD_INFO=16, METHOD_REGISTER=32, METHOD_SUBSCRIBE=64, METHOD_NOTIFY=128, METHOD_MESSAGE=256, METHOD_OPTIONS=512, - METHOD_PRACK=1024, METHOD_UPDATE=2048, METHOD_OTHER=4096 }; + METHOD_PRACK=1024, METHOD_UPDATE=2048, METHOD_REFER = 4096, METHOD_OTHER=8192 }; #define FL_FORCE_RPORT (1 << 0) /* force rport */ #define FL_FORCE_ACTIVE (1 << 1) /* force active SDP */ diff --git a/parser/parse_methods.c b/parser/parse_methods.c index 8e6aabd..aeadee8 100644 --- a/parser/parse_methods.c +++ b/parser/parse_methods.c @@ -49,7 +49,7 @@ static int token_char(char _c) * Parse a method pointed by _next, assign its enum bit to _method, and update * _next past the method. Returns 1 if parse succeeded and 0 otherwise. */ -int parse_method(str* _next, unsigned int* _method) +int parse_method(str* _next, enum request_method* _method) { if (!_next || !_method) { LOG(L_ERR, "parse_method: Invalid parameter value\n"); @@ -65,7 +65,7 @@ int parse_method(str* _next, unsigned int* _method) case 'A': case 'a': if ((_next->len > 2) && !strncasecmp(_next->s + 1, "ck", 2)) { - *_method = METH_ACK; + *_method = METHOD_ACK; _next->len -= 3; _next->s += 3; return 1; @@ -76,7 +76,7 @@ int parse_method(str* _next, unsigned int* _method) case 'B': case 'b': if ((_next->len > 2) && !strncasecmp(_next->s + 1, "ye", 2)) { - *_method = METH_BYE; + *_method = METHOD_BYE; _next->len -= 3; _next->s += 3; return 1; @@ -87,7 +87,7 @@ int parse_method(str* _next, unsigned int* _method) case 'C': case 'c': if ((_next->len > 5) && !strncasecmp(_next->s + 1, "ancel", 5)) { - *_method = METH_CANCEL; + *_method = METHOD_CANCEL; _next->len -= 6; _next->s += 6; return 1; @@ -100,14 +100,14 @@ int parse_method(str* _next, unsigned int* _method) if ((_next->len > 3) && ((*(_next->s + 1) == 'N') || (*(_next->s + 1) == 'n'))) { if (!strncasecmp(_next->s + 2, "fo", 2)) { - *_method = METH_INFO; + *_method = METHOD_INFO; _next->len -= 4; _next->s += 4; return 1; } if ((_next->len > 5) && !strncasecmp(_next->s + 2, "vite", 4)) { - *_method = METH_INVITE; + *_method = METHOD_INVITE; _next->len -= 6; _next->s += 6; return 1; @@ -118,7 +118,7 @@ int parse_method(str* _next, unsigned int* _method) case 'M': case 'm': if ((_next->len > 6) && !strncasecmp(_next->s + 1, "essage", 6)) { - *_method = METH_MESSAGE; + *_method = METHOD_MESSAGE; _next->len -= 7; _next->s += 7; return 1; @@ -129,7 +129,7 @@ int parse_method(str* _next, unsigned int* _method) case 'N': case 'n': if ((_next->len > 5) && !strncasecmp(_next->s + 1, "otify", 5)) { - *_method = METH_NOTIFY; + *_method = METHOD_NOTIFY; _next->len -= 6; _next->s += 6; return 1; @@ -140,7 +140,7 @@ int parse_method(str* _next, unsigned int* _method) case 'O': case 'o': if ((_next->len > 6) && !strncasecmp(_next->s + 1, "ptions", 6)) { - *_method = METH_OPTIONS; + *_method = METHOD_OPTIONS; _next->len -= 7; _next->s += 7; return 1; @@ -151,7 +151,7 @@ int parse_method(str* _next, unsigned int* _method) case 'P': case 'p': if ((_next->len > 4) && !strncasecmp(_next->s + 1, "rack", 4)) { - *_method = METH_PRACK; + *_method = METHOD_PRACK; _next->len -= 5; _next->s += 5; return 1; @@ -164,14 +164,14 @@ int parse_method(str* _next, unsigned int* _method) if ((_next->len > 4) && ((*(_next->s + 1) == 'E') || (*(_next->s + 1) == 'e'))) { if (!strncasecmp(_next->s + 2, "fer", 3)) { - *_method = METH_REFER; + *_method = METHOD_REFER; _next->len -= 5; _next->s += 5; return 1; } if ((_next->len > 7) && !strncasecmp(_next->s + 2, "gister", 6)) { - *_method = METH_REGISTER; + *_method = METHOD_REGISTER; _next->len -= 8; _next->s += 8; return 1; @@ -182,7 +182,7 @@ int parse_method(str* _next, unsigned int* _method) case 'S': case 's': if ((_next->len > 8) && !strncasecmp(_next->s + 1, "ubscribe", 8)) { - *_method = METH_SUBSCRIBE; + *_method = METHOD_SUBSCRIBE; _next->len -= 9; _next->s += 9; return 1; @@ -193,7 +193,7 @@ int parse_method(str* _next, unsigned int* _method) case 'U': case 'u': if ((_next->len > 5) && !strncasecmp(_next->s + 1, "pdate", 5)) { - *_method = METH_UPDATE; + *_method = METHOD_UPDATE; _next->len -= 6; _next->s += 6; return 1; @@ -211,7 +211,7 @@ int parse_method(str* _next, unsigned int* _method) _next->s++; _next->len--; } while (_next->len && token_char(*(_next->s))); - *_method = METH_UNKNOWN; + *_method = METHOD_OTHER; return 1; } else { return 0; diff --git a/parser/parse_methods.h b/parser/parse_methods.h index a4d70aa..867484f 100644 --- a/parser/parse_methods.h +++ b/parser/parse_methods.h @@ -29,27 +29,9 @@ #define PARSE_METHODS_H #include "../str.h" +#include "msg_parser.h" -/* - * Methods found in methods Contact parameter or Allow header. - */ -enum method { - METH_UNKNOWN = 1, - METH_ACK = 2, - METH_BYE = 4, - METH_CANCEL = 8, - METH_INFO = 16, - METH_INVITE = 32, - METH_NOTIFY = 64, - METH_OPTIONS = 128, - METH_PRACK = 256, - METH_REGISTER = 512, - METH_SUBSCRIBE = 1024, - METH_UPDATE = 2048, - METH_MESSAGE = 4096, - METH_REFER = 8192 -}; - +#define ALL_METHODS 0xffffffff /* * Parse comma separated list of methods pointed by _body and assign their @@ -57,7 +39,7 @@ enum method { */ int parse_methods(str* _body, unsigned int* _methods); -int parse_method(str* _next, unsigned int* _method); +int parse_method(str* _next, enum request_method* _method); #endif /* PARSE_METHODS_H */

15 years, 9 months

content length

by Daniel-Constantin Mierla

Hello, the data lumps system is critically affected if content-length is wrong for UDP. The anchor_lump() calls abort() in the case content-length is higher than actually body length. This can be prevented by called sanity module to check the content length, however, I consider being too drastic to have abort in such case, it would be better to return an error and let the sip router process other messages. Opinions? Checking sip-router sources, it faces same issue. Another option would be to correct the C-L value locally, but the right one is that phone vendor fixes its side. Cheers, Daniel -- Daniel-Constantin Mierla SIP Router Masterclass - Kamailio (OpenSER) Training http://www.asipto.com/index.php/sip-router-masterclass/

15 years, 9 months

sip_msg and hdrs anchors

by Daniel-Constantin Mierla

Hello, it became a trend to add anchors to each header used by some module to sip_msg structure. While the average is 15 headers per SIP message (some without anchors in the sip_msg), sip_msg has over 35. Many of these are used only once, e.g., presence related headers are used by router as endpoint, not as a proxy. Intended to endpoint are subject, supported, unsupported, and perhaps others... Keeping them and cloning in TM when proxying makes no sense. They are not used for routing. I think would be good to replace some anchors or at least for future the addition of anchors with functions like: get_hdr_xyz(sip_msg) - that will take care of parsing and return the right hdr_field structure. On another hand I propose to add sortcut to body (start and length) - in this case if there is a correction done by the parser, will be in effect everywhere. Looking now in the code, there are functions that extract body in different ways, some correcting the length by skipping \r, \n at the end. Cheers, Daniel -- Daniel-Constantin Mierla

15 years, 9 months

Patch: usrloc compilation fixes

by Henning Westerholt

Hi, attached patch fixes the compilation for the usrloc module. It adapts it to the different parse_phostport syntax, and fixes a missing #define. Patch against kamailio-3.0 branch. The other (tiny) patchs introduces a ALL_METHODS #define to the parser of sr, which is also necessary for usrloc and a few more modules. Patch against sr master branch. Please apply, thanks Henning

15 years, 9 months

k git repository

by Daniel-Constantin Mierla

Hello, some time ago, during an IRC devel meeting, it was proposed to migrate K source repository to GIT (IIRC Ovidiu Sas). At that time SF.net didn't provide git support but does it now.. Probably many know that most of the modules were updated to compile with sip-router core (last of them being worked out): http://sip-router.org/wiki/devel/kamailio-integration#module_integration_st… Now I am asking the K devels if they feel comfortable with git, so that we move our repository to git. It will easy synchronization with sip-router core which is kept in git. Cheers, Daniel -- Daniel-Constantin Mierla

15 years, 9 months

git:master: dns: TXT records support

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 8f4ba87e4170e025a50ca12581acd8b12a085298 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f4ba87… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Mar 30 20:40:23 2009 +0200 dns: TXT records support - support for TXT lookups, both single and multiple strings are supported. --- resolve.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ resolve.h | 18 +++++++++++++++ 2 files changed, 91 insertions(+), 0 deletions(-) diff --git a/resolve.c b/resolve.c index 9f55f3d..8dfde34 100644 --- a/resolve.c +++ b/resolve.c @@ -456,6 +456,73 @@ error: +/** parses a TXT record into a txt_rdata structure. + * @param msg - pointer to the dns message + * @param end - pointer to the end of the record (rdata end) + * @param rdata - pointer to the rdata part of the txt answer + * returns 0 on error, or a dyn. alloc'ed txt_rdata structure */ +/* TXT rdata format: + * + * one or several character strings: + * 01234567 + * +--------------------+ + * | len | string / ... + * |------------------+ + */ +static struct txt_rdata* dns_txt_parser(unsigned char* msg, unsigned char* end, + unsigned char* rdata) +{ + struct txt_rdata* txt; + int len, n, i; + int str_size; + unsigned char* p; + unsigned char* st; + + txt=0; + if (unlikely((rdata+1)>end)) goto error; + n=0; + str_size=0; + /* count the number of strings */ + p=rdata; + do{ + len=*p; + p+=len+1; + str_size+=len+1; /* 1 for the term. 0 */ + if (unlikely(p>end)) goto error; + n++; + }while(p<end); + /* alloc sizeof struct + space for the dns_cstr array + space for + the strings */ + txt=local_malloc(sizeof(struct txt_rdata) +(n-1)*sizeof(struct dns_cstr)+ + str_size); + if(unlikely(txt==0)){ + LOG(L_ERR, "ERROR: dns_txt_parser: out of memory\n"); + goto error; + } + /* string table */ + st=(unsigned char*)txt+sizeof(struct txt_rdata) + + (n-1)*sizeof(struct dns_cstr); + txt->cstr_no=n; + txt->tslen=str_size; + /* fill the structure */ + p=rdata; + for (i=0; i<n; i++){ + len=*p; + memcpy(st, p+1, len); + st[len]=0; + txt->txt[i].cstr_len=len; + txt->txt[i].cstr=(char*)st; + st+=len+1; + p+=len+1; + } + return txt; +error: + if (txt) local_free(txt); + return 0; +} + + + /* frees completely a struct rdata list */ void free_rdata_list(struct rdata* head) { @@ -689,6 +756,12 @@ again: *last=rd; last=&(rd->next); break; + case T_TXT: + rd->rdata= dns_txt_parser(buff.buff, p+rdlength, p); + if (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 eba6ad4..b4d66ae 100644 --- a/resolve.h +++ b/resolve.h @@ -152,6 +152,24 @@ struct cname_rdata { /* real size of the structure */ #define CNAME_RDATA_SIZE(s) (sizeof(struct cname_rdata)+(s).name_len) +/* dns character-string */ +struct dns_cstr{ + char* cstr; /* pointer to null term. string */ + unsigned char cstr_len; +}; + +/* txt rec. struct */ +struct txt_rdata { + unsigned short cstr_no; /* number of strings */ + unsigned short tslen; /* total strings table len */ + struct dns_cstr txt[1]; /* at least 1 */ + /* all txt[*].cstr point inside a string table at the end of the struct.*/ +}; + +#define TXT_RDATA_SIZE(s) \ + (sizeof(struct txt_rdata)+((s).cstr_no-1)*sizeof(struct dns_cstr)+\ + (s).tslen) + #ifdef HAVE_RESOLV_RES int match_search_list(const struct __res_state* res, char* name);

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev