sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 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, 8 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, 8 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, 8 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, 8 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, 8 months

git:master: Add parsed_uri structure to the to_body structure.

by Jan Janak

Module: sip-router Branch: master Commit: 0873991755f732a3a57cfeb8d0d9437f4fd306bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0873991… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Thu Mar 5 23:47:02 2009 +0100 Add parsed_uri structure to the to_body structure. This is a compatiblity change inspired by kamailio changes. It makes it possible to store already parsed to and from URIs in the sip message structure and there is no need to reparse such URIs later. To and From headers are often parsed repeatedly in modules. As a side effect I had to avoid a nasty cyclic dependency in parser headers. I removed parse_to from msg_parser.h, the header does not have to be included there because nothing in msg_parser.h uses stuff from parse_to. In addition to that many files that previously included only msg_parser.h, and assumed that the header would pull parse_to.h as well, needed to be modified to include parse_to.h explicitly. --- msg_translator.c | 1 + parser/msg_parser.c | 1 + parser/msg_parser.h | 1 - parser/parse_from.h | 1 + parser/parse_to.h | 2 ++ 5 files changed, 5 insertions(+), 1 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index ae52878..3df42d4 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -139,6 +139,7 @@ #include "ut.h" #include "pt.h" #include "cfg/cfg.h" +#include "parser/parse_to.h" #include "forward.h" diff --git a/parser/msg_parser.c b/parser/msg_parser.c index a7df061..e50d3ff 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -58,6 +58,7 @@ #include "parse_hname2.h" #include "parse_uri.h" #include "parse_content.h" +#include "parse_to.h" #include "../compiler_opt.h" #ifdef DEBUG_DMALLOC diff --git a/parser/msg_parser.h b/parser/msg_parser.h index b1541b7..86855e8 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -59,7 +59,6 @@ #include "../config.h" #include "parse_def.h" #include "parse_cseq.h" -#include "parse_to.h" #include "parse_via.h" #include "parse_fline.h" #include "parse_retry_after.h" diff --git a/parser/parse_from.h b/parser/parse_from.h index f9e149a..1618627 100644 --- a/parser/parse_from.h +++ b/parser/parse_from.h @@ -29,6 +29,7 @@ #ifndef _PARSE_FROM_H #define _PARSE_FROM_H +#include "parse_to.h" #include "msg_parser.h" diff --git a/parser/parse_to.h b/parser/parse_to.h index c032cb1..08e4fc4 100644 --- a/parser/parse_to.h +++ b/parser/parse_to.h @@ -30,6 +30,7 @@ #define PARSE_TO #include "../str.h" +#include "msg_parser.h" enum { TAG_PARAM = 400, GENERAL_PARAM @@ -49,6 +50,7 @@ struct to_body{ str uri; /* URI */ str display; /* Display Name */ str tag_value; /* Value of tag */ + struct sip_uri parsed_uri; struct to_param *param_lst; /* Linked list of parameters */ struct to_param *last_param; /* Last parameter in the list */ };

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

git:janakj/kcore: Adding cmpapi.[ch] from kamailio core.

by Jan Janak

Module: sip-router Branch: janakj/kcore Commit: 06e7f4bab16c3f78686282d67ab16fb2065f01e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=06e7f4b… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 3 16:22:22 2009 +0100 Adding cmpapi.[ch] from kamailio core. --- lib/kcore/cmpapi.c | 240 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/cmpapi.h | 57 ++++++++++++ 2 files changed, 297 insertions(+), 0 deletions(-) diff --git a/lib/kcore/cmpapi.c b/lib/kcore/cmpapi.c new file mode 100644 index 0000000..8223052 --- /dev/null +++ b/lib/kcore/cmpapi.c @@ -0,0 +1,240 @@ +/* + * $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 + */ + +/*! + * \file + * \brief comparison functions + */ + +#include "../../parser/parse_uri.h" +#include "../../parser/parse_param.h" +#include "cmpapi.h" + +int cmp_str(str *s1, str *s2) +{ + int ret = 0; + int len = 0; + if(s1->len==0 && s2->len==0) + return 0; + if(s1->len==0) + return -1; + if(s2->len==0) + return 1; + len = (s1->len<s2->len)?s1->len:s2->len; + ret = strncmp(s1->s, s2->s, len); + if(ret==0) + { + if(s1->len==s2->len) + return 0; + if(s1->len<s2->len) + return -1; + return 1; + } + return ret; +} + +int cmpi_str(str *s1, str *s2) +{ + int ret = 0; + int len = 0; + if(s1->len==0 && s2->len==0) + return 0; + if(s1->len==0) + return -1; + if(s2->len==0) + return 1; + len = (s1->len<s2->len)?s1->len:s2->len; + ret = strncasecmp(s1->s, s2->s, len); + if(ret==0) + { + if(s1->len==s2->len) + return 0; + if(s1->len<s2->len) + return -1; + return 1; + } + return ret; +} + +int cmp_hdrname_str(str *s1, str *s2) +{ + /* todo: parse hdr name and compare with short/long alternative */ + return cmpi_str(s1, s2); +} + +int cmp_hdrname_strzn(str *s1, char *s2, size_t n) +{ + str s; + s.s = s2; + s.len = n; + return cmpi_str(s1, &s); +} + +int cmp_str_params(str *s1, str *s2) +{ + param_t* pl1 = NULL; + param_hooks_t phooks1; + param_t *pit1=NULL; + param_t* pl2 = NULL; + param_hooks_t phooks2; + param_t *pit2=NULL; + + if (parse_params(s1, CLASS_ANY, &phooks1, &pl1)<0) + return -1; + if (parse_params(s2, CLASS_ANY, &phooks2, &pl2)<0) + return -1; + for (pit1 = pl1; pit1; pit1=pit1->next) + { + for (pit2 = pl2; pit2; pit2=pit2->next) + { + if (pit1->name.len==pit2->name.len + && strncasecmp(pit1->name.s, pit2->name.s, pit2->name.len)==0) + { + if(pit1->body.len!=pit2->body.len + || strncasecmp(pit1->body.s, pit2->body.s, + pit2->body.len)!=0) + return 1; + } + } + } + return 0; +} + +/** + * Compare SIP URI as per RFC3261, 19.1.4 + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri(struct sip_uri *uri1, struct sip_uri *uri2) +{ + if(uri1->type!=uri2->type) + return 1; + /* quick check for length */ + if(uri1->user.len!=uri2->user.len + || uri1->host.len!=uri2->host.len + || uri1->port.len!=uri2->port.len + || uri1->passwd.len!=uri2->passwd.len) + return 1; + if(cmp_str(&uri1->user, &uri2->user)!=0) + return 1; + if(cmp_str(&uri1->port, &uri2->port)!=0) + return 1; + if(cmp_str(&uri1->passwd, &uri2->passwd)!=0) + return 1; + if(cmpi_str(&uri1->host, &uri2->host)!=0) + return 1; + /* if no params, we are done */ + if(uri1->params.len==0 && uri2->params.len==0) + return 0; + if(uri1->params.len==0) + { + if(uri2->user_param.len!=0) + return 1; + if(uri2->ttl.len!=0) + return 1; + if(uri2->method.len!=0) + return 1; + if(uri2->maddr.len!=0) + return 1; + } + if(uri2->params.len==0) + { + if(uri1->user_param.len!=0) + return 1; + if(uri1->ttl.len!=0) + return 1; + if(uri1->method.len!=0) + return 1; + if(uri1->maddr.len!=0) + return 1; + } + return cmp_str_params(&uri1->params, &uri2->params); +} + +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_uri_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_uri(&uri1, &uri2); +} + +/** + * Compare SIP AoR + * - match user, host and port (if port missing, assume 5060) + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_aor(struct sip_uri *uri1, struct sip_uri *uri2) +{ + /* quick check for length */ + if(uri1->user.len!=uri2->user.len + || uri1->host.len!=uri2->host.len) + return 1; + if(cmp_str(&uri1->user, &uri2->user)!=0) + return 1; + if(cmp_str(&uri1->port, &uri2->port)!=0) + { + if(uri1->port.len==0 && uri2->port_no!=5060) + return 1; + if(uri2->port.len==0 && uri1->port_no!=5060) + return 1; + } + if(cmpi_str(&uri1->host, &uri2->host)!=0) + return 1; + return 0; +} + +/** + * return: + * - 0: match + * - >0: no match + * - <0: error + */ +int cmp_aor_str(str *s1, str *s2) +{ + struct sip_uri uri1; + struct sip_uri uri2; + + /* todo: parse uri and compare the parts */ + if(parse_uri(s1->s, s1->len, &uri1)!=0) + return -1; + if(parse_uri(s2->s, s2->len, &uri2)!=0) + return -1; + return cmp_aor(&uri1, &uri2); +} + diff --git a/lib/kcore/cmpapi.h b/lib/kcore/cmpapi.h new file mode 100644 index 0000000..89038f8 --- /dev/null +++ b/lib/kcore/cmpapi.h @@ -0,0 +1,57 @@ +/* + * $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 + */ + +/*! + * \file + * \brief comparison functions + */ + +#ifndef _CMPAPI_H_ +#define _CMPAPI_H_ + +#include <string.h> +#include "../../str.h" + +/** + * Comparison functions + * - return: + * - < 0 - less + * - ==0 - equal + * - > 0 - greater + * cmp_str* - for strings does case sensitive comparison + * cmpi_str* - for strings does case insensitive comparison + * + */ + +#define cmp_strz(a, b) strcmp((a), (b)) +#define cmpi_strz(a, b) strcasecmp((a), (b)) + +int cmp_str(str *s1, str *s2); +int cmpi_str(str *s1, str *s2); + +int cmp_hdrname_str(str *s1, str *s2); +int cmp_hdrname_strzn(str *s1, char *s2, size_t n); +int cmp_uri_str(str *s1, str *s2); +int cmp_aor_str(str *s1, str *s2); + +#endif +

15 years, 8 months

git on sourceforge

by Jan Janak

FYI: http://apps.sourceforge.net/trac/sitedocs/wiki/Git Jan.

15 years, 8 months

git:master: Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/ sip-router

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d7a5e7bc4343c6638207c7343891126e37e20495 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7a5e7b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 5 18:43:52 2009 +0100 Merge branch 'ser_core_cvs' of ssh://git.sip-router.org/sip-router * 'ser_core_cvs' of ssh://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(). Conflicts: usr_avp.c - regex free fix from sip-router conflicted with the one from ser (they were the same) ---

15 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009