sr-dev March 2009

sr-dev@lists.kamailio.org

14 participants
188 discussions

git:master: Extend the parser parameter with support for dialog event parameters.
by Jan Janak 17 Mar '09

17 Mar '09

Module: sip-router Branch: master Commit: 2eb780d71326e03dff0cc676c16085c18bce914b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2eb780d… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 17:17:44 2009 +0100 Extend the parser parameter with support for dialog event parameters. This patch extends the generic parameter parser in the sip-router core with support for the following dialog event package parameters: call-id, from-tag, to-tag, include-session-description, and sla. The patch introduces a new parameter class called CLASS_EVENT_DIALOG which can be used to instruct the parser to look for the well-known parameters above. It also adds a new parameter hook structure called event_dialog_hooks which will be filled with pointers to the well known parameters if the are found in the parsed string. --- parser/parse_param.c | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++ parser/parse_param.h | 23 ++++++++++++++--- 2 files changed, 85 insertions(+), 4 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index f52811d..c5ed012 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -43,6 +43,66 @@ #include "parse_param.h" +static inline void parse_event_dialog_class(param_hooks_t* h, param_t* p) +{ + + if (!p->name.s) { + LOG(L_ERR, "ERROR: parse_event_dialog_class: empty value\n"); + return; + } + if (!h) { + LOG(L_CRIT, "BUG: parse_event_dialog_class: NULL param hook pointer\n"); + return; + } + switch(p->name.s[0]) { + case 'c': + case 'C': + if ((p->name.len == 7) && + (!strncasecmp(p->name.s + 1, "all-id", 6))) { + p->type = P_CALL_ID; + h->event_dialog.call_id = p; + } + break; + + case 'f': + case 'F': + if ((p->name.len == 8) && + (!strncasecmp(p->name.s + 1, "rom-tag", 7))) { + p->type = P_FROM_TAG; + h->event_dialog.from_tag = p; + } + break; + + case 't': + case 'T': + if ((p->name.len == 6) && + (!strncasecmp(p->name.s + 1, "o-tag", 5))) { + p->type = P_TO_TAG; + h->event_dialog.to_tag = p; + } + break; + + case 'i': + case 'I': + if ((p->name.len == 27) && + (!strncasecmp(p->name.s + 1, "nclude-session-description", 26))) { + p->type = P_ISD; + h->event_dialog.include_session_description = p; + } + break; + + case 's': + case 'S': + if ((p->name.len == 3) && + (!strncasecmp(p->name.s + 1, "la", 2))) { + p->type = P_SLA; + h->event_dialog.sla = p; + } + break; + } +} + + /* * Try to find out parameter name, recognized parameters * are q, expires and method @@ -328,6 +388,7 @@ static inline void parse_param_name(str* _s, pclass_t _c, param_hooks_t* _h, par switch(_c) { case CLASS_CONTACT: parse_contact_class(_h, _p); break; case CLASS_URI: parse_uri_class(_h, _p); break; + case CLASS_EVENT_DIALOG: parse_event_dialog_class(_h, _p); break; default: break; } } @@ -545,6 +606,11 @@ static inline void print_param(FILE* _o, param_t* _p) case P_DSTPORT: type = "P_DSTPORT"; break; case P_INSTANCE: type = "P_INSTANCE"; break; case P_FTAG: type = "P_FTAG"; break; + case P_CALL_ID: type = "P_CALL_ID"; break; + case P_FROM_TAG: type = "P_FROM_TAG"; break; + case P_TO_TAG: type = "P_TO_TAG"; break; + case P_ISD: type = "P_ISD"; break; + case P_SLA: type = "P_SLA"; break; default: type = "UNKNOWN"; break; } diff --git a/parser/parse_param.h b/parser/parse_param.h index 297518c..40a529f 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -56,7 +56,12 @@ typedef enum ptype { P_DSTIP, /* URI: dstip parameter */ P_DSTPORT, /* URi: dstport parameter */ P_INSTANCE, /* Contact: sip.instance parameter */ - P_FTAG /* URI: ftag parameter */ + P_FTAG, /* URI: ftag parameter */ + P_CALL_ID, /* Dialog event package: call-id */ + P_FROM_TAG, /* Dialog event package: from-tag */ + P_TO_TAG, /* Dialog event package: to-tag */ + P_ISD, /* Dialog event package: include-session-description */ + P_SLA /* Dialog event package: sla */ } ptype_t; @@ -64,9 +69,10 @@ typedef enum ptype { * Class of parameters */ typedef enum pclass { - CLASS_ANY = 0, /* Any parameters, well-known hooks will be not used */ - CLASS_CONTACT, /* Contact parameters */ - CLASS_URI /* URI parameters */ + CLASS_ANY = 0, /* Any parameters, well-known hooks will be not used */ + CLASS_CONTACT, /* Contact parameters */ + CLASS_URI, /* URI parameters */ + CLASS_EVENT_DIALOG /* Event dialog parameters */ } pclass_t; @@ -109,12 +115,21 @@ struct uri_hooks { }; +struct event_dialog_hooks { + struct param* call_id; + struct param* from_tag; + struct param* to_tag; + struct param* include_session_description; + struct param* sla; +}; + /* * Union of hooks structures for all classes */ typedef union param_hooks { struct contact_hooks contact; /* Contact hooks */ struct uri_hooks uri; /* URI hooks */ + struct event_dialog_hooks event_dialog; } param_hooks_t; /**

1 0

git:master: Update to the refurbished event parser.
by Jan Janak 17 Mar '09

17 Mar '09

Module: sip-router Branch: master Commit: bf7bb14b806596e752226369ab82bb3a66fadf0b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf7bb14… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 17:42:05 2009 +0100 Update to the refurbished event parser. event->text has been renamed to event->name in parse_event.h --- select_core.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/select_core.c b/select_core.c index 387d0e4..7852940 100644 --- a/select_core.c +++ b/select_core.c @@ -874,7 +874,7 @@ int select_event(str* res, select_t* s, struct sip_msg* msg) return -1; } - *res = ((event_t*)msg->event->parsed)->text; + *res = ((event_t*)msg->event->parsed)->name; return 0; }

1 0

Re: [SR-Dev] [Kamailio-Users] kamailio at FFG 2009
by Henning Westerholt 17 Mar '09

17 Mar '09

On Tuesday 03 March 2009, Henning Westerholt wrote: > [..] > I'll provide the slides and eventual some notes after the talk as usual. Hi all, the event went pretty well. It was not a typical "free software conference" like for example the FOSDEM, as most of the audience were system or network administrators. The talks i visited were informative, in the evening they organised a really nice social event. My presentation is available at: http://www.kamailio.org/events/2009-FFG/presentation.pdf Cheers, Henning

1 0

Patch: remove VQ_MALLOC memory manager
by Henning Westerholt 17 Mar '09

17 Mar '09

Hi, attached patch removes the VQ_MALLOC memory manager from the sip-router core. As discussed some time ago, this memory manager don't provide a realloc implementation, and is thus not really usable for the modules, as some of them needs this. We removed this in kamailio in the last year, so far nobody missed it. Removing this memory manager is in my opinion a good cleanup, and also make the synchronisation of this MM implementations with the ones in the kamailio core easier. Cheers, Henning

1 0

git:master: Adding cases for HDR_PPI_T, HDR_PAI_T, and HDR_PATH_T
by Jan Janak 17 Mar '09

17 Mar '09

Module: sip-router Branch: master Commit: 4ad9320a7a31b41f375872e56042904069cd943c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4ad9320… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Tue Mar 17 10:24:46 2009 +0100 Adding cases for HDR_PPI_T, HDR_PAI_T, and HDR_PATH_T --- modules/tm/sip_msg.c | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index 82f4433..90a3fa1 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -487,6 +487,9 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) case HDR_DATE_T: case HDR_IDENTITY_T: case HDR_IDENTITY_INFO_T: + case HDR_PPI_T: + case HDR_PAI_T: + case HDR_PATH_T: /* we ignore them for now even if they have something parsed*/ break; }/*switch*/ @@ -874,6 +877,21 @@ struct sip_msg* sip_msg_cloner( struct sip_msg *org_msg, int *sip_msg_len ) new_msg->sipifmatch = new_hdr; } break; + case HDR_PPI_T: + if (!HOOK_SET(ppi)) { + new_msg->ppi = new_hdr; + } + break; + case HDR_PAI_T: + if (!HOOK_SET(pai)) { + new_msg->pai = new_hdr; + } + break; + case HDR_PATH_T: + if (!HOOK_SET(path)) { + new_msg->path = new_hdr; + } + break; }/*switch*/ if ( last_hdr )

1 0

git:master: Teach sip-router how to recognized Path header field name.
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: master Commit: e430fa027b632c289cd440a228f102f385d29087 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e430fa0… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 18:49:27 2009 +0100 Teach sip-router how to recognized Path header field name. --- parser/case_path.h | 41 +++++++++++++++++++++++++++++++++++++++++ parser/hf.c | 1 + parser/hf.h | 2 ++ parser/keys.h | 1 + parser/msg_parser.c | 5 +++++ parser/msg_parser.h | 1 + parser/parse_hname2.c | 2 ++ 7 files changed, 53 insertions(+), 0 deletions(-) diff --git a/parser/case_path.h b/parser/case_path.h new file mode 100644 index 0000000..5b065fc --- /dev/null +++ b/parser/case_path.h @@ -0,0 +1,41 @@ +/* + * $Id$ + * + * Path Header Field Name Parsing Macros + * + * Copyright (C) 2009 iptelorg GmbH + * + * This file is part of ser, a free SIP server. + * + * ser 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 + * + * For a license to use the ser software under conditions + * other than those described here, or to purchase support for this + * software, please contact iptel.org by e-mail at the following addresses: + * info(a)iptel.org + * + * ser 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 + */ + + +#ifndef CASE_PATH_H +#define CASE_PATH_H + + +#define path_CASE \ + hdr->type = HDR_PATH_T; \ + p += 4; \ + goto dc_end + + +#endif /* CASE_PATH_H */ diff --git a/parser/hf.c b/parser/hf.c index 594a27f..c5f7ba3 100644 --- a/parser/hf.c +++ b/parser/hf.c @@ -211,6 +211,7 @@ void clean_hdr_field(struct hdr_field* hf) case HDR_REQUESTDISPOSITION_T: case HDR_WWW_AUTHENTICATE_T: case HDR_PROXY_AUTHENTICATE_T: + case HDR_PATH_T: break; default: LOG(L_CRIT, "BUG: clean_hdr_field: unknown header type %d\n", diff --git a/parser/hf.h b/parser/hf.h index 7196833..bddf0a2 100644 --- a/parser/hf.h +++ b/parser/hf.h @@ -109,6 +109,7 @@ enum _hdr_types_t { HDR_RETRY_AFTER_T /* Retry-After header field */, HDR_PPI_T /**< P-Preferred-Identity header field */, HDR_PAI_T /**< P-Asserted-Identity header field */, + HDR_PATH_T /**< Path header field */, HDR_EOH_T /* End of message header */ }; @@ -178,6 +179,7 @@ typedef unsigned long long hdr_flags_t; #define HDR_RETRY_AFTER_F HDR_F_DEF(RETRY_AFTER) #define HDR_PPI_F HDR_F_DEF(PPI) #define HDR_PAI_F HDR_F_DEF(PAI) +#define HDR_PATH_F HDR_F_DEF(PATH) #define HDR_OTHER_F HDR_F_DEF(OTHER) diff --git a/parser/keys.h b/parser/keys.h index 92c60ce..bf17058 100644 --- a/parser/keys.h +++ b/parser/keys.h @@ -108,6 +108,7 @@ #define _iden_ 0x6e656469 /* "iden" */ #define _tity_ 0x79746974 /* "tity" */ #define _info_ 0x6f666e69 /* "info" */ +#define _path_ 0x68746170 /* "path" */ #define _pt_l_ 0x6c2d7470 /* "pt-l" */ #define _angu_ 0x75676e61 /* "angu" */ diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 5cfbd7c..cad8028 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -241,6 +241,7 @@ char* get_hdr_field(char* buf, char* end, struct hdr_field* hdr) case HDR_REQUESTDISPOSITION_T: case HDR_WWW_AUTHENTICATE_T: case HDR_PROXY_AUTHENTICATE_T: + case HDR_PATH_T: case HDR_OTHER_T: /* just skip over it */ hdr->body.s=tmp; @@ -516,6 +517,10 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next) if (msg->identity_info==0) msg->identity_info=hf; msg->parsed_flag|=HDR_IDENTITY_INFO_F; break; + case HDR_PATH_T: + if (msg->path==0) msg->path=hf; + msg->parsed_flag|=HDR_PATH_F; + break; default: LOG(L_CRIT, "BUG: parse_headers: unknown header type %d\n", hf->type); diff --git a/parser/msg_parser.h b/parser/msg_parser.h index 4b18ed5..48790c9 100644 --- a/parser/msg_parser.h +++ b/parser/msg_parser.h @@ -257,6 +257,7 @@ typedef struct sip_msg { struct hdr_field* identity_info; struct hdr_field* pai; struct hdr_field* ppi; + struct hdr_field* path; char* eoh; /* pointer to the end of header (if found) or null */ char* unparsed; /* here we stopped parsing*/ diff --git a/parser/parse_hname2.c b/parser/parse_hname2.c index 6b8e159..a222d5e 100644 --- a/parser/parse_hname2.c +++ b/parser/parse_hname2.c @@ -98,6 +98,7 @@ static inline char* skip_ws(char* p, unsigned int size) #include "case_date.h" /* Date */ #include "case_iden.h" /* Identity, Identity-info */ #include "case_retr.h" /* Retry-After */ +#include "case_path.h" /* Path */ #define READ(val) \ @@ -143,6 +144,7 @@ static inline char* skip_ws(char* p, unsigned int size) case _date_: date_CASE; \ case _iden_: iden_CASE; \ case _retr_: retr_CASE; \ + case _path_: path_CASE;

1 0

git:master: Include dlfcn.h for RTLD_NOW and friends.
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: master Commit: feef2d2e0bdbc5232138e0308e8e1cd9daf0a4ab URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=feef2d2… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 16:54:44 2009 +0100 Include dlfcn.h for RTLD_NOW and friends. There is a test in sr_module.h which tests whether the macro RTLD_NOW is defined and defines it to DL_LAZY if not. The header file did not include dlfcn.h which defines the macro RTLD_NOW, so as a result it was always re-defined to DL_LAZY. --- sr_module.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/sr_module.h b/sr_module.h index 0078f25..bdf64de 100644 --- a/sr_module.h +++ b/sr_module.h @@ -58,6 +58,8 @@ #ifndef sr_module_h #define sr_module_h +#include <dlfcn.h> + #include "parser/msg_parser.h" /* for sip_msg */ #include "version.h" #include "rpc.h"

1 0

regexp.[ch]
by Ovidiu Sas 16 Mar '09

16 Mar '09

regexp.[ch] needs to be imported from k core into lib/kcore and the following patch should be applied: --- ../../../kam-trunk/regexp.h 2009-03-09 19:41:18.000000000 -0400 +++ regexp.h 2009-03-14 14:16:02.000000000 -0400 @@ -32,7 +32,7 @@ #ifndef REGEXP_H #define REGEXP_H -#include "str.h" +#include "../../str.h" #define MAX_MATCH 6 --- ../../../kam-trunk/regexp.c 2009-03-09 19:41:18.000000000 -0400 +++ regexp.c 2009-03-14 14:16:29.000000000 -0400 @@ -33,7 +33,7 @@ #include <regex.h> #include <ctype.h> #include "regexp.h" -#include "dprint.h" +#include "../../dprint.h" /*! \brief Replace in replacement tokens \\d with substrings of string pointed by * pmatch. After that, the following patch should be applied to get one step further in compiling domainpolicy and enum modules: $ git diff diff --git a/modules/domainpolicy/domainpolicy.c b/modules/domainpolicy/domainpolicy.c index 3d7ace5..ed7997f 100644 --- a/modules/domainpolicy/domainpolicy.c +++ b/modules/domainpolicy/domainpolicy.c @@ -46,7 +46,7 @@ #include "../../socket_info.h" #include "../../resolve.h" -#include "../../regexp.h" +#include "../../lib/kcore/regexp.h" #define IS_D2PNAPTR(naptr) ((naptr->services_len >= 7) && (!strncasecmp("D2P+SIP", naptr->services, 7))) diff --git a/modules/enum/enum.c b/modules/enum/enum.c index 486a049..b3f446c 100644 --- a/modules/enum/enum.c +++ b/modules/enum/enum.c @@ -34,7 +34,7 @@ #include "../../dset.h" #include "../../qvalue.h" #include "enum_mod.h" -#include "../../regexp.h" +#include "../../lib/kcore/regexp.h" #include "../../pvar.h" /* Regards, Ovidiu Sas

2 1

git:janakj/kcore: Fix paths to header files in the sr core.
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 9edd0fd57e763081f096cfc4fb41922acaeed173 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9edd0fd… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 15:25:06 2009 +0100 Fix paths to header files in the sr core. --- lib/kcore/regexp.c | 2 +- lib/kcore/regexp.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/kcore/regexp.c b/lib/kcore/regexp.c index da724ca..a4766e1 100644 --- a/lib/kcore/regexp.c +++ b/lib/kcore/regexp.c @@ -33,7 +33,7 @@ #include <regex.h> #include <ctype.h> #include "regexp.h" -#include "dprint.h" +#include "../../dprint.h" /*! \brief Replace in replacement tokens \\d with substrings of string pointed by * pmatch. diff --git a/lib/kcore/regexp.h b/lib/kcore/regexp.h index e63ed60..0c013a1 100644 --- a/lib/kcore/regexp.h +++ b/lib/kcore/regexp.h @@ -32,7 +32,7 @@ #ifndef REGEXP_H #define REGEXP_H -#include "str.h" +#include "../../str.h" #define MAX_MATCH 6

1 0

git:janakj/kcore: Adding files regexp.[ch] from kamailio core
by Jan Janak 16 Mar '09

16 Mar '09

Module: sip-router Branch: janakj/kcore Commit: 301e4abff0ac546969eaa6b26b97574883fcba08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=301e4ab… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Mon Mar 16 15:23:26 2009 +0100 Adding files regexp.[ch] from kamailio core --- lib/kcore/regexp.c | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++ lib/kcore/regexp.h | 41 +++++++++++++++++ 2 files changed, 163 insertions(+), 0 deletions(-) diff --git a/lib/kcore/regexp.c b/lib/kcore/regexp.c new file mode 100644 index 0000000..da724ca --- /dev/null +++ b/lib/kcore/regexp.c @@ -0,0 +1,122 @@ +/* + * $Id$ + * + * Regular expression functions + * + * Copyright (C) 2003 Juha Heinanen + * + * 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 Regular Expression functions + */ + +#include <sys/types.h> +#include <string.h> +#include <regex.h> +#include <ctype.h> +#include "regexp.h" +#include "dprint.h" + +/*! \brief Replace in replacement tokens \\d with substrings of string pointed by + * pmatch. + */ +int replace(regmatch_t* pmatch, char* string, char* replacement, str* result) +{ + int len, i, j, digit, size; + + len = strlen(replacement); + j = 0; + + for (i = 0; i < len; i++) { + if (replacement[i] == '\\') { + if (i < len - 1) { + if (isdigit((unsigned char)replacement[i+1])) { + digit = replacement[i+1] - '0'; + if (pmatch[digit].rm_so != -1) { + size = pmatch[digit].rm_eo - pmatch[digit].rm_so; + if (j + size < result->len) { + memcpy(&(result->s[j]), string+pmatch[digit].rm_so, size); + j = j + size; + } else { + return -1; + } + } else { + return -2; + } + i = i + 1; + continue; + } else { + i = i + 1; + } + } else { + return -3; + } + } + if (j + 1 < result->len) { + result->s[j] = replacement[i]; + j = j + 1; + } else { + return -4; + } + } + result->len = j; + return 1; +} + + +/*! \brief Match pattern against string and store result in pmatch */ +int reg_match(char *pattern, char *string, regmatch_t *pmatch) +{ + regex_t preg; + + if (regcomp(&preg, pattern, REG_EXTENDED | REG_NEWLINE)) { + return -1; + } + if (preg.re_nsub > MAX_MATCH) { + regfree(&preg); + return -2; + } + if (regexec(&preg, string, MAX_MATCH, pmatch, 0)) { + regfree(&preg); + return -3; + } + regfree(&preg); + return 0; +} + + +/*! \brief Match pattern against string and, if match succeeds, and replace string + * with replacement substituting tokens \\d with matched substrings. + */ +int reg_replace(char *pattern, char *replacement, char *string, str *result) +{ + regmatch_t pmatch[MAX_MATCH]; + + LM_DBG("pattern: '%s', replacement: '%s', string: '%s'\n", + pattern, replacement, string); + + if (reg_match(pattern, string, &(pmatch[0]))) { + return -1; + } + + return replace(&pmatch[0], string, replacement, result); + +} diff --git a/lib/kcore/regexp.h b/lib/kcore/regexp.h new file mode 100644 index 0000000..e63ed60 --- /dev/null +++ b/lib/kcore/regexp.h @@ -0,0 +1,41 @@ +/* + * $Id$ + * + * Regular expression definitions + * + * Copyright (C) 2003 Juha Heinanen + * + * 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 Regular expression definitions + */ + + +#ifndef REGEXP_H +#define REGEXP_H + +#include "str.h" + +#define MAX_MATCH 6 + +extern int reg_replace(char *pattern, char *replacement, char *string, str *result); + +#endif

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2009