sr-dev September 2020

sr-dev@lists.kamailio.org

12 participants
270 discussions

git:master:8dfc0f6e: rr: reset param buffer for r-r advertised address

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 8dfc0f6ef0ddc4bf2d73d21124caa289d4b8ce07 URL: https://github.com/kamailio/kamailio/commit/8dfc0f6ef0ddc4bf2d73d21124caa28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-30T12:34:40+02:00 rr: reset param buffer for r-r advertised address - GH #2486 --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/8dfc0f6ef0ddc4bf2d73d21124caa28… Patch: https://github.com/kamailio/kamailio/commit/8dfc0f6ef0ddc4bf2d73d21124caa28… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index 0b74356905..df3caf4a8d 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -549,6 +549,11 @@ int record_route_preset(struct sip_msg* _m, str* _data) from = get_from(_m); } + if (rr_param_buf.len && rr_param_msg!=_m->id) { + /* rr_params were set for a different message -> reset buffer */ + rr_param_buf.len = 0; + } + l = anchor_lump(_m, _m->headers->name.s - _m->buf, 0, HDR_RECORDROUTE_T); if (!l) { LM_ERR("failed to create lump anchor\n"); @@ -812,6 +817,11 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = 0; } + if (rr_param_buf.len && rr_param_msg!=_m->id) { + /* rr_params were set for a different message -> reset buffer */ + rr_param_buf.len = 0; + } + if(rr_ignore_sips==0) { sips = rr_is_sips(_m); }

4 years, 1 month

git:master:d48ce56d: core: new parameter ipv6_hex_style

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d48ce56dcd382786d9e81c5477341a8899e0b338 URL: https://github.com/kamailio/kamailio/commit/d48ce56dcd382786d9e81c5477341a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-30T09:17:03+02:00 core: new parameter ipv6_hex_style - can be set to "a" or "A" to specify if hex digits in local computed ipv6 addresses are lowercase or uppercase. Default is "A" (same format used so far). - enables the ability to follow recommedations of RFC5952, section 4.3 - GH #2488 --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/ip_addr.c Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/d48ce56dcd382786d9e81c5477341a8… Patch: https://github.com/kamailio/kamailio/commit/d48ce56dcd382786d9e81c5477341a8… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index d5ac31ddd8..cc565b0151 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -331,6 +331,8 @@ DNS_CACHE_REC_PREF dns_cache_rec_pref /* ipv6 auto bind */ AUTO_BIND_IPV6 auto_bind_ipv6 BIND_IPV6_LINK_LOCAL bind_ipv6_link_local +IPV6_HEX_STYLE ipv6_hex_style + /* blacklist */ DST_BLST_INIT dst_blacklist_init USE_DST_BLST use_dst_blacklist @@ -775,6 +777,8 @@ IMPORTFILE "import_file" return AUTO_BIND_IPV6; } <INITIAL>{BIND_IPV6_LINK_LOCAL} { count(); yylval.strval=yytext; return BIND_IPV6_LINK_LOCAL; } +<INITIAL>{IPV6_HEX_STYLE} { count(); yylval.strval=yytext; + return IPV6_HEX_STYLE; } <INITIAL>{DST_BLST_INIT} { count(); yylval.strval=yytext; return DST_BLST_INIT; } <INITIAL>{USE_DST_BLST} { count(); yylval.strval=yytext; diff --git a/src/core/cfg.y b/src/core/cfg.y index d17540de72..7fc9817a6f 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -360,6 +360,8 @@ extern char *default_routename; %token AUTO_BIND_IPV6 %token BIND_IPV6_LINK_LOCAL +%token IPV6_HEX_STYLE + /*blacklist*/ %token DST_BLST_INIT %token USE_DST_BLST @@ -875,6 +877,13 @@ assign_stm: | DNS_CACHE_REC_PREF error { yyerror("boolean value expected"); } | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(auto_bind_ipv6 = $3);} | AUTO_BIND_IPV6 error { yyerror("boolean value expected"); } + | IPV6_HEX_STYLE EQUAL STRING { + ksr_ipv6_hex_style = $3; + if(ksr_ipv6_hex_style[0]!='a' && ksr_ipv6_hex_style[0]!='A') { + yyerror("expected \"a\" or \"A\" value"); + } + } + | IPV6_HEX_STYLE error { yyerror("string value expected"); } | BIND_IPV6_LINK_LOCAL EQUAL NUMBER {sr_bind_ipv6_link_local = $3;} | BIND_IPV6_LINK_LOCAL error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } diff --git a/src/core/globals.h b/src/core/globals.h index ea16f3ae29..6e5b234353 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -219,6 +219,7 @@ extern char *_sr_uri_host_extra_chars; extern unsigned char *_ksr_hname_extra_chars; extern char *ksr_stats_namesep; +extern char *ksr_ipv6_hex_style; #ifdef USE_DNS_CACHE extern int dns_cache_init; /* if 0, the DNS cache is not initialized at startup */ diff --git a/src/core/ip_addr.c b/src/core/ip_addr.c index 9989063fff..4dada18ddc 100644 --- a/src/core/ip_addr.c +++ b/src/core/ip_addr.c @@ -36,6 +36,7 @@ #include "resolve.h" #include "trim.h" +char *ksr_ipv6_hex_style = "A"; struct net* mk_new_net(struct ip_addr* ip, struct ip_addr* mask) { diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index bfde61cdec..53880b0059 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -41,6 +41,8 @@ #include "dprint.h" +extern char *ksr_ipv6_hex_style; + enum sip_protos { PROTO_NONE, PROTO_UDP, PROTO_TCP, PROTO_TLS, PROTO_SCTP, PROTO_WS, PROTO_WSS, PROTO_OTHER }; #define PROTO_LAST PROTO_OTHER @@ -530,7 +532,7 @@ static inline int ip6tosbuf(unsigned char* ip6, char* buff, int len) register unsigned short hex4; int r; -#define HEXDIG(x) (((x)>=10)?(x)-10+'A':(x)+'0') +#define HEXDIG(x) (((x)>=10)?(x)-10+ksr_ipv6_hex_style[0]:(x)+'0') offset=0; if (unlikely(len<IP6_MAX_STR_SIZE))

4 years, 1 month

[kamailio/kamailio] dialog: dlg_cell, always check for a to-tag match (#2484)

by Julien Chavanton

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Based on the email thread : ``` [SR-Users] Dialog - timeout for dlg with CallIDInbox ``` Several users are facing unpexected dialog disconnection caused by no-ack timer. Using a modified version of the dialog module to improve debug-ability ttps://github.com/kamailio/kamailio/pull/2483 I was able to confirm at least one problem and after looking at the trace, it seems like dialog mismatch with a serial forking scenario : - log line 3 is telling us that a NO-ACK disconnection should be triggered - log line 1-2 is telling us what happened when the ACK was received in dlg_onroute(), oddly enough state 5 was old and new, could it be a mismatch/confusio with the previous dialog, looking in this direction ... ``` 1: 2020-09-25T16:30:16.896: dialog [dlg_handlers.c:1273]: extra_ack_debug_info(): [ACK][1] state not changed >>> call-id[562419_125824138_2072238224] to-tag[<sip:+14019991904@anon.com>;tag=gK02b68836] 2: 2020-09-25T16:30:16.896: dialog [dlg_handlers.c:1440]: dlg_onroute(): [ACK] state not changed old[5]new[5] ... 3: 2020-09-25T16:32:22.674: dialog [dlg_hash.c:247]: dlg_clean_run(): dialog disconnection no-ACK call-id[562419_125824138_2072238224][1601051416]<[1601051542 - 60] ``` After looking at the pcap trace, call-id 562419_125824138_2072238224 was involved in serial forking : call attempt1 ``` X >> INVITE >> Y // no to-tag X << 100 ... X << 408 // to-tag=594d50c3218065a60bb91fd47a70fbc1-59edef02 (locally generated) X >> ACK // to-tag=594d50c3218065a60bb91fd47a70fbc1-59edef02 ``` call attempt2 ``` X >> INVITE >> Z // no to-tag X << 100 X << 200 << Z // to-tag=gK02b68836 X >> ACK >> Z // to-tag=gK02b68836 (Should be state old[3]new[4], I wonder how it could possibly be state old[5]new[5]) ``` I did look at several occurrences and there is always a locally generated 408/to-tag before, seems like I have a good lead to investigate further. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2484 -- Commit Summary -- * dialog: dlg_cell, always check for a to-tag match -- File Changes -- M src/modules/dialog/dlg_hash.c (13) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2484.patch https://github.com/kamailio/kamailio/pull/2484.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/2484

4 years, 1 month

git:5.2:50b6e42c: dialog: dlg_cell, always check for a to-tag match

by Julien Chavanton

Module: kamailio Branch: 5.2 Commit: 50b6e42cde3d643d80796a178874ba76960b0f7a URL: https://github.com/kamailio/kamailio/commit/50b6e42cde3d643d80796a178874ba7… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-29T09:00:53-07:00 dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/50b6e42cde3d643d80796a178874ba7… Patch: https://github.com/kamailio/kamailio/commit/50b6e42cde3d643d80796a178874ba7… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index ce1570d256..1c8bf55d15 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -793,6 +793,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, unsigned int *dir, int mode) { struct dlg_cell *dlg; + struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; d_entry = &(d_table->entries[h_entry]); @@ -804,13 +805,24 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { ref_dlg_unsafe(dlg, 1); if(likely(mode==0)) dlg_unlock( d_table, d_entry); - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + + /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ + if (dlg->tag[1].len == 0) { + dlg_no_totag=dlg; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", + callid->len, callid->s,h_entry,*dir); + continue; + } + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", + callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + return dlg; } } if(likely(mode==0)) dlg_unlock( d_table, d_entry); + if (dlg_no_totag) return dlg_no_totag; + LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

4 years, 1 month

git:5.3:71c40960: dialog: dlg_cell, always check for a to-tag match

by Julien Chavanton

Module: kamailio Branch: 5.3 Commit: 71c40960fdd5583d64bf198573d7cd5db9ec5433 URL: https://github.com/kamailio/kamailio/commit/71c40960fdd5583d64bf198573d7cd5… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-29T08:59:55-07:00 dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/71c40960fdd5583d64bf198573d7cd5… Patch: https://github.com/kamailio/kamailio/commit/71c40960fdd5583d64bf198573d7cd5… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5557e87574..93d35f553b 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -865,6 +865,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, unsigned int *dir, int mode) { struct dlg_cell *dlg; + struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; d_entry = &(d_table->entries[h_entry]); @@ -876,13 +877,24 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { ref_dlg_unsafe(dlg, 1); if(likely(mode==0)) dlg_unlock( d_table, d_entry); - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + + /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ + if (dlg->tag[1].len == 0) { + dlg_no_totag=dlg; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", + callid->len, callid->s,h_entry,*dir); + continue; + } + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", + callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + return dlg; } } if(likely(mode==0)) dlg_unlock( d_table, d_entry); + if (dlg_no_totag) return dlg_no_totag; + LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

4 years, 1 month

git:5.4:0bde3ca5: dialog: dlg_cell, always check for a to-tag match

by Julien Chavanton

Module: kamailio Branch: 5.4 Commit: 0bde3ca506467008cf3d8345afa731617b095c8c URL: https://github.com/kamailio/kamailio/commit/0bde3ca506467008cf3d8345afa7316… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-29T08:58:58-07:00 dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/0bde3ca506467008cf3d8345afa7316… Patch: https://github.com/kamailio/kamailio/commit/0bde3ca506467008cf3d8345afa7316… --- diff --git a/src/modules/dialog/dlg_hash.c b/src/modules/dialog/dlg_hash.c index 5557e87574..93d35f553b 100644 --- a/src/modules/dialog/dlg_hash.c +++ b/src/modules/dialog/dlg_hash.c @@ -865,6 +865,7 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, unsigned int *dir, int mode) { struct dlg_cell *dlg; + struct dlg_cell *dlg_no_totag=NULL; struct dlg_entry *d_entry; d_entry = &(d_table->entries[h_entry]); @@ -876,13 +877,24 @@ static inline struct dlg_cell* internal_get_dlg(unsigned int h_entry, if (match_dialog( dlg, callid, ftag, ttag, dir)==1) { ref_dlg_unsafe(dlg, 1); if(likely(mode==0)) dlg_unlock( d_table, d_entry); - LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", - callid->len, callid->s,h_entry,*dir); + + /* If to-tag is empty continue to search in case another dialog is found with a matching to-tag. */ + if (dlg->tag[1].len == 0) { + dlg_no_totag=dlg; + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d\n", + callid->len, callid->s,h_entry,*dir); + continue; + } + LM_DBG("dialog callid='%.*s' found on entry %u, dir=%d to-tag='%.*s'\n", + callid->len, callid->s,h_entry,*dir, dlg->tag[1].len, dlg->tag[1].s); + return dlg; } } if(likely(mode==0)) dlg_unlock( d_table, d_entry); + if (dlg_no_totag) return dlg_no_totag; + LM_DBG("no dialog callid='%.*s' found\n", callid->len, callid->s); return 0; }

4 years, 1 month

[kamailio/kamailio] temporary extra debugability of unexpected no-ack disconnection (#2483)

by Julien Chavanton

4 years, 1 month

[kamailio/kamailio] dispatcher: fix an error in initially (#2485)

by Julien Chavanton

training of the latency estimator   #### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) #### Checklist:  - [x] Tested changes locally #### Description  minor issue with the estimator initialization / training You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2485 -- Commit Summary -- * dispatcher: fix an error in initially -- File Changes -- M src/modules/dispatcher/dispatch.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2485.patch https://github.com/kamailio/kamailio/pull/2485.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/2485

4 years, 1 month

git:master:a7693045: Merge pull request #2485 from kamailio/jchavanton/dispatcher

by GitHub

Module: kamailio Branch: master Commit: a7693045df3c01e29d485aebeb21ccff3ed1ce96 URL: https://github.com/kamailio/kamailio/commit/a7693045df3c01e29d485aebeb21ccf… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-09-29T08:42:30-07:00 Merge pull request #2485 from kamailio/jchavanton/dispatcher dispatcher: fix an error in initialisation --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/a7693045df3c01e29d485aebeb21ccf… Patch: https://github.com/kamailio/kamailio/commit/a7693045df3c01e29d485aebeb21ccf… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 4066bc39d7..8e798a871b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2588,6 +2588,8 @@ int ds_mark_dst(struct sip_msg *msg, int state) } static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { + int training_count = 10000; + /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; @@ -2602,8 +2604,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l latency_stats->average = latency; latency_stats->estimate = latency; } - /* train the average if stable after 10 samples */ - if (latency_stats->count > 10 && latency_stats->stdev < 0.5) latency_stats->count = 500000; + /* stabilize-train the estimator if the average is stable after 10 samples */ + if (latency_stats->count > 10 && latency_stats->count < training_count + && latency_stats->stdev < 0.5) + latency_stats->count = training_count; if (latency_stats->min > latency) latency_stats->min = latency; if (latency_stats->max < latency)

4 years, 1 month

git:master:b728cb30: dispatcher: fix an error in initialisation /

by Julien Chavanton

Module: kamailio Branch: master Commit: b728cb30810ef44b821a93335cdd34f954f2029c URL: https://github.com/kamailio/kamailio/commit/b728cb30810ef44b821a93335cdd34f… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-28T13:02:44-07:00 dispatcher: fix an error in initialisation / training of the latency estimator --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/b728cb30810ef44b821a93335cdd34f… Patch: https://github.com/kamailio/kamailio/commit/b728cb30810ef44b821a93335cdd34f… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 4066bc39d7..8e798a871b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2588,6 +2588,8 @@ int ds_mark_dst(struct sip_msg *msg, int state) } static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int latency) { + int training_count = 10000; + /* after 2^21 ~24 days at 1s interval, the average becomes a weighted average */ if (latency_stats->count < 2097152) { latency_stats->count++; @@ -2602,8 +2604,10 @@ static inline void latency_stats_update(ds_latency_stats_t *latency_stats, int l latency_stats->average = latency; latency_stats->estimate = latency; } - /* train the average if stable after 10 samples */ - if (latency_stats->count > 10 && latency_stats->stdev < 0.5) latency_stats->count = 500000; + /* stabilize-train the estimator if the average is stable after 10 samples */ + if (latency_stats->count > 10 && latency_stats->count < training_count + && latency_stats->stdev < 0.5) + latency_stats->count = training_count; if (latency_stats->min > latency) latency_stats->min = latency; if (latency_stats->max < latency)

4 years, 1 month

← Newer
1
...
8
9
10
11
12
13
14
...
27
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2020