sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:bf9d697c: async: free var in case of fixup error
by Daniel-Constantin Mierla 09 Jul '17

09 Jul '17

Module: kamailio Branch: master Commit: bf9d697c31ad2c7614aa37997c4772df8e8d25a7 URL: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-09T10:01:17+02:00 async: free var in case of fixup error --- Modified: src/modules/async/async_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… Patch: https://github.com/kamailio/kamailio/commit/bf9d697c31ad2c7614aa37997c4772d… --- diff --git a/src/modules/async/async_mod.c b/src/modules/async/async_mod.c index c781753042..90588f1d12 100644 --- a/src/modules/async/async_mod.c +++ b/src/modules/async/async_mod.c @@ -194,8 +194,10 @@ static int fixup_async_sleep(void **param, int param_no) } memset(ap, 0, sizeof(async_param_t)); ap->u.paction = get_action_from_param(param, param_no); - if(fixup_igp_null(param, param_no) < 0) + if(fixup_igp_null(param, param_no) < 0) { + pkg_free(ap); return -1; + } ap->pinterval = (gparam_t *)(*param); *param = (void *)ap; return 0;

1 0

git:master:3cbae684: usrloc: rpc flush to return error in case of failure
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 3cbae6841c80de89fc7c72b73c1695e3788c1819 URL: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 usrloc: rpc flush to return error in case of failure --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… Patch: https://github.com/kamailio/kamailio/commit/3cbae6841c80de89fc7c72b73c1695e… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 35f78e95e2..bace4885e1 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -545,7 +545,9 @@ static const char* ul_rpc_rm_contact_doc[2] = { static void ul_rpc_flush(rpc_t* rpc, void* ctx) { - synchronize_all_udomains(0, 1); + if(synchronize_all_udomains(0, 1) != 0) { + rpc->fault(ctx, 500, "Operation failed"); + } return; }

1 0

git:master:b28e2943: registrar: free var in case of pv name error
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: b28e2943b8d171628f81057a352507b2a56b91a4 URL: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 registrar: free var in case of pv name error --- Modified: src/modules/registrar/regpv.c --- Diff: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… Patch: https://github.com/kamailio/kamailio/commit/b28e2943b8d171628f81057a352507b… --- diff --git a/src/modules/registrar/regpv.c b/src/modules/registrar/regpv.c index 35bdd74e78..ad82262a04 100644 --- a/src/modules/registrar/regpv.c +++ b/src/modules/registrar/regpv.c @@ -288,8 +288,8 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) { str pn; str pa; - regpv_name_t *rp; - regpv_profile_t *rpp; + regpv_name_t *rp = NULL; + regpv_profile_t *rpp = NULL; if(sp==NULL || in==NULL || in->len<=0) return -1; @@ -414,6 +414,7 @@ int pv_parse_ulc_name(pv_spec_p sp, str *in) return 0; error: + if(rp) pkg_free(rp); LM_ERR("unknown contact attr name in %.*s\n", in->len, in->s); return -1; }

1 0

git:master:070057a5: auth_db: small reorder to do the check before accessing the fields
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 070057a5d66e2f5dd4bcf90d96f8f8ceeca3a433 URL: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 auth_db: small reorder to do the check before accessing the fields --- Modified: src/modules/auth_db/authorize.c --- Diff: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… Patch: https://github.com/kamailio/kamailio/commit/070057a5d66e2f5dd4bcf90d96f8f8c… --- diff --git a/src/modules/auth_db/authorize.c b/src/modules/auth_db/authorize.c index b291cf8f56..4de0956cac 100644 --- a/src/modules/auth_db/authorize.c +++ b/src/modules/auth_db/authorize.c @@ -91,7 +91,8 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl return -1; } - if (auth_dbf.query(auth_db_handle, keys, 0, vals, col, n, nc, 0, &res) < 0) { + if (auth_dbf.query(auth_db_handle, keys, 0, vals, col, n, nc, 0, &res) < 0 + || res==NULL) { LM_ERR("failed to query database\n"); pkg_free(col); if(res) @@ -100,8 +101,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } pkg_free(col); if (RES_ROW_N(res) == 0) { - if(res) - auth_dbf.free_result(auth_db_handle, res); + auth_dbf.free_result(auth_db_handle, res); LM_DBG("no result for user \'%.*s%s%.*s\' in [%.*s]\n", user->len, user->s, (n==2)?"@":"", (n==2)?domain->len:0, (n==2)?domain->s:"", @@ -114,8 +114,7 @@ int fetch_credentials(sip_msg_t *msg, str *user, str* domain, str *table, int fl } for (cred=credentials, n=0; cred; cred=cred->next, n++) { if (db_val2pv_spec(msg, &RES_ROWS(res)[0].values[n], cred->spec) != 0) { - if(res) - auth_dbf.free_result(auth_db_handle, res); + auth_dbf.free_result(auth_db_handle, res); LM_ERR("Failed to convert value for column %.*s\n", RES_NAMES(res)[n]->len, RES_NAMES(res)[n]->s); return -3; @@ -542,11 +541,16 @@ int w_auth_check(sip_msg_t *_m, char* _realm, char* _table, char *_flags) str stable; int iflags; + if(_m==NULL) { + LM_ERR("invalid msg parameter\n"); + return AUTH_ERROR; + } + if ((_m->REQ_METHOD == METHOD_ACK) || (_m->REQ_METHOD == METHOD_CANCEL)) { return AUTH_OK; } - if(_m==NULL || _realm==NULL || _table==NULL || _flags==NULL) { + if(_realm==NULL || _table==NULL || _flags==NULL) { LM_ERR("invalid parameters\n"); return AUTH_ERROR; }

1 0

git:master:5530fe31: lib: dtrie - removed duplicate check for same value
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: 5530fe31fe89a4dfe9e17cbe56c0cd83cb8f45ab URL: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 lib: dtrie - removed duplicate check for same value --- Modified: src/lib/trie/dtrie.c --- Diff: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… Patch: https://github.com/kamailio/kamailio/commit/5530fe31fe89a4dfe9e17cbe56c0cd8… --- diff --git a/src/lib/trie/dtrie.c b/src/lib/trie/dtrie.c index 3ec65074af..ab3682e2a1 100644 --- a/src/lib/trie/dtrie.c +++ b/src/lib/trie/dtrie.c @@ -100,7 +100,8 @@ void dtrie_delete(struct dtrie_node_t *root, struct dtrie_node_t *node, } -void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, const unsigned int branches) +void dtrie_destroy(struct dtrie_node_t **root, dt_delete_func_t delete_payload, + const unsigned int branches) { if ((root!=NULL) && (*root!=NULL)) { dtrie_delete(*root, *root, delete_payload, branches); @@ -119,13 +120,13 @@ void dtrie_clear(struct dtrie_node_t *root, dt_delete_func_t delete_payload, } -int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned int numberlen, +int dtrie_insert(struct dtrie_node_t *root, const char *number, + const unsigned int numberlen, void *data, const unsigned int branches) { struct dtrie_node_t *node = root; unsigned char digit, i=0; - if (node == NULL) return -1; if (root == NULL) return -1; if (number == NULL) return -1; @@ -151,7 +152,9 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i return -1; } - LM_DBG("allocate %lu bytes for node at %p\n", (long unsigned)sizeof(struct dtrie_node_t), node->child[digit]); + LM_DBG("allocate %lu bytes for node at %p\n", + (long unsigned)sizeof(struct dtrie_node_t), + node->child[digit]); memset(node->child[digit], 0, sizeof(struct dtrie_node_t)); node->child[digit]->child = shm_malloc(sizeof(struct dtrie_node_t *) * branches); @@ -174,7 +177,8 @@ int dtrie_insert(struct dtrie_node_t *root, const char *number, const unsigned i } -unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_size(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0; @@ -188,7 +192,8 @@ unsigned int dtrie_size(const struct dtrie_node_t *root, const unsigned int bran } -unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0; @@ -204,7 +209,8 @@ unsigned int dtrie_loaded_nodes(const struct dtrie_node_t *root, const unsigned } -unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int branches) +unsigned int dtrie_leaves(const struct dtrie_node_t *root, + const unsigned int branches) { unsigned int i, sum = 0, leaf = 1; @@ -222,13 +228,13 @@ unsigned int dtrie_leaves(const struct dtrie_node_t *root, const unsigned int br void **dtrie_longest_match(struct dtrie_node_t *root, const char *number, - const unsigned int numberlen, int *nmatchptr, const unsigned int branches) + const unsigned int numberlen, int *nmatchptr, + const unsigned int branches) { struct dtrie_node_t *node = root; unsigned char digit, i = 0; void **ret = NULL; - if (node == NULL) return NULL; if (root == NULL) return NULL; if (number == NULL) return NULL;

1 0

git:master:f401938a: acc: free parameter in acc fixup in case of error
by Daniel-Constantin Mierla 08 Jul '17

08 Jul '17

Module: kamailio Branch: master Commit: f401938a4f5a5b6eb1089b2c85372a69f07ce777 URL: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-08T09:48:35+02:00 acc: free parameter in acc fixup in case of error --- Modified: src/modules/acc/acc_logic.c Modified: src/modules/acc/acc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… Patch: https://github.com/kamailio/kamailio/commit/f401938a4f5a5b6eb1089b2c85372a6… --- diff --git a/src/modules/acc/acc_logic.c b/src/modules/acc/acc_logic.c index 02de9f4cf3..bb3b05b5cb 100644 --- a/src/modules/acc/acc_logic.c +++ b/src/modules/acc/acc_logic.c @@ -391,26 +391,26 @@ static inline int should_acc_reply(struct sip_msg *req, struct sip_msg *rpl, { unsigned int i; - /* negative transactions reported otherwise only if explicitly + /* negative transactions reported otherwise only if explicitly * demanded */ if (code >= 300) { - if (!is_failed_acc_on(req)) return 0; - i = 0; - while (failed_filter[i] != 0) { - if (failed_filter[i] == code) return 0; - i++; - } - return 1; + if (!is_failed_acc_on(req)) return 0; + i = 0; + while (failed_filter[i] != 0) { + if (failed_filter[i] == code) return 0; + i++; + } + return 1; } if ( !is_acc_on(req) ) - return 0; - + return 0; + if ( code<200 && !(early_media && parse_headers(rpl,HDR_CONTENTLENGTH_F, 0) == 0 && rpl->content_length && get_content_length(rpl) > 0)) - return 0; + return 0; return 1; /* seed is through, we will account this reply */ } @@ -424,8 +424,10 @@ static inline void acc_onreply_in(struct cell *t, struct sip_msg *req, /* don't parse replies in which we are not interested */ /* missed calls enabled ? */ if ( (reply && reply!=FAKED_REPLY) && (should_acc_reply(req,reply,code) - || (is_invite(t) && code>=300 && is_mc_on(req))) ) { - parse_headers(reply, HDR_TO_F, 0 ); + || (is_invite(t) && code>=300 && is_mc_on(req))) ) { + if(parse_headers(reply, HDR_TO_F, 0)<0) { + LM_ERR("failed to parse headers\n"); + } } } @@ -463,7 +465,7 @@ static inline void on_missed(struct cell *t, struct sip_msg *req, /* we report on missed calls when the first * forwarding attempt fails; we do not wish to - * report on every attempt; so we clear the flags; + * report on every attempt; so we clear the flags; */ if (is_log_mc_on(req)) { @@ -684,4 +686,4 @@ static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ) } else if (type&TMCB_RESPONSE_IN) { acc_onreply_in( t, ps->req, ps->rpl, ps->code); } -} \ No newline at end of file +} diff --git a/src/modules/acc/acc_mod.c b/src/modules/acc/acc_mod.c index 6665446843..f0582b2315 100644 --- a/src/modules/acc/acc_mod.c +++ b/src/modules/acc/acc_mod.c @@ -313,16 +313,17 @@ static int acc_fixup(void** param, int param_no) if (strchr(p,PV_MARKER)!=NULL) { /* is a variable $xxxxx */ if (pv_parse_format(&accp->reason, &accp->elem)<0) { - LM_ERR("bad param 1; " - "parse format error [%.*s]\n", accp->reason.len, accp->reason.s); + LM_ERR("bad param 1 - parse format error [%.*s]\n", + accp->reason.len, accp->reason.s); + pkg_free(accp); return E_UNSPEC; } } else { if(acc_parse_code(p,accp)<0) { - LM_ERR("bad param 1;" - "parse code error\n"); + LM_ERR("bad param 1 - parse code error\n"); + pkg_free(accp); return E_UNSPEC; } } @@ -810,4 +811,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_acc_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:f632b879: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: f632b879272e6db24d83f0c0881d8708a7aecfc7 URL: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-07T14:16:23+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870… Patch: https://github.com/kamailio/kamailio/commit/f632b879272e6db24d83f0c0881d870…

1 0

git:master:c593d749: textops: documentation for remove_hf_exp(...)
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: c593d7492ddb957a862dd31b5ce9e09fdf54a8e5 URL: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:10:04+02:00 textops: documentation for remove_hf_exp(...) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… Patch: https://github.com/kamailio/kamailio/commit/c593d7492ddb957a862dd31b5ce9e09… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 539697fced..68b3676703 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -10,9 +10,9 @@  <chapter> - + <title>&adminguide;</title> - + <section> <title>Overview</title> <para> @@ -32,11 +32,11 @@ processing in &kamailio; script. </para> <para> - Search ignores folded lines. For example, + Search ignores folded lines. For example, search(<quote>(From|f):.*@foo.bar</quote>) doesn't match the following From header field: <programlisting format="linespecific"> -From: medabeda +From: medabeda <sip:medameda@foo.bar>;tag=1234 </programlisting> </para> @@ -1154,8 +1154,7 @@ remove_hf("m") </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, - FAILURE_ROUTE and BRANCH_ROUTE. + This function can be used from ANY_ROUTE. </para> <example> <title><function>remove_hf_re</function> usage</title> @@ -1170,6 +1169,48 @@ if(remove_hf_re("^P-")) </example> </section> + <section id="textops.f.remove_hf_exp"> + <title> + <function moreinfo="none">remove_hf_exp(expmatch, expskip)</function> + </title> + <para> + Remove from message all headers with name matching regular + expression <quote>expmatch</quote>, but not matching regular + expression <quote>expskip</quote>. + </para> + <para> + Returns true if at least one header is found and removed. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>expmatch</emphasis> - regular expression to match + the header name to be removed. + </para> + </listitem> + <listitem> + <para><emphasis>expskip</emphasis> - regular expression to match + the header name to be skipped from removal. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>remove_hf_exp</function> usage</title> + <programlisting format="linespecific"> +... +if(remove_hf_exp("^P-", "^P-Keep-")) +{ + # All headers starting with "P-" removed, + # except the ones starting with "P-Keep-" +} +... +</programlisting> + </example> + </section> + <section id="textops.f.has_body"> <title> <function moreinfo="none">has_body()</function>, @@ -1177,7 +1218,7 @@ if(remove_hf_re("^P-")) </title> <para> The function returns <emphasis>true</emphasis> if the SIP message - has a body attached. The checked includes also the + has a body attached. The checked includes also the <quote>Content-Length</quote> header presence and value. </para> <para> @@ -1187,7 +1228,7 @@ if(remove_hf_re("^P-")) <para>Meaning of the parameters is as follows:</para> <itemizedlist> <listitem> - <para><emphasis>mime</emphasis> - mime to be checked against the + <para><emphasis>mime</emphasis> - mime to be checked against the <quote>Content-Type</quote> header. If not present or 0, this check will be disabled. </para>

1 0

git:master:d7972d83: textops: new function remove_hf_exp(match, skip)
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: d7972d83b3f12f64d4f70d8e6eacb88ec34648f1 URL: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:52+02:00 textops: new function remove_hf_exp(match, skip) - remove header fields that do not match regex ''skip', but match regex 'match' --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… Patch: https://github.com/kamailio/kamailio/commit/d7972d83b3f12f64d4f70d8e6eacb88… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index cd116a8fe9..cd32f0074a 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -129,6 +129,7 @@ static int cmp_str_f(struct sip_msg *msg, char *str1, char *str2 ); static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); +static int remove_hf_exp_f(sip_msg_t* msg, char* ematch, char* eskip); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ); static int fixup_substre(void**, int); @@ -207,6 +208,9 @@ static cmd_export_t cmds[]={ {"remove_hf_re", (cmd_function)remove_hf_re_f, 1, fixup_regexp_null, fixup_free_regexp_null, ANY_ROUTE}, + {"remove_hf_exp", (cmd_function)remove_hf_exp_f, 1, + fixup_regexp_regexp, fixup_free_regexp_regexp, + ANY_ROUTE}, {"is_present_hf", (cmd_function)is_present_hf_f, 1, hname_fixup, free_hname_fixup, ANY_ROUTE}, @@ -1052,16 +1056,14 @@ int remove_hf_f(struct sip_msg* msg, char* str_hf, char* foo) return cnt==0 ? -1 : 1; } -static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +static int remove_hf_re(sip_msg_t* msg, regex_t *re) { struct hdr_field *hf; struct lump* l; int cnt; - regex_t *re; char c; regmatch_t pmatch; - re = (regex_t*)key; cnt=0; /* we need to be sure we have seen all HFs */ @@ -1091,6 +1093,59 @@ static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) return cnt==0 ? -1 : 1; } +static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo) +{ + return remove_hf_re(msg, (regex_t*)key); +} + +static int remove_hf_exp_re(sip_msg_t* msg, regex_t *mre, regex_t *sre) +{ + struct hdr_field *hf; + struct lump* l; + int cnt; + char c; + regmatch_t pmatch; + + cnt=0; + + /* we need to be sure we have seen all HFs */ + if(parse_headers(msg, HDR_EOH_F, 0)<0) { + LM_ERR("error while parsing message headers\n"); + return -1; + } + + for (hf=msg->headers; hf; hf=hf->next) + { + c = hf->name.s[hf->name.len]; + hf->name.s[hf->name.len] = '\0'; + if (regexec(sre, hf->name.s, 1, &pmatch, 0)==0) + { + hf->name.s[hf->name.len] = c; + continue; + } + if (regexec(mre, hf->name.s, 1, &pmatch, 0)!=0) + { + hf->name.s[hf->name.len] = c; + continue; + } + hf->name.s[hf->name.len] = c; + l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); + if (l==0) + { + LM_ERR("cannot remove header\n"); + return -1; + } + cnt++; + } + + return cnt==0 ? -1 : 1; +} + +static int remove_hf_exp_f(struct sip_msg* msg, char* ematch, char* eskip) +{ + return remove_hf_exp_re(msg, (regex_t*)ematch, (regex_t*)eskip); +} + static int is_present_hf_helper_f(struct sip_msg* msg, gparam_t* gp) { struct hdr_field *hf;

1 0

git:master:85136705: core: fixup helper function for two regex parameters
by Daniel-Constantin Mierla 07 Jul '17

07 Jul '17

Module: kamailio Branch: master Commit: 851367053d6b4d64161a50fa7408d0dd750922d5 URL: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-07T14:03:29+02:00 core: fixup helper function for two regex parameters --- Modified: src/core/mod_fix.c Modified: src/core/mod_fix.h --- Diff: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… Patch: https://github.com/kamailio/kamailio/commit/851367053d6b4d64161a50fa7408d0d… --- diff --git a/src/core/mod_fix.c b/src/core/mod_fix.c index 4fd0fa4ca7..d817b75565 100644 --- a/src/core/mod_fix.c +++ b/src/core/mod_fix.c @@ -207,7 +207,7 @@ struct regex_fixup { int fixup_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if ((re=pkg_malloc(sizeof(*re))) ==0) { @@ -226,11 +226,15 @@ int fixup_regexp_null(void** param, int param_no) return E_UNSPEC; } +int fixup_regexp_regexp(void** param, int param_no) +{ + return fixup_regexp_null(param, 1); +} int fixup_free_regexp_null(void** param, int param_no) { struct regex_fixup* re; - + if (param_no != 1) return E_UNSPEC; if (*param) { @@ -242,6 +246,11 @@ int fixup_free_regexp_null(void** param, int param_no) return 0; } +int fixup_free_regexp_regexp(void** param, int param_no) +{ + return fixup_free_regexp_null(param, 1); +} + /* fixup_pvar_*() has to be written "by hand", since it needs to save the original pointer (the fixup users expects a pointer to the pv_spec_t in *param and hence the original value @@ -638,4 +647,4 @@ int fixup_free_spve_pvar(void** param, int param_no) if(param_no==2) return fixup_free_pvar_null(param, 1); return E_UNSPEC; -} \ No newline at end of file +} diff --git a/src/core/mod_fix.h b/src/core/mod_fix.h index a8388ee84d..835342ab86 100644 --- a/src/core/mod_fix.h +++ b/src/core/mod_fix.h @@ -1,4 +1,4 @@ -/* +/* * Copyright (C) 2008 iptelorg GmbH * * Permission to use, copy, modify, and distribute this software for any @@ -36,7 +36,7 @@ /** * generic parameter that holds a string, an int, a pseudo-variable * or a ser select, avp, or subst. - * + * * Note: used only for compatibility with existing kamailio code, * please use fparam_t directly in the future. * @@ -86,13 +86,8 @@ int fixup_uint_uint(void** param, int param_no); int fixup_regexp_null(void** param, int param_no); int fixup_free_regexp_null(void** param, int param_no); -#if 0 -int fixup_regexp_none(void** param, int param_no); -int fixup_free_regexp_none(void** param, int param_no); -/* not implemened yet */ -int fixup_regexpNL_null(void** param, int param_no); -int fixup_regexpNL_none(void** param, int param_no); -#endif +int fixup_regexp_regexp(void** param, int param_no); +int fixup_free_regexp_regexp(void** param, int param_no); int fixup_pvar_null(void **param, int param_no); int fixup_free_pvar_null(void** param, int param_no);

1 0

← Newer
1
...
32
33
34
35
36
37
38
...
41
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017