sr-dev November 2020

sr-dev@lists.kamailio.org

22 participants
312 discussions

git:master:88943174: misc/examples: note that sr is exported by app_lua_sr

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 889431746d24c73eeff73705fab36a0e154116a9 URL: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-20T08:02:37+01:00 misc/examples: note that sr is exported by app_lua_sr - hint for lua syntax check --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… Patch: https://github.com/kamailio/kamailio/commit/889431746d24c73eeff73705fab36a0… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-lua.lua b/misc/examples/kemi/kamailio-basic-kemi-lua.lua index a896529965..fc31e1b93c 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-lua.lua +++ b/misc/examples/kemi/kamailio-basic-kemi-lua.lua @@ -1,7 +1,7 @@ -- Kamailio - equivalent of routing blocks in Lua -- --- KSR - the new dynamic object exporting Kamailio functions (kemi) --- sr - the old static object exporting Kamailio functions +-- KSR - the object exporting Kamailio KEMI functions (app_lua module) +-- sr - the old object exporting Kamailio functions (app_lua_sr module) -- -- Relevant remarks: @@ -11,6 +11,9 @@ -- * KSR.drop() is only marking the SIP message for drop, but doesn't stop -- the execution of the script. Use KSR.x.exit() after it or KSR.x.drop() -- +-- Hints: +-- * Lua syntax check: luac -p /path/to/script.lua +-- -- debug callback function to print details of execution trace --[[

4 years

git:master:aa6e9963: tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send()

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: aa6e9963b2725c1b6b7e5ff995a77c222d95fa3c URL: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T17:07:05+01:00 tm: proper fill of From/To URI/tag values using parsed structure in t_uac_send() --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… Patch: https://github.com/kamailio/kamailio/commit/aa6e9963b2725c1b6b7e5ff995a77c2… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index cc50274f0c..dfe99d1390 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -593,7 +593,7 @@ void rpc_t_uac_wait(rpc_t* rpc, void* c) static int t_uac_check_msg(struct sip_msg* msg, str* method, str* body, - int* fromtag, int *cseq_is, int* cseq, + str *fromtag, int *cseq_is, int* cseq, str* callid) { struct to_body* parsed_from; @@ -628,7 +628,13 @@ static int t_uac_check_msg(struct sip_msg* msg, } parsed_from = (struct to_body*)msg->from->parsed; - *fromtag = parsed_from->tag_value.s && parsed_from->tag_value.len; + if(parsed_from->tag_value.s && parsed_from->tag_value.len) { + fromtag->s = parsed_from->tag_value.s; + fromtag->len = parsed_from->tag_value.len; + } else { + fromtag->s = NULL; + fromtag->len = 0; + } *cseq = 0; if (msg->cseq && (parsed_cseq = get_cseq(msg))) { @@ -676,7 +682,8 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, struct socket_info* ssock; str saddr; int sport, sproto; - int ret, fromtag, cseq_is, cseq; + int ret, cseq_is, cseq; + str fromtag; dlg_t dlg; uac_req_t uac_req; @@ -749,7 +756,9 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, */ /* Generate fromtag if not present */ - if (!fromtag) { + if (fromtag.s && fromtag.len) { + dlg.id.loc_tag = fromtag; + } else { generate_fromtag(&dlg.id.loc_tag, &dlg.id.call_id, ruri); } @@ -758,8 +767,11 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, else dlg.loc_seq.value = DEFAULT_CSEQ; dlg.loc_seq.is_set = 1; - dlg.loc_uri = faked_msg.from->body; - dlg.rem_uri = faked_msg.to->body; + dlg.loc_uri = get_from(&faked_msg)->uri; + dlg.rem_uri = get_to(&faked_msg)->uri; + if(get_to(&faked_msg)->tag_value.len > 0) { + dlg.id.rem_tag = get_to(&faked_msg)->tag_value; + } dlg.rem_target = *ruri; dlg.dst_uri = *nexthop; dlg.send_sock=ssock;

4 years

git:master:9c8abc6b: modules: readme files regenerated - dispatcher ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: 9c8abc6bba6807231989c3dabed4aef1e7fff307 URL: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-11-19T17:01:16+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef… Patch: https://github.com/kamailio/kamailio/commit/9c8abc6bba6807231989c3dabed4aef…

4 years

[kamailio/kamailio] dispatcher: algorithm 13 latency optimized round-robin with failover (#2493)

by Julien Chavanton

#### Type Of Change - [x] New feature (non-breaking change which adds new functionality) #### Checklist: - [x] Tested changes locally #### Description Previously discussed in the mailing list : **“13” - latency optimized routing mode, the lowest latency gets higher priority (serial forking ordered by priority, ds_ping_latency_stats is required).** - The algorithm will load balance using round-robin prioritizing the gateways with the highest priority. - The priority will be lowered by 1 point every time the latency ms is as high as the priority. Using this simple formula : ADJUSTED_PRIORITY = PRIORITY - (ESTIMATED_LATENCY/PRIORITY) GATEWAY | PRIORITY | ESTIMATED_LATENCY | ADJUSTED_PRIORITY | LOAD DISTRIBUTION -- | -- | -- | -- | -- 1 | 30 | 21 | 30 | 33% 2 | 30 | 91 | 27 | 0% 3 | 30 | 61 | 28 | 0% 4 | 30 | 19 | 30 | 33% 5 | 30 | 32 | 29 | 0% 6 | 30 | 0 | 30 | 33% 7 | 30 | 201 | 24 | 0% You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2493 -- Commit Summary -- * dispatcher: algorithm 13 -- File Changes -- M src/modules/dispatcher/dispatch.c (43) M src/modules/dispatcher/dispatch.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2493.patch https://github.com/kamailio/kamailio/pull/2493.diff -- 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/pull/2493

4 years

git:master:90e3033c: dispatcher: algorithm 13 (#2493)

by GitHub

Module: kamailio Branch: master Commit: 90e3033c51d7403a303f44e29f60be339ec217ef URL: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-11-19T07:51:06-08:00 dispatcher: algorithm 13 (#2493) - latency optimized round-robin with failover - optionally congestion can be use instead of latency - thanks to Salman Ali (asalman18) for the review --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3… Patch: https://github.com/kamailio/kamailio/commit/90e3033c51d7403a303f44e29f60be3…

4 years

git:master:b40a2a42: core: new preprocessor directive $!defenv ID=ENVVAR

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b40a2a42a3f4f3a21f2d0a2f9ec3c18668a05b4d URL: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T16:16:35+01:00 core: new preprocessor directive $!defenv ID=ENVVAR - define an ID to the value of an environment variable with the name ENVVAR - it can also be just $!defenv ENVVAR and the ID is set to ENVVAR name - example: #!defenv SHELL * if environment variable $SHELL is '/bin/bash', then it is like #!define SHELL /bin/bash * variant: #!defenv ENVSHELL=SHELL * then it is like #!define ENVSHELL /bin/bash - it is a simplified alternative of using #!substdef with $env(NAME) in replacement part --- Modified: src/core/cfg.lex Modified: src/core/ppcfg.h --- Diff: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… Patch: https://github.com/kamailio/kamailio/commit/b40a2a42a3f4f3a21f2d0a2f9ec3c18… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index 0d18031692..e6afb549d1 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -125,7 +125,7 @@ /* start conditions */ %x STRING1 STRING2 STR_BETWEEN COMMENT COMMENT_LN ATTR SELECT AVP_PVAR PVAR_P -%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD +%x PVARID INCLF IMPTF EVRTNAME CFGPRINTMODE CFGPRINTLOADMOD DEFENV_ID %x LINECOMMENT DEFINE_ID DEFINE_EOL DEFINE_DATA IFDEF_ID IFDEF_EOL IFDEF_SKIP /* config script types : #!SER or #!KAMAILIO or #!MAX_COMPAT */ @@ -551,6 +551,7 @@ IFNDEF ifndef ENDIF endif TRYDEF "trydefine"|"trydef" REDEF "redefine"|"redef" +DEFENV defenv /* else is already defined */ @@ -1413,6 +1414,27 @@ IMPORTFILE "import_file" ksr_cfg_print_initial_state(); } +<INITIAL,CFGPRINTMODE>{PREP_START}{DEFENV} { count(); + ksr_cfg_print_part(yytext); + state = DEFINE_S; + BEGIN(DEFENV_ID); +} + +<DEFENV_ID>[ \t]* { /* eat the whitespace */ + count(); + ksr_cfg_print_part(yytext); + } +<DEFENV_ID>[^ \t\r\n]+ { /* get the define id of environment variable */ + count(); + ksr_cfg_print_part(yytext); + if(pp_define_env(yytext, yyleng) < 0) { + LM_CRIT("error at %s line %d\n", (finame)?finame:"cfg", line); + exit(-1); + } + state = INITIAL; + ksr_cfg_print_initial_state(); +} + <CFGPRINTMODE>{LOADMODULE} { count(); printf("%s", yytext); BEGIN(CFGPRINTLOADMOD); } @@ -2000,6 +2022,47 @@ int pp_define_set(int len, char *text) return 0; } +int pp_define_env(const char * text, int len) +{ + char *r; + str defname; + str defvalue; + + r = strchr(text, '='); + + defname.s = (char*)text; + if(r == NULL) { + defname.len = len; + r = (char*)text; + } else { + defname.len = r - text; + r++; + if(strlen(r) == 0) { + LM_ERR("invalid defenv id [%s]\n", (char*)text); + return -1; + } + } + defvalue.s = getenv(r); + + if(defvalue.s == NULL) { + LM_ERR("env variable not defined [%s]\n", (char*)text); + return -1; + } + defvalue.len = strlen(defvalue.s); + + pp_define_set_type(0); + if(pp_define(defname.len, defname.s)<0) { + LM_ERR("cannot set define name [%s]\n", (char*)text); + return -1; + } + if(pp_define_set(defvalue.len, defvalue.s)<0) { + LM_ERR("cannot set define value [%s]\n", (char*)text); + return -1; + } + + return 0; +} + str *pp_define_get(int len, const char * text) { str var = {(char *)text, len}; diff --git a/src/core/ppcfg.h b/src/core/ppcfg.h index 0573b0165d..70627268b6 100644 --- a/src/core/ppcfg.h +++ b/src/core/ppcfg.h @@ -42,6 +42,7 @@ int pp_define(int len, const char *text); int pp_define_set(int len, char *text); int pp_define_set_type(int type); str *pp_define_get(int len, const char * text); +int pp_define_env(const char * text, int len); void pp_ifdef_level_update(int val); int pp_ifdef_level_check(void);

4 years

[kamailio/kamailio] Kamailio on RHEL/Centos 8 issue with SCTP associations created towards endpoint's primary and secondary IP addresses (#2429)

by Piotr Grabowski

### Description Kamailio is unable to create a SCTP association to IP address that is reachable normally when dispatcher.list is configured as following: ``` 760320003 sip:10.59.144.2:5063;transport=sctp 9 0 dstid=1 760320003 sip:10.59.144.130:5063;transport=sctp 9 0 dstid=1 ``` 10.59.144.2 and 10.59.144.130 are IPs of same endpoint treated as primary and secondary, Kamailio can't send probe (OPTIONS requests) as SCTP association can't be created. Issue doesn't exist on RHEL/Centos 6. ### Troubleshooting #### Reproduction Use previously mentioned dispatcher list with changed IP addresses to match local configuration. SCTP part of kamailio.cfg ``` # if not OS default is used #modparam("sctp", "sctp_socket_rcvbuf", 14096) #modparam("sctp", "sctp_socket_sndbuf", 14096) # Number of milliseconds before an unsent message/chunk is dropped. modparam("sctp", "sctp_send_ttl", 10000) modparam("sctp", "sctp_autoclose", 300) # How many times to attempt re-sending a message on a re-opened association, if the sctp stack did give up sending it (it's not related to sctp protocol level retransmission). Useful to improve reliability with peers that reboot/restart or fail over to another machine. modparam("sctp", "sctp_send_retries", 1) modparam("sctp", "sctp_srto_initial", 200) modparam("sctp", "sctp_srto_max", 250) modparam("sctp", "sctp_srto_min", 150) modparam("sctp", "sctp_asocmaxrxt", 4) modparam("sctp", "sctp_init_max_attempts", 3) modparam("sctp", "sctp_init_max_timeo", 1000) modparam("sctp", "sctp_hbinterval", 1000) modparam("sctp", "sctp_pathmaxrxt", 2) modparam("sctp", "sctp_sack_delay", 10) modparam("sctp", "sctp_sack_freq", 1) modparam("sctp", "sctp_max_burst", 4) ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3234]: ds_ping_result_helper(): probing set, but not mode DS_PROBE_INACTIVE Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3268]: ds_ping_set(): probing set #760320003, URI sip:10.59.144.2:5063;transport=sctp Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: dispatcher [dispatch.c:3293]: ds_ping_set(): Default ping_from: sip:siplb@sdp.t-mobile.at Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:435]: t_uac_prepare(): next_hop=<sip:10.59.144.2:5063;transport=sctp> Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: <core> [core/resolve.c:1244]: srv_sip_resolvehost(): 10.59.144.2:5063 proto=4 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2281]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_ADDED: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: <core> [core/resolve.c:1356]: srv_sip_resolvehost(): returning 0xa7c280 (10.59.144.2:5063 proto=4) Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:158]: dlg2hash(): hashid 27287 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2281]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2280]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [uac.c:652]: send_prepared_request_impl(): uac: 0x7fbf4eb4e5b8 branch: 0 to 10.59.144.2:5063 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2294]: DEBUG: tm [../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_ADDED: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2278]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2283]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2279]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:13 sdp-lbref02 /usr/sbin/kamailio[2279]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:14 sdp-lbref02 /usr/sbin/kamailio[2280]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.2:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:14 sdp-lbref02 /usr/sbin/kamailio[2278]: DEBUG: sctp [sctp_server.c:2317]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_PEER_ADDR_CHANGE: 10.59.144.130:5063: SCTP_ADDR_MADE_PRIM: assoc_id 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2340]: sctp_handle_notification(): sctp notification from 10.59.144.130:5063 on sdp-lbref02-sigtran01:5060: SCTP_ASSOC_CHANGE: SCTP_CANT_STR_ASSOC: assoc_id 0, ostreams 0, istreams 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2282]: DEBUG: sctp [sctp_server.c:2340]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_ASSOC_CHANGE: SCTP_CANT_STR_ASSOC: assoc_id 0, ostreams 0, istreams 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2299]: sctp_handle_notification(): sctp notification from 10.59.144.2:5063 on sdp-lbref02-sigtran01:5060: SCTP_SEND_FAILED: error 0, assoc_id 0, flags 0 Aug 6 18:19:15 sdp-lbref02 /usr/sbin/kamailio[2285]: DEBUG: sctp [sctp_server.c:2098]: sctp_handle_send_failed(): sctp: RETRY-ing (1) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  Issue is gone when one of IP addresses is removed from dispatcher.list. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.3.5 (x86_64/linux) 9e70e8 flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: 9e70e8 compiled on 12:22:26 Jun 22 2020 with gcc 8.3.1 ``` Also tested latest 5.2 and 5.4 * **Operating System**:  ``` [root@sdp-lbref02 ~]# uname -a Linux sdp-lbref02 4.18.0-193.14.3.el8_2.x86_64 #1 SMP Mon Jul 20 15:02:29 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux [root@sdp-lbref02 ~]# cat /etc/redhat-release Red Hat Enterprise Linux release 8.2 (Ootpa) ``` -- 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/2429

4 years

[kamailio/kamailio] Branch ordering behavior changed since v5.3.4 (#2449)

by Cindy Leung

4 years

git:5.4:2d733ec7: tm: print ruri mode in debug message from t load contacts

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: 2d733ec7c9e26ad79d9d8503db0d342217febd30 URL: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:29:03+01:00 tm: print ruri mode in debug message from t load contacts (cherry picked from commit 3214ecd8ee82d1b69cde57d96dddefe1301c190c) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… Patch: https://github.com/kamailio/kamailio/commit/2d733ec7c9e26ad79d9d8503db0d342… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index 13611cdb54..e7e9c8eedc 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -337,7 +337,7 @@ int ki_t_load_contacts_mode(struct sip_msg* msg, int mode) } /* Check if anything needs to be done */ - LM_DBG("nr_branches is %d\n", nr_branches); + LM_DBG("nr_branches is %d - new uri mode %d\n", nr_branches, ruri_is_new); if ((nr_branches == 0) || ((nr_branches == 1) && !ruri_is_new)) { LM_DBG("nothing to do - only one contact!\n");

4 years

git:5.4:f61d7a1b: tm: use q field comparison in while for standard t contacts load

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.4 Commit: f61d7a1b6b45bbed29bf4bc6c8a69fd52700ca41 URL: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-11-19T13:28:53+01:00 tm: use q field comparison in while for standard t contacts load - fix ordering change to standar mode introduced with proportional mode - GH #2449 (cherry picked from commit 59f6ddbe902d61bc682dd12fc6330df656468b1b) --- Modified: src/modules/tm/t_serial.c --- Diff: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… Patch: https://github.com/kamailio/kamailio/commit/f61d7a1b6b45bbed29bf4bc6c8a69fd… --- diff --git a/src/modules/tm/t_serial.c b/src/modules/tm/t_serial.c index d27a648243..13611cdb54 100644 --- a/src/modules/tm/t_serial.c +++ b/src/modules/tm/t_serial.c @@ -459,11 +459,20 @@ int ki_t_load_contacts_mode(struct sip_msg* msg, int mode) prev = (struct contact *)0; curr = contacts; - while (curr && - ((curr->q_index < next->q_index) || - ((curr->q_index == next->q_index) && (next->path.len == 0)))) { - prev = curr; - curr = curr->next; + if (mode == T_LOAD_PROPORTIONAL) { + while (curr && + ((curr->q_index < next->q_index) || + ((curr->q_index == next->q_index) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } + } else { + while (curr && + ((curr->q < next->q) || + ((curr->q == next->q) && (next->path.len == 0)))) { + prev = curr; + curr = curr->next; + } } if (!curr) { next->next = (struct contact *)0;

4 years

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2020