sr-dev March 2018

sr-dev@lists.kamailio.org

17 participants
326 discussions

git:master:9aedcb54: lib srdb1: small fix/extension in README
by Henning Westerholt 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 9aedcb548037a34b61a37ebe3e9baeb9755c9c49 URL: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-03-14T21:29:04+01:00 lib srdb1: small fix/extension in README --- Modified: src/lib/srdb1/README --- Diff: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… Patch: https://github.com/kamailio/kamailio/commit/9aedcb548037a34b61a37ebe3e9baeb… --- diff --git a/src/lib/srdb1/README b/src/lib/srdb1/README index b710ca4065..a7f50d095b 100644 --- a/src/lib/srdb1/README +++ b/src/lib/srdb1/README @@ -1,5 +1,9 @@ This directory contains the generic database support interface - db1. The interface should be used by all modules willing to communicate with a database. Kamailio can then switch from one database to another simply by loading a different -database support module. Directory example contains a very simple example -how to use the interface. Directory doc contains the API documentation. +database support module. For documentation please have a look to doxygen +comments in the respective header files. + +The directory schema contains the XML structure for the different databases +definitions. Please use this structure, don't add SQL files for table +definitions directly.

1 0

git:master:1f180628: modules: readme files regenerated - tmx ... [skip ci]
by Kamailio Dev 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 1f180628c9817442cecd3219ac6be0dc2fc88da2 URL: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-14T17:46:30+01:00 modules: readme files regenerated - tmx ... [skip ci] --- Modified: src/modules/tmx/README --- Diff: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d… Patch: https://github.com/kamailio/kamailio/commit/1f180628c9817442cecd3219ac6be0d…

1 0

git:master:32102e43: tmx: documentation for t_flush_xflags() function
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 32102e43272f8c101121e5edb94b7e5077d985a9 URL: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T17:36:59+01:00 tmx: documentation for t_flush_xflags() function --- Modified: src/modules/tmx/doc/tmx_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… Patch: https://github.com/kamailio/kamailio/commit/32102e43272f8c101121e5edb94b7e5… --- diff --git a/src/modules/tmx/doc/tmx_admin.xml b/src/modules/tmx/doc/tmx_admin.xml index b767197537..9f6168bb0f 100644 --- a/src/modules/tmx/doc/tmx_admin.xml +++ b/src/modules/tmx/doc/tmx_admin.xml @@ -223,6 +223,27 @@ if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { ... t_flush_flags(); ... +</programlisting> + </example> + </section> + <section id="tmx.f.t_flush_xflags"> + <title> + <function moreinfo="none">t_flush_xflags()</function> + </title> + <para> + Flush the extended flags from current SIP message into the already created + transaction. It make sense only in routing block if the transaction was + created via t_newtran() and the extended flags have been altered since. + </para> + <para> + This function can be used from ANY_ROUTE . + </para> + <example> + <title><function>t_flush_xflags</function> usage</title> + <programlisting format="linespecific"> +... +t_flush_xflags(); +... </programlisting> </example> </section>

1 0

git:master:dc283864: tmx: added t_flush_xflags() function
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: dc2838649343f1a75cd4443ae3004f0916ea7068 URL: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T17:36:59+01:00 tmx: added t_flush_xflags() function --- Modified: src/modules/tmx/tmx_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… Patch: https://github.com/kamailio/kamailio/commit/dc2838649343f1a75cd4443ae3004f0… --- diff --git a/src/modules/tmx/tmx_mod.c b/src/modules/tmx/tmx_mod.c index 770fcc20bf..2a703362d6 100644 --- a/src/modules/tmx/tmx_mod.c +++ b/src/modules/tmx/tmx_mod.c @@ -67,6 +67,7 @@ static int t_reply_callid(sip_msg_t* msg, char *cid, char *cseq, static int fixup_reply_callid(void** param, int param_no); static int t_flush_flags(sip_msg_t* msg, char*, char* ); +static int t_flush_xflags(sip_msg_t* msg, char *, char *); static int w_t_is_failure_route(sip_msg_t* msg, char*, char* ); static int w_t_is_branch_route(sip_msg_t* msg, char*, char* ); static int w_t_is_reply_route(sip_msg_t* msg, char*, char*); @@ -176,6 +177,8 @@ static cmd_export_t cmds[]={ fixup_reply_callid, 0, ANY_ROUTE }, {"t_flush_flags", (cmd_function)t_flush_flags, 0, 0, 0, ANY_ROUTE }, + {"t_flush_xflags", (cmd_function)t_flush_xflags, 0, 0, + 0, ANY_ROUTE }, {"t_is_failure_route", (cmd_function)w_t_is_failure_route, 0, 0, 0, ANY_ROUTE }, {"t_is_branch_route", (cmd_function)w_t_is_branch_route, 0, 0, @@ -589,6 +592,33 @@ static int t_flush_flags(sip_msg_t* msg, char *foo, char *bar) return ki_t_flush_flags(msg); } +/** + * + */ +static int ki_t_flush_xflags(sip_msg_t* msg) +{ + tm_cell_t *t; + + t=_tmx_tmb.t_gett(); + if ( t==0 || t==T_UNDEFINED) { + LM_ERR("failed to flush flags - no transaction found\n"); + return -1; + } + + memcpy(t->uas.request->xflags, msg->xflags, + KSR_XFLAGS_SIZE * sizeof(flag_t)); + return 1; +} + +/** + * + */ +static int t_flush_xflags(sip_msg_t* msg, char *foo, char *bar) +{ + return ki_t_flush_xflags(msg); +} + + /** * */ @@ -1036,6 +1066,11 @@ static sr_kemi_t sr_kemi_tmx_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("tmx"), str_init("t_flush_xflags"), + SR_KEMIP_INT, ki_t_flush_xflags, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("tmx"), str_init("t_cancel_branches"), SR_KEMIP_INT, ki_t_cancel_branches, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

INFO: Relevant fixes in the last releases
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Hello, I want to highlight that the last stable versions (for the latest 3 release series: 4.4, 5.0 and 5.1) include fixes for two issues that can crash a running instance of Kamailio, therefore it is strongly recommended to upgrade if you are using tmx or lcr modules. Next week a CVE report is going to be created with more details about one of these issues. The issues were reported privately, one by security researchers and one by a community member, and were fixed quickly. The code related to the reported issues is rather old (few years by now) and there are no known incidents of exploiting these issues so far. However, once the CVE report comes public, there could be a higher risk of exploitation. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - April 16-18, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

[kamailio/kamailio] auth_ephemeral.so: undefined symbol: EVP_sha512 (#1473)
by marcinkowalczyk 14 Mar '18

14 Mar '18

Hi, I'm trying to get auth_empheral working on kamailio 5.1.2, but it fails to load `load_module(): could not open module </usr/lib/x86_64-linux-gnu/kamailio/modules/auth_ephemeral.so>: /usr/lib/x86_64-linux-gnu/kamailio/modules/auth_ephemeral.so: undefined symbol: EVP_sha512` Tried to compile from source and install from kamailio-autheph-modules 5.1.2+xenial and it fails with same error. Regards -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1473

5 18

git:master:137c3db3: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 137c3db340b1e4139b6ddb444a220ce5928b2191 URL: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-03-14T13:16:24+01:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… Patch: https://github.com/kamailio/kamailio/commit/137c3db340b1e4139b6ddb444a220ce… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index eeb318498b..2b15a51aab 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -48,6 +48,9 @@ Muhammad Shahzad Shafi 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 5. RPC Commands @@ -79,8 +82,11 @@ Muhammad Shahzad Shafi 1.11. msg_iflag_is_set usage 1.12. file_read usage 1.13. file_write usage - 1.14. event_route[network:msg] use cases - 1.15. Sample PERL code for do_compress and do_uncompress + 1.14. setxflag usage + 1.15. isxflagset usage + 1.16. resetxflag usage + 1.17. event_route[network:msg] use cases + 1.18. Sample PERL code for do_compress and do_uncompress Chapter 1. Admin Guide @@ -111,6 +117,9 @@ Chapter 1. Admin Guide 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 5. RPC Commands @@ -240,6 +249,9 @@ modparam("corex", "msg_avp", "$avp(msg)") 4.8. msg_iflag_is_set(flagname) 4.9. file_read(fpath, var) 4.10. file_write(fpath, content) + 4.11. setxflag(flag) + 4.12. isxflagset(flag) + 4.13. resetxflag(flag) 4.1. append_branch([ uri, [ q ] ]) @@ -386,6 +398,57 @@ if(file_read("/tmp/data.txt", "$var(data)")) { ... } if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } ... +4.11. setxflag(flag) + + Set the extended message (transaction) flag. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be set. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.14. setxflag usage +... +setxflag("1"); +... +$var(flag) = 11; +setxflag("$var(flag)"); +... + +4.12. isxflagset(flag) + + Return true of the extended message (transaction) flag is set. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be tested. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.15. isxflagset usage +... +if(isxflagset("1")) +{ + ... +} +... + +4.13. resetxflag(flag) + + Reset the extended message (transaction) flag. + + Meaning of the parameters is as follows: + * flag - the index of the flag to be reset. Can be integer or + pseudo-variable with integer value (range 0-63). + + This function can be used from ANY_ROUTE. + + Example 1.16. resetxflag usage +... +resetxflag("1"); +... + 5. RPC Commands 5.1. corex.debug @@ -520,7 +583,7 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } Next is a basic usage example where encoding and decoding is done using PERL, - Example 1.14. event_route[network:msg] use cases + Example 1.17. event_route[network:msg] use cases ... loadmodule "app_perl.so" loadmodule "corex.so" @@ -551,7 +614,7 @@ event_route[network:msg] { } ... - Example 1.15. Sample PERL code for do_compress and do_uncompress + Example 1.18. Sample PERL code for do_compress and do_uncompress ... use strict; use warnings;

1 0

git:master:fd20e46b: corex: documentation for xflags management functions
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: fd20e46b280535753b9bf1b32da80a637a8fea26 URL: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:03:48+01:00 corex: documentation for xflags management functions --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… Patch: https://github.com/kamailio/kamailio/commit/fd20e46b280535753b9bf1b32da80a6… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 0df7d12cf9..f401c3e022 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -409,6 +409,93 @@ if(file_write("/tmp/data.txt", "Data is: $var(data)")) { ... } </programlisting> </example> </section> + <section id="corex.f.setxflag"> + <title><function moreinfo="none">setxflag(flag)</function></title> + <para> + Set the extended message (transaction) flag. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be set. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>setxflag</function> usage</title> + <programlisting format="linespecific"> +... +setxflag("1"); +... +$var(flag) = 11; +setxflag("$var(flag)"); +... +</programlisting> + </example> + </section> + <section id="corex.f.isxflagset"> + <title><function moreinfo="none">isxflagset(flag)</function></title> + <para> + Return true of the extended message (transaction) flag is set. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be tested. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>isxflagset</function> usage</title> + <programlisting format="linespecific"> +... +if(isxflagset("1")) +{ + ... +} +... +</programlisting> + </example> + </section> + <section id="corex.f.resetxflag"> + <title><function moreinfo="none">resetxflag(flag)</function></title> + <para> + Reset the extended message (transaction) flag. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>flag</emphasis> - the index of the flag to + be reset. Can be integer or pseudo-variable with integer value + (range 0-63). + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>resetxflag</function> usage</title> + <programlisting format="linespecific"> +... +resetxflag("1"); +... +</programlisting> + </example> + </section> </section>

1 0

git:master:63fc16e7: corex: functions to manage extended flags
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 63fc16e77ade9c682ec8489269517f4a5e77a999 URL: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:02:16+01:00 corex: functions to manage extended flags - setxflag(idx), resetxflag(idx), isxflagset(idx) - idx can be between 0 and 63 - requested via GH #1288 --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… Patch: https://github.com/kamailio/kamailio/commit/63fc16e77ade9c682ec8489269517f4… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 58a87e0c48..d80004dd05 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -46,6 +46,9 @@ static int w_msg_iflag_reset(sip_msg_t *msg, char *pflag, char *p2); static int w_msg_iflag_is_set(sip_msg_t *msg, char *pflag, char *p2); static int w_file_read(sip_msg_t *msg, char *fn, char *vn); static int w_file_write(sip_msg_t *msg, char *fn, char *vn); +static int w_isxflagset(struct sip_msg *msg, char *flag, str *s2); +static int w_resetxflag(struct sip_msg *msg, char *flag, str *s2); +static int w_setxflag(struct sip_msg *msg, char *flag, char *s2); static int fixup_file_op(void** param, int param_no); @@ -91,6 +94,12 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"file_write", (cmd_function)w_file_write, 2, fixup_spve_spve, 0, ANY_ROUTE }, + {"setxflag", (cmd_function)w_setxflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"resetxflag", (cmd_function)w_resetxflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"isxflagset", (cmd_function)w_isxflagset, 1,fixup_igp_null, + 0, ANY_ROUTE }, {0, 0, 0, 0, 0, 0} }; @@ -462,6 +471,75 @@ static int ki_append_branch_uri_q(sip_msg_t *msg, str *uri, str *q) return 1; } +/** + * + */ +static int ki_isxflagset(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return isxflagset(msg, (flag_t)fval); +} + +/** + * + */ +static int w_isxflagset(sip_msg_t *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_isxflagset(msg, fval); +} + +/** + * + */ +static int ki_resetxflag(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return resetxflag(msg, (flag_t)fval); +} + +/** + * + */ +static int w_resetxflag(sip_msg_t *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_resetxflag(msg, fval); +} + +/** + * + */ +static int ki_setxflag(sip_msg_t *msg, int fval) +{ + if((flag_t)fval>KSR_MAX_XFLAG) + return -1; + return setxflag(msg, (flag_t)fval); +} + +/** + * + */ +static int w_setxflag(sip_msg_t *msg, char *flag, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_t*)flag, &fval)!=0) { + LM_ERR("no flag value\n"); + return -1; + } + return ki_setxflag(msg, fval); +} + /** * */ @@ -482,6 +560,21 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("setxflag"), + SR_KEMIP_INT, ki_setxflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("resetxflag"), + SR_KEMIP_INT, ki_resetxflag, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("corex"), str_init("isxflagset"), + SR_KEMIP_INT, ki_isxflagset, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; @@ -494,4 +587,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_corex_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:0aae6381: core: added xflags field to sip_msg_t
by Daniel-Constantin Mierla 14 Mar '18

14 Mar '18

Module: kamailio Branch: master Commit: 0aae63818588952280e901ea2c529cb936ce5cf6 URL: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-03-14T13:00:23+01:00 core: added xflags field to sip_msg_t - holds extended flags - 64 new flags in addition to the old 32 flags --- Modified: src/core/flags.c Modified: src/core/flags.h Modified: src/core/parser/msg_parser.h --- Diff: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… Patch: https://github.com/kamailio/kamailio/commit/0aae63818588952280e901ea2c529cb… --- diff --git a/src/core/flags.c b/src/core/flags.c index 5dbdd4ffbc..043824895f 100644 --- a/src/core/flags.c +++ b/src/core/flags.c @@ -317,5 +317,42 @@ static int fixup_t_flag(void** param, int param_no) return E_CFG; } +/** + * + */ +int setxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] |= 1 << fb; + return 1; +} + +/** + * + */ +int resetxflag(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + msg->xflags[fi] &= ~ (1 << fb); + return 1; +} + +/** + * + */ +int isxflagset(struct sip_msg* msg, flag_t flag) +{ + uint32_t fi; + uint32_t fb; + fi = flag / (sizeof(flag_t)*CHAR_BIT); + fb = flag % (sizeof(flag_t)*CHAR_BIT); + return (msg->xflags[fi] & (1<<fb)) ? 1 : -1; +} #endif diff --git a/src/core/flags.h b/src/core/flags.h index 3876082472..e1186dbf79 100644 --- a/src/core/flags.h +++ b/src/core/flags.h @@ -34,6 +34,10 @@ enum { FL_WHITE=1, FL_YELLOW, FL_GREEN, FL_RED, FL_BLUE, FL_MAGENTA, typedef unsigned int flag_t; +#define KSR_XFLAGS_SIZE 2 +#define KSR_MAX_XFLAG \ + ((unsigned int)(KSR_XFLAGS_SIZE * sizeof(flag_t) * CHAR_BIT - 1 )) + #define MAX_FLAG ((unsigned int)( sizeof(flag_t) * CHAR_BIT - 1 )) struct sip_msg; @@ -43,6 +47,10 @@ int resetflag( struct sip_msg* msg, flag_t flag ); int isflagset( struct sip_msg* msg, flag_t flag ); +int setxflag(struct sip_msg* msg, flag_t flag); +int resetxflag(struct sip_msg* msg, flag_t flag); +int isxflagset(struct sip_msg* msg, flag_t flag); + /* Script flag functions. Script flags are global flags that keep their * value regardless of the SIP message being processed. */ diff --git a/src/core/parser/msg_parser.h b/src/core/parser/msg_parser.h index 41e6deeb33..9270e0bba9 100644 --- a/src/core/parser/msg_parser.h +++ b/src/core/parser/msg_parser.h @@ -359,6 +359,7 @@ typedef struct sip_msg { to avoid unnecessary calculations */ unsigned int msg_flags; /*!< internal flags used by core */ flag_t flags; /*!< config flags */ + flag_t xflags[KSR_XFLAGS_SIZE]; /*!< config extended flags */ str set_global_address; str set_global_port; struct socket_info* force_send_socket; /*!< force sending on this socket */

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
33
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 2018