[sr-dev] git:master:9d5c7509: ims_isc: Allow Regex in RURI-Field

Module: kamailio Branch: master Commit: 9d5c7509cb5aadea98bfcabbd70f17668fc34a58 URL: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-03-22T22:54:30+01:00 ims_isc: Allow Regex in RURI-Field --- Modified: src/modules/ims_isc/checker.c --- Diff: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… Patch: https://github.com/kamailio/kamailio/commit/9d5c7509cb5aadea98bfcabbd70f176… --- diff --git a/src/modules/ims_isc/checker.c b/src/modules/ims_isc/checker.c index dd927c6..4461182 100644 --- a/src/modules/ims_isc/checker.c +++ b/src/modules/ims_isc/checker.c @@ -182,6 +182,40 @@ static int isc_check_session_desc(ims_spt *spt, struct sip_msg *msg) { } /** + * Check if a Service Point Trigger for RURI matches the RURI of a message + * @param spt - the service point trigger + * @param msg - the message + * @returns - 1 on success, 0 on failure + */ +static int isc_check_ruri(ims_spt *spt, struct sip_msg *msg) { + char buf[256]; + regex_t comp; + + if (spt->request_uri.len >= sizeof(buf)) { + LM_ERR("RURI \"%.*s\" is to long to be processed (max %d bytes)\n", spt->request_uri.len, spt->request_uri.s, (int) (sizeof(buf) - 1)); + return FALSE; + } + + /* compile the regex for content */ + memcpy(buf, spt->request_uri.s, spt->request_uri.len); + buf[spt->request_uri.len] = 0; + if(regcomp(&(comp), buf, REG_ICASE | REG_EXTENDED) != 0) { + LM_ERR("Error compiling the following regexp for RURI content: %.*s\n", spt->request_uri.len, spt->request_uri.s); + return FALSE; + } + + if (regexec(&(comp), buf, 0, NULL, 0) == 0) //regex match + { + regfree(&(comp)); + return TRUE; + } + regfree(&(comp)); + return FALSE; +} + + + +/** * Check if a Service Point Trigger matches a message * @param spt - the service point trigger * @param msg - the message @@ -198,8 +232,7 @@ static int isc_check_spt(ims_spt *spt, struct sip_msg *msg, char direction, spt->type, spt->request_uri.len, spt->request_uri.s); LM_DBG("ifc_check_spt: Found Request URI %.*s \n", msg->first_line.u.request.uri.len, msg->first_line.u.request.uri.s); - r = (strncasecmp(spt->request_uri.s, msg->first_line.u.request.uri.s, - spt->request_uri.len) == 0); + r = isc_check_ruri(spt, msg); break; case IFC_METHOD: LM_DBG("ifc_check_spt: SPT type %d -> Method == %.*s ?\n",