sr-dev May 2018

sr-dev@lists.kamailio.org

22 participants
215 discussions

git: new commits in branch 5.1
by Daniel-Constantin Mierla 09 May '18

09 May '18

- URL: https://github.com/kamailio/kamailio/commit/cefd474c13756b2a37b5969620ab8c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T11:59:31+02:00 cfgutils: update route_if_exists() to have same behaviour as route() - do not run the route block as a top route - related to GH #1503 (cherry picked from commit 9670bd80550b9e0c2af1d5d61df618292346ba28) - URL: https://github.com/kamailio/kamailio/commit/c5df8556f2c4189c01e4ddf3f9a1309… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:00:46+02:00 nathelper: it doesn't ping contacts if ping_nated_only=0 - nathelper sends ping only if nat flag is specified, but if ping_nated_only=0 it should ping all contact in any case. (cherry picked from commit b34cf58a3a88e5ed2b2aa6aa9e5df0e5bb1808f9) - URL: https://github.com/kamailio/kamailio/commit/d75068d2ecd12189c0cc238ed073785… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:00:55+02:00 nathelper: moved var declaration into the begining of function. (cherry picked from commit 2fb84e5e101b61bbaedc18d8b37188cbc6b1cee8) - URL: https://github.com/kamailio/kamailio/commit/e0c84fcd3159ed81d66461c9b14f385… Author: Konstantin Poliakov <k.polyakov(a)mightycall.com> Date: 2018-05-09T12:01:13+02:00 usrloc: use UL_DB_EXPIRES_SET() inside get_all_db_ucontacts() - fix matching date field for some backends, such as mongodb, as well as obey ul_expires_type value (cherry picked from commit 944dc1dc1e6261a3c179ff11bf3531e379eb9f35) - URL: https://github.com/kamailio/kamailio/commit/b30e500576ba1e4e31b530c5bee6369… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:01:24+02:00 usrloc: removed useless set of db type for expire column (cherry picked from commit 943724e62c2b3bb98a37d9f496cc6c76ecb976cb) - URL: https://github.com/kamailio/kamailio/commit/4b174a25e895545e4e101b23ad4d6cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:01:52+02:00 core: print rr type for rpc dns.view (cherry picked from commit b72e0b6984e87b42f0a578a6b220a28a80e67737) - URL: https://github.com/kamailio/kamailio/commit/981fd4dc2ca4ef49544385b1b82b0dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:05+02:00 core: dns - print index and remove per record type printing added previously - type is already printed at the top of the structure (cherry picked from commit 6285b5ebe02d39bf77baa8f29d16de246dc1ad77) - URL: https://github.com/kamailio/kamailio/commit/89a91f11f5bdb87d91f5b2003ef7bfe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:18+02:00 htable: added parameter event_callback_mode - control when event_route[htable:init] is executed: 0 - after all modules were initialized; 1 - in first worker process; (default 0) - fixes use with kemi framework by using value 1, because after module initialization the kemi framework is not ready, being set up per child process - reported by GH #1519 (cherry picked from commit 1b8ab8458806106a51de26afd06be5e3a15188b0) - URL: https://github.com/kamailio/kamailio/commit/1295aadf9055be1542b4436d84fd759… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:26+02:00 htable: docs for event_callback_mode parameter (cherry picked from commit e72a41906da417cedb81ef8216c3c084fbb4902d) - URL: https://github.com/kamailio/kamailio/commit/75e29b91ebb54fc5ad3ce5ccbdc9230… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-09T12:02:41+02:00 Module: htable:: event_callback_mode to int (cherry picked from commit 896c5e1c76e6836bedaf66f9b832020a0d70c04b) - URL: https://github.com/kamailio/kamailio/commit/e4cca93ff255b391ae5c4cfedf3ccc5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:02:52+02:00 core: rpc dns.view returns an array of records (cherry picked from commit 648dd937831654d40a9d615319693b87db31ef94) - URL: https://github.com/kamailio/kamailio/commit/04bd1288ba84223695c5e01e8f587fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:04+02:00 dispatcher: declare vars at beginning of the block in rpc command (cherry picked from commit c73a22abb1691e3c25b5f599e5f387540f152913) - URL: https://github.com/kamailio/kamailio/commit/ed235c5a5671fa9011e489e2ab1ff03… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:40+02:00 core: rpc dns.view outputs proper formatted structure - previously it was doing sort of printf to emulate structures (cherry picked from commit ab9e9eba2bdd70a6bac296b88331a137c6a3cbd0) - URL: https://github.com/kamailio/kamailio/commit/e86116142f4c30ba5f9afbeebf55850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:03:54+02:00 db_perlvdb: proper lookup for app_perl module - reported by shaheryarkh(a)gmail.com (cherry picked from commit 1226ae471627547ef00c651b78b37e1c397adc23) - URL: https://github.com/kamailio/kamailio/commit/7998b253bd6ed2e589f94d18a85aec9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:02+02:00 db_perlvdb: updated the db api exported fields (cherry picked from commit c7aa0a9e3796b1fcd70305a2878d62bf251a9b5e) - URL: https://github.com/kamailio/kamailio/commit/1cac068d1acdd44081a1c4e65a317a4… Author: surendratiwari3 <surendratiwari3(a)gmail.com> Date: 2018-05-09T12:04:17+02:00 misc:kemi_lua append_hf to append (cherry picked from commit 5ceb3b857d448fed1e819812dcb4a9724243cdb8) - URL: https://github.com/kamailio/kamailio/commit/052cfbd844b662cac17910f55111ad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:32+02:00 core: dns cache - print status as field in rpc structure (cherry picked from commit 1822d974ff1704cca3a1db5fce0507be47af3928) - URL: https://github.com/kamailio/kamailio/commit/fcd3974e85b549c85cb7fb3a11e9d01… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T12:04:42+02:00 db_perlvdb: added const specifiers to get rid of warnings (cherry picked from commit 6a152024a40abdb89842aaee418088fe3fb23ae2) - URL: https://github.com/kamailio/kamailio/commit/256d06bc1902f59354fb0bee37a1e34… Author: uts09 <uttamhoode(a)gmail.com> Date: 2018-05-09T12:04:59+02:00 misc/examples/ims: replaced deprecated mi_fifo with jsonrpcs - submitted via PR #1524 (cherry picked from commit e17853d8804fa7f10688676d313014ac6e313215) - URL: https://github.com/kamailio/kamailio/commit/e5745ca3d058f82e957a761b4b800f8… Author: Muhammad Shahzad <shaheryarkh(a)gmail.com> Date: 2018-05-09T12:05:13+02:00 db_perlvdb: updated code and documentation for latest db api - GH #1525 (cherry picked from commit 1a15e985de8cc4a5c836dacd0df4afdb6b6efb1b)

1 0

git:master:066f0e8c: core: kemi - remove unused variable from method check helper
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 066f0e8cdf19f35289772814c5dd6854691c92a3 URL: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T10:45:39+02:00 core: kemi - remove unused variable from method check helper --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… Patch: https://github.com/kamailio/kamailio/commit/066f0e8cdf19f35289772814c5dd685… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 7c8e0a4056..5a07abb254 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -795,7 +795,6 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) static int sr_kemi_core_is_method_type(sip_msg_t *msg, int mtype) { int imethod; - int i; if(msg==NULL) { LM_WARN("invalid parameters\n");

1 0

git:master:3b3302e4: core: kemi - return bool for method test functions
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 3b3302e4178f22dd3aa47406598ce20fa0748c31 URL: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T10:44:07+02:00 core: kemi - return bool for method test functions --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… Patch: https://github.com/kamailio/kamailio/commit/3b3302e4178f22dd3aa47406598ce20… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index afe46321f6..7c8e0a4056 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1354,62 +1354,62 @@ static sr_kemi_t _sr_kemi_core[] = { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_INVITE"), - SR_KEMIP_INT, sr_kemi_core_is_method_invite, + SR_KEMIP_BOOL, sr_kemi_core_is_method_invite, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_ACK"), - SR_KEMIP_INT, sr_kemi_core_is_method_ack, + SR_KEMIP_BOOL, sr_kemi_core_is_method_ack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_BYE"), - SR_KEMIP_INT, sr_kemi_core_is_method_bye, + SR_KEMIP_BOOL, sr_kemi_core_is_method_bye, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_CANCEL"), - SR_KEMIP_INT, sr_kemi_core_is_method_cancel, + SR_KEMIP_BOOL, sr_kemi_core_is_method_cancel, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_REGISTER"), - SR_KEMIP_INT, sr_kemi_core_is_method_register, + SR_KEMIP_BOOL, sr_kemi_core_is_method_register, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_OPTIONS"), - SR_KEMIP_INT, sr_kemi_core_is_method_options, + SR_KEMIP_BOOL, sr_kemi_core_is_method_options, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_SUBSCRIBE"), - SR_KEMIP_INT, sr_kemi_core_is_method_subscribe, + SR_KEMIP_BOOL, sr_kemi_core_is_method_subscribe, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_PUBLISH"), - SR_KEMIP_INT, sr_kemi_core_is_method_publish, + SR_KEMIP_BOOL, sr_kemi_core_is_method_publish, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_NOTIFY"), - SR_KEMIP_INT, sr_kemi_core_is_method_notify, + SR_KEMIP_BOOL, sr_kemi_core_is_method_notify, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_INFO"), - SR_KEMIP_INT, sr_kemi_core_is_method_info, + SR_KEMIP_BOOL, sr_kemi_core_is_method_info, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_UPDATE"), - SR_KEMIP_INT, sr_kemi_core_is_method_update, + SR_KEMIP_BOOL, sr_kemi_core_is_method_update, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init(""), str_init("is_PRACK"), - SR_KEMIP_INT, sr_kemi_core_is_method_prack, + SR_KEMIP_BOOL, sr_kemi_core_is_method_prack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } },

1 0

git:master:7c912517: core: kemi - use uppercase method value in helper function names
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: 7c9125178b5b5d133919e0abc5bc687271783c5b URL: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:44:47+02:00 core: kemi - use uppercase method value in helper function names - better matching with how is in sip message --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… Patch: https://github.com/kamailio/kamailio/commit/7c9125178b5b5d133919e0abc5bc687… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 8ee9e1c91b..afe46321f6 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1353,62 +1353,62 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_invite"), + { str_init(""), str_init("is_INVITE"), SR_KEMIP_INT, sr_kemi_core_is_method_invite, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_ack"), + { str_init(""), str_init("is_ACK"), SR_KEMIP_INT, sr_kemi_core_is_method_ack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_bye"), + { str_init(""), str_init("is_BYE"), SR_KEMIP_INT, sr_kemi_core_is_method_bye, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_cancel"), + { str_init(""), str_init("is_CANCEL"), SR_KEMIP_INT, sr_kemi_core_is_method_cancel, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_register"), + { str_init(""), str_init("is_REGISTER"), SR_KEMIP_INT, sr_kemi_core_is_method_register, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_options"), + { str_init(""), str_init("is_OPTIONS"), SR_KEMIP_INT, sr_kemi_core_is_method_options, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_subscribe"), + { str_init(""), str_init("is_SUBSCRIBE"), SR_KEMIP_INT, sr_kemi_core_is_method_subscribe, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_publish"), + { str_init(""), str_init("is_PUBLISH"), SR_KEMIP_INT, sr_kemi_core_is_method_publish, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_notify"), + { str_init(""), str_init("is_NOTIFY"), SR_KEMIP_INT, sr_kemi_core_is_method_notify, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_info"), + { str_init(""), str_init("is_INFO"), SR_KEMIP_INT, sr_kemi_core_is_method_info, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_update"), + { str_init(""), str_init("is_UPDATE"), SR_KEMIP_INT, sr_kemi_core_is_method_update, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, - { str_init(""), str_init("is_prack"), + { str_init(""), str_init("is_PRACK"), SR_KEMIP_INT, sr_kemi_core_is_method_prack, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE }

1 0

git:master:e6eabea9: corex: exported kemi function to test if user-agend header is set
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: e6eabea9e7806a708b0af8a45b7390eceb51dfdb URL: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:23:07+02:00 corex: exported kemi function to test if user-agend header is set - KSR.has_user_agent() - return 1 if User-Agent has value; -1 otherwise --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… Patch: https://github.com/kamailio/kamailio/commit/e6eabea9e7806a708b0af8a45b7390e… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 6d6b03da29..b86876a191 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -751,7 +751,7 @@ static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) } /** - * + * */ static int ki_has_ruri_user(sip_msg_t *msg) { @@ -773,6 +773,28 @@ static int ki_has_ruri_user(sip_msg_t *msg) return -1; } +/** + * + */ +static int ki_has_user_agent(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(msg->user_agent==NULL && ((parse_headers(msg, HDR_USERAGENT_F, 0)==-1) + || (msg->user_agent==NULL))) + { + LM_DBG("no User-Agent header\n"); + return -1; + } + + if(msg->user_agent->body.s!=NULL && msg->user_agent->body.len>0) { + return 1; + } + + return -1; +} + /** * */ @@ -838,6 +860,11 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("has_user_agent"), + SR_KEMIP_INT, ki_has_user_agent, + { SR_KEMIP_NONE, 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 } } };

1 0

git:master:dabcabd3: corex: exported helper function to check if RURI has user field
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: dabcabd3025c2a8988379a40ca65c56fe9b2838b URL: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T09:07:49+02:00 corex: exported helper function to check if RURI has user field - KSR.has_ruri_user() - return 1 if user field is set, -1 otherwise --- Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… Patch: https://github.com/kamailio/kamailio/commit/dabcabd3025c2a8988379a40ca65c56… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 0d7ce35857..6d6b03da29 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -30,6 +30,7 @@ #include "../../core/lvalue.h" #include "../../core/pvar.h" #include "../../core/kemi.h" +#include "../../core/parser/parse_uri.h" #include "corex_lib.h" #include "corex_rpc.h" @@ -749,6 +750,29 @@ static int w_via_add_xavp_params(sip_msg_t *msg, char *pflags, char *s2) return ki_via_add_xavp_params(msg, fval); } +/** + * + */ +static int ki_has_ruri_user(sip_msg_t *msg) +{ + if(msg==NULL) + return -1; + + if(msg->first_line.type == SIP_REPLY) /* REPLY doesnt have a ruri */ + return -1; + + if(msg->parsed_uri_ok==0 /* R-URI not parsed*/ && parse_sip_msg_uri(msg)<0) { + LM_ERR("failed to parse the R-URI\n"); + return -1; + } + + if(msg->parsed_uri.user.s!=NULL && msg->parsed_uri.user.len>0) { + return 1; + } + + return -1; +} + /** * */ @@ -809,6 +833,12 @@ static sr_kemi_t sr_kemi_corex_exports[] = { { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("corex"), str_init("has_ruri_user"), + SR_KEMIP_INT, ki_has_ruri_user, + { SR_KEMIP_NONE, 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 } } }; /* clang-format on */

1 0

git:master:d63638d4: core: exported helper functions to match on specific sip methods
by Daniel-Constantin Mierla 09 May '18

09 May '18

Module: kamailio Branch: master Commit: d63638d44dc3959cf387a57eb9ce1004153e6030 URL: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-09T08:55:02+02:00 core: exported helper functions to match on specific sip methods - useful to make the kemi script easier to follow --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100… Patch: https://github.com/kamailio/kamailio/commit/d63638d44dc3959cf387a57eb9ce100…

1 0

git:master:e4f6a39b: core: kemi - exported is_myself_suri()
by Daniel-Constantin Mierla 08 May '18

08 May '18

Module: kamailio Branch: master Commit: e4f6a39b08cb6fb8bb40c635ebafc7795a239e3c URL: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T22:48:47+02:00 core: kemi - exported is_myself_suri() - return true if the source address is matching myself (useful to detect when sending to itself) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… Patch: https://github.com/kamailio/kamailio/commit/e4f6a39b08cb6fb8bb40c635ebafc77… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 0ff1c48152..bb671f1e60 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -235,6 +235,21 @@ static int sr_kemi_core_is_myself_turi(sip_msg_t *msg) return sr_kemi_core_is_myself(msg, &xto->uri); } +/** + * + */ +static int sr_kemi_core_is_myself_suri(sip_msg_t *msg) +{ + str suri; + + if(get_src_uri(msg, 0, &suri)<0) { + LM_ERR("cannot src address uri\n"); + return SR_KEMI_FALSE; + } + + return sr_kemi_core_is_myself(msg, &suri); +} + /** * */ @@ -1047,6 +1062,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("is_myself_suri"), + SR_KEMIP_BOOL, sr_kemi_core_is_myself_suri, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("setflag"), SR_KEMIP_BOOL, sr_kemi_core_setflag, { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:bbef7d81: core: kemi - support for MESSAGE in is_method_in()
by Daniel-Constantin Mierla 08 May '18

08 May '18

Module: kamailio Branch: master Commit: bbef7d81e94a7cc048620571cd2f324184dbb5e9 URL: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-05-08T22:44:16+02:00 core: kemi - support for MESSAGE in is_method_in() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… Patch: https://github.com/kamailio/kamailio/commit/bbef7d81e94a7cc048620571cd2f324… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index a3922cae91..0ff1c48152 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -733,6 +733,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'M': + case 'm': + if(imethod==METHOD_MESSAGE) { + return SR_KEMI_TRUE; + } + break; case 'R': case 'r': if(imethod==METHOD_REGISTER) {

1 0

git:master:bcacfa0c: modules: readme files regenerated - db_perlvdb ... [skip ci]
by Kamailio Dev 08 May '18

08 May '18

Module: kamailio Branch: master Commit: bcacfa0cf139e26b6f56a73b3d6cdf8c1a395210 URL: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-05-08T08:32:08+02:00 modules: readme files regenerated - db_perlvdb ... [skip ci] --- Modified: src/modules/db_perlvdb/README --- Diff: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… Patch: https://github.com/kamailio/kamailio/commit/bcacfa0cf139e26b6f56a73b3d6cdf8… --- diff --git a/src/modules/db_perlvdb/README b/src/modules/db_perlvdb/README index ba746b7bd0..759dbae9f0 100644 --- a/src/modules/db_perlvdb/README +++ b/src/modules/db_perlvdb/README @@ -69,12 +69,12 @@ Chapter 1. Admin Guide database access. Relaying of insert, update, query and delete operations is supported. - Modules can be configured to use the perlvdb module as database backend - using the db_url_parameter: + Modules can be configured to use the db_perlvdb module as database + backend using the db_url_parameter: modparam("acc", "db_url", "perlvdb:Kamailio::VDB::Adapter::AccountingSIPtrace") This configuration options tells acc module that it should use the - perlvdb module which will in turn use the Perl class + db_perlvdb module which will in turn use the Perl class Kamailio::VDB::Adapter::AccountingSIPtrace to relay the database requests. @@ -86,13 +86,14 @@ modparam("acc", "db_url", "perlvdb:Kamailio::VDB::Adapter::AccountingSIPtrace") 2.1. Kamailio Modules The following modules must be loaded before this module: - * perl -- Perl module + * app_perl -- Perl Application module 2.2. External Libraries or Applications The following libraries or applications must be installed before running Kamailio with this module loaded: - * None (Besides the ones mentioned in the perl module documentation). + * None (Besides the ones mentioned in the app_perl module + documentation). 3. Parameters @@ -136,7 +137,7 @@ Chapter 2. Developer Guide 2. Base class Kamailio::VDB - A client module has to be configured to use the perlvdb module in + A client module has to be configured to use the db_perlvdb module in conjunction with a Perl class to provide the functions. The configured class needs to inherit from the base class Kamailio::VDB.

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2018