sr-dev October 2015

sr-dev@lists.kamailio.org

28 participants
236 discussions

git:master:16c2fcb3: acc: add acc_prepare_always parameter

by Victor Seva

Module: kamailio Branch: master Commit: 16c2fcb34d315963c153e9a5f2961563567d19f0 URL: https://github.com/kamailio/kamailio/commit/16c2fcb34d315963c153e9a5f296156… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2015-10-05T15:26:38+02:00 acc: add acc_prepare_always parameter This will force the preparation of the request no matter if the acc_prepare_flag is set at the moment of the transaction creation --- Modified: modules/acc/acc_logic.c Modified: modules/acc/acc_mod.c Modified: modules/acc/acc_mod.h Modified: modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/16c2fcb34d315963c153e9a5f296156… Patch: https://github.com/kamailio/kamailio/commit/16c2fcb34d315963c153e9a5f296156… --- diff --git a/modules/acc/acc_logic.c b/modules/acc/acc_logic.c index 16a97e5..0d453a7 100644 --- a/modules/acc/acc_logic.c +++ b/modules/acc/acc_logic.c @@ -102,7 +102,7 @@ struct acc_enviroment acc_env; (((_rq)->REQ_METHOD==METHOD_CANCEL) && report_cancels==0) #define is_acc_prepare_on(_rq) \ - (is_acc_flag_set(_rq,acc_prepare_flag)) + (acc_prepare_always || is_acc_flag_set(_rq,acc_prepare_flag)) static void tmcb_func( struct cell* t, int type, struct tmcb_params *ps ); diff --git a/modules/acc/acc_mod.c b/modules/acc/acc_mod.c index 91b47d0..d412dbf 100644 --- a/modules/acc/acc_mod.c +++ b/modules/acc/acc_mod.c @@ -108,6 +108,7 @@ static char *failed_filter_str = 0; /* by default, do not filter logging of unsigned short failed_filter[MAX_FAILED_FILTER_COUNT + 1]; static char* leg_info_str = 0; /*!< multi call-leg support */ struct acc_extra *leg_info = 0; +int acc_prepare_always = 0; /* prepare the request always for later acc */ int acc_prepare_flag = -1; /*!< should the request be prepared for later acc */ char *acc_time_format = "%Y-%m-%d %H:%M:%S"; int reason_from_hf = 0; /*!< assign reason from reason hf if present */ @@ -262,6 +263,7 @@ static param_export_t params[] = { {"multi_leg_info", PARAM_STRING, &leg_info_str }, {"detect_direction", INT_PARAM, &detect_direction }, {"acc_prepare_flag", INT_PARAM, &acc_prepare_flag }, + {"acc_prepare_always", INT_PARAM, &acc_prepare_always }, {"reason_from_hf", INT_PARAM, &reason_from_hf }, /* syslog specific */ {"log_flag", INT_PARAM, &log_flag }, diff --git a/modules/acc/acc_mod.h b/modules/acc/acc_mod.h index c746ffb..055ac61 100644 --- a/modules/acc/acc_mod.h +++ b/modules/acc/acc_mod.h @@ -103,5 +103,6 @@ extern int acc_time_mode; extern str acc_time_attr; extern str acc_time_exten; +extern int acc_prepare_always; #endif diff --git a/modules/acc/doc/acc_admin.xml b/modules/acc/doc/acc_admin.xml index fbe7dc3..c047873 100644 --- a/modules/acc/doc/acc_admin.xml +++ b/modules/acc/doc/acc_admin.xml @@ -624,7 +624,7 @@ modparam("acc", "detect_direction", 1) later, with flags set in TM module specific routes (e.g., like failure_route). If this flag is not set and acc or missed_call flag are not set either in request route block, there is no way to mark the - request for transaction later. If either acc or missed_call flags are + request for transaction later unless you set acc_prepare_always. If either acc or missed_call flags are set in request route block, there is no need to set this flag. </para> <para> @@ -639,6 +639,23 @@ modparam("acc", "acc_prepare_flag", 5) </programlisting> </example> </section> + <section id="acc.p.acc_prepare_always"> + <title><varname>acc_prepare_always</varname> (integer)</title> + <para> + Prepare all request even if acc_prepare_flag is not set to mark the request for transaction later. + </para> + <para> + Default value is not-set (previous behaviour). + </para> + <example> + <title>acc_prepare_flag example</title> + <programlisting format="linespecific"> +... +modparam("acc", "acc_prepare_always", 1) +... +</programlisting> + </example> + </section> <section id="acc.p.multi_leg_info"> <title><varname>multi_leg_info</varname> (string)</title> <para>

8 years, 7 months

git:master:dbda20a5: Merge pull request #358 from ycaner06/patch-5

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: dbda20a52984e4e62064feccbc70e2dd775ab6b7 URL: https://github.com/kamailio/kamailio/commit/dbda20a52984e4e62064feccbc70e2d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-05T19:07:05+02:00 Merge pull request #358 from ycaner06/patch-5 auth_radius doc: about freeradius-client --- Modified: modules/auth_radius/doc/auth_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/dbda20a52984e4e62064feccbc70e2d… Patch: https://github.com/kamailio/kamailio/commit/dbda20a52984e4e62064feccbc70e2d… --- diff --git a/modules/auth_radius/doc/auth_radius_admin.xml b/modules/auth_radius/doc/auth_radius_admin.xml index 79c92db..7977162 100644 --- a/modules/auth_radius/doc/auth_radius_admin.xml +++ b/modules/auth_radius/doc/auth_radius_admin.xml @@ -23,9 +23,10 @@ credentials to make sure that only well formed credentials will get to the server. We have implemented radius authentication according to draft-sterman-aaa-sip-00. This module requires radiusclient-ng - library version 0.5.0 or higher which is available from - <ulink url='http://developer.berlios.de/projects/radiusclient-ng/'> - http://developer.berlios.de/projects/radiusclient-ng/</ulink>. + library version 0.5.0 or or freeradius-client or higher which is available from + <ulink url='https://github.com/FreeRADIUS/freeradius-client/'> + https://github.com/FreeRADIUS/freeradius-client/</ulink>. + Also can be installed from repos. </para> </section> <section>

8 years, 7 months

git:master:232916e3: auth_radius doc: about freeradius-client

by Yasin

Module: kamailio Branch: master Commit: 232916e317512af18b7f78c5e71544b698b3dd82 URL: https://github.com/kamailio/kamailio/commit/232916e317512af18b7f78c5e71544b… Author: Yasin <yasin.caner(a)netgsm.com.tr> Committer: Yasin <yasin.caner(a)netgsm.com.tr> Date: 2015-10-05T18:25:52+03:00 auth_radius doc: about freeradius-client added information about how to active freeradius-client library --- Modified: modules/auth_radius/doc/auth_radius_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/232916e317512af18b7f78c5e71544b… Patch: https://github.com/kamailio/kamailio/commit/232916e317512af18b7f78c5e71544b… --- diff --git a/modules/auth_radius/doc/auth_radius_admin.xml b/modules/auth_radius/doc/auth_radius_admin.xml index 79c92db..7977162 100644 --- a/modules/auth_radius/doc/auth_radius_admin.xml +++ b/modules/auth_radius/doc/auth_radius_admin.xml @@ -23,9 +23,10 @@ credentials to make sure that only well formed credentials will get to the server. We have implemented radius authentication according to draft-sterman-aaa-sip-00. This module requires radiusclient-ng - library version 0.5.0 or higher which is available from - <ulink url='http://developer.berlios.de/projects/radiusclient-ng/'> - http://developer.berlios.de/projects/radiusclient-ng/</ulink>. + library version 0.5.0 or or freeradius-client or higher which is available from + <ulink url='https://github.com/FreeRADIUS/freeradius-client/'> + https://github.com/FreeRADIUS/freeradius-client/</ulink>. + Also can be installed from repos. </para> </section> <section>

8 years, 7 months

[kamailio] auth_radius doc: about freeradius-client (#358)

by Yasin

added information about how to active freeradius-client library You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/358 -- Commit Summary -- * auth_radius doc: about freeradius-client -- File Changes -- M modules/auth_radius/doc/auth_radius_admin.xml (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/358.patch https://github.com/kamailio/kamailio/pull/358.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/358

8 years, 7 months

git:master:50903b62: docs Add reference to the jansson library

by Olle E. Johansson

Module: kamailio Branch: master Commit: 50903b62046fe26b5b865a3c0e9beea8c5a14d1d URL: https://github.com/kamailio/kamailio/commit/50903b62046fe26b5b865a3c0e9beea… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2015-10-05T16:10:50+02:00 docs Add reference to the jansson library --- Modified: INSTALL --- Diff: https://github.com/kamailio/kamailio/commit/50903b62046fe26b5b865a3c0e9beea… Patch: https://github.com/kamailio/kamailio/commit/50903b62046fe26b5b865a3c0e9beea… --- diff --git a/INSTALL b/INSTALL index 8a3ea13..dd53b36 100644 --- a/INSTALL +++ b/INSTALL @@ -133,6 +133,7 @@ Requirements: - libunistring - for the WebSocket module - python and devel headers for the Python module - jdk and gcj for Java module +- the jansson library for the jansson module used for JSON document handling OS Notes:

8 years, 7 months

git:master:85d43251: Merge pull request #353 from ycaner06/patch-2

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 85d43251000ff7d56382db21cdd6db61d71f1bd3 URL: https://github.com/kamailio/kamailio/commit/85d43251000ff7d56382db21cdd6db6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-05T07:46:59+02:00 Merge pull request #353 from ycaner06/patch-2 misc_radis : more logging --- Modified: modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/85d43251000ff7d56382db21cdd6db6… Patch: https://github.com/kamailio/kamailio/commit/85d43251000ff7d56382db21cdd6db6…

8 years, 7 months

git:master:043f3480: misc_radis : more logging

by Yasin

Module: kamailio Branch: master Commit: 043f3480b04e4d67ff36eb1b9c22f33c25e771dd URL: https://github.com/kamailio/kamailio/commit/043f3480b04e4d67ff36eb1b9c22f33… Author: Yasin <yasin.caner(a)netgsm.com.tr> Committer: Yasin <yasin.caner(a)netgsm.com.tr> Date: 2015-10-02T14:14:19+03:00 misc_radis : more logging it helps to understand misc radius errors. i checked "REJECT_RC" never defined. --- Modified: modules/misc_radius/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/043f3480b04e4d67ff36eb1b9c22f33… Patch: https://github.com/kamailio/kamailio/commit/043f3480b04e4d67ff36eb1b9c22f33…

8 years, 7 months

[kamailio] misc_radis : more logging (#353)

by Yasin

it helps to understand misc radius errors. i checked "REJECT_RC" never defined. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/353 -- Commit Summary -- * misc_radis : more logging -- File Changes -- M modules/misc_radius/functions.c (204) -- Patch Links -- https://github.com/kamailio/kamailio/pull/353.patch https://github.com/kamailio/kamailio/pull/353.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/353

8 years, 7 months

git:master:be18e641: textopsx: update the readme for keep_hf()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: be18e641c409d9a23dae7fd1c5bae2e0ad057ed7 URL: https://github.com/kamailio/kamailio/commit/be18e641c409d9a23dae7fd1c5bae2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-05T07:42:10+02:00 textopsx: update the readme for keep_hf() --- Modified: modules/textopsx/README Modified: modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/be18e641c409d9a23dae7fd1c5bae2e… Patch: https://github.com/kamailio/kamailio/commit/be18e641c409d9a23dae7fd1c5bae2e… --- diff --git a/modules/textopsx/README b/modules/textopsx/README index 5239885..bbc859b 100644 --- a/modules/textopsx/README +++ b/modules/textopsx/README @@ -22,7 +22,7 @@ Daniel-Constantin Mierla 2.1. msg_apply_changes() 2.2. change_reply_status(code, reason) 2.3. remove_body() - 2.4. keep_hf(regexp) + 2.4. keep_hf([regexp]) 2.5. fnmatch(value, expr [, flags]) 2.6. append_hf_value(hf, hvalue) 2.7. insert_hf_value(hf, hvalue) @@ -68,7 +68,7 @@ Chapter 1. Admin Guide 2.1. msg_apply_changes() 2.2. change_reply_status(code, reason) 2.3. remove_body() - 2.4. keep_hf(regexp) + 2.4. keep_hf([regexp]) 2.5. fnmatch(value, expr [, flags]) 2.6. append_hf_value(hf, hvalue) 2.7. insert_hf_value(hf, hvalue) @@ -97,7 +97,7 @@ Chapter 1. Admin Guide 2.1. msg_apply_changes() 2.2. change_reply_status(code, reason) 2.3. remove_body() - 2.4. keep_hf(regexp) + 2.4. keep_hf([regexp]) 2.5. fnmatch(value, expr [, flags]) 2.6. append_hf_value(hf, hvalue) 2.7. insert_hf_value(hf, hvalue) @@ -170,12 +170,14 @@ onreply_route { remove_body(); ... -2.4. keep_hf(regexp) +2.4. keep_hf([regexp]) Remove headers that don't match the regular expression regexp. Several header are ignored always (thus not removed): Via, From, To, Call-ID, CSeq, Content-Length, Content-Type, Max-Forwards, Contact, Route, - Record-Route -- these can be removed one by one with remove_hf(). + Record-Route -- these can be removed one by one with remove_hf(). If + regexp is missing, then only the headers listed above are kept, the + rest are removed. This function can be used from ANY_ROUTE. diff --git a/modules/textopsx/doc/functions.xml b/modules/textopsx/doc/functions.xml index 204c227..280b730 100644 --- a/modules/textopsx/doc/functions.xml +++ b/modules/textopsx/doc/functions.xml @@ -103,14 +103,15 @@ remove_body(); <section id="textopsx.f.keep_hf"> <title> - <function moreinfo="none">keep_hf(regexp)</function> + <function moreinfo="none">keep_hf([regexp])</function> </title> <para> Remove headers that don't match the regular expression regexp. Several header are ignored always (thus not removed): Via, From, To, Call-ID, CSeq, Content-Length, Content-Type, Max-Forwards, Contact, Route, Record-Route -- these can be removed one by one - with remove_hf(). + with remove_hf(). If regexp is missing, then only the headers + listed above are kept, the rest are removed. </para> <para> This function can be used from ANY_ROUTE.

8 years, 7 months

git:master:7456a25e: textopsx: if no param is given to keep_hf(re), then keep only mandatory headers

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7456a25e214658bbbfb420d8401366b34c6a285c URL: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-10-05T07:42:10+02:00 textopsx: if no param is given to keep_hf(re), then keep only mandatory headers --- Modified: modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… Patch: https://github.com/kamailio/kamailio/commit/7456a25e214658bbbfb420d8401366b… --- diff --git a/modules/textopsx/textopsx.c b/modules/textopsx/textopsx.c index b170eb8..564e9ac 100644 --- a/modules/textopsx/textopsx.c +++ b/modules/textopsx/textopsx.c @@ -84,6 +84,8 @@ static cmd_export_t cmds[] = { change_reply_status_fixup, ONREPLY_ROUTE }, {"remove_body", (cmd_function)w_remove_body_f, 0, 0, ANY_ROUTE }, + {"keep_hf", (cmd_function)w_keep_hf_f, 0, + fixup_regexp_null, ANY_ROUTE }, {"keep_hf", (cmd_function)w_keep_hf_f, 1, fixup_regexp_null, ANY_ROUTE }, {"fnmatch", (cmd_function)w_fnmatch2_f, 2, @@ -356,7 +358,11 @@ static int w_keep_hf_f(struct sip_msg* msg, char* key, char* foo) char c; struct lump* l; - re = (regex_t*)key; + if(key) { + re = (regex_t*)key; + } else { + re = NULL; + } /* we need to be sure we have seen all HFs */ parse_headers(msg, HDR_EOH_F, 0); @@ -380,20 +386,32 @@ static int w_keep_hf_f(struct sip_msg* msg, char* key, char* foo) ; } - c = hf->name.s[hf->name.len]; - hf->name.s[hf->name.len] = '\0'; - if (regexec(re, hf->name.s, 1, &pmatch, 0)!=0) - { - /* no match => remove */ - hf->name.s[hf->name.len] = c; + if(re==NULL) { + /* no regex to match => remove all */ l=del_lump(msg, hf->name.s-msg->buf, hf->len, 0); if (l==0) { - LM_ERR("cannot remove header\n"); + LM_ERR("cannot remove header [%.*s]\n", + hf->name.len, hf->name.s); return -1; } } else { - hf->name.s[hf->name.len] = c; + c = hf->name.s[hf->name.len]; + hf->name.s[hf->name.len] = '\0'; + if (regexec(re, hf->name.s, 1, &pmatch, 0)!=0) + { + /* no match => remove */ + 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 [%.*s]\n", + hf->name.len, hf->name.s); + return -1; + } + } else { + hf->name.s[hf->name.len] = c; + } } }

8 years, 7 months

← Newer
1
...
15
16
17
18
19
20
21
...
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2015