sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:janakj/kcore: Move hash_func.h from kamailio core to libkcore.

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 06f3ba8e7370122154ae0155498c8d9746856aa0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06f3ba8… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 18:13:51 2009 +0100 Move hash_func.h from kamailio core to libkcore. --- lib/kcore/hash_func.h | 112 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) diff --git a/lib/kcore/hash_func.h b/lib/kcore/hash_func.h new file mode 100644 index 0000000..a2a71ed --- /dev/null +++ b/lib/kcore/hash_func.h @@ -0,0 +1,112 @@ +/* + * $Id$ + * + * Copyright (C) 2001-2003 FhG Fokus + * + * 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 + * + * History: + *--------- + * + * 2006-01-20 - new_hash1() added; support for configurable hash size + * added (bogdan) + * 2006-03-13 - new_hash1() and new_hash2() merged into core_hash(); + * added core_case_hash() for case insensitive hashes; + * all TM dependet stuff moved to TM config file (bogdan) + */ + +/*! + * \file + * \brief Hash functions + */ + + +#ifndef _HASH_FUNC_H_ +#define _HASH_FUNC_H_ + +#include "../../str.h" + + +#define ch_h_inc h+=v^(v>>3) +#define ch_icase(_c) (((_c)>='A'&&(_c)<='Z')?((_c)|0x20):(_c)) +static inline unsigned int core_hash(const str *s1, const str *s2, const unsigned int size) +{ + char *p, *end; + register unsigned v; + register unsigned h; + + h=0; + + end=s1->s+s1->len; + for ( p=s1->s ; p<=(end-4) ; p+=4 ){ + v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + ch_h_inc; + } + v=0; + for (; p<end ; p++){ v<<=8; v+=*p;} + ch_h_inc; + + if (s2) { + end=s2->s+s2->len; + for (p=s2->s; p<=(end-4); p+=4){ + v=(*p<<24)+(p[1]<<16)+(p[2]<<8)+p[3]; + ch_h_inc; + } + v=0; + for (; p<end ; p++){ v<<=8; v+=*p;} + ch_h_inc; + } + h=((h)+(h>>11))+((h>>13)+(h>>23)); + return size?((h)&(size-1)):h; +} + + +static inline unsigned int core_case_hash( str *s1, str *s2, unsigned int size) +{ + char *p, *end; + register unsigned v; + register unsigned h; + + h=0; + + end=s1->s+s1->len; + for ( p=s1->s ; p<=(end-4) ; p+=4 ){ + v=(ch_icase(*p)<<24)+(ch_icase(p[1])<<16)+(ch_icase(p[2])<<8) + + ch_icase(p[3]); + ch_h_inc; + } + v=0; + for (; p<end ; p++){ v<<=8; v+=ch_icase(*p);} + ch_h_inc; + + if (s2) { + end=s2->s+s2->len; + for (p=s2->s; p<=(end-4); p+=4){ + v=(ch_icase(*p)<<24)+(ch_icase(p[1])<<16)+(ch_icase(p[2])<<8) + + ch_icase(p[3]); + ch_h_inc; + } + v=0; + for (; p<end ; p++){ v<<=8; v+=ch_icase(*p);} + ch_h_inc; + } + h=((h)+(h>>11))+((h>>13)+(h>>23)); + return size?((h)&(size-1)):h; +} + + +#endif

15 years, 10 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, 10 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, 10 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, 10 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, 10 months

git:janakj/kcore: Moving strcommon.[ch] from kamailio core to libkcore

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: b38ce3c5b7b3cbe36c75422cd9aff7760ccb66b6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b38ce3c… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 17:10:47 2009 +0100 Moving strcommon.[ch] from kamailio core to libkcore --- lib/kcore/strcommon.c | 369 +++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/strcommon.h | 54 +++++++ 2 files changed, 423 insertions(+), 0 deletions(-) diff --git a/lib/kcore/strcommon.c b/lib/kcore/strcommon.c new file mode 100644 index 0000000..84c54bf --- /dev/null +++ b/lib/kcore/strcommon.c @@ -0,0 +1,369 @@ +/* + * $Id$ + * + * Copyright (C) 2007 voice-system.ro + * + * 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 + * \brief Generic string handling functions + */ + +#include "../../ut.h" +#include "strcommon.h" + +/*! \brief + * add backslashes to special characters + */ +int escape_common(char *dst, char *src, int src_len) +{ + int i, j; + + if(dst==0 || src==0 || src_len<=0) + return 0; + j = 0; + for(i=0; i<src_len; i++) + { + switch(src[i]) + { + case '\'': + dst[j++] = '\\'; + dst[j++] = src[i]; + break; + case '"': + dst[j++] = '\\'; + dst[j++] = src[i]; + break; + case '\\': + dst[j++] = '\\'; + dst[j++] = src[i]; + break; + case '\0': + dst[j++] = '\\'; + dst[j++] = '0'; + break; + default: + dst[j++] = src[i]; + } + } + return j; +} + +/*! \brief + * remove backslashes to special characters + */ +int unescape_common(char *dst, char *src, int src_len) +{ + int i, j; + + if(dst==0 || src==0 || src_len<=0) + return 0; + j = 0; + i = 0; + while(i<src_len) + { + if(src[i]=='\\' && i+1<src_len) + { + switch(src[i+1]) + { + case '\'': + dst[j++] = '\''; + i++; + break; + case '"': + dst[j++] = '"'; + i++; + break; + case '\\': + dst[j++] = '\\'; + i++; + break; + case '0': + dst[j++] = '\0'; + i++; + break; + default: + dst[j++] = src[i]; + } + } else { + dst[j++] = src[i]; + } + i++; + } + return j; +} + +/*! \brief Compute MD5 checksum */ +void compute_md5(char *dst, char *src, int src_len) +{ + MD5_CTX context; + unsigned char digest[16]; + MD5Init (&context); + MD5Update (&context, src, src_len); + MD5Final (digest, &context); + string2hex(digest, 16, dst); +} + +/*! \brief Unscape all printable ASCII characters */ +int unescape_user(str *sin, str *sout) +{ + char *at, *p, c; + + if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL + || sin->len<0 || sout->len < sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + while(p < sin->s+sin->len) + { + if (*p == '%') + { + p++; + switch (*p) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + c = (*p - '0') << 4; + break; + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + c = (*p - 'a' + 10) << 4; + break; + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + c = (*p - 'A' + 10) << 4; + break; + default: + LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); + return -1; + } + p++; + switch (*p) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + c = c + (*p - '0'); + break; + case 'a': + case 'b': + case 'c': + case 'd': + case 'e': + case 'f': + c = c + (*p - 'a' + 10); + break; + case 'A': + case 'B': + case 'C': + case 'D': + case 'E': + case 'F': + c = c + (*p - 'A' + 10); + break; + default: + LM_ERR("invalid hex digit <%u>\n", (unsigned int)*p); + return -1; + } + if ((c < 32) || (c > 126)) + { + LM_ERR("invalid escaped character <%u>\n", (unsigned int)c); + return -1; + } + *at++ = c; + } else { + *at++ = *p; + } + p++; + } + + *at = 0; + sout->len = at - sout->s; + + LM_DBG("unescaped string is <%s>\n", sout->s); + return 0; +} + +/*! \brief + * Escape all printable characters that are not valid in user + * part of request uri + * no_need_to_escape = unreserved | user-unreserved + * unreserved = aplhanum | mark + * mark = - | _ | . | ! | ~ | * | ' | ( | ) + * user-unreserved = & | = | + | $ | , | ; | ? | / + */ +int escape_user(str *sin, str *sout) +{ + + char *at, *p; + unsigned char x; + + if(sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL + || sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + + at = sout->s; + p = sin->s; + while (p < sin->s+sin->len) + { + if (*p < 32 || *p > 126) + { + LM_ERR("invalid escaped character <%u>\n", (unsigned int)*p); + return -1; + } + if (isdigit((int)*p) || ((*p >= 'A') && (*p <= 'Z')) || + ((*p >= 'a') && (*p <= 'z'))) + { + *at = *p; + } else { + switch (*p) { + case '-': + case '_': + case '.': + case '!': + case '~': + case '*': + case '\'': + case '(': + case ')': + case '&': + case '=': + case '+': + case '$': + case ',': + case ';': + case '?': + *at = *p; + break; + default: + *at++ = '%'; + x = (*p) >> 4; + if (x < 10) + { + *at++ = x + '0'; + } else { + *at++ = x - 10 + 'a'; + } + x = (*p) & 0x0f; + if (x < 10) { + *at = x + '0'; + } else { + *at = x - 10 + 'a'; + } + } + } + at++; + p++; + } + *at = 0; + sout->len = at - sout->s; + LM_DBG("escaped string is <%s>\n", sout->s); + return 0; +} + + +int unescape_param(str *sin, str *sout) +{ + return unescape_user(sin, sout); +} + + +/*! \brief + * Escape all printable characters that are not valid in + * a param part of request uri: = | ; | , | | " | ? | & + */ +int escape_param(str *sin, str *sout) +{ + char *at, *p; + unsigned char x; + + if (sin==NULL || sout==NULL || sin->s==NULL || sout->s==NULL || + sin->len<0 || sout->len < 3*sin->len+1) + return -1; + + at = sout->s; + p = sin->s; + while (p < sin->s+sin->len) { + if (*p < 32 || *p > 126) { + LM_ERR("invalid escaped character <%u>\n", (unsigned int)*p); + return -1; + } + switch (*p) { + case ' ': + case '?': + case '&': + case '=': + case ',': + case ';': + case '"': + case '+': + *at++ = '%'; + x = (*p) >> 4; + if (x < 10) + { + *at++ = x + '0'; + } else { + *at++ = x - 10 + 'a'; + } + x = (*p) & 0x0f; + if (x < 10) { + *at = x + '0'; + } else { + *at = x - 10 + 'a'; + } + break; + default: + *at = *p; + } + at++; + p++; + } + *at = 0; + sout->len = at - sout->s; + LM_DBG("escaped string is <%s>\n", sout->s); + + return 0; +} + diff --git a/lib/kcore/strcommon.h b/lib/kcore/strcommon.h new file mode 100644 index 0000000..8d7d61e --- /dev/null +++ b/lib/kcore/strcommon.h @@ -0,0 +1,54 @@ +/* + * $Id$ + * + * Copyright (C) 2007 voice-system.ro + * + * 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 + * \brief Common string handling functions + */ + +#ifndef _STRCOMMON_H_ +#define _STRCOMMON_H_ + +#include "../../str.h" +#include "../../md5.h" + +/* + * add backslashes to special characters + */ +int escape_common(char *dst, char *src, int src_len); +/* + * remove backslashes to special characters + */ +int unescape_common(char *dst, char *src, int src_len); + +void compute_md5(char *dst, char *src, int src_len); + +int escape_user(str *sin, str *sout); + +int unescape_user(str *sin, str *sout); + +int escape_param(str *sin, str *sout); + +int unescape_param(str *sin, str *sout); + +#endif +

15 years, 10 months

git:master: A warning comment about FL_USE_MEDIA_PROXY_FLAG reserved in mediaproxy

by Jan Janak

Module: sip-router Branch: master Commit: 5a1522e056f6808445831df227f2d011a67fa06e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5a1522e… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 6 01:02:59 2009 +0100 A warning comment about FL_USE_MEDIA_PROXY_FLAG reserved in mediaproxy --- parser/msg_parser.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 86855e8..636b10e 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -99,6 +99,9 @@ enum request_method { METHOD_UNDEF=0, METHOD_INVITE=1, METHOD_CANCEL=2, METHOD_A /* WARNING: Value (1 << 11) is temporarily reserved for use in kamailio acc * module (flag FL_REQ_UPSTREAM)! */ +/* WARNING: Value (1 << 12) is temporarily reserved for use in kamailio + * media proxy module (flag FL_USE_MEDIA_PROXY)! */ + #define FL_MTU_FB_MASK (FL_MTU_TCP_FB|FL_MTU_TLS_FB|FL_MTU_SCTP_FB)

15 years, 10 months

git:master: Include parse_to.h explicitly where needed.

by Jan Janak

Module: sip-router Branch: master Commit: 9504e6bd77e2a1ce44df2efd3895df618a558710 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9504e6b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 23:51:40 2009 +0100 Include parse_to.h explicitly where needed. Since msg_parser.h does not include parse_to.h after a recent change, we need to include parse_to.h in all files that access data structures and parsers from the to parser and only included msg_parser.h previously. --- modules/tm/sip_msg.c | 1 + modules/tm/t_msgbuilder.c | 1 + modules/tm/t_reply.c | 1 + 3 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index 561ae96..82f4433 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -65,6 +65,7 @@ #include "../../data_lump_rpl.h" #include "../../ut.h" #include "../../parser/digest/digest.h" +#include "../../parser/parse_to.h" #ifdef POSTPONE_MSG_CLONING #include "../../atomic_ops.h" diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index 44c5148..6c8fc70 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -60,6 +60,7 @@ #include "../../dprint.h" #include "../../config.h" #include "../../parser/parser_f.h" +#include "../../parser/parse_to.h" #include "../../ut.h" #include "../../parser/msg_parser.h" #include "../../parser/contact/parse_contact.h" diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index cdcd029..c946f10 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -101,6 +101,7 @@ #include "../../dprint.h" #include "../../config.h" #include "../../parser/parser_f.h" +#include "../../parser/parse_to.h" #include "../../ut.h" #include "../../timer.h" #include "../../error.h"

15 years, 10 months

git:master: Merge branch 'master' of ssh://janakj@git.sip-router.org/ sip-router into sr

by Jan Janak

Module: sip-router Branch: master Commit: 3bc6281523b9a85a9781fa8f8d21b04ac7529d71 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bc6281… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Fri Mar 6 00:41:57 2009 +0100 Merge branch 'master' of ssh://janakj@git.sip-router.org/sip-router into sr * 'master' of ssh://janakj@git.sip-router.org/sip-router: tcp: config option to disable active connects tcp: async mode on by default tcp: enable runtime changing for most of the cfg vars tcp: use dynamic config framework, part 2 tcp: use dynamic config framework, part 1 test: updated parse uri test program sctp: rpc info command sctp: connection reuse & connection tracking sctp: empty sctp_handle_assoc_change added regfree() function call is added to free the memory allocated by regcomp(). ---

15 years, 10 months

git:master: Kamailo compatiblity macros was_canceled and no_new_branches

by Jan Janak

Module: sip-router Branch: master Commit: 50837fd71dcddfb87cdeeb1fb31f156d1eee6f67 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=50837fd… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 19:19:18 2009 +0100 Kamailo compatiblity macros was_canceled and no_new_branches --- modules/tm/h_table.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 5e0ae70..d69daa8 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -435,6 +435,8 @@ struct s_table* _tm_table; /* private internal stuff, don't touch directly */ #define is_invite(_t_) ((_t_)->flags&T_IS_INVITE_FLAG) #define is_local(_t_) ((_t_)->flags&T_IS_LOCAL_FLAG) #define has_noisy_ctimer(_t_) ((_t_)->flags&T_NOISY_CTIMER_FLAG) +#define was_cancelled(_t_) ((_t_)->flags&T_CANCELED) +#define no_new_branches(_t_) ((_t_)->flags&T_6xx) void reset_kr();

15 years, 10 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev