sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:master: Kamailio compatibility: parse_repl

by Jan Janak

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

15 years, 9 months

git:master: Kamailio compatiblity changes: REPLACE_BUFFER_SIZE

by Jan Janak

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

15 years, 9 months

git:master: Kamailio compatibility declarations

by Jan Janak

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

15 years, 9 months

git:master: Use parse_repl from within subst_parser function.

by Jan Janak

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

15 years, 9 months

git:master: Update tm module to use and set the global route_type variable.

by Jan Janak

Module: sip-router Branch: master Commit: 29e00cb942e122a8d0dc2b4e3adf4ef8e431c4b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29e00cb… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Sat Mar 7 01:51:19 2009 +0100 Update tm module to use and set the global route_type variable. This patch removes the rmode variable from tm module and replaces it with the global variable route_type defined in route.h. In addition to that we replaced MODE_* constants with *_ROUTE (also defined in route.h). A variable that was once defined in the tm module is now better moved to the core, because just the core itself without the tm module loaded can execute two types of routes, the request route and the global onreply route (if used). --- modules/tm/t_fwd.c | 16 +++++++++------- modules/tm/t_lookup.c | 26 +++++++++++++------------- modules/tm/t_reply.c | 24 +++++++++++------------- modules/tm/t_reply.h | 3 --- modules/tm/tm.c | 28 ++++++++++++++-------------- modules/tm/tm_load.c | 1 - onsend.h | 1 + receive.c | 3 +++ route.c | 1 + 9 files changed, 52 insertions(+), 51 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=29e…

15 years, 9 months

git:master: New global variable route_type with the type of route being executed

by Jan Janak

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 */

15 years, 9 months

git:janakj/kcore: Replace sibling with header iterator with header type checks

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: f84fdc820e13ad1516969f5cbe6fdf941bfa01cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f84fdc8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 6 02:21:10 2009 +0100 Replace sibling with header iterator with header type checks --- lib/kcore/parser_helpers.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/lib/kcore/parser_helpers.c b/lib/kcore/parser_helpers.c index 5d4ef16..fbfc5a0 100644 --- a/lib/kcore/parser_helpers.c +++ b/lib/kcore/parser_helpers.c @@ -111,7 +111,11 @@ int print_rr_body(struct hdr_field *iroute, str *oroute, int order, } p = p->next; } - iroute = iroute->sibling; + + for(iroute = iroute->next; iroute; iroute = iroute->next) { + if (iroute->type == HDR_ROUTE_T) break; + } +/* iroute = iroute->sibling; */ } for(i=0;i<n;i++){

15 years, 9 months

git:janakj/kcore: Adding print_rr_body from kamailio/parser/parse_rr.[hc]

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 895489f0d7e0ec36a20868e94fa31361fe9c5e45 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=895489f… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 6 02:13:42 2009 +0100 Adding print_rr_body from kamailio/parser/parse_rr.[hc] --- lib/kcore/parser_helpers.c | 110 ++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/parser_helpers.h | 10 ++++ 2 files changed, 120 insertions(+), 0 deletions(-) diff --git a/lib/kcore/parser_helpers.c b/lib/kcore/parser_helpers.c index 15c48c6..5d4ef16 100644 --- a/lib/kcore/parser_helpers.c +++ b/lib/kcore/parser_helpers.c @@ -2,7 +2,9 @@ #include "errinfo.h" #include "../../parser/parse_to.h" #include "../../parser/parse_from.h" +#include "../../parser/parse_rr.h" #include "../../dprint.h" +#include "../../mem/mem.h" #include <string.h> @@ -63,3 +65,111 @@ struct sip_uri *parse_from_uri(struct sip_msg *msg) return &tb->parsed_uri; } + +/*! + * get first RR header and print comma separated bodies in oroute + * - order = 0 normal; order = 1 reverse + * - nb_recs - input=skip number of rr; output=number of printed rrs + */ +int print_rr_body(struct hdr_field *iroute, str *oroute, int order, + unsigned int * nb_recs) +{ + rr_t *p; + int n = 0, nr=0; + int i = 0; + int route_len; +#define MAX_RR_HDRS 64 + static str route[MAX_RR_HDRS]; + char *cp, *start; + + if(iroute==NULL) + return 0; + + route_len= 0; + memset(route, 0, MAX_RR_HDRS*sizeof(str)); + + while (iroute!=NULL) + { + if (parse_rr(iroute) < 0) + { + LM_ERR("failed to parse RR\n"); + goto error; + } + + p =(rr_t*)iroute->parsed; + while (p) + { + route[n].s = p->nameaddr.name.s; + route[n].len = p->len; + LM_DBG("current rr is %.*s\n", route[n].len, route[n].s); + + n++; + if(n==MAX_RR_HDRS) + { + LM_ERR("too many RR\n"); + goto error; + } + p = p->next; + } + iroute = iroute->sibling; + } + + for(i=0;i<n;i++){ + if(!nb_recs || (nb_recs && + ( (!order&& (i>=*nb_recs)) || (order && (i<=(n-*nb_recs)) )) ) ) + { + route_len+= route[i].len; + nr++; + } + + } + + if(nb_recs) + LM_DBG("skipping %i route records\n", *nb_recs); + + route_len += --nr; /* for commas */ + + oroute->s=(char*)pkg_malloc(route_len); + + + if(oroute->s==0) + { + LM_ERR("no more pkg mem\n"); + goto error; + } + cp = start = oroute->s; + if(order==0) + { + i= (nb_recs == NULL) ? 0:*nb_recs; + + while (i<n) + { + memcpy(cp, route[i].s, route[i].len); + cp += route[i].len; + if (++i<n) + *(cp++) = ','; + } + } else { + + i = (nb_recs == NULL) ? n-1 : (n-*nb_recs-1); + + while (i>=0) + { + memcpy(cp, route[i].s, route[i].len); + cp += route[i].len; + if (i-->0) + *(cp++) = ','; + } + } + oroute->len=cp - start; + + LM_DBG("out rr [%.*s]\n", oroute->len, oroute->s); + LM_DBG("we have %i records\n", n); + if(nb_recs != NULL) + *nb_recs = (unsigned int)n; + + return 0; + +error: + return -1; +} diff --git a/lib/kcore/parser_helpers.h b/lib/kcore/parser_helpers.h index 58e8764..76f7e98 100644 --- a/lib/kcore/parser_helpers.h +++ b/lib/kcore/parser_helpers.h @@ -3,9 +3,19 @@ #include "../../parser/msg_parser.h" #include "../../parser/parse_uri.h" +#include "../../str.h" struct sip_uri* parse_to_uri(struct sip_msg* msg); struct sip_uri* parse_from_uri(struct sip_msg* msg); +/*! + * get first RR header and print comma separated bodies in oroute + * - order = 0 normal; order = 1 reverse + * - nb_recs - input=skip number of rr; output=number of printed rrs + */ +int print_rr_body(struct hdr_field *iroute, str *oroute, int order, + unsigned int * nb_recs); + + #endif /* _PARSER_HELPERS_H */

15 years, 9 months

git:janakj/kcore: Parser helper functions not present in sip-router.

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 66b8eec6fd1123e10b805d11d8d78cfb50c7a33e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=66b8eec… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 23:57:38 2009 +0100 Parser helper functions not present in sip-router. That include parse_to_uri and parse_from_uri. Also adding errinfo.[ch] which is required by the parser helpers. --- lib/kcore/errinfo.c | 75 ++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/errinfo.h | 59 ++++++++++++++++++++++++++++++++++ lib/kcore/parser_helpers.c | 65 ++++++++++++++++++++++++++++++++++++++ lib/kcore/parser_helpers.h | 11 ++++++ 4 files changed, 210 insertions(+), 0 deletions(-) diff --git a/lib/kcore/errinfo.c b/lib/kcore/errinfo.c new file mode 100644 index 0000000..799549f --- /dev/null +++ b/lib/kcore/errinfo.c @@ -0,0 +1,75 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Voice Sistem SRL + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file errinfo.c + * \brief Kamailio Error info functions + */ + + +#include <stdlib.h> +#include <string.h> + +#include "../../dprint.h" +#include "errinfo.h" + +/*! global error info */ +err_info_t _oser_err_info; + +/*! \brief Get global error state + */ +err_info_t* get_err_info(void) { return &_oser_err_info; } + +/*! \brief Initialize global error state + */ +void init_err_info(void) +{ + memset(&_oser_err_info, 0, sizeof(err_info_t)); +} + +/*! \brief Set suggested error info message + */ +void set_err_info(int ec, int el, char *info) +{ + LM_DBG("ec: %d, el: %d, ei: '%s'\n", ec, el, + (info)?info:""); + _oser_err_info.eclass = ec; + _oser_err_info.level = el; + if(info) + { + _oser_err_info.info.s = info; + _oser_err_info.info.len = strlen(info); + } +} + +/*! \brief Set suggested error reply + */ +void set_err_reply(int rc, char *rr) +{ + _oser_err_info.rcode = rc; + if(rr) + { + _oser_err_info.rreason.s = rr; + _oser_err_info.rreason.len = strlen(rr); + } +} + diff --git a/lib/kcore/errinfo.h b/lib/kcore/errinfo.h new file mode 100644 index 0000000..fb4bf6b --- /dev/null +++ b/lib/kcore/errinfo.h @@ -0,0 +1,59 @@ +/* + * $Id$ + * + * Copyright (C) 2006 Voice Sistem SRL + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +/*! + * \file errinfo.h + * \brief Error handling + */ + + +#ifndef _errinfo_h_ +#define _errinfo_h_ + +#include "../../str.h" + +/*! \name ErrorClasses error clases */ +#define OSER_EC_PARSER 1 /*!< parse error */ +#define OSER_EC_PMEMORY 2 /*!< private memory error */ +#define OSER_EC_SMEMORY 3 /*!< share memory error */ + +#define OSER_EL_CRITIC 1 +#define OSER_EL_HIGH 2 +#define OSER_EL_MEDIUM 3 /*!< severity level normal - used by parsing errors */ +#define OSER_EL_NORMAL 4 +#define OSER_EL_LOW 5 + +typedef struct err_info_ +{ + int eclass; /*!< error class */ + int level; /*!< severity level (lower is higher) */ + str info; /*!< error details */ + int rcode; /*!< recommended reply code */ + str rreason; /*!< recommended reply reason phrase */ +} err_info_t; + +void init_err_info(void); +void set_err_info(int ec, int el, char *info); +void set_err_reply(int rc, char *rr); +err_info_t* get_err_info(void); + +#endif diff --git a/lib/kcore/parser_helpers.c b/lib/kcore/parser_helpers.c new file mode 100644 index 0000000..15c48c6 --- /dev/null +++ b/lib/kcore/parser_helpers.c @@ -0,0 +1,65 @@ +#include "parser_helpers.h" +#include "errinfo.h" +#include "../../parser/parse_to.h" +#include "../../parser/parse_from.h" +#include "../../dprint.h" + +#include <string.h> + +struct sip_uri *parse_to_uri(struct sip_msg *msg) +{ + struct to_body *tb = NULL; + + if(msg==NULL || msg->to==NULL || msg->to->parsed==NULL) + return NULL; + + tb = get_to(msg); + + if(tb->parsed_uri.user.s!=NULL || tb->parsed_uri.host.s!=NULL) + return &tb->parsed_uri; + + if (parse_uri(tb->uri.s, tb->uri.len , &tb->parsed_uri)<0) + { + LM_ERR("failed to parse To uri\n"); + memset(&tb->parsed_uri, 0, sizeof(struct sip_uri)); + set_err_info(OSER_EC_PARSER, OSER_EL_MEDIUM, "error parsing To uri"); + set_err_reply(400, "bad To uri"); + return NULL; + } + + return &tb->parsed_uri; +} + + +struct sip_uri *parse_from_uri(struct sip_msg *msg) +{ + struct to_body *tb = NULL; + + if(msg==NULL) + return NULL; + + if(parse_from_header(msg)<0) + { + LM_ERR("cannot parse FROM header\n"); + return NULL; + } + + if(msg->from==NULL || get_from(msg)==NULL) + return NULL; + + tb = get_from(msg); + + if(tb->parsed_uri.user.s!=NULL || tb->parsed_uri.host.s!=NULL) + return &tb->parsed_uri; + + if (parse_uri(tb->uri.s, tb->uri.len , &tb->parsed_uri)<0) + { + LM_ERR("failed to parse From uri\n"); + memset(&tb->parsed_uri, 0, sizeof(struct sip_uri)); + set_err_info(OSER_EC_PARSER, OSER_EL_MEDIUM, "error parsing From uri"); + set_err_reply(400, "bad From uri"); + return NULL; + } + return &tb->parsed_uri; +} + diff --git a/lib/kcore/parser_helpers.h b/lib/kcore/parser_helpers.h new file mode 100644 index 0000000..58e8764 --- /dev/null +++ b/lib/kcore/parser_helpers.h @@ -0,0 +1,11 @@ +#ifndef _PARSER_HELPERS_H +#define _PARSER_HELPERS_H + +#include "../../parser/msg_parser.h" +#include "../../parser/parse_uri.h" + +struct sip_uri* parse_to_uri(struct sip_msg* msg); + +struct sip_uri* parse_from_uri(struct sip_msg* msg); + +#endif /* _PARSER_HELPERS_H */

15 years, 9 months

git:janakj/kcore: Merge branch 'sr' into kcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 8f3676cf2f6d3b20ae67294817bd49514a061d3a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f3676c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 23:56:19 2009 +0100 Merge branch 'sr' into kcore * sr: Include parse_to.h explicitly where needed. Add parsed_uri structure to the to_body structure. Kamailo compatiblity macros was_canceled and no_new_branches fix compiler warning about uninitialized variable integrate sip-router compatiblity patches from Jan Janak Define fixup_spve_null Alias LM_NOTICE to NOTICE Function load_tm_api added A comment warning about flag FL_REQ_UPSTREAM. Replace explicit flag values with bit shifts for better readability ---

15 years, 9 months

← Newer
1
...
12
13
14
15
16
17
18
19
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009