- sr-dev - kamailio.org

git:master:acd7f6f1: topos: update to-tag and rr on reply even to-tag is already set
by Daniel-Constantin Mierla 01 Oct '20

01 Oct '20

Module: kamailio Branch: master Commit: acd7f6f1703d12aa8f2dce87e1b8e4b74d6b4d96 URL: https://github.com/kamailio/kamailio/commit/acd7f6f1703d12aa8f2dce87e1b8e4b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-01T10:04:50+02:00 topos: update to-tag and rr on reply even to-tag is already set - GH #2489 --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/acd7f6f1703d12aa8f2dce87e1b8e4b… Patch: https://github.com/kamailio/kamailio/commit/acd7f6f1703d12aa8f2dce87e1b8e4b… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index ae7a4ec2c1..b506a94b97 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -1343,7 +1343,7 @@ int tps_db_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, nr_keys = 0; nr_ucols = 0; - db_keys[nr_keys]=&td_col_a_uuid; + db_keys[nr_keys]=&tt_col_a_uuid; db_ops[nr_keys]=OP_EQ; db_vals[nr_keys].type = DB1_STR; db_vals[nr_keys].nul = 0; @@ -1366,8 +1366,7 @@ int tps_db_update_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } if((mode & TPS_DBU_RPLATTRS) && msg->first_line.type==SIP_REPLY) { - if(sd->b_tag.len<=0 - && msg->first_line.u.reply.statuscode>=180 + if(msg->first_line.u.reply.statuscode>=180 && msg->first_line.u.reply.statuscode<200) { db_ucols[nr_ucols] = &tt_col_y_rr;

1 0

git:master:8301f366: topos: store branch record before dialog record
by Daniel-Constantin Mierla 01 Oct '20

01 Oct '20

Module: kamailio Branch: master Commit: 8301f366538ef7e63096d9fe10fa5c2aee780e81 URL: https://github.com/kamailio/kamailio/commit/8301f366538ef7e63096d9fe10fa5c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-10-01T09:44:59+02:00 topos: store branch record before dialog record --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/8301f366538ef7e63096d9fe10fa5c2… Patch: https://github.com/kamailio/kamailio/commit/8301f366538ef7e63096d9fe10fa5c2… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index ae4a635c1f..ae7a4ec2c1 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -545,6 +545,8 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) ret = tps_storage_link_msg(msg, td, dir); if(ret<0) goto error; + ret = _tps_storage_api.insert_branch(td); + if(ret<0) goto error; if(dialog==0) { if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { LM_WARN("no local address - do record routing for all initial requests\n"); @@ -552,8 +554,6 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog, int dir) ret = _tps_storage_api.insert_dialog(td); if(ret<0) goto error; } - ret = _tps_storage_api.insert_branch(td); - if(ret<0) goto error; return 0;

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Daniel-Constantin Mierla 30 Sep '20

30 Sep '20

Closed #2479. -- 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/2479#event-3824129189

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Daniel-Constantin Mierla 30 Sep '20

30 Sep '20

@linuxmaniac - closing this one, 2e7710e should fix it. Once you test and it is ok, then you can backport as needed. If still an issues, then reopen. -- 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/2479#issuecomment-701344668

1 0

git:master:8a1d5d98: rr: use safer msg_ctx_id_t checks for asserting validity of cached param value
by Daniel-Constantin Mierla 30 Sep '20

30 Sep '20

Module: kamailio Branch: master Commit: 8a1d5d9853fce4a78818ebec15c2c7bf04b5a3f3 URL: https://github.com/kamailio/kamailio/commit/8a1d5d9853fce4a78818ebec15c2c7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-30T13:09:51+02:00 rr: use safer msg_ctx_id_t checks for asserting validity of cached param value --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/8a1d5d9853fce4a78818ebec15c2c7b… Patch: https://github.com/kamailio/kamailio/commit/8a1d5d9853fce4a78818ebec15c2c7b… --- diff --git a/src/modules/rr/record.c b/src/modules/rr/record.c index df3caf4a8d..604b3d2393 100644 --- a/src/modules/rr/record.c +++ b/src/modules/rr/record.c @@ -78,7 +78,7 @@ extern int rr_sockname_mode; */ static char rr_param_buf_ptr[RR_PARAM_BUF_SIZE]; static str rr_param_buf = {rr_param_buf_ptr,0}; -static unsigned int rr_param_msg; +static msg_ctx_id_t rr_param_ctx_id = {0}; static pv_spec_t *custom_user_avp; /*!< AVP for custom_user setting */ @@ -429,7 +429,7 @@ int record_route(struct sip_msg* _m, str *params) tag = 0; } - if (rr_param_buf.len && rr_param_msg!=_m->id) { + if (rr_param_buf.len && (msg_ctx_id_match(_m, &rr_param_ctx_id)!=1)) { /* rr_params were set for a different message -> reset buffer */ rr_param_buf.len = 0; } @@ -549,7 +549,7 @@ int record_route_preset(struct sip_msg* _m, str* _data) from = get_from(_m); } - if (rr_param_buf.len && rr_param_msg!=_m->id) { + if (rr_param_buf.len && (msg_ctx_id_match(_m, &rr_param_ctx_id)!=1)) { /* rr_params were set for a different message -> reset buffer */ rr_param_buf.len = 0; } @@ -817,7 +817,7 @@ int record_route_advertised_address(struct sip_msg* _m, str* _data) tag = 0; } - if (rr_param_buf.len && rr_param_msg!=_m->id) { + if (rr_param_buf.len && (msg_ctx_id_match(_m, &rr_param_ctx_id)!=1)) { /* rr_params were set for a different message -> reset buffer */ rr_param_buf.len = 0; } @@ -930,10 +930,10 @@ int add_rr_param(struct sip_msg* msg, str* rr_param) } } else { /* RR not done yet -> store the param in the static buffer */ - if (rr_param_msg!=msg->id) { + if (msg_ctx_id_match(msg, &rr_param_ctx_id)!=1) { /* it's about a different message -> reset buffer */ rr_param_buf.len = 0; - rr_param_msg = msg->id; + msg_ctx_id_set(msg, &rr_param_ctx_id); } if (rr_param_buf.len+rr_param->len>RR_PARAM_BUF_SIZE) { LM_ERR("maximum size of rr_param_buf exceeded\n");

1 0

[kamailio/kamailio] rfc5952#section-4.3 conformance: IPv6 address in lower case (#2488)
by sergey-safarov 30 Sep '20

30 Sep '20

### Description [rfc5952#section-4.3](https://tools.ietf.org/html/rfc5952#section-4.3) > **4.3. Lowercase** The characters "a", "b", "c", "d", "e", and "f" in an IPv6 address MUST be represented in lowercase. ### Expected behavior According to RFC #### Actual observed behavior IPv6 addresses the upper case. #### Debugging Data None #### Log Messages None #### SIP Traffic ``` OPTIONS sip:proxy.example.com;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2600:1F1C:257:8706:C6BA:A565:1E85:B29E];branch=z9hG4bKa3e9.cac3f2f1000000000000000000000000.0 To: <sip:proxy.example.com;transport=tcp> From: <sip:proxy@example.com>;tag=897804205b5fb4c6a22d7dcb9cb796fb-733ff025 CSeq: 10 OPTIONS Call-ID: 29ea7b443fbf87f8-2892(a)172.22.6.119 Max-Forwards: 70 Content-Length: 0 User-Agent: Kamailio ``` ### Possible Solutions Not known ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [centos@ip-172-22-6-226 ~]$ kamailio -v version: kamailio 5.5.0-dev2 (x86_64/linux) 60f04b 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: 60f04b compiled on 04:01:18 Sep 26 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [centos@ip-172-22-6-226 ~]$ cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="8" ``` -- 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/2488

2 6

git:master:8dfc0f6e: rr: reset param buffer for r-r advertised address
by Daniel-Constantin Mierla 30 Sep '20

30 Sep '20

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); }

1 0

git:master:d48ce56d: core: new parameter ipv6_hex_style
by Daniel-Constantin Mierla 30 Sep '20

30 Sep '20

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))

1 0

[kamailio/kamailio] dialog: dlg_cell, always check for a to-tag match (#2484)
by Julien Chavanton 29 Sep '20

29 Sep '20

#### 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

2 7

git:5.2:50b6e42c: dialog: dlg_cell, always check for a to-tag match
by Julien Chavanton 29 Sep '20

29 Sep '20

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; }

1 0

git:5.3:71c40960: dialog: dlg_cell, always check for a to-tag match
by Julien Chavanton 29 Sep '20

29 Sep '20

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; }

1 0

git:5.4:0bde3ca5: dialog: dlg_cell, always check for a to-tag match
by Julien Chavanton 29 Sep '20

29 Sep '20

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; }

1 0

[kamailio/kamailio] temporary extra debugability of unexpected no-ack disconnection (#2483)
by Julien Chavanton 29 Sep '20

29 Sep '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2483 -- Commit Summary -- * dialog: no-ack-extra-debug -- File Changes -- M src/modules/dialog/dlg_handlers.c (48) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2483.patch https://github.com/kamailio/kamailio/pull/2483.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/2483

1 2

[kamailio/kamailio] dispatcher: fix an error in initially (#2485)
by Julien Chavanton 29 Sep '20

29 Sep '20

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

2 2

git:master:b728cb30: dispatcher: fix an error in initialisation /
by Julien Chavanton 29 Sep '20

29 Sep '20

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)

1 0

git:master:a7693045: Merge pull request #2485 from kamailio/jchavanton/dispatcher
by GitHub 29 Sep '20

29 Sep '20

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)

1 0

git:master:498aa359: dialog: dlg_cell, always check for a to-tag match
by Julien Chavanton 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: 498aa35987bcfd329cf5a4879eb63888ff8ef225 URL: https://github.com/kamailio/kamailio/commit/498aa35987bcfd329cf5a4879eb6388… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: Julien Chavanton <jchavanton(a)gmail.com> Date: 2020-09-28T09:49:04-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/498aa35987bcfd329cf5a4879eb6388… Patch: https://github.com/kamailio/kamailio/commit/498aa35987bcfd329cf5a4879eb6388… --- 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; }

1 0

git:master:ba7d1d2e: Merge pull request #2484 from kamailio/jchavanton/dlg_missmatch
by GitHub 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: ba7d1d2e586ed22dcc78898eaa08abd61606212a URL: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… Author: Julien Chavanton <jchavanton(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-09-29T08:41:34-07:00 Merge pull request #2484 from kamailio/jchavanton/dlg_missmatch dialog: dlg_cell, always check for a to-tag match --- Modified: src/modules/dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… Patch: https://github.com/kamailio/kamailio/commit/ba7d1d2e586ed22dcc78898eaa08abd… --- 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; }

1 0

[kamailio/kamailio] kamailio-3.3.x-freeswitch-1.2.x-sbc I encountered 488 when using Internet (#2487)
by yuexiajiayan 29 Sep '20

29 Sep '20

i'm use it on freeswitch public ip 47.xx.xx.xx and private ip 172.31.239.38 i'm test it http://kb.asipto.com/freeswitch:kamailio-3.3.x-freeswitch-1.2.x-sbc (freeswitch.bindip= 47.xx.xx.xx ) and 101 to 100 and return 488 There seems to be no problem using it on the intranet and log: 8(21255) NOTICE: {2 26129640 INVITE b1b6df17-7ccd-1239-9990-00163e05779b} acc [acc.c:279]: acc_log_request(): ACC: call missed: timestamp=1601366864;method=INVITE;from_tag=t7jr1405ee9gp;to_tag=dGSi5k2;call_id=b1b6df17-7ccd-1239-9990-00163e05779b;code=488;reason=Not acceptable here;src_user=101;src_domain=172.31.239.38;src_ip=47.xxx.xx.xx;dst_ouser=100;dst_user=100;dst_domain=220.207.94.221 fs log: to 100 ask return INCOMPATIBLE_DESTINATION error Do you need to modify anything in the public network？ I can't find any information. Please help me? thinks -- 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/2487

2 2

git:master:a4cc0be0: modules: readme files regenerated - topoh ... [skip ci]
by Kamailio Dev 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: a4cc0be07f78575fdfeae7aebfce6d37838765d6 URL: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-29T10:46:15+02:00 modules: readme files regenerated - topoh ... [skip ci] --- Modified: src/modules/topoh/README Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… Patch: https://github.com/kamailio/kamailio/commit/a4cc0be07f78575fdfeae7aebfce6d3… --- diff --git a/src/modules/topoh/README b/src/modules/topoh/README index 45e4b904d7..5f2113ef58 100644 --- a/src/modules/topoh/README +++ b/src/modules/topoh/README @@ -36,10 +36,12 @@ Daniel-Constantin Mierla 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] List of Examples @@ -54,7 +56,9 @@ Daniel-Constantin Mierla 1.9. Set sanity_checks parameter 1.10. Set uri_prefix_checks parameter 1.11. Set event_callback parameter - 1.12. Usage of event_route[topoh:msg-outgoing] + 1.12. Set event_mode parameter + 1.13. Usage of event_route[topoh:msg-outgoing] + 1.14. Usage of event_route[topoh:msg-sending] Chapter 1. Admin Guide @@ -79,10 +83,12 @@ Chapter 1. Admin Guide 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] 1. Overview @@ -130,6 +136,7 @@ Chapter 1. Admin Guide 3.9. sanity_checks (integer) 3.10. uri_prefix_checks (integer) 3.11. event_callback (str) + 3.12. event_mode (int) 3.1. mask_key (str) @@ -284,9 +291,23 @@ function ksr_topoh_event(evname) end ... +3.12. event_mode (int) + + Control what event_route blocks to be executed. It is a bitmask of: 1 - + execute event_route[topoh:msg-outgoing]; 2 - execute + event_route[topoh:msg-sending]. + + Default value is 3 (execute both event_route blocks). + + Example 1.12. Set event_mode parameter +... +modparam("topoh", "event_mode", 2) +... + 4. Event Routes 4.1. event_route[topoh:msg-outgoing] + 4.2. event_route[topoh:msg-sending] 4.1. event_route[topoh:msg-outgoing] @@ -300,7 +321,7 @@ end reparsing the outgoing SIP message for the cases when topology hiding is not wanted. - Example 1.12. Usage of event_route[topoh:msg-outgoing] + Example 1.13. Usage of event_route[topoh:msg-outgoing] ... event_route[topoh:msg-outgoing] { if($sndto(ip)=="10.1.1.10") { @@ -308,3 +329,22 @@ event_route[topoh:msg-outgoing] { } } ... + +4.2. event_route[topoh:msg-sending] + + It is executed before doing topology hiding processing for a SIP + message to be sent out, being executed after + event_route[topoh:msg-outgoing]. + + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is the one to + be sent out. + + Example 1.14. Usage of event_route[topoh:msg-sending] +... +event_route[topoh:msg-sending] { + if(is_request() and $fU=="alice") { + drop; + } +} +... diff --git a/src/modules/topos/README b/src/modules/topos/README index 72b1ae8b3f..339ecd4f5d 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -265,8 +265,8 @@ end 3.9. event_mode (int) Control what event_route blocks to be executed. It is a bitmask of: 1 - - execute event_route[topos:outgoing]; 2 - execute - event_route[topos:sending]. + execute event_route[topos:msg-outgoing]; 2 - execute + event_route[topos:msg-sending]. Default value is 3 (execute both event_route blocks).

1 0

git:master:e48655dd: topoh: docs for event_mode param and msg-sending event route
by Daniel-Constantin Mierla 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: e48655dd638eed8bbbd8d6087363dbdeb45a451c URL: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:35:58+02:00 topoh: docs for event_mode param and msg-sending event route --- Modified: src/modules/topoh/doc/topoh_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… Patch: https://github.com/kamailio/kamailio/commit/e48655dd638eed8bbbd8d6087363dbd… --- diff --git a/src/modules/topoh/doc/topoh_admin.xml b/src/modules/topoh/doc/topoh_admin.xml index 857813585b..ff98338f02 100644 --- a/src/modules/topoh/doc/topoh_admin.xml +++ b/src/modules/topoh/doc/topoh_admin.xml @@ -308,6 +308,27 @@ function ksr_topoh_event(evname) return 1; end ... +</programlisting> + </example> + </section> + <section id="topoh.p.event_mode"> + <title><varname>event_mode</varname> (int)</title> + <para> + Control what event_route blocks to be executed. It is a bitmask of: + 1 - execute event_route[topoh:msg-outgoing]; 2 - execute + event_route[topoh:msg-sending]. + </para> + <para> + <emphasis> + Default value is 3 (execute both event_route blocks). + </emphasis> + </para> + <example> + <title>Set <varname>event_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("topoh", "event_mode", 2) +... </programlisting> </example> </section> @@ -315,7 +336,7 @@ end <section> <title>Event Routes</title> - <section> + <section id="topoh.e.msg_outgoing"> <title>event_route[topoh:msg-outgoing]</title> <para> It is executed before doing topology hiding processing for an outgoing @@ -339,6 +360,30 @@ event_route[topoh:msg-outgoing] { } } ... +</programlisting> + </example> + </section> + <section id="topoh.e.msg_sending"> + <title>event_route[topoh:msg-sending]</title> + <para> + It is executed before doing topology hiding processing for a SIP + message to be sent out, being executed after event_route[topoh:msg-outgoing]. + </para> + <para> + Inside the event route the variables $sndto(ip), $sndto(port) and + $sndto(proto) point to the destination. The SIP message is the one + to be sent out. + </para> + <example> + <title>Usage of event_route[topoh:msg-sending]</title> + <programlisting format="linespecific"> +... +event_route[topoh:msg-sending] { + if(is_request() and $fU=="alice") { + drop; + } +} +... </programlisting> </example> </section>

1 0

git:master:0b4edbe9: topos: docs - fix references to event route names
by Daniel-Constantin Mierla 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: 0b4edbe967587fff3d8367c1dc301b4e22ca0949 URL: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:39:06+02:00 topos: docs - fix references to event route names --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… Patch: https://github.com/kamailio/kamailio/commit/0b4edbe967587fff3d8367c1dc301b4… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 973391430b..f5d438ec1c 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -268,8 +268,8 @@ end <title><varname>event_mode</varname> (int)</title> <para> Control what event_route blocks to be executed. It is a bitmask of: - 1 - execute event_route[topos:outgoing]; 2 - execute - event_route[topos:sending]. + 1 - execute event_route[topos:msg-outgoing]; 2 - execute + event_route[topos:msg-sending]. </para> <para> <emphasis>

1 0

git:master:21e04744: topoh: execute msg-outgoing and msg-sending event routes
by Daniel-Constantin Mierla 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: 21e04744a17522f8367e483c672adc01d836d75b URL: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T10:27:05+02:00 topoh: execute msg-outgoing and msg-sending event routes - similar to topos module - new event_mode modparam to control kemi callbacks execution --- Modified: src/modules/topoh/topoh_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0… Patch: https://github.com/kamailio/kamailio/commit/21e04744a17522f8367e483c672adc0…

1 0

git:5.4:aed88c64: pv: use the corresponding functions for parsing names of xavu and xavi
by Daniel-Constantin Mierla 29 Sep '20

29 Sep '20

Module: kamailio Branch: 5.4 Commit: aed88c64710493452ee3ea8468c80c3c01287111 URL: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T09:20:49+02:00 pv: use the corresponding functions for parsing names of xavu and xavi (cherry picked from commit aa8589ba66f984e93438a91a7fe8b26bd9d5b62e) --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… Patch: https://github.com/kamailio/kamailio/commit/aed88c64710493452ee3ea8468c80c3… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4d3d8b343c..ab48a54647 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -96,10 +96,10 @@ static pv_export_t mod_pvs[] = { pv_parse_xavp_name, 0, 0, 0 }, { {"xavu", sizeof("xavu")-1}, /* xavu */ PVT_XAVU, pv_get_xavu, pv_set_xavu, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavu_name, 0, 0, 0 }, { {"xavi", sizeof("xavi")-1}, /* xavi */ PVT_XAVI, pv_get_xavi, pv_set_xavi, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavi_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -1221,7 +1221,7 @@ static int w_xav_child_seti(sip_msg_t *msg, char *prname, char *pcname, return -1; } - return ki_xav_child_seti(msg, &rname, &cname, ival, _case); + return ki_xav_child_seti(msg, &rname, &cname, ival, _case); } static int w_xavp_child_seti(sip_msg_t *msg, char *prname, char *pcname, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 9510c405ba..36127a2484 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -234,7 +234,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, xavp_rm_by_index(&xname->name, idx, NULL); return 0; } - + if(xname->next->index.type==PVT_EXTRA) { /* get the index */ @@ -352,7 +352,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, return -1; return 0; } - + /* xavp with xavp list value */ if(xname->next->index.type==PVT_EXTRA) { @@ -389,7 +389,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, if(avp->val.type!=SR_XTYPE_XAVP) return -1; - + if(xname->next->index.type==PVT_EXTRA) { if(idxf1==PV_IDX_ALL) { /* ignore: should iterate and set same value to all xavps @@ -416,7 +416,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, /* add new xavp with xavp list */ if(xavp_add_value(&xname->next->name, &xval, &list)==NULL) return -1; - + /* build xavp value */ memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_XAVP; @@ -895,7 +895,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, xavu_rm_by_name(&xname->name, NULL); return 0; } - + avu = xavu_lookup(&xname->name, NULL); if(avu!=NULL && avu->val.type==SR_XTYPE_XAVP) { xavu_rm_by_name(&xname->next->name, &avu->val.v.xavp);

1 0

git:master:aa8589ba: pv: use the corresponding functions for parsing names of xavu and xavi
by Daniel-Constantin Mierla 29 Sep '20

29 Sep '20

Module: kamailio Branch: master Commit: aa8589ba66f984e93438a91a7fe8b26bd9d5b62e URL: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-29T07:25:46+02:00 pv: use the corresponding functions for parsing names of xavu and xavi --- Modified: src/modules/pv/pv.c Modified: src/modules/pv/pv_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… Patch: https://github.com/kamailio/kamailio/commit/aa8589ba66f984e93438a91a7fe8b26… --- diff --git a/src/modules/pv/pv.c b/src/modules/pv/pv.c index 4d3d8b343c..ab48a54647 100644 --- a/src/modules/pv/pv.c +++ b/src/modules/pv/pv.c @@ -96,10 +96,10 @@ static pv_export_t mod_pvs[] = { pv_parse_xavp_name, 0, 0, 0 }, { {"xavu", sizeof("xavu")-1}, /* xavu */ PVT_XAVU, pv_get_xavu, pv_set_xavu, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavu_name, 0, 0, 0 }, { {"xavi", sizeof("xavi")-1}, /* xavi */ PVT_XAVI, pv_get_xavi, pv_set_xavi, - pv_parse_xavp_name, 0, 0, 0 }, + pv_parse_xavi_name, 0, 0, 0 }, {{"avp", (sizeof("avp")-1)}, PVT_AVP, pv_get_avp, pv_set_avp, pv_parse_avp_name, pv_parse_index, 0, 0}, {{"hdr", (sizeof("hdr")-1)}, PVT_HDR, pv_get_hdr, 0, pv_parse_hdr_name, @@ -1221,7 +1221,7 @@ static int w_xav_child_seti(sip_msg_t *msg, char *prname, char *pcname, return -1; } - return ki_xav_child_seti(msg, &rname, &cname, ival, _case); + return ki_xav_child_seti(msg, &rname, &cname, ival, _case); } static int w_xavp_child_seti(sip_msg_t *msg, char *prname, char *pcname, diff --git a/src/modules/pv/pv_xavp.c b/src/modules/pv/pv_xavp.c index 9510c405ba..36127a2484 100644 --- a/src/modules/pv/pv_xavp.c +++ b/src/modules/pv/pv_xavp.c @@ -234,7 +234,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, xavp_rm_by_index(&xname->name, idx, NULL); return 0; } - + if(xname->next->index.type==PVT_EXTRA) { /* get the index */ @@ -352,7 +352,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, return -1; return 0; } - + /* xavp with xavp list value */ if(xname->next->index.type==PVT_EXTRA) { @@ -389,7 +389,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, if(avp->val.type!=SR_XTYPE_XAVP) return -1; - + if(xname->next->index.type==PVT_EXTRA) { if(idxf1==PV_IDX_ALL) { /* ignore: should iterate and set same value to all xavps @@ -416,7 +416,7 @@ int pv_set_xavp(struct sip_msg* msg, pv_param_t *param, /* add new xavp with xavp list */ if(xavp_add_value(&xname->next->name, &xval, &list)==NULL) return -1; - + /* build xavp value */ memset(&xval, 0, sizeof(sr_xval_t)); xval.type = SR_XTYPE_XAVP; @@ -895,7 +895,7 @@ int pv_set_xavu(struct sip_msg* msg, pv_param_t *param, xavu_rm_by_name(&xname->name, NULL); return 0; } - + avu = xavu_lookup(&xname->name, NULL); if(avu!=NULL && avu->val.type==SR_XTYPE_XAVP) { xavu_rm_by_name(&xname->next->name, &avu->val.v.xavp);

1 0

git:5.4:a6cb7427: usrloc: set last keepalive value to current time on new records
by Daniel-Constantin Mierla 25 Sep '20

25 Sep '20

Module: kamailio Branch: 5.4 Commit: a6cb7427ea8d98ba10d51e1fde3648bb1aca53b6 URL: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-25T09:41:38+02:00 usrloc: set last keepalive value to current time on new records - do not rely on last modified value, can be loaded from db and be too old (cherry picked from commit 60f04b6d6f51b55294d22722df3f351a76cbfb9b) --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… Patch: https://github.com/kamailio/kamailio/commit/a6cb7427ea8d98ba10d51e1fde3648b… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 256d9530c2..95ed8d530c 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -26,8 +26,8 @@ * - Module: \ref usrloc */ -#include "ucontact.h" -#include <string.h> /* memcpy */ +#include <string.h> +#include <time.h> #include "../../core/mem/shm_mem.h" #include "../../core/ut.h" #include "../../core/ip_addr.h" @@ -129,7 +129,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->methods = _ci->methods; c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; - c->last_keepalive = _ci->last_modified; + c->last_keepalive = time(NULL); c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & ul_nat_bflag)?1:0; @@ -295,7 +295,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->cseq = _ci->cseq; _c->methods = _ci->methods; _c->last_modified = _ci->last_modified; - _c->last_keepalive = _ci->last_modified; + _c->last_keepalive = time(NULL); _c->flags = _ci->flags; _c->cflags = _ci->cflags; _c->server_id = _ci->server_id;

1 0

git:master:60f04b6d: usrloc: set last keepalive value to current time on new records
by Daniel-Constantin Mierla 25 Sep '20

25 Sep '20

Module: kamailio Branch: master Commit: 60f04b6d6f51b55294d22722df3f351a76cbfb9b URL: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-25T09:38:39+02:00 usrloc: set last keepalive value to current time on new records - do not rely on last modified value, can be loaded from db and be too old --- Modified: src/modules/usrloc/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… Patch: https://github.com/kamailio/kamailio/commit/60f04b6d6f51b55294d22722df3f351… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index 256d9530c2..95ed8d530c 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -26,8 +26,8 @@ * - Module: \ref usrloc */ -#include "ucontact.h" -#include <string.h> /* memcpy */ +#include <string.h> +#include <time.h> #include "../../core/mem/shm_mem.h" #include "../../core/ut.h" #include "../../core/ip_addr.h" @@ -129,7 +129,7 @@ ucontact_t* new_ucontact(str* _dom, str* _aor, str* _contact, ucontact_info_t* _ c->methods = _ci->methods; c->reg_id = _ci->reg_id; c->last_modified = _ci->last_modified; - c->last_keepalive = _ci->last_modified; + c->last_keepalive = time(NULL); c->tcpconn_id = _ci->tcpconn_id; c->server_id = _ci->server_id; c->keepalive = (_ci->cflags & ul_nat_bflag)?1:0; @@ -295,7 +295,7 @@ int mem_update_ucontact(ucontact_t* _c, ucontact_info_t* _ci) _c->cseq = _ci->cseq; _c->methods = _ci->methods; _c->last_modified = _ci->last_modified; - _c->last_keepalive = _ci->last_modified; + _c->last_keepalive = time(NULL); _c->flags = _ci->flags; _c->cflags = _ci->cflags; _c->server_id = _ci->server_id;

1 0

[kamailio/kamailio] Kamailio-5.4.0 : Crashes from keepalive module (#2448)
by sagarmalam 24 Sep '20

24 Sep '20

### Description  I am using keepalive module to send keepalives to all the destinations registered with an application server which sits behind kamailio. When Kamailio recieves 200 Ok. I take URI contact from 200 OK and pass it as a param to ka_add_destination function.Most of the time it works fine but sometimes kamailio crashes when it recieves 200 OK of OPTIONS. ### Troubleshooting #### Reproduction I am able to reproduce it easily in below scenario : All the URIs which we are feeding to KA module has this syntax : sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp 1. So request will be generate by KA module and it will be send to 10.50.8.11:9090 ( which is another port of same kamailio instance ) via UDP protocol. 2. On recieving OPTION on 9090 port , - We are calling handle_ruri_alias() function which will set $du =sip:10.50.8.1:5060;transport=udp - Modify RURI from sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp to sip:2003@**35.185.177.49:5060**;pb-ip=35.185.177.49;pb-pt=5060;**transport**=udp - and relay to 10.50.8.1 3. 10.50.8.1 is another instance of Kamailio which will relay OPTION packet to final destination  #### Debugging Data  ``` [root@SBC-4-2 /]# gdb kamailio core.67771 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-110.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/local/sbin/kamailio...done. [New LWP 67771] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -m 5000 -M 500 -P /run/kamailio/kamailio.pid'. Program terminated with signal 11, Segmentation fault. #0 0x00000000abcdefed in ?? () Missing separate debuginfos, use: debuginfo-install cyrus-sasl-lib-2.1.26-23.el7.x86_64 glibc-2.17-222.el7.x86_64 keyutils-libs-1.5.8-3.el7.x86_64 krb5-libs-1.15.1-19.el7.x86_64 libcom_err-1.42.9-12.el7_5.x86_64 libcurl-7.29.0-51.el7.x86_64 libevent-2.0.21-4.el7.x86_64 libgcc-4.8.5-36.el7_6.2.x86_64 libidn-1.28-4.el7.x86_64 libselinux-2.5-12.el7.x86_64 libssh2-1.4.3-10.el7_2.1.x86_64 libstdc++-4.8.5-36.el7_6.2.x86_64 libuuid-2.23.2-52.el7_5.1.x86_64 mariadb-libs-5.5.64-1.el7.x86_64 nspr-4.19.0-1.el7_5.x86_64 nss-3.36.0-5.el7_5.x86_64 nss-softokn-freebl-3.36.0-5.el7_5.x86_64 nss-util-3.36.0-1.el7_5.x86_64 openldap-2.4.44-15.el7_5.x86_64 openssl-libs-1.0.2k-16.el7_6.1.x86_64 pcre-8.32-17.el7.x86_64 zlib-1.2.7-18.el7.x86_64 (gdb) bt full #0 0x00000000abcdefed in ?? () No symbol table info available. #1 0x00007f931dc69c7e in ka_options_callback (t=0x7f91e58f05c0, type=1024, ps=0x7ffda0977bd0) at keepalive_core.c:126 uri = { s = 0x7f91e58f63f0 "sip:2003@10.50.8.11:9090;alias=10.50.8.1~5060~1;pb-ip=35.185.177.49;pb-pt=5060;tp=udp>\r\nFrom: <sip:keepalive@fromsbc>;tag=c7bfd876be500fff196414658218fc27-d6989f6d\r\nCSeq: 10 OPTIONS\r\nCall-ID: 3f2c3c7c"..., len = 85} msg = 0x0 state = 2 state_routes = {0x7f931dc6f844 "", 0x7f931dc6f93d "keepalive:dst-up", 0x7f931dc6f94e "keepalive:dst-down"} ka_dest = 0x7f91e5898988 __FUNCTION__ = "ka_options_callback" #2 0x00007f9324bfddd8 in run_trans_callbacks_internal (cb_lst=0x7f91e58f0638, type=1024, trans=0x7f91e58f05c0, params=0x7ffda0977bd0) at t_hooks.c:258 cbp = 0x7f91e58f6590 backup_from = 0xb2a750 <def_list+16> backup_to = 0xb2a758 <def_list+24> backup_dom_from = 0xb2a760 <def_list+32> backup_dom_to = 0xb2a768 <def_list+40> backup_uri_from = 0xb2a740 <def_list> backup_uri_to = 0xb2a748 <def_list+8> backup_xavps = 0xb29fd0 <_xavp_list_head> backup_xavus = 0xb29fd8 <_xavu_list_head> backup_xavis = 0xb29fe0 <_xavi_list_head> __FUNCTION__ = "run_trans_callbacks_internal" #3 0x00007f9324bfdf0a in run_trans_callbacks (type=1024, trans=0x7f91e58f05c0, req=0x0, rpl=0xffffffffffffffff, code=408) at t_hooks.c:285 params = {req = 0x0, rpl = 0xffffffffffffffff, param = 0x7f91e58f65a0, code = 408, flags = 0, branch = 0, t_rbuf = 0x0, dst = 0x0, send_buf = {s = 0x0, len = 0}} #4 0x00007f9324b943f1 in local_reply (t=0x7f91e58f05c0, p_msg=0xffffffffffffffff, branch=0, msg_status=408, cancel_data=0x7ffda0977d50) at t_reply.c:2265 local_store = 0 local_winner = 0 reply_status = RPS_COMPLETED winning_msg = 0xffffffffffffffff winning_code = 408 totag_retr = 0 ---Type <return> to continue, or q <return> to quit--- __FUNCTION__ = "local_reply" #5 0x00007f9324bcc9fd in fake_reply (t=0x7f91e58f05c0, branch=0, code=408) at timer.c:290 cancel_data = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = -443611712}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = -443611712}}}} do_cancel_branch = 0 reply_status = 67771 #6 0x00007f9324bcce95 in final_response_handler (r_buf=0x7f91e58f0860, t=0x7f91e58f05c0) at timer.c:462 silent = 0 branch_ret = 0 prev_branch = 0 now = 0 #7 0x00007f9324bccf56 in retr_buf_handler (ticks=112894435, tl=0x7f91e58f0880, p=0xfa0) at timer.c:518 rbuf = 0x7f91e58f0860 fr_remainder = 1 retr_remainder = 32657 retr_interval = 3847088576 new_retr_interval_ms = 6989250208 crt_retr_interval_ms = 140264594074048 t = 0x7f91e58f05c0 __FUNCTION__ = "retr_buf_handler" #8 0x00000000004b7bcd in slow_timer_main () at core/timer.c:1105 n = 12 ret = 4294967295 tl = 0x7f91e58f0880 i = 700 __FUNCTION__ = "slow_timer_main" #9 0x000000000042a4c3 in main_loop () at main.c:1737 i = 16 pid = 0 si = 0x0 si_desc = "udp receiver child=15 sock=10.50.8.11:9090\000:0:0:11]:5060\000\061:5060)\000\000\000\000\000\000\000\000\000\000F\345\221\177\000\000\000\000\000\000\000\000\000\000\bLv\345\221\177\000\000P\201\227\240\375\177\000\000\210\212K\000\000\000\000\000\260\270A\000\000\000\000\000\b{\017(\223\177\000" nrprocs = 16 woneinit = 1 ---Type <return> to continue, or q <return> to quit--- __FUNCTION__ = "main_loop" #10 0x0000000000433a66 in main (argc=7, argv=0x7ffda09786b8) at main.c:2856 cfg_stream = 0x27e7010 c = -1 r = 0 tmp = 0x7ffda0979f26 "" tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x7d2498 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" ret = -1 seed = 791137056 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x7f934718ea00 <intel_02_known> p = 0x0 st = {st_dev = 23, st_ino = 30676, st_nlink = 2, st_mode = 16877, st_uid = 0, st_gid = 5001, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1597841333, tv_nsec = 176009291}, st_mtim = {tv_sec = 1597841333, tv_nsec = 166009247}, st_ctim = {tv_sec = 1597841333, tv_nsec = 176009291}, __unused = {0, 0, 0}} tbuf = "\377\377\377\377", '\000' <repeats 12 times>, "\340\263\001G\223\177\000\000\310T\320G\223\177", '\000' <repeats 90 times>, "p\342\252\000\000\000\000\000\260\270A\000\000\000\000\000\260\206\227\240\375\177", '\000' <repeats 26 times>, "\036_\260G\223\177\000\000\001", '\000' <repeats 23 times>... option_index = 0 long_options = {{name = 0x7d468f "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x7cfc94 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x7d4694 "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x7d469a "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x7d46a0 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x7d46a9 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x7d46b3 "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x7d46bd "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x7d46c8 "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x7d46d1 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x7d46dc "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __FUNCTION__ = "main" (gdb) ``` #### Log Messages  ``` Aug 19 12:58:26 SBC-4-2 /usr/local/sbin/kamailio[67772]: CRITICAL: <core> [core/mem/q_malloc.c:138]: qm_debug_check_frag(): BUG: qm: fragm. 0x7f91e5898950 (address 0x7f91e5898988) end overwritten (c0c0c0c1, abcdefed)! Memory allocator was called from core: core/usr_avp.c:626. Fragment marked by core: core/usr_avp.c:175. Exec from core/mem/q_malloc.c:511. Aug 19 12:58:38 SBC-4-2 /usr/local/sbin/kamailio[67793]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 94 ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@SBC-4-2 /]# kamailio -v version: kamailio 5.4.0 (x86_64/linux) 6c4fce 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 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: 6c4fce compiled on 14:16:47 Aug 14 2020 with gcc 4.8.5 ``` * **Operating System**:  ``` [root@SBC-4-2 /]# uname -a Linux SBC-4-2.netcarrier.net 5.1.0 #1 SMP Mon May 6 13:44:38 GMT 2019 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2448

4 34

git:master:298aeb7f: core: dns cache - removed disabled code between #if 0 ... #endif
by Daniel-Constantin Mierla 24 Sep '20

24 Sep '20

Module: kamailio Branch: master Commit: 298aeb7f93bfa75ec78bc941f2c76167525b2e61 URL: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-24T10:04:08+02:00 core: dns cache - removed disabled code between #if 0 ... #endif --- Modified: src/core/dns_cache.c --- Diff: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… Patch: https://github.com/kamailio/kamailio/commit/298aeb7f93bfa75ec78bc941f2c7616… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index c8567813e5..923c65049d 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2488,37 +2488,6 @@ struct hostent* dns_resolvehost(char* name) } - - -#if 0 -/* resolves a host name trying NAPTR, SRV, A & AAAA lookups, for details - * see dns_sip_resolve() - * FIXME: this version will return only the first ip - * returns: hostent struct & *port filled with the port from the SRV record; - * 0 on error - */ -struct hostent* dns_sip_resolvehost(str* name, unsigned short* port, - char* proto) -{ - struct dns_srv_handle h; - struct ip_addr ip; - int ret; - - if ((cfg_get(core, core_cfg, use_dns_cache==0)) || (dns_hash==0)){ - /* not init or off => use normal, non-cached version */ - return _sip_resolvehost(name, port, proto); - } - dns_srv_handle_init(&h); - ret=dns_sip_resolve(&h, name, &ip, port, proto, dns_flags); - dns_srv_handle_put(&h); - if (ret>=0) - return ip_addr2he(name, &ip); - return 0; -} -#endif - - - /* resolves a host name trying SRV lookup if *port==0 or normal A/AAAA lookup * if *port!=0. * when performing SRV lookup (*port==0) it will use proto to look for

1 0

git:5.4:7f14deb8: usrloc: do keepalive mode checks before expire processing
by Daniel-Constantin Mierla 23 Sep '20

23 Sep '20

Module: kamailio Branch: 5.4 Commit: 7f14deb8704697ebe1e073c8db30a5569bab6985 URL: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:32:17+02:00 usrloc: do keepalive mode checks before expire processing (cherry picked from commit e67b588434a08c828548c79b6cc5f4c2a7240dc9) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… Patch: https://github.com/kamailio/kamailio/commit/7f14deb8704697ebe1e073c8db30a55… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 105e32a2cf..a1070f3f74 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -126,10 +126,22 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_ka_mode & ULKA_NAT) { + /* keepalive for natted contacts only */ + if (ul_nat_bflag == 0) { + continue; + } + if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { + continue; + } + } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { if(uc->last_keepalive+ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ - LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + LM_DBG("set expired contact on keepalive (%u + %u < %u)" + " - aor: %.*s c: %.*s\n", (unsigned int)uc->last_keepalive, + (unsigned int)ul_keepalive_timeout, (unsigned int)tnow, ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); if(uc->expires > tnow + 10) { uc->expires = tnow + 10; @@ -137,16 +149,6 @@ int ul_ka_urecord(urecord_t *ur) } } } - - if(ul_ka_mode & ULKA_NAT) { - /* keepalive for natted contacts only */ - if (ul_nat_bflag == 0) { - continue; - } - if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { - continue; - } - } if(uc->received.len > 0) { sdst = uc->received; } else {

1 0

git:5.4:4669e8f2: imc: jump over printing error log messages when list commands are ok
by Daniel-Constantin Mierla 23 Sep '20

23 Sep '20

Module: kamailio Branch: 5.4 Commit: 4669e8f295eefca64af61e168e5e79f540df89c8 URL: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T09:19:52+02:00 imc: jump over printing error log messages when list commands are ok - reported by GH #2481 (cherry picked from commit 92cfb5e8d291706889c926892397e663e2d93b05) --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… Patch: https://github.com/kamailio/kamailio/commit/4669e8f295eefca64af61e168e5e79f… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 4ace0b800e..9dbc403e3e 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -942,13 +942,15 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, struct imc_uri room; memset(&room, '\0', sizeof(room)); - if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) - goto error; + if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, + &dst->parsed)) { + goto done; + } rm = imc_get_room(&room.parsed.user, &room.parsed.host); if (rm == NULL || (rm->flags & IMC_ROOM_DELETED)) { LM_ERR("Room [%.*s] does not exist!\n", STR_FMT(&room.uri)); - goto error; + goto done; } /* verify if the user is a member of the room */ @@ -956,7 +958,7 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, if (member == NULL) { LM_ERR("User [%.*s] is not member of room [%.*s]!\n", STR_FMT(&src->uri), STR_FMT(&rm->uri)); - goto error; + goto done; } p = imc_body_buf; @@ -1004,13 +1006,16 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, body.len = p - body.s; LM_DBG("members = '%.*s'\n", STR_FMT(&body)); - LM_ERR("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); + LM_DBG("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); imc_send_message(&rm->uri, &member->uri, build_headers(msg), &body); rv = 0; + goto done; + overrun: LM_ERR("Buffer too small for member list message\n"); -error: + +done: if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; @@ -1065,7 +1070,8 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, LM_DBG("rooms = '%.*s'\n", STR_FMT(&body)); imc_send_message(&dst->uri, &src->uri, build_headers(msg), &body); - rv = 0; + return 0; + error: LM_ERR("Buffer too small for member list message\n"); return rv;

1 0

git:5.4:f14111e9: usrloc: do keepalive-based contact expire on internal callback
by Daniel-Constantin Mierla 23 Sep '20

23 Sep '20

Module: kamailio Branch: 5.4 Commit: f14111e9ba0139e79a2bf7b7c0c5bc98c47cf220 URL: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:32:10+02:00 usrloc: do keepalive-based contact expire on internal callback - the one used by nathelper is not triggered automatically (cherry picked from commit 5c1e07dc2efc46fe078263c76ce0388f09949539) --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… Patch: https://github.com/kamailio/kamailio/commit/f14111e9ba0139e79a2bf7b7c0c5bc9… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 6d93717db5..105e32a2cf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -40,6 +40,8 @@ #include "ul_keepalive.h" +extern int ul_keepalive_timeout; + static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** @@ -102,11 +104,13 @@ int ul_ka_urecord(urecord_t *ur) int aortype = 0; int i; struct timeval tv; + time_t tnow = 0; if (ul_ka_mode == ULKA_NONE) { return 0; } LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); + tnow = time(NULL); for(i=0; i<ur->aor.len; i++) { if(ur->aor.s[i] == '@') { @@ -122,6 +126,18 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { + if(uc->last_keepalive+ul_keepalive_timeout < tnow) { + /* set contact as expired in 10s */ + LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); + if(uc->expires > tnow + 10) { + uc->expires = tnow + 10; + continue; + } + } + } + if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (ul_nat_bflag == 0) {

1 0

git:master:e67b5884: usrloc: do keepalive mode checks before expire processing
by Daniel-Constantin Mierla 23 Sep '20

23 Sep '20

Module: kamailio Branch: master Commit: e67b588434a08c828548c79b6cc5f4c2a7240dc9 URL: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:31:04+02:00 usrloc: do keepalive mode checks before expire processing --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… Patch: https://github.com/kamailio/kamailio/commit/e67b588434a08c828548c79b6cc5f4c… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 105e32a2cf..a1070f3f74 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -126,10 +126,22 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_ka_mode & ULKA_NAT) { + /* keepalive for natted contacts only */ + if (ul_nat_bflag == 0) { + continue; + } + if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { + continue; + } + } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { if(uc->last_keepalive+ul_keepalive_timeout < tnow) { /* set contact as expired in 10s */ - LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + LM_DBG("set expired contact on keepalive (%u + %u < %u)" + " - aor: %.*s c: %.*s\n", (unsigned int)uc->last_keepalive, + (unsigned int)ul_keepalive_timeout, (unsigned int)tnow, ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); if(uc->expires > tnow + 10) { uc->expires = tnow + 10; @@ -137,16 +149,6 @@ int ul_ka_urecord(urecord_t *ur) } } } - - if(ul_ka_mode & ULKA_NAT) { - /* keepalive for natted contacts only */ - if (ul_nat_bflag == 0) { - continue; - } - if ((uc->cflags & ul_nat_bflag) != ul_nat_bflag) { - continue; - } - } if(uc->received.len > 0) { sdst = uc->received; } else {

1 0

git:master:5c1e07dc: usrloc: do keepalive-based contact expire on internal callback
by Daniel-Constantin Mierla 23 Sep '20

23 Sep '20

Module: kamailio Branch: master Commit: 5c1e07dc2efc46fe078263c76ce0388f09949539 URL: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-23T17:00:29+02:00 usrloc: do keepalive-based contact expire on internal callback - the one used by nathelper is not triggered automatically --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… Patch: https://github.com/kamailio/kamailio/commit/5c1e07dc2efc46fe078263c76ce0388… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 6d93717db5..105e32a2cf 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -40,6 +40,8 @@ #include "ul_keepalive.h" +extern int ul_keepalive_timeout; + static int ul_ka_send(str *kamsg, dest_info_t *kadst); /** @@ -102,11 +104,13 @@ int ul_ka_urecord(urecord_t *ur) int aortype = 0; int i; struct timeval tv; + time_t tnow = 0; if (ul_ka_mode == ULKA_NONE) { return 0; } LM_DBG("keepalive for aor: %.*s\n", ur->aor.len, ur->aor.s); + tnow = time(NULL); for(i=0; i<ur->aor.len; i++) { if(ur->aor.s[i] == '@') { @@ -122,6 +126,18 @@ int ul_ka_urecord(urecord_t *ur) if((ul_ka_filter&GAU_OPT_SERVER_ID) && (uc->server_id != server_id)) { continue; } + if(ul_keepalive_timeout>0 && uc->last_keepalive>0) { + if(uc->last_keepalive+ul_keepalive_timeout < tnow) { + /* set contact as expired in 10s */ + LM_DBG("set expired contact on keepalive - aor: %.*s c: %.*s\n", + ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); + if(uc->expires > tnow + 10) { + uc->expires = tnow + 10; + continue; + } + } + } + if(ul_ka_mode & ULKA_NAT) { /* keepalive for natted contacts only */ if (ul_nat_bflag == 0) {

1 0

git:5.4:46349856: ndb_redis: set message level to debug on exec
by Victor Seva 23 Sep '20

23 Sep '20

Module: kamailio Branch: 5.4 Commit: 463498565029aced931b44fd686f5c9d15b49341 URL: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-23T09:03:52+02:00 ndb_redis: set message level to debug on exec * logging error makes no sense here since there's going to be a reconnection afterwards > ERROR: ndb_redis [redis_client.c:903]: redisc_exec_argv(): Redis error: Server closed the connection (cherry picked from commit a9c331d70dbed6827874aa99296203ac5a9d5c7b) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… Patch: https://github.com/kamailio/kamailio/commit/463498565029aced931b44fd686f5c9… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 5ad063f89a..bd97012c8e 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -770,7 +770,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) /* null reply, reconnect and try again */ if (rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if (redisc_create_pipelined_message(rsrv) == 0) {

1 0

git:master:a9c331d7: ndb_redis: set message level to debug on exec
by Victor Seva 23 Sep '20

23 Sep '20

Module: kamailio Branch: master Commit: a9c331d70dbed6827874aa99296203ac5a9d5c7b URL: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-23T09:02:43+02:00 ndb_redis: set message level to debug on exec * logging error makes no sense here since there's going to be a reconnection afterwards > ERROR: ndb_redis [redis_client.c:903]: redisc_exec_argv(): Redis error: Server closed the connection --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… Patch: https://github.com/kamailio/kamailio/commit/a9c331d70dbed6827874aa99296203a… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 5bc1bf0e47..15a86f7b10 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -770,7 +770,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) /* null reply, reconnect and try again */ if (rsrv->ctxRedis->err) { - LM_ERR("Redis error: %s\n", rsrv->ctxRedis->errstr); + LM_DBG("Redis error: %s\n", rsrv->ctxRedis->errstr); } if (redisc_create_pipelined_message(rsrv) == 0) {

1 0

[kamailio/kamailio] ERROR: imc_handle_members(): Buffer too small for member list message (#2481)
by Anthony Messina 23 Sep '20

23 Sep '20

### Description  When issuing `#members` command via IMC, the following error occurs, though the member list is returned to the client: ``` ERROR: imc [imc_cmd.c:1007]: imc_handle_members(): Message-ID: '185434_mobile-rel120YmVmYzE0ZjMwNzgyYWIxOWVjYWZhNmM1MzY5ZjY1YzU' ERROR: imc [imc_cmd.c:1012]: imc_handle_members(): Buffer too small for member list message ``` When issuing `#rooms` command via IMC, the following error occurs, though the room list is returned to the client: ``` ERROR: imc [imc_cmd.c:1070]: imc_handle_rooms(): Buffer too small for member list message ``` In case it's relevant, the clients are using TLS connections. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1-2.git99b2a0c066.fc32 (x86_64/linux) 09fd6a 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: 09fd6a compiled on 00:00:00 Sep 12 2020 with gcc 10.2.1 ``` * **Operating System**:  ``` Fedora 32 x86_64 Linux 5.8.9-200.fc32.x86_64 #1 SMP Mon Sep 14 18:28:45 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2481

2 3

git:5.4:609685c9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Sep '20

22 Sep '20

Module: kamailio Branch: 5.4 Commit: 609685c91d92337a1d0832d709ebff437fb193ef URL: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-22T19:46:21+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… Patch: https://github.com/kamailio/kamailio/commit/609685c91d92337a1d0832d709ebff4… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ac3a6b7bb6..d075042834 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -94,8 +94,9 @@ Carsten Bock 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -197,8 +198,9 @@ Carsten Bock 1.52. ka_from parameter usage 1.53. ka_domain parameter usage 1.54. ka_filter parameter usage - 1.55. ka_loglevel parameter usage - 1.56. ka_logmsg parameter usage + 1.55. Set ka_timeout parameter + 1.56. ka_loglevel parameter usage + 1.57. ka_logmsg parameter usage Chapter 1. Admin Guide @@ -269,8 +271,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -404,8 +407,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 3.1. nat_bflag (int) @@ -683,8 +687,8 @@ modparam("usrloc", "desc_time_order", 1) 3.25. timer_interval (int) Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives and + other tasks, that need to be run periodically. Default value is 60. @@ -1163,19 +1167,38 @@ modparam("usrloc", "ka_domain", "mydomain.com") modparam("usrloc", "ka_filter", 1) ... -3.55. ka_loglevel (int) +3.55. ka_timeout (int) + + The parameter sets the interval in seconds after which a contact is + removed from location table if it does not reply to SIP keepalives + (usually OPTIONS ping requests). + + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + + Default value is “0” (feature disabled). + + Example 1.55. Set ka_timeout parameter +... +modparam("usrloc", "ka_timeout", 120) +... + +3.56. ka_loglevel (int) The level to print the log message when the keepalive response is received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). Default value is “255” (disabled). - Example 1.55. ka_loglevel parameter usage + Example 1.56. ka_loglevel parameter usage ... modparam("usrloc", "ka_loglevel", 1) ... -3.56. ka_logmsg (str) +3.57. ka_logmsg (str) The formatted log specification to be added to the message printed when the keepalive is received and roundtrip time is computed. The log @@ -1187,7 +1210,7 @@ modparam("usrloc", "ka_loglevel", 1) Default value is “ to-uri: [$tu] remote-addr: [$sas]”. - Example 1.56. ka_logmsg parameter usage + Example 1.57. ka_logmsg parameter usage ... modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ...

1 0

git:5.4:79ec049b: usrloc: docs for ka_timeout module parameter
by Daniel-Constantin Mierla 22 Sep '20

22 Sep '20

Module: kamailio Branch: 5.4 Commit: 79ec049ba50c0c48c02748c2679c07f4da2a766e URL: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:28:58+02:00 usrloc: docs for ka_timeout module parameter (cherry picked from commit 2e9d4e2dc45bf5baab1bff9c13fc841b66793cb4) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… Patch: https://github.com/kamailio/kamailio/commit/79ec049ba50c0c48c02748c2679c07f… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 396d89828d..4b624fb81f 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -604,8 +604,8 @@ modparam("usrloc", "desc_time_order", 1) <title><varname>timer_interval</varname> (int)</title> <para> Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives + and other tasks, that need to be run periodically. </para> <para> <emphasis> @@ -1424,6 +1424,36 @@ modparam("usrloc", "ka_filter", 1) </example> </section> + <section id="usrloc.p.ka_timeout"> + <title><varname>ka_timeout</varname> (int)</title> + <para> + The parameter sets the interval in seconds after which a + contact is removed from location table if it does not reply to SIP + keepalives (usually OPTIONS ping requests). + </para> + <para> + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + </para> + <para> + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (feature disabled). + </emphasis> + </para> + <example> + <title>Set <varname>ka_timeout</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_timeout", 120) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

1 0

git:5.4:f5eb642c: usrloc: export modparam to set keepalive timeout
by Daniel-Constantin Mierla 22 Sep '20

22 Sep '20

Module: kamailio Branch: 5.4 Commit: f5eb642c9bc9012debd2009ad03f2598d0c7c354 URL: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:28:48+02:00 usrloc: export modparam to set keepalive timeout - variable was not exported by the module for internal keepalive mechanism (cherry picked from commit 9331044bf517be120dea59414402415090b63007) --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… Patch: https://github.com/kamailio/kamailio/commit/f5eb642c9bc9012debd2009ad03f259… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 7aecb318a1..860fb715b5 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -258,6 +258,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {0, 0, 0}

1 0

git:master:92cfb5e8: imc: jump over printing error log messages when list commands are ok
by Daniel-Constantin Mierla 22 Sep '20

22 Sep '20

Module: kamailio Branch: master Commit: 92cfb5e8d291706889c926892397e663e2d93b05 URL: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-22T19:01:34+02:00 imc: jump over printing error log messages when list commands are ok - reported by GH #2481 --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… Patch: https://github.com/kamailio/kamailio/commit/92cfb5e8d291706889c926892397e66… --- diff --git a/src/modules/imc/imc_cmd.c b/src/modules/imc/imc_cmd.c index 4ace0b800e..9dbc403e3e 100644 --- a/src/modules/imc/imc_cmd.c +++ b/src/modules/imc/imc_cmd.c @@ -942,13 +942,15 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, struct imc_uri room; memset(&room, '\0', sizeof(room)); - if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, &dst->parsed)) - goto error; + if (build_imc_uri(&room, cmd->param[0].s ? cmd->param[0] : dst->parsed.user, + &dst->parsed)) { + goto done; + } rm = imc_get_room(&room.parsed.user, &room.parsed.host); if (rm == NULL || (rm->flags & IMC_ROOM_DELETED)) { LM_ERR("Room [%.*s] does not exist!\n", STR_FMT(&room.uri)); - goto error; + goto done; } /* verify if the user is a member of the room */ @@ -956,7 +958,7 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, if (member == NULL) { LM_ERR("User [%.*s] is not member of room [%.*s]!\n", STR_FMT(&src->uri), STR_FMT(&rm->uri)); - goto error; + goto done; } p = imc_body_buf; @@ -1004,13 +1006,16 @@ int imc_handle_members(struct sip_msg* msg, imc_cmd_t *cmd, body.len = p - body.s; LM_DBG("members = '%.*s'\n", STR_FMT(&body)); - LM_ERR("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); + LM_DBG("Message-ID: '%.*s'\n", STR_FMT(get_callid(msg))); imc_send_message(&rm->uri, &member->uri, build_headers(msg), &body); rv = 0; + goto done; + overrun: LM_ERR("Buffer too small for member list message\n"); -error: + +done: if (room.uri.s != NULL) pkg_free(room.uri.s); if (rm != NULL) imc_release_room(rm); return rv; @@ -1065,7 +1070,8 @@ int imc_handle_rooms(struct sip_msg* msg, imc_cmd_t *cmd, LM_DBG("rooms = '%.*s'\n", STR_FMT(&body)); imc_send_message(&dst->uri, &src->uri, build_headers(msg), &body); - rv = 0; + return 0; + error: LM_ERR("Buffer too small for member list message\n"); return rv;

1 0

[kamailio/kamailio] Matching uri == myself fails when request uri has parameter (#2482)
by Jukka Väisänen 22 Sep '20

22 Sep '20

### Description If the SIP request URI has a parameter ;user=phone, then the match with `myself` fails with error in log. ### Troubleshooting Sending an OPTIONS request through the proxy: ``` OPTIONS sip:+358removed@example.com;user=phone SIP/2.0. ... From: <sip:+358removed@example.com;user=phone>;tag=JJhksk01ou7PFTq8xz1-GlhgGNG-c94A. To: <sip:+358removed@example.com;user=phone>. ... Content-Length: 0. ``` Note: The R-URI does NOT match myself. It never does in my case unless it's an attacker. #### Reproduction My config is very simple in terms of aliases: ``` auto_aliases=no alias=172.29.1.21:5060 ``` and in routing block: ` if (uri==myself) return;` Log shows: ``` Listening on udp: 172.29.1.21 [172.29.1.21]:5060 Aliases: *: 172.29.1.21:5060 ... 7(20681) ERROR: <core> [core/resolve.c:1808]: str2ip6buf(): invalid name, no conversion to IP address possible ... ``` ### Possible Solutions Sorry, I couldn't figure out where in the source this call to resolve.c functions happens. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.6 (x86_64/linux) bf6c08 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 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: bf6c08 compiled on 09:25:09 Sep 10 2020 with gcc 4.8.5 ``` * **Operating System**: ``` Amazon Linux 2 (up to date) on AWS ``` -- 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/2482

3 9

[kamailio/kamailio] Keepalive - Remove race condition when removing destination (#2474)
by Nacho G. 22 Sep '20

22 Sep '20

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2474 -- Commit Summary -- * WIP -- File Changes -- M src/modules/keepalive/keepalive.h (1) M src/modules/keepalive/keepalive_api.c (23) M src/modules/keepalive/keepalive_core.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2474.patch https://github.com/kamailio/kamailio/pull/2474.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/2474

3 12

git:master:7fb391b4: Merge pull request #2474 from NGSegovia/keepalive_solve_sync_problems
by GitHub 22 Sep '20

22 Sep '20

Module: kamailio Branch: master Commit: 7fb391b4c320741ccc950ddf13c7bf256cc55f62 URL: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2… Author: Nacho G <nacho.gs(a)zaleos.net> Committer: GitHub <noreply(a)github.com> Date: 2020-09-22T17:52:57+02:00 Merge pull request #2474 from NGSegovia/keepalive_solve_sync_problems Keepalive - Remove race condition when removing destination --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2… Patch: https://github.com/kamailio/kamailio/commit/7fb391b4c320741ccc950ddf13c7bf2…

1 0

git:master:fb115679: keepalive: prevent race condition when deleting a destination
by Nacho Garcia Segovia 22 Sep '20

22 Sep '20

Module: kamailio Branch: master Commit: fb115679228b19944f886893b47743db44465072 URL: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-09-14T13:18:37+02:00 keepalive: prevent race condition when deleting a destination - Added a lock to ka_dest type, so we get it when we run callbacks that may be associated to an OPTIONS response - Same lock is used to not remove destinations that are running callbacks - Now find destinations consider owner and uri --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d… Patch: https://github.com/kamailio/kamailio/commit/fb115679228b19944f886893b47743d…

1 0

Info: recordings of Kamailio World 2020 sessions
by Daniel-Constantin Mierla 22 Sep '20

22 Sep '20

Hello, for those that couldn't attend the Kamailio World 2020 online event that happened a few weeks ago, or someone wants to view again a session, the recordings of the two days were split per session -- they are available on KamailioWorld youtube channel: * https://www.youtube.com/c/KamailioWorld/ For convenience, they were also grouped in a playlist for KW2020, see: * https://www.youtube.com/c/KamailioWorld/playlists No other editing than just cutting at start/stop of each session. Slides should be available at: * http://kamailio.org/events/2020-KamailioWorldOnline/ Enjoy! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:b754b9f6: usrloc: use unsigned int for rpc output for the fields having this type
by Daniel-Constantin Mierla 21 Sep '20

21 Sep '20

Module: kamailio Branch: master Commit: b754b9f68bee0b58b4ae00b7f0764c2bf711d14c URL: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-21T10:59:34+02:00 usrloc: use unsigned int for rpc output for the fields having this type --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… Patch: https://github.com/kamailio/kamailio/commit/b754b9f68bee0b58b4ae00b7f0764c2… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index 9124eb746f..63c45381b5 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -144,12 +144,12 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding state"); return -1; } - if(rpc->struct_add(vh, "d", "Flags", c->flags)<0) + if(rpc->struct_add(vh, "u", "Flags", c->flags)<0) { rpc->fault(ctx, 500, "Internal error adding flags"); return -1; } - if(rpc->struct_add(vh, "d", "CFlags", c->cflags)<0) + if(rpc->struct_add(vh, "u", "CFlags", c->cflags)<0) { rpc->fault(ctx, 500, "Internal error adding cflags"); return -1; @@ -159,7 +159,7 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding socket"); return -1; } - if(rpc->struct_add(vh, "d", "Methods", c->methods)<0) + if(rpc->struct_add(vh, "u", "Methods", c->methods)<0) { rpc->fault(ctx, 500, "Internal error adding methods"); return -1; @@ -175,7 +175,7 @@ int rpc_dump_contact(rpc_t* rpc, void* ctx, void *ih, ucontact_t* c) rpc->fault(ctx, 500, "Internal error adding instance"); return -1; } - if(rpc->struct_add(vh, "d", "Reg-Id", c->reg_id)<0) + if(rpc->struct_add(vh, "u", "Reg-Id", c->reg_id)<0) { rpc->fault(ctx, 500, "Internal error adding reg_id"); return -1; @@ -286,7 +286,7 @@ static void ul_rpc_dump(rpc_t* rpc, void* ctx) rpc->fault(ctx, 500, "Internal error creating aor struct"); return; } - if(rpc->struct_add(bh, "Sd[", + if(rpc->struct_add(bh, "Su[", "AoR", &r->aor, "HashID", r->aorhash, "Contacts", &ih)<0)

1 0

git:master:5557b9b7: ndb_redis: fix cluster support
by Victor Seva 21 Sep '20

21 Sep '20

Module: kamailio Branch: master Commit: 5557b9b715a9ca754c454b5edaebf2a43b832015 URL: https://github.com/kamailio/kamailio/commit/5557b9b715a9ca754c454b5edaebf2a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-21T09:49:25+02:00 ndb_redis: fix cluster support fixes #2461 related #2300 --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/5557b9b715a9ca754c454b5edaebf2a… Patch: https://github.com/kamailio/kamailio/commit/5557b9b715a9ca754c454b5edaebf2a… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 5ad063f89a..5bc1bf0e47 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1032,13 +1032,6 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) } } - LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); - if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { - LM_ERR("Redis error:%.*s\n", - (int)rpl->rplRedis->len, rpl->rplRedis->str); - goto error_exec; - } - if (check_cluster_reply(rpl->rplRedis, &rsrv)) { LM_DBG("rsrv->ctxRedis = %p\n", rsrv->ctxRedis); if(rsrv->ctxRedis==NULL) @@ -1073,14 +1066,15 @@ int redisc_exec(str *srv, str *res, str *cmd, ...) goto error_exec; } } + } - LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); - if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { - LM_ERR("Redis error:%.*s\n", - (int)rpl->rplRedis->len, rpl->rplRedis->str); - goto error_exec; - } + LM_DBG("rpl->rplRedis->type:%d\n", rpl->rplRedis->type); + if(rpl->rplRedis->type == REDIS_REPLY_ERROR) { + LM_ERR("Redis error:%.*s\n", + (int)rpl->rplRedis->len, rpl->rplRedis->str); + goto error_exec; } + STR_ZTOV(cmd->s[cmd->len], c); rsrv->disable.consecutive_errors = 0; va_end(ap);

1 0

git:master:8b74c67d: Revert "Revert "tls: proper ifdef on libssl version for tls_init_locks()""
by Daniel-Constantin Mierla 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: 8b74c67de4aef45835a34efc55e0db66f8a9d2ed URL: https://github.com/kamailio/kamailio/commit/8b74c67de4aef45835a34efc55e0db6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-18T14:12:38+02:00 Revert "Revert "tls: proper ifdef on libssl version for tls_init_locks()"" This reverts commit da5d71da620deb8b8740256e556011e93cdac1a3. --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/8b74c67de4aef45835a34efc55e0db6… Patch: https://github.com/kamailio/kamailio/commit/8b74c67de4aef45835a34efc55e0db6… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..21078e82d9 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ +/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,10 +185,13 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error: tls_destroy_locks(); return -1; + +#else + return 0; +#endif }

1 0

git:master:4d14057a: Revert "Revert "tls: support compilation without deprecated OpenSSL APIs""
by Daniel-Constantin Mierla 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: 4d14057a25aa55dbf572e3cd5aa188f8aa0799ae URL: https://github.com/kamailio/kamailio/commit/4d14057a25aa55dbf572e3cd5aa188f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-18T14:11:52+02:00 Revert "Revert "tls: support compilation without deprecated OpenSSL APIs"" This reverts commit 0a2fc0371430f19f868dc17f3a361e412ceb376f. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/4d14057a25aa55dbf572e3cd5aa188f… Patch: https://github.com/kamailio/kamailio/commit/4d14057a25aa55dbf572e3cd5aa188f… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index a8859c4a31..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -27,6 +27,8 @@ #include <stdlib.h> #include <openssl/ssl.h> #include <openssl/opensslv.h> +#include <openssl/bn.h> +#include <openssl/dh.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> @@ -61,7 +63,7 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index b9288cbd9a..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,14 +627,13 @@ int tls_h_mod_pre_init_f(void) return 0; } LM_DBG("preparing tls env for modules initialization\n"); -#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) - LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); - OPENSSL_init_ssl(0, NULL); -#else +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); -#endif SSL_load_error_strings(); +#else + LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); +#endif tls_mod_preinitialized=1; return 0; } @@ -668,7 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - ssl_version=SSLeay(); + ssl_version=OpenSSL_version_num(); /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -680,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - SSLeay_version(SSLEAY_VERSION), ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring " @@ -857,6 +856,7 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void tls_h_mod_destroy_f(void) { LM_DBG("tls module final tls destroy\n"); +#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ @@ -869,4 +869,5 @@ void tls_h_mod_destroy_f(void) LM_DBG("executing openssl v1.1+ cleanup\n"); OPENSSL_cleanup(); #endif +#endif } diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 4e5bbcc5e3..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,6 +140,8 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); if (n_static_locks<0){ @@ -167,13 +169,10 @@ int tls_init_locks() CRYPTO_set_locking_callback(locking_f); } -/* OpenSSL is thread-safe since 1.1.0 */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); -#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process @@ -186,6 +185,7 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif return 0; error:

1 0

git:master:6ee8085a: Revert "Revert "tls: added define condition on version functions""
by Daniel-Constantin Mierla 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: 6ee8085a987b8f0e9a4fa23379f0040ab49db693 URL: https://github.com/kamailio/kamailio/commit/6ee8085a987b8f0e9a4fa23379f0040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-18T14:12:17+02:00 Revert "Revert "tls: added define condition on version functions"" This reverts commit bffd78f14921f67735a64caea2fb130393daa2bc. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/6ee8085a987b8f0e9a4fa23379f0040… Patch: https://github.com/kamailio/kamailio/commit/6ee8085a987b8f0e9a4fa23379f0040… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fc84033e68..2930bde2be 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -63,9 +63,11 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (OpenSSL_version_num() < 0x1000005fL) { +#if OPENSSL_VERSION_NUMBER < 0x010100000L + if (SSLeay() < 0x1000005fL) { return; } +#endif ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 351ed4187e..f10d0c0344 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -645,6 +645,7 @@ int tls_h_mod_init_f(void) { /*struct socket_info* si;*/ long ssl_version; + const char *ssl_version_txt; #if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) int lib_kerberos; int lib_zlib; @@ -667,7 +668,15 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif + +#if OPENSSL_VERSION_NUMBER < 0x010100000L + ssl_version=SSLeay(); + ssl_version_txt=SSLeay_version(SSLEAY_VERSION); +#else ssl_version=OpenSSL_version_num(); + ssl_version_txt=OpenSSL_version(OPENSSL_VERSION); +#endif + /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -679,7 +688,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - OpenSSL_version(OPENSSL_VERSION), ssl_version, + ssl_version_txt, ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring "

1 0

git:master:6bdb836a: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: 6bdb836a05dbec735bc281ec5eebbdc2908c9878 URL: https://github.com/kamailio/kamailio/commit/6bdb836a05dbec735bc281ec5eebbdc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-18T13:31:16+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/6bdb836a05dbec735bc281ec5eebbdc… Patch: https://github.com/kamailio/kamailio/commit/6bdb836a05dbec735bc281ec5eebbdc… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 175cce91ce..70b7a07847 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -71,6 +71,7 @@ Muhammad Shahzad Shafi 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info + 5.8. corex.shm.stats 6. Event Routes @@ -167,6 +168,7 @@ Chapter 1. Admin Guide 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info + 5.8. corex.shm.stats 6. Event Routes @@ -727,6 +729,7 @@ event_route[dispatcher:dst-down] { 5.5. corex.shm_summary 5.6. corex.pkg_summary 5.7. corex.shm.info + 5.8. corex.shm.stats 5.1. corex.debug @@ -786,6 +789,13 @@ event_route[dispatcher:dst-down] { Example: kamcli rpc shm.info +5.8. corex.shm.stats + + Return shared memory statistics (values are in bytes). + + Example: + kamcli rpc shm.stats + 6. Event Routes 6.1. event_route[network:msg]

1 0

git:master:b7c3ca0c: corex: docs for rpc command shm.stats
by Daniel-Constantin Mierla 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: b7c3ca0c01a828bc9c25c3db2dca87b3c0522bfe URL: https://github.com/kamailio/kamailio/commit/b7c3ca0c01a828bc9c25c3db2dca87b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-18T13:23:22+02:00 corex: docs for rpc command shm.stats --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b7c3ca0c01a828bc9c25c3db2dca87b… Patch: https://github.com/kamailio/kamailio/commit/b7c3ca0c01a828bc9c25c3db2dca87b… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index aecc5e895c..e9d73b1c78 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -982,6 +982,20 @@ event_route[dispatcher:dst-down] { <programlisting format="linespecific"> &kamcli; rpc shm.info </programlisting> + </section> + <section id="corex.rpc.shm.stats"> + <title> + <function moreinfo="none">corex.shm.stats</function> + </title> + <para> + Return shared memory statistics (values are in bytes). + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.stats + </programlisting> </section> </section>

1 0

git:master:90e152b6: corex: rpc command shm.stats
by Daniel-Constantin Mierla 18 Sep '20

18 Sep '20

Module: kamailio Branch: master Commit: 90e152b691e9f18ff53a908af0634eaa024a4f7d URL: https://github.com/kamailio/kamailio/commit/90e152b691e9f18ff53a908af0634ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-18T13:16:39+02:00 corex: rpc command shm.stats - convenience function to be coherent with pkg variants --- Modified: src/modules/corex/corex_rpc_shm.c --- Diff: https://github.com/kamailio/kamailio/commit/90e152b691e9f18ff53a908af0634ea… Patch: https://github.com/kamailio/kamailio/commit/90e152b691e9f18ff53a908af0634ea… --- diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c index 5316cdc7bc..7bf10553dd 100644 --- a/src/modules/corex/corex_rpc_shm.c +++ b/src/modules/corex/corex_rpc_shm.c @@ -54,8 +54,34 @@ static void corex_rpc_shm_info(rpc_t* rpc, void* ctx) } } +static const char* corex_rpc_shm_stats_doc[2] = { + "Return shared memory stats", + 0 +}; + +/* + * RPC command to return shm stats + */ +static void corex_rpc_shm_stats(rpc_t* rpc, void* c) +{ + struct mem_info mi; + void *th; + + shm_info(&mi); + rpc->add(c, "{", &th); + rpc->struct_add(th, "uuuuuu", + "total", (unsigned int)(mi.total_size), + "free", (unsigned int)(mi.free), + "used", (unsigned int)(mi.used), + "real_used",(unsigned int)(mi.real_used), + "max_used", (unsigned int)(mi.max_used), + "fragments", (unsigned int)mi.total_frags + ); +} + rpc_export_t corex_rpc_shm_cmds[] = { - {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {"shm.stats", corex_rpc_shm_stats, corex_rpc_shm_stats_doc, 0}, {0, 0, 0, 0} };

1 0

[kamailio/kamailio] Memory use after free - qm_realloc(): BUG: trying to realloc an already freed pointer (#2475)
by gormania 18 Sep '20

18 Sep '20

### Description  Intermittent CRITICAL memory use after free at startup. ### Troubleshooting #### Reproduction  This happens intermittently on startup. Because our container restarts automatically and the issue is not seen other than at startup it is ultimately innocuous. But the restarts are a false alarm for sys admin. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Sep 10 15:29:22 product-name process-name[1764]: new user 'admin(a)172.51.1.1' added Sep 10 15:29:22 product-name process-name[1764]: Starting xxxx 1.5.8-0+gxxxxxxxx Sep 10 15:29:22 product-name process-name[1764]: Setting core dump pattern Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_init.c:503]: init_tls_compression(): disabling compression... Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/tcp_main.c:5042]: init_tcp(): using epoll_lt as the io watch method (auto detected) Sep 10 15:29:22 product-name process-name[1764]: Listening on Sep 10 15:29:22 product-name process-name[1764]: udp: 172.51.1.1:5060 advertise 172.51.1.1:5060 Sep 10 15:29:22 product-name process-name[1764]: tcp: 172.51.1.1:5060 advertise 172.51.1.1:5060 Sep 10 15:29:22 product-name process-name[1764]: tls: 172.51.1.1:5061 advertise 172.51.1.1:5060 Sep 10 15:29:22 product-name process-name[1764]: Aliases: Sep 10 15:29:22 product-name process-name[1764]: tls: bb48d50a0892:5061 Sep 10 15:29:22 product-name process-name[1764]: tcp: bb48d50a0892:5060 Sep 10 15:29:22 product-name process-name[1764]: udp: bb48d50a0892:5060 Sep 10 15:29:22 product-name process-name[1764]: *: 172.51.1.1:* Sep 10 15:29:22 product-name process-name[1764]: Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: db_sqlite [db_sqlite.c:218]: mod_init(): SQlite library version 3.16.2 (compiled using 3.16.2) Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: rr [rr_mod.c:177]: mod_init(): outbound module not available Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: http_async_client [http_async_client_mod.c:222]: mod_init(): Initializing Http Async module Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: [App] xxxx init Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: [---] Location reporting format: custom-1 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: [---] Logging of location reporting: DISABLED Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_mod.c:377]: mod_init(): With ECDH-Support! Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_mod.c:380]: mod_init(): With Diffie Hellman Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nonce_count) support disabled Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_init.c:719]: init_tls_h(): compiled with openssl version "OpenSSL 1.0.2u 20 Dec 2019" (0x1000215f), kerberos support: off, compression: on Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_init.c:723]: init_tls_h(): installed openssl library version "OpenSSL 1.0.2u 20 Dec 2019" (0x1000215f), kerberos support: off, zlib compression: off Sep 10 15:29:22 product-name process-name[1764]: compiler: gcc -I. -I.. -I../include -fPIC -DOPENSSL_PIC -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -g -O2 -fdebug-prefix-map=/build/openssl1.0-NNAFzi/openssl1.0-1.0.2u=. -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wa,--noexecstack -Wall -DMD32_REG_T=int -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DRC4_ASM -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM Sep 10 15:29:22 product-name process-name[1764]: 0(1) WARNING: tls [tls_init.c:784]: init_tls_h(): openssl bug #1491 (crash/mem leaks on low memory) workaround enabled (on low memory tls operations will fail preemptively) with free memory thresholds 7864320 and 3932160 bytes Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold1 has been changed to 7864320 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold2 has been changed to 3932160 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [main.c:2779]: main(): processes (at least): 15 - shm size: 67108864 - pkg size: 8388608 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:303]: ksr_tls_fill_missing(): TLSs<default>: tls_method=18 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:315]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/kamailio/publickey.pem' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:322]: ksr_tls_fill_missing(): TLSs<default>: ca_list='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:329]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:333]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=0 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:340]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:347]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/kamailio/privatekey.pem' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:351]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=0 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:354]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 Sep 10 15:29:22 product-name process-name[1764]: 0(1) NOTICE: tls [tls_domain.c:1087]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:707]: set_verification(): TLSs<default>: No client certificate required and no checks performed Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:303]: ksr_tls_fill_missing(): TLSc<default>: tls_method=18 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:315]: ksr_tls_fill_missing(): TLSc<default>: certificate='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:322]: ksr_tls_fill_missing(): TLSc<default>: ca_list='/etc/kamailio/sipcacert.pem' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:329]: ksr_tls_fill_missing(): TLSc<default>: crl='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:333]: ksr_tls_fill_missing(): TLSc<default>: require_certificate=1 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:340]: ksr_tls_fill_missing(): TLSc<default>: cipher_list='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:347]: ksr_tls_fill_missing(): TLSc<default>: private_key='(null)' Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:351]: ksr_tls_fill_missing(): TLSc<default>: verify_certificate=1 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:354]: ksr_tls_fill_missing(): TLSc<default>: verify_depth=9 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: tls [tls_domain.c:692]: set_verification(): TLSc<default>: Server MUST present valid certificate Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 1 Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 2 Sep 10 15:29:22 product-name process-name[1764]: 8(160) INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [main.c:783]: handle_sigs(): SIGCHLD received, but no child has stopped, ignoring it Sep 10 15:29:22 product-name process-name[1764]: 6(158) CRITICAL: <core> [core/mem/q_malloc.c:646]: qm_realloc(): BUG: trying to realloc an already freed pointer 0x7f7d3413f928 , fragment 0x7f7d3413f8f0 -- aborting Sep 10 15:29:22 product-name process-name[1764]: 14(166) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 23 Sep 10 15:29:22 product-name process-name[1764]: 0(1) ALERT: <core> [main.c:766]: handle_sigs(): child process 158 exited by a signal 6 Sep 10 15:29:22 product-name process-name[1764]: 0(1) ALERT: <core> [main.c:769]: handle_sigs(): core was not generated Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [main.c:792]: handle_sigs(): terminating due to SIGCHLD Sep 10 15:29:22 product-name process-name[1764]: 1(153) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 2(154) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 4(156) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 14(166) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 15 Sep 10 15:29:22 product-name process-name[1764]: 3(155) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 14(166) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 18 Sep 10 15:29:22 product-name process-name[1764]: 7(159) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 5(157) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 9(161) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 10(162) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 8(160) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 11(163) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 14(166) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 13(165) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 12(164) INFO: <core> [main.c:847]: sig_usr(): signal 15 received Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: db_sqlite [db_sqlite.c:227]: mod_destroy(): SQlite terminate Sep 10 15:29:22 product-name process-name[1764]: 0(1) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` #### SIP Traffic  ``` Occurs at startup before SIP traffic relevant. ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.4 (x86_64/linux) f7690e-dirty 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 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: f7690e -dirty compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Running under docker on Centos 7 Linux bb48d50a0892 3.10.0-1062.el7.x86_64 #1 SMP Wed Aug 7 18:08:02 UTC 2019 x86_64 GNU/Linux ``` -- 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/2475

3 5

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Victor Seva 17 Sep '20

17 Sep '20

``cfgt_process_route()`` just tries to get every value that it's at ``pv_cache`` when entering or leaving a route. It relies on ``pv_get_spec_value()`` for values that are not ``$avp()`` nor ``$xavp()`` -- 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/2479#issuecomment-694205484

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Seeing it happens when an ACK was received by trying to dump $T_rpl(...), the docs specify it has to be used in failure route blocks, not being the case in this crash situation: * https://www.kamailio.org/wiki/cookbooks/5.4.x/pseudovariables#t_rpl_pv I added safety checks in the code to catch such cases and return $null. -- 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/2479#issuecomment-694195433

1 0

git:master:2e7710e2: tmx: safety check of expected route blocks for using $T_*() variables
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 2e7710e292a649c6c57e46d5994d3b2cf3815865 URL: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T14:21:30+02:00 tmx: safety check of expected route blocks for using $T_*() variables - related to GH #2479 --- Modified: src/modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… Patch: https://github.com/kamailio/kamailio/commit/2e7710e292a649c6c57e46d5994d3b2… --- diff --git a/src/modules/tmx/t_var.c b/src/modules/tmx/t_var.c index 15938fcd9e..1aa1dc0cff 100644 --- a/src/modules/tmx/t_var.c +++ b/src/modules/tmx/t_var.c @@ -305,6 +305,11 @@ int pv_get_t_var_req(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(CORE_ONREPLY_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_req(msg)) return pv_get_null(msg, param, res); @@ -320,6 +325,11 @@ int pv_get_t_var_rpl(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -335,6 +345,11 @@ int pv_get_t_var_branch(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(FAILURE_ROUTE|BRANCH_FAILURE_ROUTE|TM_ONREPLY_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_rpl(msg)) return pv_get_null(msg, param, res); @@ -350,6 +365,11 @@ int pv_get_t_var_inv(struct sip_msg *msg, pv_param_t *param, { pv_spec_t *pv=NULL; + if(!is_route_type(REQUEST_ROUTE)) { + LM_DBG("used in unsupported route block - type %d\n", get_route_type()); + return pv_get_null(msg, param, res); + } + if(pv_t_update_inv(msg)) return pv_get_null(msg, param, res);

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Not familiar with the cfgt module, when is it executed in this case? I can see in the trace that it relies on some debugger api, maybe you can present more details about execution context to understand what happens behind the module. -- 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/2479#issuecomment-694181287

1 0

git:master:105e90ab: modules: readme files regenerated - corex ... [skip ci]
by Kamailio Dev 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 105e90ab7d42f63c24b7c2bce447f64f416dceac URL: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-17T13:31:23+02:00 modules: readme files regenerated - corex ... [skip ci] --- Modified: src/modules/corex/README --- Diff: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… Patch: https://github.com/kamailio/kamailio/commit/105e90ab7d42f63c24b7c2bce447f64… --- diff --git a/src/modules/corex/README b/src/modules/corex/README index 027450415f..175cce91ce 100644 --- a/src/modules/corex/README +++ b/src/modules/corex/README @@ -70,6 +70,7 @@ Muhammad Shahzad Shafi 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 6. Event Routes @@ -165,6 +166,7 @@ Chapter 1. Admin Guide 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 6. Event Routes @@ -724,6 +726,7 @@ event_route[dispatcher:dst-down] { 5.4. corex.shm_status 5.5. corex.shm_summary 5.6. corex.pkg_summary + 5.7. corex.shm.info 5.1. corex.debug @@ -776,6 +779,13 @@ event_route[dispatcher:dst-down] { kamcmd corex.pkg_summary pid 2345 kamcmd corex.pkg_summary idx 1 +5.7. corex.shm.info + + Return shared memory manager details. + + Example: + kamcli rpc shm.info + 6. Event Routes 6.1. event_route[network:msg]

1 0

git:master:57d33a2d: lib/srdb1: db_use_table() more suggestive error messages
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 57d33a2d76219ae3d1eb503044dadaeddc7e06fd URL: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T12:55:10+02:00 lib/srdb1: db_use_table() more suggestive error messages --- Modified: src/lib/srdb1/db.c --- Diff: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… Patch: https://github.com/kamailio/kamailio/commit/57d33a2d76219ae3d1eb503044dadae… --- diff --git a/src/lib/srdb1/db.c b/src/lib/srdb1/db.c index d33c9390c8..54b66d330b 100644 --- a/src/lib/srdb1/db.c +++ b/src/lib/srdb1/db.c @@ -477,8 +477,12 @@ int db_check_table_version(db_func_t* dbf, db1_con_t* dbh, const str* table, */ int db_use_table(db1_con_t* _h, const str* _t) { - if (!_h || !_t || !_t->s) { - LM_ERR("invalid parameter value\n"); + if (!_h) { + LM_ERR("invalid connection parameter\n"); + return -1; + } + if (!_t || !_t->s) { + LM_ERR("invalid table parameter value\n"); return -1; }

1 0

git:master:f1278a20: corex: added rpc command shm.info
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: f1278a20bb37b29285c9d7cac298a3b1905f1c88 URL: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T13:19:13+02:00 corex: added rpc command shm.info --- Added: src/modules/corex/corex_rpc_shm.c Added: src/modules/corex/corex_rpc_shm.h Modified: src/modules/corex/corex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… Patch: https://github.com/kamailio/kamailio/commit/f1278a20bb37b29285c9d7cac298a3b… --- diff --git a/src/modules/corex/corex_mod.c b/src/modules/corex/corex_mod.c index 8d0e649548..194efcdb8e 100644 --- a/src/modules/corex/corex_mod.c +++ b/src/modules/corex/corex_mod.c @@ -39,6 +39,7 @@ #include "corex_lib.h" #include "corex_rpc.h" +#include "corex_rpc_shm.h" #include "corex_var.h" #include "corex_nio.h" @@ -188,6 +189,12 @@ static int mod_init(void) return -1; } + if(corex_init_rpc_shm()<0) + { + LM_ERR("failed to register RPC shm commands\n"); + return -1; + } + if(corex_register_check_self()<0) { LM_ERR("failed to register check self callback\n"); diff --git a/src/modules/corex/corex_rpc_shm.c b/src/modules/corex/corex_rpc_shm.c new file mode 100644 index 0000000000..5316cdc7bc --- /dev/null +++ b/src/modules/corex/corex_rpc_shm.c @@ -0,0 +1,72 @@ +/** + * Copyright (C) 2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#include <stdio.h> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + +#include "../../core/dprint.h" +#include "../../core/ut.h" +#include "../../core/mem/shm.h" +#include "../../core/globals.h" +#include "../../core/rpc.h" +#include "../../core/rpc_lookup.h" + +static const char* corex_rpc_shm_info_doc[2] = { + "Return details of the shared memory manager", + 0 +}; + + +/* + * RPC command to list the listening sockets + */ +static void corex_rpc_shm_info(rpc_t* rpc, void* ctx) +{ + void* th; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "su", + "name", (_shm_root.mname)?_shm_root.mname:"unknown", + "size", (unsigned int)shm_mem_size) <0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } +} + +rpc_export_t corex_rpc_shm_cmds[] = { + {"shm.info", corex_rpc_shm_info, corex_rpc_shm_info_doc, 0}, + {0, 0, 0, 0} +}; + +/** + * register RPC shm commands + */ +int corex_init_rpc_shm(void) +{ + if (rpc_register_array(corex_rpc_shm_cmds)!=0) { + LM_ERR("failed to register RPC shm commands\n"); + return -1; + } + return 0; +} diff --git a/src/modules/corex/corex_rpc_shm.h b/src/modules/corex/corex_rpc_shm.h new file mode 100644 index 0000000000..392dcafc08 --- /dev/null +++ b/src/modules/corex/corex_rpc_shm.h @@ -0,0 +1,25 @@ +/** + * Copyright (C) 2020 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of Kamailio, a free SIP server. + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ + +#ifndef _COREX_RPC_SHM_H_ +#define _COREX_RPC_SHM_H_ + +int corex_init_rpc_shm(void); + +#endif

1 0

git:master:4dd854a3: corex: docs added for rpc command shm.info
by Daniel-Constantin Mierla 17 Sep '20

17 Sep '20

Module: kamailio Branch: master Commit: 4dd854a32ccd7bbb3fd97d072c69071ab0ef4850 URL: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-17T13:21:24+02:00 corex: docs added for rpc command shm.info --- Modified: src/modules/corex/doc/corex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… Patch: https://github.com/kamailio/kamailio/commit/4dd854a32ccd7bbb3fd97d072c69071… --- diff --git a/src/modules/corex/doc/corex_admin.xml b/src/modules/corex/doc/corex_admin.xml index 96c6fe4ae3..aecc5e895c 100644 --- a/src/modules/corex/doc/corex_admin.xml +++ b/src/modules/corex/doc/corex_admin.xml @@ -968,6 +968,20 @@ event_route[dispatcher:dst-down] { &sercmd; corex.pkg_summary pid 2345 &sercmd; corex.pkg_summary idx 1 </programlisting> + </section> + <section id="corex.rpc.shm.info"> + <title> + <function moreinfo="none">corex.shm.info</function> + </title> + <para> + Return shared memory manager details. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc shm.info + </programlisting> </section> </section>

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Victor Seva 16 Sep '20

16 Sep '20

and we have the check of the value before at tmx/t_var.c 176: ``` if(t->uac[branch].reply==NULL || t->uac[branch].reply==FAKED_REPLY) return 1; ``` So it seems other worker touched that shared memory part meanwhile -- 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/2479#issuecomment-693346859

1 0

Re: [sr-dev] [kamailio/kamailio] cfgt: crash trying to get $T_rpl() value using pv_get_spec_value() (#2479)
by Victor Seva 16 Sep '20

16 Sep '20

crash is due to tmx/t_var.c at 206: `` memcpy(_pv_trpl.buf, t->uac[branch].reply->buf, t->uac[branch].reply->len); `` ``` (gdb) f 1 #1 pv_t_update_rpl (msg=<optimized out>) at t_var.c:206 206 in t_var.c (gdb) p t $1 = (struct cell *) 0x7f59ab5c4f28 (gdb) p t->uac $2 = (struct ua_client *) 0x7f59ab5c51b8 (gdb) p t->uac[branch] $3 = {reply = 0x0, end_reply = 0x0, request = {rbtype = 0, flags = 172, t_active = 0, branch = 0, buffer_len = 1657, buffer = 0x7f59ab600680 "INVITE sip:testuser1003@127.1.0.1:50604 SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5062;lr=on;ftag=11791SIPpTag001;did=5a5.6a01;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=SlRwVBghIw0wLT9zNQYk"..., my_T = 0x7f59ab5c4f28, timer = {next = 0x0, prev = 0x0, expire = 352338360, initial_timeout = 16, data = 0x7d0, f = 0x7f59b5a813c0 <retr_buf_handler>, flags = 513, slow_idx = 0}, dst = {send_sock = 0x7f59b68e9290, to = {s = {sa_family = 2, sa_data = "\023\330\177\000\000\001\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 55315, sin_addr = {s_addr = 16777343}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 55315, sin6_flowinfo = 16777343, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 2, __ss_padding = "\023\330\177\000\000\001", '\000' <repeats 111 times>, __ss_align = 0}}, id = 0, send_flags = {f = 4, blst_imask = 0}, proto = 1 '\001', proto_pad0 = 0 '\000', proto_pad1 = 0}, retr_expire = 352338360, fr_expire = 352341219}, local_cancel = {rbtype = 0, flags = 0, t_active = 0, branch = 0, buffer_len = 0, buffer = 0x0, my_T = 0x7f59ab5c4f28, timer = {next = 0x0, prev = 0x0, expire = 0, initial_timeout = 0, data = 0x0, f = 0x7f59b5a813c0 <retr_buf_handler>, flags = 0, slow_idx = 0}, dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}, sas = {ss_family = 0, __ss_padding = '\000' <repeats 117 times>, __ss_align = 0}}, id = 0, send_flags = {f = 0, blst_imask = 0}, proto = 0 '\000', proto_pad0 = 0 '\000', proto_pad1 = 0}, retr_expire = 0, fr_expire = 0}, dns_h = {srv = 0x0, a = 0x0, srv_tried_rrs = 0, port = 0, srv_no = 0 '\000', ip_no = 0 '\000', proto = 0 '\000'}, uri = { s = 0x7f59ab600687 "sip:testuser1003@127.1.0.1:50604 SIP/2.0\r\nRecord-Route: <sip:127.0.0.1:5062;lr=on;ftag=11791SIPpTag001;did=5a5.6a01;ice_caller=strip;ice_callee=strip;aset=50;rtpprx=yes;vsf=SlRwVBghIw0wLT9zNQYkMA93fEh"..., len = 32}, path = { s = 0x7f59ab600d68 "<sip:lb@127.0.0.1;lr;socket=sip:127.0.0.1:5060>", len = 47}, instance = {s = 0x0, len = 0}, ruid = {s = 0x7f59ab600e00 "uloc-5f61608a-7966-8", len = 20}, location_ua = {s = 0x7f59ab600e80 "n/a", len = 3}, last_received = 302, flags = 5, branch_flags = 134259714, icode = 0, local_ack = 0x0, on_failure = 6, on_branch_failure = 0, on_reply = 2, on_unused = 0} (gdb) p t->uac[branch].reply $4 = (struct sip_msg *) 0x0 ``` -- 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/2479#issuecomment-693343276

1 0

git:master:c4d7b74b: modules: readme files regenerated - kex ... [skip ci]
by Kamailio Dev 16 Sep '20

16 Sep '20

Module: kamailio Branch: master Commit: c4d7b74be399cb1e4a5d40969b533f55398dd523 URL: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-16T09:01:19+02:00 modules: readme files regenerated - kex ... [skip ci] --- Modified: src/modules/kex/README --- Diff: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5… Patch: https://github.com/kamailio/kamailio/commit/c4d7b74be399cb1e4a5d40969b533f5…

1 0

git:master:01e8e339: kex: added pkg.info rpc command
by Daniel-Constantin Mierla 16 Sep '20

16 Sep '20

Module: kamailio Branch: master Commit: 01e8e339149ce1554747929cb63b843866c53aba URL: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-16T07:22:09+02:00 kex: added pkg.info rpc command - get details about pkg manager --- Modified: src/modules/kex/pkg_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… Patch: https://github.com/kamailio/kamailio/commit/01e8e339149ce1554747929cb63b843… --- diff --git a/src/modules/kex/pkg_stats.c b/src/modules/kex/pkg_stats.c index 9a2f4a2d37..ee6c637ace 100644 --- a/src/modules/kex/pkg_stats.c +++ b/src/modules/kex/pkg_stats.c @@ -259,11 +259,39 @@ static void rpc_pkg_stats(rpc_t* rpc, void* ctx) } } +/** + * + */ +static const char* rpc_pkg_info_doc[2] = { + "Private memory manager details", + 0 +}; + +/** + * + */ +static void rpc_pkg_info(rpc_t* rpc, void* ctx) +{ + void* th; + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + if(rpc->struct_add(th, "su", + "name", (_pkg_root.mname)?_pkg_root.mname:"unknown", + "size", (unsigned int)pkg_mem_size) <0) { + rpc->fault(ctx, 500, "Internal error adding fields"); + return; + } +} + /** * */ rpc_export_t kex_pkg_rpc[] = { {"pkg.stats", rpc_pkg_stats, rpc_pkg_stats_doc, RET_ARRAY}, + {"pkg.info", rpc_pkg_info, rpc_pkg_info_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:5898c5ac: kex: docs for rpc pkg.info command
by Daniel-Constantin Mierla 16 Sep '20

16 Sep '20

Module: kamailio Branch: master Commit: 5898c5ac89d7a53aa9aa877cc1c642e4365e66dd URL: https://github.com/kamailio/kamailio/commit/5898c5ac89d7a53aa9aa877cc1c642e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-16T07:31:27+02:00 kex: docs for rpc pkg.info command --- Modified: src/modules/kex/doc/kex_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/5898c5ac89d7a53aa9aa877cc1c642e… Patch: https://github.com/kamailio/kamailio/commit/5898c5ac89d7a53aa9aa877cc1c642e… --- diff --git a/src/modules/kex/doc/kex_admin.xml b/src/modules/kex/doc/kex_admin.xml index 334f989342..3e4ee9e1f4 100644 --- a/src/modules/kex/doc/kex_admin.xml +++ b/src/modules/kex/doc/kex_admin.xml @@ -732,6 +732,20 @@ resetdebug(); &kamcmd; pkg.stats rank 1 &kamcmd; pkg.stats index 10 </programlisting> + </section> + <section id="kex.r.pkg.info"> + <title> + <function moreinfo="none">pkg.info</function> + </title> + <para> + Get pkg manager details. + </para> + <para> + Example: + </para> + <programlisting format="linespecific"> + &kamcli; rpc pkg.info + </programlisting> </section> <section id="kex.r.stats.get_statistics"> <title>

1 0

git:5.2:07e51b97: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.2 Commit: 07e51b97c9a409eeb4d735f8d20a67b6f6c7e097 URL: https://github.com/kamailio/kamailio/commit/07e51b97c9a409eeb4d735f8d20a67b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-15T18:01:51+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/07e51b97c9a409eeb4d735f8d20a67b… Patch: https://github.com/kamailio/kamailio/commit/07e51b97c9a409eeb4d735f8d20a67b… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index c5f35ed381..ab3a38a260 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -239,21 +239,22 @@ Chapter 1. Admin Guide If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER - including one or more Path HFs: + including one or more Path header fields: * off - stores the value of the Path headers into usrloc without passing it back to the UAC in the reply. * lazy - stores the Path header and passes it back to the UAC if - Path-support is indicated by the “path” param in the Supported HF. + Path-support is indicated by the “path” param in the Supported + header field. * strict - rejects the registration with “420 Bad Extension” if there's a Path header but no support for it is indicated by the UAC. Otherwise it's stored and passed back to the UAC. A call to lookup(...) always uses the path header if found, and inserts - it as Route HF either in front of the first Route HF, or after the last - Via HF if no Route is present. It also sets the destination uri to the - first Path uri, thus overwriting the received-uri, because NAT has to - be handled at the outbound-proxy of the UAC (the first hop after - client's NAT). + it as Route header field either in front of the first Route header + field, or after the last Via header field if no Route is present. It + also sets the destination uri to the first Path uri, thus overwriting + the received-uri, because NAT has to be handled at the outbound-proxy + of the UAC (the first hop after client's NAT). The whole process is transparent to the user, so no config changes are required beside setting the registrar-parameters “use_path” and @@ -322,10 +323,10 @@ Chapter 1. Admin Guide 3.1. default_expires (integer) - If the processed message contains neither Expires HFs nor expires - contact parameters, this value will be used for newly created usrloc - records. The parameter contains number of second to expire (for example - use 3600 for one hour). If it is set to a lower value than the + If the processed message contains neither Expires header fields nor + expires contact parameters, this value will be used for newly created + usrloc records. The parameter contains number of second to expire (for + example use 3600 for one hour). If it is set to a lower value than the “min_expires” parameter then it will be ignored. This parameter can be modified via ser config framework. A random value in a specific interval can be selected by using the default_expires_range parameter @@ -853,8 +854,8 @@ end 4.1. save(domain, [, flags [, uri]]) The function processes a REGISTER message. It can add, remove or modify - location records (in usrloc) depending on Contact and Expires HFs in - the REGISTER message. On success and when called from the + location records (in usrloc) depending on Contact and Expires header + fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short description in reason phrase. @@ -864,7 +865,7 @@ end then this must be name of the table which stores the contacts. * flags (optional) - the value may be a bitwise OR of the following flags: - + 0x01 - save the contacts only in memory cache without no DB + + 0x01 - save the contacts only in memory cache with no DB operation; + 0x02 - do not generate a SIP reply to the current REGISTER request. When used in ONREPLY_ROUTE, this parameter is

1 0

git:5.3:458d96d9: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.3 Commit: 458d96d9cabf679efbcaaa81f69086c50940e495 URL: https://github.com/kamailio/kamailio/commit/458d96d9cabf679efbcaaa81f69086c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-15T18:01:38+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/458d96d9cabf679efbcaaa81f69086c… Patch: https://github.com/kamailio/kamailio/commit/458d96d9cabf679efbcaaa81f69086c… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index e4516756e6..2a611ef564 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -245,21 +245,22 @@ Chapter 1. Admin Guide If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER - including one or more Path HFs: + including one or more Path header fields: * off - stores the value of the Path headers into usrloc without passing it back to the UAC in the reply. * lazy - stores the Path header and passes it back to the UAC if - Path-support is indicated by the “path” param in the Supported HF. + Path-support is indicated by the “path” param in the Supported + header field. * strict - rejects the registration with “420 Bad Extension” if there's a Path header but no support for it is indicated by the UAC. Otherwise it's stored and passed back to the UAC. A call to lookup(...) always uses the path header if found, and inserts - it as Route HF either in front of the first Route HF, or after the last - Via HF if no Route is present. It also sets the destination uri to the - first Path uri, thus overwriting the received-uri, because NAT has to - be handled at the outbound-proxy of the UAC (the first hop after - client's NAT). + it as Route header field either in front of the first Route header + field, or after the last Via header field if no Route is present. It + also sets the destination uri to the first Path uri, thus overwriting + the received-uri, because NAT has to be handled at the outbound-proxy + of the UAC (the first hop after client's NAT). The whole process is transparent to the user, so no config changes are required beside setting the registrar-parameters “use_path” and @@ -329,10 +330,10 @@ Chapter 1. Admin Guide 3.1. default_expires (integer) - If the processed message contains neither Expires HFs nor expires - contact parameters, this value will be used for newly created usrloc - records. The parameter contains number of second to expire (for example - use 3600 for one hour). If it is set to a lower value than the + If the processed message contains neither Expires header fields nor + expires contact parameters, this value will be used for newly created + usrloc records. The parameter contains number of second to expire (for + example use 3600 for one hour). If it is set to a lower value than the “min_expires” parameter then it will be ignored. This parameter can be modified via ser config framework. A random value in a specific interval can be selected by using the default_expires_range parameter @@ -892,8 +893,8 @@ request_route { 4.1. save(domain, [, flags [, uri]]) The function processes a REGISTER message. It can add, remove or modify - location records (in usrloc) depending on Contact and Expires HFs in - the REGISTER message. On success and when called from the + location records (in usrloc) depending on Contact and Expires header + fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short description in reason phrase. @@ -903,7 +904,7 @@ request_route { then this must be name of the table which stores the contacts. * flags (optional) - the value may be a bitwise OR of the following flags: - + 0x01 - save the contacts only in memory cache without no DB + + 0x01 - save the contacts only in memory cache with no DB operation; + 0x02 - do not generate a SIP reply to the current REGISTER request. When used in ONREPLY_ROUTE, this parameter is

1 0

git:5.4:5cbec397: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.4 Commit: 5cbec397d4dbe338400aefacddcce69dd0547f39 URL: https://github.com/kamailio/kamailio/commit/5cbec397d4dbe338400aefacddcce69… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-15T18:01:22+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/5cbec397d4dbe338400aefacddcce69… Patch: https://github.com/kamailio/kamailio/commit/5cbec397d4dbe338400aefacddcce69… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index fe9c969ce9..f4f5ccae0d 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -254,21 +254,22 @@ Chapter 1. Admin Guide If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER - including one or more Path HFs: + including one or more Path header fields: * off - stores the value of the Path headers into usrloc without passing it back to the UAC in the reply. * lazy - stores the Path header and passes it back to the UAC if - Path-support is indicated by the “path” param in the Supported HF. + Path-support is indicated by the “path” param in the Supported + header field. * strict - rejects the registration with “420 Bad Extension” if there's a Path header but no support for it is indicated by the UAC. Otherwise it's stored and passed back to the UAC. A call to lookup(...) always uses the path header if found, and inserts - it as Route HF either in front of the first Route HF, or after the last - Via HF if no Route is present. It also sets the destination uri to the - first Path uri, thus overwriting the received-uri, because NAT has to - be handled at the outbound-proxy of the UAC (the first hop after - client's NAT). + it as Route header field either in front of the first Route header + field, or after the last Via header field if no Route is present. It + also sets the destination uri to the first Path uri, thus overwriting + the received-uri, because NAT has to be handled at the outbound-proxy + of the UAC (the first hop after client's NAT). The whole process is transparent to the user, so no config changes are required beside setting the registrar-parameters “use_path” and @@ -341,10 +342,10 @@ Chapter 1. Admin Guide 3.1. default_expires (integer) - If the processed message contains neither Expires HFs nor expires - contact parameters, this value will be used for newly created usrloc - records. The parameter contains number of second to expire (for example - use 3600 for one hour). If it is set to a lower value than the + If the processed message contains neither Expires header fields nor + expires contact parameters, this value will be used for newly created + usrloc records. The parameter contains number of second to expire (for + example use 3600 for one hour). If it is set to a lower value than the “min_expires” parameter then it will be ignored. This parameter can be modified via ser config framework. A random value in a specific interval can be selected by using the default_expires_range parameter @@ -955,8 +956,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 4.1. save(domain, [, flags [, uri]]) The function processes a REGISTER message. It can add, remove or modify - location records (in usrloc) depending on Contact and Expires HFs in - the REGISTER message. On success and when called from the + location records (in usrloc) depending on Contact and Expires header + fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short description in reason phrase. @@ -966,7 +967,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 then this must be name of the table which stores the contacts. * flags (optional) - the value may be a bitwise OR of the following flags: - + 0x01 - save the contacts only in memory cache without no DB + + 0x01 - save the contacts only in memory cache with no DB operation; + 0x02 - do not generate a SIP reply to the current REGISTER request. When used in ONREPLY_ROUTE, this parameter is

1 0

git:5.2:8e62b35f: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.2 Commit: 8e62b35f97ba34268fbde35599ecd1645f0d7f76 URL: https://github.com/kamailio/kamailio/commit/8e62b35f97ba34268fbde35599ecd16… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:50:10Z registrar: Update documentation - Fix double negative "without no DB operation". Changed to "with no DB operation". (cherry picked from commit be0382fa11920de972ddbcdbe17c3ff583da87e4) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/8e62b35f97ba34268fbde35599ecd16… Patch: https://github.com/kamailio/kamailio/commit/8e62b35f97ba34268fbde35599ecd16… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 7c4226ad3c..3edede4096 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1026,7 +1026,7 @@ end <itemizedlist> <listitem> <para><emphasis>0x01</emphasis> - save the contacts only - in memory cache without no DB operation; + in memory cache with no DB operation; </para> </listitem> <listitem>

1 0

git:5.2:59cede26: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.2 Commit: 59cede2607d8847cfff96aa6221f00e0abbb625d URL: https://github.com/kamailio/kamailio/commit/59cede2607d8847cfff96aa6221f00e… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:50:15Z registrar: Update documentation - Replace all occurences of "HF" with "header field" - Replace all occurences of "HFs" with "header fields" (cherry picked from commit d936c6276b6d8e45efd87a4fc25a55b9c3ab1fce) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/59cede2607d8847cfff96aa6221f00e… Patch: https://github.com/kamailio/kamailio/commit/59cede2607d8847cfff96aa6221f00e… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 3edede4096..54bfea5ff6 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -28,7 +28,7 @@ If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER including - one or more Path HFs: + one or more Path header fields: </para> <itemizedlist> <listitem> @@ -42,7 +42,7 @@ <para> <emphasis>lazy</emphasis> - stores the Path header and passes it back to the UAC if Path-support is indicated - by the <quote>path</quote> param in the Supported HF. + by the <quote>path</quote> param in the Supported header field. </para> </listitem> <listitem> @@ -56,8 +56,8 @@ </itemizedlist> <para> A call to lookup(...) always uses the path header if - found, and inserts it as Route HF either in front of - the first Route HF, or after the last Via HF if no + found, and inserts it as Route header field either in front of + the first Route header field, or after the last Via header field if no Route is present. It also sets the destination uri to the first Path uri, thus overwriting the received-uri, because NAT has to be handled at the outbound-proxy of @@ -131,7 +131,7 @@ <title><varname>default_expires</varname> (integer)</title> <para> If the processed message contains neither Expires - <acronym>HFs</acronym> nor expires contact parameters, this value + header fields nor expires contact parameters, this value will be used for newly created usrloc records. The parameter contains number of second to expire (for example use 3600 for one hour). If it is set to a lower value than the <quote>min_expires</quote> parameter @@ -1003,7 +1003,7 @@ end </title> <para> The function processes a <emphasis>REGISTER</emphasis> message. It can add, remove or - modify location records (in usrloc) depending on Contact and Expires HFs in the + modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short

1 0

git:5.3:9be13ba9: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.3 Commit: 9be13ba9668b1c0aea9122ef4d8bfbb22e29eabb URL: https://github.com/kamailio/kamailio/commit/9be13ba9668b1c0aea9122ef4d8bfbb… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:49:47Z registrar: Update documentation - Replace all occurences of "HF" with "header field" - Replace all occurences of "HFs" with "header fields" (cherry picked from commit d936c6276b6d8e45efd87a4fc25a55b9c3ab1fce) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9be13ba9668b1c0aea9122ef4d8bfbb… Patch: https://github.com/kamailio/kamailio/commit/9be13ba9668b1c0aea9122ef4d8bfbb… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 1a8942d3b4..8b83e3c00e 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -28,7 +28,7 @@ If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER including - one or more Path HFs: + one or more Path header fields: </para> <itemizedlist> <listitem> @@ -42,7 +42,7 @@ <para> <emphasis>lazy</emphasis> - stores the Path header and passes it back to the UAC if Path-support is indicated - by the <quote>path</quote> param in the Supported HF. + by the <quote>path</quote> param in the Supported header field. </para> </listitem> <listitem> @@ -56,8 +56,8 @@ </itemizedlist> <para> A call to lookup(...) always uses the path header if - found, and inserts it as Route HF either in front of - the first Route HF, or after the last Via HF if no + found, and inserts it as Route header field either in front of + the first Route header field, or after the last Via header field if no Route is present. It also sets the destination uri to the first Path uri, thus overwriting the received-uri, because NAT has to be handled at the outbound-proxy of @@ -131,7 +131,7 @@ <title><varname>default_expires</varname> (integer)</title> <para> If the processed message contains neither Expires - <acronym>HFs</acronym> nor expires contact parameters, this value + header fields nor expires contact parameters, this value will be used for newly created usrloc records. The parameter contains number of second to expire (for example use 3600 for one hour). If it is set to a lower value than the <quote>min_expires</quote> parameter @@ -1048,7 +1048,7 @@ request_route { </title> <para> The function processes a <emphasis>REGISTER</emphasis> message. It can add, remove or - modify location records (in usrloc) depending on Contact and Expires HFs in the + modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short

1 0

git:5.3:edbafff7: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.3 Commit: edbafff7df51d2dc16f3a379cfb0d333c37439fd URL: https://github.com/kamailio/kamailio/commit/edbafff7df51d2dc16f3a379cfb0d33… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:49:43Z registrar: Update documentation - Fix double negative "without no DB operation". Changed to "with no DB operation". (cherry picked from commit be0382fa11920de972ddbcdbe17c3ff583da87e4) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/edbafff7df51d2dc16f3a379cfb0d33… Patch: https://github.com/kamailio/kamailio/commit/edbafff7df51d2dc16f3a379cfb0d33… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 67e13e09e3..1a8942d3b4 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1071,7 +1071,7 @@ request_route { <itemizedlist> <listitem> <para><emphasis>0x01</emphasis> - save the contacts only - in memory cache without no DB operation; + in memory cache with no DB operation; </para> </listitem> <listitem>

1 0

git:5.4:76864d45: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.4 Commit: 76864d4508ff4e1d9d909480663819db272aae48 URL: https://github.com/kamailio/kamailio/commit/76864d4508ff4e1d9d909480663819d… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:48:45Z registrar: Update documentation - Fix double negative "without no DB operation". Changed to "with no DB operation". (cherry picked from commit be0382fa11920de972ddbcdbe17c3ff583da87e4) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/76864d4508ff4e1d9d909480663819d… Patch: https://github.com/kamailio/kamailio/commit/76864d4508ff4e1d9d909480663819d… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e3140965d4..75a4104fb2 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1174,7 +1174,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 <itemizedlist> <listitem> <para><emphasis>0x01</emphasis> - save the contacts only - in memory cache without no DB operation; + in memory cache with no DB operation; </para> </listitem> <listitem>

1 0

git:5.4:acce084f: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: 5.4 Commit: acce084fcab7249d52862bef0f4c32ed488222bc URL: https://github.com/kamailio/kamailio/commit/acce084fcab7249d52862bef0f4c32e… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T15:49:00Z registrar: Update documentation - Replace all occurences of "HF" with "header field" - Replace all occurences of "HFs" with "header fields" (cherry picked from commit d936c6276b6d8e45efd87a4fc25a55b9c3ab1fce) --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/acce084fcab7249d52862bef0f4c32e… Patch: https://github.com/kamailio/kamailio/commit/acce084fcab7249d52862bef0f4c32e… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index 75a4104fb2..461605f3d0 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -28,7 +28,7 @@ If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER including - one or more Path HFs: + one or more Path header fields: </para> <itemizedlist> <listitem> @@ -42,7 +42,7 @@ <para> <emphasis>lazy</emphasis> - stores the Path header and passes it back to the UAC if Path-support is indicated - by the <quote>path</quote> param in the Supported HF. + by the <quote>path</quote> param in the Supported header field. </para> </listitem> <listitem> @@ -56,8 +56,8 @@ </itemizedlist> <para> A call to lookup(...) always uses the path header if - found, and inserts it as Route HF either in front of - the first Route HF, or after the last Via HF if no + found, and inserts it as Route header field either in front of + the first Route header field, or after the last Via header field if no Route is present. It also sets the destination uri to the first Path uri, thus overwriting the received-uri, because NAT has to be handled at the outbound-proxy of @@ -131,7 +131,7 @@ <title><varname>default_expires</varname> (integer)</title> <para> If the processed message contains neither Expires - <acronym>HFs</acronym> nor expires contact parameters, this value + header fields nor expires contact parameters, this value will be used for newly created usrloc records. The parameter contains number of second to expire (for example use 3600 for one hour). If it is set to a lower value than the <quote>min_expires</quote> parameter @@ -1151,7 +1151,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 </title> <para> The function processes a <emphasis>REGISTER</emphasis> message. It can add, remove or - modify location records (in usrloc) depending on Contact and Expires HFs in the + modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short

1 0

git:master:56a25750: modules: readme files regenerated - registrar ... [skip ci]
by Kamailio Dev 15 Sep '20

15 Sep '20

Module: kamailio Branch: master Commit: 56a257509aabb41e8eddc0f18347b0289aa0ab01 URL: https://github.com/kamailio/kamailio/commit/56a257509aabb41e8eddc0f18347b02… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-15T17:46:10+02:00 modules: readme files regenerated - registrar ... [skip ci] --- Modified: src/modules/registrar/README --- Diff: https://github.com/kamailio/kamailio/commit/56a257509aabb41e8eddc0f18347b02… Patch: https://github.com/kamailio/kamailio/commit/56a257509aabb41e8eddc0f18347b02… --- diff --git a/src/modules/registrar/README b/src/modules/registrar/README index fe9c969ce9..f4f5ccae0d 100644 --- a/src/modules/registrar/README +++ b/src/modules/registrar/README @@ -254,21 +254,22 @@ Chapter 1. Admin Guide If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER - including one or more Path HFs: + including one or more Path header fields: * off - stores the value of the Path headers into usrloc without passing it back to the UAC in the reply. * lazy - stores the Path header and passes it back to the UAC if - Path-support is indicated by the “path” param in the Supported HF. + Path-support is indicated by the “path” param in the Supported + header field. * strict - rejects the registration with “420 Bad Extension” if there's a Path header but no support for it is indicated by the UAC. Otherwise it's stored and passed back to the UAC. A call to lookup(...) always uses the path header if found, and inserts - it as Route HF either in front of the first Route HF, or after the last - Via HF if no Route is present. It also sets the destination uri to the - first Path uri, thus overwriting the received-uri, because NAT has to - be handled at the outbound-proxy of the UAC (the first hop after - client's NAT). + it as Route header field either in front of the first Route header + field, or after the last Via header field if no Route is present. It + also sets the destination uri to the first Path uri, thus overwriting + the received-uri, because NAT has to be handled at the outbound-proxy + of the UAC (the first hop after client's NAT). The whole process is transparent to the user, so no config changes are required beside setting the registrar-parameters “use_path” and @@ -341,10 +342,10 @@ Chapter 1. Admin Guide 3.1. default_expires (integer) - If the processed message contains neither Expires HFs nor expires - contact parameters, this value will be used for newly created usrloc - records. The parameter contains number of second to expire (for example - use 3600 for one hour). If it is set to a lower value than the + If the processed message contains neither Expires header fields nor + expires contact parameters, this value will be used for newly created + usrloc records. The parameter contains number of second to expire (for + example use 3600 for one hour). If it is set to a lower value than the “min_expires” parameter then it will be ignored. This parameter can be modified via ser config framework. A random value in a specific interval can be selected by using the default_expires_range parameter @@ -955,8 +956,8 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 4.1. save(domain, [, flags [, uri]]) The function processes a REGISTER message. It can add, remove or modify - location records (in usrloc) depending on Contact and Expires HFs in - the REGISTER message. On success and when called from the + location records (in usrloc) depending on Contact and Expires header + fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, “200 OK” will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short description in reason phrase. @@ -966,7 +967,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 then this must be name of the table which stores the contacts. * flags (optional) - the value may be a bitwise OR of the following flags: - + 0x01 - save the contacts only in memory cache without no DB + + 0x01 - save the contacts only in memory cache with no DB operation; + 0x02 - do not generate a SIP reply to the current REGISTER request. When used in ONREPLY_ROUTE, this parameter is

1 0

[kamailio/kamailio] Minor doc changes to Registrar module (#2477)
by Ben Kaufman 15 Sep '20

15 Sep '20

### Description Use of acronym "HF" (header field) in the REGISTRAR is a bit obscure. It probably makes sense to experienced Kamailio admins, but it's not immediately apparent to beginners. Since there is little gained by using the acronym in this document it would be more friendly to use "header field". Also, there is a double negative in section 4.1/flags/0x01: ``` 0x01 - save the contacts only in memory cache without no DB operation; ``` The literal meaning of this sentence is that it performs a DB operation. This should be changed to "with no" or possibly just "without", or even "with no". ### Expected behavior Use 'header field' instead of 'HF'. Use "with" instead of "without no". #### Actual observed behavior As indicated above #### Debugging Data Not applicable #### Log Messages Not applicable #### SIP Traffic Not applicable ### Possible Solutions Use 'header field' instead of 'HF'. Use "with" instead of "without no". ### Additional Information * **Kamailio Version** - output of `kamailio -v` Exists in most recent code branch. * **Operating System**: Not applicable. -- 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/2477

2 2

[kamailio/kamailio] Issue 2477 - Minor doc changes to Registrar module (#2478)
by Ben Kaufman 15 Sep '20

15 Sep '20

#### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [X] PR should be backported to stable branches - [X] Tested changes locally - [X] Related to issue #2477 #### Description Minor doc changes to Registrar module as described in Issue #2477 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2478 -- Commit Summary -- * registrar: Update documentation * registrar: Update documentation -- File Changes -- M src/modules/registrar/doc/registrar_admin.xml (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2478.patch https://github.com/kamailio/kamailio/pull/2478.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/2478

2 2

git:master:d936c627: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: master Commit: d936c6276b6d8e45efd87a4fc25a55b9c3ab1fce URL: https://github.com/kamailio/kamailio/commit/d936c6276b6d8e45efd87a4fc25a55b… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T17:41:40+02:00 registrar: Update documentation - Replace all occurences of "HF" with "header field" - Replace all occurences of "HFs" with "header fields" --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d936c6276b6d8e45efd87a4fc25a55b… Patch: https://github.com/kamailio/kamailio/commit/d936c6276b6d8e45efd87a4fc25a55b… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index e3140965d4..bb2d8f8646 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -28,7 +28,7 @@ If path support is enabled in the registrar module, a call to save(...) stores the values of the Path Header(s) along with the contact into usrloc. There are three modes regarding the reply to a REGISTER including - one or more Path HFs: + one or more Path header fields: </para> <itemizedlist> <listitem> @@ -42,7 +42,7 @@ <para> <emphasis>lazy</emphasis> - stores the Path header and passes it back to the UAC if Path-support is indicated - by the <quote>path</quote> param in the Supported HF. + by the <quote>path</quote> param in the Supported header field. </para> </listitem> <listitem> @@ -56,8 +56,8 @@ </itemizedlist> <para> A call to lookup(...) always uses the path header if - found, and inserts it as Route HF either in front of - the first Route HF, or after the last Via HF if no + found, and inserts it as Route header field either in front of + the first Route header field, or after the last Via header field if no Route is present. It also sets the destination uri to the first Path uri, thus overwriting the received-uri, because NAT has to be handled at the outbound-proxy of @@ -131,7 +131,7 @@ <title><varname>default_expires</varname> (integer)</title> <para> If the processed message contains neither Expires - <acronym>HFs</acronym> nor expires contact parameters, this value + header fields nor expires contact parameters, this value will be used for newly created usrloc records. The parameter contains number of second to expire (for example use 3600 for one hour). If it is set to a lower value than the <quote>min_expires</quote> parameter @@ -1151,7 +1151,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 </title> <para> The function processes a <emphasis>REGISTER</emphasis> message. It can add, remove or - modify location records (in usrloc) depending on Contact and Expires HFs in the + modify location records (in usrloc) depending on Contact and Expires header fields in the REGISTER message. On success and when called from the REQUEST_ROUTE, <quote>200 OK</quote> will be returned listing all contacts that are currently in the location database. On an error, an error message will be sent with a short

1 0

git:master:be0382fa: registrar: Update documentation
by Henning Westerholt 15 Sep '20

15 Sep '20

Module: kamailio Branch: master Commit: be0382fa11920de972ddbcdbe17c3ff583da87e4 URL: https://github.com/kamailio/kamailio/commit/be0382fa11920de972ddbcdbe17c3ff… Author: whosgonna <ben.whosgonna.com(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-15T17:41:40+02:00 registrar: Update documentation - Fix double negative "without no DB operation". Changed to "with no DB operation". --- Modified: src/modules/registrar/doc/registrar_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/be0382fa11920de972ddbcdbe17c3ff… Patch: https://github.com/kamailio/kamailio/commit/be0382fa11920de972ddbcdbe17c3ff… --- diff --git a/src/modules/registrar/doc/registrar_admin.xml b/src/modules/registrar/doc/registrar_admin.xml index bb2d8f8646..461605f3d0 100644 --- a/src/modules/registrar/doc/registrar_admin.xml +++ b/src/modules/registrar/doc/registrar_admin.xml @@ -1174,7 +1174,7 @@ kamcmd cfg.set_now_int registrar use_expired_contacts 0 <itemizedlist> <listitem> <para><emphasis>0x01</emphasis> - save the contacts only - in memory cache without no DB operation; + in memory cache with no DB operation; </para> </listitem> <listitem>

1 0

[kamailio/kamailio] $xavp(reg=>max_contacts)=1 < modparam("registrar", "max_contacts", 10) does not work (#2471)
by Anthony Messina 15 Sep '20

15 Sep '20

### Description  I'd like to reduce the number of contacts per AOR for certain UAs, while maintaining a default higher limit. ``` modparam("registrar", "max_contacts", 10) modparam("registrar", "xavp_cfg", "reg") route[REGISTRAR] { if($ua=~"^Yealink") { $xavp(reg=>max_contacts)=1; } if(!save("location")) { sl_reply_error(); } exit; } ``` ### Expected behavior https://www.kamailio.org/docs/modules/stable/modules/registrar#registrar.p.… states: * max_contacts - the number of maximum contacts to be stored for the current registration AoR. It **overwrites** the 'max_contacts' module parameter value. I expect that the UA will register with the new contact and have all others removed. #### Actual observed behavior `$xavp(reg=>max_contacts)` set to a value lower than the `max_contacts` modparam does not achieve the **overwrites** expectation from the documentation. #### Log Messages  ``` INFO: registrar [save.c:619]: test_max_contacts(): too many contacts for AOR <user(a)example.com> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.1-1.gite1d4ddcb6c.fc32 (x86_64/linux) 09fd6a 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: 09fd6a compiled on 00:00:00 Sep 5 2020 with gcc 10.2.1 ``` * **Operating System**:  ``` Fedora 32, kernel-5.8.4-200.fc32.x86_64 ``` -- 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/2471

3 6

git:master:628d2d3f: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 15 Sep '20

15 Sep '20

Module: kamailio Branch: master Commit: 628d2d3fa7a6b61c85f0211838640bc5713ba3e7 URL: https://github.com/kamailio/kamailio/commit/628d2d3fa7a6b61c85f0211838640bc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-15T07:46:18+02:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/628d2d3fa7a6b61c85f0211838640bc… Patch: https://github.com/kamailio/kamailio/commit/628d2d3fa7a6b61c85f0211838640bc… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index b70fdd3737..72b1ae8b3f 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -98,17 +98,21 @@ Chapter 1. Admin Guide 1. Overview - This module offers topology hiding by stripping the SIP routing headers - that show topology details. The script interpreter gets the SIP - messages with full content, so all existing functionality is preserved. + This module offers topology hiding for INVITE-based dialogs, by + stripping the SIP routing headers that show topology details . The + script interpreter gets the SIP messages with full content, so all + existing functionality is preserved. The module is transparent for the configuration writer. It only needs - to be loaded (tune the parameters if needed). + to be loaded (tune the module parameters if needed). It also works for SIP MESSAGE or other requests that do not create a - call dialog -- record_route() must be used for them as well, the - headers are not going to be in the messages sent to the network, they - are needed to know local addresses used to communicate with each side. + dialog -- record_route() must be used for them as well, the headers are + not going to be in the messages sent to the network, they are needed to + know local addresses used to communicate with each side. At this moment + it is not designed to work for presence (SUBSCRIBE-based) dialogs. The + REGISTER and PUBLISH requests are skipped from processing by this + module, expected to be terminated on a local SIP server. 2. Dependencies

1 0

git:master:878971f2: topos: docs - more details about what SIP traffic is handled
by Daniel-Constantin Mierla 15 Sep '20

15 Sep '20

Module: kamailio Branch: master Commit: 878971f2c0bc32233b6f18728f9b88537b3d19e8 URL: https://github.com/kamailio/kamailio/commit/878971f2c0bc32233b6f18728f9b885… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-15T07:33:00+02:00 topos: docs - more details about what SIP traffic is handled --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/878971f2c0bc32233b6f18728f9b885… Patch: https://github.com/kamailio/kamailio/commit/878971f2c0bc32233b6f18728f9b885… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index 46edd04a6c..973391430b 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -16,20 +16,23 @@ <section> <title>Overview</title> <para> - This module offers topology hiding by stripping the SIP routing - headers that show topology details. + This module offers topology hiding for INVITE-based dialogs, by stripping + the SIP routing headers that show topology details . The script interpreter gets the SIP messages with full content, so all existing functionality is preserved. </para> <para> The module is transparent for the configuration writer. It only needs to be - loaded (tune the parameters if needed). + loaded (tune the module parameters if needed). </para> <para> It also works for SIP MESSAGE or other requests that do not create - a call dialog -- record_route() must be used for them as well, the + a dialog -- record_route() must be used for them as well, the headers are not going to be in the messages sent to the network, they are needed to know local addresses used to communicate with each side. + At this moment it is not designed to work for presence (SUBSCRIBE-based) + dialogs. The REGISTER and PUBLISH requests are skipped from processing + by this module, expected to be terminated on a local SIP server. </para> </section> <section>

1 0

git:master:70295ebe: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 14 Sep '20

14 Sep '20

Module: kamailio Branch: master Commit: 70295ebe5b3762ce5679da1985b14134aae91744 URL: https://github.com/kamailio/kamailio/commit/70295ebe5b3762ce5679da1985b1413… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-14T19:01:15+02:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/70295ebe5b3762ce5679da1985b1413… Patch: https://github.com/kamailio/kamailio/commit/70295ebe5b3762ce5679da1985b1413…

1 0

git:master:9c97c700: rr: new function loose_route_mode(vmode)
by Daniel-Constantin Mierla 14 Sep '20

14 Sep '20

Module: kamailio Branch: master Commit: 9c97c700a7db52e80189b88f2c6950f3dabbc8ed URL: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T13:24:31+02:00 rr: new function loose_route_mode(vmode) - if vmode==1, then do only loose routing (do not test if r-uri==myself to do strict routing, always do loose routing, with preloaded check like loose_route()) - if vmode==0, then behave like loose_route() --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/loose.h Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f… Patch: https://github.com/kamailio/kamailio/commit/9c97c700a7db52e80189b88f2c6950f…

1 0

git:master:e771c554: rr: docs for loose_route_mode() function
by Daniel-Constantin Mierla 14 Sep '20

14 Sep '20

Module: kamailio Branch: master Commit: e771c554d8ca8ec691c8f02efdf6f85187f49b0f URL: https://github.com/kamailio/kamailio/commit/e771c554d8ca8ec691c8f02efdf6f85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T13:34:38+02:00 rr: docs for loose_route_mode() function --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/e771c554d8ca8ec691c8f02efdf6f85… Patch: https://github.com/kamailio/kamailio/commit/e771c554d8ca8ec691c8f02efdf6f85… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index fb7b4d03ca..514c8b4a04 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -442,6 +442,34 @@ if(!loose_route_preloaded()) { </example> </section> + <section id="rr.f.loose_route_mode"> + <title><function moreinfo="none">loose_route_mode(vmode)</function></title> + + <para>The function is similar to `loose_route()`, but it does only + loose routing processing if vmode==1, skipping the testing of r-uri==myself + for performing strict routing. If vmode==0, it behaves like loose_route(). + </para> + <para>It is a convenient function to use with application servers that + set the Contact URI to SIP server address. + </para> + <para>This function can be used from REQUEST_ROUTE.</para> + + <example> + <title><function>loose_route_mode</function> usage</title> + + <programlisting format="linespecific"> +... +if(has_totag() and uri==myself) { + if(loose_route_mode("1")) { + rewritehostport("my.app.server:5090"); + t_relay(); + exit; + } +} +... +</programlisting> + </example> + </section> <section id="rr.f.record_route"> <title><function moreinfo="none">record_route([sparams])</function></title>

1 0

git:master:e307432e: dispatcher: sync on updating last used fields
by Daniel-Constantin Mierla 14 Sep '20

14 Sep '20

Module: kamailio Branch: master Commit: e307432e5f34a2093544e9ff703ea205169e4088 URL: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T13:01:17+02:00 dispatcher: sync on updating last used fields --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… Patch: https://github.com/kamailio/kamailio/commit/e307432e5f34a2093544e9ff703ea20… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index b78a89fdb5..4066bc39d7 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2070,6 +2070,7 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) unsigned int hash; ds_set_t *idx = NULL; int ulast = 0; + int vlast = 0; if(msg == NULL) { LM_ERR("bad parameters\n"); @@ -2124,8 +2125,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_ROUNDROBIN: /* 4 - round robin */ + lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); ulast = 1; break; case DS_ALG_HASHAUTHUSER: /* 5 - hash auth username */ @@ -2136,8 +2140,11 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) break; case 1: /* No Authorization found: Use round robin */ + lock_get(&idx->lock); hash = idx->last; idx->last = (idx->last + 1) % idx->nr; + vlast = idx->last; + lock_release(&idx->lock); ulast = 1; break; default: @@ -2158,8 +2165,10 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) hash = 0; break; case DS_ALG_WEIGHT: /* 9 - weight based distribution */ + lock_get(&idx->lock); hash = idx->wlist[idx->wlast]; idx->wlast = (idx->wlast + 1) % 100; + lock_release(&idx->lock); break; case DS_ALG_CALLLOAD: /* 10 - call load based distribution */ /* only INVITE can start a call */ @@ -2189,8 +2198,10 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) } break; case DS_ALG_RELWEIGHT: /* 11 - relative weight based distribution */ + lock_get(&idx->lock); hash = idx->rwlist[idx->rwlast]; idx->rwlast = (idx->rwlast + 1) % 100; + lock_release(&idx->lock); break; case DS_ALG_PARALLEL: /* 12 - parallel dispatching */ hash = 0; @@ -2240,10 +2251,13 @@ int ds_manage_routes(sip_msg_t *msg, ds_select_state_t *rstate) rstate->emode = 1; } - /* update last field for next select to point after the current active used */ - if(ulast) { + /* update last field for next select to point after the current active used, + * if not updated meanwhile */ + lock_get(&idx->lock); + if(ulast && (vlast == idx->last)) { idx->last = (hash + 1) % idx->nr; } + lock_release(&idx->lock); LM_DBG("selected [%d-%d-%d/%d] <%.*s>\n", rstate->alg, rstate->setid, rstate->umode, hash,

1 0

git:5.2:01d814b8: dispatcher: update state if sending keepalive OPTIONS fails
by Daniel-Constantin Mierla 14 Sep '20

14 Sep '20

Module: kamailio Branch: 5.2 Commit: 01d814b824c5b03a044f793783bd9ab7a9d811c3 URL: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T09:34:56+02:00 dispatcher: update state if sending keepalive OPTIONS fails - backport of 4584e17b98f338916cc89dac6e1700f250cdf501 (cherry picked from commit 1bccb817c20f02665d48a38eb59a57a6ae17b81f) --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… Patch: https://github.com/kamailio/kamailio/commit/01d814b824c5b03a044f793783bd9ab… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index 77294c7782..23625e87d1 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3095,6 +3095,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + int state; if(!node) return; @@ -3144,6 +3145,18 @@ void ds_ping_set(ds_set_t *node) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); + state = DS_TRYING_DST; + if(ds_probing_mode != DS_PROBE_NONE) { + state |= DS_PROBING_DST; + } + /* check if meantime someone disabled the target via RPC */ + if(!(node->dlist[j].flags & DS_DISABLED_DST) + && ds_update_state(NULL, node->id, &node->dlist[j].uri, + state) != 0) { + LM_ERR("Setting the probing state failed (%.*s, group %d)\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + } } } }

1 0

git:5.3:1bccb817: dispatcher: update state if sending keepalive OPTIONS fails
by Daniel-Constantin Mierla 14 Sep '20

14 Sep '20

Module: kamailio Branch: 5.3 Commit: 1bccb817c20f02665d48a38eb59a57a6ae17b81f URL: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-14T09:33:16+02:00 dispatcher: update state if sending keepalive OPTIONS fails - backport of 4584e17b98f338916cc89dac6e1700f250cdf501 --- Modified: src/modules/dispatcher/dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… Patch: https://github.com/kamailio/kamailio/commit/1bccb817c20f02665d48a38eb59a57a… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d66a48e919..aa563a984b 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -3252,6 +3252,7 @@ void ds_ping_set(ds_set_t *node) uac_req_t uac_r; int i, j; str ping_from; + int state; if(!node) return; @@ -3300,6 +3301,18 @@ void ds_ping_set(ds_set_t *node) < 0) { LM_ERR("unable to ping [%.*s]\n", node->dlist[j].uri.len, node->dlist[j].uri.s); + state = DS_TRYING_DST; + if(ds_probing_mode != DS_PROBE_NONE) { + state |= DS_PROBING_DST; + } + /* check if meantime someone disabled the target via RPC */ + if(!(node->dlist[j].flags & DS_DISABLED_DST) + && ds_update_state(NULL, node->id, &node->dlist[j].uri, + state) != 0) { + LM_ERR("Setting the probing state failed (%.*s, group %d)\n", + node->dlist[j].uri.len, node->dlist[j].uri.s, + node->id); + } } } }

1 0

Multi Kamailio Scenarios
by Benjamín Visón 12 Sep '20

12 Sep '20

I am setting up a redundant active/active environment and I am in need of having 2 kamailios operate as full proxies (meaning both of them will accept registrations). I am using DMQ in order to keep htables synched as well as dialogs. For locations, I have a PostgreSQL database with the registrations. My problem is that since both kamailios are accepting registrations the UACs are only able to receive packets from the UAS on which they are registered. Therefore when let's say UAC-1 registers to Kamailio A and it tries to call UAC-2 which is registered on Kamailio B nothing happens because UAC-2 receives the INVITE from Kamailio A and just ignores them. I've spent almost a month trying to play with inter-kamailio communication (that is, detecting these types of scenarios and sending the INVITE to Kamailio B and have Kamailio B send the INVITE to UAC-2) but there are a LOT of things that are not working properly let alone having to keep track of all the dialog information and to/from tags and doing proper route of all ACK/BYE/CANCEL, etc. My question is, is there a way to achieve this scenario where multiple kamailios can coexist with all responsibilities? Things I've tried: - Keep track of to/from tag in an htable and forward requests based on who sent the request - Use append_branches to handle multiple AOR (with the possibility of 1 user having multiple registrations in different kamailios) - Manually tweaking $ru/$du based on what type of request is and who is it destined to. Any orientation will be appreciated as this is a crucial piece of the project I'm working on. Saludos, [image: Facebook] <https://www.facebook.com/bvisonl>[image: Twitter] <https://twitter.com/benjaminvison>[image: Instagram] <https://instagram.com/bvisonl/> Benjamín Visón / IT Engineer / Software Developer bvisonl(a)gmail.com / (829)-664-5163

3 5

git:master:3c19ca90: docs: add matrix channel information to normal and github READMEs
by Henning Westerholt 12 Sep '20

12 Sep '20

Module: kamailio Branch: master Commit: 3c19ca90327d92be69cdce482e66991147db9083 URL: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-12T09:57:10Z docs: add matrix channel information to normal and github READMEs --- Modified: README Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… Patch: https://github.com/kamailio/kamailio/commit/3c19ca90327d92be69cdce482e66991… --- diff --git a/README b/README index 8458765154..957361df15 100644 --- a/README +++ b/README @@ -109,7 +109,8 @@ To participate in the mailing list, subscribe at the following web address: https://lists.kamailio.org/mailman/listinfo/sr-users The IRC channel #kamailio on freenode.net is a place where to meet and discuss -with other members of Kamailio community. +with other members of Kamailio community. Additionally there is also a Matrix +Kamailio community channel available on https://riot.kamailio.dev/. VI. Contributions ================= diff --git a/README.md b/README.md index 8005030775..f160311182 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,13 @@ An open IRC discussion channel is managed by the community: * irc server: irc.freenode.net * irc channel: #kamailio +### Matrix Channel + +An open Matrix discussion channel is managed by the community: + + * server: https://riot.kamailio.dev/ + * Room: https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev + ## Useful Resources News:

1 0

git:master:e52c1f33: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 11 Sep '20

11 Sep '20

Module: kamailio Branch: master Commit: e52c1f334fb98e00809226cde190da3406976348 URL: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-11T22:16:12+02:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… Patch: https://github.com/kamailio/kamailio/commit/e52c1f334fb98e00809226cde190da3… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index ac3a6b7bb6..d075042834 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -94,8 +94,9 @@ Carsten Bock 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -197,8 +198,9 @@ Carsten Bock 1.52. ka_from parameter usage 1.53. ka_domain parameter usage 1.54. ka_filter parameter usage - 1.55. ka_loglevel parameter usage - 1.56. ka_logmsg parameter usage + 1.55. Set ka_timeout parameter + 1.56. ka_loglevel parameter usage + 1.57. ka_logmsg parameter usage Chapter 1. Admin Guide @@ -269,8 +271,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 4. RPC Commands @@ -404,8 +407,9 @@ Chapter 1. Admin Guide 3.52. ka_from (str) 3.53. ka_domain (str) 3.54. ka_filter (int) - 3.55. ka_loglevel (int) - 3.56. ka_logmsg (str) + 3.55. ka_timeout (int) + 3.56. ka_loglevel (int) + 3.57. ka_logmsg (str) 3.1. nat_bflag (int) @@ -683,8 +687,8 @@ modparam("usrloc", "desc_time_order", 1) 3.25. timer_interval (int) Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives and + other tasks, that need to be run periodically. Default value is 60. @@ -1163,19 +1167,38 @@ modparam("usrloc", "ka_domain", "mydomain.com") modparam("usrloc", "ka_filter", 1) ... -3.55. ka_loglevel (int) +3.55. ka_timeout (int) + + The parameter sets the interval in seconds after which a contact is + removed from location table if it does not reply to SIP keepalives + (usually OPTIONS ping requests). + + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + + Default value is “0” (feature disabled). + + Example 1.55. Set ka_timeout parameter +... +modparam("usrloc", "ka_timeout", 120) +... + +3.56. ka_loglevel (int) The level to print the log message when the keepalive response is received. It should be a value between -5 (L_ALERT) and 3 (L_DBG). Default value is “255” (disabled). - Example 1.55. ka_loglevel parameter usage + Example 1.56. ka_loglevel parameter usage ... modparam("usrloc", "ka_loglevel", 1) ... -3.56. ka_logmsg (str) +3.57. ka_logmsg (str) The formatted log specification to be added to the message printed when the keepalive is received and roundtrip time is computed. The log @@ -1187,7 +1210,7 @@ modparam("usrloc", "ka_loglevel", 1) Default value is “ to-uri: [$tu] remote-addr: [$sas]”. - Example 1.56. ka_logmsg parameter usage + Example 1.57. ka_logmsg parameter usage ... modparam("usrloc", "ka_logmsg", " to-uri: [$tu] remote-addr: [$sas]") ...

1 0

git:master:9331044b: usrloc: export modparam to set keepalive timeout
by Daniel-Constantin Mierla 11 Sep '20

11 Sep '20

Module: kamailio Branch: master Commit: 9331044bf517be120dea59414402415090b63007 URL: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-11T22:07:31+02:00 usrloc: export modparam to set keepalive timeout - variable was not exported by the module for internal keepalive mechanism --- Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… Patch: https://github.com/kamailio/kamailio/commit/9331044bf517be120dea59414402415… --- diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 7aecb318a1..860fb715b5 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -258,6 +258,7 @@ static param_export_t params[] = { {"ka_domain", PARAM_STR, &ul_ka_domain}, {"ka_method", PARAM_STR, &ul_ka_method}, {"ka_filter", PARAM_INT, &ul_ka_filter}, + {"ka_timeout", PARAM_INT, &ul_keepalive_timeout}, {"ka_loglevel", PARAM_INT, &ul_ka_loglevel}, {"ka_logmsg", PARAM_STR, &ul_ka_logmsg}, {0, 0, 0}

1 0

git:master:2e9d4e2d: usrloc: docs for ka_timeout module parameter
by Daniel-Constantin Mierla 11 Sep '20

11 Sep '20

Module: kamailio Branch: master Commit: 2e9d4e2dc45bf5baab1bff9c13fc841b66793cb4 URL: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-11T22:07:31+02:00 usrloc: docs for ka_timeout module parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… Patch: https://github.com/kamailio/kamailio/commit/2e9d4e2dc45bf5baab1bff9c13fc841… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 396d89828d..4b624fb81f 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -604,8 +604,8 @@ modparam("usrloc", "desc_time_order", 1) <title><varname>timer_interval</varname> (int)</title> <para> Number of seconds between two timer runs. The module uses a timer to - delete expired contacts, synchronize with database and other tasks, - that need to be run periodically. + delete expired contacts, synchronize with database, send keepalives + and other tasks, that need to be run periodically. </para> <para> <emphasis> @@ -1424,6 +1424,36 @@ modparam("usrloc", "ka_filter", 1) </example> </section> + <section id="usrloc.p.ka_timeout"> + <title><varname>ka_timeout</varname> (int)</title> + <para> + The parameter sets the interval in seconds after which a + contact is removed from location table if it does not reply to SIP + keepalives (usually OPTIONS ping requests). + </para> + <para> + The features is available only for contacts that are stored in memory + (not working for db only mode of the usrloc module). + </para> + <para> + Keepalives are sent stateless, not using TM module. The value of this + parameter has to be few times higher than timer interval. + </para> + <para> + <emphasis> + Default value is <quote>0</quote> (feature disabled). + </emphasis> + </para> + <example> + <title>Set <varname>ka_timeout</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "ka_timeout", 120) +... +</programlisting> + </example> + </section> + <section id="usrloc.p.ka_loglevel"> <title><varname>ka_loglevel</varname> (int)</title> <para>

1 0

[kamailio/kamailio] msrp: fixed IPv6 addrees parsing (#2472)
by sergey-safarov 11 Sep '20

11 Sep '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [*] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Fix relaying MSRP messages to IPv6 uri. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2472 -- Commit Summary -- * msrp: fixed IPv6 addrees parsing -- File Changes -- M src/modules/msrp/msrp_parser.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2472.patch https://github.com/kamailio/kamailio/pull/2472.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/2472

2 10

git:master:8b72f462: pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391)
by Henning Westerholt 11 Sep '20

11 Sep '20

Module: kamailio Branch: master Commit: 8b72f462deb4b66fb55f754abc93bf7295278afa URL: https://github.com/kamailio/kamailio/commit/8b72f462deb4b66fb55f754abc93bf7… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-11T10:51:23Z pkg: add CAP_CHOWN capability to Kamailio systemd service files to allow chown (#2391) - add CAP_CHOWN capability to Kamailio systemd service files to allow chown - needed e.g. for user and group setting from jsonrpcs and ctl modules - related to github issue #2391 --- Modified: pkg/kamailio/deb/bionic/kamailio.service Modified: pkg/kamailio/deb/buster/kamailio.service Modified: pkg/kamailio/deb/debian/kamailio.service Modified: pkg/kamailio/deb/focal/kamailio.service Modified: pkg/kamailio/deb/jessie/kamailio.service Modified: pkg/kamailio/deb/sid/kamailio.service Modified: pkg/kamailio/deb/stretch/kamailio.service Modified: pkg/kamailio/deb/xenial/kamailio.service Modified: pkg/kamailio/obs/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/8b72f462deb4b66fb55f754abc93bf7… Patch: https://github.com/kamailio/kamailio/commit/8b72f462deb4b66fb55f754abc93bf7…

1 0

git:master:84edbfea: pkg: synchronize environment setting for pkg mem between debian and rpm packages
by Henning Westerholt 11 Sep '20

11 Sep '20

Module: kamailio Branch: master Commit: 84edbfea9c8acb6dbeeaf796a79dd7fa29eba2e2 URL: https://github.com/kamailio/kamailio/commit/84edbfea9c8acb6dbeeaf796a79dd7f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-11T10:44:53Z pkg: synchronize environment setting for pkg mem between debian and rpm packages --- Modified: pkg/kamailio/obs/kamailio.service --- Diff: https://github.com/kamailio/kamailio/commit/84edbfea9c8acb6dbeeaf796a79dd7f… Patch: https://github.com/kamailio/kamailio/commit/84edbfea9c8acb6dbeeaf796a79dd7f… --- diff --git a/pkg/kamailio/obs/kamailio.service b/pkg/kamailio/obs/kamailio.service index b1305fa37d..2572ee09d3 100644 --- a/pkg/kamailio/obs/kamailio.service +++ b/pkg/kamailio/obs/kamailio.service @@ -9,7 +9,7 @@ User=kamailio Group=kamailio Environment='CFGFILE=/etc/kamailio/kamailio.cfg' Environment='SHM_MEMORY=64' -Environment='PKG_MEMORY=4' +Environment='PKG_MEMORY=8' EnvironmentFile=-/etc/sysconfig/kamailio ExecStart=/usr/sbin/kamailio -DD -P /run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY Restart=on-failure

1 0

[kamailio/kamailio] topos/topos_redis canceled and failed calls not deleted in redis (#2012)
by ohammami 11 Sep '20

11 Sep '20

### Description `topos-redis` does not clean entries for failed and canceled calls. modules are loaded in this order: ``` ... loadmodule "topos.so" loadmodule "ndb_redis.so" loadmodule "topos_redis.so" # ----- ndb_redis params ----- modparam("ndb_redis", "server", "name=srvC;addr=REDIS_HOST;port=REDIS_PORT;db=REDIS_DB_TOPOS") # ----- topos params ----- modparam("topos", "storage", "redis") modparam("topos_redis", "serverid", "srvC") modparam("topos", "mask_callid", 0) modparam("topos", "sanity_checks", 0) modparam("topos", "branch_expire", 30) modparam("topos", "dialog_expire", 14400) modparam("topos", "clean_interval", 10) ... ``` When a call is answered the timer are working fine and the records are cleaned after branch_expire timer. 1. call established ``` 10.0.1.11:6379[9]> KEYS * 1) "b:x:z9hG4bKe33b.1c2d440696a8e6d47f678fcf80962608.0" 2) "d:z:atpsh-5d305fc4-51c0-1" 3) "b:x:INVITE:6cbb3f3c-0470-474a-90e9-1d3f07d42a1a:as32b06c60" ``` 2. after 30s ``` 10.0.1.11:6379[9]> KEYS * 1) "d:z:atpsh-5d305fc4-51c0-1" ``` 4. call ends ``` 10.0.1.11:6379[9]> KEYS * 1) "b:x:z9hG4bKa4f4.d283ab69d26e3eadea338bb3cc28860e.0" 2) "d:z:atpsh-5d305fc4-51c0-1" ``` 5. after 30s ``` 10.0.1.11:6379[9]> KEYS * (empty list or set) ``` #### Issue description When the call fails or it's canceled ``` 10.0.1.11:6379[9]> KEYS * 1) "b:x:z9hG4bK6b04.0b594f71aba72f5f7f6f3ca8d7e57f04.0" 2) "d:z:atpsh-5d305fc4-51c3-1" 3) "b:x:INVITE:0319e114-c5b9-4dfc-91f0-392dc4239255:as018c9b6b" ``` after 30s ``` 10.0.1.11:6379[9]> KEYS * 1) "d:z:atpsh-5d305fc4-51c3-1" 10.0.1.11:6379[9]> TTL "d:z:atpsh-5d305fc4-51c3-1" (integer) 14319 ``` The record `d:z:atpsh-5d305fc4-51c3-1` is not cleaned by the cancel or busy...it will persist in the redis until it expires. I upgraded my machine from 5.1.3 to 5.1.8 after finding this fix #1608 which I noticed in the beginning. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.8 (x86_64/linux) c7a172 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: c7a172 compiled on 05:42:57 Jun 19 2019 with gcc 4.8.5 ``` * **Operating System**: ``` 3.10.0-693.17.1.el7.x86_64 #1 SMP Thu Jan 25 20:13:58 UTC 2018 x86_64 x86_64 x86_64 GNU/Lin ``` ``` CentOS Linux release 7.4.1708 (Core) ``` -- 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/2012

3 5

[kamailio/kamailio] Use kamilio to deploy as P-cscf, I-cscf, S-cscf to implement IMS functions. In the SIP call Flow , the P-CSCF will exit every time. (#2267)
by chenhao5651 11 Sep '20

11 Sep '20

### Description I use kamilio to deploy as P-cscf, I-cscf,S-cscf to implement IMS functions, two test phones attach kamilio and make volte call. The P-cscf will exit every time. ### Troubleshooting I think it may related to the collaboration between tm module and ipsec module. #### Reproduction I set up a test environment according to the instructions https://open5gs.org/open5gs/docs/tutorial/02-VoLTE-setup/ . two iphones connetc to the EPC and attach to kamailio,and the IPSec is available. #### Debugging Data Here is the gdb info ``` Reading symbols from /usr/local/sbin/kamailio...done. [New LWP 22934] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/local/sbin/kamailio -f /etc/kamailio_pcscf/kamailio_pcscf.cfg -P /var/run/'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f1f4951f2d0 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 (gdb) bt #0 0x00007f1f4951f2d0 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #1 0x00007f1f494cefb4 in vfprintf () from /lib/x86_64-linux-gnu/libc.so.6 #2 0x00007f1f494d1370 in ?? () from /lib/x86_64-linux-gnu/libc.so.6 #3 0x00007f1f494ce7ea in vfprintf () from /lib/x86_64-linux-gnu/libc.so.6 #4 0x00007f1f494d78c4 in fprintf () from /lib/x86_64-linux-gnu/libc.so.6 #5 0x00007f1f44290629 in fill_contact (ci=0x7fff6d0ae1a0, m=0x7f1f48ee3280) at cmd.c:218 #6 0x00007f1f4429a29a in ipsec_forward (m=0x7f1f48ee3280, d=0x7f1f44a7efb8) at cmd.c:693 #7 0x00007f1f442890ac in w_forward (_m=0x7f1f48ee3280, _d=0x7f1f44a7efb8 "\270\356\247D\037\177", _cflags=0x0) at ims_ipsec_pcscf_mod.c:355 #8 0x000055713f26f2f1 in do_action (h=0x7fff6d0af080, a=0x7f1f48e7d3d8, msg=0x7f1f48ee3280) at core/action.c:1079 #9 0x000055713f27d2ab in run_actions (h=0x7fff6d0af080, a=0x7f1f48e79710, msg=0x7f1f48ee3280) at core/action.c:1578 #10 0x000055713f27dabd in run_top_route (a=0x7f1f48e79710, msg=0x7f1f48ee3280, c=0x7fff6d0af080) at core/action.c:1663 #11 0x00007f1f489dd18a in reply_received (p_msg=0x7f1f48ee3280) at t_reply.c:2418 #12 0x000055713f382183 in do_forward_reply (msg=0x7f1f48ee3280, mode=0) at core/forward.c:745 #13 0x000055713f383fcb in forward_reply (msg=0x7f1f48ee3280) at core/forward.c:846 #14 0x000055713f3e82a9 in receive_msg ( buf=0x55713f6c9ea0 <buf> "SIP/2.0 183 Session Progress\r\nRecord-Route: <sip:mt@192.168.4.207;transport=tcp;r2=on;lr=on;ftag=2573636716;rm=7;did=a1e.1e8>,<sip:mt@192.168.4.207;r2=on;lr=on;ftag=2573636716;rm=7;did=a1e.1e8>,<sip:m"..., len=1958, rcv_info=0x7fff6d0af5c0) at core/receive.c:510 #15 0x000055713f2d05e1 in udp_rcv_loop () at core/udp_server.c:548 #16 0x000055713f233c1e in main_loop () at main.c:1673 #17 0x000055713f23cff2 in main (argc=13, argv=0x7fff6d0afea8) at main.c:2802 ``` #### Log Messages Here is the P-cscf logs [pcscf.log](https://github.com/kamailio/kamailio/files/4401553/pcscf.log) #### SIP Traffic [traffic.zip](https://github.com/kamailio/kamailio/files/4401567/traffic.zip) ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/2267

3 5

Kamailio v5.3.6 Released
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Hello, Kamailio SIP Server v5.3.6 stable release is out. This is a maintenance release of the latest stable branch, 5.3, that includes fixes since the release of v5.3.5. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.6. Note that 5.3 is the second last stable branch, still officially maintained by Kamailio development team. The latest stable branch is 5.4, with v5.4.1 being release out of it. For more details about version 5.3.6 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/09/kamailio-v5-3-6-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.3:bf6c084d: ChangeLog: content updated for v5.3.6
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.3 Commit: bf6c084dfba846c60fe3bd5c1f1552a3c75a22f4 URL: https://github.com/kamailio/kamailio/commit/bf6c084dfba846c60fe3bd5c1f1552a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T11:15:42+02:00 ChangeLog: content updated for v5.3.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/bf6c084dfba846c60fe3bd5c1f1552a… Patch: https://github.com/kamailio/kamailio/commit/bf6c084dfba846c60fe3bd5c1f1552a…

1 0

git:5.3:475a887b: Makefile.defs: version set to 5.3.6
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.3 Commit: 475a887b88537cbfdb9cae2782b39660ff9eb125 URL: https://github.com/kamailio/kamailio/commit/475a887b88537cbfdb9cae2782b3966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T11:13:02+02:00 Makefile.defs: version set to 5.3.6 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/475a887b88537cbfdb9cae2782b3966… Patch: https://github.com/kamailio/kamailio/commit/475a887b88537cbfdb9cae2782b3966… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 7f3e4f456c..46fa571236 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 3 -SUBLEVEL = 5 +SUBLEVEL = 6 EXTRAVERSION = # memory manager switcher

1 0

git:5.3:855b93dd: pkg/kamailio/deb: version set to 5.3.6
by Victor Seva 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.3 Commit: 855b93dd213dd8f13e483c36ea60769c893ab58b URL: https://github.com/kamailio/kamailio/commit/855b93dd213dd8f13e483c36ea60769… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-10T11:10:41+02:00 pkg/kamailio/deb: version set to 5.3.6 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/855b93dd213dd8f13e483c36ea60769… Patch: https://github.com/kamailio/kamailio/commit/855b93dd213dd8f13e483c36ea60769…

1 0

git:5.3:82f82fc8: xcap_server: rever use of STR_VTOZ macro
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.3 Commit: 82f82fc80d795f718e35db79b66b320ed690f2e6 URL: https://github.com/kamailio/kamailio/commit/82f82fc80d795f718e35db79b66b320… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T10:31:30+02:00 xcap_server: rever use of STR_VTOZ macro - got it by picking a commit with another fix and this macro is not in branch 5.3 --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/82f82fc80d795f718e35db79b66b320… Patch: https://github.com/kamailio/kamailio/commit/82f82fc80d795f718e35db79b66b320… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index 1556aa14b9..20b229d268 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -321,12 +321,13 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - STR_VTOZ(buf->s[buf->len-1], c); + c = buf->s[buf->len-1]; + buf->s[buf->len-1] = '\0'; while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; } - STR_ZTOV(buf->s[buf->len-1], c); + buf->s[buf->len-1] = c; return 0; }

1 0

git:5.3:39e088f5: pkg/kamailio: updated version to 5.3.6 for rpms and alpine specs
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.3 Commit: 39e088f5f809340dd0c0b5c2c65e734d85b7d677 URL: https://github.com/kamailio/kamailio/commit/39e088f5f809340dd0c0b5c2c65e734… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T10:09:21+02:00 pkg/kamailio: updated version to 5.3.6 for rpms and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/39e088f5f809340dd0c0b5c2c65e734… Patch: https://github.com/kamailio/kamailio/commit/39e088f5f809340dd0c0b5c2c65e734… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 1e211cb3d5..2a59037eb6 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.3.5 +pkgver=5.3.6 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 9ff0a975ef..8e880eeecc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.3.5 +%define ver 5.3.6 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:5.4:99b2a0c0: core: more comments about data lump structure fields and options
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Module: kamailio Branch: 5.4 Commit: 99b2a0c066bcc35425b3a2bc73158711bba70b70 URL: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-10T09:43:48+02:00 core: more comments about data lump structure fields and options (cherry picked from commit b13431b6fc7eec20096c5be46c8ce2e43931c45f) --- Modified: src/core/lump_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871… Patch: https://github.com/kamailio/kamailio/commit/99b2a0c066bcc35425b3a2bc7315871…

1 0

Releasing v5.3.6
by Daniel-Constantin Mierla 10 Sep '20

10 Sep '20

Hello, I am considering to release v5.3.6 from the branch 5.3 in the next days, aiming from Thursday (Sep 10, 2020) if everything goes as planned at this moment, or on Monday (Sep 14, 2020) if a little bit of time is needed. Should you be aware of any issue that needs to be addressed in the branch 5.3 (e.g., a bug, or a missing backport), inform us as soon as possible to try to sort it out in time. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 1

[kamailio/kamailio] Segmentation fault in rpc_mod_print function while shutting down server. (#2433)
by Andrey Deykunov 09 Sep '20

09 Sep '20

### Description We have segfault in Kamailio v5.3.1 installed on Debain 9.x 64 bit occured while kamailio was shutting down while our script tryed to get metric using kamcmd utility at the same time. ### Troubleshooting No troubleshooting was done, since it happened on a production server. We simply restarted the server. #### Reproduction The problem periodically happens on production servers during restart. Kamailio crashes when one of our scripts tried getting statistics about websocket and tls modules using kamcmd during server restart. As I see in core dump, shared memory was already freed when rpc_mod_print called in the child process. #### Debugging Data  ``` core.kamailio.17684 /var/lib/ums/sbin/kamailio GNU gdb (Debian 7.12-6) 7.12.0.20161007-git Copyright (C) 2016 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /var/lib/ums/sbin/kamailio...done. [New LWP 17684] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/var/lib/ums/sbin/kamailio -m 2048 -M 12 -P /var/run/kamailio/kamailio.pid -f /'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #0 __strcmp_ssse3 () at ../sysdeps/x86_64/multiarch/../strcmp.S:1197 #1 0x00007ff4d6ddb2f5 in rpc_mod_print (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", stats=0x1f2f180, flag=2) at mod_stats.c:117 #2 0x00007ff4d6ddb0eb in rpc_mod_print_one (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, mname=0x1f140b8 "tls", pkg_stats=0x1f2d9c0, shm_stats=0x1f2f180, flag=2) at mod_stats.c:159 #3 0x00007ff4d6ddaee1 in rpc_mod_mem_stats_mode (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658, fmode=0) at mod_stats.c:239 #4 0x00007ff4d6dda84f in rpc_mod_mem_stats (rpc=0x7ff4d66f0540 <binrpc_callbacks>, ctx=0x7fff11cd5658) at mod_stats.c:251 #5 0x00007ff4d64bfc80 in process_rpc_req (buf=0x1f140a4 "\241\003\026t\256\214=\221\nmod.stats", size=29, bytes_needed=0x7fff11cd5aa0, sh=0x7fff11cd5a10, saved_state=0x1f240a8) at binrpc_run.c:678 #6 0x00007ff4d64ad72f in handle_stream_read (s_c=0x1f14070, idx=-1) at io_listener.c:511 #7 0x00007ff4d64a9121 in handle_io (fm=0x7ff55a4e4ae0, events=1, idx=-1) at io_listener.c:706 #8 0x00007ff4d64a793a in io_wait_loop_epoll (h=0x7ff4d66f0348 <io_h>, t=10, repeat=0) at ./../../core/io_wait.h:1062 #9 0x00007ff4d649b62c in io_listen_loop (fd_no=2, cs_lst=0x1e28940) at io_listener.c:281 #10 0x00007ff4d64d172c in mod_child (rank=0) at ctl.c:338 #11 0x0000000000638c14 in init_mod_child (m=0x7ff55a3634b0, rank=0) at core/sr_module.c:780 #12 0x000000000063862d in init_mod_child (m=0x7ff55a363b78, rank=0) at core/sr_module.c:776 #13 0x000000000063862d in init_mod_child (m=0x7ff55a364018, rank=0) at core/sr_module.c:776 #14 0x000000000063862d in init_mod_child (m=0x7ff55a364528, rank=0) at core/sr_module.c:776 #15 0x000000000063862d in init_mod_child (m=0x7ff55a3649c8, rank=0) at core/sr_module.c:776 #16 0x000000000063862d in init_mod_child (m=0x7ff55a365140, rank=0) at core/sr_module.c:776 #17 0x000000000063862d in init_mod_child (m=0x7ff55a3657b0, rank=0) at core/sr_module.c:776 #18 0x000000000063862d in init_mod_child (m=0x7ff55a365c38, rank=0) at core/sr_module.c:776 #19 0x00000000006385b2 in init_child (rank=0) at core/sr_module.c:825 #20 0x000000000043140c in main_loop () at main.c:1753 #21 0x000000000043df6f in main (argc=9, argv=0x7fff11cd9dd8) at main.c:2802 ``` #### Log Messages No any useful logs available. #### SIP Traffic No SIP traffic available. ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.1 (x86_64/linux) 283e46 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 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: 283e46 compiled on 14:23:37 Jul 28 2020 with clang 9.0 ``` * **Operating System**:  ``` Linux devhpbx005-1.vx 4.9.0-12-amd64 #1 SMP Debian 4.9.210-1 (2020-01-20) x86_64 GNU/Linux ``` -- 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/2433

2 14

git:master:9645be24: core: mem - use own functions for shm mod stats get operation
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 9645be245f899fa8ae11a6be045d2ef83fd66bf5 URL: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T18:44:46+02:00 core: mem - use own functions for shm mod stats get operation - protect with global lock for shm stats --- Modified: src/core/mem/f_malloc.c Modified: src/core/mem/q_malloc.c Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… Patch: https://github.com/kamailio/kamailio/commit/9645be245f899fa8ae11a6be045d2ef… --- diff --git a/src/core/mem/f_malloc.c b/src/core/mem/f_malloc.c index 2363700c0b..38f686ff2c 100644 --- a/src/core/mem/f_malloc.c +++ b/src/core/mem/f_malloc.c @@ -1367,6 +1367,16 @@ void fm_shm_sums(void* qmp) fm_sums(qmp); fm_shm_unlock(); } +void fm_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + fm_shm_lock(); + fm_mod_get_stats(qmp, qm_rootp); + fm_shm_unlock(); +} +void fm_shm_mod_free_stats(void *qm_rootp) +{ + fm_mod_free_stats(qm_rootp); +} /** @@ -1413,8 +1423,8 @@ int fm_malloc_init_shm_manager(void) ma.xavailable = fm_shm_available; ma.xsums = fm_shm_sums; ma.xdestroy = fm_malloc_destroy_shm_manager; - ma.xmodstats = fm_mod_get_stats; - ma.xfmodstats = fm_mod_free_stats; + ma.xmodstats = fm_shm_mod_get_stats; + ma.xfmodstats = fm_shm_mod_free_stats; ma.xglock = fm_shm_glock; ma.xgunlock = fm_shm_gunlock; diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index b518bfab81..94f972eae9 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -1350,7 +1350,16 @@ void qm_shm_sums(void* qmp) qm_sums(qmp); qm_shm_unlock(); } - +void qm_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + qm_shm_lock(); + qm_mod_get_stats(qmp, qm_rootp); + qm_shm_unlock(); +} +void qm_shm_mod_free_stats(void *qm_rootp) +{ + qm_mod_free_stats(qm_rootp); +} /** * \brief Destroy memory pool @@ -1396,8 +1405,8 @@ int qm_malloc_init_shm_manager(void) ma.xavailable = qm_shm_available; ma.xsums = qm_shm_sums; ma.xdestroy = qm_malloc_destroy_shm_manager; - ma.xmodstats = qm_mod_get_stats; - ma.xfmodstats = qm_mod_free_stats; + ma.xmodstats = qm_shm_mod_get_stats; + ma.xfmodstats = qm_shm_mod_free_stats; ma.xglock = qm_shm_glock; ma.xgunlock = qm_shm_gunlock; diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 33bbf4869d..10db30264b 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -1607,6 +1607,16 @@ void tlsf_shm_sums(void* tlsfmp) tlsf_sums(tlsfmp); tlsf_shm_unlock(); } +void tlsf_shm_mod_get_stats(void *qmp, void **qm_rootp) +{ + tlsf_shm_lock(); + tlsf_mod_get_stats(qmp, qm_rootp); + tlsf_shm_unlock(); +} +void tlsf_shm_mod_free_stats(void *qm_rootp) +{ + tlsf_mod_free_stats(qm_rootp); +} /** @@ -1653,8 +1663,8 @@ int tlsf_malloc_init_shm_manager(void) ma.xavailable = tlsf_shm_available; ma.xsums = tlsf_shm_sums; ma.xdestroy = tlsf_malloc_destroy_shm_manager; - ma.xmodstats = tlsf_mod_get_stats; - ma.xfmodstats = tlsf_mod_free_stats; + ma.xmodstats = tlsf_shm_mod_get_stats; + ma.xfmodstats = tlsf_shm_mod_free_stats; ma.xglock = tlsf_shm_glock; ma.xgunlock = tlsf_shm_gunlock;

1 0

git:master:aa458a62: core: mem - define mem_counter struct in meminfo
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: aa458a62f034c2cb57639bdc713ed3c51b0292c7 URL: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T17:50:24+02:00 core: mem - define mem_counter struct in meminfo - it is the same for f/q/tlsf mallocs --- Modified: src/core/mem/f_malloc.h Modified: src/core/mem/meminfo.h Modified: src/core/mem/q_malloc.h Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… Patch: https://github.com/kamailio/kamailio/commit/aa458a62f034c2cb57639bdc713ed3c… --- diff --git a/src/core/mem/f_malloc.h b/src/core/mem/f_malloc.h index d338f5c5d3..2bed0b8e53 100644 --- a/src/core/mem/f_malloc.h +++ b/src/core/mem/f_malloc.h @@ -241,17 +241,5 @@ void fm_sums(void* qmp); void fm_mod_get_stats(void* qm, void **fm_root); void fm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/meminfo.h b/src/core/mem/meminfo.h index 9c7760db34..8b69daa705 100644 --- a/src/core/mem/meminfo.h +++ b/src/core/mem/meminfo.h @@ -42,5 +42,17 @@ struct mem_info{ unsigned long total_frags; /** number of total memory fragments */ }; +typedef struct _mem_counter{ + const char *file; + const char *func; + const char *mname; + unsigned long line; + + unsigned long size; + int count; + + struct _mem_counter *next; +} mem_counter; + #endif diff --git a/src/core/mem/q_malloc.h b/src/core/mem/q_malloc.h index 71e248f527..85d3c86e60 100644 --- a/src/core/mem/q_malloc.h +++ b/src/core/mem/q_malloc.h @@ -174,17 +174,5 @@ void qm_sums(void* qm); void qm_mod_get_stats(void *qm, void **qm_root); void qm_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #endif #endif diff --git a/src/core/mem/tlsf_malloc.h b/src/core/mem/tlsf_malloc.h index 3fce9cd1e9..4112634b95 100644 --- a/src/core/mem/tlsf_malloc.h +++ b/src/core/mem/tlsf_malloc.h @@ -89,18 +89,6 @@ unsigned long tlsf_available(tlsf_t pool); void tlsf_mod_get_stats(tlsf_t pool, void **root); void tlsf_mod_free_stats(void *root); -typedef struct _mem_counter{ - const char *file; - const char *func; - const char *mname; - unsigned long line; - - unsigned long size; - int count; - - struct _mem_counter *next; -} mem_counter; - #if defined(__cplusplus) }; #endif

1 0

git:master:761eb061: kex: use mutex to sync the mod mem stats rpc commands
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 761eb0616fea2a859a2c0abb652b22feb6f59859 URL: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T17:57:10+02:00 kex: use mutex to sync the mod mem stats rpc commands - related to GH #2433 --- Modified: src/modules/kex/mod_stats.c --- Diff: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… Patch: https://github.com/kamailio/kamailio/commit/761eb0616fea2a859a2c0abb652b22f… --- diff --git a/src/modules/kex/mod_stats.c b/src/modules/kex/mod_stats.c index a19a3ed3c3..25e3285c78 100644 --- a/src/modules/kex/mod_stats.c +++ b/src/modules/kex/mod_stats.c @@ -35,7 +35,9 @@ #include "../../core/pt.h" #include "../../core/sr_module.h" #include "../../core/events.h" -#include "../../core/mem/f_malloc.h" +#include "../../core/mem/pkg.h" +#include "../../core/mem/shm.h" +#include "../../core/locking.h" #include "../../core/rpc.h" #include "../../core/rpc_lookup.h" @@ -47,6 +49,9 @@ #define DBG_MOD_ALL_FLAG 3 /* 1|2 - print pkg+shm (1+2) memory stats */ #define DBG_MOD_INF_FLAG 4 /* 1<<2 - print more info in the stats */ + +static gen_lock_t *kex_rpc_mod_mem_stats_lock = NULL; + /** * */ @@ -248,7 +253,9 @@ static void rpc_mod_mem_stats_mode(rpc_t *rpc, void *ctx, int fmode) */ static void rpc_mod_mem_stats(rpc_t *rpc, void *ctx) { - rpc_mod_mem_stats_mode(rpc, ctx, 0); + lock_get(kex_rpc_mod_mem_stats_lock); + rpc_mod_mem_stats_mode(rpc, ctx, 0); + lock_release(kex_rpc_mod_mem_stats_lock); } /** @@ -256,7 +263,9 @@ static void rpc_mod_mem_stats(rpc_t *rpc, void *ctx) */ static void rpc_mod_mem_statsx(rpc_t *rpc, void *ctx) { - rpc_mod_mem_stats_mode(rpc, ctx, DBG_MOD_INF_FLAG); + lock_get(kex_rpc_mod_mem_stats_lock); + rpc_mod_mem_stats_mode(rpc, ctx, DBG_MOD_INF_FLAG); + lock_release(kex_rpc_mod_mem_stats_lock); } @@ -275,6 +284,15 @@ rpc_export_t kex_mod_rpc[] = { */ int mod_stats_init_rpc(void) { + kex_rpc_mod_mem_stats_lock = lock_alloc(); + if(kex_rpc_mod_mem_stats_lock == NULL) { + LM_ERR("failed to allocate the lock\n"); + return -1; + } + if(lock_init(kex_rpc_mod_mem_stats_lock) == NULL) { + LM_ERR("failed to init the lock\n"); + return -1; + } if (rpc_register_array(kex_mod_rpc)!=0) { LM_ERR("failed to register RPC commands\n");

1 0

git:5.2:916110d5: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.2 Commit: 916110d55a1ec83e142bd5fc2e9df8f9a5505eca URL: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:43:01Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… Patch: https://github.com/kamailio/kamailio/commit/916110d55a1ec83e142bd5fc2e9df8f… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 6417bee21a..83d04eca8a 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -452,14 +452,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:5.4:2ca2232b: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.4 Commit: 2ca2232b3cac72f7c03b37ef9db5a198462e6dfa URL: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:42:40Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… Patch: https://github.com/kamailio/kamailio/commit/2ca2232b3cac72f7c03b37ef9db5a19… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:5.3:b7efdb12: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Henning Westerholt 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.3 Commit: b7efdb12dd2e98c03c38565556169b553b8b6a0a URL: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-09-09T14:42:25Z core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt (cherry picked from commit 57ee97f52dd90c86743b6fd6dd682285ef994e80) --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… Patch: https://github.com/kamailio/kamailio/commit/b7efdb12dd2e98c03c38565556169b5… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:master:57ee97f5: core: skip abort() in free_lump() for LUMPFLAG_DUPED
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 57ee97f52dd90c86743b6fd6dd682285ef994e80 URL: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T15:33:18+02:00 core: skip abort() in free_lump() for LUMPFLAG_DUPED - the LUMPFLAG_DUPED is set when duplicating lumps list for branch route execution, but some functions such as set_body() may want to clean them - report and minimal reproducing config by Henning Westerholt --- Modified: src/core/data_lump.c --- Diff: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… Patch: https://github.com/kamailio/kamailio/commit/57ee97f52dd90c86743b6fd6dd68228… --- diff --git a/src/core/data_lump.c b/src/core/data_lump.c index 765dd5f988..a9a4880199 100644 --- a/src/core/data_lump.c +++ b/src/core/data_lump.c @@ -456,14 +456,17 @@ struct lump* anchor_lump2(struct sip_msg* msg, int offset, int len, } +/** + * free lump content + */ void free_lump(struct lump* lmp) { - if (lmp && (lmp->op==LUMP_ADD)){ - if (lmp->u.value){ - if (lmp->flags &(LUMPFLAG_DUPED|LUMPFLAG_SHMEM)){ + if (lmp && (lmp->op==LUMP_ADD)) { + if (lmp->u.value) { + if (lmp->flags & LUMPFLAG_SHMEM) { LM_CRIT("non free-able lump: %p flags=%x\n", lmp, lmp->flags); abort(); - }else{ + } else if(!(lmp->flags & LUMPFLAG_DUPED)) { pkg_free(lmp->u.value); lmp->u.value=0; lmp->len=0;

1 0

git:master:b13431b6: core: more comments about data lump structure fields and options
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: b13431b6fc7eec20096c5be46c8ce2e43931c45f URL: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T15:32:33+02:00 core: more comments about data lump structure fields and options --- Modified: src/core/lump_struct.h --- Diff: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e… Patch: https://github.com/kamailio/kamailio/commit/b13431b6fc7eec20096c5be46c8ce2e…

1 0

[kamailio/kamailio] uac: contact_addr field added into db uacreg table (#2470)
by ovoshlook 09 Sep '20

09 Sep '20

#### 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally #### Description Allows to pass unique address part into contact header for REGISTER requests for each uacreg entry If contact_addr wasn't passed into uacreg for a particular entry default reg_contact_addr will be used instead. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2470 -- Commit Summary -- * uacreg contact_addr added into db as configrable parameter for each entry * docs generated * formatting * Merge branch 'uacreg-contact_addr-field-in-db' of https://github.com/ovoshlook/kamailio into uacreg-contact_addr-field-in-db * reverted readme * formatting * formatting -- File Changes -- M src/modules/uac/doc/uac_admin.xml (11) M src/modules/uac/uac_reg.c (43) M src/modules/uac/uac_reg.h (2) M utils/kamctl/db_berkeley/kamailio/uacreg (4) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_redis/kamailio/uacreg (2) M utils/kamctl/db_sqlite/uac-create.sql (3) M utils/kamctl/dbtext/kamailio/uacreg (2) M utils/kamctl/mongodb/kamailio/uacreg.json (7) M utils/kamctl/mysql/uac-create.sql (3) M utils/kamctl/oracle/uac-create.sql (3) M utils/kamctl/postgres/uac-create.sql (3) M utils/kamctl/xhttp_pi/uac-mod (3) M utils/kamctl/xhttp_pi/uac-table (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2470.patch https://github.com/kamailio/kamailio/pull/2470.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/2470

2 8

git:master:3c643c02: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 3c643c023626e0de744c4960f2a7af4a401f6df0 URL: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-09T13:31:27+02:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… Patch: https://github.com/kamailio/kamailio/commit/3c643c023626e0de744c4960f2a7af4… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index a018d29a16..ae8376ab15 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -524,6 +524,9 @@ modparam("uac", "reg_db_table", "uacreg") username part of the Contact: URI will be the L_UUID field in the database. + A contact_addr value in the uacreg table will override the parameter + for this particular entry. + Example 1.17. Set reg_contact_addr parameter ... modparam("uac", "reg_contact_addr", "192.168.1.2:5080") @@ -1111,8 +1114,10 @@ event_route[uac:reply] { * flags * reg_delay * socket + * contact_addr - Use a dot (.) if no value should be set for auth_password or auth_ha1. + Use a dot (.) if no value should be set for auth_password, auth_ha1, or + contact_addr. Example 1.45. uac.reg_add usage ... @@ -1155,6 +1160,11 @@ event_route[uac:reply] { * reg_delay - delay initial registration with at least reg_delay seconds, e.g.,: 3 + * contact_addr - contact address to be used for this record instead + of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It + can be set to '.' (dot) to skip setting it and then + reg_contact_addr modparam is used. + * socket - Used socket for sending out registration requests, e.g.:, udp:192.168.0.125:5060

1 0

git:master:b98ff23b: lib/srdb1/schema/entities.xml: increased contact_addr_len entity to 255
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: b98ff23bb7acab26a3442925ea563f64db97360c URL: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:28:32+02:00 lib/srdb1/schema/entities.xml: increased contact_addr_len entity to 255 - contact can have parameters that could end up being long (e.g., for ims cases) --- Modified: src/lib/srdb1/schema/entities.xml --- Diff: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… Patch: https://github.com/kamailio/kamailio/commit/b98ff23bb7acab26a3442925ea563f6… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 024851ec00..4ca1b6bfed 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,6 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> -<!ENTITY contact_addr_len "128"> +<!ENTITY contact_addr_len "255"> <!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128">

1 0

git:master:177713c6: kamctl: regenerated db creation scripts for uacreg
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 177713c6e0fc51934779bd3e81e7a3278897d503 URL: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:29:44+02:00 kamctl: regenerated db creation scripts for uacreg --- Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… Patch: https://github.com/kamailio/kamailio/commit/177713c6e0fc51934779bd3e81e7a32… --- diff --git a/utils/kamctl/db_sqlite/uac-create.sql b/utils/kamctl/db_sqlite/uac-create.sql index 764e623e02..6ff05276a5 100644 --- a/utils/kamctl/db_sqlite/uac-create.sql +++ b/utils/kamctl/db_sqlite/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires INTEGER DEFAULT 0 NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, reg_delay INTEGER DEFAULT 0 NOT NULL, - contact_addr VARCHAR(128) DEFAULT '' NOT NULL, + contact_addr VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) ); diff --git a/utils/kamctl/mysql/uac-create.sql b/utils/kamctl/mysql/uac-create.sql index b6c53f5dcf..a4560e6914 100644 --- a/utils/kamctl/mysql/uac-create.sql +++ b/utils/kamctl/mysql/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE `uacreg` ( `expires` INT DEFAULT 0 NOT NULL, `flags` INT DEFAULT 0 NOT NULL, `reg_delay` INT DEFAULT 0 NOT NULL, - `contact_addr` VARCHAR(128) DEFAULT '' NOT NULL, + `contact_addr` VARCHAR(255) DEFAULT '' NOT NULL, `socket` VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT l_uuid_idx UNIQUE (`l_uuid`) ); diff --git a/utils/kamctl/oracle/uac-create.sql b/utils/kamctl/oracle/uac-create.sql index fdad9316b1..88eb71c3e7 100644 --- a/utils/kamctl/oracle/uac-create.sql +++ b/utils/kamctl/oracle/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires NUMBER(10) DEFAULT 0 NOT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, reg_delay NUMBER(10) DEFAULT 0 NOT NULL, - contact_addr VARCHAR2(128) DEFAULT '', + contact_addr VARCHAR2(255) DEFAULT '', socket VARCHAR2(128) DEFAULT '', CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) ); diff --git a/utils/kamctl/postgres/uac-create.sql b/utils/kamctl/postgres/uac-create.sql index 4fcce80f0e..c24c3b8ecc 100644 --- a/utils/kamctl/postgres/uac-create.sql +++ b/utils/kamctl/postgres/uac-create.sql @@ -13,7 +13,7 @@ CREATE TABLE uacreg ( expires INTEGER DEFAULT 0 NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, reg_delay INTEGER DEFAULT 0 NOT NULL, - contact_addr VARCHAR(128) DEFAULT '' NOT NULL, + contact_addr VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(128) DEFAULT '' NOT NULL, CONSTRAINT uacreg_l_uuid_idx UNIQUE (l_uuid) );

1 0

git:master:e7275114: uac: allow empty contact addr in rpc add command for uacreg
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: e72751147e0d6b5fd9ed32d23a7412d64fcb65eb URL: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:20:44+02:00 uac: allow empty contact addr in rpc add command for uacreg - it has to be set to . - contact_addr parameter moved to be last, to be easier to just add to existing commands --- Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… Patch: https://github.com/kamailio/kamailio/commit/e72751147e0d6b5fd9ed32d23a7412d… --- diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index c636cc6cfa..379a544a7e 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -526,7 +526,7 @@ int reg_ht_add(reg_uac_t *reg) return -1; } - if (!reg->contact_addr.s || reg->contact_addr.len == 0) + if (!reg->contact_addr.s || reg->contact_addr.len == 0) { reg->contact_addr=reg_contact_addr; } @@ -553,7 +553,7 @@ int reg_ht_add(reg_uac_t *reg) memset(nr, 0, sizeof(reg_uac_t) + len); nr->expires = reg->expires; nr->flags = reg->flags; - if (reg->reg_delay) + if (reg->reg_delay) nr->reg_delay = reg->reg_delay; else if (reg_random_delay>0) nr->reg_delay = kam_rand() % reg_random_delay; @@ -594,9 +594,9 @@ int reg_ht_add(reg_uac_t *reg) } - /** - * - */ +/** + * + */ int reg_ht_rm(reg_uac_t *reg) { unsigned int slot1, slot2; @@ -2136,8 +2136,8 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) &reg.expires, &reg.flags, &reg.reg_delay, - &reg.contact_addr, - &reg.socket + &reg.socket, + &reg.contact_addr )<1) { rpc->fault(ctx, 400, "Invalid Parameters"); @@ -2154,6 +2154,10 @@ static void rpc_uac_reg_add(rpc_t* rpc, void* ctx) reg.auth_ha1.len = 0; } + if(reg.contact_addr.len==1 && reg.contact_addr.s[0] == '.') { + reg.contact_addr = reg_contact_addr; + } + if(uac_reg_check_password(&reg) < 0) { rpc->fault(ctx, 500, "Failed to add record - invalid password or ha1"); return;

1 0

git:master:89656680: uac: docs - updates for uacreg contact addr field
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 89656680c6ff3aae00bbffae03131a1e983198dd URL: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:26:54+02:00 uac: docs - updates for uacreg contact addr field --- Modified: src/modules/uac/doc/uac_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… Patch: https://github.com/kamailio/kamailio/commit/89656680c6ff3aae00bbffae03131a1… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 42645e891a..d43b8afa0c 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -1359,12 +1359,13 @@ event_route[uac:reply] { <listitem><para>expires</para></listitem> <listitem><para>flags</para></listitem> <listitem><para>reg_delay</para></listitem> - <listitem><para>contact_addr</para></listitem> <listitem><para>socket</para></listitem> + <listitem><para>contact_addr</para></listitem> </itemizedlist> </para> <para> - Use a dot (.) if no value should be set for auth_password or auth_ha1. + Use a dot (.) if no value should be set for auth_password, auth_ha1, + or contact_addr. </para> <example> @@ -1463,8 +1464,9 @@ event_route[uac:reply] { </itemizedlist> <itemizedlist> <listitem><para> - <emphasis>contact_addr</emphasis> - Used contact address for sending out registration requests, - e.g.:, 192.168.0.125:5060 + <emphasis>contact_addr</emphasis> - contact address to be used for this record + instead of reg_contact_addr module parameter, e.g.:, 192.168.0.125:5060. It can + be set to '.' (dot) to skip setting it and then reg_contact_addr modparam is used. </para></listitem> </itemizedlist> <itemizedlist>

1 0

git:master:4ae04d52: lib/srdb1: added contact_addr column to uacreg table
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 4ae04d52d0bd33ee44222f5b7efeca18f52d6413 URL: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:15:27+02:00 lib/srdb1: added contact_addr column to uacreg table --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/uacreg.xml --- Diff: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… Patch: https://github.com/kamailio/kamailio/commit/4ae04d52d0bd33ee44222f5b7efeca1… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index acd7028967..024851ec00 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -1,5 +1,6 @@ <!ENTITY user_len "64"> <!ENTITY domain_len "64"> +<!ENTITY contact_addr_len "128"> <!ENTITY socket_len "128"> <!ENTITY from_tag_len "128"> <!ENTITY to_tag_len "128"> diff --git a/src/lib/srdb1/schema/uacreg.xml b/src/lib/srdb1/schema/uacreg.xml index bf967f2655..1da4d46f60 100644 --- a/src/lib/srdb1/schema/uacreg.xml +++ b/src/lib/srdb1/schema/uacreg.xml @@ -135,6 +135,14 @@ <description>Initial registration delay</description> </column> + <column id="contact_addr"> + <name>contact_addr</name> + <type>string</type> + <size>&contact_addr_len;</size> + <default/> + <description>Used contact_addr in contact header for sending out requests,if not passed reg_contact_addr will be used instead</description> + </column> + <column id="socket"> <name>socket</name> <type>string</type>

1 0

git:master:2ddc45c1: kamctl: regenerated uacreg table creation scripts
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 2ddc45c10ccb5790b064599ea1aa89ed83abab84 URL: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:15:59+02:00 kamctl: regenerated uacreg table creation scripts --- Modified: utils/kamctl/db_berkeley/kamailio/uacreg Modified: utils/kamctl/db_redis/kamailio/uacreg Modified: utils/kamctl/db_sqlite/uac-create.sql Modified: utils/kamctl/dbtext/kamailio/uacreg Modified: utils/kamctl/mongodb/kamailio/uacreg.json Modified: utils/kamctl/mysql/uac-create.sql Modified: utils/kamctl/oracle/uac-create.sql Modified: utils/kamctl/postgres/uac-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/uac-mod Modified: utils/kamctl/xhttp_pi/uac-table --- Diff: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e… Patch: https://github.com/kamailio/kamailio/commit/2ddc45c10ccb5790b064599ea1aa89e…

1 0

git:master:f9950d1f: uac: support to set contact address in uacreg database record
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: f9950d1fe3864cebc9e4249f1a7a28624139e1b9 URL: https://github.com/kamailio/kamailio/commit/f9950d1fe3864cebc9e4249f1a7a286… Author: ovoshlook <ovoshlook(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:11:59+02:00 uac: support to set contact address in uacreg database record - enable per registration contact address - GH #2470 --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_reg.c Modified: src/modules/uac/uac_reg.h --- Diff: https://github.com/kamailio/kamailio/commit/f9950d1fe3864cebc9e4249f1a7a286… Patch: https://github.com/kamailio/kamailio/commit/f9950d1fe3864cebc9e4249f1a7a286…

1 0

git:master:1cda0298: msrp: proper parsing ipv6 host part in uri
by Daniel-Constantin Mierla 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 1cda029885dd89e2ec46fe28a0d6f656aad19e7a URL: https://github.com/kamailio/kamailio/commit/1cda029885dd89e2ec46fe28a0d6f65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-09T13:01:36+02:00 msrp: proper parsing ipv6 host part in uri - enclose ipv6 address in square brackets for msrp pv - related to #2472 --- Modified: src/modules/msrp/msrp_parser.c Modified: src/modules/msrp/msrp_vars.c --- Diff: https://github.com/kamailio/kamailio/commit/1cda029885dd89e2ec46fe28a0d6f65… Patch: https://github.com/kamailio/kamailio/commit/1cda029885dd89e2ec46fe28a0d6f65… --- diff --git a/src/modules/msrp/msrp_parser.c b/src/modules/msrp/msrp_parser.c index a6310cea93..4e5e67e130 100644 --- a/src/modules/msrp/msrp_parser.c +++ b/src/modules/msrp/msrp_parser.c @@ -491,10 +491,25 @@ int msrp_parse_uri(char *start, int len, msrp_uri_t *uri) } hook = &uri->host; hook->s = s; + if(*s == '[') + { + /* IPv6 */ + p = q_memchr(s, ']', e - s); + if(p == NULL) + { + goto error; + } + s = p + 1; + hook->len = s - hook->s; + } p = q_memchr(s, ':', e - s); if(p!=NULL) { - hook->len = p - hook->s; + if(hook->len == 0) + { + /* host len was not set yet */ + hook->len = p - hook->s; + } hook = &uri->port; s = p+1; if(s>=e) goto error; diff --git a/src/modules/msrp/msrp_vars.c b/src/modules/msrp/msrp_vars.c index fddabde189..8384ff0910 100644 --- a/src/modules/msrp/msrp_vars.c +++ b/src/modules/msrp/msrp_vars.c @@ -283,7 +283,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) memcpy(p, "msrp://", 7); p+=7; } - strcpy(p, ip_addr2a(&mf->tcpinfo->rcv->src_ip)); + strcpy(p, ip_addr2strz(&mf->tcpinfo->rcv->src_ip)); strcat(p, ":"); strcat(p, int2str(mf->tcpinfo->rcv->src_port, NULL)); s.len = strlen(s.s);

1 0

[kamailio/kamailio] Kamailio 5.4.1 - Crash on startup when TLS is enabled after upgrading from stretch to buster (#2466)
by Joey Golan 09 Sep '20

09 Sep '20

### Description After upgrading Debian from stretch to buster, kamailio service keeps crashing on service stat. Same kamailio configuration file worked fine on Debian stretch. If I disable TLS the service starts successfully. ### Troubleshooting Looks like a TLS issue #### Reproduction Debian buster TLS enabled #### Debugging Data  ``` root@kamailio11:/# gdb /usr/sbin/kamailio /core GNU gdb (Debian 8.2.1-2+b3) 8.2.1 Copyright (C) 2018 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-linux-gnu". Type "show configuration" for configuration details. For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>. Find the GDB manual and other documentation resources online at: <http://www.gnu.org/software/gdb/documentation/>. For help, type "help". Type "apropos word" to search for commands related to "word"... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/lib/debug/.build-id/ed/15dbbb24fb309311e7a6a16cf9222a82afb102.debug...done. done. [New LWP 7259] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x00007f17c0877e26 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 (gdb) bt full #0 0x00007f17c0877e26 in ?? () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #1 0x00007f17c087812f in OPENSSL_cleanup () from /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 No symbol table info available. #2 0x00007f17c46aad8c in __run_exit_handlers (status=1, listp=0x7f17c482c718 <__exit_funcs>, run_list_atexit=run_list_atexit@entry=true, run_dtors=run_dtors@entry=true) at exit.c:108 atfct = <optimized out> onfct = <optimized out> cxafct = <optimized out> f = <optimized out> new_exitfn_called = 3 cur = 0x7f17c482dd80 <initial> #3 0x00007f17c46aaeba in __GI_exit (status=<optimized out>) at exit.c:139 No locals. #4 0x000055c479a9c502 in handle_sigs () at main.c:808 chld = 0 chld_status = 139 any_chld_stopped = 1 memlog = 0 __func__ = "handle_sigs" #5 0x000055c479aa8053 in main_loop () at main.c:1817 i = 8 pid = 7301 si = 0x0 si_desc = "udp receiver child=7 sock=172.19.140.101:5060\000\000\000\003\000\000\000+\000\000\000\000\253pP\333\351\322a\320-\221z\304U\000\000\210`\354y\304U\000\000\000\000\000\000\000\000\000\000\260Lv\304\027\177\000\000\363N\361y\304U\000\000\000\000\000\200\000\000\000\000\060P\254$\375\177\000\000hm\322y\304U\000" nrprocs = 8 woneinit = 1 __func__ = "main_loop" #6 0x000055c479ab1516 in main (argc=9, argv=0x7ffd24ac5578) at main.c:2856 cfg_stream = 0x55c47a82b260 c = -1 r = 0 tmp = 0x7ffd24ac6de3 "" tmp_len = 32535 port = -995964432 proto = 32535 ahost = 0x0 aport = 0 options = 0x55c479ec8d38 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:x:X:Y:" --Type <RET> for more, q to quit, c to continue without paging-- ret = -1 seed = 1032197731 rfd = 4 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 21, st_ino = 79137, st_nlink = 2, st_mode = 16832, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 40, st_blksize = 4096, st_blocks = 0, st_atim = {tv_sec = 1599027572, tv_nsec = 735090396}, st_mtim = {tv_sec = 1599027608, tv_nsec = 820311152}, st_ctim = {tv_sec = 1599027608, tv_nsec = 820311152}, __glibc_reserved = {0, 0, 0}} tbuf = "\000\000\000\000\000\000\000\000\b\000\000\000\000\000\000\000\060ע\304\027\177\000\000\000\000\000\000\000\000\000\000\240A\271$\375\177\000\000\364ڠ\304\027\177\000\000\b\000\000\000\000\000\000\000\230B\271$\375\177\000\000\060ע\304\027\177\000\000\030S\254$\375\177\000\000\024S\254$\375\177", '\000' <repeats 18 times>, "\230B\271$\375\177\000\000\250A\271$\375\177\000\000'\036\177\304\027\177\000\000&\260be\000\000\000\000\200T\254$\375\177\000\000\300\212\225\001\000\000\000\000\340S\254$\375\177\000\000\320S\254$\375\177\000\000\030S\254$\375\177\000\000Xע\304\027\177\000\000\001", '\000' <repeats 31 times>... option_index = 0 long_options = {{name = 0x55c479ecadc6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x55c479ec650c "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x55c479ecadcb "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x55c479ecadd1 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x55c479ecadd7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x55c479ecade0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x55c479ecadea "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x55c479ecadf4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x55c479ecadff "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x55c479ecae08 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x55c479ecae13 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" ``` #### Log Messages  ``` Sep 2 06:23:10 kamailio11 kamailio: INFO: <core> [core/tcp_main.c:4982]: init_tcp(): using epoll_lt as the io watch method (auto detected) Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: rr [../outbound/api.h:52]: ob_load_api(): unable to import bind_ob - maybe module is not loaded Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: rr [rr_mod.c:185]: mod_init(): outbound module not available Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: dmq_usrloc [dmq_usrloc.c:81]: mod_init(): dmq usrloc replication mode = 1 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: cfgutils [cfgutils.c:869]: mod_init(): no hash_file given, disable hash functionality Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [http_async_client_mod.c:222]: mod_init(): Initializing Http Async module Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: auth [auth_mod.c:345]: mod_init(): qop set, but nonce-count (nonce_count) support disabled Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: permissions [permissions.c:601]: mod_init(): default allow file (/etc/kamailio/permissions.allow) not found => empty rule set Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: permissions [permissions.c:615]: mod_init(): default deny file (/etc/kamailio/permissions.deny) not found => empty rule set Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: pike [pike.c:97]: pike_init(): PIKE - initializing Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: pike [ip_tree.c:81]: init_lock_set(): probing 256 set size Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_mod.c:389]: mod_init(): With ECDH-Support! Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_mod.c:392]: mod_init(): With Diffie Hellman Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: WARNING: tls [tls_init.c:792]: tls_h_mod_init_f(): openssl bug #1491 (crash/mem leaks on low memory) workaround enabled (on low memory tls operations will fail preemptively) with free memory thresholds 22544384 and 11272192 bytes Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold1 has been changed to 22544384 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [core/cfg/cfg_ctx.c:595]: cfg_set_now(): tls.low_mem_threshold2 has been changed to 11272192 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [main.c:2833]: main(): processes (at least): 43 - shm size: 2147483648 - pkg size: 33554432 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [core/udp_server.c:154]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [core/udp_server.c:206]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:101]: async_http_init_sockets(): inter-process event notification sockets initialized Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:309]: ksr_tls_fill_missing(): TLSs<default>: tls_method=22 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:321]: ksr_tls_fill_missing(): TLSs<default>: certificate='/etc/kamailio/ssl/widebridge.pem' Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:328]: ksr_tls_fill_missing(): TLSs<default>: ca_list='/etc/kamailio/ssl/cacert.pem' Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:335]: ksr_tls_fill_missing(): TLSs<default>: crl='(null)' Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:339]: ksr_tls_fill_missing(): TLSs<default>: require_certificate=0 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:346]: ksr_tls_fill_missing(): TLSs<default>: cipher_list='HIGH' Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:353]: ksr_tls_fill_missing(): TLSs<default>: private_key='/etc/kamailio/ssl/widebridge.key' Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSs<default>: verify_certificate=0 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:360]: ksr_tls_fill_missing(): TLSs<default>: verify_depth=9 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:363]: ksr_tls_fill_missing(): TLSs<default>: verify_client=0 Sep 2 06:23:10 kamailio11 /usr/sbin/kamailio[7354]: NOTICE: tls [tls_domain.c:1109]: ksr_tls_fix_domain(): registered server_name callback handler for socket [:0], server_name='<default>' ... Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:716]: set_verification(): TLSs<default>: No client certificate required and no checks performed Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:309]: ksr_tls_fill_missing(): TLSc<default>: tls_method=22 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:321]: ksr_tls_fill_missing(): TLSc<default>: certificate='(null)' Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:328]: ksr_tls_fill_missing(): TLSc<default>: ca_list='(null)' Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:335]: ksr_tls_fill_missing(): TLSc<default>: crl='(null)' Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:339]: ksr_tls_fill_missing(): TLSc<default>: require_certificate=0 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:346]: ksr_tls_fill_missing(): TLSc<default>: cipher_list='(null)' Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:353]: ksr_tls_fill_missing(): TLSc<default>: private_key='(null)' Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:357]: ksr_tls_fill_missing(): TLSc<default>: verify_certificate=0 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:360]: ksr_tls_fill_missing(): TLSc<default>: verify_depth=9 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:363]: ksr_tls_fill_missing(): TLSc<default>: verify_client=0 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: tls [tls_domain.c:719]: set_verification(): TLSc<default>: Server MAY present invalid certificate Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7355]: INFO: rtpengine [rtpengine.c:2781]: rtpp_test(): rtpengine instance <udp:127.0.0.1:22222> found, support for it enabled Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 1 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7367]: INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/7367 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 2 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 3 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: http_async_client [async_http.c:84]: async_http_init_worker(): started worker process: 4 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7371]: INFO: ctl [io_listener.c:214]: io_listen_loop(): io_listen_loop: using epoll_lt io watch method (config) Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7376]: CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x645f6d6574737973 (out of memory block!) called from tls: tls_init.c: ser_free(323) - ignoring Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7375]: CRITICAL: <core> [core/mem/q_malloc.c:501]: qm_free(): BUG: bad pointer 0x645f6d6574737973 (out of memory block!) called from tls: tls_init.c: ser_free(323) - ignoring Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: ALERT: <core> [main.c:776]: handle_sigs(): child process 7375 exited by a signal 11 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: ALERT: <core> [main.c:779]: handle_sigs(): core was not generated Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: ALERT: <core> [main.c:776]: handle_sigs(): child process 7376 exited by a signal 11 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: ALERT: <core> [main.c:779]: handle_sigs(): core was not generated Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [main.c:802]: handle_sigs(): terminating due to SIGCHLD Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7382]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7385]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7384]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7377]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7383]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7380]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7381]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7368]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7379]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7366]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7378]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7364]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7374]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7362]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7373]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7360]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7372]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7358]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7371]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7356]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7370]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7387]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7369]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7388]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7367]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7386]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7365]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7390]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7363]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7395]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7361]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7393]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7359]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7357]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7355]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7389]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7394]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7392]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7391]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 23 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 24 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 25 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 26 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 27 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 28 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 29 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 30 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 31 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 32 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 33 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 34 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 35 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 5 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 36 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 9 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 40 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 44 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 48 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 52 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 53 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 54 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 55 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 56 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 57 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 59 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 61 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 63 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 65 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 67 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 69 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 71 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 73 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 75 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 77 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 79 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 81 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 83 Sep 2 06:23:11 kamailio11 /usr/sbin/kamailio[7396]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 85 Sep 2 06:23:15 kamailio11 /usr/sbin/kamailio[7396]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Sep 2 06:23:15 kamailio11 /usr/sbin/kamailio[7354]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` root@kamailio11:/etc/kamailio# kamailio -v version: kamailio 5.4.1 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**:  ``` root@kamailio11:/etc/kamailio# cat /etc/os-release PRETTY_NAME="Debian GNU/Linux 10 (buster)" NAME="Debian GNU/Linux" VERSION_ID="10" VERSION="10 (buster)" VERSION_CODENAME=buster ID=debian HOME_URL="https://www.debian.org/" SUPPORT_URL="https://www.debian.org/support" BUG_REPORT_URL="https://bugs.debian.org/" Linux kamailio11.dev.wb.internal 4.19.0-10-amd64 #1 SMP Debian 4.19.132-1 (2020-07-24) x86_64 GNU/Linux ``` -- 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/2466

6 19

git:5.3:794861c8: httpa_asyc_client: set curl memory callbacks in module initialization
by Federico Cabiddu 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.3 Commit: 794861c8db50846599118fe7583f522200195d8d URL: https://github.com/kamailio/kamailio/commit/794861c8db50846599118fe7583f522… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-09-09T12:49:03+02:00 httpa_asyc_client: set curl memory callbacks in module initialization --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/794861c8db50846599118fe7583f522… Patch: https://github.com/kamailio/kamailio/commit/794861c8db50846599118fe7583f522… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7bfbb004c9..d0b99daecb 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -275,6 +275,8 @@ static int mod_init(void) return -1; } + set_curl_mem_callbacks(); + /* init faked sip msg */ if(faked_msg_init()<0) { LM_ERR("failed to init faked sip msg\n"); diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index 948171b519..cfe9ae9177 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -392,7 +392,6 @@ void set_curl_mem_callbacks(void) LM_ERR ("invalid memory manager: %d\n", curl_memory_manager); break; } - } int init_http_multi(struct event_base *evbase, struct http_m_global *wg) @@ -400,7 +399,6 @@ int init_http_multi(struct event_base *evbase, struct http_m_global *wg) g = wg; g->evbase = evbase; - set_curl_mem_callbacks(); g->multi = curl_multi_init(); LM_DBG("curl_multi %p initialized on global %p (evbase %p)\n", g->multi, g, evbase);

1 0

git:5.4:4e0f9f88: httpa_asyc_client: set curl memory callbacks in module initialization
by Federico Cabiddu 09 Sep '20

09 Sep '20

Module: kamailio Branch: 5.4 Commit: 4e0f9f8869aaf364011413417ff6c95c032af16d URL: https://github.com/kamailio/kamailio/commit/4e0f9f8869aaf364011413417ff6c95… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-09-09T12:48:43+02:00 httpa_asyc_client: set curl memory callbacks in module initialization --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/4e0f9f8869aaf364011413417ff6c95… Patch: https://github.com/kamailio/kamailio/commit/4e0f9f8869aaf364011413417ff6c95… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7bfbb004c9..d0b99daecb 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -275,6 +275,8 @@ static int mod_init(void) return -1; } + set_curl_mem_callbacks(); + /* init faked sip msg */ if(faked_msg_init()<0) { LM_ERR("failed to init faked sip msg\n"); diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index b5c2e8d637..9ed1b2dc92 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -385,7 +385,6 @@ void set_curl_mem_callbacks(void) LM_ERR ("invalid memory manager: %d\n", curl_memory_manager); break; } - } int init_http_multi(struct event_base *evbase, struct http_m_global *wg) @@ -393,7 +392,6 @@ int init_http_multi(struct event_base *evbase, struct http_m_global *wg) g = wg; g->evbase = evbase; - set_curl_mem_callbacks(); g->multi = curl_multi_init(); LM_DBG("curl_multi %p initialized on global %p (evbase %p)\n", g->multi, g, evbase);

1 0

git:master:66fea7c6: httpa_asyc_client: set curl memory callbacks in module initialization
by Federico Cabiddu 09 Sep '20

09 Sep '20

Module: kamailio Branch: master Commit: 66fea7c615e01b200b334d5255c90911cfb360fe URL: https://github.com/kamailio/kamailio/commit/66fea7c615e01b200b334d5255c9091… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-09-08T15:05:37+02:00 httpa_asyc_client: set curl memory callbacks in module initialization --- Modified: src/modules/http_async_client/http_async_client_mod.c Modified: src/modules/http_async_client/http_multi.c --- Diff: https://github.com/kamailio/kamailio/commit/66fea7c615e01b200b334d5255c9091… Patch: https://github.com/kamailio/kamailio/commit/66fea7c615e01b200b334d5255c9091… --- diff --git a/src/modules/http_async_client/http_async_client_mod.c b/src/modules/http_async_client/http_async_client_mod.c index 7bfbb004c9..d0b99daecb 100644 --- a/src/modules/http_async_client/http_async_client_mod.c +++ b/src/modules/http_async_client/http_async_client_mod.c @@ -275,6 +275,8 @@ static int mod_init(void) return -1; } + set_curl_mem_callbacks(); + /* init faked sip msg */ if(faked_msg_init()<0) { LM_ERR("failed to init faked sip msg\n"); diff --git a/src/modules/http_async_client/http_multi.c b/src/modules/http_async_client/http_multi.c index b5c2e8d637..9ed1b2dc92 100644 --- a/src/modules/http_async_client/http_multi.c +++ b/src/modules/http_async_client/http_multi.c @@ -385,7 +385,6 @@ void set_curl_mem_callbacks(void) LM_ERR ("invalid memory manager: %d\n", curl_memory_manager); break; } - } int init_http_multi(struct event_base *evbase, struct http_m_global *wg) @@ -393,7 +392,6 @@ int init_http_multi(struct event_base *evbase, struct http_m_global *wg) g = wg; g->evbase = evbase; - set_curl_mem_callbacks(); g->multi = curl_multi_init(); LM_DBG("curl_multi %p initialized on global %p (evbase %p)\n", g->multi, g, evbase);

1 0

git:master:c644d311: core: events - return after SREV_TCP_WS_CLOSE callbacks are executed
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: master Commit: c644d311100e52e83f7ddf54a3a0b7be83525184 URL: https://github.com/kamailio/kamailio/commit/c644d311100e52e83f7ddf54a3a0b7b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T13:09:59+02:00 core: events - return after SREV_TCP_WS_CLOSE callbacks are executed --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/c644d311100e52e83f7ddf54a3a0b7b… Patch: https://github.com/kamailio/kamailio/commit/c644d311100e52e83f7ddf54a3a0b7b… --- diff --git a/src/core/events.c b/src/core/events.c index b9df7dcf2d..69a496df31 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -353,6 +353,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) && _sr_events_list.tcp_ws_close[i]; i++) { ret = _sr_events_list.tcp_ws_close[i](evp); } + return ret; } else return 1; default: return -1;

1 0

git:5.4:c7a07121: core: events - return once SREV_SIP_REPLY_OUT callbacks are executed
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: 5.4 Commit: c7a07121012b23299331b22426852d9af534582f URL: https://github.com/kamailio/kamailio/commit/c7a07121012b23299331b22426852d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T13:09:10+02:00 core: events - return once SREV_SIP_REPLY_OUT callbacks are executed (cherry picked from commit 1910432ce3af56af1e6d4c4c124c2af2925c5b9a) --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/c7a07121012b23299331b22426852d9… Patch: https://github.com/kamailio/kamailio/commit/c7a07121012b23299331b22426852d9… --- diff --git a/src/core/events.c b/src/core/events.c index 91df673996..d48d7a7819 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -334,6 +334,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) && _sr_events_list.sip_reply_out[i]; i++) { ret |= _sr_events_list.sip_reply_out[i](evp); } + return ret; } else return 1; default: return -1;

1 0

git:master:1910432c: core: events - return once SREV_SIP_REPLY_OUT callbacks are executed
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: master Commit: 1910432ce3af56af1e6d4c4c124c2af2925c5b9a URL: https://github.com/kamailio/kamailio/commit/1910432ce3af56af1e6d4c4c124c2af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T13:08:01+02:00 core: events - return once SREV_SIP_REPLY_OUT callbacks are executed --- Modified: src/core/events.c --- Diff: https://github.com/kamailio/kamailio/commit/1910432ce3af56af1e6d4c4c124c2af… Patch: https://github.com/kamailio/kamailio/commit/1910432ce3af56af1e6d4c4c124c2af… --- diff --git a/src/core/events.c b/src/core/events.c index 2d8400f829..b9df7dcf2d 100644 --- a/src/core/events.c +++ b/src/core/events.c @@ -343,6 +343,7 @@ int sr_event_exec(int type, sr_event_param_t *evp) && _sr_events_list.sip_reply_out[i]; i++) { ret |= _sr_events_list.sip_reply_out[i](evp); } + return ret; } else return 1; case SREV_TCP_WS_CLOSE: if(unlikely(_sr_events_list.tcp_ws_close[0]!=0))

1 0

git:master:68f93d27: sipdump: init checksum filed
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: master Commit: 68f93d27b9ee40cfce8c52304eac4ad9c83ee4b1 URL: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T12:48:15+02:00 sipdump: init checksum filed - silent analyzer --- Modified: src/modules/sipdump/sipdump_pcap.c --- Diff: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… Patch: https://github.com/kamailio/kamailio/commit/68f93d27b9ee40cfce8c52304eac4ad… --- diff --git a/src/modules/sipdump/sipdump_pcap.c b/src/modules/sipdump/sipdump_pcap.c index 1a559cea59..52ef7b3b92 100644 --- a/src/modules/sipdump/sipdump_pcap.c +++ b/src/modules/sipdump/sipdump_pcap.c @@ -182,6 +182,7 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) v_pcap_udp_header.src = ntohs(spd->src_port); v_pcap_udp_header.dst = ntohs(spd->dst_port); v_pcap_udp_header.length = ntohs(sizeof(struct pcap_udp_header) + data.len); + v_pcap_udp_header.checksum = 0; /* IP header */ if (spd->afid == AF_INET6) { @@ -243,4 +244,4 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) LM_ERR("writing UDP payload to pcap failed: %s\n", strerror(errno)); } fflush(fs); -} \ No newline at end of file +}

1 0

git:master:9132a4bb: sipdump: move use of spd fields after safety check
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

Module: kamailio Branch: master Commit: 9132a4bbd39c0302204dd053bd1e563c02afed8e URL: https://github.com/kamailio/kamailio/commit/9132a4bbd39c0302204dd053bd1e563… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T12:52:53+02:00 sipdump: move use of spd fields after safety check --- Modified: src/modules/sipdump/sipdump_pcap.c --- Diff: https://github.com/kamailio/kamailio/commit/9132a4bbd39c0302204dd053bd1e563… Patch: https://github.com/kamailio/kamailio/commit/9132a4bbd39c0302204dd053bd1e563… --- diff --git a/src/modules/sipdump/sipdump_pcap.c b/src/modules/sipdump/sipdump_pcap.c index 52ef7b3b92..e808ff23fe 100644 --- a/src/modules/sipdump/sipdump_pcap.c +++ b/src/modules/sipdump/sipdump_pcap.c @@ -125,8 +125,8 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) char *p = NULL; struct pcap_record_header v_pcap_record_header = { - .ts_sec = spd->tv.tv_sec, - .ts_usec = spd->tv.tv_usec, + .ts_sec = 0, + .ts_usec = 0, }; struct pcap_ethernet_header v_pcap_ethernet_header = { .type = 0, @@ -148,6 +148,9 @@ void sipdump_write_pcap(FILE *fs, sipdump_data_t *spd) return; } + v_pcap_record_header.ts_sec = spd->tv.tv_sec; + v_pcap_record_header.ts_usec = spd->tv.tv_usec; + data = spd->data; if((sipdump_mode & SIPDUMP_MODE_WPCAPEX) && (spd->data.len < BUF_SIZE - 256)) { if(_sipdump_pcap_data_buf == NULL) {

1 0

git:5.3:e1dc051e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 08 Sep '20

08 Sep '20

Module: kamailio Branch: 5.3 Commit: e1dc051e4171cb7a441987d0c184fc210fa57063 URL: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-09-08T12:47:01+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/pike/README Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… Patch: https://github.com/kamailio/kamailio/commit/e1dc051e4171cb7a441987d0c184fc2… --- diff --git a/src/modules/app_lua/README b/src/modules/app_lua/README index a1f0c05984..545fb78f14 100644 --- a/src/modules/app_lua/README +++ b/src/modules/app_lua/README @@ -94,6 +94,9 @@ Chapter 1. Admin Guide To read more about KEMI exports and available KSR submodules, see: * http://kamailio.org/docs/tutorials/devel/kamailio-kemi-framework/ + Note: to have the old Lua module 'sr' available, load the 'app_lua_sr' + Kamailio module. + Lua (http://www.lua.org) is a fast and easy to embed scripting language. Exported API from SIP router to Lua is documented in the dokuwiki. @@ -203,7 +206,7 @@ lua_dofile("/usr/local/etc/kamailio/lua/myscript.lua"); Example 1.6. lua_dostring usage ... -if(!lua_dostring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_dostring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -237,7 +240,7 @@ lua_run("lua_func3", "$rU", "2", "$si"); Example 1.8. lua_runstring usage ... -if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) +if(!lua_runstring("KSR.log([[err]], [[----------- Hello World from $fU\n]])")) { xdbg("SCRIPT: failed to execute lua script!\n"); } @@ -297,7 +300,7 @@ if(!lua_runstring("sr.log([[err]], [[----------- Hello World from $fU\n]])")) '/usr/local/etc/kamailio/lua/myscript.lua'. ... function sr_append_fu_to_reply() - sr.hdr.append_to_reply("P-From: " .. sr.pv.get("$fu") .. "\r\n"); + KSR.hdr.append_to_reply("P-From: " .. KSR.pv.get("$fu") .. "\r\n"); end ... diff --git a/src/modules/pike/README b/src/modules/pike/README index a7f66697e7..beea746f45 100644 --- a/src/modules/pike/README +++ b/src/modules/pike/README @@ -39,6 +39,7 @@ Bogdan-Andrei Iancu 2. RPC calls 1. pike.top + 2. pike.list 3. Developer Guide @@ -49,6 +50,7 @@ Bogdan-Andrei Iancu 1.3. Set remove_latency parameter 1.4. Set pike_log_level parameter 1.5. pike_check_req usage + 2.1. Using pike.top 3.1. Tree of IP addresses Chapter 1. Admin Guide @@ -219,6 +221,7 @@ Chapter 2. RPC calls Table of Contents 1. pike.top + 2. pike.list 1. pike.top @@ -230,9 +233,9 @@ Chapter 2. RPC calls Some IPs could be marked as HOT depending on theirs request rates. - pike.top command takes one string parameter which specifies what kind - of nodes you are interested in. Possible values are HOT or ALL. If no - argument is given, it behaves as HOT was used. + pike.top command can take one string parameter which specifies what + kind of nodes you are interested in. Possible values are HOT or ALL. If + no argument is given, it behaves as HOT was used. Marking nodes HOT is done on server side, client only presents given data and make some postprocessing like sorting. @@ -240,6 +243,15 @@ Chapter 2. RPC calls Output of this command is a simple dump of ip_tree nodes marked as ip-leafs. + Example 2.1. Using pike.top +... +kamcli rpc pike.top ALL +... + +2. pike.list + + Alias for "pike.top" command. + Chapter 3. Developer Guide One single tree (for both IPv4 and IPv6) is used. Each node contains a diff --git a/src/modules/tls/README b/src/modules/tls/README index 0a0e6650d7..99f05e22c5 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -1426,7 +1426,7 @@ end 10.34. rand_engine (str) - Set the ranondom number generator engine for libssl. + Set the random number generator engine for libssl. Note: the default random number generator (PRNG) engine of libssl v1.1.x is not designed for multi-process applications and can result in

1 0

git: new commits in branch 5.3
by Daniel-Constantin Mierla 08 Sep '20

08 Sep '20

- URL: https://github.com/kamailio/kamailio/commit/fa7042676c0dc2ea8760c928ef70fd1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:35+02:00 kamctl: added pstrap command - use ps to get list of PIDs for Kamailio instance, instead of RPC core.psx (cherry picked from commit 97ec85559f1e33405fff2320443dc86d2df13456) - URL: https://github.com/kamailio/kamailio/commit/12aecb27779637b90ef83efea4dfaf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:44+02:00 kamctl: print process details in pstrap output (cherry picked from commit 904a1590dbcdbb0fda9f676b4768596f797e9e27) - URL: https://github.com/kamailio/kamailio/commit/7ac48ca1a6bd0462199ebb6cf1be61b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:52:57+02:00 kamctl: skip tracing kamctl itself in pstrap (cherry picked from commit 626c0dee863fa517e473148ca8010d737a8f7ffe) - URL: https://github.com/kamailio/kamailio/commit/c79cc69ac27bd1d6b506634e8a9d768… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:56:49+02:00 tls: docs - fixed typo - GH #2410 (cherry picked from commit a12064696ac37cadf954a89b58daa1e05e182180) (cherry picked from commit eb2abae40b36ad123528cddb25e0ddd217b68b22) - URL: https://github.com/kamailio/kamailio/commit/5896f8e31078ff9b5d704c7393d7a7a… Author: Luis Martin Gil <luismartingil(a)zaleos.net> Date: 2020-09-08T09:57:08+02:00 tm - remove not used route_mode var (cherry picked from commit 6619be46249dfe0b2f2cbc863cb8b2f44716122b) - URL: https://github.com/kamailio/kamailio/commit/6474444f12b15b443f9f0ed96e509b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:57:50+02:00 log_custom: print to stderror if sending log message fails - help troubleshooting while avoiding looping to same function in case the log engine is set to log custom module (cherry picked from commit f16d046f6330f897b374d9bb7dab3b2ce8eab3a7) (cherry picked from commit 1ecade5cbd323e1ab45ec6f83236e1d389739d3b) - URL: https://github.com/kamailio/kamailio/commit/9db407d0ad2a2e48725ddc2fd370269… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:18+02:00 app_lua: docs - note about availability of 'sr' Lua module - use KSR in the examples (cherry picked from commit 34efa83569bedb1f36c3661ee063ff6334633e4a) (cherry picked from commit c98d9e8c6687f2311f51016ed9cc2e089d4eb242) - URL: https://github.com/kamailio/kamailio/commit/4f9a5cdefb8d6baf9c069e277012d6d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:30+02:00 xcap_server: check before going to the end of the buffer - use marcros to set and restore char for ending 0 (cherry picked from commit 6ce5c0bdf136ecffd7917f2d60093e1b2c49fa54) (cherry picked from commit 4aeb071b26df08e1dfc902340475c077e468c661) - URL: https://github.com/kamailio/kamailio/commit/2d581622496e2141401a00a47011cf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:58:58+02:00 db_text: free pointer in case of error (cherry picked from commit bddf16db74ea779bb01805fc2cbabfdaf8f4d62b) (cherry picked from commit aabb2b2cfab6dc664ebc4b3d15db0d2ecb3cafd5) - URL: https://github.com/kamailio/kamailio/commit/0f8528d4705e0e7060708f6108c47bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:07+02:00 Makefile.defs: get clang version only from --version output - the full version with stderr output included has a different first line on MacOS, making head -n 1 not extract the version number line (cherry picked from commit bff689cfedca70149e17b6ec3584ca9ecab71418) (cherry picked from commit b14b0a116791b85f2048e5fc863e50b7f7d93405) - URL: https://github.com/kamailio/kamailio/commit/148cf4bb35cb94e111cf8ade1294519… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:17+02:00 Makefile.defs: map gcc v10.x to 9.0+ options - detect properly the 10.x gcc version number, GH #2425 (cherry picked from commit 79e7738027a40affa4c7f606bf55a3ad0fe31bc4) (cherry picked from commit 6d79c954469082aeb8518fdcca80217ce4826992) - URL: https://github.com/kamailio/kamailio/commit/58043293132efa043a1d9ebfb2473d1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:27+02:00 pike: docs - section for pike.list rpc command (cherry picked from commit 720e929a87c6d3ee29c316ca63886c7142320f43) (cherry picked from commit c783f19708bfd1d8c2334f739c8960b2de5f4fb3) - URL: https://github.com/kamailio/kamailio/commit/0567c42a324deaa8dfe60cf1d8281aa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T09:59:39+02:00 topoh: check if via param has the expected prefix, otherwise skip - GH #2437 (cherry picked from commit 046126b4a90090bf5b8f9b517ba5218793e6b973) (cherry picked from commit c8c884c4db353d4fac83752a494989e699fc36ff) - URL: https://github.com/kamailio/kamailio/commit/e956b3c7dbb931f719e11a44887c5ee… Author: Dmitry <dmitry.wagin(a)ya.ru> Date: 2020-09-08T09:59:55+02:00 Makefile.defs: Fixed libs option for FreeBSD (cherry picked from commit f490c4e0f5888963a01fa99fe94a464d44223199) (cherry picked from commit 0efd0d63a8f8d7b644d0eba13552778d3b746c67) - URL: https://github.com/kamailio/kamailio/commit/659edfc219c850ac464869589d11fb8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T10:00:18+02:00 topoh: remove the Via cookie when skipping topoh via event route - event route is now executed with parsed sip message to be sent out - GH #2437 (cherry picked from commit 06a1d20fdcae42c8f2130c547c6c6cf5fb6dce26) (cherry picked from commit b5176749605808af737aca00992f549152f9c38a) - URL: https://github.com/kamailio/kamailio/commit/4c80e4c71a44fbe26761bee730e423f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-08T10:00:37+02:00 usrloc: get_udomain() - safety checks for location table name parameter (cherry picked from commit 29dde9fea1eb21b4bb484286f7443dd32f611bd2) (cherry picked from commit ac56dfde20c5e689fb911debdd33a6155f7b130c)

1 0

git:5.3:8079c537: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: 5.3 Commit: 8079c537fa34be1ca075617d2b79143cd932e719 URL: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T20:35:28+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded - backport of commit efa6c6a9bf13c430d5be5146168d1ded4c39dba7 (master) - backport of commit 1a49cc015609c8701057d5a9cf50f68db61870c1 (5.4) --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… Patch: https://github.com/kamailio/kamailio/commit/8079c537fa34be1ca075617d2b79143… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index 8da8fc7441..ebde602595 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -936,26 +936,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - LM_ERR("no more pkg mem\n"); - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -966,8 +946,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -976,20 +956,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { LM_ERR("no more pkg mem\n"); - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + LM_ERR("no more pkg mem\n"); + return; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1003,10 +1003,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

git:5.4:1a49cc01: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: 5.4 Commit: 1a49cc015609c8701057d5a9cf50f68db61870c1 URL: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T19:48:29+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded (cherry picked from commit efa6c6a9bf13c430d5be5146168d1ded4c39dba7) --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… Patch: https://github.com/kamailio/kamailio/commit/1a49cc015609c8701057d5a9cf50f68… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c64af52999..3a476a3d82 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -942,26 +942,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - PKG_MEM_ERROR; - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -972,8 +952,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -982,20 +962,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { PKG_MEM_ERROR; - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri update - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + PKG_MEM_ERROR; + goto free1; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1009,10 +1009,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

git:master:efa6c6a9: uac: restore first display name then uri with dialog callback
by Daniel-Constantin Mierla 07 Sep '20

07 Sep '20

Module: kamailio Branch: master Commit: efa6c6a9bf13c430d5be5146168d1ded4c39dba7 URL: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-07T19:35:04+02:00 uac: restore first display name then uri with dialog callback - same as for rr callback, otherwise the new header can be malformed: the case of initial INVITE with From URI having no angle brackets and goes out with display name and angle brackets, the ACK for 200ok results with >From broken when forwarded --- Modified: src/modules/uac/replace.c --- Diff: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… Patch: https://github.com/kamailio/kamailio/commit/efa6c6a9bf13c430d5be5146168d1de… --- diff --git a/src/modules/uac/replace.c b/src/modules/uac/replace.c index c64af52999..3a476a3d82 100644 --- a/src/modules/uac/replace.c +++ b/src/modules/uac/replace.c @@ -942,26 +942,6 @@ static void replace_callback(struct dlg_cell *dlg, int type, old_uri.len, old_uri.s, new_display->len, new_display->s, new_uri->len, new_uri->s); - /* duplicate the decoded value */ - p = pkg_malloc( new_uri->len); - if (!p) { - PKG_MEM_ERROR; - return; - } - memcpy( p, new_uri->s, new_uri->len); - - /* build del/add lumps */ - l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); - if (l==0) { - LM_ERR("del lump failed\n"); - goto free; - } - - if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { - LM_ERR("insert new lump failed\n"); - goto free; - } - /* deal with display name */ l = 0; /* first remove the existing display */ @@ -972,8 +952,8 @@ static void replace_callback(struct dlg_cell *dlg, int type, l = del_lump(msg, body->display.s-msg->buf, body->display.len, 0); if (l==0) { LM_ERR("display del lump failed\n"); - goto free; - } + return; + } } if (new_display->s && new_display->len > 0) { LM_DBG("inserting display [%.*s]\n", @@ -982,20 +962,40 @@ static void replace_callback(struct dlg_cell *dlg, int type, buf.s = pkg_malloc(new_display->len + 2); if (buf.s==0) { PKG_MEM_ERROR; - goto free; + return; } memcpy( buf.s, new_display->s, new_display->len); buf.len = new_display->len; if (l==0 && (l=get_display_anchor(msg, hdr, body, &buf)) == 0) { LM_ERR("failed to insert anchor\n"); - goto free2; + goto free1; } if (insert_new_lump_after(l, buf.s, buf.len, 0) == 0) { LM_ERR("insert new display lump failed\n"); - goto free2; + goto free1; } } + /* uri update - duplicate the decoded value */ + p = pkg_malloc( new_uri->len); + if (!p) { + PKG_MEM_ERROR; + goto free1; + } + memcpy( p, new_uri->s, new_uri->len); + + /* build del/add lumps */ + l = del_lump( msg, old_uri.s-msg->buf, old_uri.len, 0); + if (l==0) { + LM_ERR("del lump failed\n"); + goto free2; + } + + if (insert_new_lump_after( l, p, new_uri->len, 0)==0) { + LM_ERR("insert new lump failed\n"); + goto free2; + } + /* register tm callback to change replies, * but only if not registered earlier */ if (!(msg->msg_flags & (FL_USE_UAC_FROM|FL_USE_UAC_TO)) && @@ -1009,10 +1009,10 @@ static void replace_callback(struct dlg_cell *dlg, int type, return; free2: - pkg_free(buf.s); - -free: pkg_free(p); + +free1: + pkg_free(buf.s); }

1 0

[kamailio/kamailio] SIP Header 'Replaces' Support in Module RTPENGINE for 3GPP SRVCC functionality (#2473)
by Hamid R. Hashmi 07 Sep '20

07 Sep '20

Do Module RTPENGINE Supports 'Replaces' header (RFC 3891), if yes then how to use this feature, if no then will module RTPEngine will have support for 'Replaces' in the near future? I have been using Freeswitch for this functionality but facing many difficulties in it. -- 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/2473

2 2

git:5.4:e1d4ddcb: pv_headers: fix $x_hdr index on get
by Victor Seva 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.4 Commit: e1d4ddcb6c517f8fc3d688728f4d1310c5149352 URL: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-04T16:11:54+02:00 pv_headers: fix $x_hdr index on get * previously we where not supporting pseudo-variables as index (cherry picked from commit 492c99e8065baa510f55154593122e33d3a61d73) --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… Patch: https://github.com/kamailio/kamailio/commit/e1d4ddcb6c517f8fc3d688728f4d131… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index ad5ba9ddac..7cba757456 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -539,38 +539,33 @@ int pvh_get_header(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) sr_xavp_t *xavi = NULL; sr_xval_t *xval = NULL; pv_value_t tv; - str hname = STR_NULL; - int idx = 0; + str *hname = NULL; + int idx, idxf; int cnt = 0; - idx = param->pvi.u.ival; + if(pv_get_spec_name(msg, param, &tv) != 0 || (!(tv.flags & PV_VAL_STR))) { + LM_ERR("invalid header name, must be a string\n"); + return -1; + } + hname = &tv.rs; - if(param->pvn.type == PV_NAME_PVAR) { - if(pv_get_spec_value(msg, (pv_spec_p)(param->pvn.u.dname), &tv) != 0) { - LM_ERR("cannot get avp value\n"); - return -1; - } - if(!(tv.flags & PV_VAL_STR)) { - return pv_get_null(msg, param, res); - } - hname = tv.rs; - } else if(param->pvn.u.isname.type == AVP_NAME_STR) { - hname = param->pvn.u.isname.name.s; - } else { - return pv_get_null(msg, param, res); + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf) != 0) { + LM_ERR("invalid index\n"); + return -1; } if(idx < 0) { - if((xavi = pvh_xavi_get_child(msg, &xavi_name, &hname)) == NULL) + if((xavi = pvh_xavi_get_child(msg, &xavi_name, hname)) == NULL) cnt = 0; else - cnt = xavi_count(&hname, &xavi); + cnt = xavi_count(hname, &xavi); idx = idx + cnt; if(idx < 0) - pv_get_null(msg, param, res); + return pv_get_null(msg, param, res); } - xval = pvh_xavi_get_value(msg, &xavi_name, &hname, idx); + xval = pvh_xavi_get_value(msg, &xavi_name, hname, idx); if(xval == NULL || !xval->v.s.s) return pv_get_null(msg, param, res);

1 0

git:master:492c99e8: pv_headers: fix $x_hdr index on get
by Victor Seva 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: 492c99e8065baa510f55154593122e33d3a61d73 URL: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… Author: Victor Seva <vseva(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-04T16:11:03+02:00 pv_headers: fix $x_hdr index on get * previously we where not supporting pseudo-variables as index --- Modified: src/modules/pv_headers/pvh_xavp.c --- Diff: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… Patch: https://github.com/kamailio/kamailio/commit/492c99e8065baa510f55154593122e3… --- diff --git a/src/modules/pv_headers/pvh_xavp.c b/src/modules/pv_headers/pvh_xavp.c index ad5ba9ddac..7cba757456 100644 --- a/src/modules/pv_headers/pvh_xavp.c +++ b/src/modules/pv_headers/pvh_xavp.c @@ -539,38 +539,33 @@ int pvh_get_header(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) sr_xavp_t *xavi = NULL; sr_xval_t *xval = NULL; pv_value_t tv; - str hname = STR_NULL; - int idx = 0; + str *hname = NULL; + int idx, idxf; int cnt = 0; - idx = param->pvi.u.ival; + if(pv_get_spec_name(msg, param, &tv) != 0 || (!(tv.flags & PV_VAL_STR))) { + LM_ERR("invalid header name, must be a string\n"); + return -1; + } + hname = &tv.rs; - if(param->pvn.type == PV_NAME_PVAR) { - if(pv_get_spec_value(msg, (pv_spec_p)(param->pvn.u.dname), &tv) != 0) { - LM_ERR("cannot get avp value\n"); - return -1; - } - if(!(tv.flags & PV_VAL_STR)) { - return pv_get_null(msg, param, res); - } - hname = tv.rs; - } else if(param->pvn.u.isname.type == AVP_NAME_STR) { - hname = param->pvn.u.isname.name.s; - } else { - return pv_get_null(msg, param, res); + /* get the index */ + if(pv_get_spec_index(msg, param, &idx, &idxf) != 0) { + LM_ERR("invalid index\n"); + return -1; } if(idx < 0) { - if((xavi = pvh_xavi_get_child(msg, &xavi_name, &hname)) == NULL) + if((xavi = pvh_xavi_get_child(msg, &xavi_name, hname)) == NULL) cnt = 0; else - cnt = xavi_count(&hname, &xavi); + cnt = xavi_count(hname, &xavi); idx = idx + cnt; if(idx < 0) - pv_get_null(msg, param, res); + return pv_get_null(msg, param, res); } - xval = pvh_xavi_get_value(msg, &xavi_name, &hname, idx); + xval = pvh_xavi_get_value(msg, &xavi_name, hname, idx); if(xval == NULL || !xval->v.s.s) return pv_get_null(msg, param, res);

1 0

[kamailio/kamailio] keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm (#2462)
by Nacho G. 04 Sep '20

04 Sep '20

- This avoids a race condition that may happen processing tm_request callbacl - Allows to identify uniquely a ka_dest record   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue #2448 #### Description  Check issue You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2462 -- Commit Summary -- * keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm -- File Changes -- M src/modules/keepalive/keepalive.h (5) M src/modules/keepalive/keepalive_api.c (39) M src/modules/keepalive/keepalive_core.c (15) M src/modules/keepalive/keepalive_mod.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2462.patch https://github.com/kamailio/kamailio/pull/2462.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/2462

2 2

git:master:d7f59825: Merge pull request #2462 from NGSegovia/keepalive_fix_race_condition_tm_request
by GitHub 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: d7f5982556a5286eea6992af5430dc3785a5d9e3 URL: https://github.com/kamailio/kamailio/commit/d7f5982556a5286eea6992af5430dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-09-04T13:46:39+02:00 Merge pull request #2462 from NGSegovia/keepalive_fix_race_condition_tm_request keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d7f5982556a5286eea6992af5430dc3… Patch: https://github.com/kamailio/kamailio/commit/d7f5982556a5286eea6992af5430dc3…

1 0

git:master:9a3a8f15: keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm
by Nacho Garcia Segovia 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: 9a3a8f15381c213901279c4a10f99d2ffcde85b1 URL: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-09-02T15:15:41+02:00 keepalive: added uuid to ka_dest structure to avoid passing the whole struct to tm - This avoids a race condition that may happen processing tm_request callbacl - Allows to identify uniquely a ka_dest record --- Modified: src/modules/keepalive/keepalive.h Modified: src/modules/keepalive/keepalive_api.c Modified: src/modules/keepalive/keepalive_core.c Modified: src/modules/keepalive/keepalive_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2… Patch: https://github.com/kamailio/kamailio/commit/9a3a8f15381c213901279c4a10f99d2…

1 0

[kamailio/kamailio] Kamailio crashing when applying s.prefixes transformation on empty string (#2467)
by cmcom-gb 04 Sep '20

04 Sep '20

### Description Applying a simple `{s.prefixes}` transformation on a variable with an empty value crashes Kamailio. It is not specific to a particular SIP message being processed. ### Troubleshooting #### Reproduction ``` request_route { $var(empty) = ""; $var(result) = $(var(empty){s.prefixes}); drop; } ``` #### Debugging Data ``` (paste your debugging data here) ``` #### Log Messages ``` kernel: [27707776.714159] kamailio[13060]: segfault at 562232762ff0 ip 00007f82a1e76391 sp 00007ffc3bc7fcd8 error 4 in libc-2.24.so[7f82a1d4d000+195000] ``` #### SIP Traffic Any SIP traffic will do, as long as this particular scenario is hit, for whatever reason. Could be buggy business logic. ### Possible Solutions The only thing I could think of is to place the transformation inside an `if` statement which checks for an empty value of the variable the `{s.prefixes]` transformation is being applied to. ### Additional Information I've tested this with Kamailio 5.1 and 5.4, and both have this issue. * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.0 (x86_64/linux) version: kamailio 5.1.10 (x86_64/linux) ``` * **Operating System**: ``` Kamailio 5.1.10 -> Debian GNU/Linux 9.13 (stretch) Kamailio 5.4.0 -> Debian GNU/Linux 9.8 (stretch) ``` -- 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/2467

2 2

git:5.2:41a9d81e: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.2 Commit: 41a9d81e63bd4a3e44fcd00d2cf2c2855079b41b URL: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:45:38+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) (cherry picked from commit ad14b61155686aead27e7ac5f3fb6b1aa90b6840) (cherry picked from commit 8fcbfc697eaa7df91e84bfbf484ed51a49fc0e2e) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… Patch: https://github.com/kamailio/kamailio/commit/41a9d81e63bd4a3e44fcd00d2cf2c28… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 8ab46d328f..9b512e860f 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -837,6 +837,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -875,7 +876,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:5.3:8fcbfc69: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.3 Commit: 8fcbfc697eaa7df91e84bfbf484ed51a49fc0e2e URL: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:44:36+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) (cherry picked from commit ad14b61155686aead27e7ac5f3fb6b1aa90b6840) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… Patch: https://github.com/kamailio/kamailio/commit/8fcbfc697eaa7df91e84bfbf484ed51… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index dfc842aac1..b95ffd135c 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -838,6 +838,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -876,7 +877,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:5.4:ad14b611: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: 5.4 Commit: ad14b61155686aead27e7ac5f3fb6b1aa90b6840 URL: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:32:34+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 (cherry picked from commit e74b06c32bc2b090937350858f655af4ab89ff63) --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… Patch: https://github.com/kamailio/kamailio/commit/ad14b61155686aead27e7ac5f3fb6b1… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index d07e55e719..cdfcd3ddf3 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -909,6 +909,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -947,7 +948,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:master:e74b06c3: pv: handle s.prefixes for empty values
by Daniel-Constantin Mierla 04 Sep '20

04 Sep '20

Module: kamailio Branch: master Commit: e74b06c32bc2b090937350858f655af4ab89ff63 URL: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-04T10:22:52+02:00 pv: handle s.prefixes for empty values - avoid crash due to invalid length of result, GH #2467 --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… Patch: https://github.com/kamailio/kamailio/commit/e74b06c32bc2b090937350858f655af… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 4de9849165..437e3b2e74 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -909,6 +909,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, if(!(val->flags&PV_VAL_STR)) val->rs.s = int2str(val->ri, &val->rs.len); + /* Set maximum prefix length */ max = val->rs.len; if(tp!=NULL) { @@ -947,7 +948,7 @@ int tr_eval_string(struct sip_msg *msg, tr_param_t *tp, int subtype, memset(val, 0, sizeof(pv_value_t)); val->flags = PV_VAL_STR; val->rs.s = _tr_buffer; - val->rs.len = j-1; + val->rs.len = (j>0)?(j-1):0; break;

1 0

git:master:99d96c4f: core: cast to unsigned to make analyzers happy on index type
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 99d96c4f5f82ca33fc6c0ccac383a3e41058405d URL: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T14:03:02+02:00 core: cast to unsigned to make analyzers happy on index type --- Modified: src/core/cfg.y Modified: src/core/globals.h Modified: src/core/parser/parse_hname2.c --- Diff: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… Patch: https://github.com/kamailio/kamailio/commit/99d96c4f5f82ca33fc6c0ccac383a3e… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 6eccec29bd..d17540de72 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1448,7 +1448,7 @@ assign_stm: | USER_AGENT_HEADER EQUAL error { yyerror("string value expected"); } | URI_HOST_EXTRA_CHARS EQUAL STRING { _sr_uri_host_extra_chars=$3; } | URI_HOST_EXTRA_CHARS EQUAL error { yyerror("string value expected"); } - | HDR_NAME_EXTRA_CHARS EQUAL STRING { _ksr_hname_extra_chars=$3; } + | HDR_NAME_EXTRA_CHARS EQUAL STRING { _ksr_hname_extra_chars=(unsigned char*)$3; } | HDR_NAME_EXTRA_CHARS EQUAL error { yyerror("string value expected"); } | REPLY_TO_VIA EQUAL NUMBER { reply_to_via=$3; } | REPLY_TO_VIA EQUAL error { yyerror("boolean value expected"); } diff --git a/src/core/globals.h b/src/core/globals.h index 413e8f2374..ea16f3ae29 100644 --- a/src/core/globals.h +++ b/src/core/globals.h @@ -216,7 +216,7 @@ extern str _ksr_xavp_via_params; extern str _ksr_xavp_via_fields; extern char *_sr_uri_host_extra_chars; -extern char *_ksr_hname_extra_chars; +extern unsigned char *_ksr_hname_extra_chars; extern char *ksr_stats_namesep; diff --git a/src/core/parser/parse_hname2.c b/src/core/parser/parse_hname2.c index a4fdca3e37..598008214a 100644 --- a/src/core/parser/parse_hname2.c +++ b/src/core/parser/parse_hname2.c @@ -154,17 +154,17 @@ static ksr_hdr_map_idx_t _ksr_hdr_map_idx[KSR_HDR_MAP_IDX_SIZE]; /** * valid chars in header names */ -static char *_ksr_hname_chars_list = "0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-._+~"; +static unsigned char *_ksr_hname_chars_list = (unsigned char*)"0123456789AaBbCcDdEeFfGgHhIiJjKkLlMmNnOoPpQqRrSsTtUuVvWwXxYyZz-._+~"; /** * additional valid chars in header names (core param) */ -char *_ksr_hname_extra_chars = ""; +unsigned char *_ksr_hname_extra_chars = (unsigned char*)""; /** * indexed valid chars in 256-array for 1-byte-index access check */ -static char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; +static unsigned char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; /** @@ -172,7 +172,7 @@ static char _ksr_hname_chars_idx[KSR_HDR_MAP_IDX_SIZE]; */ int ksr_hname_init_index(void) { - char c; + unsigned char c; int i; for(i=0; i<KSR_HDR_MAP_IDX_SIZE; i++) { @@ -231,7 +231,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, hdr->type = HDR_ERROR_T; return begin; } - if(_ksr_hname_chars_idx[*begin] == 0) { + if(_ksr_hname_chars_idx[(unsigned char)(*begin)] == 0) { LM_ERR("invalid start of header name for [%.*s]\n", (int)(end-begin), begin); hdr->type = HDR_ERROR_T; @@ -241,7 +241,7 @@ char *parse_sip_header_name(char* const begin, const char* const end, hdr->name.s = begin; for(p=begin+1; p<end; p++) { - if(_ksr_hname_chars_idx[*p] == 0) { + if(_ksr_hname_chars_idx[(unsigned char)(*p)] == 0) { /* char not allowed in header name */ break; } @@ -279,9 +279,9 @@ char *parse_sip_header_name(char* const begin, const char* const end, done: /* lookup header type */ - if(_ksr_hdr_map_idx[hdr->name.s[0]].idxs >= 0) { - for(i = _ksr_hdr_map_idx[hdr->name.s[0]].idxs; - i <= _ksr_hdr_map_idx[hdr->name.s[0]].idxe; i++) { + if(_ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxs >= 0) { + for(i = _ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxs; + i <= _ksr_hdr_map_idx[(unsigned char)(hdr->name.s[0])].idxe; i++) { if(hdr->name.len == _ksr_hdr_map[i].hname.len && strncasecmp(hdr->name.s, _ksr_hdr_map[i].hname.s, hdr->name.len) == 0) { @@ -308,4 +308,4 @@ char* parse_hname2(char* const begin, const char* const end, struct hdr_field* c char* parse_hname2_short(char* const begin, const char* const end, struct hdr_field* const hdr) { return parse_sip_header_name(begin, end, hdr, 0); -} \ No newline at end of file +}

1 0

git:master:138097c1: pike: use core search functions
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 138097c19ba7b00eac983798a72225ab73ddf73d URL: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T13:08:38+02:00 pike: use core search functions --- Modified: src/modules/pike/pike_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… Patch: https://github.com/kamailio/kamailio/commit/138097c19ba7b00eac983798a72225a… --- diff --git a/src/modules/pike/pike_rpc.c b/src/modules/pike/pike_rpc.c index e3997e34b3..a94b3762cd 100644 --- a/src/modules/pike/pike_rpc.c +++ b/src/modules/pike/pike_rpc.c @@ -26,6 +26,7 @@ #include "../../core/timer.h" /* ticks_t */ #include "../../core/dprint.h" +#include "../../core/ut.h" #include "pike_top.h" #include <stdlib.h> @@ -128,11 +129,11 @@ static void pike_top(rpc_t *rpc, void *c) stropts = "HOT"; DBG("pike:top: string options: '%s'", stropts); - if ( strcasestr(stropts, "ALL") ) { + if ( strz_casesearch_strz(stropts, "ALL") ) { options = NODE_STATUS_ALL; - } else if ( strcasestr(stropts, "HOT") ) { + } else if ( strz_casesearch_strz(stropts, "HOT") ) { options |= NODE_STATUS_HOT; - } else if ( strcasestr(stropts, "WARM") ) { + } else if ( strz_casesearch_strz(stropts, "WARM") ) { options |= NODE_STATUS_WARM; } DBG("pike:top: options: 0x%02x\n", options);

1 0

git:master:42228552: core: helper functions to search variants of str in another str
by Daniel-Constantin Mierla 03 Sep '20

03 Sep '20

Module: kamailio Branch: master Commit: 42228552b72267786561704f120e3da3aac5fd89 URL: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-03T12:47:50+02:00 core: helper functions to search variants of str in another str --- Modified: src/core/tcp_read.c Modified: src/core/ut.c Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… Patch: https://github.com/kamailio/kamailio/commit/42228552b72267786561704f120e3da… --- diff --git a/src/core/tcp_read.c b/src/core/tcp_read.c index 655db7da7b..6a005a9a32 100644 --- a/src/core/tcp_read.c +++ b/src/core/tcp_read.c @@ -110,26 +110,6 @@ int tcp_set_clone_rcvbuf(int v) } #ifdef READ_HTTP11 -static inline char *strfindcasestrz(str *haystack, char *needlez) -{ - int i,j; - str needle; - - needle.s = needlez; - needle.len = strlen(needlez); - for(i=0;i<haystack->len-needle.len;i++) { - for(j=0;j<needle.len;j++) { - if ( !((haystack->s[i+j]==needle.s[j]) || - ( isalpha((int)haystack->s[i+j]) - && ((haystack->s[i+j])^(needle.s[j]))==0x20 )) ) - break; - } - if (j==needle.len) - return haystack->s+i; - } - return 0; -} - int tcp_http11_continue(struct tcp_connection *c) { struct dest_info dst; @@ -161,7 +141,7 @@ int tcp_http11_continue(struct tcp_connection *c) return 0; /* check for Expect header */ - if(strfindcasestrz(&msg, "Expect: 100-continue")!=NULL) + if(str_casesearch_strz(&msg, "Expect: 100-continue")!=NULL) { init_dst_from_rcv(&dst, &c->rcv); if (tcp_send(&dst, 0, HTTP11CONTINUE, HTTP11CONTINUE_LEN) < 0) { @@ -169,7 +149,7 @@ int tcp_http11_continue(struct tcp_connection *c) } } /* check for Transfer-Encoding header */ - if(strfindcasestrz(&msg, "Transfer-Encoding: chunked")!=NULL) + if(str_casesearch_strz(&msg, "Transfer-Encoding: chunked")!=NULL) { c->req.flags |= F_TCP_REQ_BCHUNKED; ret = 1; @@ -178,7 +158,7 @@ int tcp_http11_continue(struct tcp_connection *c) * - HTTP Via format is different that SIP Via * - workaround: replace with Hia to be ignored by SIP parser */ - if((p=strfindcasestrz(&msg, "\nVia:"))!=NULL) + if((p=str_casesearch_strz(&msg, "\nVia:"))!=NULL) { p++; *p = 'H'; diff --git a/src/core/ut.c b/src/core/ut.c index 90b01d1026..0189b642ab 100644 --- a/src/core/ut.c +++ b/src/core/ut.c @@ -296,6 +296,53 @@ char *str_search(str *text, str *needle) return NULL; } +/** + * @brief case insensitive search for occurence of needle in text + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_casesearch(str *text, str *needle) +{ + int i,j; + for(i=0;i<text->len-needle->len;i++) { + for(j=0;j<needle->len;j++) { + if ( !((text->s[i+j]==needle->s[j]) || + ( isalpha((int)text->s[i+j]) + && ((text->s[i+j])^(needle->s[j]))==0x20 )) ) + break; + } + if (j==needle->len) + return text->s+i; + } + return 0; +} + +/** + * portable strcasestr() - the libc version requires #define _GNU_SOURCE + */ +char *strz_casesearch_strz(char *textz, char *needlez) +{ + str text; + + text.s = textz; + text.len = strlen(textz); + + return str_casesearch_strz(&text, needlez); +} + +/** + * case insensitive search of a charz string 'needlez' inside str 'text' + */ +char *str_casesearch_strz(str *text, char *needlez) +{ + str needle; + + needle.s = needlez; + needle.len = strlen(needlez); + + return str_casesearch(text, &needle); +} + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or diff --git a/src/core/ut.h b/src/core/ut.h index 56c1f9e157..6ef2e079bc 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1053,6 +1053,12 @@ char* get_abs_pathname(str* base, str* file); */ char *str_search(str *text, str *needle); +char *str_casesearch(str *text, str *needle); + +char *strz_casesearch_strz(char *textz, char *needlez); + +char *str_casesearch_strz(str *text, char *needlez); + /* * ser_memmem() returns the location of the first occurrence of data * pattern b2 of size len2 in memory block b1 of size len1 or

1 0

git:master:bffd78f1: Revert "tls: added define condition on version functions"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: bffd78f14921f67735a64caea2fb130393daa2bc URL: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:27:24+02:00 Revert "tls: added define condition on version functions" This reverts commit 99c6a68dea60ca745dfdfa33085bb6acbcee846a. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… Patch: https://github.com/kamailio/kamailio/commit/bffd78f14921f67735a64caea2fb130… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 2930bde2be..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -63,11 +63,9 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } -#endif ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index f10d0c0344..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -645,7 +645,6 @@ int tls_h_mod_init_f(void) { /*struct socket_info* si;*/ long ssl_version; - const char *ssl_version_txt; #if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) int lib_kerberos; int lib_zlib; @@ -668,15 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - -#if OPENSSL_VERSION_NUMBER < 0x010100000L - ssl_version=SSLeay(); - ssl_version_txt=SSLeay_version(SSLEAY_VERSION); -#else ssl_version=OpenSSL_version_num(); - ssl_version_txt=OpenSSL_version(OPENSSL_VERSION); -#endif - /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -688,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - ssl_version_txt, ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring "

1 0

git:master:0a2fc037: Revert "tls: support compilation without deprecated OpenSSL APIs"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: 0a2fc0371430f19f868dc17f3a361e412ceb376f URL: https://github.com/kamailio/kamailio/commit/0a2fc0371430f19f868dc17f3a361e4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:27:26+02:00 Revert "tls: support compilation without deprecated OpenSSL APIs" This reverts commit 234b02236b3ad13cdaf5624d11c727ad7d804747. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/0a2fc0371430f19f868dc17f3a361e4… Patch: https://github.com/kamailio/kamailio/commit/0a2fc0371430f19f868dc17f3a361e4… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fc84033e68..a8859c4a31 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -27,8 +27,6 @@ #include <stdlib.h> #include <openssl/ssl.h> #include <openssl/opensslv.h> -#include <openssl/bn.h> -#include <openssl/dh.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> @@ -63,7 +61,7 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (OpenSSL_version_num() < 0x1000005fL) { + if (SSLeay() < 0x1000005fL) { return; } diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 351ed4187e..b9288cbd9a 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,13 +627,14 @@ int tls_h_mod_pre_init_f(void) return 0; } LM_DBG("preparing tls env for modules initialization\n"); -#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) + LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); + OPENSSL_init_ssl(0, NULL); +#else LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); - SSL_load_error_strings(); -#else - LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); #endif + SSL_load_error_strings(); tls_mod_preinitialized=1; return 0; } @@ -667,7 +668,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - ssl_version=OpenSSL_version_num(); + ssl_version=SSLeay(); /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -679,7 +680,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - OpenSSL_version(OPENSSL_VERSION), ssl_version, + SSLeay_version(SSLEAY_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring " @@ -856,7 +857,6 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void tls_h_mod_destroy_f(void) { LM_DBG("tls module final tls destroy\n"); -#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ @@ -869,5 +869,4 @@ void tls_h_mod_destroy_f(void) LM_DBG("executing openssl v1.1+ cleanup\n"); OPENSSL_cleanup(); #endif -#endif } diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..4e5bbcc5e3 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,8 +140,6 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); if (n_static_locks<0){ @@ -169,10 +167,13 @@ int tls_init_locks() CRYPTO_set_locking_callback(locking_f); } +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); +#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process @@ -185,7 +186,6 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error:

1 0

git:master:da5d71da: Revert "tls: proper ifdef on libssl version for tls_init_locks()"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: da5d71da620deb8b8740256e556011e93cdac1a3 URL: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:27:18+02:00 Revert "tls: proper ifdef on libssl version for tls_init_locks()" This reverts commit 60bd3aa284a5d9eb117a9763aa590aecf276ba16. --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e… Patch: https://github.com/kamailio/kamailio/commit/da5d71da620deb8b8740256e556011e… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 21078e82d9..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ +/* OpenSSL is thread-safe since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,13 +185,10 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif return 0; error: tls_destroy_locks(); return -1; - -#else - return 0; -#endif }

1 0

git:5.4:0f6dea70: Revert "tls: support compilation without deprecated OpenSSL APIs"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: 5.4 Commit: 0f6dea703bd8a4cb5e450eddd046bce2b254e84d URL: https://github.com/kamailio/kamailio/commit/0f6dea703bd8a4cb5e450eddd046bce… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:20:53+02:00 Revert "tls: support compilation without deprecated OpenSSL APIs" This reverts commit 10af8efa9061c2f52ee1db51c4cf665073c20dcc. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/0f6dea703bd8a4cb5e450eddd046bce… Patch: https://github.com/kamailio/kamailio/commit/0f6dea703bd8a4cb5e450eddd046bce… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index fc84033e68..a8859c4a31 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -27,8 +27,6 @@ #include <stdlib.h> #include <openssl/ssl.h> #include <openssl/opensslv.h> -#include <openssl/bn.h> -#include <openssl/dh.h> #ifndef OPENSSL_NO_ENGINE #include <openssl/engine.h> @@ -63,7 +61,7 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; - if (OpenSSL_version_num() < 0x1000005fL) { + if (SSLeay() < 0x1000005fL) { return; } diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index 351ed4187e..b9288cbd9a 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -627,13 +627,14 @@ int tls_h_mod_pre_init_f(void) return 0; } LM_DBG("preparing tls env for modules initialization\n"); -#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) +#if OPENSSL_VERSION_NUMBER >= 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) + LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); + OPENSSL_init_ssl(0, NULL); +#else LM_DBG("preparing tls env for modules initialization (libssl <=1.0)\n"); SSL_library_init(); - SSL_load_error_strings(); -#else - LM_DBG("preparing tls env for modules initialization (libssl >=1.1)\n"); #endif + SSL_load_error_strings(); tls_mod_preinitialized=1; return 0; } @@ -667,7 +668,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - ssl_version=OpenSSL_version_num(); + ssl_version=SSLeay(); /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -679,7 +680,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - OpenSSL_version(OPENSSL_VERSION), ssl_version, + SSLeay_version(SSLEAY_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring " @@ -856,7 +857,6 @@ int tls_check_sockets(tls_domains_cfg_t* cfg) void tls_h_mod_destroy_f(void) { LM_DBG("tls module final tls destroy\n"); -#if OPENSSL_VERSION_NUMBER < 0x010100000L || defined(LIBRESSL_VERSION_NUMBER) if(tls_mod_preinitialized > 0) ERR_free_strings(); /* TODO: free all the ctx'es */ @@ -869,5 +869,4 @@ void tls_h_mod_destroy_f(void) LM_DBG("executing openssl v1.1+ cleanup\n"); OPENSSL_cleanup(); #endif -#endif } diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..4e5bbcc5e3 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,8 +140,6 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ -#if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); if (n_static_locks<0){ @@ -169,10 +167,13 @@ int tls_init_locks() CRYPTO_set_locking_callback(locking_f); } +/* OpenSSL is thread-safe since 1.1.0 */ +#if OPENSSL_VERSION_NUMBER < 0x10100000L /* set "dynamic" locks callbacks */ CRYPTO_set_dynlock_create_callback(dyn_create_f); CRYPTO_set_dynlock_lock_callback(dyn_lock_f); CRYPTO_set_dynlock_destroy_callback(dyn_destroy_f); +#endif /* starting with v1.0.0 openssl does not use anymore getpid(), but address * of errno which can point to same virtual address in a multi-process @@ -185,7 +186,6 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error:

1 0

git:5.4:abebfbed: Revert "tls: proper ifdef on libssl version for tls_init_locks()"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: 5.4 Commit: abebfbed313aaf052f4383ecf03607f17549c63c URL: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:20:52+02:00 Revert "tls: proper ifdef on libssl version for tls_init_locks()" This reverts commit e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79. --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f… Patch: https://github.com/kamailio/kamailio/commit/abebfbed313aaf052f4383ecf03607f… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 21078e82d9..3eb6f033a5 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ +/* OpenSSL is thread-safe since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,13 +185,10 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ +#endif return 0; error: tls_destroy_locks(); return -1; - -#else - return 0; -#endif }

1 0

git:5.4:e7cf0625: Revert "tls: added define condition on version functions"
by Victor Seva 02 Sep '20

02 Sep '20

Module: kamailio Branch: 5.4 Commit: e7cf0625893125bb45029f6e055ec7910f70d88f URL: https://github.com/kamailio/kamailio/commit/e7cf0625893125bb45029f6e055ec79… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-02T14:20:53+02:00 Revert "tls: added define condition on version functions" This reverts commit 67979e07b63b574687b1924c38fabd724d0ad876. --- Modified: src/modules/tls/tls_domain.c Modified: src/modules/tls/tls_init.c --- Diff: https://github.com/kamailio/kamailio/commit/e7cf0625893125bb45029f6e055ec79… Patch: https://github.com/kamailio/kamailio/commit/e7cf0625893125bb45029f6e055ec79… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 2930bde2be..fc84033e68 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -63,11 +63,9 @@ static void setup_ecdh(SSL_CTX *ctx) { EC_KEY *ecdh; -#if OPENSSL_VERSION_NUMBER < 0x010100000L - if (SSLeay() < 0x1000005fL) { + if (OpenSSL_version_num() < 0x1000005fL) { return; } -#endif ecdh = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1); SSL_CTX_set_options(ctx, SSL_OP_SINGLE_ECDH_USE); diff --git a/src/modules/tls/tls_init.c b/src/modules/tls/tls_init.c index f10d0c0344..351ed4187e 100644 --- a/src/modules/tls/tls_init.c +++ b/src/modules/tls/tls_init.c @@ -645,7 +645,6 @@ int tls_h_mod_init_f(void) { /*struct socket_info* si;*/ long ssl_version; - const char *ssl_version_txt; #if OPENSSL_VERSION_NUMBER < 0x010100000L && !defined(LIBRESSL_VERSION_NUMBER) int lib_kerberos; int lib_zlib; @@ -668,15 +667,7 @@ int tls_h_mod_init_f(void) #if OPENSSL_VERSION_NUMBER < 0x00907000L LM_WARN("You are using an old version of OpenSSL (< 0.9.7). Upgrade!\n"); #endif - -#if OPENSSL_VERSION_NUMBER < 0x010100000L - ssl_version=SSLeay(); - ssl_version_txt=SSLeay_version(SSLEAY_VERSION); -#else ssl_version=OpenSSL_version_num(); - ssl_version_txt=OpenSSL_version(OPENSSL_VERSION); -#endif - /* check if version have the same major minor and fix level * (e.g. 0.9.8a & 0.9.8c are ok, but 0.9.8 and 0.9.9x are not) * - values is represented as 0xMMNNFFPPS: major minor fix patch status @@ -688,7 +679,7 @@ int tls_h_mod_init_f(void) " compiled \"%s\" (0x%08lx).\n" " Please make sure a compatible version is used" " (tls_force_run in kamailio.cfg will override this check)\n", - ssl_version_txt, ssl_version, + OpenSSL_version(OPENSSL_VERSION), ssl_version, OPENSSL_VERSION_TEXT, (long)OPENSSL_VERSION_NUMBER); if (cfg_get(tls, tls_cfg, force_run)) LM_WARN("tls_force_run turned on, ignoring "

1 0

[kamailio/kamailio] [db_text] In a case of using dispatcher from db_text, only first entry in table is processed (#2465)
by Igor Olhovskiy 02 Sep '20

02 Sep '20

### Description I have list of dispatchers in `db_text`. But only first is processed. #### Reproduction Create `dispatcher` table in a case of db_text ``` id(int,auto) setid(int) destination(string) flags(int) priority(int) attrs(string) description(string) 2:1:sip\:asterisk_2\:5060:2:0::asterisk_2 1:1:sip\:asterisk_1\:5060:2:0::asterisk_1 ``` Start Kamailio Run `kamctl dispatcher dump` ``` # kamctl dispatcher dump { "jsonrpc": "2.0", "result": { "NRSETS": 1, "RECORDS": [{ "SET": { "ID": 1, "TARGETS": [{ "DEST": { "URI": "sip:asterisk_2:5060", "FLAGS": "AP", "PRIORITY": 0 } }] } }] }, "id": 124 } ``` Only the first entry is processed. On running ``` # kamctl dispatcher reload ``` nothing is changed. ### Possible Solutions Adding other dispatchers via `kamcmd` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /# kamailio -v version: kamailio 5.4.1 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**: Debian 10/Docker. ``` # uname -a Linux 9b7efa852274 5.3.18-lp152.36-default #1 SMP Tue Aug 18 17:09:44 UTC 2020 (885251f) x86_64 GNU/Linux ``` -- 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/2465

3 8

[kamailio/kamailio] [kamdbctl] db_text incorrect version table in 5.4 (#2463)
by Igor Olhovskiy 02 Sep '20

02 Sep '20

### Description `Version` table in default `db_text` creation has incorrect structure. ### Troubleshooting version table is #### Reproduction Installing Kamailio 5.4 from Debian repos. Tuning **kamdbctl** to DBTEXT. Running `kamdbctl create` Check `version` table. Shows something like ``` id(int,auto) table_name(string) table_version(int) version:1 ... ``` Should be ``` table_name(string) table_version(int) version:1 ``` or with `id` index ### Possible Solutions Manually delete `id(int,auto)` from `version` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` /# kamailio -v version: kamailio 5.4.1 (x86_64/linux) 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: unknown compiled with gcc 8.3.0 ``` * **Operating System**: Debian 10/Docker image ``` # uname -a Linux 9b7efa852274 5.3.18-lp152.36-default #1 SMP Tue Aug 18 17:09:44 UTC 2020 (885251f) x86_64 GNU/Linux ``` -- 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/2463

2 2

git:5.4:b43f98af: doc/stylesheets: set 0 for id column in dbtext version table records
by Daniel-Constantin Mierla 02 Sep '20

02 Sep '20

Module: kamailio Branch: 5.4 Commit: b43f98af239b8459bb8872464c954ba25ce3dbf5 URL: https://github.com/kamailio/kamailio/commit/b43f98af239b8459bb8872464c954ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-02T13:15:08+02:00 doc/stylesheets: set 0 for id column in dbtext version table records (cherry picked from commit fcd3f257c12d2e17fa92007f9d149e4ee27ec994) --- Modified: doc/stylesheets/dbschema_k/xsl/dbtext.xsl --- Diff: https://github.com/kamailio/kamailio/commit/b43f98af239b8459bb8872464c954ba… Patch: https://github.com/kamailio/kamailio/commit/b43f98af239b8459bb8872464c954ba… --- diff --git a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl index 8bb0599149..29c4b4da7d 100644 --- a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl +++ b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl @@ -53,6 +53,7 @@  <xsl:template match="version"> + <xsl:text>0:</xsl:text> <xsl:call-template name="get-name"> <xsl:with-param name="select" select="parent::table"/> </xsl:call-template>

1 0

git:5.4:acebbeef: kamctl: regenerated dbtext version table records
by Daniel-Constantin Mierla 02 Sep '20

02 Sep '20

Module: kamailio Branch: 5.4 Commit: acebbeef29d538c245e58738574bb5432c4170f6 URL: https://github.com/kamailio/kamailio/commit/acebbeef29d538c245e58738574bb54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-02T13:15:17+02:00 kamctl: regenerated dbtext version table records - GH #2463 (cherry picked from commit 65f5d0ed0fb88f5312ac53f2faaa66a2098ce0d8) --- Modified: utils/kamctl/dbtext/kamailio/version --- Diff: https://github.com/kamailio/kamailio/commit/acebbeef29d538c245e58738574bb54… Patch: https://github.com/kamailio/kamailio/commit/acebbeef29d538c245e58738574bb54… --- diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index a733827f18..a9d31882d9 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,72 +1,72 @@ id(int,auto) table_name(string) table_version(int) -version:1 -acc:5 -acc_cdrs:2 -active_watchers:12 -address:6 -aliases:8 -carrier_name:1 -carrierfailureroute:2 -carrierroute:3 -cpl:1 -dbaliases:1 -dialog:7 -dialog_vars:1 -dialplan:2 -dispatcher:4 -domain:2 -domain_attrs:1 -domain_name:1 -domainpolicy:2 -dr_gateways:3 -dr_groups:2 -dr_gw_lists:1 -dr_rules:3 -globalblacklist:1 -grp:2 -htable:2 -imc_members:1 -imc_rooms:1 -lcr_gw:3 -lcr_rule:3 -lcr_rule_target:1 -location:9 -location_attrs:1 -matrix:1 -missed_calls:4 -mohqcalls:1 -mohqueues:1 -mtree:1 -mtrees:2 -pdt:1 -pl_pipes:1 -presentity:5 -pua:7 -purplemap:1 -re_grp:1 -rls_presentity:1 -rls_watchers:3 -rtpengine:1 -rtpproxy:1 -sca_subscriptions:2 -secfilter:1 -silo:8 -sip_trace:4 -speed_dial:2 -subscriber:7 -topos_d:1 -topos_t:1 -trusted:6 -uacreg:4 -uid_credentials:7 -uid_domain:2 -uid_domain_attrs:1 -uid_global_attrs:1 -uid_uri:3 -uid_uri_attrs:2 -uid_user_attrs:3 -uri:1 -userblacklist:1 -usr_preferences:2 -watchers:3 -xcap:4 +0:version:1 +0:acc:5 +0:acc_cdrs:2 +0:active_watchers:12 +0:address:6 +0:aliases:8 +0:carrier_name:1 +0:carrierfailureroute:2 +0:carrierroute:3 +0:cpl:1 +0:dbaliases:1 +0:dialog:7 +0:dialog_vars:1 +0:dialplan:2 +0:dispatcher:4 +0:domain:2 +0:domain_attrs:1 +0:domain_name:1 +0:domainpolicy:2 +0:dr_gateways:3 +0:dr_groups:2 +0:dr_gw_lists:1 +0:dr_rules:3 +0:globalblacklist:1 +0:grp:2 +0:htable:2 +0:imc_members:1 +0:imc_rooms:1 +0:lcr_gw:3 +0:lcr_rule:3 +0:lcr_rule_target:1 +0:location:9 +0:location_attrs:1 +0:matrix:1 +0:missed_calls:4 +0:mohqcalls:1 +0:mohqueues:1 +0:mtree:1 +0:mtrees:2 +0:pdt:1 +0:pl_pipes:1 +0:presentity:5 +0:pua:7 +0:purplemap:1 +0:re_grp:1 +0:rls_presentity:1 +0:rls_watchers:3 +0:rtpengine:1 +0:rtpproxy:1 +0:sca_subscriptions:2 +0:secfilter:1 +0:silo:8 +0:sip_trace:4 +0:speed_dial:2 +0:subscriber:7 +0:topos_d:1 +0:topos_t:1 +0:trusted:6 +0:uacreg:4 +0:uid_credentials:7 +0:uid_domain:2 +0:uid_domain_attrs:1 +0:uid_global_attrs:1 +0:uid_uri:3 +0:uid_uri_attrs:2 +0:uid_user_attrs:3 +0:uri:1 +0:userblacklist:1 +0:usr_preferences:2 +0:watchers:3 +0:xcap:4

1 0

git:master:65f5d0ed: kamctl: regenerated dbtext version table records
by Daniel-Constantin Mierla 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: 65f5d0ed0fb88f5312ac53f2faaa66a2098ce0d8 URL: https://github.com/kamailio/kamailio/commit/65f5d0ed0fb88f5312ac53f2faaa66a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-02T13:11:40+02:00 kamctl: regenerated dbtext version table records - GH #2463 --- Modified: utils/kamctl/dbtext/kamailio/version --- Diff: https://github.com/kamailio/kamailio/commit/65f5d0ed0fb88f5312ac53f2faaa66a… Patch: https://github.com/kamailio/kamailio/commit/65f5d0ed0fb88f5312ac53f2faaa66a… --- diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index a733827f18..a9d31882d9 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,72 +1,72 @@ id(int,auto) table_name(string) table_version(int) -version:1 -acc:5 -acc_cdrs:2 -active_watchers:12 -address:6 -aliases:8 -carrier_name:1 -carrierfailureroute:2 -carrierroute:3 -cpl:1 -dbaliases:1 -dialog:7 -dialog_vars:1 -dialplan:2 -dispatcher:4 -domain:2 -domain_attrs:1 -domain_name:1 -domainpolicy:2 -dr_gateways:3 -dr_groups:2 -dr_gw_lists:1 -dr_rules:3 -globalblacklist:1 -grp:2 -htable:2 -imc_members:1 -imc_rooms:1 -lcr_gw:3 -lcr_rule:3 -lcr_rule_target:1 -location:9 -location_attrs:1 -matrix:1 -missed_calls:4 -mohqcalls:1 -mohqueues:1 -mtree:1 -mtrees:2 -pdt:1 -pl_pipes:1 -presentity:5 -pua:7 -purplemap:1 -re_grp:1 -rls_presentity:1 -rls_watchers:3 -rtpengine:1 -rtpproxy:1 -sca_subscriptions:2 -secfilter:1 -silo:8 -sip_trace:4 -speed_dial:2 -subscriber:7 -topos_d:1 -topos_t:1 -trusted:6 -uacreg:4 -uid_credentials:7 -uid_domain:2 -uid_domain_attrs:1 -uid_global_attrs:1 -uid_uri:3 -uid_uri_attrs:2 -uid_user_attrs:3 -uri:1 -userblacklist:1 -usr_preferences:2 -watchers:3 -xcap:4 +0:version:1 +0:acc:5 +0:acc_cdrs:2 +0:active_watchers:12 +0:address:6 +0:aliases:8 +0:carrier_name:1 +0:carrierfailureroute:2 +0:carrierroute:3 +0:cpl:1 +0:dbaliases:1 +0:dialog:7 +0:dialog_vars:1 +0:dialplan:2 +0:dispatcher:4 +0:domain:2 +0:domain_attrs:1 +0:domain_name:1 +0:domainpolicy:2 +0:dr_gateways:3 +0:dr_groups:2 +0:dr_gw_lists:1 +0:dr_rules:3 +0:globalblacklist:1 +0:grp:2 +0:htable:2 +0:imc_members:1 +0:imc_rooms:1 +0:lcr_gw:3 +0:lcr_rule:3 +0:lcr_rule_target:1 +0:location:9 +0:location_attrs:1 +0:matrix:1 +0:missed_calls:4 +0:mohqcalls:1 +0:mohqueues:1 +0:mtree:1 +0:mtrees:2 +0:pdt:1 +0:pl_pipes:1 +0:presentity:5 +0:pua:7 +0:purplemap:1 +0:re_grp:1 +0:rls_presentity:1 +0:rls_watchers:3 +0:rtpengine:1 +0:rtpproxy:1 +0:sca_subscriptions:2 +0:secfilter:1 +0:silo:8 +0:sip_trace:4 +0:speed_dial:2 +0:subscriber:7 +0:topos_d:1 +0:topos_t:1 +0:trusted:6 +0:uacreg:4 +0:uid_credentials:7 +0:uid_domain:2 +0:uid_domain_attrs:1 +0:uid_global_attrs:1 +0:uid_uri:3 +0:uid_uri_attrs:2 +0:uid_user_attrs:3 +0:uri:1 +0:userblacklist:1 +0:usr_preferences:2 +0:watchers:3 +0:xcap:4

1 0

git:master:fcd3f257: doc/stylesheets: set 0 for id column in dbtext version table records
by Daniel-Constantin Mierla 02 Sep '20

02 Sep '20

Module: kamailio Branch: master Commit: fcd3f257c12d2e17fa92007f9d149e4ee27ec994 URL: https://github.com/kamailio/kamailio/commit/fcd3f257c12d2e17fa92007f9d149e4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-02T13:11:18+02:00 doc/stylesheets: set 0 for id column in dbtext version table records --- Modified: doc/stylesheets/dbschema_k/xsl/dbtext.xsl --- Diff: https://github.com/kamailio/kamailio/commit/fcd3f257c12d2e17fa92007f9d149e4… Patch: https://github.com/kamailio/kamailio/commit/fcd3f257c12d2e17fa92007f9d149e4… --- diff --git a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl index 8bb0599149..29c4b4da7d 100644 --- a/doc/stylesheets/dbschema_k/xsl/dbtext.xsl +++ b/doc/stylesheets/dbschema_k/xsl/dbtext.xsl @@ -53,6 +53,7 @@  <xsl:template match="version"> + <xsl:text>0:</xsl:text> <xsl:call-template name="get-name"> <xsl:with-param name="select" select="parent::table"/> </xsl:call-template>

1 0

Kamailio v5.4.1 Released
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Hello, Kamailio SIP Server v5.4.1 stable release is out. This is a maintenance release of the latest stable branch, 5.4, that includes fixes since the release of v5.4.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.4.x. Deployments running previous v5.4.x versions are strongly recommended to be upgraded to v5.4.1. For more details about version 5.4.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2020/09/kamailio-v5-4-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:09fd6a16: ChangeLog: content updated for v5.4.1
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Module: kamailio Branch: 5.4 Commit: 09fd6a165fdf7292b6275b1ac318c13bb4b167b5 URL: https://github.com/kamailio/kamailio/commit/09fd6a165fdf7292b6275b1ac318c13… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-01T09:57:57+02:00 ChangeLog: content updated for v5.4.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/09fd6a165fdf7292b6275b1ac318c13… Patch: https://github.com/kamailio/kamailio/commit/09fd6a165fdf7292b6275b1ac318c13…

1 0

git:5.4:9527496e: Makefile.defs: version set to 5.4.1
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Module: kamailio Branch: 5.4 Commit: 9527496e3c1bd268531551d72c61ee6190a4c468 URL: https://github.com/kamailio/kamailio/commit/9527496e3c1bd268531551d72c61ee6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-01T09:37:28+02:00 Makefile.defs: version set to 5.4.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/9527496e3c1bd268531551d72c61ee6… Patch: https://github.com/kamailio/kamailio/commit/9527496e3c1bd268531551d72c61ee6… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index d6f45125ed..05e47cdfa2 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.4:ee284726: pkg: version set to 5.4.1 for rpm and alpine specs
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Module: kamailio Branch: 5.4 Commit: ee284726b6200f86c370254ba3d27d2f43c79053 URL: https://github.com/kamailio/kamailio/commit/ee284726b6200f86c370254ba3d27d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-01T09:36:28+02:00 pkg: version set to 5.4.1 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/ee284726b6200f86c370254ba3d27d2… Patch: https://github.com/kamailio/kamailio/commit/ee284726b6200f86c370254ba3d27d2… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index e0aa28a049..d243876d82 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.4.0 +pkgver=5.4.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 37c67d294e..42a9c88db9 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.4.0 +%define ver 5.4.1 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

git:master:6049a139: pkg/kamailio/deb: version set 5.5.0~dev2
by Victor Seva 01 Sep '20

01 Sep '20

Module: kamailio Branch: master Commit: 6049a139bcb40baf31647bbe843cae2cdb0b5d77 URL: https://github.com/kamailio/kamailio/commit/6049a139bcb40baf31647bbe843cae2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-01T09:13:53+02:00 pkg/kamailio/deb: version set 5.5.0~dev2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/6049a139bcb40baf31647bbe843cae2… Patch: https://github.com/kamailio/kamailio/commit/6049a139bcb40baf31647bbe843cae2…

1 0

git:5.4:47fe547c: pkg/kamailio/deb: version set 5.4.1
by Victor Seva 01 Sep '20

01 Sep '20

Module: kamailio Branch: 5.4 Commit: 47fe547ce2c1b7b1ccb22744dbefe8a0ea41d926 URL: https://github.com/kamailio/kamailio/commit/47fe547ce2c1b7b1ccb22744dbefe8a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-09-01T09:12:28+02:00 pkg/kamailio/deb: version set 5.4.1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/47fe547ce2c1b7b1ccb22744dbefe8a… Patch: https://github.com/kamailio/kamailio/commit/47fe547ce2c1b7b1ccb22744dbefe8a…

1 0

git:master:bf6c64cf: Makefile.defs: version set to 5.5.0-dev2
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Module: kamailio Branch: master Commit: bf6c64cf4586c180e0b15ab2b7a36c8b4f2f8829 URL: https://github.com/kamailio/kamailio/commit/bf6c64cf4586c180e0b15ab2b7a36c8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-09-01T08:35:18+02:00 Makefile.defs: version set to 5.5.0-dev2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bf6c64cf4586c180e0b15ab2b7a36c8… Patch: https://github.com/kamailio/kamailio/commit/bf6c64cf4586c180e0b15ab2b7a36c8… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1094593b15..e5dbbba525 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 5 SUBLEVEL = 0 -EXTRAVERSION = -dev1 +EXTRAVERSION = -dev2 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

Releasing Kamailio v5.4.1
by Daniel-Constantin Mierla 01 Sep '20

01 Sep '20

Hello, I am considering to release Kamailio v5.4.1 as the first patch release in the 5.4 series, likely to be done next week, on the 1st of September, 2020. There are a few issues reported on the tracker, hopefully they will be tackled till then. If you are aware of something else not working as expected, report them to issue tracker asap to give a better chance to be fixed till the release day. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Funding: https://www.paypal.me/dcmierla

1 2

Kamailio World Online Event - Schedule and access details
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Hello, the schedule for Kamailio World Updates has been published - it is an online event happening this week, on Wed-Thu, Sep 2-3, 2020, from 13:00UTC to 17:00UTC, more details are available at: * https://www.kamailioworld.com/k08-online/ The agenda includes presentations, live demos and open discussion sessions, as well as an online party to celebrate 19 years of development for Kamailio project. Being shorter than the usual Kamailio World, the event has an obvious focus on Kamailio only, with sessions about what is new in Kamailio ecosystem. The sessions are done live, in a self-hosted Jitsi Meet video conferencing room (hosting sponsored by lod.com), with live streaming to YouTube KamailioWorld channel: * https://www.youtube.com/c/KamailioWorld/ If streaming goes without problems, the recordings of presentations and live demos will be made available on YouTube channel after the event. If you want to join the video conferencing room, be sure you are muted and with video turned off, in order not to disturb the sessions with unexpected noise. Un-mute/turn video on only when you want to participate in a discussion. Asking questions and text discussions can be done on our self hosted Matrix server, in the room "kamailio" (full room id: #kamailio:matrix.kamailio.dev): * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev The server is federated, so if you have a Matrix account on another server, you can join easily. During the event, we will allow guests to join the room, so it is not really required to have a Matrix account. Should anyone have issues joining the chat room during the event, reply on sr-users and we will try to assist you. As an alternative for posting questions, I will keep an eye on YouTube comments during the live streaming and try to pass them to the speaker, if something pops up there. The last session on the 2nd day is the online celebration party for 19 years of development for Kamailio project. Grab a drink, prepare your birthday speech and say it live, tell an interesting story about your experiences in RTC or just enjoy open discussions with the other participants! It is the first time we are experimenting with a live online event, testing looked good so far and we hope everything will run smooth during the sessions! Anyhow, I am confident everyone will enjoy the event and be able to (re-)connect with people from Kamailio community, no matter where they are located around the world! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:5.4:b1ce252f: keepalive: removed function name from log messages
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: 5.4 Commit: b1ce252f8090f66de290cec95dbb6e1762ee6bdf URL: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T12:16:05+02:00 keepalive: removed function name from log messages (cherry picked from commit 17d6a88090e2a67f5c0b06e6aae76d629595b37e) --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… Patch: https://github.com/kamailio/kamailio/commit/b1ce252f8090f66de290cec95dbb6e1… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 36cf81aef1..00f40c46bf 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -61,7 +61,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest = (ka_dest_t *)param; - LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + LM_DBG("dest: %.*s\n", ka_dest->uri.len, ka_dest->uri.s); if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { return (ticks_t)(0); /* stops the timer */ @@ -104,7 +104,7 @@ static void ka_options_callback( uri.s = t->to.s + 5; uri.len = t->to.len - 8; - LM_DBG("OPTIONS-Request was finished with code %d (to %.*s)\n", ps->code, + LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s); @@ -149,7 +149,7 @@ static void ka_run_route(sip_msg_t *msg, str *uri, char *route) return; } - LM_DBG("ka_run_route event_route[%s]\n", route); + LM_DBG("run event_route[%s]\n", route); rt = route_get(&event_rt, route); if(rt < 0 || event_rt.rlist[rt] == NULL) {

1 0

git:master:8aeaee0f: pv: new transformation {uri.saor}
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: master Commit: 8aeaee0fda4013e1fe0477ce1dcb31738dc18aea URL: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T09:37:45+02:00 pv: new transformation {uri.saor} - return sip aor (sip:[user@]domain) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… Patch: https://github.com/kamailio/kamailio/commit/8aeaee0fda4013e1fe0477ce1dcb317… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 91e9bca516..4de9849165 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1409,6 +1409,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; case TR_URI_DURI: + case TR_URI_SAOR: case TR_URI_SURI: if(_tr_uri.len >= TR_BUFFER_SIZE) { LM_WARN("uri too long [%.*s] (%d)\n", @@ -1436,7 +1437,8 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; sv.len++; - if(subtype == TR_URI_SURI && _tr_parsed_uri.user.len > 0) { + if((_tr_parsed_uri.user.len > 0) + && (subtype != TR_URI_DURI)) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len); sv.len += _tr_parsed_uri.user.len; @@ -1448,19 +1450,21 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, _tr_parsed_uri.host.len); sv.len += _tr_parsed_uri.host.len; } - if(_tr_parsed_uri.port.len > 0) { - sv.s[sv.len] = ':'; - sv.len++; - memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, - _tr_parsed_uri.port.len); - sv.len += _tr_parsed_uri.port.len; - } - if(_tr_parsed_uri.transport_val.len > 0) { - memcpy(sv.s + sv.len, ";transport=", 11); - sv.len += 11; - memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, - _tr_parsed_uri.transport_val.len); - sv.len += _tr_parsed_uri.transport_val.len; + if(subtype != TR_URI_SAOR) { + if(_tr_parsed_uri.port.len > 0) { + sv.s[sv.len] = ':'; + sv.len++; + memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, + _tr_parsed_uri.port.len); + sv.len += _tr_parsed_uri.port.len; + } + if(_tr_parsed_uri.transport_val.len > 0) { + memcpy(sv.s + sv.len, ";transport=", 11); + sv.len += 11; + memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, + _tr_parsed_uri.transport_val.len); + sv.len += _tr_parsed_uri.transport_val.len; + } } sv.s[sv.len] = '\0'; val->rs = sv; @@ -2845,6 +2849,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "port", 4)==0) { t->subtype = TR_URI_PORT; goto done; + } else if(name.len==4 && strncasecmp(name.s, "saor", 4)==0) { + t->subtype = TR_URI_SAOR; + goto done; } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { t->subtype = TR_URI_SURI; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index d15df89057..c587464bed 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,8 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_DURI, TR_URI_SURI + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SAOR, TR_URI_DURI, + TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

git:master:17d6a880: keepalive: removed function name from log messages
by Daniel-Constantin Mierla 31 Aug '20

31 Aug '20

Module: kamailio Branch: master Commit: 17d6a88090e2a67f5c0b06e6aae76d629595b37e URL: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-31T12:15:00+02:00 keepalive: removed function name from log messages --- Modified: src/modules/keepalive/keepalive_core.c --- Diff: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… Patch: https://github.com/kamailio/kamailio/commit/17d6a88090e2a67f5c0b06e6aae76d6… --- diff --git a/src/modules/keepalive/keepalive_core.c b/src/modules/keepalive/keepalive_core.c index 36cf81aef1..00f40c46bf 100644 --- a/src/modules/keepalive/keepalive_core.c +++ b/src/modules/keepalive/keepalive_core.c @@ -61,7 +61,7 @@ ticks_t ka_check_timer(ticks_t ticks, struct timer_ln* tl, void* param) ka_dest = (ka_dest_t *)param; - LM_DBG("ka_check_timer dest:%.*s\n", ka_dest->uri.len, ka_dest->uri.s); + LM_DBG("dest: %.*s\n", ka_dest->uri.len, ka_dest->uri.s); if(ka_counter_del > 0 && ka_dest->counter > ka_counter_del) { return (ticks_t)(0); /* stops the timer */ @@ -104,7 +104,7 @@ static void ka_options_callback( uri.s = t->to.s + 5; uri.len = t->to.len - 8; - LM_DBG("OPTIONS-Request was finished with code %d (to %.*s)\n", ps->code, + LM_DBG("OPTIONS request was finished with code %d (to %.*s)\n", ps->code, ka_dest->uri.len, ka_dest->uri.s); //uri.len, uri.s); @@ -149,7 +149,7 @@ static void ka_run_route(sip_msg_t *msg, str *uri, char *route) return; } - LM_DBG("ka_run_route event_route[%s]\n", route); + LM_DBG("run event_route[%s]\n", route); rt = route_get(&event_rt, route); if(rt < 0 || event_rt.rlist[rt] == NULL) {

1 0

git:5.4:e9baba91: tls: proper ifdef on libssl version for tls_init_locks()
by Daniel-Constantin Mierla 30 Aug '20

30 Aug '20

Module: kamailio Branch: 5.4 Commit: e9baba91c6c7e3d1817e8a07bbabbce3a8efbe79 URL: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-30T18:05:43+02:00 tls: proper ifdef on libssl version for tls_init_locks() - avoid compile warning on unused label (cherry picked from commit 60bd3aa284a5d9eb117a9763aa590aecf276ba16) --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… Patch: https://github.com/kamailio/kamailio/commit/e9baba91c6c7e3d1817e8a07bbabbce… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..21078e82d9 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ +/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,10 +185,13 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error: tls_destroy_locks(); return -1; + +#else + return 0; +#endif }

1 0

git:master:60bd3aa2: tls: proper ifdef on libssl version for tls_init_locks()
by Daniel-Constantin Mierla 30 Aug '20

30 Aug '20

Module: kamailio Branch: master Commit: 60bd3aa284a5d9eb117a9763aa590aecf276ba16 URL: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-30T18:04:04+02:00 tls: proper ifdef on libssl version for tls_init_locks() - avoid compile warning on unused label --- Modified: src/modules/tls/tls_locking.c --- Diff: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… Patch: https://github.com/kamailio/kamailio/commit/60bd3aa284a5d9eb117a9763aa590ae… --- diff --git a/src/modules/tls/tls_locking.c b/src/modules/tls/tls_locking.c index 3eb6f033a5..21078e82d9 100644 --- a/src/modules/tls/tls_locking.c +++ b/src/modules/tls/tls_locking.c @@ -140,7 +140,7 @@ unsigned long sr_ssl_id_f() /* returns -1 on error, 0 on success */ int tls_init_locks() { -/* OpenSSL is thread-safe since 1.1.0 */ +/* OpenSSL is no longer supporting to set locking callbacks since 1.1.0 */ #if OPENSSL_VERSION_NUMBER < 0x10100000L /* init "static" tls locks */ n_static_locks=CRYPTO_num_locks(); @@ -185,10 +185,13 @@ int tls_init_locks() * (only atomic_inc), fallback to the default use-locks mode * CRYPTO_set_add_lock_callback(atomic_add_f); */ -#endif return 0; error: tls_destroy_locks(); return -1; + +#else + return 0; +#endif }

1 0

git:master:564940f5: pv: new transformation {uri.duri}
by Daniel-Constantin Mierla 29 Aug '20

29 Aug '20

Module: kamailio Branch: master Commit: 564940f5ef923df7935a7b737a70e25c0d5f6a7b URL: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-29T19:45:20+02:00 pv: new transformation {uri.duri} - return uri needed for destination address (e.g., sip:host:port;transport=tcp) --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… Patch: https://github.com/kamailio/kamailio/commit/564940f5ef923df7935a7b737a70e25… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index b9eb291b99..91e9bca516 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1408,6 +1408,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_URI_PASSWD: val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; + case TR_URI_DURI: case TR_URI_SURI: if(_tr_uri.len >= TR_BUFFER_SIZE) { LM_WARN("uri too long [%.*s] (%d)\n", @@ -1435,7 +1436,7 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, memcpy(_tr_buffer, sv.s, sv.len); sv.s = _tr_buffer; sv.len++; - if(_tr_parsed_uri.user.len > 0) { + if(subtype == TR_URI_SURI && _tr_parsed_uri.user.len > 0) { memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, _tr_parsed_uri.user.len); sv.len += _tr_parsed_uri.user.len; @@ -2847,6 +2848,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { t->subtype = TR_URI_SURI; goto done; + } else if(name.len==4 && strncasecmp(name.s, "duri", 4)==0) { + t->subtype = TR_URI_DURI; + goto done; } else if(name.len==6 && strncasecmp(name.s, "params", 6)==0) { t->subtype = TR_URI_PARAMS; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index bf4c922243..d15df89057 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SURI + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_DURI, TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

git:master:4a3ad2bf: pv: new transformation {uri.suri}
by Daniel-Constantin Mierla 28 Aug '20

28 Aug '20

Module: kamailio Branch: master Commit: 4a3ad2bf58d6c18f522bb73330030403a50cafbf URL: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-28T20:42:15+02:00 pv: new transformation {uri.suri} - get the simple routing uri - keep only transport parameter, if exists --- Modified: src/modules/pv/pv_trans.c Modified: src/modules/pv/pv_trans.h --- Diff: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… Patch: https://github.com/kamailio/kamailio/commit/4a3ad2bf58d6c18f522bb7333003040… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index d07e55e719..b9eb291b99 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -1408,6 +1408,62 @@ int tr_eval_uri(struct sip_msg *msg, tr_param_t *tp, int subtype, case TR_URI_PASSWD: val->rs = (_tr_parsed_uri.passwd.s)?_tr_parsed_uri.passwd:_tr_empty; break; + case TR_URI_SURI: + if(_tr_uri.len >= TR_BUFFER_SIZE) { + LM_WARN("uri too long [%.*s] (%d)\n", + _tr_uri.len, _tr_uri.s, _tr_uri.len); + val->rs = _tr_empty; + break; + } + + tr_set_crt_buffer(); + sv.s = _tr_uri.s; + sv.len = 0; + while(sv.len<_tr_uri.len) { + if(_tr_uri.s[sv.len]==':') { + break; + } + sv.len++; + } + if(_tr_uri.s[sv.len]!=':') { + LM_WARN("uri schema not found [%.*s] (%d)\n", + _tr_uri.len, _tr_uri.s, _tr_uri.len); + val->rs = _tr_empty; + break; + } + sv.len++; + memcpy(_tr_buffer, sv.s, sv.len); + sv.s = _tr_buffer; + sv.len++; + if(_tr_parsed_uri.user.len > 0) { + memcpy(sv.s + sv.len, _tr_parsed_uri.user.s, + _tr_parsed_uri.user.len); + sv.len += _tr_parsed_uri.user.len; + sv.s[sv.len] = '@'; + sv.len++; + } + if(_tr_parsed_uri.host.len > 0) { + memcpy(sv.s + sv.len, _tr_parsed_uri.host.s, + _tr_parsed_uri.host.len); + sv.len += _tr_parsed_uri.host.len; + } + if(_tr_parsed_uri.port.len > 0) { + sv.s[sv.len] = ':'; + sv.len++; + memcpy(sv.s + sv.len, _tr_parsed_uri.port.s, + _tr_parsed_uri.port.len); + sv.len += _tr_parsed_uri.port.len; + } + if(_tr_parsed_uri.transport_val.len > 0) { + memcpy(sv.s + sv.len, ";transport=", 11); + sv.len += 11; + memcpy(sv.s + sv.len, _tr_parsed_uri.transport_val.s, + _tr_parsed_uri.transport_val.len); + sv.len += _tr_parsed_uri.transport_val.len; + } + sv.s[sv.len] = '\0'; + val->rs = sv; + break; case TR_URI_PORT: val->flags |= PV_TYPE_INT|PV_VAL_INT; val->rs = (_tr_parsed_uri.port.s)?_tr_parsed_uri.port:_tr_empty; @@ -2788,6 +2844,9 @@ char* tr_parse_uri(str* in, trans_t *t) } else if(name.len==4 && strncasecmp(name.s, "port", 4)==0) { t->subtype = TR_URI_PORT; goto done; + } else if(name.len==4 && strncasecmp(name.s, "suri", 4)==0) { + t->subtype = TR_URI_SURI; + goto done; } else if(name.len==6 && strncasecmp(name.s, "params", 6)==0) { t->subtype = TR_URI_PARAMS; goto done; diff --git a/src/modules/pv/pv_trans.h b/src/modules/pv/pv_trans.h index 6494852246..bf4c922243 100644 --- a/src/modules/pv/pv_trans.h +++ b/src/modules/pv/pv_trans.h @@ -50,7 +50,7 @@ enum _tr_uri_subtype { TR_URI_NONE=0, TR_URI_USER, TR_URI_HOST, TR_URI_PASSWD, TR_URI_PORT, TR_URI_PARAMS, TR_URI_PARAM, TR_URI_HEADERS, TR_URI_TRANSPORT, TR_URI_TTL, TR_URI_UPARAM, TR_URI_MADDR, TR_URI_METHOD, TR_URI_LR, - TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET + TR_URI_R2, TR_URI_SCHEME, TR_URI_TOSOCKET, TR_URI_SURI }; enum _tr_param_subtype { TR_PL_NONE=0, TR_PL_VALUE, TR_PL_VALUEAT, TR_PL_NAME, TR_PL_COUNT

1 0

[kamailio/kamailio] TCP : queue full, x requests queued (total handled y) (#2392)
by ThomasSevestre 28 Aug '20

28 Aug '20

Hello, Do you know what can cause this issue ? Do you need more information ? ### Description I had an issue on a kamailio instance with TLS connections. User agents where not able to register to kamailio using TLS With the follonwing setup : UDP => Kamailio => TLS Kamailio was able to route from UDP to TLS but not from TLS to UDP. ### Troubleshooting #### Log Messages Here are some unusual logs during the issue : ``` ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 27 , queue entry 0, retries 17, connection 0x7f913e1d7fd8, tcp socket 134, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 23 , queue entry 1, retries 13, connection 0x7f913e1a0eb0, tcp socket 105, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 25 , queue entry 2, retries 11, connection 0x7f913e1ada08, tcp socket 137, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 27 , queue entry 3, retries 9, connection 0x7f913e1c2cf0, tcp socket 170, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 23 , queue entry 0, retries 7, connection 0x7f913e1cb480, tcp socket 281, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 25 , queue entry 1, retries 5, connection 0x7f913e1e4b30, tcp socket 398, errno=11 (Resource temporarily unavailable) ERROR: <core> [core/tcp_main.c:3504]: send_fd_queue_run(): send_fd failed on socket 27 , queue entry 2, retries 3, connection 0x7f913e1e8ef8, tcp socket 406, errno=11 (Resource temporarily unavailable) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 1, socket 23: queue full, 304 requests queued (total handled 425) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 2, socket 25: queue full, 304 requests queued (total handled 4940) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 3, socket 27: queue full, 304 requests queued (total handled 310) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 1, socket 23: queue full, 305 requests queued (total handled 426) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 2, socket 25: queue full, 305 requests queued (total handled 4941) CRITICAL: <core> [core/tcp_main.c:4216]: send2child(): tcp child 3, socket 27: queue full, 305 requests queued (total handled 311) ``` Just before the CRITICAL log, there is this comment in sources : /* FIXME: remove after debugging */ ### Additional Information ``` 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 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 03:49:09 Jun 24 2020 with /usr/bin/gcc 5.4.0 ``` -- 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/2392

3 7

[kamailio/kamailio] pkg/kamailio/deb: libxmlrpc-c3-dev becomes libxmlrpc-core-c3-dev on debian buster (#2432)
by Karsten Horsmann 27 Aug '20

27 Aug '20

### Description Hi all, make deb on debian buster should make kamailio packages. The libxmlrpc-c3-dev seems renamed to libxmlrpc-core-c3-dev. ### Troubleshooting #### Reproduction git clone kamailio cd kamailio git checkout 5.4 make deb #### Debugging Data ``` pi@pi:~/src/kamailio (5.4=)$ make deb make -C src/ deb make[1]: Entering directory '/home/pi/src/kamailio/src' target architecture <arm6>, host architecture <arm7> making config... (cd ..; \ if [ -d debian ]; then \ dpkg-buildpackage -rfakeroot -tc -uc -us; \ rm debian; \ else \ ln -s pkg/kamailio/deb/debian debian; \ dpkg-buildpackage -rfakeroot -tc -uc -us; \ rm debian; \ fi) dpkg-buildpackage: info: source package kamailio dpkg-buildpackage: info: source version 5.4.0 dpkg-buildpackage: info: source distribution unstable dpkg-buildpackage: info: source changed by Victor Seva <vseva(a)debian.org> dpkg-buildpackage: info: host architecture armhf dpkg-source --before-build . dpkg-checkbuilddeps: error: Unmet build dependencies: libxmlrpc-c3-dev dpkg-buildpackage: warning: build dependencies/conflicts unsatisfied; aborting dpkg-buildpackage: warning: (Use -d flag to override.) make[1]: Leaving directory '/home/pi/src/kamailio/src' ``` #### Log Messages ``` (paste your log messages here) ``` #### SIP Traffic ``` (paste your sip traffic here) ``` ### Possible Solutions ``` pi@pi:~/src/kamailio (5.4-patch-libxmlrpc-core)$ git diff HEAD HEAD^ diff --git a/pkg/kamailio/deb/debian/backports/buster b/pkg/kamailio/deb/debian/backports/buster index 8ccfda1db2..82a41a8d4f 100755 --- a/pkg/kamailio/deb/debian/backports/buster +++ b/pkg/kamailio/deb/debian/backports/buster @@ -7,7 +7,7 @@ rm -rf ${DIST} cp -r debian ${DIST} # No mi_xmlrpc module -sed -i -e '/libxmlrpc-core-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \ +sed -i -e '/libxmlrpc-c3-dev/d' -e '/^Package: kamailio-xmlrpc-modules/,/^$/d' \ ${DIST}/control sed -i -e 's/ mi_xmlrpc[ ,$]*/ /' ${DIST}/rules sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ mi_xmlrpc/' ${DIST}/rules diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index a423d6c70c..52957ddabc 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -49,7 +49,7 @@ Build-Depends: libunistring-dev, libval-dev, libxml2-dev, - libxmlrpc-core-c3-dev, + libxmlrpc-c3-dev, openssl, pkg-config, python, diff --git a/utils/db_berkeley/kambdb_recover b/utils/db_berkeley/kambdb_recover deleted file mode 100755 index 88d06da872..0000000000 ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.4.0 (arm6/linux) a24d6c-dirty 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: a24d6c -dirty compiled with gcc 8.3.0 ``` * **Operating System**: ``` pi@pi:~/src/kamailio (5.4-patch-libxmlrpc-core)$ lsb_release -a No LSB modules are available. Distributor ID: Raspbian Description: Raspbian GNU/Linux 10 (buster) Release: 10 Codename: buster lsb_release -a No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster ``` -- 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/2432

3 4

git:5.4:ac56dfde: usrloc: get_udomain() - safety checks for location table name parameter
by Daniel-Constantin Mierla 27 Aug '20

27 Aug '20

Module: kamailio Branch: 5.4 Commit: ac56dfde20c5e689fb911debdd33a6155f7b130c URL: https://github.com/kamailio/kamailio/commit/ac56dfde20c5e689fb911debdd33a61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-27T12:36:11+02:00 usrloc: get_udomain() - safety checks for location table name parameter (cherry picked from commit 29dde9fea1eb21b4bb484286f7443dd32f611bd2) --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/ac56dfde20c5e689fb911debdd33a61… Patch: https://github.com/kamailio/kamailio/commit/ac56dfde20c5e689fb911debdd33a61… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index cba8ec425c..96a95fe3c9 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -792,13 +792,24 @@ int get_udomain(const char* _n, udomain_t** _d) dlist_t* d; str s; + if(_n == NULL) { + LM_ERR("null location table name\n"); + goto notfound; + } + s.s = (char*)_n; s.len = strlen(_n); + if(s.len <= 0) { + LM_ERR("empty location table name\n"); + goto notfound; + } if (find_dlist(&s, &d) == 0) { *_d = d->d; return 0; } + +notfound: *_d = NULL; return -1; }

1 0

git:master:29dde9fe: usrloc: get_udomain() - safety checks for location table name parameter
by Daniel-Constantin Mierla 27 Aug '20

27 Aug '20

Module: kamailio Branch: master Commit: 29dde9fea1eb21b4bb484286f7443dd32f611bd2 URL: https://github.com/kamailio/kamailio/commit/29dde9fea1eb21b4bb484286f7443dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-27T12:34:50+02:00 usrloc: get_udomain() - safety checks for location table name parameter --- Modified: src/modules/usrloc/dlist.c --- Diff: https://github.com/kamailio/kamailio/commit/29dde9fea1eb21b4bb484286f7443dd… Patch: https://github.com/kamailio/kamailio/commit/29dde9fea1eb21b4bb484286f7443dd… --- diff --git a/src/modules/usrloc/dlist.c b/src/modules/usrloc/dlist.c index cba8ec425c..96a95fe3c9 100644 --- a/src/modules/usrloc/dlist.c +++ b/src/modules/usrloc/dlist.c @@ -792,13 +792,24 @@ int get_udomain(const char* _n, udomain_t** _d) dlist_t* d; str s; + if(_n == NULL) { + LM_ERR("null location table name\n"); + goto notfound; + } + s.s = (char*)_n; s.len = strlen(_n); + if(s.len <= 0) { + LM_ERR("empty location table name\n"); + goto notfound; + } if (find_dlist(&s, &d) == 0) { *_d = d->d; return 0; } + +notfound: *_d = NULL; return -1; }

1 0

[kamailio/kamailio] rtpengine module not try resolve AAAA dns records (#2458)
by sergey-safarov 26 Aug '20

26 Aug '20

### Description In my environment, I use AAAA dns names without A dns records. When kamailio start, using `tcpdump` I can see only A request and does not see AAAA. In config file configred ``` dns_cache_flags = 4 ``` ### Troubleshooting #### Reproduction Configure kamailio to use rtpengine servers AAAA dns names. A dns records os not exists. #### Debugging Data None #### Log Messages None #### SIP Traffic None ### Possible Solutions I do now know ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` [root@ip-172-23-6-136 ~]# kamailio -v version: kamailio 5.5.0-dev1 (x86_64/linux) d9dd2a 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: d9dd2a compiled on 04:01:13 Aug 22 2020 with gcc 8.3.1 ``` * **Operating System**: ``` [root@ip-172-23-6-136 ~]# cat /etc/os-release NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="8" ``` -- 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/2458

1 3

git:5.4:f22d1eba: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 26 Aug '20

26 Aug '20

Module: kamailio Branch: 5.4 Commit: f22d1ebae89f15e177a791d09c36ded1184d9b67 URL: https://github.com/kamailio/kamailio/commit/f22d1ebae89f15e177a791d09c36ded… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-26T23:16:45+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_lua/README Modified: src/modules/keepalive/README Modified: src/modules/pike/README Modified: src/modules/sqlops/README Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/f22d1ebae89f15e177a791d09c36ded… Patch: https://github.com/kamailio/kamailio/commit/f22d1ebae89f15e177a791d09c36ded…

1 0

git: new commits in branch 5.4
by Daniel-Constantin Mierla 26 Aug '20

26 Aug '20

- URL: https://github.com/kamailio/kamailio/commit/12095fd3948ca776dd2d03b8efa1129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:53:20+02:00 evapi: export async_unicast() to kemi - PR #2415 (cherry picked from commit 7116c04c61cf789a371568fb593c109e195a1574) - URL: https://github.com/kamailio/kamailio/commit/c98d9e8c6687f2311f51016ed9cc2e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:53:33+02:00 app_lua: docs - note about availability of 'sr' Lua module - use KSR in the examples (cherry picked from commit 34efa83569bedb1f36c3661ee063ff6334633e4a) - URL: https://github.com/kamailio/kamailio/commit/4aeb071b26df08e1dfc902340475c07… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:53:48+02:00 xcap_server: check before going to the end of the buffer - use marcros to set and restore char for ending 0 (cherry picked from commit 6ce5c0bdf136ecffd7917f2d60093e1b2c49fa54) - URL: https://github.com/kamailio/kamailio/commit/aabb2b2cfab6dc664ebc4b3d15db0d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:54:03+02:00 db_text: free pointer in case of error (cherry picked from commit bddf16db74ea779bb01805fc2cbabfdaf8f4d62b) - URL: https://github.com/kamailio/kamailio/commit/b14b0a116791b85f2048e5fc863e50b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:54:35+02:00 Makefile.defs: get clang version only from --version output - the full version with stderr output included has a different first line on MacOS, making head -n 1 not extract the version number line (cherry picked from commit bff689cfedca70149e17b6ec3584ca9ecab71418) - URL: https://github.com/kamailio/kamailio/commit/6d79c954469082aeb8518fdcca80217… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:55:09+02:00 Makefile.defs: map gcc v10.x to 9.0+ options - detect properly the 10.x gcc version number, GH #2425 (cherry picked from commit 79e7738027a40affa4c7f606bf55a3ad0fe31bc4) - URL: https://github.com/kamailio/kamailio/commit/c783f19708bfd1d8c2334f739c8960b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:55:34+02:00 pike: docs - section for pike.list rpc command (cherry picked from commit 720e929a87c6d3ee29c316ca63886c7142320f43) - URL: https://github.com/kamailio/kamailio/commit/c8c884c4db353d4fac83752a494989e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:56:06+02:00 topoh: check if via param has the expected prefix, otherwise skip - GH #2437 (cherry picked from commit 046126b4a90090bf5b8f9b517ba5218793e6b973) - URL: https://github.com/kamailio/kamailio/commit/10af8efa9061c2f52ee1db51c4cf665… Author: Rosen Penev <rosenp(a)gmail.com> Date: 2020-08-26T22:56:42+02:00 tls: support compilation without deprecated OpenSSL APIs - GH #2428 (cherry picked from commit 234b02236b3ad13cdaf5624d11c727ad7d804747) - URL: https://github.com/kamailio/kamailio/commit/67979e07b63b574687b1924c38fabd7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:57:02+02:00 tls: added define condition on version functions - libssl 1.1 variants are not in 1.0 - following the changes by 234b02236b3ad13cdaf5624d11c727ad7d804747 (cherry picked from commit 99c6a68dea60ca745dfdfa33085bb6acbcee846a) - URL: https://github.com/kamailio/kamailio/commit/0efd0d63a8f8d7b644d0eba13552778… Author: Dmitry <dmitry.wagin(a)ya.ru> Date: 2020-08-26T22:57:48+02:00 Makefile.defs: Fixed libs option for FreeBSD (cherry picked from commit f490c4e0f5888963a01fa99fe94a464d44223199) - URL: https://github.com/kamailio/kamailio/commit/474d77b8743834a14d00ad285534cf2… Author: Yufei Tao <yufei.tao(a)syntec.co.uk> Date: 2020-08-26T22:58:42+02:00 uac: added uac_event_callback for kemi (cherry picked from commit 767d3ca88a4e4fa093a6a81a36d95d116251b578) - URL: https://github.com/kamailio/kamailio/commit/daab7955e91c4537547c89eacb7ecd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:59:03+02:00 cfgutils: exported route check functions to kemi (cherry picked from commit ecba550f5d35435adfa9c692cec8cee6cae8a77b) - URL: https://github.com/kamailio/kamailio/commit/f1d194d0d83f94a495c539436918a09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:59:13+02:00 core: kemi - exported core route function (cherry picked from commit d9dd2abeb82be8b992ddf534864b6d84594b7a47) - URL: https://github.com/kamailio/kamailio/commit/a3763403b22b21974e401929de4ef3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:59:30+02:00 keepalive: docs - documented owner parameter for add/delete functions - related to GH #2438 (cherry picked from commit 7284a61125bb0cacd1adc2289af616061df03258) - URL: https://github.com/kamailio/kamailio/commit/b5176749605808af737aca00992f549… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-26T22:59:57+02:00 topoh: remove the Via cookie when skipping topoh via event route - event route is now executed with parsed sip message to be sent out - GH #2437 (cherry picked from commit 06a1d20fdcae42c8f2130c547c6c6cf5fb6dce26) - URL: https://github.com/kamailio/kamailio/commit/05b4b85b6d977fddfd23b3c556328c5… Author: Juha Heinanen <jh(a)tutpro.com> Date: 2020-08-26T23:00:14+02:00 sqlops module: added one more sql query function return value to README (cherry picked from commit d93de03c10eb7b88024d7eb9ba85200601cf6c7a)

1 0

[kamailio/kamailio] Extend rtpengine hashing algorithms (#1986)
by Ionut Ionita 26 Aug '20

26 Aug '20

#### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] Each component has a single commit (if not, squash them into one commit) - [ ] 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #1911 #### Description  The goal was to have a different, more complex hashing algorithm that would offer a better distribution among nodes. We've seen in production that the current algorithm does not perform well under heavy load therefore we decided to add SHA1 hashing. After running performance tests we've decided that we need a cryptographic function in order to have the best results mostly when the callids have small entropy. In order to add SHA1, a new API was added in crypto module exporting a function applying SHA1 to a string. The API was used in rtpengine module over the callid. After this operation the hash was calculated as before except for applying 0xFF mask over the hash as it was done before, which restrains the power of this algorithm. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1986 -- Commit Summary -- * crypto: add exportable API and expose SHA1 hashing function * rtpengine: use SHA1 over callid for better distribution among nodes * rtpengine: add modparam to switch between legacy hashing algorithm and SHA1 * rtpengine: update README -- File Changes -- A src/modules/crypto/api.c (30) A src/modules/crypto/api.h (63) M src/modules/crypto/crypto_mod.c (2) M src/modules/crypto/crypto_uuid.c (34) M src/modules/crypto/crypto_uuid.h (8) M src/modules/rtpengine/doc/rtpengine_admin.xml (25) M src/modules/rtpengine/rtpengine.c (53) M src/modules/rtpengine/rtpengine.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1986.patch https://github.com/kamailio/kamailio/pull/1986.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/1986

5 6

[kamailio/kamailio] redis_cmd with more than 3 %s insertions causes parse error (#2457)
by Daniel I Greenwald 26 Aug '20

26 Aug '20

### Description  ### Troubleshooting 3 insertions works: `redis_cmd("kam_redis", "SET %s %s-%s", "test_key", "foo", "bar", "r");` 4 does not: `redis_cmd("kam_redis", "SET %s %s-%s-%s", "test_key", "foo", "bar", "bar2", "r");` #### Reproduction add this to cfg, run `kamailio -c` `redis_cmd("kam_redis", "SET %s %s-%s-%s", "test_key", "foo", "bar", "bar2", "r");` #### Log Messages ``` 0(30690) CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 433, column 83: Too many arguments 0(30690) CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 433, column 83: '('')' expected (function call) 0(30690) CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 433, column 83: bad command: missing ';'? 0(30690) ERROR: <core> [core/cfg.y:3363]: yyparse(): function used inside params of another function: xlog 0(30690) CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 435, column 9: use of function execution inside params not allowed ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: unknown compiled with gcc 5.4.0 root@vagrant-ubuntu-xenial-64 ``` * **Operating System**: Ubuntu 16.04 -- 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/2457

2 2

[kamailio/kamailio] redis_cmd with more than two %s insertions creates parse errors (#2456)
by Daniel I Greenwald 25 Aug '20

25 Aug '20

### Description Add a redis_cmd() call with more than two %s insertions. Kamailio throws parse errors at startup. See below for example and log messages. ### Troubleshooting This line works fine: `redis_cmd("kam_redis", "SET %s %s-bar, "test_key", "foo" "r");` This one does not: `redis_cmd("kam_redis", "SET %s %s-%s, "test_key", "foo", "bar, "r");` #### Reproduction Add a line like this: `redis_cmd("kam_redis", "SET %s %s-%s, "test_key", "foo", "bar, "r");` #### Log Messages ``` 2020-08-13T16:39:05.468806+00:00,vagrant-ubuntu-xenial-64: CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 424, column 117: Too many arguments 2020-08-13T16:39:05.472800+00:00,vagrant-ubuntu-xenial-64: CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 424, column 117: '('')' expected (function call) 2020-08-13T16:39:05.473289+00:00,vagrant-ubuntu-xenial-64: CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 424, column 117: bad command: missing ';'? 2020-08-13T16:39:05.473927+00:00,vagrant-ubuntu-xenial-64: ERROR: <core> [core/cfg.y:3363]: yyparse(): function used inside params of another function: xlog 2020-08-13T16:39:05.475417+00:00,vagrant-ubuntu-xenial-64: CRITICAL: <core> [core/cfg.y:3517]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 426, column 9: use of function execution inside params not allowed` ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.2.7 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, 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 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: unknown compiled with gcc 5.4.0 ``` I have confirmed the issue with the available later version packages as well. * **Operating System**: Ubuntu 16.04 -- 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/2456

2 3

[kamailio/kamailio] db_redis: Failed to allocate memory for match pattern (#2441)
by sergey-safarov 25 Aug '20

25 Aug '20

### Description I want to start Kamailio with this config ``` loadmodule "db_redis.so" loadmodule "permissions.so" loadmodule "rtpengine.so" #loadmodule "permissions.so" modparam("db_redis", "keys", "address=entry:id") modparam("permissions", "db_url", "redis://127.0.0.1:6379/1"); modparam("rtpengine", "db_url", "redis://127.0.0.1:6379/1") listen = udp:eth0:5060 ``` When start Kamailio I get this error ```sh [root@ip-172-22-6-111 kamailio]# kamailio -DD -E Listening on udp: 172.22.6.111:5060 Aliases: udp: ip-172-22-6-111.us-west-1.compute.internal:5060 0(54483) ERROR: db_redis [redis_dbase.c:951]: db_redis_scan_query_keys(): Failed to allocate memory for match pattern 0(54483) ERROR: db_redis [redis_dbase.c:1471]: db_redis_perform_query(): failed to scan query keys 0(54483) ERROR: db_redis [redis_dbase.c:1607]: db_redis_perform_query(): failed to perform the query 0(54483) ERROR: db_redis [redis_dbase.c:2397]: db_redis_query(): failed to do the query 0(54483) ERROR: rtpengine [rtpengine_db.c:90]: rtpp_load_db(): error while running db query 0(54483) ERROR: rtpengine [rtpengine.c:1628]: mod_init(): error while loading rtpengine instances from database 0(54483) ERROR: <core> [core/sr_module.c:871]: init_mod(): Error while initializing module rtpengine (/usr/lib64/kamailio/modules/rtpengine.so) ERROR: error while initializing modules 0(54483) ERROR: rtpengine [rtpengine_hash.c:134]: rtpengine_hash_table_destroy(): NULL rtpengine_hash_table ``` ### Troubleshooting When swap order load of `rtpengine` and `permissions`, then Kmailio will start properly #### Reproduction Install redis server on hosts and start kamailio with config above. #### Debugging Data None #### Log Messages ``` 0(54469) DEBUG: db_redis [redis_connection.c:119]: db_redis_connect(): connecting to redis at 127.0.0.1:6379 0(54469) DEBUG: db_redis [redis_connection.c:172]: db_redis_connect(): connection opened to redis://127.0.0.1:6379/1 0(54469) DEBUG: db_redis [redis_connection.c:197]: db_redis_connect(): connection opened to redis://127.0.0.1:6379/1 0(54469) DEBUG: db_redis [redis_connection.c:258]: db_redis_new_connection(): connection opened to redis://127.0.0.1:6379/1 0(54469) DEBUG: db_redis [redis_dbase.c:2319]: db_redis_query(): querying prefix (table) 'version' 0(54469) DEBUG: db_redis [redis_dbase.c:188]: db_redis_return_version(): get table version 0(54469) DEBUG: <core> [db_res.c:119]: db_new_result(): allocate 56 bytes for result set at 0x7fa9e646d228 0(54469) DEBUG: <core> [db_res.c:188]: db_allocate_rows(): allocate 16 bytes for rows at 0x7fa9e646d2c8 0(54469) DEBUG: <core> [db_res.c:156]: db_allocate_columns(): allocate 8 bytes for result names at 0x7fa9e646d340 0(54469) DEBUG: <core> [db_res.c:167]: db_allocate_columns(): allocate 4 bytes for result types at 0x7fa9e646d3b0 0(54469) DEBUG: <core> [db_row.c:117]: db_allocate_row(): allocate 32 bytes for row values at 0x7fa9e646d420 0(54469) DEBUG: db_redis [redis_dbase.c:228]: db_redis_return_version(): returning short-cut table version 1 for table 'rtpengine' 0(54469) DEBUG: db_redis [redis_dbase.c:2826]: db_redis_free_result(): perform redis free result 0(54469) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 1 columns 0(54469) DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7fa9e646d340 0(54469) DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7fa9e646d3b0 0(54469) DEBUG: <core> [db_res.c:52]: db_free_rows(): freeing 1 rows 0(54469) DEBUG: <core> [db_row.c:95]: db_free_row(): freeing row values at 0x7fa9e646d420 0(54469) DEBUG: <core> [db_res.c:60]: db_free_rows(): freeing rows at 0x7fa9e646d2c8 0(54469) DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fa9e646d228 0(54469) DEBUG: db_redis [redis_dbase.c:2319]: db_redis_query(): querying prefix (table) 'rtpengine' 0(54469) DEBUG: db_redis [redis_dbase.c:2370]: db_redis_query(): no columns given to build query keys, falling back to full table scan 0(54469) DEBUG: <core> [db_res.c:119]: db_new_result(): allocate 56 bytes for result set at 0x7fa9e646d298 0(54469) DEBUG: <core> [db_res.c:156]: db_allocate_columns(): allocate 32 bytes for result names at 0x7fa9e646d338 0(54469) DEBUG: <core> [db_res.c:167]: db_allocate_columns(): allocate 16 bytes for result types at 0x7fa9e646d3c0 0(54469) DEBUG: db_redis [redis_dbase.c:1466]: db_redis_perform_query(): loading full table: 'rtpengine 0(54469) ERROR: db_redis [redis_dbase.c:951]: db_redis_scan_query_keys(): Failed to allocate memory for match pattern 0(54469) ERROR: db_redis [redis_dbase.c:1471]: db_redis_perform_query(): failed to scan query keys 0(54469) ERROR: db_redis [redis_dbase.c:1607]: db_redis_perform_query(): failed to perform the query 0(54469) DEBUG: db_redis [redis_dbase.c:2826]: db_redis_free_result(): perform redis free result 0(54469) DEBUG: <core> [db_res.c:79]: db_free_columns(): freeing 4 columns 0(54469) DEBUG: <core> [db_res.c:96]: db_free_columns(): freeing result names at 0x7fa9e646d338 0(54469) DEBUG: <core> [db_res.c:101]: db_free_columns(): freeing result types at 0x7fa9e646d3c0 0(54469) DEBUG: <core> [db_res.c:138]: db_free_result(): freeing result set at 0x7fa9e646d298 0(54469) ERROR: db_redis [redis_dbase.c:2397]: db_redis_query(): failed to do the query 0(54469) ERROR: rtpengine [rtpengine_db.c:90]: rtpp_load_db(): error while running db query 0(54469) DEBUG: db_redis [redis_dbase.c:66]: db_redis_close(): closing redis db connection 0(54469) DEBUG: <core> [db_pool.c:100]: pool_remove(): removing connection from the pool 0(54469) DEBUG: db_redis [redis_connection.c:279]: db_redis_free_connection(): freeing db_redis connection 0(54469) ERROR: rtpengine [rtpengine.c:1628]: mod_init(): error while loading rtpengine instances from database 0(54469) ERROR: <core> [core/sr_module.c:871]: init_mod(): Error while initializing module rtpengine (/usr/lib64/kamailio/modules/rtpengine.so) ERROR: error while initializing modules 0(54469) ERROR: rtpengine [rtpengine_hash.c:134]: rtpengine_hash_table_destroy(): NULL rtpengine_hash_table 0(54469) DEBUG: rtpengine [rtpengine.c:2056]: mod_destroy(): rtpengine_hash_table_destroy() success! 0(54469) DEBUG: db_redis [db_redis_mod.c:114]: mod_destroy(): module destroying 0(54469) INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized 0(54469) DEBUG: <core> [core/mem/shm.c:288]: shm_destroy_manager(): destroying memory manager: q_malloc 0(54469) DEBUG: <core> [core/mem/q_malloc.c:1185]: qm_shm_lock_destroy(): destroying the shared memory lock 0(54469) DEBUG: <core> [core/mem/pkg.c:97]: pkg_destroy_manager(): destroying memory manager: q_malloc ``` #### SIP Traffic None ### Possible Solutions Not know ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0-dev1 (x86_64/linux) 57e63d 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: 57e63d compiled on 04:01:10 Aug 11 2020 with gcc 8.3.1 ``` * **Operating System**: ``` NAME="CentOS Linux" VERSION="8 (Core)" ID="centos" ID_LIKE="rhel fedora" VERSION_ID="8" PLATFORM_ID="platform:el8" PRETTY_NAME="CentOS Linux 8 (Core)" ANSI_COLOR="0;31" CPE_NAME="cpe:/o:centos:centos:8" HOME_URL="https://www.centos.org/" BUG_REPORT_URL="https://bugs.centos.org/" CENTOS_MANTISBT_PROJECT="CentOS-8" CENTOS_MANTISBT_PROJECT_VERSION="8" REDHAT_SUPPORT_PRODUCT="centos" REDHAT_SUPPORT_PRODUCT_VERSION="8" ``` -- 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/2441

3 9

git:master:a29415d6: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 25 Aug '20

25 Aug '20

Module: kamailio Branch: master Commit: a29415d6c6cc5550061720c57a24dee17e6804f0 URL: https://github.com/kamailio/kamailio/commit/a29415d6c6cc5550061720c57a24dee… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-08-25T19:16:20+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/a29415d6c6cc5550061720c57a24dee… Patch: https://github.com/kamailio/kamailio/commit/a29415d6c6cc5550061720c57a24dee… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index 7d68e3b63b..b2c74a2fb9 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -211,6 +211,8 @@ modparam("sqlops", "connect_mode", 1) * -1 - error in parameters or query execution * 1 - query successful, at least one row in resultset (for SELECTs) * 2 - query successful, no rows returned + 3 - query successful, at least one row returned, but result + parameter was not given 4.1. sql_query(connection, query[, result])

1 0

[kamailio/kamailio] sqlops sql_query() function result value has not been documented in README (#2454)
by juha-h 25 Aug '20

25 Aug '20

README should tell that: - 1 is returned when query succeeds and result set is not empty - 2 is returned when query succeeds but result set is not empty - 3 is returned when result set is not empty, but result param was not given - -1 is returned in case of error -- 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/2454

2 3

git:master:d93de03c: sqlops module: added one more sql query function return value to README
by Juha Heinanen 25 Aug '20

25 Aug '20

Module: kamailio Branch: master Commit: d93de03c10eb7b88024d7eb9ba85200601cf6c7a URL: https://github.com/kamailio/kamailio/commit/d93de03c10eb7b88024d7eb9ba85200… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2020-08-25T20:11:59+03:00 sqlops module: added one more sql query function return value to README --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d93de03c10eb7b88024d7eb9ba85200… Patch: https://github.com/kamailio/kamailio/commit/d93de03c10eb7b88024d7eb9ba85200… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index aaec64f302..671fe79858 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -237,6 +237,10 @@ modparam("sqlops", "connect_mode", 1) <para> <emphasis>2</emphasis> - query successful, no rows returned </para> + <para> + <emphasis>3</emphasis> - query successful, at least one row + returned, but result parameter was not given + </para> </listitem> </itemizedlist> <section>

1 0

[kamailio/kamailio] coredump: dmq_usrloc sync from node in "status: disabled" (#2451)
by marcinkowalczyk 25 Aug '20

25 Aug '20

### Description I'm running two kamailio registrars with dmq replication ``` modparam("usrloc", "db_mode", 0) modparam("usrloc", "use_domain", 1) loadmodule "dmq.so" modparam("dmq", "server_address", "sip:own_ip:5062" ) modparam("dmq", "notification_address", "sip:peer_ip:5062") modparam("dmq", "ping_interval", 15) modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "usrloc_delete", 1) ``` Replication works fine I can see contacts on both registrars. Problem starts when I try to restart one of regsitrars, than another one crashes just after tries to sync with first one. I did some more investigation and if 1st node starts when he is still in "active" status in DMQ donor node will crash. ``` # kamcmd dmq.list_nodes { host: 10.0.210.67 port: 5062 resolved_ip: 10.0.210.67 status: disabled last_notification: 0 local: 0 } { host: 10.0.210.58 port: 5062 resolved_ip: 10.0.210.58 status: active last_notification: 0 local: 1 } ``` If 1st node will be down for bit longer time (so DMQ marks is as pending) crash will not happen and sync will be successfull. ``` # kamcmd dmq.list_nodes { host: 10.0.210.67 port: 5062 resolved_ip: 10.0.210.67 status: pending last_notification: 0 local: 0 } { host: 10.0.210.58 port: 5062 resolved_ip: 10.0.210.58 status: active last_notification: 0 local: 1 } ``` ### Troubleshooting #### Reproduction restart one of nodes in time when all cluster members are in active state #### Debugging Da ``` [root /]# gdb /usr/sbin/kamailio /core.50795 GNU gdb (GDB) Red Hat Enterprise Linux 7.6.1-119.el7 Copyright (C) 2013 Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html> This is free software: you are free to change and redistribute it. There is NO WARRANTY, to the extent permitted by law. Type "show copying" and "show warranty" for details. This GDB was configured as "x86_64-redhat-linux-gnu". For bug reporting instructions, please see: <http://www.gnu.org/software/gdb/bugs/>... Reading symbols from /usr/sbin/kamailio...Reading symbols from /usr/sbin/kamailio...(no debugging symbols found)...done. (no debugging symbols found)...done. [New LWP 50795] [Thread debugging using libthread_db enabled] Using host libthread_db library "/lib64/libthread_db.so.1". Core was generated by `/usr/sbin/kamailio -DD -P /run/kamailio/kamailio.pid -f /etc/kamailio/kamailio.'. Program terminated with signal 11, Segmentation fault. #0 0x00007f7027eaca38 in usrloc_dmq_send_contact () from /usr/lib64/kamailio/modules/dmq_usrloc.so Missing separate debuginfos, use: debuginfo-install kamailio-5.4.0-0.el7.centos.x86_64 (gdb) backtrace #0 0x00007f7027eaca38 in usrloc_dmq_send_contact () from /usr/lib64/kamailio/modules/dmq_usrloc.so #1 0x00007f7027ea29de in usrloc_get_all_ucontact () from /usr/lib64/kamailio/modules/dmq_usrloc.so #2 0x00007f7027ea5e3c in usrloc_dmq_execute_action () from /usr/lib64/kamailio/modules/dmq_usrloc.so #3 0x00007f7027ea8937 in usrloc_dmq_handle_msg () from /usr/lib64/kamailio/modules/dmq_usrloc.so #4 0x00007f7028c43b88 in worker_loop () from /usr/lib64/kamailio/modules/dmq.so #5 0x00007f7028c41304 in child_init () from /usr/lib64/kamailio/modules/dmq.so #6 0x000000000057c313 in init_mod_child () #7 0x000000000057bf88 in init_mod_child () #8 0x000000000057bf88 in init_mod_child () #9 0x000000000057bf88 in init_mod_child () #10 0x000000000057bf88 in init_mod_child () #11 0x000000000057bf88 in init_mod_child () #12 0x000000000057bf88 in init_mod_child () #13 0x000000000057cab2 in init_child () #14 0x000000000042ab0d in main_loop () #15 0x0000000000433a76 in main () (gdb) bt full #0 0x00007f7027eaca38 in usrloc_dmq_send_contact () from /usr/lib64/kamailio/modules/dmq_usrloc.so No symbol table info available. #1 0x00007f7027ea29de in usrloc_get_all_ucontact () from /usr/lib64/kamailio/modules/dmq_usrloc.so No symbol table info available. #2 0x00007f7027ea5e3c in usrloc_dmq_execute_action () from /usr/lib64/kamailio/modules/dmq_usrloc.so No symbol table info available. #3 0x00007f7027ea8937 in usrloc_dmq_handle_msg () from /usr/lib64/kamailio/modules/dmq_usrloc.so No symbol table info available. #4 0x00007f7028c43b88 in worker_loop () from /usr/lib64/kamailio/modules/dmq.so No symbol table info available. #5 0x00007f7028c41304 in child_init () from /usr/lib64/kamailio/modules/dmq.so No symbol table info available. #6 0x000000000057c313 in init_mod_child () No symbol table info available. #7 0x000000000057bf88 in init_mod_child () No symbol table info available. #8 0x000000000057bf88 in init_mod_child () No symbol table info available. #9 0x000000000057bf88 in init_mod_child () No symbol table info available. #10 0x000000000057bf88 in init_mod_child () No symbol table info available. #11 0x000000000057bf88 in init_mod_child () No symbol table info available. #12 0x000000000057bf88 in init_mod_child () No symbol table info available. #13 0x000000000057cab2 in init_child () No symbol table info available. #14 0x000000000042ab0d in main_loop () No symbol table info available. #15 0x0000000000433a76 in main () No symbol table info available. (gdb) quit [root /]# ``` #### Log Messages ``` Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53012]: ALERT: <core> [main.c:777]: handle_sigs(): child process 53050 exited by a signal 11 Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53012]: ALERT: <core> [main.c:780]: handle_sigs(): core was not generated Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53012]: INFO: <core> [main.c:802]: handle_sigs(): terminating due to SIGCHLD Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53021]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53014]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53022]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53013]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53023]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53024]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53018]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53028]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53025]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53031]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53026]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53032]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53027]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53035]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53047]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53054]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53038]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53053]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53045]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53057]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53079]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53072]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53033]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53074]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53070]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53077]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53056]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53019]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53036]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53040]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53075]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53043]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53041]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53030]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53020]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53052]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53029]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53015]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53017]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received Aug 20 11:18:08 10.0.210.58 kamailio-dispatcher[53016]: INFO: <core> [main.c:857]: sig_usr(): signal 15 received ``` #### SIP Traffic ### Possible Solutions shared db sync ### Additional Information ``` # kamailio -v version: kamailio 5.4.0 (x86_64/linux) 6c4fce 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 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: 6c4fce compiled on 17:15:32 Jul 29 2020 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.8.2003 (Core) 3.10.0-1127.18.2.el7.x86_64 #1 SMP Sun Jul 26 15:27:06 UTC 2020 x86_64 x86_64 x86_64 GNU/Linux ``` -- 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/2451

2 7

[kamailio/kamailio] Usrloc race condition when db_mode is set to 2 (#2455)
by VolodyaIvanets 24 Aug '20

24 Aug '20

Hello! There is a ```delete from `location` where `expires`<'XYZ' AND `expires`<>'1970-01-01 03:00:00'``` query that runs before every time when insert, update or delete for location table is executed. The last query from the provided example was unsuccessful before the second last query deleted the corresponding record. The test was made on the Kamailio v5.4.0. Usrloc module configuration is: ``` modparam("usrloc", "db_url", DATABASE_URL) modparam("usrloc", "timer_interval", 10) modparam("usrloc", "db_mode", 2) modparam("usrloc", "nat_bflag", FLB_NATB) modparam("usrloc", "db_timer_clean", 1) ``` The test phone I was using - Zoiper softphone updates registration 5 seconds before the expiration. The first registration was at 15:04:43. The following update was at 15:05:38. Following DB queries were executed: ``` 529486 Query delete from `location` where `expires`<'2020-08-24 15:04:45' AND `expires`<>'1970-01-01 03:00:00' 529485 Query insert into `location` (`username`,`contact`,`expires`,`q`,`callid`,`cseq`,`flags`,`cflags`,`user_agent`,`received`,`socket`,`last_modified`,`ruid`,`reg_id`,`server_id`,`connection_id`,`keepalive`,`partition` ) values ('300-test','sip:300-test@192.168.0.105:56022;rinstance=5dd76a9c6cb94169;transport=tcp','2020-08-24 15:05:43',-1.000000,'DQzsJiW2Cpjs66s88IkOMQ..',2,0,0,'Z 3.15.40006 rv2.8.20','sip:XXX.XXX.XXX.XXX:56317;transport=tcp','tcp:172.16.30.216:5060','2020-08-24 15:04:43','uloc-5f43acc8-1f59-1',0,0,1,0,0) 529486 Query delete from `location` where `expires`<'2020-08-24 15:04:55' AND `expires`<>'1970-01-01 03:00:00' 529486 Query delete from `location` where `expires`<'2020-08-24 15:05:05' AND `expires`<>'1970-01-01 03:00:00' 529486 Query delete from `location` where `expires`<'2020-08-24 15:05:15' AND `expires`<>'1970-01-01 03:00:00' 529486 Query delete from `location` where `expires`<'2020-08-24 15:05:25' AND `expires`<>'1970-01-01 03:00:00' 529486 Query delete from `location` where `expires`<'2020-08-24 15:05:35' AND `expires`<>'1970-01-01 03:00:00' 529486 Query delete from `location` where `expires`<'2020-08-24 15:05:45' AND `expires`<>'1970-01-01 03:00:00' 529485 Query update `location` set `expires`='2020-08-24 15:06:38',`q`=-1.000000 ,`cseq`=3,`flags`=0,`cflags`=0,`user_agent`='Z 3.15.40006 rv2.8.20',`received`='sip:XXX.XXX.XXX.XXX:56317;transport=tcp',`path`=NULL,`socket`='tcp:172.16.30.216:5060',`methods`=NULL,`last_modified`='2020-08-24 15:05:38',`callid`='DQzsJiW2Cpjs66s88IkOMQ..',`instance`=NULL,`reg_id`=0,`server_id`=0,`connection_id`=1,`keepalive`=0,`contact`='sip:300-test@192.168.0.105:56022;rinstance=5dd76a9c6cb94169;transport=tcp' where `ruid`='uloc-5f43acc8-1f59-1' ``` Reducing timer_interval value to 3 seconds corrected the behavior for me. But is it possible to run ```delete from `location` where `expires`<'XYZ' AND `expires`<>'1970-01-01 03:00:00'``` query not before but after queries that manage particular registrations are executed? Thank you! -- 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/2455

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev