sr-dev August 2019

sr-dev@lists.kamailio.org

17 participants
339 discussions

git:master:3f1b5142: tm: lookup on_sl_reply route in mod_init()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3f1b5142c45f979b7847b2878ccf3b130baeae65 URL: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-26T13:31:29+02:00 tm: lookup on_sl_reply route in mod_init() - moved from fixup during modparam to store the name of the route block --- Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/tm.c --- Diff: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… Patch: https://github.com/kamailio/kamailio/commit/3f1b5142c45f979b7847b2878ccf3b1… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index f138e9a2e4..1fa7f9dda8 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -96,6 +96,7 @@ static int goto_on_branch_failure=0; static int goto_on_reply=0; /* where to go on receipt of reply without transaction context */ int goto_on_sl_reply=0; +extern str on_sl_reply_name; /* remap 503 response code to 500 */ extern int tm_remap_503_500; diff --git a/src/modules/tm/tm.c b/src/modules/tm/tm.c index 370d477109..105bbaf1f2 100644 --- a/src/modules/tm/tm.c +++ b/src/modules/tm/tm.c @@ -96,7 +96,6 @@ static int fixup_on_branch_failure(void** param, int param_no); static int fixup_on_reply(void** param, int param_no); static int fixup_on_branch(void** param, int param_no); static int fixup_t_reply(void** param, int param_no); -static int fixup_on_sl_reply(modparam_t type, void* val); static int fixup_t_relay_to(void** param, int param_no); static int fixup_t_is_set(void** param, int param_no); @@ -217,7 +216,7 @@ static char *fr_inv_timer_param = 0 /*FR_INV_TIMER_AVP*/; str contacts_avp = {0, 0}; str contact_flows_avp = {0, 0}; str ulattrs_xavp_name = {NULL, 0}; - +str on_sl_reply_name = {NULL, 0}; int tm_remap_503_500 = 1; int tm_failure_exec_mode = 0; @@ -454,7 +453,7 @@ static param_export_t params[]={ {"cancel_b_method", PARAM_INT, &default_tm_cfg.cancel_b_flags}, {"reparse_on_dns_failover", PARAM_INT, &default_tm_cfg.reparse_on_dns_failover}, - {"on_sl_reply", PARAM_STRING|PARAM_USE_FUNC, fixup_on_sl_reply }, + {"on_sl_reply", PARAM_STR, &on_sl_reply_name }, {"contacts_avp", PARAM_STR, &contacts_avp }, {"contact_flows_avp", PARAM_STR, &contact_flows_avp }, {"disable_6xx_block", PARAM_INT, &default_tm_cfg.disable_6xx }, @@ -588,21 +587,6 @@ static int fixup_on_branch(void** param, int param_no) return 0; } -static int fixup_on_sl_reply(modparam_t type, void* val) -{ - if ((type & PARAM_STRING) == 0) { - LM_ERR("not a string parameter\n"); - return -1; - } - - if (fixup_routes(0, &onreply_rt, &val)) - return -1; - - goto_on_sl_reply = (int)(long)val; - return 0; -} - - /* (char *hostname, char *port_nr) ==> (struct proxy_l *, -) */ static int fixup_hostport2proxy(void** param, int param_no) @@ -716,6 +700,13 @@ static int mod_init(void) return -1; } + if(on_sl_reply_name.s!=NULL && on_sl_reply_name.len>0) { + goto_on_sl_reply=route_get(&onreply_rt, on_sl_reply_name.s); + if (goto_on_sl_reply==-1){ + LM_ERR("route get failed for on_sl_reply\n"); + return -1; + } + } if (init_callid() < 0) { LM_CRIT("Error while initializing Call-ID generator\n"); return -1;

5 years, 3 months

git:master:b8e725c4: websocket: remove core stats.h #include, remove no-op #defines as well

by Henning Westerholt

Module: kamailio Branch: master Commit: b8e725c407ce5b0b9580ab0d8bd7a9223b509193 URL: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:27:56+02:00 websocket: remove core stats.h #include, remove no-op #defines as well --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… Patch: https://github.com/kamailio/kamailio/commit/b8e725c407ce5b0b9580ab0d8bd7a92… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 36b465bc65..2da0863de5 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -34,7 +34,6 @@ #include "../../core/events.h" #include "../../core/receive.h" -#include "../../core/stats.h" #include "../../core/str.h" #include "../../core/tcp_conn.h" #include "../../core/tcp_read.h" @@ -244,7 +243,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) if(dst.proto == PROTO_WS) { if(unlikely(tcp_disable)) { - STATS_TX_DROPS; LM_WARN("TCP disabled\n"); pkg_free(send_buf); tcpconn_put(con); @@ -254,7 +252,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) #ifdef USE_TLS else if(dst.proto == PROTO_WSS) { if(unlikely(tls_disable)) { - STATS_TX_DROPS; LM_WARN("TLS disabled\n"); pkg_free(send_buf); tcpconn_put(con); @@ -275,7 +272,6 @@ static int encode_and_send_ws_frame(ws_frame_t *frame, conn_close_t conn_close) dst.send_flags.f |= SND_F_FORCE_CON_REUSE; if(tcp_send(&dst, from, send_buf, frame_length) < 0) { - STATS_TX_DROPS; LM_ERR("sending WebSocket frame\n"); pkg_free(send_buf); update_stat(ws_failed_connections, 1);

5 years, 3 months

git:master:b38fe1b5: core: remove STATS #define, depends on non-existing module, does not compile

by Henning Westerholt

Module: kamailio Branch: master Commit: b38fe1b5b6061c07a050b329bacd55377bdd45ef URL: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:20:17+02:00 core: remove STATS #define, depends on non-existing module, does not compile - remove STATS #define, depends on non-existing snmp module, does not compile - could be used to print e.g. number of packets on SIGUSR1 - these numbers were reported through SNMP - replaced by Kamailio statistics support - remove stats.c and stats.h files --- Modified: src/Makefile.defs Modified: src/core/cfg.y Modified: src/core/forward.c Modified: src/core/forward.h Modified: src/core/receive.c Modified: src/core/ver_defs.h Modified: src/main.c Removed: src/core/stats.c Removed: src/core/stats.h --- Diff: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553… Patch: https://github.com/kamailio/kamailio/commit/b38fe1b5b6061c07a050b329bacd553…

5 years, 3 months

git:master:74dd23ad: tls: remove core stats.h #include, add necessary system #include for open(..)

by Henning Westerholt

Module: kamailio Branch: master Commit: 74dd23adc125ee2e3e9f31a4d33a9fd687638a21 URL: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2019-08-25T13:26:34+02:00 tls: remove core stats.h #include, add necessary system #include for open(..) --- Modified: src/modules/tls/tls_config.c --- Diff: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… Patch: https://github.com/kamailio/kamailio/commit/74dd23adc125ee2e3e9f31a4d33a9fd… --- diff --git a/src/modules/tls/tls_config.c b/src/modules/tls/tls_config.c index 72ed987360..4c7d2963ab 100644 --- a/src/modules/tls/tls_config.c +++ b/src/modules/tls/tls_config.c @@ -36,10 +36,11 @@ #include "../../core/trim.h" #include "../../core/ut.h" #include "../../core/cfg/cfg.h" -#include "../../core/stats.h" #include <dirent.h> +#include <sys/types.h> #include <sys/stat.h> +#include <fcntl.h> static tls_domains_cfg_t* _ksr_tls_cfg = NULL; static tls_domain_t* _ksr_tls_domain = NULL;

5 years, 3 months

ims_diameter_server and cdp modules modification

by Maryam Baghdadi

Hello, I used from kamailio with MMTel features as AS in my IMS scenario and I wanted to send UDR diameter request from AS to my HSS. According to my study I should use "diameter_request" or "diameter_request_async" in ims_diameter_server module . but some problem exists in diameter_request function which caused "json" string as input of "diameter_request" ignored and fault happened. I added parse and checking "json" string in diameter_request function in ims_diameter_server.c file : if (message) { if (get_str_fparam(&s_message, msg, (fparam_t*)message) < 0) { LM_ERR("failed to get json string\n"); return -1; } LM_DBG("json %.*s\n", s_message.len, s_message.s); } also cdp_get_session function in cdp module has problem with "lock and unlock session" and " AAASessionsLock(hash); " doesn't work correctly. I comment " AAASessionsLock(hash);" and " AAASessionsUnlock(hash);" I recompiled ims_diameter_server and cdp modules again called below part in request_route of my configuration : if(is_method("REGISTER")) { diameter_request("hss domain address", "16777217", "306", "{ 'avpCode':263 , ....}"); } this worked correctly and UDR request sent to hss .

5 years, 3 months

git:5.2:b16b9bf4: core: kemi - warning when using an unsupported method flag for is_method_in()

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b16b9bf49d1b8437673c8913265daf8ee311e51a URL: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:23:27+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() (cherry picked from commit 7dc450006743ea160864ce5583a4494fb1033e9e) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… Patch: https://github.com/kamailio/kamailio/commit/b16b9bf49d1b8437673c8913265daf8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index ccdc90cf18..fda12d72e4 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -869,6 +869,8 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + default: + LM_WARN("unsupported method flag: %c\n", vmethod->s[i]); } } return SR_KEMI_FALSE;

5 years, 3 months

git:master:7dc45000: core: kemi - warning when using an unsupported method flag for is_method_in()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7dc450006743ea160864ce5583a4494fb1033e9e URL: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:22:16+02:00 core: kemi - warning when using an unsupported method flag for is_method_in() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… Patch: https://github.com/kamailio/kamailio/commit/7dc450006743ea160864ce5583a4494… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f7c0086eaf..286e81fed0 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -875,6 +875,8 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + default: + LM_WARN("unsupported method flag: %c\n", vmethod->s[i]); } } return SR_KEMI_FALSE;

5 years, 3 months

git:5.2:b21a75da: core: kemi - fix matching update for is_method_in("U")

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.2 Commit: b21a75dad1575999549f9a84de522dfb8d7fb50f URL: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:11:59+02:00 core: kemi - fix matching update for is_method_in("U") (cherry picked from commit e876770e36c83ce47d1b0f95c14fe269b92a4e70) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… Patch: https://github.com/kamailio/kamailio/commit/b21a75dad1575999549f9a84de522df… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index f638174947..ccdc90cf18 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -839,6 +839,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'U': + case 'u': + if(imethod==METHOD_UPDATE) { + return SR_KEMI_TRUE; + } + break; case 'K': case 'k': if(imethod==METHOD_KDMQ) {

5 years, 3 months

git:master:e876770e: core: kemi - fix matching update for is_method_in("U")

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: e876770e36c83ce47d1b0f95c14fe269b92a4e70 URL: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2019-08-24T16:10:36+02:00 core: kemi - fix matching update for is_method_in("U") --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… Patch: https://github.com/kamailio/kamailio/commit/e876770e36c83ce47d1b0f95c14fe26… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 39ee38773c..f7c0086eaf 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -845,6 +845,12 @@ static int sr_kemi_core_is_method_in(sip_msg_t *msg, str *vmethod) return SR_KEMI_TRUE; } break; + case 'U': + case 'u': + if(imethod==METHOD_UPDATE) { + return SR_KEMI_TRUE; + } + break; case 'K': case 'k': if(imethod==METHOD_KDMQ) {

5 years, 3 months

[kamailio/kamailio] Dispatcher probes a maximum of 15 Gateways at a time (#2041)

by duarterocha91

### Description I have a Kamailio with several Gateways configured. It's Probing is done using Dispatcher module and setting the GW state with value "8". If more than 15 Gw's are set as "8" with a probing frequency of 1min, only 15 GW will be probed each minute. I can't find a configuration for this and have already posted this issue in the sr-users mailing list I'm using Kamailio 5.2.0. Best 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/2041

5 years, 3 months

← Newer
1
...
12
13
14
15
16
17
18
...
34
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2019