sr-dev

sr-dev@lists.kamailio.org

4 participants
44691 discussions

SDP parser
by Ovidiu Sas 10 Mar '09

10 Mar '09

Hello all, The SDP parser from the kamailio core needs to be imported into the sip-router core. It is located under parser/sdp directory. Th qos module has a dependency on the SDP parser. Regards, Ovidiu Sas

2 3

git:janakj/kcore: Macro append_chr added.
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 511e44b641b0cb64eb07370c862b117360384c4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=511e44b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:54:58 2009 +0100 Macro append_chr added. --- lib/kcore/km_ut.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/lib/kcore/km_ut.h b/lib/kcore/km_ut.h index 43fc11b..a2454a9 100644 --- a/lib/kcore/km_ut.h +++ b/lib/kcore/km_ut.h @@ -47,6 +47,9 @@ (_dest) += (_len) ; \ }while(0); \ +/*! append _c char to _dest string */ +#define append_chr(_dest,_c) \ + *((_dest)++) = _c; /* INTeger-TO-Buffer-STRing : convers an unsigned long to a string

1 0

git:master: Use parse_repl from within subst_parser function.
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: cf1a563fa84022ff8fe55f3ecd3c07a033f05f10 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf1a563… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:20:23 2009 +0100 Use parse_repl from within subst_parser function. The code now in parse_repl function was originally hardwired into the subst_parser function, we moved the code into a separate function and now just call the function from subst_parser. --- re.c | 92 ++++++------------------------------------------------------------ 1 files changed, 8 insertions(+), 84 deletions(-) diff --git a/re.c b/re.c index 2ef7ad9..21a0a5a 100644 --- a/re.c +++ b/re.c @@ -211,7 +211,6 @@ struct subst_expr* subst_parser(str* subst) char* repl_end; struct replace_with rw[MAX_REPLACE_WITH]; int rw_no; - int escape; int cflags; /* regcomp flags */ int replace_all; struct subst_expr* se; @@ -250,91 +249,16 @@ struct subst_expr* subst_parser(str* subst) goto error; found_re: re_end=p; - p++; - /* parse replacement */ - repl=p; - rw_no=0; - max_pmatch=0; - escape=0; - for(;p<end; p++){ - if (escape){ - escape=0; - switch (*p){ - /* special char escapes */ - case '\\': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_CHAR; - rw[rw_no].u.c='\\'; - break; - case 'n': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_CHAR; - rw[rw_no].u.c='\n'; - break; - case 'r': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_CHAR; - rw[rw_no].u.c='\r'; - break; - case 't': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_CHAR; - rw[rw_no].u.c='\t'; - break; - /* special sip msg parts escapes */ - case 'u': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_URI; - break; - /* re matches */ - case '0': /* allow 0, too, reference to the whole match */ - case '1': - case '2': - case '3': - case '4': - case '5': - case '6': - case '7': - case '8': - case '9': - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_NMATCH; - rw[rw_no].u.nmatch=(*p)-'0';/* 0 is the whole matched str*/ - if (max_pmatch<rw[rw_no].u.nmatch) - max_pmatch=rw[rw_no].u.nmatch; - break; - default: /* just print current char */ - if (*p!=c){ - LOG(L_WARN, "subst_parser: WARNING: \\%c unknown" - " escape in %.*s\n", *p, subst->len, subst->s); - } - rw[rw_no].size=2; - rw[rw_no].offset=(p-1)-repl; - rw[rw_no].type=REPLACE_CHAR; - rw[rw_no].u.c=*p; - break; - } - rw_no++; - if (rw_no>=MAX_REPLACE_WITH){ - LOG(L_ERR, "ERROR: subst_parser: too many escapes in the" - " replace part %.*s\n", subst->len, subst->s); - goto error; - } - }else if (*p=='\\') escape=1; - else if (*p==c) goto found_repl; + if (end < (p + 2)) { + ERR("subst_parser: String too short\n"); + goto error; } - LOG(L_ERR, "ERROR: subst_parser: missing separator: %.*s\n", subst->len, - subst->s); - goto error; -found_repl: - repl_end=p; + repl=p+1; + if ((rw_no = parse_repl(rw, &p, end, &max_pmatch, WITH_SEP)) < 0) + goto error; + repl_end = p; p++; + /* parse flags */ for(;p<end; p++){ switch(*p){

1 0

git:master: Kamailio compatibility declarations
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: 812b60d34c0dc600349913a5ccd6bd66450044b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=812b60d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:12:22 2009 +0100 Kamailio compatibility declarations * Define WITH_SEP and WITHOUT_SEP for k. compatiblity * Extend enum replace_special with REPLACE_SPEC * Add pv_spec_t type to the union in replace_with --- re.h | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/re.h b/re.h index 4dec277..06022f2 100644 --- a/re.h +++ b/re.h @@ -37,11 +37,16 @@ #define _re_h #include "str.h" +#include "pvar.h" #include "parser/msg_parser.h" #include <sys/types.h> /* for regex */ #include <regex.h> -enum replace_special { REPLACE_NMATCH, REPLACE_CHAR, REPLACE_URI }; +#define WITH_SEP 1 +#define WITHOUT_SEP 0 + +enum replace_special { REPLACE_NMATCH, REPLACE_CHAR, REPLACE_URI, + REPLACE_SPEC }; struct replace_with{ int offset; /* offset in string */ @@ -50,6 +55,7 @@ struct replace_with{ union{ int nmatch; char c; + pv_spec_t spec; }u; };

1 0

git:master: Kamailio compatiblity changes: REPLACE_BUFFER_SIZE
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: 6e65d12aae8613b3fdbc233e4661bd4fbf9bd3d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6e65d12… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:17:54 2009 +0100 Kamailio compatiblity changes: REPLACE_BUFFER_SIZE * Move the definition of MAX_REPLACE_WITH to the beginning of the file * Add the macro configuring default size of static buffer REPLACE_BUFFER_SIZE --- re.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/re.c b/re.c index ecb8312..2ef7ad9 100644 --- a/re.c +++ b/re.c @@ -40,7 +40,8 @@ #include <string.h> - +#define MAX_REPLACE_WITH 100 +#define REPLACE_BUFFER_SIZE 1024 void subst_expr_free(struct subst_expr* se) {

1 0

git:master: Kamailio compatibility: parse_repl
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: 6a320d25bf720207f2a8e7f7161462d19de4fe0c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a320d2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:16:08 2009 +0100 Kamailio compatibility: parse_repl * Move the replace parser into a separate function called parse_repl * Declare the function in the header file * Add support for PV_MARKER (pseudo-variable marker $) to the parser --- re.c | 133 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- re.h | 2 + 2 files changed, 134 insertions(+), 1 deletions(-) diff --git a/re.c b/re.c index 3380a45..ecb8312 100644 --- a/re.c +++ b/re.c @@ -64,12 +64,143 @@ void replace_lst_free(struct replace_lst* l) } } +int parse_repl(struct replace_with * rw, char ** begin, + char * end, int *max_token_nb, int with_sep) +{ + + char* p0; + char * repl; + str s; + int token_nb; + int escape; + int max_pmatch; + char *p, c; + + /* parse replacement */ + p = *begin; + c = *p; + if(with_sep) + p++; + repl= p; + token_nb=0; + max_pmatch=0; + escape=0; + for(;p<end; p++){ + if (escape){ + escape=0; + switch (*p){ + /* special char escapes */ + case '\\': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c='\\'; + break; + case 'n': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c='\n'; + break; + case 'r': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c='\r'; + break; + case 't': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c='\t'; + break; + case PV_MARKER: + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c=PV_MARKER; + break; + /* special sip msg parts escapes */ + case 'u': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_URI; + break; + /* re matches */ + case '0': /* allow 0, too, reference to the whole match */ + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_NMATCH; + rw[token_nb].u.nmatch=(*p)-'0'; + /* 0 is the whole matched str*/ + if (max_pmatch<rw[token_nb].u.nmatch) + max_pmatch=rw[token_nb].u.nmatch; + break; + default: /* just print current char */ + if (*p!=c){ + WARN("subst_parser:\\%c unknown escape in %s\n", *p, *begin); + } + rw[token_nb].size=2; + rw[token_nb].offset=(p-1)-repl; + rw[token_nb].type=REPLACE_CHAR; + rw[token_nb].u.c=*p; + break; + } + + token_nb++; + + if (token_nb>=MAX_REPLACE_WITH){ + ERR("subst_parser: too many escapes in the replace part %s\n", *begin); + goto error; + } + }else if (*p=='\\') { + escape=1; + }else if (*p==PV_MARKER) { + s.s = p; + s.len = end - s.s; + p0 = pv_parse_spec(&s, &rw[token_nb].u.spec); + if(p0==NULL) + { + ERR("subst_parser: bad specifier in replace part %s\n", *begin); + goto error; + } + rw[token_nb].size=p0-p; + rw[token_nb].offset=p-repl; + rw[token_nb].type=REPLACE_SPEC; + token_nb++; + p=p0-1; + }else if (*p==c && with_sep){ + goto found_repl; + } + } + if(with_sep){ + ERR("subst_parser: missing separator: %s\n", *begin); + goto error; + } + +found_repl: + + *max_token_nb = max_pmatch; + *begin = p; + return token_nb; + +error: + return -1; +} /* parse a /regular expression/replacement/flags into a subst_expr structure */ struct subst_expr* subst_parser(str* subst) { -#define MAX_REPLACE_WITH 100 char c; char* end; char* p; diff --git a/re.h b/re.h index 06022f2..b31a62d 100644 --- a/re.h +++ b/re.h @@ -79,6 +79,8 @@ struct replace_lst{ void subst_expr_free(struct subst_expr* se); void replace_lst_free(struct replace_lst* l); +int parse_repl(struct replace_with * rw, char ** begin, + char * end, int *max_token_nb, int flag); struct subst_expr* subst_parser(str* subst); struct replace_lst* subst_run( struct subst_expr* se, const char* input, struct sip_msg* msg, int *count);

1 0

git:master: Importing kamailio fixes into the sip-router version of re.c
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: b23b15b9977c0f6d7da955d335eaacbe282df12b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b23b15b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:32:34 2009 +0100 Importing kamailio fixes into the sip-router version of re.c This patch imports the following two fixes: * bug fixed in multiple matching on complete lines. Closes bug #1819248. Credits go to Alexander Bergolth (SF bergolth) (svn commit id 3096) * non-critical bug fixed - invalid regexps may lead to infinite matches and finally to memory starvation. Reported to Klaus Darilion <klaus.mailinglists(a)pernau.at> (svn commit id 1039) --- re.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/re.c b/re.c index 21a0a5a..7f1dc23 100644 --- a/re.c +++ b/re.c @@ -483,18 +483,20 @@ struct replace_lst* subst_run(struct subst_expr* se, const char* input, DBG("subst_run: running. r=%d\n", r); /* subst */ if (r==0){ /* != REG_NOMATCH */ - /* change eflags, not to match any more at string start */ - eflags|=REG_NOTBOL; + if (pmatch[0].rm_so==-1) { + ERR("subst_run: Unknown offset?\n"); + goto error; + } + if (pmatch[0].rm_so==pmatch[0].rm_eo) { + ERR("subst_run: Matched string is empty, invalid regexp?\n"); + goto error; + } *crt=pkg_malloc(sizeof(struct replace_lst)); if (*crt==0){ LOG(L_ERR, "ERROR: subst_run: out of mem (crt)\n"); goto error; } memset(*crt, 0, sizeof(struct replace_lst)); - if (pmatch[0].rm_so==-1){ - LOG(L_ERR, "ERROR: subst_run: unknown offset?\n"); - goto error; - } (*crt)->offset=pmatch[0].rm_so+(int)(p-input); (*crt)->size=pmatch[0].rm_eo-pmatch[0].rm_so; DBG("subst_run: matched (%d, %d): [%.*s]\n", @@ -507,6 +509,8 @@ struct replace_lst* subst_run(struct subst_expr* se, const char* input, } crt=&((*crt)->next); p+=pmatch[0].rm_eo; + if (*(p-1) == '\n' || *(p-1) == '\r') eflags&=~REG_NOTBOL; + else eflags|=REG_NOTBOL; cnt++; } }while((r==0) && se->replace_all);

1 0

git:master: Remove function replace_len which is no longer needed.
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: 578b3a95ec13d1ca934c02fed8291aa5419f2160 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=578b3a9… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:42:10 2009 +0100 Remove function replace_len which is no longer needed. This function was originally used to calculate the size of the memory buffer in replace_build for the resulting string. Since we now print the result into a static buffer, this function is no longer needed. --- re.c | 46 ---------------------------------------------- 1 files changed, 0 insertions(+), 46 deletions(-) diff --git a/re.c b/re.c index 6b19786..2b2f6b0 100644 --- a/re.c +++ b/re.c @@ -328,52 +328,6 @@ error: return 0; } - - -static int replace_len(const char* match, int nmatch, regmatch_t* pmatch, - struct subst_expr* se, struct sip_msg* msg) -{ - int r; - int len; - str* uri; - - len=se->replacement.len; - for (r=0; r<se->n_escapes; r++){ - switch(se->replace[r].type){ - case REPLACE_NMATCH: - len-=se->replace[r].size; - if ((se->replace[r].u.nmatch<nmatch)&&( - pmatch[se->replace[r].u.nmatch].rm_so!=-1)){ - /* do the replace */ - len+=pmatch[se->replace[r].u.nmatch].rm_eo- - pmatch[se->replace[r].u.nmatch].rm_so; - }; - break; - case REPLACE_CHAR: - len-=(se->replace[r].size-1); - break; - case REPLACE_URI: - len-=se->replace[r].size; - if (msg->first_line.type!=SIP_REQUEST){ - LOG(L_CRIT, "BUG: replace_len: uri substitution on" - " a reply\n"); - break; /* ignore, we can continue */ - } - uri= (msg->new_uri.s)?(&msg->new_uri): - (&msg->first_line.u.request.uri); - len+=uri->len; - break; - default: - LOG(L_CRIT, "BUG: replace_len: unknown type %d\n", - se->replace[r].type); - /* ignore it */ - } - } - return len; -} - - - /* rpl.s will be alloc'ed with the proper size & rpl.len set * returns 0 on success, <0 on error*/ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch,

1 0

git:master: Kamailio compatibility changes: replace_build
by Jan Janak 08 Mar '09

08 Mar '09

Module: sip-router Branch: master Commit: e12b2f1d22db9b2ac08c07cdfa4c9923e7c0de42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e12b2f1… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sun Mar 8 04:40:13 2009 +0100 Kamailio compatibility changes: replace_build List of changes: * Add support for pseudo variables * Create a static buffer allocated on the stack that will be used to print the resulting string, we no longer can determine the final size of the result in advance because of pseudo-variable support and thus we print to a fixed-size buffer and copy the result into a dynamically allocated buffer when done. * Define macro RBUF_APPEND which is used to add text to the static buffer, the macro checks if there is enough space in the buffer before each write * Remove the call to replace_len at the beginning of the function * Replace all occurrences of memcpy(...) and dest+=... with RBUF_APPEND * At the end create a dynamically allocated buffer for the result and copy the string from the static buffer into the dynamic buffer. --- re.c | 56 +++++++++++++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 23 deletions(-) diff --git a/re.c b/re.c index 7f1dc23..6b19786 100644 --- a/re.c +++ b/re.c @@ -381,30 +381,30 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, { int r; str* uri; + pv_value_t sv; char* p; char* dest; char* end; int size; - - rpl->len=replace_len(match, nmatch, pmatch, se, msg); - if (rpl->len==0){ - rpl->s=0; /* empty string */ - return 0; - } - rpl->s=pkg_malloc(rpl->len); - if (rpl->s==0){ - LOG(L_ERR, "ERROR: replace_build: out of mem (rpl)\n"); - goto error; - } + static char rbuf[REPLACE_BUFFER_SIZE]; + +#define RBUF_APPEND(dst, src, size) \ + if ((dst) - rbuf + (size) >= REPLACE_BUFFER_SIZE - 1) { \ + ERR("replace_build: Buffer too small\n"); \ + goto error; \ + } \ + memcpy((dst), (src), (size)); \ + (dst) += (size); + p=se->replacement.s; end=p+se->replacement.len; - dest=rpl->s; + dest=rbuf; + for (r=0; r<se->n_escapes; r++){ /* copy the unescaped parts */ size=se->replacement.s+se->replace[r].offset-p; - memcpy(dest, p, size); + RBUF_APPEND(dest, p, size); p+=size+se->replace[r].size; - dest+=size; switch(se->replace[r].type){ case REPLACE_NMATCH: if ((se->replace[r].u.nmatch<nmatch)&&( @@ -412,15 +412,13 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, /* do the replace */ size=pmatch[se->replace[r].u.nmatch].rm_eo- pmatch[se->replace[r].u.nmatch].rm_so; - memcpy(dest, - match+pmatch[se->replace[r].u.nmatch].rm_so, - size); - dest+=size; + RBUF_APPEND(dest, + match+pmatch[se->replace[r].u.nmatch].rm_so, + size); }; break; case REPLACE_CHAR: - *dest=se->replace[r].u.c; - dest++; + RBUF_APPEND(dest, &se->replace[r].u.c, 1); break; case REPLACE_URI: if (msg->first_line.type!=SIP_REQUEST){ @@ -430,8 +428,14 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, } uri= (msg->new_uri.s)?(&msg->new_uri): (&msg->first_line.u.request.uri); - memcpy(dest, uri->s, uri->len); - dest+=uri->len; + RBUF_APPEND(dest, uri->s, uri->len); + break; + case REPLACE_SPEC: + if(pv_get_spec_value(msg, &se->replace[r].u.spec, &sv)!=0) { + ERR("replace_build: item substitution returned error\n"); + break; /* ignore, we can continue */ + } + RBUF_APPEND(dest, sv.rs.s, sv.rs.len); break; default: LOG(L_CRIT, "BUG: replace_build: unknown type %d\n", @@ -439,7 +443,13 @@ static int replace_build(const char* match, int nmatch, regmatch_t* pmatch, /* ignore it */ } } - memcpy(dest, p, end-p); + RBUF_APPEND(dest, p, end-p); + rpl->len = dest - rbuf; + if ((rpl->s = pkg_malloc(rpl->len)) == NULL) { + ERR("replace_build: Out of pkg memory\n"); + goto error; + } + memcpy(rpl->s, rbuf, rpl->len); return 0; error: return -1;

1 0

git:master: New global variable route_type with the type of route being executed
by Jan Janak 07 Mar '09

07 Mar '09

Module: sip-router Branch: master Commit: 1dfe92cbe2f80f662087230e716e473367708f24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1dfe92c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Mar 7 01:42:04 2009 +0100 New global variable route_type with the type of route being executed This patch adds a new global variable called route_type. This value of the variable is one of the *_ROUTE values defined in route.h. Those defines have been moved from sr_module.h, originally they were used as the flags for functions in module exports but we can use them here for the global route_type variable as well. The variable route_type is meant to be used by module functions, in some cases they need to test for the type of the route being executed to know what functions are available and whether the sip message being process is stored in shared memory or private memory. The tm module contained similar variable (which was exported through the tm module API), but it makes more sense to keep it in sip-router core, because the core can execute two route types, the request route and the onreply route, even if the tm module is not used. --- route.h | 23 +++++++++++++++++++++++ sr_module.h | 10 +--------- 2 files changed, 24 insertions(+), 9 deletions(-) diff --git a/route.h b/route.h index 732d4a9..221fb4c 100644 --- a/route.h +++ b/route.h @@ -42,6 +42,29 @@ /*#include "cfg_parser.h" */ +/* Various types of route sections, make sure that the values defined in the + * macros below occupy disjunct bits so that they can also be used as flags + */ +#define REQUEST_ROUTE (1 << 0) +#define FAILURE_ROUTE (1 << 1) +#define ONREPLY_ROUTE (1 << 2) +#define BRANCH_ROUTE (1 << 3) +#define ONSEND_ROUTE (1 << 4) +#define ERROR_ROUTE (1 << 5) +#define LOCAL_ROUTE (1 << 6) + +/* The value of this variable is one of the route types defined above and it + * determines the type of the route being executed, module functions can use + * this value to determine the type of the route they are being executed in + */ +extern int route_type; + +#define set_route_type(type) \ + do { \ + route_type = (type); \ + } while(0) + +#define is_route_type(type) (route_type == (type)) struct route_list{ struct action** rlist; diff --git a/sr_module.h b/sr_module.h index 149ca6e..0078f25 100644 --- a/sr_module.h +++ b/sr_module.h @@ -62,6 +62,7 @@ #include "version.h" #include "rpc.h" #include "route_struct.h" +#include "route.h" #include "str.h" /* kamailio compat */ @@ -146,15 +147,6 @@ typedef int (*param_func_t)( modparam_t type, void* val); #define VAR_PARAM_NO -128 /* function has variable number of parameters (see cmd_function_var for the prototype) */ -/* functions flags */ -#define REQUEST_ROUTE 1 /* Function can be used in request route blocks */ -#define FAILURE_ROUTE 2 /* Function can be used in reply route blocks */ -#define ONREPLY_ROUTE 4 /* Function can be used in on_reply */ -#define BRANCH_ROUTE 8 /* Function can be used in branch_route blocks */ -#define ONSEND_ROUTE 16 /* Function can be used in onsend_route blocks */ -#define ERROR_ROUTE 32 /* Function can be used in an error route */ -#define LOCAL_ROUTE 64 /* Function can be used in a local route */ - /* Macros - used as rank in child_init function */ #define PROC_MAIN 0 /* Main ser process */ #define PROC_TIMER -1 /* Timer attendant process */

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