- sr-dev - kamailio.org

git:5.5:5dbf99eb: ndb_redis: fix SIGSEGV in redisc_check_auth
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: 5.5 Commit: 5dbf99eb03aba76905aa926a55aedd3caa0fcd05 URL: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:30:30+02:00 ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. (cherry picked from commit c32a0be89cc92a0649277774d1e7aebf349b8b49) --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… Patch: https://github.com/kamailio/kamailio/commit/5dbf99eb03aba76905aa926a55aedd3… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index befb69ab79..bb6adc20b1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1269,6 +1269,10 @@ int redisc_check_auth(redisc_server_t *rsrv, char *pass) int retval = 0; reply = redisCommand(rsrv->ctxRedis, "AUTH %s", pass); + if(!reply) { + LM_ERR("Redis authentication error\n"); + return -1; + } if (reply->type == REDIS_REPLY_ERROR) { LM_ERR("Redis authentication error\n"); retval = -1;

1 0

git:master:34b61d3f: tm: skip body operation on empty string for uac building
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7 URL: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:25:29+02:00 tm: skip body operation on empty string for uac building --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… Patch: https://github.com/kamailio/kamailio/commit/34b61d3f1d6b5a0d4425f8edfa69d70… --- diff --git a/src/modules/tm/t_msgbuilder.c b/src/modules/tm/t_msgbuilder.c index ef9b45e246..27aaef9b5f 100644 --- a/src/modules/tm/t_msgbuilder.c +++ b/src/modules/tm/t_msgbuilder.c @@ -1637,7 +1637,7 @@ char* build_uac_req(str* method, str* headers, str* body, dlg_t* dialog, memapp(w, CRLF, CRLF_LEN); } memapp(w, CRLF, CRLF_LEN); - if (body) memapp(w, body->s, body->len); + if (body && body->s && body->len>0) memapp(w, body->s, body->len); #ifdef EXTRA_DEBUG assert(w-buf == *len);

1 0

git:master:c8490703: presence: skip body operations on empty string
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: c849070371740c01f9f13a889c610de9132349f3 URL: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:27:01+02:00 presence: skip body operations on empty string --- Modified: src/modules/presence/notify.c Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… Patch: https://github.com/kamailio/kamailio/commit/c849070371740c01f9f13a889c610de… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 87ed58cff4..cf52c21c22 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -1700,7 +1700,8 @@ int send_notify_request( } /* build extra headers */ - if(build_str_hdr(subs, notify_body ? 1 : 0, &str_hdr) < 0) { + if(build_str_hdr(subs, (notify_body && notify_body->len>0) ? 1 : 0, + &str_hdr) < 0) { LM_ERR("while building headers\n"); goto error; } diff --git a/src/modules/presence/presence_dmq.c b/src/modules/presence/presence_dmq.c index 8dd7c99fe8..83a88f1aa1 100644 --- a/src/modules/presence/presence_dmq.c +++ b/src/modules/presence/presence_dmq.c @@ -303,6 +303,9 @@ int pres_dmq_handle_msg( } else if(strcmp(it->string, "body") == 0) { p_body.s = it->valuestring; p_body.len = strlen(it->valuestring); + if(p_body.len==0) { + p_body.s = NULL; + } } else { LM_ERR("unrecognized field in json object\n"); goto invalid; diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index bc17bf1074..a7629a4e92 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -737,6 +737,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, result_cols[rez_ruid_col = n_result_cols++] = &str_ruid_col; if(new_t) { + /* new_t!=0 */ LM_DBG("new presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -888,6 +889,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, *sent_reply = 1; goto send_notify; } else { + /* new_t==0 */ LM_DBG("updating existing presentity with etag %.*s\n", presentity->etag.len, presentity->etag.s); @@ -1206,7 +1208,7 @@ static int ps_db_update_presentity(sip_msg_t *msg, presentity_t *presentity, update_vals[n_update_cols].val.int_val = presentity->priority; n_update_cols++; - if(body && body->s) { + if(body && body->s && body->len>0) { update_keys[n_update_cols] = &str_body_col; update_vals[n_update_cols].type = DB1_BLOB; update_vals[n_update_cols].nul = 0; @@ -1748,7 +1750,7 @@ static int ps_cache_update_presentity(sip_msg_t *msg, presentity_t *presentity, ptc.expires = presentity->expires + (int)time(NULL); ptc.received_time = presentity->received_time; ptc.priority = presentity->priority; - if(body && body->s) { + if(body && body->s && body->len>0) { ptc.body = *body; } if(presentity->sender) {

1 0

git:master:a0a97119: usrloc: set tcp connection id to -1 for records added via rpc
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: a0a97119bef7671f33734399dc9de4562abae39c URL: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T09:11:06+02:00 usrloc: set tcp connection id to -1 for records added via rpc - cope properly with the handle_lost_tcp modparam --- Modified: src/modules/usrloc/ul_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… Patch: https://github.com/kamailio/kamailio/commit/a0a97119bef7671f33734399dc9de45… --- diff --git a/src/modules/usrloc/ul_rpc.c b/src/modules/usrloc/ul_rpc.c index d45a8e2783..6565b07d5c 100644 --- a/src/modules/usrloc/ul_rpc.c +++ b/src/modules/usrloc/ul_rpc.c @@ -678,6 +678,7 @@ static void ul_rpc_add(rpc_t* rpc, void* ctx) } ci.ruid = _ul_sruid.uid; ci.server_id = server_id; + ci.tcpconn_id = -1; lock_udomain(dom, &aor);

1 0

git:master:17a2eec2: core: parse_to_param() check for end of data on escape or start of value
by Daniel-Constantin Mierla 09 Sep '21

09 Sep '21

Module: kamailio Branch: master Commit: 17a2eec2a8e47939782c1352ddb0fa4d3e73f9d8 URL: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T09:05:54+02:00 core: parse_to_param() check for end of data on escape or start of value --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… Patch: https://github.com/kamailio/kamailio/commit/17a2eec2a8e47939782c1352ddb0fa4… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 0b8cddc8e2..99138dcaf4 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -225,6 +225,12 @@ static char *parse_to_param(char *const buffer, const char *const end, case '\\': switch(status) { case PARA_VALUE_QUOTED: + if(tmp+1>=end) { + LM_ERR("unexpected end of data in status %d - start: %p" + " - end: %p - crt: %p\n", + status, buffer, end , tmp); + goto error; + } switch(*(tmp + 1)) { case '\r': case '\n': @@ -241,6 +247,12 @@ static char *parse_to_param(char *const buffer, const char *const end, case '"': switch(status) { case S_PARA_VALUE: + if(tmp+1>=end) { + LM_ERR("unexpected end of data in status %d - start: %p" + " - end: %p - crt: %p\n", + status, buffer, end , tmp); + goto error; + } param->value.s = tmp + 1; status = PARA_VALUE_QUOTED; break;

1 0

git:master:f624e170: core: parser - free unlinked local param structure in parse_to_param()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: f624e1701088a94465a06f36a2ef27804b16ec0e URL: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T14:57:52+02:00 core: parser - free unlinked local param structure in parse_to_param() --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… Patch: https://github.com/kamailio/kamailio/commit/f624e1701088a94465a06f36a2ef278… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 604791c7b0..0b8cddc8e2 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -281,6 +281,10 @@ static char *parse_to_param(char *const buffer, const char *const end, semicolon_add_param: add_param(param, to_b, newparam); case E_PARA_VALUE: + if(newparam) { + pkg_free(newparam); + newparam = NULL; + } param = (struct to_param *)pkg_malloc( sizeof(struct to_param)); if(!param) {

1 0

git:master:bd92fb59: sca: call unsafe find entry function to avoid infinite recursion
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: bd92fb59cce183008956ff060911cc14d3dfb160 URL: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T13:30:31+02:00 sca: call unsafe find entry function to avoid infinite recursion --- Modified: src/modules/sca/sca_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… Patch: https://github.com/kamailio/kamailio/commit/bd92fb59cce183008956ff060911cc1… --- diff --git a/src/modules/sca/sca_hash.c b/src/modules/sca/sca_hash.c index 3e96bc2be5..690e9a39e5 100644 --- a/src/modules/sca/sca_hash.c +++ b/src/modules/sca/sca_hash.c @@ -205,7 +205,7 @@ sca_hash_entry *sca_hash_table_slot_kv_find_entry(sca_hash_slot *slot, str *key) sca_hash_entry *e; lock_get(&slot->lock); - e = sca_hash_table_slot_kv_find_entry(slot, key); + e = sca_hash_table_slot_kv_find_entry_unsafe(slot, key); lock_release(&slot->lock); return (e);

1 0

git:master:b86d2490: dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: b86d2490f3b96c532cbe07259786757b3ab9fc02 URL: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 dialog: rpc set state change to DLG_FLAG_CHANGED instead of DLG_FLAG_NEW --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… Patch: https://github.com/kamailio/kamailio/commit/b86d2490f3b96c532cbe07259786757… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 7e5b00425b..243bb9bd9f 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2706,7 +2706,7 @@ static void rpc_dlg_set_state(rpc_t *rpc,void *c){ dlg->init_ts = (unsigned int)(time(0)); dlg->end_ts = (unsigned int)(time(0)); } - dlg->dflags |= DLG_FLAG_NEW; + dlg->dflags |= DLG_FLAG_CHANGED; dlg_unref(dlg, unref);

1 0

git:master:d0b1d4b2: misctest: print input data in hex format
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: d0b1d4b255c2ec4ad9d7e9505b70453bc6376163 URL: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 misctest: print input data in hex format --- Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… Patch: https://github.com/kamailio/kamailio/commit/d0b1d4b255c2ec4ad9d7e9505b70453… --- diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index f942063225..c8fe64a56c 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -53,6 +53,7 @@ static void mod_destroy(void); static int misctest_memory_init(void); static int misctest_message_init(void); +int misctest_hexprint(void *data, size_t length, int linelen, int split); static int misctest_memory = 0; static int misctest_message = 0; @@ -313,7 +314,9 @@ static int misctest_message_init(void) tmsg.buf = tbuf; - LM_INFO("using data: [[%.*s]]\n", tmsg.len, tmsg.buf); + LM_INFO("using data: [[%.*s]] (%d)\n", tmsg.len, tmsg.buf, tmsg.len); + + misctest_hexprint(tmsg.buf, tmsg.len, 20, 10); if (parse_msg(tmsg.buf, tmsg.len, &tmsg) < 0) { goto cleanup; @@ -342,6 +345,90 @@ static int misctest_message_init(void) } +/** + * misctest_hexprint - output a hex dump of a buffer + * + * data - pointer to the buffer + * length - length of buffer to write + * linelen - number of chars to output per line + * split - number of chars in each chunk on a line + */ + +int misctest_hexprint(void *data, size_t length, int linelen, int split) +{ + char buffer[512]; + char *ptr; + const void *inptr; + int pos; + int remaining = length; + + inptr = data; + + if(sizeof(buffer) <= (3 + (4 * (linelen / split)) + (linelen * 4))) { + LM_ERR("buffer size is too small\n"); + return -1; + } + + while (remaining > 0) { + int lrem; + int splitcount; + ptr = buffer; + + lrem = remaining; + splitcount = 0; + for (pos = 0; pos < linelen; pos++) { + + if (split == splitcount++) { + sprintf(ptr, " "); + ptr += 2; + splitcount = 1; + } + + if (lrem) { + sprintf(ptr, "%0.2x ", *((unsigned char *) inptr + pos)); + lrem--; + } else { + sprintf(ptr, " "); + } + ptr += 3; + } + + *ptr++ = ' '; + *ptr++ = ' '; + + lrem = remaining; + splitcount = 0; + for (pos = 0; pos < linelen; pos++) { + unsigned char c; + + if (split == splitcount++) { + sprintf(ptr, " "); + ptr += 2; + splitcount = 1; + } + + if (lrem) { + c = *((unsigned char *) inptr + pos); + if (c > 31 && c < 127) { + sprintf(ptr, "%c", c); + } else { + sprintf(ptr, "."); + } + lrem--; + } + ptr++; + } + + *ptr = '\0'; + LM_INFO("%s\n", buffer); + + inptr += linelen; + remaining -= linelen; + } + + return 0; +} + /** record a memory chunk list entry. * @param addr - address of the newly allocated memory * @oaram size - size

1 0

git:master:20db418f: core: parser contact - proper update of length in skip_name()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: 20db418f1e35f31d7a90d7cabbd22ae989b7266c URL: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 core: parser contact - proper update of length in skip_name() - stop walking name also for unquoted ;, being special char - small typo --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… Patch: https://github.com/kamailio/kamailio/commit/20db418f1e35f31d7a90d7cabbd22ae… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 8c6ebdd6bb..345167022f 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -147,10 +147,10 @@ static inline int skip_name(str* _s) return 0; } - if (*p == ':') { + if (*p == ':' || *p == ';') { if (last_wsp) { - _s->s = last_wsp; _s->len -= last_wsp - _s->s + 1; + _s->s = last_wsp; } return 0; } @@ -224,7 +224,7 @@ int parse_contacts(str* _s, contact_t** _c) trim(&c->uri); if((c->uri.len <= 0) || (c->uri.s + c->uri.len > sv.s + sv.len)) { - LM_ERR("invlid contact uri\n"); + LM_ERR("invalid contact uri\n"); goto error; }

1 0

git:master:a2511df2: core: log unexpected char in parse_param2()
by Daniel-Constantin Mierla 08 Sep '21

08 Sep '21

Module: kamailio Branch: master Commit: a2511df29adc83544f047cbbdba7a8ba88272930 URL: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-08T10:00:56+02:00 core: log unexpected char in parse_param2() --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… Patch: https://github.com/kamailio/kamailio/commit/a2511df29adc83544f047cbbdba7a8b… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index 5452cbe50b..8436e0db23 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -514,7 +514,7 @@ static inline int parse_param2( goto ok; /* To be able to parse URI parameters */ if(_s->s[0] != separator) { - LM_ERR("Invalid character, %c expected\n", separator); + LM_ERR("Invalid character '%c' - expected '%c'\n", _s->s[0], separator); goto error; }

1 0

[kamailio/kamailio] JavaScript KEMI Interpreter app_jsdt module can't load file large than 128KB (#2847)
by viet0511 08 Sep '21

08 Sep '21

### Description Reload JavaScript KEMI Interpreter with file size > 128KB throw error: ``` app_jsdt [app_jsdt_api.c:447]: jsdt_kemi_load_script(): failed running: SyntaxError: parse error (line 1948, end of i nput ``` ### Troubleshooting Find out in this line 1948: in this line, file size reached 128KB Try reducing file size to lower than 128KB, it loads successfully #### Reproduction Alway failed when the file to load larger than 128KB ### Possible Solutions N/A ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.4.3 (x86_64/linux) e19ae3 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: e19ae3 compiled on 14:01:49 Jan 8 2021 with gcc 4.4.7 ``` * **Operating System**:  ``` CentOS release 6.8 (Final) ``` -- 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/2847

1 2

git:master:96656e0d: modules: readme files regenerated - xlog ... [skip ci]
by Kamailio Dev 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: 96656e0dfe66aba44ec5fceb27ce5f1e088a78a4 URL: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-07T13:16:24+02:00 modules: readme files regenerated - xlog ... [skip ci] --- Modified: src/modules/xlog/README --- Diff: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1… Patch: https://github.com/kamailio/kamailio/commit/96656e0dfe66aba44ec5fceb27ce5f1…

1 0

git:5.5:9ab3c601: textops: RFC2543 is broken
by Luis Azedo 07 Sep '21

07 Sep '21

Module: kamailio Branch: 5.5 Commit: 9ab3c60125291809ba082435a8d593f934cf76c4 URL: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:13:35+01:00 textops: RFC2543 is broken commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session (cherry picked from commit 3ee0670ee9ca5e2812fd90cccef3a7ae4e55a3b4) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… Patch: https://github.com/kamailio/kamailio/commit/9ab3c60125291809ba082435a8d593f… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 4b3216d4d2..1d15be3a7b 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4367,13 +4367,10 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - !sdp_stream->sendrecv_mode.len && - sdp_session->sendrecv_mode.len && sdp_session->is_on_hold) return sdp_session->is_on_hold; sdp_stream_num++;

1 0

[kamailio/kamailio] textops: RFC2543 is broken (#2844)
by lazedo 07 Sep '21

07 Sep '21

commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session   #### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  removed the check for `sendrecv_mode` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2844 -- Commit Summary -- * textops: RFC2543 is broken -- File Changes -- M src/modules/textops/textops.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2844.patch https://github.com/kamailio/kamailio/pull/2844.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/2844

2 2

git:master:3ee0670e: textops: RFC2543 is broken
by lazedo 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: 3ee0670ee9ca5e2812fd90cccef3a7ae4e55a3b4 URL: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:12:12+01:00 textops: RFC2543 is broken commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51 broke RFC2543 hold there's no need to check for sendrecv_mode, is_on_hold is either set or not in sdp_stream and/or sdp_session --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… Patch: https://github.com/kamailio/kamailio/commit/3ee0670ee9ca5e2812fd90cccef3a7a… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 84e93f30ed..bfb5a54941 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4517,13 +4517,10 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && - !sdp_stream->sendrecv_mode.len && - sdp_session->sendrecv_mode.len && sdp_session->is_on_hold) return sdp_session->is_on_hold; sdp_stream_num++;

1 0

[kamailio/kamailio] xlog: add prefix_mode (#2845)
by lazedo 07 Sep '21

07 Sep '21

allows pv_format specifier in prefix param   #### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  add `prefix_mode` param to xlog to optionally interpret `prefix` as a `pv_format` specifier. `config`: ``` mod_param("xlog", "prefix", "$_s([$(cfg(file):$cfg(line)] $ci $(cfg(route){s.tolower}) )") mod_param("xlog", "prefix_mode", 1) ... xlog("L_INFO", "hello") ... ``` `output:` <pre><code> 66(307) INFO: <b>[my-file.cfg:5]</b> 62795aa2-9696c27c <b>my_route</b> hello </code> </pre> You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2845 -- Commit Summary -- * xlog: add prefix_mode -- File Changes -- M src/modules/xlog/doc/xlog_admin.xml (22) M src/modules/xlog/xlog.c (46) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2845.patch https://github.com/kamailio/kamailio/pull/2845.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/2845

2 3

git:master:88e5f613: xlog: add prefix_mode
by lazedo 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: 88e5f6130a26f37e4e5dfa515ef640443bbc6873 URL: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2021-09-07T12:11:47+01:00 xlog: add prefix_mode allows pv_format specifier in prefix param --- Modified: src/modules/xlog/doc/xlog_admin.xml Modified: src/modules/xlog/xlog.c --- Diff: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… Patch: https://github.com/kamailio/kamailio/commit/88e5f6130a26f37e4e5dfa515ef6404… --- diff --git a/src/modules/xlog/doc/xlog_admin.xml b/src/modules/xlog/doc/xlog_admin.xml index 3a6b029c6e..3fcda4c105 100644 --- a/src/modules/xlog/doc/xlog_admin.xml +++ b/src/modules/xlog/doc/xlog_admin.xml @@ -165,6 +165,28 @@ modparam("xlog", "long_format", 1) ... modparam("xlog", "prefix", "-xlog: ") ... +</programlisting> + </example> + </section> + <section id="xlog.p.varname"> + <title><varname>prefix_mode</varname> (str)</title> + <para> + control behaviour of <varname>prefix</varname> value. + if mode = 0 then <varname>prefix</varname> is treated as string (current behaviour). + if mode = 1 then <varname>prefix</varname> is treated as pv_format specifier and value will be evaluated before output. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>prefix_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("xlog", "prefix", "$cfg(name):$cfg(line)") +modparam("xlog", "prefix_mode", 1) +... </programlisting> </example> </section> diff --git a/src/modules/xlog/xlog.c b/src/modules/xlog/xlog.c index ed167d80ba..ea05e51833 100644 --- a/src/modules/xlog/xlog.c +++ b/src/modules/xlog/xlog.c @@ -60,6 +60,9 @@ MODULE_VERSION char *_xlog_buf = NULL; char *_xlog_prefix = "<script>: "; +int _xlog_prefix_mode = 0; +char *_xlog_prefix_buf = NULL; +pv_elem_t *_xlog_prefix_pvs = NULL; /** parameters */ static int buf_size=4096; @@ -170,6 +173,7 @@ static param_export_t params[]={ {"log_facility", PARAM_STRING, &xlog_facility_name}, {"log_colors", PARAM_STRING|USE_FUNC_PARAM, (void*)xlog_log_colors_param}, {"methods_filter", PARAM_INT, &xlog_default_cfg.methods_filter}, + {"prefix_mode", INT_PARAM, &_xlog_prefix_mode}, {0,0,0} }; @@ -215,6 +219,27 @@ static int mod_init(void) PKG_MEM_ERROR; return -1; } + + if (_xlog_prefix_mode) { + str s; + s.s = _xlog_prefix; + s.len = strlen(s.s); + + if(pv_parse_format(&s, &_xlog_prefix_pvs)<0) + { + LM_ERR("wrong format[%s]\n", s.s); + return -1; + } + + _xlog_prefix_buf = (char*)pkg_malloc((buf_size+1)*sizeof(char)); + if(_xlog_prefix_buf==NULL) + { + PKG_MEM_ERROR; + return -1; + } + + } + return 0; } @@ -222,12 +247,23 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, int level, int line, int facility) { str txt; + char * _xlog_prefix_val = _xlog_prefix; txt.len = buf_size; + txt.s = _xlog_buf; if(xl_print_log(msg, xm->m, _xlog_buf, &txt.len)<0) return -1; - txt.s = _xlog_buf; + + if (_xlog_prefix_mode) { + str _xlog_prefix_str; + _xlog_prefix_str.s = _xlog_prefix_buf; + _xlog_prefix_str.len = buf_size; + if(pv_printf(msg, _xlog_prefix_pvs, _xlog_prefix_str.s, &_xlog_prefix_str.len) == 0 && _xlog_prefix_str.len > 0) { + _xlog_prefix_val = _xlog_prefix_buf; + } + } + /* if facility is not explicitely defined use the xlog default facility */ if (facility==NOFACILITY) { facility = xlog_facility; @@ -235,7 +271,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, if(line>0) if(long_format==1) - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%s:%d:%.*s", (xm->a)?(((xm->a->cfile)?xm->a->cfile:"")):"", (xm->a)?xm->a->cline:0, txt.len, txt.s); @@ -243,7 +279,7 @@ static inline int xlog_helper(struct sip_msg* msg, xl_msg_t *xm, LOG_FN(facility, level, _xlog_prefix, "%d:%.*s", (xm->a)?xm->a->cline:0, txt.len, txt.s); else - LOG_FN(facility, level, _xlog_prefix, + LOG_FN(facility, level, _xlog_prefix_val, "%.*s", txt.len, txt.s); return 1; } @@ -488,6 +524,10 @@ static void destroy(void) { if(_xlog_buf) pkg_free(_xlog_buf); + if(_xlog_prefix_buf) + pkg_free(_xlog_prefix_buf); + if(_xlog_prefix_pvs) + pv_elem_free_all(_xlog_prefix_pvs); } static int xdbg_fixup_helper(void** param, int param_no, int mode)

1 0

git:master:c12ddec3: modules: readme files regenerated - misctest ... [skip ci]
by Kamailio Dev 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: c12ddec36c7c321054c188eb8efdccd7bb04e168 URL: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-07T11:01:26+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd… Patch: https://github.com/kamailio/kamailio/commit/c12ddec36c7c321054c188eb8efdccd…

1 0

git:master:d6c52a6a: core: parser contact - link structure once finishing current one
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: d6c52a6afdd38cc05a67a25e55e387ad77a9ddf4 URL: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: parser contact - link structure once finishing current one --- Modified: src/core/parser/contact/contact.c --- Diff: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… Patch: https://github.com/kamailio/kamailio/commit/d6c52a6afdd38cc05a67a25e55e387a… --- diff --git a/src/core/parser/contact/contact.c b/src/core/parser/contact/contact.c index 650740b1a1..8c6ebdd6bb 100644 --- a/src/core/parser/contact/contact.c +++ b/src/core/parser/contact/contact.c @@ -262,13 +262,14 @@ int parse_contacts(str* _s, contact_t** _c) _s->len--; trim_leading(_s); + c->next = *_c; + *_c = c; + c = NULL; + if (_s->len == 0) { LM_ERR("text after comma missing\n"); goto error; } - - c->next = *_c; - *_c = c; } error:

1 0

git:master:c89d1e92: misctest: added option to perform tests for sip message
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: c89d1e922742e93913517d245686b552ded40b09 URL: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:41+02:00 misctest: added option to perform tests for sip message --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55… Patch: https://github.com/kamailio/kamailio/commit/c89d1e922742e93913517d245686b55…

1 0

git:master:d2dbe98e: core: relocate parse_contact_hader() to parser folder
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Module: kamailio Branch: master Commit: d2dbe98e072f59138b9974ab8f147bcfef5f983e URL: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-07T10:50:40+02:00 core: relocate parse_contact_hader() to parser folder --- Modified: src/core/parser/contact/parse_contact.c Modified: src/core/parser/contact/parse_contact.h Modified: src/core/select_core.c --- Diff: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… Patch: https://github.com/kamailio/kamailio/commit/d2dbe98e072f59138b9974ab8f147bc… --- diff --git a/src/core/parser/contact/parse_contact.c b/src/core/parser/contact/parse_contact.c index 37a075a17d..242c4a0756 100644 --- a/src/core/parser/contact/parse_contact.c +++ b/src/core/parser/contact/parse_contact.c @@ -228,7 +228,7 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev) } /** - * + * Parse all contact headers */ int parse_contact_headers(sip_msg_t *msg) { @@ -254,3 +254,20 @@ int parse_contact_headers(sip_msg_t *msg) return 0; } + +/** + * Parse first contact header + */ +int parse_contact_header(sip_msg_t *msg) +{ + if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 + || !msg->contact)) { + LM_DBG("bad msg or missing CONTACT header\n"); + return -1; + } + + if (msg->contact->parsed) + return 0; + + return parse_contact(msg->contact); +} diff --git a/src/core/parser/contact/parse_contact.h b/src/core/parser/contact/parse_contact.h index 4d8e1cd642..e6e38b6e9e 100644 --- a/src/core/parser/contact/parse_contact.h +++ b/src/core/parser/contact/parse_contact.h @@ -75,4 +75,9 @@ int contact_iterator(contact_t** c, struct sip_msg* msg, contact_t* prev); */ int parse_contact_headers(sip_msg_t *msg); +/* + * parse first Contact header + */ +int parse_contact_header(sip_msg_t *msg); + #endif /* PARSE_CONTACT_H */ diff --git a/src/core/select_core.c b/src/core/select_core.c index 02d393a6ba..9b6e2df2d9 100644 --- a/src/core/select_core.c +++ b/src/core/select_core.c @@ -221,18 +221,6 @@ SELECT_uri_header(from) SELECT_uri_header(refer_to) SELECT_uri_header(rpid) -int parse_contact_header( struct sip_msg *msg) -{ - if ( !msg->contact && ( parse_headers(msg,HDR_CONTACT_F,0)==-1 || !msg->contact)) { - LM_DBG("bad msg or missing CONTACT header\n"); - return -1; - } - - if (msg->contact->parsed) - return 0; - - return parse_contact(msg->contact); -} #define get_contact(msg) ((contact_body_t*)(msg->contact->parsed))

1 0

Info: Kamailio World 2021 starting soon - live stream
by Daniel-Constantin Mierla 07 Sep '21

07 Sep '21

Hello, to sync better on time, Kamailio World 2021 online edition is starting in about 2 hours from now (12:50 UTC Welcome and 13:00UTC the first session) - the agenda is available at: * https://kamailioworld.com/k09-online/ In short: participation is free, no registration is needed. The sessions are live streamed to YouTube KamailioWorld channel: * https://www.youtube.com/c/KamailioWorld/ YouTube chat next to the live stream can be used for addressing questions to speakers -- we will monitor it and ask the speaker inside the video conferencing room. For community interaction via text chatting, you can join the Matrix room #kamailio:matrix.kamailio.dev : * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev Questions for speakers can also be addressed in this chat room. If anyone wants to participate in the live video conferencing room, the URL is: * https://meet.kamailioworld.com/live Just note that we may have to limit the number of participants in the live session in order to ensure proper streaming quality. See you soon online! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

3 4

git:master:afcf3fb4: modules: readme files regenerated - misctest ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: afcf3fb4eff2cebd88d60c31f74ed952f331f729 URL: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T15:31:14+02:00 modules: readme files regenerated - misctest ... [skip ci] --- Modified: src/modules/misctest/README --- Diff: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95… Patch: https://github.com/kamailio/kamailio/commit/afcf3fb4eff2cebd88d60c31f74ed95…

1 0

git:master:bc06c9f9: misctest: added memory module parameter
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: bc06c9f9ca546a6892c9a59f10fd0a963b46c737 URL: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T15:23:17+02:00 misctest: added memory module parameter - control if it should do initialization for memory testing --- Modified: src/modules/misctest/doc/misctest_params.xml Modified: src/modules/misctest/misctest_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… Patch: https://github.com/kamailio/kamailio/commit/bc06c9f9ca546a6892c9a59f10fd0a9… --- diff --git a/src/modules/misctest/doc/misctest_params.xml b/src/modules/misctest/doc/misctest_params.xml index 9bb0a10bfa..db19e29a26 100644 --- a/src/modules/misctest/doc/misctest_params.xml +++ b/src/modules/misctest/doc/misctest_params.xml @@ -12,6 +12,25 @@ </sectioninfo> <title>Parameters</title> + <section id="misctest.p.memory"> + <title><varname>memory</varname></title> + <para> + Initialize for memory testing. Set it to 1 to prepare the memory + testing. + </para> + <para> + Default: 0 (off). + </para> + <example> + <title> + Set <varname>memory</varname> in the config file + </title> + <programlisting> +modparam("misctest", "memory", 1) + </programlisting> + </example> + </section> + <section id="misctest.p.mem_check_content"> <title><varname>mem_check_content</varname></title> <para> diff --git a/src/modules/misctest/misctest_mod.c b/src/modules/misctest/misctest_mod.c index e26320ef93..2ce3187812 100644 --- a/src/modules/misctest/misctest_mod.c +++ b/src/modules/misctest/misctest_mod.c @@ -37,6 +37,7 @@ static int mt_mem_free_f(struct sip_msg *, char *, char *); static int mod_init(void); static void mod_destroy(void); +static int misctest_memory = 0; /* clang-format off */ static cmd_export_t cmds[]={ @@ -87,6 +88,7 @@ static rpc_export_t mt_rpc[]; /* clang-format off */ static param_export_t params[]={ + {"memory", PARAM_INT, &misctest_memory}, {"mem_check_content", PARAM_INT, &default_mt_cfg.mem_check_content}, {0,0,0} }; @@ -172,21 +174,23 @@ static int mod_init(void) goto error; } - alloc_lst = shm_malloc(sizeof(*alloc_lst)); - if(alloc_lst == 0) - goto error; - alloc_lst->chunks = 0; - atomic_set_long(&alloc_lst->size, 0); - atomic_set_int(&alloc_lst->no, 0); - if(lock_init(&alloc_lst->lock) == 0) - goto error; - rndt_lst = shm_malloc(sizeof(*rndt_lst)); - if(rndt_lst == 0) - goto error; - rndt_lst->tests = 0; - atomic_set_int(&rndt_lst->last_id, 0); - if(lock_init(&rndt_lst->lock) == 0) - goto error; + if(misctest_memory!=0) { + alloc_lst = shm_malloc(sizeof(*alloc_lst)); + if(alloc_lst == 0) + goto error; + alloc_lst->chunks = 0; + atomic_set_long(&alloc_lst->size, 0); + atomic_set_int(&alloc_lst->no, 0); + if(lock_init(&alloc_lst->lock) == 0) + goto error; + rndt_lst = shm_malloc(sizeof(*rndt_lst)); + if(rndt_lst == 0) + goto error; + rndt_lst->tests = 0; + atomic_set_int(&rndt_lst->last_id, 0); + if(lock_init(&rndt_lst->lock) == 0) + goto error; + } return 0; error: return -1; @@ -195,17 +199,19 @@ static int mod_init(void) static void mod_destroy() { - if(rndt_lst) { - mem_destroy_all_tests(); - lock_destroy(&rndt_lst->lock); - shm_free(rndt_lst); - rndt_lst = 0; - } - if(alloc_lst) { - mem_unleak(-1); - lock_destroy(&alloc_lst->lock); - shm_free(alloc_lst); - alloc_lst = 0; + if(misctest_memory!=0) { + if(rndt_lst) { + mem_destroy_all_tests(); + lock_destroy(&rndt_lst->lock); + shm_free(rndt_lst); + rndt_lst = 0; + } + if(alloc_lst) { + mem_unleak(-1); + lock_destroy(&alloc_lst->lock); + shm_free(alloc_lst); + alloc_lst = 0; + } } }

1 0

git:master:01aa8666: modules/malloc_test: renamed module to misctest
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 01aa8666c1419689b009e82fc23ff12d3a165715 URL: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:52:50+02:00 modules/malloc_test: renamed module to misctest - generic name to include tests not related to memory --- Added: src/modules/misctest/Makefile Added: src/modules/misctest/README Added: src/modules/misctest/doc/Makefile Added: src/modules/misctest/doc/misctest.xml Added: src/modules/misctest/doc/misctest_functions.xml Added: src/modules/misctest/doc/misctest_params.xml Added: src/modules/misctest/doc/misctest_rpc.xml Added: src/modules/misctest/misctest_mod.c Removed: src/modules/malloc_test/Makefile Removed: src/modules/malloc_test/README Removed: src/modules/malloc_test/doc/Makefile Removed: src/modules/malloc_test/doc/malloc_test.xml Removed: src/modules/malloc_test/doc/malloc_test_functions.xml Removed: src/modules/malloc_test/doc/malloc_test_params.xml Removed: src/modules/malloc_test/doc/malloc_test_rpc.xml Removed: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12… Patch: https://github.com/kamailio/kamailio/commit/01aa8666c1419689b009e82fc23ff12…

1 0

git:master:76e6033f: core: catch empty string on parsing params
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 76e6033ff14fec0f2db0b387803b4c5815a91163 URL: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:56:36+02:00 core: catch empty string on parsing params --- Modified: src/core/parser/parse_param.c --- Diff: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… Patch: https://github.com/kamailio/kamailio/commit/76e6033ff14fec0f2db0b387803b4c5… --- diff --git a/src/core/parser/parse_param.c b/src/core/parser/parse_param.c index b80ffbdcc0..5452cbe50b 100644 --- a/src/core/parser/parse_param.c +++ b/src/core/parser/parse_param.c @@ -584,7 +584,7 @@ int parse_params2( memset(_h, 0, sizeof(param_hooks_t)); *_p = 0; - if(!_s->s) { /* no parameters at all -- we're done */ + if(!_s->s || _s->len<=0) { /* no parameters at all -- we're done */ LM_DBG("empty uri params, skipping\n"); return 0; }

1 0

git:master:5fa78d73: malloc_test: removed svn id - clang formatted code
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 5fa78d73b30cb5e221446abd63b84f90bc00927d URL: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T14:35:38+02:00 malloc_test: removed svn id - clang formatted code --- Modified: src/modules/malloc_test/malloc_test.c --- Diff: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9… Patch: https://github.com/kamailio/kamailio/commit/5fa78d73b30cb5e221446abd63b84f9…

1 0

git:master:f7690117: core: parser - ensure content lenght value does not exceed max int
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: f769011743feccde0fbca8531ab4e1b3563bf155 URL: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:51:32+02:00 core: parser - ensure content lenght value does not exceed max int --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… Patch: https://github.com/kamailio/kamailio/commit/f769011743feccde0fbca8531ab4e1b… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 34cdd40e36..ee56e09b7a 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -233,6 +233,10 @@ char* parse_content_length(char* const buffer, const char* const end, size = 0; number = 0; while (p<end && *p>='0' && *p<='9') { + if(number >= INT_MAX/10) { + LM_ERR("content lenght value is too large\n"); + goto error; + } number = number*10 + (*p)-'0'; size ++; p++;

1 0

git:master:116ef944: core: parser - free local unused param structure
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 116ef94420bf6ed9e0ae3bc08a612d8d0c4aa0a7 URL: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:21:33+02:00 core: parser - free local unused param structure --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… Patch: https://github.com/kamailio/kamailio/commit/116ef94420bf6ed9e0ae3bc08a612d8… --- diff --git a/src/core/parser/parse_addr_spec.c b/src/core/parser/parse_addr_spec.c index 8bbbdefa72..604791c7b0 100644 --- a/src/core/parser/parse_addr_spec.c +++ b/src/core/parser/parse_addr_spec.c @@ -555,6 +555,9 @@ static char *parse_to_param(char *const buffer, const char *const end, saved_status, (int)(tmp - buffer), ZSW(buffer)); goto error; } + if(newparam) { + pkg_free(newparam); + } *returned_status = saved_status; return tmp;

1 0

git:master:baed515e: core: parse content length - consider multi line header format
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: baed515e8aed8e5b505ff716eb57d0c60e582632 URL: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T13:01:55+02:00 core: parse content length - consider multi line header format - safety checks for log message when not parsing the message buffer --- Modified: src/core/parser/parse_content.c --- Diff: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… Patch: https://github.com/kamailio/kamailio/commit/baed515e8aed8e5b505ff716eb57d0c… --- diff --git a/src/core/parser/parse_content.c b/src/core/parser/parse_content.c index 007217df96..34cdd40e36 100644 --- a/src/core/parser/parse_content.c +++ b/src/core/parser/parse_content.c @@ -219,6 +219,10 @@ char* parse_content_length(char* const buffer, const char* const end, int size; p = buffer; + if(buffer>=end) { + LM_ERR("empty input buffer: %p - %p\n", buffer, end); + goto error; + } /* search the begining of the number */ while ( p<end && (*p==' ' || *p=='\t' || (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) @@ -235,20 +239,40 @@ char* parse_content_length(char* const buffer, const char* const end, } if (p==end || size==0) goto error; - /* now we should have only spaces at the end */ - while ( p<end && (*p==' ' || *p=='\t' || - (*p=='\n' && (*(p+1)==' '||*(p+1)=='\t')) )) - p++; - if (p==end) - goto error; - /* the header ends proper? */ - if ( (*(p++)!='\n') && (*(p-1)!='\r' || *(p++)!='\n' ) ) - goto error; + do { + /* only spaces till the end-of-header */ + while (p<end && (*p==' ' || *p=='\t')) p++; + if (p==end) + goto error; + /* EOH with \n or \r\n */ + if(*p=='\n') { + p++; + } else if (p+1<end && *p=='\r' && *(p+1)=='\n') { + p += 2; + } else { + /* no valid EOH */ + goto error; + } + if(p<end) { + /* multi line header body */ + if(*p==' ' || *p=='\t') { + p++; + if (p==end) + goto error; + } else { + break; + } + } + } while(p<end); *length = number; return p; error: - LM_ERR("parse error near char [%d][%c]\n", *p, *p); + if(p<end) { + LM_ERR("parse error near char [%d][%c]\n", *p, *p); + } else { + LM_ERR("parse error over the end of input: %p - %p\n", buffer, end); + } return 0; }

1 0

git:5.5:c01b0d94: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: c01b0d942b9e26e2ce0cf266abdee6eb63e8e55e URL: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:31+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… Patch: https://github.com/kamailio/kamailio/commit/c01b0d942b9e26e2ce0cf266abdee6e… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 734dc7435d..86dde8f336 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -549,17 +549,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -570,11 +570,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

1 0

git:master:f1e87166: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: f1e87166d097bde903594aecfff2e562c1496e4f URL: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-09-06T10:46:15+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… Patch: https://github.com/kamailio/kamailio/commit/f1e87166d097bde903594aecfff2e56… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 4b634e24e6..127cfa7601 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -545,17 +545,17 @@ Revoking a certificate and using a CRL require the certificate file and list of CA certificates per a regular TLS configuration. -AWS CloudHSM Example +Thales Luna Example -------------------- ... -# Example for AWS CloudHSM (SafeNet Luna) +# Example for Thales Luna modparam("tls", "engine", "gem") -modparam("tls", "engine_config", "/usr/local/etc/kamailio/luna.conf") -modparam("tls", "engine_algorithms", "ALL) +modparam("tls", "engine_config", "/usr/local/etc/kamailio/thales.cnf") +modparam("tls", "engine_algorithms", "EC") ... -/usr/local/etc/kamailio/luna.cnf is a OpenSSL config format file used to +/usr/local/etc/kamailio/thales.cnf is a OpenSSL config format file used to bootstrap the engine, e.g., pass the PIN. ... @@ -566,11 +566,12 @@ kamailio = openssl_init engines = engine_section [ engine_section ] -# gem is the name of the SafeNet Luna OpenSSL engine +# gem is the name of the Thales Luna OpenSSL engine gem = gem_section [ gem_section ] -# from SafeNet documentation +# from Thales documentation +dynamic_path = /usr/lib64/engines-1.1/gem.so ENGINE_INIT = 0:20:21:password=1234-ABCD-5678-EFGH ...

1 0

git:5.5:ad5af6d3: tls: fix OpenSSL engine in child processes
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: ad5af6d3acd648e6bd57b923083cc26d3a3d0f57 URL: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:35:01+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 (cherry picked from commit 238ef139bfbe145fb93e5c4b0730de58040d2265) --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26… Patch: https://github.com/kamailio/kamailio/commit/ad5af6d3acd648e6bd57b923083cc26…

1 0

[kamailio/kamailio] OpenSSL 1.1.1 and HSM keys incoming patches (#2839)
by aalba6675 06 Sep '21

06 Sep '21

### Description When using HSM keys (via OpenSSL engine) the engine and private keys are loaded in the child processes since PKCS#11 modules rarely survive `fork()`. With OpenSSL 1.1.1 and the call to `OPENSSL_init_ssl()` in `tls_init.c` the engine linked-list is now initialized in the master process. Subsequently the technique used in `tls_init.c:660 CONF_modules_load_file()` will fail as each child process manipulates the linked-list. Even if the engine linked-list manipulation itself is protected by global locks; traversing the linked-list will encounter invalid memory locations as the nodes are insert by other child processes. This issue is filed as a marker; I will be providing patches to change the way HSM private keys are loaded in the child process to avoid linked-list corruption. ### Troubleshooting - use soft (PEM) keys — no issue as OpenSSL engine is not relevant in this context #### Reproduction - configure TLS with OpenSSL engine key(e.g pkcs11 engine with SoftHSM keys) ### Additional Information Root cause: the function `CONF_modules_load_file()` will configure OpenSSL engines from a OpenSSL configuration file but it also adds each engine to the global linked list. Unfortunately there is no OpenSSL function to reset the linked-list in the child process. It seems to be initialized once at start-up: the linked-list head/tail pointers are static variables and their initialization is protected by OpenSSL's `RUN_ONCE` mechanism, so it doesn't seem it supported mechanism to have them reinitialized after `fork()`. -- 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/2839

2 3

[kamailio/kamailio] tls: fix OpenSSL engine in child processes (#2840)
by aalba6675 06 Sep '21

06 Sep '21

tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839   #### 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 #2839 #### Description The call to `OPENSSL_init_ssl()` in `tls_init.c` results in the creation of the engine linked-list in the parent. This affects per-child engine private keys as there is no api to reinitialize the engine linked-list in the child. This PR removes the call to `CONF_modules_load_file()` which causes linked-list corruption and replaces the initialization of engine private keys in the child with with other api calls which do not manipulate global objects. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2840 -- Commit Summary -- * tls: fix OpenSSL engine in child processes -- File Changes -- M src/modules/tls/doc/hsm_howto.xml (15) M src/modules/tls/tls_mod.c (93) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2840.patch https://github.com/kamailio/kamailio/pull/2840.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/2840

2 6

git:master:238ef139: tls: fix OpenSSL engine in child processes
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 238ef139bfbe145fb93e5c4b0730de58040d2265 URL: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:33:13+02:00 tls: fix OpenSSL engine in child processes tls_init.c calls OPENSSL_init_ssl(); this initializes the global engine linked-list and this cannot be reset in the child. To avoid linked-list corruption we manually instantiate the engine object required for loading private keys instead of relying on CONF_modules_load_file(). Updates to doc/. Addresses #2839 --- Modified: src/modules/tls/doc/hsm_howto.xml Modified: src/modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5… Patch: https://github.com/kamailio/kamailio/commit/238ef139bfbe145fb93e5c4b0730de5…

1 0

[kamailio/kamailio] tlsf is broken (#2843)
by lazedo 06 Sep '21

06 Sep '21

### Description  ### Troubleshooting #### Reproduction kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg #### Debugging Data ``` core was generated by `kamailio -c -x tlsf -f misc/examples/pkg/kamailio-basic.cfg'. Program terminated with signal SIGSEGV, Segmentation fault. #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 85 clist_insert(&ht->table[h], e, next, prev); (gdb) bt full #0 0x0000555e79902495 in str_hash_add (ht=0x555e79d6e0f0 <main_rt+16>, e=0x7f01c0521a48) at core/str_hash.h:85 h = 6 #1 0x0000555e79902e46 in route_add (rt=0x555e79d6e0e0 <main_rt>, name=0x555e79bd87be "0", i=0) at core/route.c:134 e = 0x7f01c0521a48 __func__ = "route_add" #2 0x0000555e799035f3 in init_rlist (r_name=0x555e79bd87c0 "main", rt=0x555e79d6e0e0 <main_rt>, n_entries=2, hash_size=8) at core/route.c:160 __func__ = "init_rlist" #3 0x0000555e79903647 in init_routes () at core/route.c:172 No locals. #4 0x0000555e79776eaa in main (argc=6, argv=0x7ffec006df78) at main.c:2408 cfg_stream = 0x0 c = -1 r = 0 tmp = 0x0 tmp_len = 0 port = 0 proto = 0 ahost = 0x0 aport = 0 options = 0x555e79ba60a8 ":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 = 0 rfd = 0 debug_save = 0 debug_flag = 0 dont_fork_cnt = 0 n_lst = 0x0 p = 0x0 st = {st_dev = 0, st_ino = 0, st_nlink = 0, st_mode = 0, st_uid = 0, st_gid = 0, __pad0 = 0, st_rdev = 0, st_size = 0, st_blksize = 0, st_blocks = 0, st_atim = {tv_sec = 0, tv_nsec = 0}, st_mtim = {tv_sec = 0, tv_nsec = 0}, st_ctim = {tv_sec = 0, tv_nsec = 0}, __unused = {0, 0, 0}} tbuf = '\000' <repeats 2336 times>... option_index = 0 long_options = {{name = 0x555e79ba85a6 "help", has_arg = 0, flag = 0x0, val = 104}, {name = 0x555e79ba3504 "version", has_arg = 0, flag = 0x0, val = 118}, {name = 0x555e79ba85ab "alias", has_arg = 1, flag = 0x0, val = 1024}, {name = 0x555e79ba85b1 "subst", has_arg = 1, flag = 0x0, val = 1025}, {name = 0x555e79ba85b7 "substdef", has_arg = 1, flag = 0x0, val = 1026}, {name = 0x555e79ba85c0 "substdefs", has_arg = 1, flag = 0x0, val = 1027}, {name = 0x555e79ba85ca "server-id", has_arg = 1, flag = 0x0, val = 1028}, {name = 0x555e79ba85d4 "loadmodule", has_arg = 1, flag = 0x0, val = 1029}, {name = 0x555e79ba85df "modparam", has_arg = 1, flag = 0x0, val = 1030}, {name = 0x555e79ba85e8 "log-engine", has_arg = 1, flag = 0x0, val = 1031}, {name = 0x555e79ba85f3 "debug", has_arg = 1, flag = 0x0, val = 1032}, {name = 0x555e79ba85f9 "cfg-print", has_arg = 0, flag = 0x0, val = 1033}, {name = 0x555e79ba8603 "atexit", has_arg = 1, flag = 0x0, val = 1034}, {name = 0x555e79ba860a "defenv", has_arg = 1, flag = 0x0, val = 1035}, {name = 0x0, has_arg = 0, flag = 0x0, val = 0}} __func__ = "main" (gdb) info locals h = 6 (gdb) list 80 struct str_hash_entry* e) 81 { 82 int h; 83 84 h=get_hash1_raw(e->key.s, e->key.len) % ht->size; 85 clist_insert(&ht->table[h], e, next, prev); 86 } 87 88 89 (gdb) ``` ### Possible Solutions works after reverting - ddafeebfaf1537c684eee22be228867563dd02ac - 2d7aee506c617f2d258719562f8debf2b4ba087e ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` bash-5.0# kamailio -v version: kamailio 5.5.2 (x86_64/linux) 55e232-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_BLOCKLIST, 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: 55e232 -dirty compiled on 15:08:48 Sep 5 2021 with gcc 9.3.0 ``` * **Operating System**:  ``` Alpine Docker Image 3.12 ``` -- 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/2843

2 2

git:5.5:185d8b24: Revert "core/mem: removed tlsf_malloc_bits.h"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: 185d8b24c411a38b5b2c2632abdbf90b3796fbf6 URL: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:26+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. (cherry picked from commit 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1) --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… Patch: https://github.com/kamailio/kamailio/commit/185d8b24c411a38b5b2c2632abdbf90… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

1 0

git:5.5:946ec979: Revert "core/mem: tlsf malloc - sync'ed with v3.1"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: 5.5 Commit: 946ec97950e13196926487db817abf2d1655c6b7 URL: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:31:12+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. (cherry picked from commit 39c53260599405db4626c8a691552f3aabd3448c) --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2… Patch: https://github.com/kamailio/kamailio/commit/946ec97950e13196926487db817abf2…

1 0

git:master:90f4bd59: Revert "core/mem: removed tlsf_malloc_bits.h"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 90f4bd591aba7c6fbe234df1f3868edf4ff0a9f1 URL: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:50+02:00 Revert "core/mem: removed tlsf_malloc_bits.h" This reverts commit 2d7aee506c617f2d258719562f8debf2b4ba087e. --- Added: src/core/mem/tlsf_malloc_bits.h --- Diff: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… Patch: https://github.com/kamailio/kamailio/commit/90f4bd591aba7c6fbe234df1f3868ed… --- diff --git a/src/core/mem/tlsf_malloc_bits.h b/src/core/mem/tlsf_malloc_bits.h new file mode 100644 index 0000000000..29c783d4a4 --- /dev/null +++ b/src/core/mem/tlsf_malloc_bits.h @@ -0,0 +1,119 @@ +#ifndef INCLUDED_tlsfbits +#define INCLUDED_tlsfbits + +#if defined(__cplusplus) +#define tlsf_decl inline +#else +#define tlsf_decl static +#endif + +/* +** Architecture-specific bit manipulation routines. +** +** TLSF achieves O(1) cost for malloc and free operations by limiting +** the search for a free block to a free list of guaranteed size +** adequate to fulfill the request, combined with efficient free list +** queries using bitmasks and architecture-specific bit-manipulation +** routines. +** +** Most modern processors provide instructions to count leading zeroes +** in a word, find the lowest and highest set bit, etc. These +** specific implementations will be used when available, falling back +** to a reasonably efficient generic implementation. +** +** NOTE: TLSF spec relies on ffs/fls returning value 0..31. +** ffs/fls return 1-32 by default, returning 0 for error. +*/ + +/* +** Detect whether or not we are building for a 32- or 64-bit (LP/LLP) +** architecture. There is no reliable portable method at compile-time. +*/ +#if defined (__alpha__) || defined (__ia64__) || defined (__x86_64__) \ + || defined (_WIN64) || defined (__LP64__) || defined (__LLP64__) +#define TLSF_64BIT +#endif + +/* +** gcc 3.4 and above have builtin support, specialized for architecture. +** Some compilers masquerade as gcc; patchlevel test filters them out. +** +** Note: clang is compatible with GCC builtins and will also define those macros +*/ +#if defined (__GNUC__) && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 4)) \ + && defined (__GNUC_PATCHLEVEL__) + +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return __builtin_ffs(word) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + const int bit = word ? 32 - __builtin_clz(word) : 0; + return bit - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + const int bit = size ? 64 - __builtin_clzl(size) : 0; + return bit - 1; +} +#endif +#else +/* Fall back to generic implementation. */ + +tlsf_decl int tlsf_fls_generic(unsigned int word) +{ + int bit = 32; + + if (!word) bit -= 1; + if (!(word & 0xffff0000)) { word <<= 16; bit -= 16; } + if (!(word & 0xff000000)) { word <<= 8; bit -= 8; } + if (!(word & 0xf0000000)) { word <<= 4; bit -= 4; } + if (!(word & 0xc0000000)) { word <<= 2; bit -= 2; } + if (!(word & 0x80000000)) { word <<= 1; bit -= 1; } + + return bit; +} + +/* Implement ffs in terms of fls. */ +tlsf_decl int tlsf_ffs(unsigned int word) +{ + return tlsf_fls_generic(word & (~word + 1)) - 1; +} + +tlsf_decl int tlsf_fls(unsigned int word) +{ + return tlsf_fls_generic(word) - 1; +} + +#if defined (TLSF_64BIT) +tlsf_decl int tlsf_fls_sizet(size_t size) +{ + int high = (int)(size >> 32); + int bits = 0; + if (high) + { + bits = 32 + tlsf_fls(high); + } + else + { + bits = tlsf_fls((int)size & 0xffffffff); + + } + return bits; +} +#endif /* defined (TLSF_64BIT) */ + +#endif /* GNUC */ + + +#if !defined (TLSF_64BIT) +#define tlsf_fls_sizet tlsf_fls +#endif + +#undef tlsf_decl + +#endif

1 0

git:master:39c53260: Revert "core/mem: tlsf malloc - sync'ed with v3.1"
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 39c53260599405db4626c8a691552f3aabd3448c URL: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T10:29:29+02:00 Revert "core/mem: tlsf malloc - sync'ed with v3.1" This reverts commit ddafeebfaf1537c684eee22be228867563dd02ac. --- Modified: src/core/mem/tlsf_malloc.c Modified: src/core/mem/tlsf_malloc.h --- Diff: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3… Patch: https://github.com/kamailio/kamailio/commit/39c53260599405db4626c8a691552f3…

1 0

git:master:a133a273: core: dprint - include <stdint.h> for uintmax_t
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: a133a27336fa12de01319489318fd5e042b49110 URL: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:44:10+02:00 core: dprint - include <stdint.h> for uintmax_t --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… Patch: https://github.com/kamailio/kamailio/commit/a133a27336fa12de01319489318fd5e… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 9278a701f2..4a6dac31ca 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -35,6 +35,7 @@ #include <stdarg.h> #include <stdio.h> #include <strings.h> +#include <stdint.h> #include "globals.h" #include "dprint.h"

1 0

git:master:c5e88081: core: cast pthread_self() in log - some distros makes the type opaque
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: c5e880814e3a5270583dd8032c7378cde6905813 URL: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T09:23:40+02:00 core: cast pthread_self() in log - some distros makes the type opaque --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… Patch: https://github.com/kamailio/kamailio/commit/c5e880814e3a5270583dd8032c7378c… --- diff --git a/src/core/dprint.c b/src/core/dprint.c index 1294037b7a..9278a701f2 100644 --- a/src/core/dprint.c +++ b/src/core/dprint.c @@ -720,7 +720,7 @@ void ksr_slog_json(ksr_logdata_t *kld, const char *format, ...) fprintf(stderr, KSR_SLOG_JSON_CEEFMT, iso8601buf, _tp.tv_nsec, my_pid(), #ifdef HAVE_PTHREAD - pthread_self(), + (uintmax_t)pthread_self(), #endif kld->v_lname, kld->v_mname, kld->v_fname, kld->v_fline, kld->v_func, s_out.s,

1 0

git:master:cfb5c453: app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: cfb5c453caaee341dc4ee1d9f2cdc5b1c3c87eea URL: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:21:30+02:00 app_ruby: utils/app_ruby_ctl - increade api skeleton functions to 1536 --- Modified: src/modules/app_ruby/utils/app_ruby_ctl --- Diff: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… Patch: https://github.com/kamailio/kamailio/commit/cfb5c453caaee341dc4ee1d9f2cdc5b… --- diff --git a/src/modules/app_ruby/utils/app_ruby_ctl b/src/modules/app_ruby/utils/app_ruby_ctl index e8c7109ea3..cad044f222 100755 --- a/src/modules/app_ruby/utils/app_ruby_ctl +++ b/src/modules/app_ruby/utils/app_ruby_ctl @@ -2,7 +2,7 @@ # generate the .h file -KEMI_MAX_SIZE=1024 +KEMI_MAX_SIZE=1536 cat > ../app_ruby_kemi_export.h <<EOF /**

1 0

git:master:8b128b7d: app_ruby: regenerated api skeleton functions
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 8b128b7dd544e3e30d615da39e84cec91588249a URL: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:25:24+02:00 app_ruby: regenerated api skeleton functions --- Modified: src/modules/app_ruby/app_ruby_kemi_export.c Modified: src/modules/app_ruby/app_ruby_kemi_export.h --- Diff: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec… Patch: https://github.com/kamailio/kamailio/commit/8b128b7dd544e3e30d615da39e84cec…

1 0

git:master:031fd469: core: print char code on error in parse_addr_spec()
by Daniel-Constantin Mierla 06 Sep '21

06 Sep '21

Module: kamailio Branch: master Commit: 031fd46980b34a570385f49f168b13af43d84b87 URL: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-06T08:15:58+02:00 core: print char code on error in parse_addr_spec() --- Modified: src/core/parser/parse_addr_spec.c --- Diff: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a… Patch: https://github.com/kamailio/kamailio/commit/031fd46980b34a570385f49f168b13a…

1 0

git:master:017f5d81: README.md: 20 years of development anniversary
by Daniel-Constantin Mierla 03 Sep '21

03 Sep '21

Module: kamailio Branch: master Commit: 017f5d81f05f9589bc6bcf47e94af24648efee09 URL: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-03T11:15:14+02:00 README.md: 20 years of development anniversary --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… Patch: https://github.com/kamailio/kamailio/commit/017f5d81f05f9589bc6bcf47e94af24… --- diff --git a/README.md b/README.md index ede4d1a3b2..c20510bdfd 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,8 @@ Project Website: * http://www.kamailio.org +[20 Years Of Kamailio Development: Sep 3, 2001 - Sep 3, 2021](https://www.kamailio.org/w/2021/09/kamailio-20-years-of-development/) + ## Overview Kamailio is an open source implementation of a SIP Signaling Server. SIP is an open standard protocol specified by the IETF. The core specification document is [RFC3261](https://tools.ietf.org/html/rfc3261).

1 0

[kamailio/kamailio] misc: fuzz: add msg parse fuzzer (#2842)
by DavidKorczynski 02 Sep '21

02 Sep '21

Following up on earlier work on fuzzing https://github.com/kamailio/kamailio/pull/2660 I wanted to add another fuzzer as there is still a lot more code to analyse. This fuzzer targets various parsing routines and is meant to run in the oss-fuzz infrastructure.   #### 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) - [ ] 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 - [ ] 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/2842 -- Commit Summary -- * misc: fuzz: add msg parse fuzzer -- File Changes -- A misc/fuzz/fuzz_parse_msg.c (44) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2842.patch https://github.com/kamailio/kamailio/pull/2842.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/2842

2 2

git:master:199f13a7: Merge pull request #2842 from DavidKorczynski/master
by GitHub 02 Sep '21

02 Sep '21

Module: kamailio Branch: master Commit: 199f13a7dfac8cd817850c6a6afe5ba510835418 URL: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-09-02T19:53:03+02:00 Merge pull request #2842 from DavidKorczynski/master misc: fuzz: add msg parse fuzzer --- Added: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… Patch: https://github.com/kamailio/kamailio/commit/199f13a7dfac8cd817850c6a6afe5ba… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c new file mode 100644 index 0000000000..ef656abd3a --- /dev/null +++ b/misc/fuzz/fuzz_parse_msg.c @@ -0,0 +1,44 @@ +#include "../parser/sdp/sdp.h" +#include "../parser/parse_uri.c" +#include "../parser/parse_hname2.h" +#include "../parser/contact/parse_contact.h" +#include "../parser/parse_refer_to.h" +#include "../parser/parse_ppi_pai.h" +#include "../parser/parse_privacy.h" +#include "../parser/parse_diversion.h" + +int LLVMFuzzerInitialize(int *argc, char ***argv) { + ksr_hname_init_index(); + return 0; +} + +int +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + sip_msg_t orig_inv = { }; + orig_inv.buf = (char*)data; + orig_inv.len = size; + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { + goto cleanup; + } + + parse_sdp(&orig_inv); + + parse_headers(&orig_inv, HDR_TO_F, 0); + + parse_contact_header(&orig_inv); + + parse_refer_to_header(&orig_inv); + + parse_to_header(&orig_inv); + + parse_pai_header(&orig_inv); + + parse_diversion_header(&orig_inv); + + parse_privacy(&orig_inv); + +cleanup: + free_sip_msg(&orig_inv); + + return 0; +}

1 0

git:master:1e711683: misc: fuzz: add msg parse fuzzer
by David Korczynski 02 Sep '21

02 Sep '21

Module: kamailio Branch: master Commit: 1e71168342894c992ab376bf8538c0953db31fe4 URL: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… Author: David Korczynski <david(a)adalogics.com> Committer: David Korczynski <david(a)adalogics.com> Date: 2021-09-02T16:00:29+01:00 misc: fuzz: add msg parse fuzzer this fuzzer targets various parsing routines and is meant to run in the oss-fuzz infrastructure. --- Added: misc/fuzz/fuzz_parse_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… Patch: https://github.com/kamailio/kamailio/commit/1e71168342894c992ab376bf8538c09… --- diff --git a/misc/fuzz/fuzz_parse_msg.c b/misc/fuzz/fuzz_parse_msg.c new file mode 100644 index 0000000000..ef656abd3a --- /dev/null +++ b/misc/fuzz/fuzz_parse_msg.c @@ -0,0 +1,44 @@ +#include "../parser/sdp/sdp.h" +#include "../parser/parse_uri.c" +#include "../parser/parse_hname2.h" +#include "../parser/contact/parse_contact.h" +#include "../parser/parse_refer_to.h" +#include "../parser/parse_ppi_pai.h" +#include "../parser/parse_privacy.h" +#include "../parser/parse_diversion.h" + +int LLVMFuzzerInitialize(int *argc, char ***argv) { + ksr_hname_init_index(); + return 0; +} + +int +LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) { + sip_msg_t orig_inv = { }; + orig_inv.buf = (char*)data; + orig_inv.len = size; + if (parse_msg(orig_inv.buf, orig_inv.len, &orig_inv) < 0) { + goto cleanup; + } + + parse_sdp(&orig_inv); + + parse_headers(&orig_inv, HDR_TO_F, 0); + + parse_contact_header(&orig_inv); + + parse_refer_to_header(&orig_inv); + + parse_to_header(&orig_inv); + + parse_pai_header(&orig_inv); + + parse_diversion_header(&orig_inv); + + parse_privacy(&orig_inv); + +cleanup: + free_sip_msg(&orig_inv); + + return 0; +}

1 0

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,jessie #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,jessie #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,stretch #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,stretch #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,buster #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,buster #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,bionic #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,bionic #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,xenial #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,trusty #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,trusty #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » i386,xenial #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

Jenkins build became unstable: kamailiodev-nightly-binaries » amd64,focal #2004
by kamailio＠sipwise.com 02 Sep '21

02 Sep '21

See <https://kamailio.sipwise.com/job/kamailiodev-nightly-binaries/architecture=…>

1 3

git:master:22f9e269: slack: remove error string from LM_ERR() logs
by Daniel-Constantin Mierla 01 Sep '21

01 Sep '21

Module: kamailio Branch: master Commit: 22f9e269dd68edcb025e103d9aa1432423dd5550 URL: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:39:33+02:00 slack: remove error string from LM_ERR() logs - it is added automatically in the prefix - check return of snprintf() against <0, on some OSes the man pages list negative return code on error --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… Patch: https://github.com/kamailio/kamailio/commit/22f9e269dd68edcb025e103d9aa1432… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index 906e824bee..7a046d387a 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -112,13 +112,13 @@ static int _curl_send(const char* uri, str *post_data) // LM_DBG("sending to[%s]\n", uri); datasz = snprintf(NULL, 0, BODY_FMT, slack_channel, slack_username, post_data->s, slack_icon); - if (datasz == -1) { - LM_ERR("Error: snprintf error in calculating buffer size\n"); + if (datasz < 0) { + LM_ERR("snprintf error in calculating buffer size\n"); return -1; } send_data = (char*)pkg_mallocxz((datasz+1)*sizeof(char)); if(send_data==NULL) { - LM_ERR("Error: can not allocate pkg memory [%d] bytes\n", datasz); + LM_ERR("can not allocate pkg memory [%d] bytes\n", datasz); return -1; } snprintf(send_data, datasz+1, BODY_FMT, slack_channel, slack_username, post_data->s, slack_icon); @@ -126,7 +126,7 @@ static int _curl_send(const char* uri, str *post_data) curl_global_init(CURL_GLOBAL_ALL); if((curl_handle=curl_easy_init())==NULL) { - LM_ERR("Error: Unable to init cURL library\n"); + LM_ERR("Unable to init cURL library\n"); curl_global_cleanup(); return -1; } @@ -271,7 +271,7 @@ static int ki_slack_send(sip_msg_t *msg, str *slmsg) return -1; } if(pv_printf_s(msg, xmodel, &txt)!=0) { - LM_ERR("Error: cannot eval reparsed value\n"); + LM_ERR("cannot eval reparsed value\n"); pv_elem_free_all(xmodel); return -1; }

1 0

git:master:4d7490a2: Makefile.groups: added slack module to group utils
by Daniel-Constantin Mierla 01 Sep '21

01 Sep '21

Module: kamailio Branch: master Commit: 4d7490a22256b2fdb376e2dd910ce0cc3728f0b8 URL: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:33:53+02:00 Makefile.groups: added slack module to group utils - where http_client module resides --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… Patch: https://github.com/kamailio/kamailio/commit/4d7490a22256b2fdb376e2dd910ce0c… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index aa709375bc..62a585cafb 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -77,7 +77,7 @@ mod_list_xmpp=xmpp mod_list_berkeley=db_berkeley # - modules depending on curl library -mod_list_utils=utils http_client lost +mod_list_utils=utils http_client lost slack # - modules depending on curl and libevent2 library mod_list_http_async=http_async_client

1 0

[kamailio/kamailio] slack: new module, send message to slack channel (#2838)
by Arsen Semenov 01 Sep '21

01 Sep '21

#### 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 - [X] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description this is a tiny module which provides integration with slack over webhooks. currently it exports only one function which accepts formatted string as an argument, evaluates pseudo-variables if any and sends the msg to slack channel (channel name, username and emoji are set as a module parameters). Kemi function is exported as well. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2838 -- Commit Summary -- * slack: new module, send message to slack channel -- File Changes -- A src/modules/slack/Makefile (31) A src/modules/slack/README (154) A src/modules/slack/doc/Makefile (4) A src/modules/slack/doc/slack.html (468) A src/modules/slack/doc/slack.xml (28) A src/modules/slack/doc/slack_admin.xml (175) A src/modules/slack/slack.c (298) A src/modules/slack/slack.h (58) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2838.patch https://github.com/kamailio/kamailio/pull/2838.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/2838

4 9

git:master:62ac885b: slack: fix param typo; strncpy, snprintf error check; removed pre-built html doc
by Daniel-Constantin Mierla 01 Sep '21

01 Sep '21

Module: kamailio Branch: master Commit: 62ac885b8b511c88f8bbddd5d791ba547a441374 URL: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: fix param typo; strncpy, snprintf error check; removed pre-built html doc --- Modified: src/modules/slack/Makefile Modified: src/modules/slack/doc/slack_admin.xml Modified: src/modules/slack/slack.c Removed: src/modules/slack/doc/slack.html --- Diff: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5… Patch: https://github.com/kamailio/kamailio/commit/62ac885b8b511c88f8bbddd5d791ba5…

1 0

git:master:d224cc5d: slack: allocate zeroed memory for send_data
by Daniel-Constantin Mierla 01 Sep '21

01 Sep '21

Module: kamailio Branch: master Commit: d224cc5da7858fb99db64ec26fe3bd8acb0cadfc URL: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: allocate zeroed memory for send_data --- Modified: src/modules/slack/slack.c --- Diff: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… Patch: https://github.com/kamailio/kamailio/commit/d224cc5da7858fb99db64ec26fe3bd8… --- diff --git a/src/modules/slack/slack.c b/src/modules/slack/slack.c index acb724861b..906e824bee 100644 --- a/src/modules/slack/slack.c +++ b/src/modules/slack/slack.c @@ -116,7 +116,7 @@ static int _curl_send(const char* uri, str *post_data) LM_ERR("Error: snprintf error in calculating buffer size\n"); return -1; } - send_data = (char*)pkg_malloc((datasz+1)*sizeof(char)); + send_data = (char*)pkg_mallocxz((datasz+1)*sizeof(char)); if(send_data==NULL) { LM_ERR("Error: can not allocate pkg memory [%d] bytes\n", datasz); return -1;

1 0

git:master:74cfb526: slack: new module, send message to slack channel
by Daniel-Constantin Mierla 01 Sep '21

01 Sep '21

Module: kamailio Branch: master Commit: 74cfb526ff035ab08ba13497e6657d656b690db0 URL: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6… Author: Arsen Semenov <arsperger(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-01T12:32:54+02:00 slack: new module, send message to slack channel --- Added: src/modules/slack/Makefile Added: src/modules/slack/README Added: src/modules/slack/doc/Makefile Added: src/modules/slack/doc/slack.html Added: src/modules/slack/doc/slack.xml Added: src/modules/slack/doc/slack_admin.xml Added: src/modules/slack/slack.c Added: src/modules/slack/slack.h --- Diff: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6… Patch: https://github.com/kamailio/kamailio/commit/74cfb526ff035ab08ba13497e6657d6…

1 0

Info: Tomorrow Live - Kamailio World 2021 - Online
by Daniel-Constantin Mierla 31 Aug '21

31 Aug '21

Hello, couple of details for those that want to watch live or even participate to Kamailio World Online Conference, Sep 1-2, 2021 - the schedule is available at: * https://www.kamailioworld.com/k09-online/ There is no registration required, participation is completely free. You can watch live the presentations starting with 13:00UTC (14:00 London, 15:00 Berlin/Paris/Rome/Madrid, 09:00 New York) via KamailioWorld youtube channel: * https://www.youtube.com/c/KamailioWorld If you want to participate to the live video conferencing room, the link is: * https://meet.kamailioworld.com/live It is recommended to do it only if you want to address questions and interact with the speakers, otherwise the capacity of the video conferencing system may be filled and we will have to restrict the access in order to ensure good quality for presentations. You can also address questions via youtube chat that will be available next to the live stream or Matrix room: * #kamailio:matrix.kamailio.dev * https://riot.kamailio.dev/#/room/#kamailio:matrix.kamailio.dev To interact with other community member, join the Matrix chat room. No registration is required for Matrix to join the room, however the web client at the link above does not support the guests feature, you will have to use another client application that supports it or make an account with any federated Matrix server, like the one from element.io: * https://app.element.io/#/welcome Looking forward to chatting with many of you during the next two days! Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

1 0

git:master:a2b4f695: modules: readme files regenerated - secsipid ... [skip ci]
by Kamailio Dev 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: a2b4f695326d762376d99faaa33170953dc2595f URL: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-30T11:16:15+02:00 modules: readme files regenerated - secsipid ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… Patch: https://github.com/kamailio/kamailio/commit/a2b4f695326d762376d99faaa331709… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index 945143421c..9100ef65ad 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -45,7 +45,10 @@ Daniel-Constantin Mierla 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, + origID, x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 5. Installation @@ -63,8 +66,9 @@ Daniel-Constantin Mierla 1.10. secsipid_get_url usage 1.11. secsipid_add_identity usage 1.12. secsipid_build_identity usage - 1.13. secsipid_sign usage - 1.14. Libsecsipid Usage + 1.13. secsipid_build_identity_prvkey usage + 1.14. secsipid_sign usage + 1.15. Libsecsipid Usage Chapter 1. Admin Guide @@ -97,7 +101,10 @@ Chapter 1. Admin Guide 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, + origID, x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 5. Installation @@ -232,7 +239,10 @@ modparam("secsipid", "libopt", "CacheExpires=0") 4.6. secsipid_build_identity(origTN, destTN, attest, origID, x5u, keyPath) - 4.7. secsipid_sign(sheaders, spaypload, keyPath) + 4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, origID, + x5u, keyData) + + 4.8. secsipid_sign(sheaders, spaypload, keyPath) 4.1. secsipid_check_identity(keyPath) @@ -383,7 +393,29 @@ request_route { } ... -4.7. secsipid_sign(sheaders, spaypload, keyPath) +4.7. secsipid_build_identity_prvkey(origTN, destTN, attest, origID, x5u, +keyData) + + Similar to secsipid_build_identity(), but the private key data is + provided as parameter instead to the file path. + + The parameters can contain pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.13. secsipid_build_identity_prvkey usage +... +request_route { + ... + if(secsipid_build_identity_prvkey("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "$var(prvkey)")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... + +4.8. secsipid_sign(sheaders, spaypload, keyPath) Build Identity value using the key specified by "keyPath" to sign the JWT body. The sheaders and spayload have to be string representation of @@ -395,7 +427,7 @@ request_route { This function can be used from ANY_ROUTE. - Example 1.13. secsipid_sign usage + Example 1.14. secsipid_sign usage ... request_route { ... @@ -421,7 +453,7 @@ request_route { installed and its environment configured, then run the following commands: - Example 1.14. Libsecsipid Usage + Example 1.15. Libsecsipid Usage ... export GO111MODULE=off go get https://github.com/asipto/secsipidx

1 0

git:master:c8d8e50f: secsipid: docs for secsipid_build_identity_prvkey()
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: c8d8e50fe23d3310796c8615ccce346b4522fc7c URL: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T11:05:52+02:00 secsipid: docs for secsipid_build_identity_prvkey() --- Modified: src/modules/secsipid/doc/secsipid_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… Patch: https://github.com/kamailio/kamailio/commit/c8d8e50fe23d3310796c8615ccce346… --- diff --git a/src/modules/secsipid/doc/secsipid_admin.xml b/src/modules/secsipid/doc/secsipid_admin.xml index 88c4e761db..be388c17d6 100644 --- a/src/modules/secsipid/doc/secsipid_admin.xml +++ b/src/modules/secsipid/doc/secsipid_admin.xml @@ -397,6 +397,36 @@ request_route { ... } ... +</programlisting> + </example> + </section> + <section id="secsipid.f.secsipid_build_identity_prvkey"> + <title> + <function moreinfo="none">secsipid_build_identity_prvkey(origTN, destTN, attest, origID, x5u, keyData)</function> + </title> + <para> + Similar to secsipid_build_identity(), but the private key data is + provided as parameter instead to the file path. + </para> + <para> + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>secsipid_build_identity_prvkey</function> usage</title> + <programlisting format="linespecific"> +... +request_route { + ... + if(secsipid_build_identity_prvkey("$fU", "$rU", "A", "", + "https://kamailio.org/stir/$rd/cert.pem", "$var(prvkey)")) { + xinfo("Identity value: $secsipid(val)\n"); + } + ... +} +... </programlisting> </example> </section>

1 0

git:master:f37e1837: secsipid: added function to build Identity by providing private key data
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: f37e1837ac227329849bd3ffc6729ad69f7618ab URL: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T10:58:03+02:00 secsipid: added function to build Identity by providing private key data --- Modified: src/modules/secsipid/secsipid_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad… Patch: https://github.com/kamailio/kamailio/commit/f37e1837ac227329849bd3ffc6729ad…

1 0

git:master:5a78a672: secsipid_proc: added SecSIPIDGetIdentityPrvKey to api
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: 5a78a67209bf1c170d97ce220cf204d5379b9f5f URL: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T09:00:30+02:00 secsipid_proc: added SecSIPIDGetIdentityPrvKey to api --- Modified: src/modules/secsipid_proc/secsipid_proc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… Patch: https://github.com/kamailio/kamailio/commit/5a78a67209bf1c170d97ce220cf204d… --- diff --git a/src/modules/secsipid_proc/secsipid_proc_mod.c b/src/modules/secsipid_proc/secsipid_proc_mod.c index 1054582b17..0e00483ced 100644 --- a/src/modules/secsipid_proc/secsipid_proc_mod.c +++ b/src/modules/secsipid_proc/secsipid_proc_mod.c @@ -39,6 +39,7 @@ int secsipid_proc_bind(secsipid_papi_t *papi) { papi->SecSIPIDSignJSONHP = SecSIPIDSignJSONHP; papi->SecSIPIDGetIdentity = SecSIPIDGetIdentity; + papi->SecSIPIDGetIdentityPrvKey = SecSIPIDGetIdentityPrvKey; papi->SecSIPIDCheck = SecSIPIDCheck; papi->SecSIPIDCheckFull = SecSIPIDCheckFull; papi->SecSIPIDCheckFullPubKey = SecSIPIDCheckFullPubKey;

1 0

git:master:06b99df0: secsipid: define values for mode parameter of internal function
by Daniel-Constantin Mierla 30 Aug '21

30 Aug '21

Module: kamailio Branch: master Commit: 06b99df0a6e9faa82cd53f2f51ea481277f28fe3 URL: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-30T09:00:30+02:00 secsipid: define values for mode parameter of internal function --- Modified: src/modules/secsipid/secsipid_mod.c Modified: src/modules/secsipid/secsipid_papi.h --- Diff: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… Patch: https://github.com/kamailio/kamailio/commit/06b99df0a6e9faa82cd53f2f51ea481… --- diff --git a/src/modules/secsipid/secsipid_mod.c b/src/modules/secsipid/secsipid_mod.c index 27216e1cec..3ba76a8827 100644 --- a/src/modules/secsipid/secsipid_mod.c +++ b/src/modules/secsipid/secsipid_mod.c @@ -382,6 +382,10 @@ static int w_secsipid_check(sip_msg_t *msg, char *pidentity, char *pkeypath) return ki_secsipid_check(msg, &sidentity, &keypath); } +#define SECSIPID_MODE_VALHDR (1<<0) +#define SECSIPID_MODE_VALVAR (1<<1) +#define SECSIPID_MODE_KEYPATH (1<<2) +#define SECSIPID_MODE_KEYDATA (1<<3) /** * @@ -404,7 +408,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt ibody.len = _secsipid_papi.SecSIPIDGetIdentity(origtn->s, desttn->s, attest->s, origid->s, x5u->s, keypath->s, &ibody.s); - if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { _secsipid_data.ret = ibody.len; } @@ -415,7 +419,7 @@ static int ki_secsipid_add_identity_mode(sip_msg_t *msg, str *origtn, str *destt LM_DBG("identity value: %.*s\n", ibody.len, ibody.s); - if(mode==1) { + if(mode&SECSIPID_MODE_VALVAR) { if(_secsipid_data.value.s) { free(_secsipid_data.value.s); } @@ -470,7 +474,8 @@ static int ki_secsipid_add_identity(sip_msg_t *msg, str *origtn, str *desttn, str *attest, str *origid, str *x5u, str *keypath) { return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 0); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); } /** @@ -512,7 +517,8 @@ static int w_secsipid_add_identity(sip_msg_t *msg, char *porigtn, char *pdesttn, } return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 0); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALHDR|SECSIPID_MODE_KEYPATH); } /** @@ -527,7 +533,8 @@ static int ki_secsipid_build_identity(sip_msg_t *msg, str *origtn, str *desttn, memset(&_secsipid_data, 0, sizeof(secsipid_data_t)); return ki_secsipid_add_identity_mode(msg, origtn, desttn, - attest, origid, x5u, keypath, 1); + attest, origid, x5u, keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); } /** @@ -574,7 +581,8 @@ static int w_secsipid_build_identity(sip_msg_t *msg, char *porigtn, char *pdestt } return ki_secsipid_add_identity_mode(msg, &origtn, &desttn, - &attest, &origid, &x5u, &keypath, 1); + &attest, &origid, &x5u, &keypath, + SECSIPID_MODE_VALVAR|SECSIPID_MODE_KEYPATH); } /** diff --git a/src/modules/secsipid/secsipid_papi.h b/src/modules/secsipid/secsipid_papi.h index 657f5b9cc7..d96a515ba3 100644 --- a/src/modules/secsipid/secsipid_papi.h +++ b/src/modules/secsipid/secsipid_papi.h @@ -31,6 +31,9 @@ typedef struct secsipid_papi { int (*SecSIPIDGetIdentity)(char* origTN, char* destTN, char* attestVal, char* origID, char* x5uVal, char* prvkeyPath, char** outPtr); + int (*SecSIPIDGetIdentityPrvKey)(char* origTN, char* destTN, char* attestVal, + char* origID, char* x5uVal, char* prvkeyData, char** outPtr); + int (*SecSIPIDCheck)(char* identityVal, int identityLen, int expireVal, char* pubkeyPath, int timeoutVal);

1 0

git:master:733af502: modules: readme files regenerated - mqueue ... [skip ci]
by Kamailio Dev 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 733af50276242bda54e579ace28141aedfee5014 URL: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-28T20:31:13+02:00 modules: readme files regenerated - mqueue ... [skip ci] --- Modified: src/modules/mqueue/README Modified: src/modules/rtimer/README --- Diff: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a… Patch: https://github.com/kamailio/kamailio/commit/733af50276242bda54e579ace28141a…

1 0

git:master:4368987b: rtimer: add one new module parameter
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 4368987be5b17faf443104e6193a559492625fe6 URL: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T20:17:30+02:00 rtimer: add one new module parameter Add default_interval to set the fire interval, if interval not present inside timer string. --- Modified: src/modules/rtimer/doc/rtimer_admin.xml Modified: src/modules/rtimer/rtimer_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… Patch: https://github.com/kamailio/kamailio/commit/4368987be5b17faf443104e6193a559… --- diff --git a/src/modules/rtimer/doc/rtimer_admin.xml b/src/modules/rtimer/doc/rtimer_admin.xml index 92422c5f3e..676bf2f5ad 100644 --- a/src/modules/rtimer/doc/rtimer_admin.xml +++ b/src/modules/rtimer/doc/rtimer_admin.xml @@ -56,6 +56,25 @@ </section> <section> <title>Parameters</title> + <section> + <title><varname>default_interval</varname> (int)</title> + <para> + The definition of the default interval of timers (if not present on the "timer" parameter) + </para> + <para> + The parameter can be set multiple times to get different intervals in same configuration file. + </para> + <example> + <title>Set <varname>default_interval</varname> parameter</title> + <programlisting format="linespecific"> +... +# default time interval set to 300 seconds +modparam("rtimer", "default_interval", 300) +... + </programlisting> + </example> + </section> + <section> <title><varname>timer</varname> (str)</title> <para> diff --git a/src/modules/rtimer/rtimer_mod.c b/src/modules/rtimer/rtimer_mod.c index 4b398148ee..8111dfac5d 100644 --- a/src/modules/rtimer/rtimer_mod.c +++ b/src/modules/rtimer/rtimer_mod.c @@ -78,12 +78,15 @@ void stm_timer_exec(unsigned int ticks, int worker, void *param); void stm_main_timer_exec(unsigned int ticks, void *param); int stm_get_worker(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int default_interval = 120; + static pv_export_t rtimer_pvs[] = { {{"rtimer_worker", (sizeof("rtimer_worker")-1)}, PVT_OTHER, stm_get_worker, 0, 0, 0, 0, 0}, { {0, 0}, 0, 0, 0, 0, 0, 0, 0 } }; static param_export_t params[]={ + {"default_interval", INT_PARAM, &default_interval}, {"timer", PARAM_STRING|USE_FUNC_PARAM, (void*)stm_t_param}, {"exec", PARAM_STRING|USE_FUNC_PARAM, (void*)stm_e_param}, {0,0,0} @@ -294,7 +297,7 @@ int stm_t_param(modparam_t type, void *val) return -1; } if(tmp.interval==0) - tmp.interval = 120; + tmp.interval = default_interval; nt = (stm_timer_t*)pkg_malloc(sizeof(stm_timer_t)); if(nt==0) @@ -307,6 +310,7 @@ int stm_t_param(modparam_t type, void *val) nt->next = _stm_list; _stm_list = nt; free_params(params_list); + LM_INFO("created rtimer name=%.*s interval=%d mode=%d\n", tmp.name.len, tmp.name.s, tmp.interval, tmp.mode); return 0; }

1 0

git:master:a8d42360: mqueue: add two new module parameters
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: a8d4236070f69c6fd9c83dedd9c007facc34f70d URL: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… Author: Stefan Mititelu <stefan-cristian.mititelu(a)1and1.ro> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T20:17:30+02:00 mqueue: add two new module parameters Add mqueue_name and mqueue_size to define queues. Updated doc. --- Modified: src/modules/mqueue/doc/mqueue_admin.xml Modified: src/modules/mqueue/mqueue_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… Patch: https://github.com/kamailio/kamailio/commit/a8d4236070f69c6fd9c83dedd9c007f… --- diff --git a/src/modules/mqueue/doc/mqueue_admin.xml b/src/modules/mqueue/doc/mqueue_admin.xml index 7d785ac90b..9cdf57cfa4 100644 --- a/src/modules/mqueue/doc/mqueue_admin.xml +++ b/src/modules/mqueue/doc/mqueue_admin.xml @@ -150,6 +150,64 @@ modparam("mqueue", "mqueue", "name=qaz") </example> </section> + + <section id="mqueue.p.mqueue_name"> + <title><varname>mqueue_name</varname> (string)</title> + <para> + Definition of a memory queue, just by name. + </para> + <para> + <emphasis> + Default value is <quote>none</quote>. + </emphasis> + </para> + <para> + Value must be a string. + </para> + <para> + The parameter can be set many times, each holding the definition of one queue. + + The max size of each queue defined this way will be equal to mqueue_size(if mqueue_size configured), + or limitless (if mqueue_size not configured). + </para> + <example> + <title>Set <varname>mqueue_name</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mqueue", "mqueue_name", "my_own_queue") +... + </programlisting> + </example> + </section> + + <section id="mqueue.p.mqueue_size"> + <title><varname>mqueue_size</varname> (int)</title> + <para> + Definition of the size of all memory queues defined via "mqueue_name" parameter. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <para> + Value must be an int. + </para> + <para> + The parameter should be set before defining any "mqueue_name". + If not set, the queues defined via "mqueue_name" will be limitless. + </para> + <example> + <title>Set <varname>mqueue_size</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("mqueue", "mqueue_size", 1024) +... + </programlisting> + </example> + </section> + + </section> <section> diff --git a/src/modules/mqueue/mqueue_mod.c b/src/modules/mqueue/mqueue_mod.c index 325c84b472..154f5b5d81 100644 --- a/src/modules/mqueue/mqueue_mod.c +++ b/src/modules/mqueue/mqueue_mod.c @@ -50,11 +50,14 @@ static int w_mq_size(struct sip_msg *msg, char *mq, char *str2); static int w_mq_add(struct sip_msg* msg, char* mq, char* key, char* val); static int w_mq_pv_free(struct sip_msg* msg, char* mq, char* str2); int mq_param(modparam_t type, void *val); +int mq_param_name(modparam_t type, void *val); static int fixup_mq_add(void** param, int param_no); static int bind_mq(mq_api_t* api); static int mqueue_rpc_init(void); +static int mqueue_size = 0; + static pv_export_t mod_pvs[] = { { {"mqk", sizeof("mqk")-1}, PVT_OTHER, pv_get_mqk, 0, @@ -84,6 +87,8 @@ static cmd_export_t cmds[]={ static param_export_t params[]={ {"db_url", PARAM_STR, &mqueue_db_url}, {"mqueue", PARAM_STRING|USE_FUNC_PARAM, (void*)mq_param}, + {"mqueue_name", PARAM_STRING|USE_FUNC_PARAM, (void*)mq_param_name}, + {"mqueue_size", INT_PARAM, &mqueue_size }, {0, 0, 0} }; @@ -268,6 +273,39 @@ int mq_param(modparam_t type, void *val) return 0; } +int mq_param_name(modparam_t type, void *val) +{ + str qname = {0, 0}; + int msize = 0; + + if(val==NULL) + return -1; + + if(!shm_initialized()) + { + LM_ERR("shm not initialized - cannot define mqueue now\n"); + return 0; + } + + qname.s = (char*)val; + qname.len = strlen(qname.s); + + msize = mqueue_size; + + if(qname.len<=0) + { + LM_ERR("mqueue name not defined: %.*s\n", qname.len, qname.s); + return -1; + } + if(mq_head_add(&qname, msize)<0) + { + LM_ERR("cannot add mqueue: %.*s\n", qname.len, qname.s); + return -1; + } + LM_INFO("mqueue param: [%.*s|%d]\n", qname.len, qname.s, msize); + return 0; +} + static int fixup_mq_add(void** param, int param_no) { if(param_no==1 || param_no==2 || param_no==3) {

1 0

[kamailio/kamailio] core: logging: JSON: add CEE schema support (#2826)
by Daniel Pocock 28 Aug '21

28 Aug '21

#### 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 - [x] Related to issue #2797 (replace XXXX with an open issue number) #### Description  See the feature request in #2797 I've provided similar implementation in reSIProcate binaries, Kurento and GStreamer pull requests so they can all share the identical CEE schema. Tested like this: ``` make src/kamailio -f ./misc/examples/ims/pcscf/kamailio.cfg --log-engine=json:U -D -dddd -E ``` I copied one of the JSON log lines to a file and parsed it like this to check it is valid JSON: ``` python -m json.tool /tmp/kamailio.json { "appname": "kamailio", "file!line": 97, "file!name": "core/mem/pkg.c", "hostname": "ws.example.org", "msg": "destroying memory manager: q_malloc\n", "native!function": "pkg_destroy_manager", "pname": "kamailio", "pri": "DEBUG", "proc!id": "16264", "proc!tid": 140525261209856, "subsys": "core", "time": "2021-08-16T19:04:43.641230480Z" } ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2826 -- Commit Summary -- * core: logging: JSON: add CEE schema support -- File Changes -- M src/core/dprint.c (58) M src/core/dprint.h (3) M src/main.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2826.patch https://github.com/kamailio/kamailio/pull/2826.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/2826

3 12

git:master:6e2cbf7f: core: logging: JSON: add CEE schema support (#2826)
by GitHub 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 6e2cbf7f2a1263b8648041a02c4708bf0a9b13d3 URL: https://github.com/kamailio/kamailio/commit/6e2cbf7f2a1263b8648041a02c4708b… Author: Daniel Pocock <daniel(a)pocock.pro> Committer: GitHub <noreply(a)github.com> Date: 2021-08-28T20:16:25+02:00 core: logging: JSON: add CEE schema support (#2826) * core: logging: JSON: add CEE schema support * core: logging: JSON: revise CEE create nested objects * core: logging: JSON: revise CEE check for pthreads --- Modified: src/core/dprint.c Modified: src/core/dprint.h Modified: src/main.c --- Diff: https://github.com/kamailio/kamailio/commit/6e2cbf7f2a1263b8648041a02c4708b… Patch: https://github.com/kamailio/kamailio/commit/6e2cbf7f2a1263b8648041a02c4708b…

1 0

git:master:2a65a83b: lcr: the new kemi exports require int parameter type
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: 2a65a83b05ab0e087db5d29c7f4d3af348402a9d URL: https://github.com/kamailio/kamailio/commit/2a65a83b05ab0e087db5d29c7f4d3af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T19:11:01+02:00 lcr: the new kemi exports require int parameter type --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2a65a83b05ab0e087db5d29c7f4d3af… Patch: https://github.com/kamailio/kamailio/commit/2a65a83b05ab0e087db5d29c7f4d3af… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 657f5c14f2..21f05a4730 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3068,7 +3068,7 @@ static int from_gw_1(struct sip_msg *_m, char *_lcr_id, char *_s2) * address, transport protocol and source port from parameters. */ static int ki_from_gw_addr_port( - sip_msg_t *_m, int lcr_id, str *addr_str, int transport, unsigned int src_port) + sip_msg_t *_m, int lcr_id, str *addr_str, int transport, int src_port) { struct ip_addr src_addr; struct ip_addr *ip; @@ -3147,7 +3147,7 @@ static int from_gw_4( str addr_str; char *tmp; uri_transport transport; - unsigned int src_port; + int src_port; /* Get and check parameter values */ lcr_id = strtol(_lcr_id, &tmp, 10); @@ -3206,7 +3206,7 @@ static int from_any_gw_0(struct sip_msg *_m, char *_s1, char *_s2) * IP address, transport protocol and source port from parameters. */ static int ki_from_any_gw_addr_port(sip_msg_t *_m, str *addr_str, int transport, - unsigned int src_port) + int src_port) { unsigned int i; struct ip_addr *ip, src_addr; @@ -3273,7 +3273,7 @@ static int from_any_gw_3(struct sip_msg *_m, char *_addr, char *_transport, char { str addr_str; uri_transport transport; - unsigned int src_port; + int src_port; char *tmp; /* Get and check parameter values */

1 0

git:master:e2106d49: lcr: updated kemi exports with new functions having port parameter
by Daniel-Constantin Mierla 28 Aug '21

28 Aug '21

Module: kamailio Branch: master Commit: e2106d494847c44255b63f76cd65c69f8a1c6923 URL: https://github.com/kamailio/kamailio/commit/e2106d494847c44255b63f76cd65c69… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-28T18:37:00+02:00 lcr: updated kemi exports with new functions having port parameter --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e2106d494847c44255b63f76cd65c69… Patch: https://github.com/kamailio/kamailio/commit/e2106d494847c44255b63f76cd65c69…

1 0

git:master:697f34d4: rtpengine: added rtpengine_query_v()
by Daniel-Constantin Mierla 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: 697f34d484e1507b480a89c11db8b86c923ea084 URL: https://github.com/kamailio/kamailio/commit/697f34d484e1507b480a89c11db8b86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-27T18:29:00+02:00 rtpengine: added rtpengine_query_v() - do a query cmd and store the response in a variable as a json --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/697f34d484e1507b480a89c11db8b86… Patch: https://github.com/kamailio/kamailio/commit/697f34d484e1507b480a89c11db8b86…

2 1

git:master:615b538c: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: 615b538c87279575732b3250a6dd24879243658a URL: https://github.com/kamailio/kamailio/commit/615b538c87279575732b3250a6dd248… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-27T18:31:13+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/615b538c87279575732b3250a6dd248… Patch: https://github.com/kamailio/kamailio/commit/615b538c87279575732b3250a6dd248…

1 0

git:master:57f2dcdc: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: 57f2dcdcb13c277c96a50330a1558495d2efb504 URL: https://github.com/kamailio/kamailio/commit/57f2dcdcb13c277c96a50330a155849… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-27T13:16:21+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README --- Diff: https://github.com/kamailio/kamailio/commit/57f2dcdcb13c277c96a50330a155849… Patch: https://github.com/kamailio/kamailio/commit/57f2dcdcb13c277c96a50330a155849… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 7b06010c7c..1065b52d54 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -155,7 +155,8 @@ Richard Fuchs 6. Exported Pseudo Variables - 6.1. $rtpstat + 6.1. $rtpestat + 6.2. $rtpstat 7. RPC Commands @@ -269,7 +270,7 @@ Richard Fuchs 1.98. play_media usage 1.99. stop_media usage 1.100. play_dtmf usage - 1.101. $rtpstat Usage + 1.101. $rtpestat Usage 1.102. rtpengine.reload usage 1.103. rtpengine.enable usage 1.104. rtpengine.show usage @@ -394,7 +395,8 @@ Chapter 1. Admin Guide 6. Exported Pseudo Variables - 6.1. $rtpstat + 6.1. $rtpestat + 6.2. $rtpstat 7. RPC Commands @@ -2682,19 +2684,27 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); 6. Exported Pseudo Variables - 6.1. $rtpstat + 6.1. $rtpestat + 6.2. $rtpstat -6.1. $rtpstat +6.1. $rtpestat - Returns the RTP statistics from the RTP proxy. The RTP statistics from - the RTP proxy are provided as a string and it does contain several + Returns the RTP statistics from the RTP relay. The RTP statistics from + the RTP relay are provided as a string and it does contain several packet counters. The statistics must be retrieved before the session is deleted (before rtpengine_delete()). - Example 1.101. $rtpstat Usage + Example 1.101. $rtpestat Usage ... - append_hf("X-RTP-Statistics: $rtpstat\r\n"); + append_hf("X-RTP-Statistics: $rtpestat\r\n"); ... + # $rtpestat = RTP: 54846 bytes, 1447 packets, 0 errors; RTCP: 336 bytes, 3 p +ackets, 0 errors +... + +6.2. $rtpstat + + Same as $rtpestat. 7. RPC Commands diff --git a/src/modules/rtpproxy/README b/src/modules/rtpproxy/README index c40d15810e..ffed325c5c 100644 --- a/src/modules/rtpproxy/README +++ b/src/modules/rtpproxy/README @@ -70,9 +70,10 @@ Carsten Bock 5.10. rtpproxy_stop_stream2uas() 5.11. start_recording() - 6. Exported Pseudo Variables + 6. Exported Variables - 6.1. $rtpstat + 6.1. $rtppstat + 6.2. $rtpstat 7. RPC Commands @@ -103,7 +104,7 @@ Carsten Bock 1.18. rtpproxy_stream2xxx usage 1.19. rtpproxy_stop_stream2uas usage 1.20. start_recording usage - 1.21. $rtpstat-Usage + 1.21. $rtppstat Usage 1.22. rtpproxy.enable usage 1.23. rtpproxy.list usage @@ -146,9 +147,10 @@ Chapter 1. Admin Guide 5.10. rtpproxy_stop_stream2uas() 5.11. start_recording() - 6. Exported Pseudo Variables + 6. Exported Variables - 6.1. $rtpstat + 6.1. $rtppstat + 6.2. $rtpstat 7. RPC Commands @@ -736,22 +738,28 @@ rtpproxy_manage(); start_recording(); ... -6. Exported Pseudo Variables +6. Exported Variables - 6.1. $rtpstat + 6.1. $rtppstat + 6.2. $rtpstat -6.1. $rtpstat +6.1. $rtppstat Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy are provided as a string and it does contain several packet-counters. The statistics must be retrieved before the session is - deleted (before unforce_rtpproxy()). + deleted (before unforce_rtpproxy()). It is the output of RTPProxy 'Q' + command. - Example 1.21. $rtpstat-Usage + Example 1.21. $rtppstat Usage ... - append_hf("X-RTP-Statistics: $rtpstat\r\n"); + append_hf("X-RTP-Statistics: $rtppstat\r\n"); ... +6.2. $rtpstat + + Same as $rtppstat. + 7. RPC Commands 7.1. rtpproxy.enable

1 0

git:master:53846fa2: rtpproxy: aliased $rtppstat to $rtpstat
by Daniel-Constantin Mierla 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: 53846fa2016a0adec915310dd3181f01d103f9f5 URL: https://github.com/kamailio/kamailio/commit/53846fa2016a0adec915310dd3181f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-27T13:03:09+02:00 rtpproxy: aliased $rtppstat to $rtpstat - can be useful when playing with rtpengine in same config --- Modified: src/modules/rtpproxy/doc/rtpproxy_admin.xml Modified: src/modules/rtpproxy/rtpproxy.c --- Diff: https://github.com/kamailio/kamailio/commit/53846fa2016a0adec915310dd3181f0… Patch: https://github.com/kamailio/kamailio/commit/53846fa2016a0adec915310dd3181f0… --- diff --git a/src/modules/rtpproxy/doc/rtpproxy_admin.xml b/src/modules/rtpproxy/doc/rtpproxy_admin.xml index 536d7c6d0a..efc6b18e31 100644 --- a/src/modules/rtpproxy/doc/rtpproxy_admin.xml +++ b/src/modules/rtpproxy/doc/rtpproxy_admin.xml @@ -856,25 +856,31 @@ start_recording(); </section> <section> - <title>Exported Pseudo Variables</title> - <section id="rtpproxy.pv.rtpstat"> - <title><function moreinfo="none">$rtpstat</function></title> + <title>Exported Variables</title> + <section id="rtpproxy.pv.rtppstat"> + <title><function moreinfo="none">$rtppstat</function></title> <para> Returns the RTP-Statistics from the RTP-Proxy. The RTP-Statistics from the RTP-Proxy are provided as a string and it does contain several packet-counters. The statistics must be retrieved before the session is deleted (before <function>unforce_rtpproxy()</function>). + It is the output of RTPProxy 'Q' command. </para> <example> - <title>$rtpstat-Usage</title> + <title>$rtppstat Usage</title> <programlisting format="linespecific"> ... - append_hf("X-RTP-Statistics: $rtpstat\r\n"); + append_hf("X-RTP-Statistics: $rtppstat\r\n"); ... </programlisting> </example> </section> - + <section id="rtpproxy.pv.rtpstat"> + <title><function moreinfo="none">$rtpstat</function></title> + <para> + Same as $rtppstat. + </para> + </section> </section> <section> diff --git a/src/modules/rtpproxy/rtpproxy.c b/src/modules/rtpproxy/rtpproxy.c index bd2eb5368d..46184310c4 100644 --- a/src/modules/rtpproxy/rtpproxy.c +++ b/src/modules/rtpproxy/rtpproxy.c @@ -144,7 +144,7 @@ static int child_init(int); static void mod_destroy(void); /* Pseudo-Variables */ -static int pv_get_rtpstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); +static int pv_get_rtppstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int rtpproxy_disable_tout = 60; static int rtpproxy_retr = 5; @@ -250,7 +250,9 @@ static cmd_export_t cmds[] = { static pv_export_t mod_pvs[] = { {{"rtpstat", (sizeof("rtpstat")-1)}, /* RTP-Statistics */ - PVT_OTHER, pv_get_rtpstat_f, 0, 0, 0, 0, 0}, + PVT_OTHER, pv_get_rtppstat_f, 0, 0, 0, 0, 0}, + {{"rtppstat", (sizeof("rtppstat")-1)}, /* RTP-Statistics */ + PVT_OTHER, pv_get_rtppstat_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -2729,7 +2731,7 @@ static int start_recording_f(struct sip_msg* msg, char *foo, char *bar) * Returns the current RTP-Statistics from the RTP-Proxy */ static int -pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, +pv_get_rtppstat_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str ret_val = {0, 0};

1 0

git:master:cfc0ecaa: rtpengine: aliased $rtpestat to $rtpstat
by Daniel-Constantin Mierla 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: cfc0ecaa8391cf9ac17f5a33ede77bc03beb8cc9 URL: https://github.com/kamailio/kamailio/commit/cfc0ecaa8391cf9ac17f5a33ede77bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-27T13:03:09+02:00 rtpengine: aliased $rtpestat to $rtpstat - can be useful when playing with rtpproxy in same config - show an example of content for variable --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/cfc0ecaa8391cf9ac17f5a33ede77bc… Patch: https://github.com/kamailio/kamailio/commit/cfc0ecaa8391cf9ac17f5a33ede77bc… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 74a6002774..6faf39c845 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -3223,23 +3223,31 @@ play_dtmf("code=1 volume=5 duration=300 pause=150"); <section> <title>Exported Pseudo Variables</title> - <section> - <title><function moreinfo="none">$rtpstat</function></title> + <section id="rtpengine.pv.rtpestat"> + <title><function moreinfo="none">$rtpestat</function></title> <para> - Returns the &rtp; statistics from the &rtp; proxy. The &rtp; statistics from the &rtp; proxy + Returns the &rtp; statistics from the &rtp; relay. The &rtp; statistics from the &rtp; relay are provided as a string and it does contain several packet counters. The statistics must be retrieved before the session is deleted (before <function>rtpengine_delete()</function>). </para> <example> - <title>$rtpstat Usage</title> + <title>$rtpestat Usage</title> <programlisting format="linespecific"> ... - append_hf("X-RTP-Statistics: $rtpstat\r\n"); + append_hf("X-RTP-Statistics: $rtpestat\r\n"); +... + # $rtpestat = RTP: 54846 bytes, 1447 packets, 0 errors; RTCP: 336 bytes, 3 packets, 0 errors ... </programlisting> </example> </section> + <section id="rtpengine.pv.rtpstat"> + <title><function moreinfo="none">$rtpstat</function></title> + <para> + Same as $rtpestat. + </para> + </section> </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index c75caec078..989af05e56 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -245,7 +245,7 @@ static int add_rtpp_node_info(void *ptrs, struct rtpp_node *crt_rtpp, struct rtp static int rtpp_test_ping(struct rtpp_node *node); /* Pseudo-Variables */ -static int pv_get_rtpstat_f(struct sip_msg *, pv_param_t *, pv_value_t *); +static int pv_get_rtpestat_f(struct sip_msg *, pv_param_t *, pv_value_t *); static int set_rtp_inst_pvar(struct sip_msg *msg, const str * const uri); static int pv_parse_var(str *inp, pv_elem_t **outp, int *got_any); static int mos_label_stats_parse(struct minmax_mos_label_stats *mmls); @@ -448,7 +448,9 @@ static cmd_export_t cmds[] = { static pv_export_t mod_pvs[] = { {{"rtpstat", (sizeof("rtpstat")-1)}, /* RTP-Statistics */ - PVT_OTHER, pv_get_rtpstat_f, 0, 0, 0, 0, 0}, + PVT_OTHER, pv_get_rtpestat_f, 0, 0, 0, 0, 0}, + {{"rtpestat", (sizeof("rtpestat")-1)}, /* RTP-Statistics */ + PVT_OTHER, pv_get_rtpestat_f, 0, 0, 0, 0, 0}, {{0, 0}, 0, 0, 0, 0, 0, 0, 0} }; @@ -4153,7 +4155,7 @@ static int rtpengine_rtpstat_wrap(struct sip_msg *msg, void *d, int more, enum r * Returns the current RTP-Statistics from the RTP-Proxy */ static int -pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +pv_get_rtpestat_f(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { void *parms[2];

1 0

git:master:485f04b4: pkg/kamailio/deb: version set 5.6.0~dev1
by Victor Seva 27 Aug '21

27 Aug '21

Module: kamailio Branch: master Commit: 485f04b4420ab23d93e829f58560acc2198db9cb URL: https://github.com/kamailio/kamailio/commit/485f04b4420ab23d93e829f58560acc… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-08-27T12:34:11+02:00 pkg/kamailio/deb: version set 5.6.0~dev1 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/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/485f04b4420ab23d93e829f58560acc… Patch: https://github.com/kamailio/kamailio/commit/485f04b4420ab23d93e829f58560acc…

1 0

git:master:87576b26: Makefile.defs: version set to 5.6.0-dev1
by Daniel-Constantin Mierla 26 Aug '21

26 Aug '21

Module: kamailio Branch: master Commit: 87576b2611a8f8b844298b52901bb852fff17c0e URL: https://github.com/kamailio/kamailio/commit/87576b2611a8f8b844298b52901bb85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-26T14:03:22+02:00 Makefile.defs: version set to 5.6.0-dev1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/87576b2611a8f8b844298b52901bb85… Patch: https://github.com/kamailio/kamailio/commit/87576b2611a8f8b844298b52901bb85… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b55bf0ea85..51a14f5ab4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 6 SUBLEVEL = 0 -EXTRAVERSION = -dev0 +EXTRAVERSION = -dev1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

[kamailio/kamailio] ndb_redis: fix SIGSEGV in redisc_check_auth (#2834)
by Dennis 26 Aug '21

26 Aug '21

Hi ! This issue appears when ndb_redis module connect to redis via proxy, in my case haproxy. Haproxy keeps front socket always open, when all backend redis servers become unavailable, haproxy just send RST to front, redisCommand function in tis case return NULL poiner, redisc_check_auth try to dereference it without NULL checking. kamailio log: `kernel: [7250430.508827] kamailio[21749]: segfault at 0 ip 00007f00d7bb106f sp 00007fffc523c620 error 4 in ndb_redis.so[7f00d7b94000+36000]` gdb: ``` # gdb /usr/sbin/kamailio core GNU gdb (Ubuntu 8.1.1-0ubuntu1) 8.1.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...(no debugging symbols found)...done. [New LWP 21752] [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 0x00007f00d7bb106f in redisc_check_auth () from /usr/lib64/kamailio/modules/ndb_redis.so (gdb) bt #0 0x00007f00d7bb106f in redisc_check_auth () from /usr/lib64/kamailio/modules/ndb_redis.so #1 0x00007f00d7b9937a in redisc_init () from /usr/lib64/kamailio/modules/ndb_redis.so #2 0x00007f00d7bb4300 in print_redis_reply () from /usr/lib64/kamailio/modules/ndb_redis.so #3 0x0000561825796935 in ?? () #4 0x0000561825796550 in ?? () #5 0x0000561825796550 in ?? () #6 0x0000561825796550 in ?? () #7 0x0000561825796550 in ?? () #8 0x0000561825796550 in ?? () #9 0x0000561825796550 in ?? () #10 0x0000561825796550 in ?? () #11 0x0000561825796550 in ?? () #12 0x0000561825796550 in ?? () #13 0x0000561825796550 in ?? () #14 0x0000561825796550 in ?? () #15 0x0000561825796550 in ?? () #16 0x0000561825796550 in ?? () #17 0x000056182579722c in init_child () #18 0x00005618256f4520 in fork_process () #19 0x00005618255cfbf3 in main_loop () #20 0x00005618255dd095 in main () ```   #### Pre-Submission Checklist    - [x] 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/2834 -- Commit Summary -- * ndb_redis: fix SIGSEGV in redisc_check_auth -- File Changes -- M src/modules/ndb_redis/redis_client.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2834.patch https://github.com/kamailio/kamailio/pull/2834.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/2834

3 2

git:master:c32a0be8: ndb_redis: fix SIGSEGV in redisc_check_auth
by Victor Seva 26 Aug '21

26 Aug '21

Module: kamailio Branch: master Commit: c32a0be89cc92a0649277774d1e7aebf349b8b49 URL: https://github.com/kamailio/kamailio/commit/c32a0be89cc92a0649277774d1e7aeb… Author: Dennis Yurasov <dennis-y(a)yandex-team.ru> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-08-26T11:25:29+02:00 ndb_redis: fix SIGSEGV in redisc_check_auth - Added the check for NULL pointer. When TCP session to redis reset, redisCommand function can return NULL pointer. --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/kamailio/commit/c32a0be89cc92a0649277774d1e7aeb… Patch: https://github.com/kamailio/kamailio/commit/c32a0be89cc92a0649277774d1e7aeb… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index befb69ab79..bb6adc20b1 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -1269,6 +1269,10 @@ int redisc_check_auth(redisc_server_t *rsrv, char *pass) int retval = 0; reply = redisCommand(rsrv->ctxRedis, "AUTH %s", pass); + if(!reply) { + LM_ERR("Redis authentication error\n"); + return -1; + } if (reply->type == REDIS_REPLY_ERROR) { LM_ERR("Redis authentication error\n"); retval = -1;

1 0

git:master:79b3980b: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 26 Aug '21

26 Aug '21

Module: kamailio Branch: master Commit: 79b3980b62d274a33365b8895d53fdf208ea0991 URL: https://github.com/kamailio/kamailio/commit/79b3980b62d274a33365b8895d53fdf… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-26T11:16:25+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/79b3980b62d274a33365b8895d53fdf… Patch: https://github.com/kamailio/kamailio/commit/79b3980b62d274a33365b8895d53fdf… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 66aba00ef9..868faea5e6 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -40,6 +40,7 @@ Daniel-Constantin Mierla 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) + 4.3. ruxc_http_delete(url, body, hdrs, respv) 5. Installation @@ -56,7 +57,8 @@ Daniel-Constantin Mierla 1.9. Set http_debug parameter 1.10. ruxc_http_get() usage 1.11. ruxc_http_post() usage - 1.12. Libruxc Usage + 1.12. ruxc_http_delete() usage + 1.13. Libruxc Usage Chapter 1. Admin Guide @@ -84,6 +86,7 @@ Chapter 1. Admin Guide 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) + 4.3. ruxc_http_delete(url, body, hdrs, respv) 5. Installation @@ -256,6 +259,7 @@ modparam("ruxc", "http_debug", 1) 4.1. ruxc_http_get(url, hdrs, respv) 4.2. ruxc_http_post(url, body, hdrs, respv) + 4.3. ruxc_http_delete(url, body, hdrs, respv) 4.1. ruxc_http_get(url, hdrs, respv) @@ -302,6 +306,29 @@ switch ($rc) { } ... +4.3. ruxc_http_delete(url, body, hdrs, respv) + + Perform a HTTP DELETE request to "url", storing the response body in + the "respv" variable. The "body" and "hdrs" can be empty strings to + skip setting them. The first three parameters can contain variables + that are evaluated at runtime. The "respv" has to be the name of a + writable variable. + + The function returns response code of HTTP reply or negative value if + something went wrong. + + This function can be used from ANY_ROUTE. + + Example 1.12. ruxc_http_delete() usage +... +ruxc_http_delete("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(f +u{s.escape.param})", + "", "X-Token: abc", "$var(result)"); +switch ($rc) { + ... +} +... + 5. Installation The module needs "libruxc" library, which is provided by "ruxc" project @@ -315,7 +342,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.12. Libruxc Usage + Example 1.13. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:ec9eb48d: ruxc: added ruxc_http_delete(...) to do HTTP DELETE request
by Daniel-Constantin Mierla 26 Aug '21

26 Aug '21

Module: kamailio Branch: master Commit: ec9eb48dfde072630fd85a80d6d5c45e377816a3 URL: https://github.com/kamailio/kamailio/commit/ec9eb48dfde072630fd85a80d6d5c45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-26T11:04:27+02:00 ruxc: added ruxc_http_delete(...) to do HTTP DELETE request --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec9eb48dfde072630fd85a80d6d5c45… Patch: https://github.com/kamailio/kamailio/commit/ec9eb48dfde072630fd85a80d6d5c45…

1 0

Troubleshooting segfault in shared memory
by Anthony Alba 26 Aug '21

26 Aug '21

Hi sr-dev, I have a pointer from one child process A that is available to another child process B (this is a custom module I am developing). The object should have been allocated in shared memory by A using ser_malloc and friends and thus accessible from B. However B is encountering a segfault when accessing this object. Given a pointer how can I tell whether the memory it is pointing to is valid in all children, i.e, the target is in kamailio shared memory? Thanks Anthony Alba

2 2

Kamailio v5.5.2 Released
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Hello, Kamailio SIP Server v5.5.2 stable release is out. This is a maintenance release of the latest stable branch, 5.5, that includes fixes since the release of v5.5.1. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.5.x. Deployments running previous v5.5.x versions are strongly recommended to be upgraded to v5.5.2. For more details about version 5.5.2 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2021/08/kamailio-v5-5-2-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

3 2

git:5.5:e5f5a8f4: Changelog: fix version for release 5.5.2
by Henning Westerholt 25 Aug '21

25 Aug '21

Module: kamailio Branch: 5.5 Commit: e5f5a8f46e74960308fe63336731fea2775b4e07 URL: https://github.com/kamailio/kamailio/commit/e5f5a8f46e74960308fe63336731fea… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-25T19:26:21Z Changelog: fix version for release 5.5.2 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/e5f5a8f46e74960308fe63336731fea… Patch: https://github.com/kamailio/kamailio/commit/e5f5a8f46e74960308fe63336731fea… --- diff --git a/ChangeLog b/ChangeLog index 0a9031b24f..bcce4916fb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ ===================== 2021-08-25 Version 5.5.2 Released ===================== -===================== Changes Since Version 5.5.2 =========================== +===================== Changes Since Version 5.5.1 =========================== commit 0d6832949e5e3e554d7a492f32448281d4988053 Author: Daniel-Constantin Mierla <miconda(a)gmail.com>

1 0

[kamailio/kamailio] NATPING ERROR (#2835)
by JoelBorrego 25 Aug '21

25 Aug '21

we trying to configurate the pcscf.cfg file and we the following error Do you have an idea of the reason of this error?, 78(12285)ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[NATPING] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=836 a=5 n=route 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[preload_pcscf] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=895 a=16 n=if 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[preload_pcscf] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=894 a=2 n=return 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[NATPING] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=838 a=26 n=sht_iterator_start 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[NATPING] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=848 a=23 n=while 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[NATPING] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=839 a=25 n=sht_iterator_next 78(12285) ERROR: *** cfgtrace:dbg_cfg_trace(): request_route=[NATPING] c=[/etc/kamailio_pcscf/kamailio_pcscf.cfg] l=849 a=25 n=sht_iterator_end -- 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/2835

2 3

git:5.5:55e232dd: ChangeLog: content updated for v5.5.1
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Module: kamailio Branch: 5.5 Commit: 55e232dd7fb43eb3e8c63d4908af9244e9a598c1 URL: https://github.com/kamailio/kamailio/commit/55e232dd7fb43eb3e8c63d4908af924… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-25T12:01:55+02:00 ChangeLog: content updated for v5.5.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/55e232dd7fb43eb3e8c63d4908af924… Patch: https://github.com/kamailio/kamailio/commit/55e232dd7fb43eb3e8c63d4908af924…

1 0

git:master:adfa9094: modules: readme files regenerated - lcr ... [skip ci]
by Kamailio Dev 25 Aug '21

25 Aug '21

Module: kamailio Branch: master Commit: adfa9094052c2eb74d9513b66b965e37410bedcf URL: https://github.com/kamailio/kamailio/commit/adfa9094052c2eb74d9513b66b965e3… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-25T09:31:20+02:00 modules: readme files regenerated - lcr ... [skip ci] --- Modified: src/modules/lcr/README --- Diff: https://github.com/kamailio/kamailio/commit/adfa9094052c2eb74d9513b66b965e3… Patch: https://github.com/kamailio/kamailio/commit/adfa9094052c2eb74d9513b66b965e3…

1 0

[kamailio/kamailio] lcr: source port check for from_any_gw() and from_gw(). (#2832)
by zenichev 25 Aug '21

25 Aug '21

A simple change, which allows to check, if a coming request matches not only by an IP address and a transport protocol, but also using the source port of a request. Improvements are done for the following functions of the lcr module: - from_any_gw() - from_gw() Back compatibility provided, hence it does not affect already existing behavior. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2832 -- Commit Summary -- * lcr: source port check for from_any_gw() and from_gw(). -- File Changes -- M src/modules/lcr/doc/lcr_admin.xml (31) M src/modules/lcr/lcr_mod.c (116) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2832.patch https://github.com/kamailio/kamailio/pull/2832.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/2832

5 5

git:master:9115d74b: lcr: source port check for from_any_gw() and from_gw().
by Victor Seva 25 Aug '21

25 Aug '21

Module: kamailio Branch: master Commit: 9115d74b33aefb0febad7c7fffe7d184e4066b77 URL: https://github.com/kamailio/kamailio/commit/9115d74b33aefb0febad7c7fffe7d18… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-08-25T09:28:38+02:00 lcr: source port check for from_any_gw() and from_gw(). A simple change, which allows to check, if a coming request matches not only by an IP address and a transport protocol, but also using the source port of a request. Improvements are done for the following functions of the lcr module: - from_any_gw() - from_gw() Back compatibility provided, hence it does not affect already existing behavior. --- Modified: src/modules/lcr/doc/lcr_admin.xml Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9115d74b33aefb0febad7c7fffe7d18… Patch: https://github.com/kamailio/kamailio/commit/9115d74b33aefb0febad7c7fffe7d18…

1 0

git:master:536736f2: lcr: remove excessive checks for the 'src_port' accuracy
by Victor Seva 25 Aug '21

25 Aug '21

Module: kamailio Branch: master Commit: 536736f2529f7554929f3aa6b74ac616c382bc6e URL: https://github.com/kamailio/kamailio/commit/536736f2529f7554929f3aa6b74ac61… Author: Donat Zenichev <dzenichev(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2021-08-25T09:28:38+02:00 lcr: remove excessive checks for the 'src_port' accuracy Remove unneeded check for 'src_port' in: - ki_from_any_gw_addr() - ki_from_gw_addr() Which makes no sense because 'src_port' is of type 'unsigned int', and the check concerns whether it's less than 0 or not. --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/536736f2529f7554929f3aa6b74ac61… Patch: https://github.com/kamailio/kamailio/commit/536736f2529f7554929f3aa6b74ac61… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 858352f2c7..57b4021ac9 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -3093,9 +3093,9 @@ static int ki_from_gw_addr( return -1; } - /* src_port set to 0 means we don't want to check it */ - if((src_port < 0) || (src_port > 65535)) { - LM_ERR("invalid port parameter value %d\n", transport); + /* src_port set to 0 is allowed and means we don't want to check it */ + if(src_port > 65535) { + LM_ERR("invalid port parameter value %d\n", src_port); return -1; } @@ -3215,9 +3215,9 @@ static int ki_from_any_gw_addr(sip_msg_t *_m, str *addr_str, int transport, unsi return -1; } - /* src_port set to 0 means we don't want to check it */ - if((src_port < 0) || (src_port > 65535)) { - LM_ERR("invalid port parameter value %d\n", transport); + /* src_port set to 0 is allowed and means we don't want to check it */ + if(src_port > 65535) { + LM_ERR("invalid port parameter value %d\n", src_port); return -1; }

1 0

git:5.5:0d683294: Makefile.defs: version set to 5.5.2
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Module: kamailio Branch: 5.5 Commit: 0d6832949e5e3e554d7a492f32448281d4988053 URL: https://github.com/kamailio/kamailio/commit/0d6832949e5e3e554d7a492f3244828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-25T08:29:41+02:00 Makefile.defs: version set to 5.5.2 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0d6832949e5e3e554d7a492f3244828… Patch: https://github.com/kamailio/kamailio/commit/0d6832949e5e3e554d7a492f3244828… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index b9322fa472..9f76722eb5 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 1 +SUBLEVEL = 2 EXTRAVERSION = # memory manager switcher

1 0

git:5.5:e67094cc: pkg/kamailio/deb: version set 5.5.2
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Module: kamailio Branch: 5.5 Commit: e67094ccdf0288b54c6808bf7bd2469ba2bfc97e URL: https://github.com/kamailio/kamailio/commit/e67094ccdf0288b54c6808bf7bd2469… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-25T08:16:58+02:00 pkg/kamailio/deb: version set 5.5.2 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/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/e67094ccdf0288b54c6808bf7bd2469… Patch: https://github.com/kamailio/kamailio/commit/e67094ccdf0288b54c6808bf7bd2469…

1 0

git:5.5:cd816b80: pkg: version set to 5.5.2 for rpm and alpine specs
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Module: kamailio Branch: 5.5 Commit: cd816b80b20cd9560a643d016094ca2975911c34 URL: https://github.com/kamailio/kamailio/commit/cd816b80b20cd9560a643d016094ca2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-25T08:21:18+02:00 pkg: version set to 5.5.2 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/cd816b80b20cd9560a643d016094ca2… Patch: https://github.com/kamailio/kamailio/commit/cd816b80b20cd9560a643d016094ca2… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index ee259927bf..9ce95c81d9 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.5.1 +pkgver=5.5.2 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 3ca6df74fc..5c5948b669 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.1 +%define ver 5.5.2 %define rel dev1.0%{dist} %if 0%{?fedora}

1 0

Releasing Kamailio v5.5.2
by Daniel-Constantin Mierla 25 Aug '21

25 Aug '21

Hello, I am considering to release Kamailio v5.5.2 sometime next week, likely on Wednesday (August 25, 2021). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda

2 2

Registering a SIP TLS ALPN
by Olle E. Johansson 24 Aug '21

24 Aug '21

Hi Kamailians! I’ve written a very short IETF draft in order to register a SIP TLS ALPN: https://datatracker.ietf.org/doc/draft-johansson-sip-alpn/ An ALPN is a short code used in TLS connection setup to inform the server of the “next protocol” after TLS connection is setup. This way, a server listening to a port, like 5061 and 443, can support multiple protocols on the same port. In Kamailio, we support HTTP 1 and SIP because they’re very much alike, but if there’s a need to support other protocols it will be hard, like MSRP. With ALPN support we could when using TLS. In addition, newer versions of HTTP will be harder to support using the same parser. ALPN makes it easier. I do hope the registration will come through. If so, maybe we can discuss what’s needed to support ALPN for SIP and HTTP in the TLS code. Cheers, /O

2 4

[kamailio/kamailio] [minor] sip_trace table column type and size issues (#2831)
by Anthony Messina 24 Aug '21

24 Aug '21

In advance of the 5.5.2 release, note that for full IPv6 addresses with proto, brackets, and a full 5-digit port, the `varchar(50)` is too small to hold the information in `fromip` and `toip`. Also, it appears (at least for PostgreSQL) that Kamailio stores to the `message` column as `bytea`, rather than text, so perhaps that should be reflected in the table setup scripts. -- 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/2831

3 6

git:master:161353a2: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 24 Aug '21

24 Aug '21

Module: kamailio Branch: master Commit: 161353a29c39e4a032d5de5ac9bc868e06aaa89b URL: https://github.com/kamailio/kamailio/commit/161353a29c39e4a032d5de5ac9bc868… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-24T10:31:19+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/161353a29c39e4a032d5de5ac9bc868… Patch: https://github.com/kamailio/kamailio/commit/161353a29c39e4a032d5de5ac9bc868…

1 0

git:master:1d62f9d0: ruxc: docs for the new timeouts params
by Daniel-Constantin Mierla 24 Aug '21

24 Aug '21

Module: kamailio Branch: master Commit: 1d62f9d0310d462b88db1872e3db54d5f148a54c URL: https://github.com/kamailio/kamailio/commit/1d62f9d0310d462b88db1872e3db54d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-24T10:16:52+02:00 ruxc: docs for the new timeouts params --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1d62f9d0310d462b88db1872e3db54d… Patch: https://github.com/kamailio/kamailio/commit/1d62f9d0310d462b88db1872e3db54d… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 2c1aec6285..cdfb201fd7 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -62,7 +62,15 @@ <title><varname>http_timeout</varname> (int)</title> <para> The interval in miliseconds after which the HTTP GET or POST query - times out. + times out. It is the overall timeout, including DNS resolution, connecting + time, redirects, and reading the response body. Slow DNS resolution + may cause a request to exceed the timeout, because the DNS request + cannot be interrupted with the available APIs. It takes precedence over + http_timeout_read() and http_timeout_write(), but not http_timeout_connect. + See also the comments in 'https://github.com/algesten/ureq/blob/main/src/agent.rs'. + </para> + <para> + Use 0 to disable setting it in the library. </para> <para> <emphasis> @@ -75,6 +83,76 @@ ... modparam("ruxc", "http_timeout", 2000) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_timeout_connect"> + <title><varname>http_timeout_connect</varname> (int)</title> + <para> + The interval in miliseconds after which to give up on connecting to the + HTTP/S server. If http_timeout is set, this one takes precedence. The + library beneath has a default 30 seconds connect timeout. + </para> + <para> + Use 0 to disable setting it in the library. + </para> + <para> + <emphasis> + Default value is 5000 (5 secs). + </emphasis> + </para> + <example> + <title>Set <varname>http_timeout_connect</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_timeout_connect", 2000) +... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_timeout_read"> + <title><varname>http_timeout_read</varname> (int)</title> + <para> + The interval in miliseconds after which the read on HTTP/S connection + socket timeouts. If http_timeout is set, it takes precedence. + </para> + <para> + Use 0 to disable setting it in the library. + </para> + <para> + <emphasis> + Default value is 5000 (5 secs). + </emphasis> + </para> + <example> + <title>Set <varname>http_timeout_read</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_timeout_read", 2000) +... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_timeout_write"> + <title><varname>http_timeout_write</varname> (int)</title> + <para> + The interval in miliseconds after which the write on HTTP/S connection + socket timeouts. If http_timeout is set, it takes precedence. + </para> + <para> + Use 0 to disable setting it in the library. + </para> + <para> + <emphasis> + Default value is 5000 (5 secs). + </emphasis> + </para> + <example> + <title>Set <varname>http_timeout_write</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_timeout_write", 2000) +... </programlisting> </example> </section>

1 0

git:master:e9795083: ruxc: groupped setting request params in a function
by Daniel-Constantin Mierla 24 Aug '21

24 Aug '21

Module: kamailio Branch: master Commit: e9795083b50e26b3b0406b4bda8c5c74ee4822e4 URL: https://github.com/kamailio/kamailio/commit/e9795083b50e26b3b0406b4bda8c5c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-24T09:36:06+02:00 ruxc: groupped setting request params in a function --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/e9795083b50e26b3b0406b4bda8c5c7… Patch: https://github.com/kamailio/kamailio/commit/e9795083b50e26b3b0406b4bda8c5c7… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index a31f650873..427c8e2091 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -131,6 +131,22 @@ static void mod_destroy(void) return; } +/** + * + */ +static void ruxc_request_params_init(RuxcHTTPRequest *v_http_request) +{ + v_http_request->timeout = _ruxc_http_timeout; + v_http_request->timeout_connect = _ruxc_http_timeout; + v_http_request->timeout_read = _ruxc_http_timeout; + v_http_request->timeout_write = _ruxc_http_timeout; + v_http_request->tlsmode = _ruxc_http_tlsmode; + v_http_request->reuse = _ruxc_http_reuse; + v_http_request->retry = _ruxc_http_retry; + v_http_request->logtype = _ruxc_http_logtype; + v_http_request->debug = _ruxc_http_debug; +} + /** * */ @@ -142,15 +158,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, pv_value_t val = {0}; int ret; - v_http_request.timeout = _ruxc_http_timeout; - v_http_request.timeout_connect = _ruxc_http_timeout; - v_http_request.timeout_read = _ruxc_http_timeout; - v_http_request.timeout_write = _ruxc_http_timeout; - v_http_request.tlsmode = _ruxc_http_tlsmode; - v_http_request.reuse = _ruxc_http_reuse; - v_http_request.retry = _ruxc_http_retry; - v_http_request.logtype = _ruxc_http_logtype; - v_http_request.debug = _ruxc_http_debug; + ruxc_request_params_init(&v_http_request); v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -243,15 +251,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h pv_value_t val = {0}; int ret; - v_http_request.timeout = _ruxc_http_timeout; - v_http_request.timeout_connect = _ruxc_http_timeout; - v_http_request.timeout_read = _ruxc_http_timeout; - v_http_request.timeout_write = _ruxc_http_timeout; - v_http_request.tlsmode = _ruxc_http_tlsmode; - v_http_request.reuse = _ruxc_http_reuse; - v_http_request.retry = _ruxc_http_retry; - v_http_request.logtype = _ruxc_http_logtype; - v_http_request.debug = _ruxc_http_debug; + ruxc_request_params_init(&v_http_request); v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

git:master:121b7ffa: ruxc: added parameters for connection, read and write timeouts
by Daniel-Constantin Mierla 24 Aug '21

24 Aug '21

Module: kamailio Branch: master Commit: 121b7ffa0b4a0ae26033d68fdf804ad982d98883 URL: https://github.com/kamailio/kamailio/commit/121b7ffa0b4a0ae26033d68fdf804ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-24T09:45:45+02:00 ruxc: added parameters for connection, read and write timeouts --- Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/121b7ffa0b4a0ae26033d68fdf804ad… Patch: https://github.com/kamailio/kamailio/commit/121b7ffa0b4a0ae26033d68fdf804ad… --- diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 427c8e2091..54bd76d85c 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -39,6 +39,9 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; +static int _ruxc_http_timeout_connect = 5000; +static int _ruxc_http_timeout_read = 5000; +static int _ruxc_http_timeout_write = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; static int _ruxc_http_retry = 0; @@ -75,12 +78,15 @@ static cmd_export_t cmds[]={ }; static param_export_t params[]={ - {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, - {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, - {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, - {"http_retry", PARAM_INT, &_ruxc_http_retry}, - {"http_logtype", PARAM_INT, &_ruxc_http_logtype}, - {"http_debug", PARAM_INT, &_ruxc_http_debug}, + {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, + {"http_timeout_connect", PARAM_INT, &_ruxc_http_timeout_connect}, + {"http_timeout_read", PARAM_INT, &_ruxc_http_timeout_read}, + {"http_timeout_write", PARAM_INT, &_ruxc_http_timeout_write}, + {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, + {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, + {"http_retry", PARAM_INT, &_ruxc_http_retry}, + {"http_logtype", PARAM_INT, &_ruxc_http_logtype}, + {"http_debug", PARAM_INT, &_ruxc_http_debug}, {0, 0, 0} }; @@ -136,10 +142,10 @@ static void mod_destroy(void) */ static void ruxc_request_params_init(RuxcHTTPRequest *v_http_request) { - v_http_request->timeout = _ruxc_http_timeout; - v_http_request->timeout_connect = _ruxc_http_timeout; - v_http_request->timeout_read = _ruxc_http_timeout; - v_http_request->timeout_write = _ruxc_http_timeout; + v_http_request->timeout = _ruxc_http_timeout; + v_http_request->timeout_connect = _ruxc_http_timeout_connect; + v_http_request->timeout_read = _ruxc_http_timeout_read; + v_http_request->timeout_write = _ruxc_http_timeout_write; v_http_request->tlsmode = _ruxc_http_tlsmode; v_http_request->reuse = _ruxc_http_reuse; v_http_request->retry = _ruxc_http_retry;

1 0

git:5.5:ab86966a: lib/srdb1/schema: use proto_addr_len from sip_trace from/to ip fields
by Daniel-Constantin Mierla 24 Aug '21

24 Aug '21

Module: kamailio Branch: 5.5 Commit: ab86966aca142eeca5435f8567fe8cc698500cd2 URL: https://github.com/kamailio/kamailio/commit/ab86966aca142eeca5435f8567fe8cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-24T09:06:34+02:00 lib/srdb1/schema: use proto_addr_len from sip_trace from/to ip fields - size of fields is now 64 - they store proto:addr:port - GH #2831 (cherry picked from commit 4decc7ca50089f94d4fcc2ad4af2b4e1089986e7) --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/sip_trace.xml --- Diff: https://github.com/kamailio/kamailio/commit/ab86966aca142eeca5435f8567fe8cc… Patch: https://github.com/kamailio/kamailio/commit/ab86966aca142eeca5435f8567fe8cc… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 4ca1b6bfed..8021e8e738 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -30,6 +30,7 @@ <!ENTITY etag_len "128"> <!ENTITY aname_len "64"> <!ENTITY avalue_len "512"> +<!ENTITY proto_addr_len "64"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/sip_trace.xml b/src/lib/srdb1/schema/sip_trace.xml index 5aa38369fd..21b4f0ef61 100644 --- a/src/lib/srdb1/schema/sip_trace.xml +++ b/src/lib/srdb1/schema/sip_trace.xml @@ -91,7 +91,7 @@ <column id="fromip"> <name>fromip</name> <type>string</type> - <size>&ip_add_len;</size> + <size>&proto_addr_len;</size> <default/> <description>Source IP address</description> </column> @@ -99,7 +99,7 @@ <column> <name>toip</name> <type>string</type> - <size>&ip_add_len;</size> + <size>&proto_addr_len;</size> <default/> <description>Destination IP address</description> </column>

1 0

git:5.5:087167c0: kamctl: regenerate db creation scripts
by Daniel-Constantin Mierla 24 Aug '21

24 Aug '21

Module: kamailio Branch: 5.5 Commit: 087167c034afff943c217b832b9689cb61133188 URL: https://github.com/kamailio/kamailio/commit/087167c034afff943c217b832b9689c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-24T09:06:43+02:00 kamctl: regenerate db creation scripts (cherry picked from commit 5ad81a45bb28ca419d9285cc59816db0fa1afefd) --- Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/087167c034afff943c217b832b9689c… Patch: https://github.com/kamailio/kamailio/commit/087167c034afff943c217b832b9689c… --- diff --git a/utils/kamctl/db_sqlite/siptrace-create.sql b/utils/kamctl/db_sqlite/siptrace-create.sql index 2860d0a4e2..7f847816fd 100644 --- a/utils/kamctl/db_sqlite/siptrace-create.sql +++ b/utils/kamctl/db_sqlite/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg TEXT NOT NULL, method VARCHAR(50) DEFAULT '' NOT NULL, status VARCHAR(255) DEFAULT '' NOT NULL, - fromip VARCHAR(50) DEFAULT '' NOT NULL, - toip VARCHAR(50) DEFAULT '' NOT NULL, + fromip VARCHAR(64) DEFAULT '' NOT NULL, + toip VARCHAR(64) DEFAULT '' NOT NULL, fromtag VARCHAR(128) DEFAULT '' NOT NULL, totag VARCHAR(128) DEFAULT '' NOT NULL, direction VARCHAR(4) DEFAULT '' NOT NULL diff --git a/utils/kamctl/mysql/siptrace-create.sql b/utils/kamctl/mysql/siptrace-create.sql index bd08a8a49f..c74913c0e2 100644 --- a/utils/kamctl/mysql/siptrace-create.sql +++ b/utils/kamctl/mysql/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE `sip_trace` ( `msg` MEDIUMTEXT NOT NULL, `method` VARCHAR(50) DEFAULT '' NOT NULL, `status` VARCHAR(255) DEFAULT '' NOT NULL, - `fromip` VARCHAR(50) DEFAULT '' NOT NULL, - `toip` VARCHAR(50) DEFAULT '' NOT NULL, + `fromip` VARCHAR(64) DEFAULT '' NOT NULL, + `toip` VARCHAR(64) DEFAULT '' NOT NULL, `fromtag` VARCHAR(128) DEFAULT '' NOT NULL, `totag` VARCHAR(128) DEFAULT '' NOT NULL, `direction` VARCHAR(4) DEFAULT '' NOT NULL diff --git a/utils/kamctl/oracle/siptrace-create.sql b/utils/kamctl/oracle/siptrace-create.sql index 4b4dc62939..38f0681864 100644 --- a/utils/kamctl/oracle/siptrace-create.sql +++ b/utils/kamctl/oracle/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg CLOB, method VARCHAR2(50) DEFAULT '', status VARCHAR2(255) DEFAULT '', - fromip VARCHAR2(50) DEFAULT '', - toip VARCHAR2(50) DEFAULT '', + fromip VARCHAR2(64) DEFAULT '', + toip VARCHAR2(64) DEFAULT '', fromtag VARCHAR2(128) DEFAULT '', totag VARCHAR2(128) DEFAULT '', direction VARCHAR2(4) DEFAULT '' diff --git a/utils/kamctl/postgres/siptrace-create.sql b/utils/kamctl/postgres/siptrace-create.sql index b3ea989ce8..3b7cd461b5 100644 --- a/utils/kamctl/postgres/siptrace-create.sql +++ b/utils/kamctl/postgres/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg TEXT NOT NULL, method VARCHAR(50) DEFAULT '' NOT NULL, status VARCHAR(255) DEFAULT '' NOT NULL, - fromip VARCHAR(50) DEFAULT '' NOT NULL, - toip VARCHAR(50) DEFAULT '' NOT NULL, + fromip VARCHAR(64) DEFAULT '' NOT NULL, + toip VARCHAR(64) DEFAULT '' NOT NULL, fromtag VARCHAR(128) DEFAULT '' NOT NULL, totag VARCHAR(128) DEFAULT '' NOT NULL, direction VARCHAR(4) DEFAULT '' NOT NULL

1 0

[kamailio/kamailio] kazoo error (#2833)
by nihaomatmat 24 Aug '21

24 Aug '21

ERROR: kazoo [kz_amqp.c:2238]: kz_amqp_send_ex(): Failed to publish -9 : a socket error occurred ERROR: kazoo [kz_amqp.c:2707]: kz_amqp_publisher_send(): error sending publish to zone : local , connection id : 1, uri : amqp://admin Recently, I encountered a problem. The connection between kamailio and rabbitmq was interrupted, which caused the queue of MQ to be blocked and the message could not be consumed。 Above is kamailio's error log。 -- 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/2833

2 2

git:master:5ad81a45: kamctl: regenerate db creation scripts
by Daniel-Constantin Mierla 23 Aug '21

23 Aug '21

Module: kamailio Branch: master Commit: 5ad81a45bb28ca419d9285cc59816db0fa1afefd URL: https://github.com/kamailio/kamailio/commit/5ad81a45bb28ca419d9285cc59816db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-23T20:46:12+02:00 kamctl: regenerate db creation scripts --- Modified: utils/kamctl/db_sqlite/siptrace-create.sql Modified: utils/kamctl/mysql/siptrace-create.sql Modified: utils/kamctl/oracle/siptrace-create.sql Modified: utils/kamctl/postgres/siptrace-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/5ad81a45bb28ca419d9285cc59816db… Patch: https://github.com/kamailio/kamailio/commit/5ad81a45bb28ca419d9285cc59816db… --- diff --git a/utils/kamctl/db_sqlite/siptrace-create.sql b/utils/kamctl/db_sqlite/siptrace-create.sql index 2860d0a4e2..7f847816fd 100644 --- a/utils/kamctl/db_sqlite/siptrace-create.sql +++ b/utils/kamctl/db_sqlite/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg TEXT NOT NULL, method VARCHAR(50) DEFAULT '' NOT NULL, status VARCHAR(255) DEFAULT '' NOT NULL, - fromip VARCHAR(50) DEFAULT '' NOT NULL, - toip VARCHAR(50) DEFAULT '' NOT NULL, + fromip VARCHAR(64) DEFAULT '' NOT NULL, + toip VARCHAR(64) DEFAULT '' NOT NULL, fromtag VARCHAR(128) DEFAULT '' NOT NULL, totag VARCHAR(128) DEFAULT '' NOT NULL, direction VARCHAR(4) DEFAULT '' NOT NULL diff --git a/utils/kamctl/mysql/siptrace-create.sql b/utils/kamctl/mysql/siptrace-create.sql index bd08a8a49f..c74913c0e2 100644 --- a/utils/kamctl/mysql/siptrace-create.sql +++ b/utils/kamctl/mysql/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE `sip_trace` ( `msg` MEDIUMTEXT NOT NULL, `method` VARCHAR(50) DEFAULT '' NOT NULL, `status` VARCHAR(255) DEFAULT '' NOT NULL, - `fromip` VARCHAR(50) DEFAULT '' NOT NULL, - `toip` VARCHAR(50) DEFAULT '' NOT NULL, + `fromip` VARCHAR(64) DEFAULT '' NOT NULL, + `toip` VARCHAR(64) DEFAULT '' NOT NULL, `fromtag` VARCHAR(128) DEFAULT '' NOT NULL, `totag` VARCHAR(128) DEFAULT '' NOT NULL, `direction` VARCHAR(4) DEFAULT '' NOT NULL diff --git a/utils/kamctl/oracle/siptrace-create.sql b/utils/kamctl/oracle/siptrace-create.sql index 4b4dc62939..38f0681864 100644 --- a/utils/kamctl/oracle/siptrace-create.sql +++ b/utils/kamctl/oracle/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg CLOB, method VARCHAR2(50) DEFAULT '', status VARCHAR2(255) DEFAULT '', - fromip VARCHAR2(50) DEFAULT '', - toip VARCHAR2(50) DEFAULT '', + fromip VARCHAR2(64) DEFAULT '', + toip VARCHAR2(64) DEFAULT '', fromtag VARCHAR2(128) DEFAULT '', totag VARCHAR2(128) DEFAULT '', direction VARCHAR2(4) DEFAULT '' diff --git a/utils/kamctl/postgres/siptrace-create.sql b/utils/kamctl/postgres/siptrace-create.sql index b3ea989ce8..3b7cd461b5 100644 --- a/utils/kamctl/postgres/siptrace-create.sql +++ b/utils/kamctl/postgres/siptrace-create.sql @@ -7,8 +7,8 @@ CREATE TABLE sip_trace ( msg TEXT NOT NULL, method VARCHAR(50) DEFAULT '' NOT NULL, status VARCHAR(255) DEFAULT '' NOT NULL, - fromip VARCHAR(50) DEFAULT '' NOT NULL, - toip VARCHAR(50) DEFAULT '' NOT NULL, + fromip VARCHAR(64) DEFAULT '' NOT NULL, + toip VARCHAR(64) DEFAULT '' NOT NULL, fromtag VARCHAR(128) DEFAULT '' NOT NULL, totag VARCHAR(128) DEFAULT '' NOT NULL, direction VARCHAR(4) DEFAULT '' NOT NULL

1 0

git:master:4decc7ca: lib/srdb1/schema: use proto_addr_len from sip_trace from/to ip fields
by Daniel-Constantin Mierla 23 Aug '21

23 Aug '21

Module: kamailio Branch: master Commit: 4decc7ca50089f94d4fcc2ad4af2b4e1089986e7 URL: https://github.com/kamailio/kamailio/commit/4decc7ca50089f94d4fcc2ad4af2b4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-23T20:46:12+02:00 lib/srdb1/schema: use proto_addr_len from sip_trace from/to ip fields - size of fields is now 64 - they store proto:addr:port - GH #2831 --- Modified: src/lib/srdb1/schema/entities.xml Modified: src/lib/srdb1/schema/sip_trace.xml --- Diff: https://github.com/kamailio/kamailio/commit/4decc7ca50089f94d4fcc2ad4af2b4e… Patch: https://github.com/kamailio/kamailio/commit/4decc7ca50089f94d4fcc2ad4af2b4e… --- diff --git a/src/lib/srdb1/schema/entities.xml b/src/lib/srdb1/schema/entities.xml index 4ca1b6bfed..8021e8e738 100644 --- a/src/lib/srdb1/schema/entities.xml +++ b/src/lib/srdb1/schema/entities.xml @@ -30,6 +30,7 @@ <!ENTITY etag_len "128"> <!ENTITY aname_len "64"> <!ENTITY avalue_len "512"> +<!ENTITY proto_addr_len "64"> <!ENTITY MYSQL_TABLE_TYPE ""> <!ENTITY USERCOL "username"> <!ENTITY DEFAULT_ALIASES_EXPIRES "2030-05-28 21:32:15"> diff --git a/src/lib/srdb1/schema/sip_trace.xml b/src/lib/srdb1/schema/sip_trace.xml index 5aa38369fd..21b4f0ef61 100644 --- a/src/lib/srdb1/schema/sip_trace.xml +++ b/src/lib/srdb1/schema/sip_trace.xml @@ -91,7 +91,7 @@ <column id="fromip"> <name>fromip</name> <type>string</type> - <size>&ip_add_len;</size> + <size>&proto_addr_len;</size> <default/> <description>Source IP address</description> </column> @@ -99,7 +99,7 @@ <column> <name>toip</name> <type>string</type> - <size>&ip_add_len;</size> + <size>&proto_addr_len;</size> <default/> <description>Destination IP address</description> </column>

1 0

How to tell if rtp packets are being relayed through kamailio
by Faiz Fazaluddin 22 Aug '21

22 Aug '21

Hi, I want to see if rtp packets are being relayed through kamailio. I am attmepting to connect rtpengine with kamailio, but am not sure if it is working, how can I tell? I have the kamailio server on a different VM than the clients. In wireshark, no rtp packets show on the server VM and rtp packets only seem to be going directly through the client VM. Rtp engine mentions being unable to find hashtables when attempting to implement a delete_node command. Thank you very much for your help, Faiz

1 0

[kamailio/kamailio] tm - remove not used route_mode var (#2830)
by Luis Martin Gil 21 Aug '21

21 Aug '21

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Removed not used variable "route_mode" in the tm module. This was discovered by @IvanRibakov when using a g++ compiler, which added more strict flags (Ivan's Github is [here](https://github.com/IvanRibakov)) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2830 -- Commit Summary -- * tm - remove not used route_mode var -- File Changes -- M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2830.patch https://github.com/kamailio/kamailio/pull/2830.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/2830

2 2

git:5.5:d4ea970e: tm - remove not used route_mode var
by Henning Westerholt 21 Aug '21

21 Aug '21

Module: kamailio Branch: 5.5 Commit: d4ea970ecbb4688cdd30890229db4418cb0cff29 URL: https://github.com/kamailio/kamailio/commit/d4ea970ecbb4688cdd30890229db441… Author: Luis Martin Gil <luismartingil(a)zaleos.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-21T10:40:44Z tm - remove not used route_mode var (cherry picked from commit 6619be46249dfe0b2f2cbc863cb8b2f44716122b) --- Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/d4ea970ecbb4688cdd30890229db441… Patch: https://github.com/kamailio/kamailio/commit/d4ea970ecbb4688cdd30890229db441… --- diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 7eebd131d7..a0f3afde00 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -83,7 +83,6 @@ struct tm_binds { cancel_all_uacs_f cancel_all_uacs; prepare_request_within_f prepare_request_within; send_prepared_request_f send_prepared_request; - enum route_mode* route_mode; #ifdef DIALOG_CALLBACKS register_new_dlg_cb_f register_new_dlg_cb; register_dlg_tmcb_f register_dlg_tmcb;

1 0

git:master:743dcc10: tm - remove not used route_mode var
by Henning Westerholt 21 Aug '21

21 Aug '21

Module: kamailio Branch: master Commit: 743dcc103af2e4a9ef50a88f0800ca6c70f465dc URL: https://github.com/kamailio/kamailio/commit/743dcc103af2e4a9ef50a88f0800ca6… Author: Luis Martin Gil <luismartingil(a)zaleos.net> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-21T10:40:05Z tm - remove not used route_mode var (cherry picked from commit 6619be46249dfe0b2f2cbc863cb8b2f44716122b) --- Modified: src/modules/tm/tm_load.h --- Diff: https://github.com/kamailio/kamailio/commit/743dcc103af2e4a9ef50a88f0800ca6… Patch: https://github.com/kamailio/kamailio/commit/743dcc103af2e4a9ef50a88f0800ca6… --- diff --git a/src/modules/tm/tm_load.h b/src/modules/tm/tm_load.h index 7eebd131d7..a0f3afde00 100644 --- a/src/modules/tm/tm_load.h +++ b/src/modules/tm/tm_load.h @@ -83,7 +83,6 @@ struct tm_binds { cancel_all_uacs_f cancel_all_uacs; prepare_request_within_f prepare_request_within; send_prepared_request_f send_prepared_request; - enum route_mode* route_mode; #ifdef DIALOG_CALLBACKS register_new_dlg_cb_f register_new_dlg_cb; register_dlg_tmcb_f register_dlg_tmcb;

1 0

[kamailio/kamailio] tm - remove not used route_mode var (#2406)
by Luis Martin Gil 20 Aug '21

20 Aug '21

#### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Removed not used variable "route_mode" in the tm module. This was discovered by @IvanRibakov when using a g++ compiler, which added more strict flags (Ivan's Github is [here](https://github.com/IvanRibakov)) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2406 -- Commit Summary -- * tm - remove not used route_mode var -- File Changes -- M src/modules/tm/tm_load.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2406.patch https://github.com/kamailio/kamailio/pull/2406.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/2406

2 2

git:5.5:b102e101: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: b102e101747aba371639616d8520fe979f705206 URL: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-20T10:01:33+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/lwsc/README --- Diff: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… Patch: https://github.com/kamailio/kamailio/commit/b102e101747aba371639616d8520fe9… --- diff --git a/src/modules/lwsc/README b/src/modules/lwsc/README index d7ae1e48b9..4c310529ee 100644 --- a/src/modules/lwsc/README +++ b/src/modules/lwsc/README @@ -87,8 +87,7 @@ Chapter 1. Admin Guide external systems, similar to http client. It is not for routing SIP traffic. - It relies on libwebsockets (tested with v3.1.0) library - (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). 2. Dependencies @@ -104,7 +103,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libwebsockets - probably v3.1.0 or newer. + * libwebsockets - probably v2.0 or newer. 3. Parameters

1 0

git:5.5:cf93317b: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: cf93317b4252fbae7bbc640dcc150fc52e5a196e URL: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/sworker/README --- Diff: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… Patch: https://github.com/kamailio/kamailio/commit/cf93317b4252fbae7bbc640dcc150fc… --- diff --git a/src/modules/sworker/README b/src/modules/sworker/README index 241b077ab6..c5d571a179 100644 --- a/src/modules/sworker/README +++ b/src/modules/sworker/README @@ -115,7 +115,7 @@ request_route { that, 'drop' must be used so processing of the message does not continue to request_route or reply_route in the same process, it is going to be done by the delegated group of workers. It returns -1 - (false) in case there was a proble delegating the processing. + (false) in case there was a problem delegating the processing. This function can be used from REQUEST_ROUTE|CORE_REPLY_ROUTE.

1 0

git:5.5:49435452: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 494354527e2cbe180dfad3a42e3f89fed28e866c URL: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… Patch: https://github.com/kamailio/kamailio/commit/494354527e2cbe180dfad3a42e3f89f… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index 783b57ba57..49b786ac13 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -441,7 +441,7 @@ modparam("topos", "xavu_filed_b_contact", "b_contact") Example 1.16. Set xavu_field_contact_host parameter ... modparam("topos", "xavu_cfg", "_tps_") -modparam("topos", "xavu_contact_host", "contact_host") +modparam("topos", "xavu_field_contact_host", "contact_host") ... $xavu(_tps_=>contact_host) = "kamailio.org"; ...

1 0

git:5.5:13989086: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 139890860907e4f2fc55e05e2e9fe490fc76c4e1 URL: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/http_client/README Modified: src/modules/websocket/README Modified: src/modules/xhttp/README --- Diff: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… Patch: https://github.com/kamailio/kamailio/commit/139890860907e4f2fc55e05e2e9fe49… --- diff --git a/src/modules/htable/README b/src/modules/htable/README index 85f19c7102..25d6769065 100644 --- a/src/modules/htable/README +++ b/src/modules/htable/README @@ -1065,7 +1065,7 @@ kamcmd htable.sets test x[0] abc kamcmd htable.seti test x 123 # Set first entry in array key x $sht(test=>x[0]) as integer -kamcmd htable.sets test x[0] 123 +kamcmd htable.seti test x[0] 123 ... 6.5. htable.dump htable diff --git a/src/modules/http_client/README b/src/modules/http_client/README index 0028f9e623..a3de550a2b 100644 --- a/src/modules/http_client/README +++ b/src/modules/http_client/README @@ -503,7 +503,7 @@ modparam("http_client", "keep_connections", 1) Valid values are: * 0 - Return the entire HTTP result body - * 1 - Return the first oine from HTTP result body + * 1 - Return the first line from HTTP result body Default value: 1 (return first line). diff --git a/src/modules/websocket/README b/src/modules/websocket/README index 7ac759b205..cbe8fd98eb 100644 --- a/src/modules/websocket/README +++ b/src/modules/websocket/README @@ -162,6 +162,8 @@ Chapter 1. Admin Guide Example 1.1. event_route[xhttp:request] ... +tcp_accept_no_cl=yes +... loadmodule "sl.so" loadmodule "xhttp.so" loadmodule "msrp.so" # Only required if using MSRP over WebSockets diff --git a/src/modules/xhttp/README b/src/modules/xhttp/README index a38599775f..781ac41392 100644 --- a/src/modules/xhttp/README +++ b/src/modules/xhttp/README @@ -220,6 +220,11 @@ event_route[xhttp:request] { The event route is executed when a new HTTP request is received. ... +tcp_accept_no_cl=yes +... +loadmodule "sl.so" +loadmodule "xhttp.so +... event_route[xhttp:request] { xhttp_reply("200", "OK", "text/html", "<html><body>OK - [$si:$sp]</body></html>");

1 0

git:5.5:446e716f: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 446e716ff4c7e853ac9239cff8784cd30b7b8e8a URL: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… Patch: https://github.com/kamailio/kamailio/commit/446e716ff4c7e853ac9239cff8784cd… --- diff --git a/src/modules/siputils/README b/src/modules/siputils/README index 6a1ae76b9f..87d3ecf9e4 100644 --- a/src/modules/siputils/README +++ b/src/modules/siputils/README @@ -761,7 +761,7 @@ if (is_alphanumex("$rU", "+.-_")) { This function will encode uri-s inside Contact header in the following manner sip:username:password@ip:port;transport=protocol goes - sip:encoding_prefix*username*ip*port*protocol@hostpart. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart. * is the default separator and can be changed by setting the contact_flds_separator module parameter. @@ -787,9 +787,9 @@ if (src_ip == 10.0.0.0/8) encode_contact("natted_client","1.2.3.4"); 4.20. decode_contact() This function will decode the request URI. If the RURI is in the format - sip:encoding_prefix*username*ip*port*protocol@hostpart it will be - decoded to sip:username:password@ip:port;transport=protocol It uses the - default set parameter for contact encoding separator. + sip:encoding_prefix*username*password*ip*port*protocol@hostpart it will + be decoded to sip:username:password@ip:port;transport=protocol. It uses + the default set parameter for contact encoding separator. The function returns negative on error, 1 on success.

1 0

git:5.5:345e57ec: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 345e57ec3852bb0e9b3a11f35c4d56098aba1fb6 URL: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/xhttp_prom/README --- Diff: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… Patch: https://github.com/kamailio/kamailio/commit/345e57ec3852bb0e9b3a11f35c4d560… --- diff --git a/src/modules/xhttp_prom/README b/src/modules/xhttp_prom/README index 4ccdd4bd06..280d79caa8 100644 --- a/src/modules/xhttp_prom/README +++ b/src/modules/xhttp_prom/README @@ -512,7 +512,7 @@ prom_gauge_set("gg01", "-12.5"); ... # Definition of gg02 gauge with two labels method and IP -modparam("xhttp_prom", "prom_gauge", "name=cnt02; label=method:IP;"); +modparam("xhttp_prom", "prom_gauge", "name=gg02; label=method:IP;"); ... # Assign 2.8 to value of gg02 gauge with labels method and IP. It creates the ga uge if it does not exist.

1 0

git:5.5:8f14c083: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 8f14c0838912c18b8e244a904f96146c610fca91 URL: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/secsipid/README --- Diff: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… Patch: https://github.com/kamailio/kamailio/commit/8f14c0838912c18b8e244a904f96146… --- diff --git a/src/modules/secsipid/README b/src/modules/secsipid/README index c96b7830c6..b42915943b 100644 --- a/src/modules/secsipid/README +++ b/src/modules/secsipid/README @@ -299,7 +299,7 @@ request_route { 5. Installation - The module needs "secsipdi_proc.so" module thatdepends on + The module needs "secsipdi_proc.so" module that depends on "libsecsipid", which is a component of "sipsecidx" project from https://github.com/asipto/secsipidx/. The library is implemented in Go language, with generated C API and library. Until the libsecsipid is @@ -313,6 +313,7 @@ request_route { Example 1.11. Libsecsipid Usage ... +export GO111MODULE=off go get https://github.com/asipto/secsipidx cd $GOPATH/src/github.com/asipto/secsipidx/csecsipid/ make liba @@ -328,3 +329,6 @@ make install # make modules modules=src/modules/secsipid_proc # make modules modules=src/modules/secsipid ... + + For more details about compilation and installation of libsecsipid, + see: https://github.com/asipto/secsipidx.

1 0

git:5.5:a629760e: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: a629760eaff8cac4679482f616c8288623c88ec4 URL: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/jwt/README --- Diff: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… Patch: https://github.com/kamailio/kamailio/commit/a629760eaff8cac4679482f616c8288… --- diff --git a/src/modules/jwt/README b/src/modules/jwt/README index 7a7400a4b1..459f10a822 100644 --- a/src/modules/jwt/README +++ b/src/modules/jwt/README @@ -122,14 +122,17 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be added to JWT, in the format "name1=value1;name2=value2;..." (same as the SIP parameters - format). + format). The string values can be enclosed in single or double + quotes. If a value is not eclosed in between quotes, it is added as + numeric value if it is successfully converted to a long value, + otherwise is added as string value. This function can be used from ANY_ROUTE. Example 1.2. jwt_generate usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); ... 4.2. jwt_verify(pubkey, alg, claims, jwtval) @@ -142,7 +145,8 @@ modparam("jwt", "key_mode", 1) libjwt (e.g., RS256, HS256, ES256, ...) * claims - the list of claims to be checked they are in the JWT, in the format "name1=value1;name2=value2;..." (same as the SIP - parameters format). + parameters format, see also the description of claims parameter for + jwt_generate()). * jwtval - the value of the JWT to verify This function can be used from ANY_ROUTE. @@ -150,7 +154,7 @@ modparam("jwt", "key_mode", 1) Example 1.3. jwt_verify usage ... if(!jwt_verify("/path/to/pubkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci", + "caller='$fU';callee='$tU';callid='$ci';index=100", "$var(jwt)") { xwarn("failed to verify jwt\n"); } @@ -171,6 +175,6 @@ modparam("jwt", "key_mode", 1) Example 1.4. $jwt(name) usage ... jwt_generate("/path/to/prvkey.pem", "RS256", - "caller=$fU;callee=$tU;callid=$ci"); + "caller='$fU';callee='$tU';callid='$ci';index=100"); xinfo("jwt is: $jwt(val)"); ...

1 0

git:5.5:9bb2c11d: modules: readme files regenerated - modules ... [skip ci]
by The Root 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 9bb2c11de3966c40d84896cf7077131f0bc14f28 URL: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2021-08-20T10:01:16+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/lost/README --- Diff: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… Patch: https://github.com/kamailio/kamailio/commit/9bb2c11de3966c40d84896cf7077131… --- diff --git a/src/modules/lost/README b/src/modules/lost/README index 14cf3b36a6..00fa5f2ceb 100644 --- a/src/modules/lost/README +++ b/src/modules/lost/README @@ -376,8 +376,15 @@ r(pidf)\n"); * pidf-lo - the PIDF-LO returned in the HELD locationRequest response * error - any error code returned in the HELD response - The return value is 200 on success, 400 if an internal error occured, - or 500 if an error code is returned in the HELD response. + The return value is 200..203 on success, 400 if an internal error + occured, or 500 if an error code is returned in the HELD response. + Success codes in detail are as follows: + * 200 - received 200 OK, but neither location-info nor locationURI + element found + * 201 - received 200 OK with locationURI (aka Location-by-Reference) + * 202 - received 200 OK with location-info element (aka + Location-by-Value) + * 203 - received 200 OK with location-info and locationURI element This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE, and BRANCH_ROUTE.

1 0

git:5.5:de84b32e: core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: de84b32eb42e19f8626947da1c567eea2d0869fb URL: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:38+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets (cherry picked from commit 31377b160df563a222bec5a1bf92590635429240) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… Patch: https://github.com/kamailio/kamailio/commit/de84b32eb42e19f8626947da1c567ee… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0f82033c9f..9fd5635655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -513,7 +513,8 @@ static inline int lump_check_opt( struct lump *l, } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) { + if ((proto!=snd_i->send_sock->proto) + || (msg->rcv.proto!=snd_i->proto)) { LUMP_SET_COND_TRUE(l); return 1; } else return 0;

1 0

git:5.5:52978a08: core: check message rcv and snd proto for diff realms lump conditions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 52978a0873eb068be31ca0688e64c88e4872efac URL: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T10:00:27+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports (cherry picked from commit 871f8113612148a49e69218e70ed7f475fb665db) --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… Patch: https://github.com/kamailio/kamailio/commit/52978a0873eb068be31ca0688e64c88… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index a2f6505e83..0f82033c9f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -493,8 +493,9 @@ static inline int lump_check_opt( struct lump *l, case COND_IF_DIFF_REALMS: get_ip_port_proto; /* faster tests first */ - if ((port==snd_i->send_sock->port_no) && + if ((port==snd_i->send_sock->port_no) && (proto==snd_i->send_sock->proto) && + (msg->rcv.proto==snd_i->proto) && #ifdef USE_COMP (msg->rcv.comp==snd_i->comp) && #endif

1 0

git:5.5:6b1fb350: lwsc: docs - updated references to libwebsockets version
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 6b1fb350458ad19192327e0dcedafa4749b6eb7c URL: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:29+02:00 lwsc: docs - updated references to libwebsockets version - GH #2749 (cherry picked from commit 01afcc7fb2468c21a8e1cfb1a717fa96299794fa) --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… Patch: https://github.com/kamailio/kamailio/commit/6b1fb350458ad19192327e0dcedafa4… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 2f00c8fbd6..3e82f4b52b 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -20,7 +20,7 @@ external systems, similar to http client. It is not for routing SIP traffic. </para> <para> - It relies on libwebsockets (tested with v3.1.0) library (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). </para> </section> @@ -47,7 +47,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libwebsockets</emphasis> - probably v3.1.0 or newer. + <emphasis>libwebsockets</emphasis> - probably v2.0 or newer. </para> </listitem> </itemizedlist>

1 0

git:5.5:b49f23af: drouting: added dr_ prefix to internal time recurrence functions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: b49f23af03d5e2f0364610739e7ef6e07cfd54a5 URL: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:08+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 (cherry picked from commit 33ea38f35f9911a26a757dbfa22065eb80a9a24a) --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e… Patch: https://github.com/kamailio/kamailio/commit/b49f23af03d5e2f0364610739e7ef6e…

1 0

git:5.5:7e3e0a81: cplc: use cpl_ prefix for internal time recurrence functions
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 7e3e0a81bf458bd90bc1454c81bf21d64ed9212c URL: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:34:18+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 (cherry picked from commit 431544864c97d1848db1c0c42a03251a214f04cd) --- Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cpl_time.h --- Diff: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d… Patch: https://github.com/kamailio/kamailio/commit/7e3e0a81bf458bd90bc1454c81bf21d…

1 0

git:5.5:d8ff1845: kazoo : fix routing of reply events
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: d8ff1845c34a7f9d8e6911ae3d2055b122eb3b79 URL: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:47+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] (cherry picked from commit fb2eee3e175040fef5e76cbed11430976f62df32) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… Patch: https://github.com/kamailio/kamailio/commit/d8ff1845c34a7f9d8e6911ae3d2055b… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

1 0

git:5.5:680d98ca: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 680d98caccc0216f43c2b5de83935dbc4853ab9d URL: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:35+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 (cherry picked from commit 22a72f3a7725d56f00e22bdc52d44bd53da7c091) --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… Patch: https://github.com/kamailio/kamailio/commit/680d98caccc0216f43c2b5de83935db… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

1 0

git:5.5:ad5f0f52: tm: restore xavps & flags after rebuilding message
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ad5f0f522f43a69e0f7f930cac5aefc3f21607df URL: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:22+02:00 tm: restore xavps & flags after rebuilding message (cherry picked from commit 7ee642c58991e594f38247ab0751fadd07ce758c) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… Patch: https://github.com/kamailio/kamailio/commit/ad5f0f522f43a69e0f7f930cac5aefc… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

1 0

git:5.5:105b1542: misc/tools/protoshoot: removed svn id and history
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 105b15422f611ba1dcc59be30f7f4d474b294d03 URL: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:30:37+02:00 misc/tools/protoshoot: removed svn id and history (cherry picked from commit e3875c01adf576f179374a926e69e99c0094e5b4) --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… Patch: https://github.com/kamailio/kamailio/commit/105b15422f611ba1dcc59be30f7f4d4… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

1 0

git:5.5:01ab21c4: core: parse session sendrecv_mode in sdp
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 01ab21c4ba28259be72fd704afd389132260e258 URL: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:32:55+02:00 core: parse session sendrecv_mode in sdp - some user agents send a=sendonly as session attribute which apply to all media streams (cherry picked from commit 8da4477fd6d9590b9946071b9ac2a778b1d55d01) --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h --- Diff: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… Patch: https://github.com/kamailio/kamailio/commit/01ab21c4ba28259be72fd704afd3891… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d5e4f0695b..14779e4d12 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -453,6 +453,18 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ extract_bwidth(&tmpstr1, &session->bw_type, &session->bw_width); } + /* Find sendrecv_mode between session begin and first media. + * parse session attributes to check is_on_hold for a= for all medias. */ + a1p = find_first_sdp_line(o1p, m1p, 'a', NULL); + while (a1p) { + tmpstr1.s = a1p; + tmpstr1.len = m1p - a1p; + if (extract_sendrecv_mode(&tmpstr1, &session->sendrecv_mode, &session->is_on_hold) == 0) { + break; + } + a1p = find_next_sdp_line(a1p, m1p, 'a', NULL); + } + /* Have session. Iterate media descriptions in session */ m2p = m1p; stream_num = 0; diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index 84ebcfc8a2..d8c1b15b66 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -111,6 +111,8 @@ typedef struct sdp_session_cell { AS - application specific */ str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ int streams_num; /**< number of streams inside a session */ + str sendrecv_mode; + int is_on_hold; /**< flag indicating if this session is on hold */ struct sdp_stream_cell* streams; } sdp_session_cell_t;

1 0

git:5.5:dadac04b: textops: check session sendrecv_mode in is_audio_on_hold
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: dadac04b0153a29ed7c1ebb48e887c06989fa49c URL: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:33:08+02:00 textops: check session sendrecv_mode in is_audio_on_hold - if sendrecv_mode is not set in media, check if its set in session (cherry picked from commit cbcc27ef8b1674448bd8b1c45f03388e36f65f51) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… Patch: https://github.com/kamailio/kamailio/commit/dadac04b0153a29ed7c1ebb48e887c0… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 2998906051..4b3216d4d2 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4367,8 +4367,15 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + !sdp_stream->sendrecv_mode.len && + sdp_session->sendrecv_mode.len && + sdp_session->is_on_hold) + return sdp_session->is_on_hold; sdp_stream_num++; } sdp_session_num++;

1 0

git:5.5:ede5a839: core: parser sdp - shorten debug message with sdp line
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ede5a8399662903c2aa081b7010603398a598e94 URL: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:29:51+02:00 core: parser sdp - shorten debug message with sdp line - was printing the rest of the body, print now max 20 chars (cherry picked from commit 4191a8193025499df64f13d59f5716563e573161) --- Modified: src/core/parser/sdp/sdp.c --- Diff: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… Patch: https://github.com/kamailio/kamailio/commit/ede5a8399662903c2aa081b70106033… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index 7dbf259379..d5e4f0695b 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -584,7 +584,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a1p = stream->path.s + stream->path.len; } else { /* unknown a= line, ignore -- jump over it */ - LM_DBG("ignoring unknown type in a= line: `%.*s'\n", tmpstr1.len, tmpstr1.s); + LM_DBG("ignoring unknown type in a= line: `%.*s...'\n", + (tmpstr1.len>20)?20:tmpstr1.len, tmpstr1.s); a1p += 2; }

1 0

git:5.5:96f24cae: sdpops: refactored sdp_remove_str_codec_id_attrs()
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 96f24caed768b1b382b166eea835e555eac5e933 URL: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:30:01+02:00 sdpops: refactored sdp_remove_str_codec_id_attrs() - line oriented matching of codec addributes - support to remove a=rtcp-fb per codec, GH #2755 (cherry picked from commit 1a15a18eacd5764e9ba6240acbe37e645368f825) --- Modified: src/modules/sdpops/sdpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… Patch: https://github.com/kamailio/kamailio/commit/96f24caed768b1b382b166eea835e55… --- diff --git a/src/modules/sdpops/sdpops_mod.c b/src/modules/sdpops/sdpops_mod.c index bebe01ba5c..37655fde4b 100644 --- a/src/modules/sdpops/sdpops_mod.c +++ b/src/modules/sdpops/sdpops_mod.c @@ -195,48 +195,45 @@ int sdp_locate_line(sip_msg_t* msg, char *pos, str *aline) int sdp_remove_str_codec_id_attrs(sip_msg_t* msg, sdp_stream_cell_t* sdp_stream, str *rm_codec) { + str sdp_attrs_list[] = { + str_init("a=rtpmap:"), + str_init("a=fmtp:"), + str_init("a=rtcp-fb:"), + {0, 0} + }; + int i; str aline = {0, 0}; - sdp_payload_attr_t *payload; + str raw_stream = {0, 0}; struct lump *anchor; - payload = sdp_stream->payload_attr; - while (payload) { - LM_DBG("a= ... for codec %.*s/%.*s\n", - payload->rtp_payload.len, payload->rtp_payload.s, - payload->rtp_enc.len, payload->rtp_enc.s); - if(rm_codec->len==payload->rtp_payload.len - && strncmp(payload->rtp_payload.s, rm_codec->s, - rm_codec->len)==0) { - if(payload->rtp_enc.s!=NULL) { - if(sdp_locate_line(msg, payload->rtp_enc.s, &aline)==0) - { - LM_DBG("removing line: %.*s", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; - } - } - } - if(payload->fmtp_string.s!=NULL) { - if(sdp_locate_line(msg, payload->fmtp_string.s, &aline)==0) - { - LM_DBG("removing line: %.*s\n", aline.len, aline.s); - anchor = del_lump(msg, aline.s - msg->buf, - aline.len, 0); - if (anchor == NULL) { - LM_ERR("failed to remove [%.*s] inside [%.*s]\n", - rm_codec->len, rm_codec->s, - aline.len, aline.s); - return -1; + raw_stream = sdp_stream->raw_stream; + while(raw_stream.len>5) { + sdp_locate_line(msg, raw_stream.s, &aline); + /* process attribute lines: a=x:c... */ + if((aline.len>5) && ((aline.s[0] | 0x20)=='a')) { + LM_DBG("processing sdp line [%.*s]\n", aline.len, aline.s); + for(i=0; sdp_attrs_list[i].s!=NULL; i++) { + if(aline.len > sdp_attrs_list[i].len + rm_codec->len) { + if(strncasecmp(aline.s, sdp_attrs_list[i].s, + sdp_attrs_list[i].len)==0 + && strncmp(aline.s+sdp_attrs_list[i].len, rm_codec->s, + rm_codec->len)==0 + && aline.s[sdp_attrs_list[i].len + rm_codec->len]==' ') { + LM_DBG("removing line: [%.*s]\n", aline.len, aline.s); + anchor = del_lump(msg, aline.s - msg->buf, + aline.len, 0); + if (anchor == NULL) { + LM_ERR("failed to remove - id [%.*s] line [%.*s]\n", + rm_codec->len, rm_codec->s, + aline.len, aline.s); + return -1; + } } } } } - payload=payload->next; + raw_stream.s = aline.s + aline.len; + raw_stream.len -= aline.len; } return 0;

1 0

git:5.5:ba8a06d2: core: enables compilation with debug symbols by default for other architectures
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: ba8a06d2988e41b09947d3ae3386a13e3d8415b9 URL: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:27:52+02:00 core: enables compilation with debug symbols by default for other architectures - enables compilation with debug symbols by default for other architectures in core - pull request GH #2811 - closes GH #2789 (cherry picked from commit ed46adad82e7b6569eb42704c5460263d2af75f7) --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13… Patch: https://github.com/kamailio/kamailio/commit/ba8a06d2988e41b09947d3ae3386a13…

1 0

git:5.5:48eb4165: db_redis: fix broken pipe issue, if redis server with timeout setting.
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: 5.5 Commit: 48eb41654859e6130c82c46400b529f2af9ce908 URL: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… Author: FredWH <wh720(a)139.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T21:28:34+02:00 db_redis: fix broken pipe issue, if redis server with timeout setting. - issue #2764 (cherry picked from commit 7cec977f8e12bbeb0309d903e02461d1ccbf41a8) --- Modified: src/modules/db_redis/redis_connection.c --- Diff: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… Patch: https://github.com/kamailio/kamailio/commit/48eb41654859e6130c82c46400b529f… --- diff --git a/src/modules/db_redis/redis_connection.c b/src/modules/db_redis/redis_connection.c index ad2921f1d5..dd421a7844 100644 --- a/src/modules/db_redis/redis_connection.c +++ b/src/modules/db_redis/redis_connection.c @@ -305,7 +305,8 @@ void *db_redis_command_argv(km_redis_con_t *con, redis_key_t *query) { LM_DBG("query has %d args\n", argc); redisReply *reply = redisCommandArgv(con->con, argc, (const char**)argv, NULL); - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -344,7 +345,8 @@ int db_redis_append_command_argv(km_redis_con_t *con, redis_key_t *query, int qu // this should actually never happen, because if all replies // are properly consumed for the previous command, it won't send // out a new query until redisGetReply is called - if (con->con->err == REDIS_ERR_EOF) { + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); pkg_free(argv); @@ -374,8 +376,8 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { *reply = NULL; ret = redisGetReply(con->con, reply); - if (con->con->err == REDIS_ERR_EOF) { - LM_DBG("redis connection is gone, try reconnect\n"); + if (con->con->err != REDIS_OK) { + LM_DBG("redis connection is gone, try reconnect. (%d:%s)\n", con->con->err, con->con->errstr); con->append_counter = 0; if (db_redis_connect(con) != 0) { LM_ERR("Failed to reconnect to redis db\n"); @@ -396,7 +398,7 @@ int db_redis_get_reply(km_redis_con_t *con, void **reply) { db_redis_key_free(&query); } ret = redisGetReply(con->con, reply); - if (con->con->err != REDIS_ERR_EOF) { + if (con->con->err == REDIS_OK) { con->append_counter--; } } else {

1 0

git:master:fedafcff: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 20 Aug '21

20 Aug '21

Module: kamailio Branch: master Commit: fedafcff44ab2161314ab4b15e9e9c64ca2f8c7d URL: https://github.com/kamailio/kamailio/commit/fedafcff44ab2161314ab4b15e9e9c6… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-20T08:16:19+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/fedafcff44ab2161314ab4b15e9e9c6… Patch: https://github.com/kamailio/kamailio/commit/fedafcff44ab2161314ab4b15e9e9c6… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 6bade01585..210aa2303b 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -30,6 +30,8 @@ Daniel-Constantin Mierla 3.2. http_tlsmode (int) 3.3. http_reuse (int) 3.4. http_retry (int) + 3.5. http_logtype (int) + 3.6. http_debug (int) 4. Functions @@ -44,9 +46,11 @@ Daniel-Constantin Mierla 1.2. Set http_tlsmode parameter 1.3. Set http_reuse parameter 1.4. Set http_retry parameter - 1.5. ruxc_http_get() usage - 1.6. ruxc_http_post() usage - 1.7. Libruxc Usage + 1.5. Set http_logtype parameter + 1.6. Set http_debug parameter + 1.7. ruxc_http_get() usage + 1.8. ruxc_http_post() usage + 1.9. Libruxc Usage Chapter 1. Admin Guide @@ -64,6 +68,8 @@ Chapter 1. Admin Guide 3.2. http_tlsmode (int) 3.3. http_reuse (int) 3.4. http_retry (int) + 3.5. http_logtype (int) + 3.6. http_debug (int) 4. Functions @@ -103,6 +109,8 @@ Chapter 1. Admin Guide 3.2. http_tlsmode (int) 3.3. http_reuse (int) 3.4. http_retry (int) + 3.5. http_logtype (int) + 3.6. http_debug (int) 3.1. http_timeout (int) @@ -158,6 +166,29 @@ modparam("ruxc", "http_reuse", 1) modparam("ruxc", "http_retry", 2) ... +3.5. http_logtype (int) + + Set the log type for libruxc http functions: 0 - stdout; 1 - syslog. + + Default value is 0. + + Example 1.5. Set http_logtype parameter +... +modparam("ruxc", "http_logtype", 1) +... + +3.6. http_debug (int) + + Set the debug mode for libruxc http functions: 0 - no debug; 1 - + errors; 2 - debug. + + Default value is 0. + + Example 1.6. Set http_debug parameter +... +modparam("ruxc", "http_debug", 1) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -175,7 +206,7 @@ modparam("ruxc", "http_retry", 2) This function can be used from ANY_ROUTE. - Example 1.5. ruxc_http_get() usage + Example 1.7. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -198,7 +229,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.6. ruxc_http_post() usage + Example 1.8. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -221,7 +252,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.7. Libruxc Usage + Example 1.9. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:31377b16: core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: master Commit: 31377b160df563a222bec5a1bf92590635429240 URL: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T07:03:45+02:00 core: check message snd and rcv proto for COND_IF_DIFF_PROTO lumps - besides comparing the protos of rcv and snd sockets --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… Patch: https://github.com/kamailio/kamailio/commit/31377b160df563a222bec5a1bf92590… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 0f82033c9f..9fd5635655 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -513,7 +513,8 @@ static inline int lump_check_opt( struct lump *l, } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) { + if ((proto!=snd_i->send_sock->proto) + || (msg->rcv.proto!=snd_i->proto)) { LUMP_SET_COND_TRUE(l); return 1; } else return 0;

1 0

git:master:ec3f9634: ruxc: added modparams to set libruxc logtype and debug
by Daniel-Constantin Mierla 20 Aug '21

20 Aug '21

Module: kamailio Branch: master Commit: ec3f9634c8474ff4dc9e5cb0ac451064e912734d URL: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-20T08:01:25+02:00 ruxc: added modparams to set libruxc logtype and debug --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… Patch: https://github.com/kamailio/kamailio/commit/ec3f9634c8474ff4dc9e5cb0ac45106… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index d0cd3bf7f7..2c1aec6285 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -140,6 +140,45 @@ modparam("ruxc", "http_reuse", 1) ... modparam("ruxc", "http_retry", 2) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_logtype"> + <title><varname>http_logtype</varname> (int)</title> + <para> + Set the log type for libruxc http functions: 0 - stdout; 1 - syslog. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>http_logtype</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_logtype", 1) +... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_debug"> + <title><varname>http_debug</varname> (int)</title> + <para> + Set the debug mode for libruxc http functions: 0 - no debug; 1 - errors; + 2 - debug. + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>http_debug</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_debug", 1) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 13c4a54b52..a31f650873 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -42,6 +42,8 @@ static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; static int _ruxc_http_retry = 0; +static int _ruxc_http_logtype = 0; +static int _ruxc_http_debug = 0; static int mod_init(void); static int child_init(int); @@ -77,6 +79,8 @@ static param_export_t params[]={ {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, {"http_retry", PARAM_INT, &_ruxc_http_retry}, + {"http_logtype", PARAM_INT, &_ruxc_http_logtype}, + {"http_debug", PARAM_INT, &_ruxc_http_debug}, {0, 0, 0} }; @@ -101,6 +105,13 @@ struct module_exports exports = { */ static int mod_init(void) { + if(_ruxc_http_logtype==1 && log_stderr==1) { + LM_INFO("setting http logtype to 0\n"); + _ruxc_http_logtype = 0; + } else if(_ruxc_http_logtype==0 && log_stderr==0) { + LM_INFO("setting http logtype to 1\n"); + _ruxc_http_logtype = 1; + } return 0; } @@ -138,6 +149,8 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; v_http_request.retry = _ruxc_http_retry; + v_http_request.logtype = _ruxc_http_logtype; + v_http_request.debug = _ruxc_http_debug; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -237,6 +250,8 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; v_http_request.retry = _ruxc_http_retry; + v_http_request.logtype = _ruxc_http_logtype; + v_http_request.debug = _ruxc_http_debug; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

[kamailio/kamailio] kamcmd drouting.reload bug (#2827)
by ShadoWalkeR31 19 Aug '21

19 Aug '21

Every time when i call kamcmd drouting.reload in log i get message CRITICAL: <core> [core/mem/q_malloc.c:502]: qm_free(): BUG: bad pointer 0x7f7ea7c127d0 (out of memory block!) called from core: core/utils/tmrec.c: tmrec_free(393) - ignoring Tested on Centos 7, kamailio 5.4/5.5 from repo in kamailio wiki -- 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/2827

2 5

git:master:871f8113: core: check message rcv and snd proto for diff realms lump conditions
by Daniel-Constantin Mierla 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: 871f8113612148a49e69218e70ed7f475fb665db URL: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T18:14:50+02:00 core: check message rcv and snd proto for diff realms lump conditions - in addition to receive socket and send socket protos, which may be the same in cases of tcp/tls+ws/wss using same ports --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… Patch: https://github.com/kamailio/kamailio/commit/871f8113612148a49e69218e70ed7f4… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index a2f6505e83..0f82033c9f 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -493,8 +493,9 @@ static inline int lump_check_opt( struct lump *l, case COND_IF_DIFF_REALMS: get_ip_port_proto; /* faster tests first */ - if ((port==snd_i->send_sock->port_no) && + if ((port==snd_i->send_sock->port_no) && (proto==snd_i->send_sock->proto) && + (msg->rcv.proto==snd_i->proto) && #ifdef USE_COMP (msg->rcv.comp==snd_i->comp) && #endif

1 0

[kamailio/kamailio] Missing lwsc.so (#2749)
by Váradi Richárd 19 Aug '21

19 Aug '21

### Description I wanted to use the rtpengine module wiith websockets, so I installed the kamailio-lwsc-modules debian package. The problem is when I want to load the lwsc module it fails, because there is no lwsc.so file in /usr/lib/x86_64-linux-gnu/kamailio/modules/. I installed the libwebsockets-dev library, reinstalled the lwsc module, but I experience the same issue.  ### Troubleshooting #### Reproduction I installed kamailio on Ubuntu 20.04 and simply tried to load lwsc.so with this line `loadmodule "lwsc.so"`  #### Log Messages  ``` Starting Kamailio - the Open Source SIP Server... May 27 11:23:06 kamailio kamailio[3387]: ERROR: <core> [core/sr_module.c:504]: ksr_locate_module(): could not find module <lwsc> in </usr/lib/x86_64-linux-gnu/kamailio/modules> May 27 11:23:06 kamailio kamailio[3387]: CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 308, column 12-20: failed to load module May 27 11:23:06 kamailio kamailio[3387]: ERROR: <core> [core/modparam.c:178]: set_mod_param_regex(): No module matching <lwsc> found May 27 11:23:06 kamailio kamailio[3387]: CRITICAL: <core> [core/cfg.y:3686]: yyerror_at(): parse error in config file /etc/kamailio/kamailio.cfg, line 460, column 35: Can't set module parameter May 27 11:23:06 kamailio kamailio[3387]: ERROR: bad config file (2 errors) (parsing code: 0) May 27 11:23:06 kamailio kamailio[3387]: INFO: <core> [core/sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized May 27 11:23:06 kamailio systemd[1]: kamailio.service: Control process exited, code=exited, status=255/EXCEPTION May 27 11:23:06 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. May 27 11:23:06 kamailio systemd[1]: Failed to start Kamailio - the Open Source SIP Server. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Scheduled restart job, restart counter is at 5. May 27 11:23:06 kamailio systemd[1]: Stopped Kamailio - the Open Source SIP Server. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Start request repeated too quickly. May 27 11:23:06 kamailio systemd[1]: kamailio.service: Failed with result 'exit-code'. May 27 11:23:06 kamailio systemd[1]: Failed to start Kamailio - the Open Source SIP Server. ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.0 (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_BLOCKLIST, 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 9.3.0 ``` * **Operating System**:  Ubuntu 20.04 ``` Linux kamailio 5.4.0-73-generic #82-Ubuntu SMP Wed Apr 14 17:39:42 UTC 2021 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/2749

5 9

git:master:fcfa9aab: modules: readme files regenerated - lwsc ... [skip ci]
by Kamailio Dev 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: fcfa9aab7f6d360134c4bb882188dda9ccf6b4cb URL: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-19T15:01:19+02:00 modules: readme files regenerated - lwsc ... [skip ci] --- Modified: src/modules/lwsc/README --- Diff: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… Patch: https://github.com/kamailio/kamailio/commit/fcfa9aab7f6d360134c4bb882188dda… --- diff --git a/src/modules/lwsc/README b/src/modules/lwsc/README index d7ae1e48b9..4c310529ee 100644 --- a/src/modules/lwsc/README +++ b/src/modules/lwsc/README @@ -87,8 +87,7 @@ Chapter 1. Admin Guide external systems, similar to http client. It is not for routing SIP traffic. - It relies on libwebsockets (tested with v3.1.0) library - (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). 2. Dependencies @@ -104,7 +103,7 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: - * libwebsockets - probably v3.1.0 or newer. + * libwebsockets - probably v2.0 or newer. 3. Parameters

1 0

git:master:01afcc7f: lwsc: docs - updated references to libwebsockets version
by Daniel-Constantin Mierla 19 Aug '21

19 Aug '21

Module: kamailio Branch: master Commit: 01afcc7fb2468c21a8e1cfb1a717fa96299794fa URL: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-19T14:56:50+02:00 lwsc: docs - updated references to libwebsockets version - GH #2749 --- Modified: src/modules/lwsc/doc/lwsc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… Patch: https://github.com/kamailio/kamailio/commit/01afcc7fb2468c21a8e1cfb1a717fa9… --- diff --git a/src/modules/lwsc/doc/lwsc_admin.xml b/src/modules/lwsc/doc/lwsc_admin.xml index 2f00c8fbd6..3e82f4b52b 100644 --- a/src/modules/lwsc/doc/lwsc_admin.xml +++ b/src/modules/lwsc/doc/lwsc_admin.xml @@ -20,7 +20,7 @@ external systems, similar to http client. It is not for routing SIP traffic. </para> <para> - It relies on libwebsockets (tested with v3.1.0) library (https://libwebsockets.org/). + It relies on libwebsockets library (https://libwebsockets.org/). </para> </section> @@ -47,7 +47,7 @@ <itemizedlist> <listitem> <para> - <emphasis>libwebsockets</emphasis> - probably v3.1.0 or newer. + <emphasis>libwebsockets</emphasis> - probably v2.0 or newer. </para> </listitem> </itemizedlist>

1 0

git:master:43154486: cplc: use cpl_ prefix for internal time recurrence functions
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 431544864c97d1848db1c0c42a03251a214f04cd URL: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T18:08:38+02:00 cplc: use cpl_ prefix for internal time recurrence functions - avoid global symbol conflicts with core tmrec.c - GH #2827 --- Modified: src/modules/cplc/cpl_switches.h Modified: src/modules/cplc/cpl_time.c Modified: src/modules/cplc/cpl_time.h --- Diff: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251… Patch: https://github.com/kamailio/kamailio/commit/431544864c97d1848db1c0c42a03251…

1 0

[kamailio/kamailio] Force_send_socket doesn't work in kemi framework. (#2829)
by Zhan Bazarov 18 Aug '21

18 Aug '21

### Description Hello, I didn't find force_send_socket function in kemi, so, I've tried to execute it like this: KSR.x.modf("force_send_socket", "udp:10.199.240.166:5099") and it doesn't work for me and I'm getting this error in output: #### Log Messages ``` 2(23767) ERROR: {1 21 INVITE mPXgy6eqY2} app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_branch_manage((null)): Unhandled exception in the Python code: RuntimeError: self is NULL 2(23767) ERROR: {1 21 INVITE MwD6tWSuw6} app_python [python_support.c:154]: python_handle_exception(): apy_exec: ksr_branch_manage((null)): Unhandled exception in the Python code: ``` ### Possible Solutions When I comment this code - I don't have this error. ### Additional Information ``` version: kamailio 5.4.5 (x86_64/linux) c46342 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: c46342 compiled on 12:05:00 Jul 23 2021 with gcc 7.5.0 ``` Is there any way how to use force_send_socket mechanism in kemi? 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/2829

2 2

git:master:33ea38f3: drouting: added dr_ prefix to internal time recurrence functions
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 33ea38f35f9911a26a757dbfa22065eb80a9a24a URL: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T17:39:25+02:00 drouting: added dr_ prefix to internal time recurrence functions - avoids symbol conflicts with the core tmrec.c - GH #2828 --- Modified: src/modules/drouting/dr_load.c Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h Modified: src/modules/drouting/prefix_tree.c Modified: src/modules/drouting/prefix_tree.h Modified: src/modules/drouting/routing.c Modified: src/modules/drouting/routing.h --- Diff: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e… Patch: https://github.com/kamailio/kamailio/commit/33ea38f35f9911a26a757dbfa22065e…

1 0

[kamailio/kamailio] 39chr long ipv6 issue ? (#2823)
by Tristan Mahé 18 Aug '21

18 Aug '21

### Description When receiving packets from an ipv6 full length, $si is empty When trying to listen to an ipv6 full length, kamailio refuses to start, trying to resolve the ipv6 instead of parsing it as an IPv6 There's no problem if the ipv6 in question is not maximum length. ### Troubleshooting It seems like ip_addr2a() fails to properly parse a 39b length ipv6. #### Reproduction reproduced easily by placing calls from an ipv6 containing no 0 or trying to listen to an ipv6 full length. #### Log Messages Example packet and log associated: Aug 13 01:06:42 test-1 /usr/sbin/kamailio[25890]: DEBUG: tls [tls_server.c:477]: tls_accept(): tls_accept: new connection from :52524 using TLSv1.0 ECDHE-RSA-AES256-SHA 256 => The empty string before the port in that log should be a 39chr long ipv6 Aug 13 01:06:42 test-1 /usr/sbin/kamailio[25890]: WARNING: [INVITE|FROM|TO|/[]:57677=>2600:aaaa:aaaa:aaaa:aa:aa:aa:146:443/tls/22] 610:Empty source ip ?! => That is a log generated from the config, which should be $si/$siz before the port 57677 and is empty. There's a test before that log line if ($si == "") { log } #### SIP Traffic ( Anonymized ) INVITE sip:+TO@DOMAIN;transport=tls SIP/2.0 Via: SIP/2.0/TLS [2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1]:57677;branch=z9hG4bK.5SSv~9uQw;rport From: "FROM" <sip:FROM@DOMAIN>;tag=8sei4EB40 To: "TO" <sip:+TO@DOMAIN>#015#012CSeq: 20 INVITE Call-ID: mA5D5fcZdt#015#012Max-Forwards: 70 Route: <sip:DOMAIN:443;lr> Supported: replaces, outbound Allow: INVITE, ACK, CANCEL, OPTIONS, BYE, REFER, NOTIFY, MESSAGE, SUBSCRIBE, INFO, UPDATE Content-Type: application/sdp Content-Length: 529 Contact: <sip:ua@[2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1]:57677;transport=tls>;+sip.instance="<urn:uuid:2a1a2139-8ed6-40bd-9352-d804d331a098>" User-Agent: UA v=0 o=#191026873 3487 1810 IN IP6 2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1 s=Talk c=IN IP6 2607:bbbb:bbbb:bbbb:bbbb:bbbb:bbbb:d5c1 b=AS:380 t=0 0 a=rtcp-xr:rcvr-rtt=all:10000 stat-summary=loss,dup,jitt,TTL voip-metrics m=audio 10712 RTP/AVP 124 117 115 0 101 96 97 a=rtpmap:124 opus/48000/2 a=fmtp:124 useinbandfec=1 a=rtpmap:117 SILK/16000 a=rtpmap:115 SILK/8000 a=rtpmap:101 telephone-event/48000 a=rtpmap:96 telephone-event/16000 a=rtpmap:97 telephone-event/8000 a=rtcp-fb:* trr-int 1000 a=rtcp-fb:* ccm tmmbr#015 ### Possible Solutions Patching src/core/ip_addr.h to change IP6_MAX_STR_SIZE from 39 to 40 fix the issue. ### Additional Information version: kamailio 5.5.1 (x86_64/linux) ( commit 5ecf17bc2d308141534bdaf3a312704daf0db850 ) * **Operating System**: * Debian 10.10 -- 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/2823

2 4

git:master:155b5d09: textopsx: added kemi functions to return hf iterator name and body
by Daniel-Constantin Mierla 18 Aug '21

18 Aug '21

Module: kamailio Branch: master Commit: 155b5d0953cd9f5effff974d2ba9fca44da42059 URL: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-18T07:55:06+02:00 textopsx: added kemi functions to return hf iterator name and body --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… Patch: https://github.com/kamailio/kamailio/commit/155b5d0953cd9f5effff974d2ba9fca… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 5e62546fcd..a9a60f9ed8 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2277,6 +2277,47 @@ static int w_hf_iterator_insert(sip_msg_t *msg, char *piname, char *phtext) return ki_hf_iterator_insert(msg, &iname, &htext); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_hf_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_hf_iterator_hname(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_hf_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + sr_kemi_xval_null(&_sr_kemi_hf_iterator_xval, 0); + return &_sr_kemi_hf_iterator_xval; + } + _sr_kemi_hf_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_hf_iterator_xval.v.s = _hf_iterators[k].it->name; + return &_sr_kemi_hf_iterator_xval; +} + +/** + * + */ +static sr_kemi_xval_t* ki_hf_iterator_hbody(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_hf_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_hf_iterator_index(msg, iname); + if(k<0 || _hf_iterators[k].it==NULL) { + sr_kemi_xval_null(&_sr_kemi_hf_iterator_xval, 0); + return &_sr_kemi_hf_iterator_xval; + } + _sr_kemi_hf_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_hf_iterator_xval.v.s = _hf_iterators[k].it->body; + return &_sr_kemi_hf_iterator_xval; +} + /** * */ @@ -3347,6 +3388,16 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("hf_iterator_hname"), + SR_KEMIP_XVAL, ki_hf_iterator_hname, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("textopsx"), str_init("hf_iterator_hbody"), + SR_KEMIP_XVAL, ki_hf_iterator_hbody, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("textopsx"), str_init("bl_iterator_start"), SR_KEMIP_INT, ki_bl_iterator_start, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:c61b6eef: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 17 Aug '21

17 Aug '21

Module: kamailio Branch: master Commit: c61b6eef809af690cfd53efa4054a0c547e93584 URL: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-17T21:31:16+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… Patch: https://github.com/kamailio/kamailio/commit/c61b6eef809af690cfd53efa4054a0c… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index 45b80a85c5..6bade01585 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -29,6 +29,7 @@ Daniel-Constantin Mierla 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 4. Functions @@ -42,9 +43,10 @@ Daniel-Constantin Mierla 1.1. Set http_timeout parameter 1.2. Set http_tlsmode parameter 1.3. Set http_reuse parameter - 1.4. ruxc_http_get() usage - 1.5. ruxc_http_post() usage - 1.6. Libruxc Usage + 1.4. Set http_retry parameter + 1.5. ruxc_http_get() usage + 1.6. ruxc_http_post() usage + 1.7. Libruxc Usage Chapter 1. Admin Guide @@ -61,6 +63,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 4. Functions @@ -99,6 +102,7 @@ Chapter 1. Admin Guide 3.1. http_timeout (int) 3.2. http_tlsmode (int) 3.3. http_reuse (int) + 3.4. http_retry (int) 3.1. http_timeout (int) @@ -142,6 +146,18 @@ modparam("ruxc", "http_tlsmode", 1) modparam("ruxc", "http_reuse", 1) ... +3.4. http_retry (int) + + How many times to retry if the HTTP request does not get a 200ok + response. + + Default value is 0 (no retry). + + Example 1.4. Set http_retry parameter +... +modparam("ruxc", "http_retry", 2) +... + 4. Functions 4.1. ruxc_http_get(url, hdrs, respv) @@ -159,7 +175,7 @@ modparam("ruxc", "http_reuse", 1) This function can be used from ANY_ROUTE. - Example 1.4. ruxc_http_get() usage + Example 1.5. ruxc_http_get() usage ... ruxc_http_get("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{s .escape.param})", @@ -182,7 +198,7 @@ switch ($rc) { This function can be used from ANY_ROUTE. - Example 1.5. ruxc_http_post() usage + Example 1.6. ruxc_http_post() usage ... ruxc_http_post("http://api.com/index.php?r_uri=$(ru{s.escape.param})&f_uri=$(fu{ s.escape.param})", @@ -205,7 +221,7 @@ switch ($rc) { installed and its environment configured, then run the following commands: - Example 1.6. Libruxc Usage + Example 1.7. Libruxc Usage ... git clone https://github.com/miconda/ruxc cd ruxc

1 0

git:master:6da06e26: ruxc: added http_retry modparam
by Daniel-Constantin Mierla 17 Aug '21

17 Aug '21

Module: kamailio Branch: master Commit: 6da06e2683b484c19eac27b757c1f2e565aa2e5d URL: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-17T21:27:36+02:00 ruxc: added http_retry modparam --- Modified: src/modules/ruxc/doc/ruxc_admin.xml Modified: src/modules/ruxc/ruxc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… Patch: https://github.com/kamailio/kamailio/commit/6da06e2683b484c19eac27b757c1f2e… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index 794301bc06..d0cd3bf7f7 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -121,6 +121,25 @@ modparam("ruxc", "http_tlsmode", 1) ... modparam("ruxc", "http_reuse", 1) ... +</programlisting> + </example> + </section> + <section id="ruxc.p.http_retry"> + <title><varname>http_retry</varname> (int)</title> + <para> + How many times to retry if the HTTP request does not get a 200ok response. + </para> + <para> + <emphasis> + Default value is 0 (no retry). + </emphasis> + </para> + <example> + <title>Set <varname>http_retry</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("ruxc", "http_retry", 2) +... </programlisting> </example> </section> diff --git a/src/modules/ruxc/ruxc_mod.c b/src/modules/ruxc/ruxc_mod.c index 02fa278859..13c4a54b52 100644 --- a/src/modules/ruxc/ruxc_mod.c +++ b/src/modules/ruxc/ruxc_mod.c @@ -41,6 +41,7 @@ MODULE_VERSION static int _ruxc_http_timeout = 5000; static int _ruxc_http_tlsmode = 0; static int _ruxc_http_reuse = 0; +static int _ruxc_http_retry = 0; static int mod_init(void); static int child_init(int); @@ -75,6 +76,7 @@ static param_export_t params[]={ {"http_timeout", PARAM_INT, &_ruxc_http_timeout}, {"http_tlsmode", PARAM_INT, &_ruxc_http_tlsmode}, {"http_reuse", PARAM_INT, &_ruxc_http_reuse}, + {"http_retry", PARAM_INT, &_ruxc_http_retry}, {0, 0, 0} }; @@ -135,6 +137,7 @@ static int ki_ruxc_http_get_helper(sip_msg_t *_msg, str *url, str *hdrs, v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len; @@ -233,6 +236,7 @@ static int ki_ruxc_http_post_helper(sip_msg_t *_msg, str *url, str *body, str *h v_http_request.timeout_write = _ruxc_http_timeout; v_http_request.tlsmode = _ruxc_http_tlsmode; v_http_request.reuse = _ruxc_http_reuse; + v_http_request.retry = _ruxc_http_retry; v_http_request.url = url->s; v_http_request.url_len = url->len;

1 0

uac_reg module use of l_uuid in Contact header
by Ross McKillop 17 Aug '21

17 Aug '21

I've been trying to work out how to set the username element of the contact header in uac_reg outbound REGISTER requests and it seems it's hard coded in the source (uac_reg.c:990) to use the l_uuid. I'm curious why l_uuid is used here and not l_username which feels like it should be more consistent with the use of r_username? My C skills are sufficient to let me patch this locally for my application, but I wondered what the reason for this design decision is or if it's actually a very long lived 'bug' as it feels like l_username is the 'right' thing to use here? Alternatively, perhaps this would be considered a feature request to make it configurable via another parameter in the database (probably beyond my C unless I modelled it on the pull request that added contact_addr (#2470) Ross

2 2

[kamailio/kamailio] kazoo : fix routing of reply events (#2786)
by kageds 16 Aug '21

16 Aug '21

success events should be routed to onreply_route[] failure events should be routed to failure_route[]   #### Pre-Submission Checklist    - [x] 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) - [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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description Kazoo cfg files use onreply_route[] and failure_route[] to handle the replies from AMQP and the module was sending the replies to the main route and therefore the scripts were not receiving the responses You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2786 -- Commit Summary -- * kazoo : fix routing of reply events -- File Changes -- M src/modules/kazoo/kz_amqp.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2786.patch https://github.com/kamailio/kamailio/pull/2786.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/2786

5 9

git:master:fb2eee3e: kazoo : fix routing of reply events
by Daniel-Constantin Mierla 16 Aug '21

16 Aug '21

Module: kamailio Branch: master Commit: fb2eee3e175040fef5e76cbed11430976f62df32 URL: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Author: Alan Evans <alan(a)kageds.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-16T20:08:11+02:00 kazoo : fix routing of reply events success events should be routed to onreply_route[] failure events should be routed to failure_route[] --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… Patch: https://github.com/kamailio/kamailio/commit/fb2eee3e175040fef5e76cbed114309… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 8076315dfd..5685f5a845 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2498,24 +2498,24 @@ void kz_amqp_fire_connection_event(char *event, char* host, char* zone) void kz_amqp_cb_ok(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->cb_route); + int n = route_lookup(&onreply_rt, cmd->cb_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = onreply_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); } void kz_amqp_cb_error(kz_amqp_cmd_ptr cmd) { - int n = route_lookup(&main_rt, cmd->err_route); + int n = route_lookup(&failure_rt, cmd->err_route); if(n==-1) { /* route block not found in the configuration file */ return; } - struct action *a = main_rt.rlist[n]; + struct action *a = failure_rt.rlist[n]; tmb.t_continue(cmd->t_hash, cmd->t_label, a); ksr_msg_env_reset(); }

1 0

[kamailio/kamailio] TLSA Undefined Symbol __dlclose (#2815)
by Tim Chubb 13 Aug '21

13 Aug '21

### Description Building TLSA module on ubuntu 18.04 results in a compiler warning and an undefined symbol error when attempting to load module. ### Troubleshooting #### Reproduction Make module and attempt to load it  #### Debugging Data  ``` N/A ``` #### Log Messages  Compiler output ``` CC (gcc) [M tlsa.so] tls_util.o CC (gcc) [M tlsa.so] tls_domain.o CC (gcc) [M tlsa.so] tls_locking.o CC (gcc) [M tlsa.so] tls_rand.o CC (gcc) [M tlsa.so] tls_map.o CC (gcc) [M tlsa.so] tls_cfg.o CC (gcc) [M tlsa.so] tls_select.o CC (gcc) [M tlsa.so] tls_server.o CC (gcc) [M tlsa.so] tls_dump_vf.o CC (gcc) [M tlsa.so] tls_init.o CC (gcc) [M tlsa.so] tls_rpc.o CC (gcc) [M tlsa.so] tls_config.o CC (gcc) [M tlsa.so] tls_bio.o CC (gcc) [M tlsa.so] tls_ct_wrq.o CC (gcc) [M tlsa.so] tlsa_mod.o CC (gcc) [M tlsa.so] tls_verify.o LD (gcc) [M tlsa.so] tlsa.so /usr/lib/gcc/x86_64-linux-gnu/7/../../../x86_64-linux-gnu/libcrypto.a(dso_dlfcn.o): In function `dlfcn_globallookup': (.text+0x11): warning: Using 'dlopen' in statically linked applications requires at runtime the shared libraries from the glibc version used for linking ``` Kamailio Log ``` Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/sr_module.c:570]: load_module(): could not open module </usr/local/lib64/kamailio/modules/tlsa.so>: /usr/local/lib64/kamailio/modules/tlsa.so: undefined symbol: __dlclose Aug 9 11:21:04 kamtest kamailio: CRITICAL: <core> [core/cfg.y:3683]: yyerror_at(): parse error in config file /etc/kamailio/parameters/modules.cfg, line 7, column 12-20: failed to load module Aug 9 11:21:04 kamtest kamailio: ERROR: <core> [core/modparam.c:181]: set_mod_param_regex(): No module matching <tlsa> found ``` #### SIP Traffic  ``` N/A ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.6.0-dev0 (x86_64/linux) 0a5307-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_BLOCKLIST, 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: 0a5307 -dirty compiled on 10:36:16 Aug 9 2021 with gcc 7.5.0 ``` * **Operating System**:  ``` Linux kamtest 4.15.0-144-generic #148-Ubuntu SMP Sat May 8 02:33:43 UTC 2021 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/2815

2 5

git:master:22a72f3a: core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes
by Daniel-Constantin Mierla 13 Aug '21

13 Aug '21

Module: kamailio Branch: master Commit: 22a72f3a7725d56f00e22bdc52d44bd53da7c091 URL: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-13T08:57:10+02:00 core: ip addr - use POSIX INET6_ADDRSTRLEN and INET_ADDRSTRLEN to define sizes - set the values of IP4_MAX_STR_SIZE and IP6_MAX_STR_SIZE based on them, if defined, or to 15 and 45 - cope with IPv6 with IPv4 tunneling representation (RFC 4291 section 2.2) - cover the requirements of using inet_ntop() - GH #2823 --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… Patch: https://github.com/kamailio/kamailio/commit/22a72f3a7725d56f00e22bdc52d44bd… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index 546c822423..132f653255 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -510,8 +510,20 @@ int hostent2su(union sockaddr_union* su, /* maximum size of a str returned by ip_addr2str */ -#define IP6_MAX_STR_SIZE 39 /*1234:5678:9012:3456:7890:1234:5678:9012*/ -#define IP4_MAX_STR_SIZE 15 /*123.456.789.012*/ +/* POSIX INET6_ADDRSTRLEN (RFC 4291 section 2.2) - IPv6 with IPv4 tunneling + * (39): 1234:5678:9012:3456:7890:1234:5678:9012 + * (45): ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255 */ +#ifdef INET6_ADDRSTRLEN +#define IP6_MAX_STR_SIZE (INET6_ADDRSTRLEN-1) +#else +#define IP6_MAX_STR_SIZE 45 +#endif +/*123.456.789.123*/ +#ifdef INET_ADDRSTRLEN +#define IP4_MAX_STR_SIZE (INET_ADDRSTRLEN-1) +#else +#define IP4_MAX_STR_SIZE 15 +#endif /* converts a raw ipv6 addr (16 bytes) to ascii */ int ip6tosbuf(unsigned char* ip6, char* buff, int len);

1 0

[kamailio/kamailio] Kami Lua retrieving variable in configuration file (#2822)
by jpskriver 12 Aug '21

12 Aug '21

### Description Suppose that there is an variable define in `kamailio-basic-kemi.cfg` with: ``` #!define MYVAR 1.2.3.4 ``` Then in the `kamailio-basic-kemi-lua.lua` - How can we get that variable? ### Possible Solutions Is there any alternative solution like set global via app_lua parameter, example: ``` modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") modparam("app_lua", "varset", "pstngw=s:sip:10.10.10.10") ``` -- 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/2822

3 3

[kamailio/kamailio] Kamailio unable to relay ACK (response to 200 OK) with TCP connection (#2814)
by jpskriver 12 Aug '21

12 Aug '21

### Description The ACK that response to 200 OK was NAT relayed by Kamailio if using TCP protocol, then got this issue from log ```pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporarily unavailable)```  ### Troubleshooting #### Reproduction * Using KAMI with Lua for routing config. * make call between 2 sip clients, the receiver has been registered with TCP #### Debugging Data * With the same scenario with UDP, it work fine. *  ``` (paste your debugging data here) ``` #### Log Messages  ``` Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <script>: ROUTE RELAY BEGIN:----------------------------------------------------------- Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:1327]: t_newtran(): msg (0x14a5999f0b38) id=3/4784 global id=2/4784 T start=0xffffffffffffffff Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:497]: t_lookup_request(): start searching: hash=41830, isACK=1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:455]: matching_3261(): RFC3261 transaction matching failed - via branch [z9hG4bKQe8H61SrNcaXD] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_lookup.c:675]: t_lookup_request(): no transaction found Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: tm [t_funcs.c:286]: t_relay_to(): forwarding ACK statelessly Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/crypto/md5utils.c:67]: MD5StringArray(): MD5 calculated: 66c47e5249a7009267e0cd264863c247 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/msg_translator.c:1797]: check_boundaries(): no multi-part body Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:577]: forward_request(): Sending:#012ACK sip:Joe%20Biden@14.186.XXX.XX:60791;transport=TCP SIP/2.0#015#012Via: SIP/2.0/TCP 188.166.XXX.XX:5060;branch=z9hG4bK663a.66c47e5249a7009267e0cd264863c247.0#015#012Via: SIP/2.0/UDP 127.0.0.2;received=127.0.0.2;rport=5060;branch=z9hG4bKQe8H61SrNcaXD#015#012Max-Forwards: 69#015#012From: "Donald Trump" <sip:33123456789@127.0.0.2>;tag=mUNavKm60XZte#015#012To: <sip:5512345@127.0.0.3:5060;transport=udp>;tag=bd21bf6b#015#012Call-ID: 0e846d85-720e-123a-45a5-ea0e9328da5f#015#012CSeq: 39612479 ACK#015#012Contac t: <sip:gw+KamGW@127.0.0.2:5060;transport=udp;gw=KamGW>#015#012Content-Length: 0#015#012#015#012. Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/forward.c:578]: forward_request(): orig. len=557, new_len=539, proto=2 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:489]: sr_lua_reload_script(): No need to reload [/path-to-lua/routing.lua] is version 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:673]: app_lua_run_ex(): executing Lua function: [[ksr_onsend_route]] Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:675]: app_lua_run_ex(): lua top index is: 0 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1993]: tcp_send(): no open tcp connection found, opening new one Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/ip_addr.c:577]: print_ip(): tcpconn_new: new tcp connection: 14.186.47.222 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1175]: tcpconn_new(): on port 60791, type 2, socket -1 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:1494]: tcpconn_add(): hashes: 1566:2785:0, 4 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: <core> [core/tcp_main.c:2886]: tcpconn_1st_send(): pending write on new connection 0x14a595095d40 sock 16 (-1/539 bytes written) (err: 11 - Resource temporar ily unavailable) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/tcp_main.c:3792]: handle_ser_child(): read response= 14a595095d40, 5, fd 55 from 12 (4784) Aug 7 10:35:53 testnode1 /usr/local/sbin/kamailio[4806]: DEBUG: <core> [core/io_wait.h:375]: io_watch_add(): DBG: io_watch_add(0x55f0338266a0, 55, 2, 0x14a595095d40), fd_no=41 Aug 7 10:35:53 testnode1 testnode[4784]: DEBUG: app_lua [app_lua_api.c:1003]: sr_kemi_lua_exec_func_ex(): param[0] for: xdbg is str: ROUTE RELAY END:-------------------------------------------------------- --- ``` #### SIP Traffic ![image](https://user-images.githubusercontent.com/85822466/128597726-0f64fdec-9b45-4ef6-b480-f5c0b3f21600.png) ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` kamailio -v version: kamailio 5.5.1 (x86_64/linux) 7abebb 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_BLOCKLIST, 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: 7abebb compiled on 07:46:14 Jun 27 2021 with gcc 8.3.0 ``` * **Operating System**:  Debian 10.10 ``` root@testnode1:~# uname -a Linux testnode1 4.19.0-12-cloud-amd64 #1 SMP Debian 4.19.152-1 (2020-10-18) 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/2814

2 2

[kamailio/kamailio] tm: restore xavps & flags after rebuilding message (#2821)
by lazedo 11 Aug '21

11 Aug '21

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description setting via xavp in tm:local-request has no effect ``` xavp_via_params = "via" event_route[tm:local-request] { $xavp(via=>xi) = "something" via_add_xavp_params("1"); } reply_route { $var(vd) = $sel(via.params["xi"]); xlog("L_INFO", "$ci|log|core|reply $rm this should be true => ('$var(vd)' == 'something')\n"); } ``` #### Changes changed t_run_local_req and moved restore xavps & flags to the end, after the messages changes are applied. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2821 -- Commit Summary -- * tm: restore xavps & flags after rebuilding message -- File Changes -- M src/modules/tm/uac.c (8) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2821.patch https://github.com/kamailio/kamailio/pull/2821.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/2821

2 2

git:master:7ee642c5: tm: restore xavps & flags after rebuilding message
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 7ee642c58991e594f38247ab0751fadd07ce758c URL: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:44:40+02:00 tm: restore xavps & flags after rebuilding message --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… Patch: https://github.com/kamailio/kamailio/commit/7ee642c58991e594f38247ab0751fad… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ad6a74c8cb..9cbc9d5f88 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -300,10 +300,6 @@ static inline int t_run_local_req( set_route_type( backup_route_type ); p_onsend=0; - /* restore original environment */ - tm_xdata_swap(new_cell, &backup_xd, 1); - setsflagsval(sflag_bk); - if (unlikely(ra_ctx.run_flags&DROP_R_F)) { LM_DBG("tm:local-request dropped msg. to %.*s\n", lreq.dst_uri.len, lreq.dst_uri.s); @@ -372,6 +368,10 @@ static inline int t_run_local_req( } clean: + /* restore original environment */ + tm_xdata_swap(new_cell, &backup_xd, 1); + setsflagsval(sflag_bk); + /* clean local msg structure */ if (unlikely(lreq.new_uri.s)) {

1 0

[kamailio/kamailio] Rfc3264 on session (#2813)
by lazedo 11 Aug '21

11 Aug '21

#### 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 - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  some user agents send a=sendonly as a session attribute and is_audio_on_hold() returns false when it should return true. #### Changes - changed sdp_session_cell struct in sdp.h to add sendrecv_mode and is_on_hold - changed parse_sdp_session in sdp.c to iterate session attributes and call extract_sendrecv_mode for assigment to session - changed ki_is_audio_on_hold in textops.c to look for session sendrecv_mode if its not set in media You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2813 -- Commit Summary -- * core: parse session sendrecv_mode in sdp * textops: check session sendrecv_mode in is_audio_on_hold -- File Changes -- M src/core/parser/sdp/sdp.c (12) M src/core/parser/sdp/sdp.h (2) M src/modules/textops/textops.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2813.patch https://github.com/kamailio/kamailio/pull/2813.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/2813

2 2

git:master:8da4477f: core: parse session sendrecv_mode in sdp
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 8da4477fd6d9590b9946071b9ac2a778b1d55d01 URL: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:38:16+02:00 core: parse session sendrecv_mode in sdp - some user agents send a=sendonly as session attribute which apply to all media streams --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h --- Diff: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… Patch: https://github.com/kamailio/kamailio/commit/8da4477fd6d9590b9946071b9ac2a77… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index d5e4f0695b..14779e4d12 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -453,6 +453,18 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ extract_bwidth(&tmpstr1, &session->bw_type, &session->bw_width); } + /* Find sendrecv_mode between session begin and first media. + * parse session attributes to check is_on_hold for a= for all medias. */ + a1p = find_first_sdp_line(o1p, m1p, 'a', NULL); + while (a1p) { + tmpstr1.s = a1p; + tmpstr1.len = m1p - a1p; + if (extract_sendrecv_mode(&tmpstr1, &session->sendrecv_mode, &session->is_on_hold) == 0) { + break; + } + a1p = find_next_sdp_line(a1p, m1p, 'a', NULL); + } + /* Have session. Iterate media descriptions in session */ m2p = m1p; stream_num = 0; diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index 84ebcfc8a2..d8c1b15b66 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -111,6 +111,8 @@ typedef struct sdp_session_cell { AS - application specific */ str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ int streams_num; /**< number of streams inside a session */ + str sendrecv_mode; + int is_on_hold; /**< flag indicating if this session is on hold */ struct sdp_stream_cell* streams; } sdp_session_cell_t;

1 0

git:master:cbcc27ef: textops: check session sendrecv_mode in is_audio_on_hold
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: cbcc27ef8b1674448bd8b1c45f03388e36f65f51 URL: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… Author: Luis Azedo <luis.azedo(a)factorlusitano.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:38:16+02:00 textops: check session sendrecv_mode in is_audio_on_hold - if sendrecv_mode is not set in media, check if its set in session --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… Patch: https://github.com/kamailio/kamailio/commit/cbcc27ef8b1674448bd8b1c45f03388… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 05491ab184..84e93f30ed 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4517,8 +4517,15 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(!sdp_stream) break; if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->sendrecv_mode.len && sdp_stream->is_on_hold) return sdp_stream->is_on_hold; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + !sdp_stream->sendrecv_mode.len && + sdp_session->sendrecv_mode.len && + sdp_session->is_on_hold) + return sdp_session->is_on_hold; sdp_stream_num++; } sdp_session_num++;

1 0

[kamailio/kamailio] tm: enhance fr/retr timers logging (#2818)
by Maksym Rudenko 11 Aug '21

11 Aug '21

- Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user-set values - log when resetting fr/retr timers on provisional replies   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The main reason for these changes is that we haven't found any possibility to distinguish which of `fr` timeouts expires. The rest of the logs are also helpful, but secondary. As they all are under `ifdef TIMEOUT_DEBUG` I hope it is not a big deal. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2818 -- Commit Summary -- * tm: enhance fr/retr timers logging -- File Changes -- M src/modules/tm/t_lookup.c (6) M src/modules/tm/t_reply.c (3) M src/modules/tm/t_suspend.c (3) M src/modules/tm/timer.c (7) M src/modules/tm/timer.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2818.patch https://github.com/kamailio/kamailio/pull/2818.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/2818

3 3

git:master:05577d19: tm: enhance fr/retr timers logging
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 05577d19f21eeeaa416c17e4fd554dfd18fd9ce1 URL: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… Author: mrudenko <m.rudenko(a)zaleos.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T19:35:42+02:00 tm: enhance fr/retr timers logging - Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user set values - log when resetting fr/retr timers on provisional replies --- Modified: src/modules/tm/t_lookup.c Modified: src/modules/tm/t_reply.c Modified: src/modules/tm/t_suspend.c Modified: src/modules/tm/timer.c Modified: src/modules/tm/timer.h --- Diff: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… Patch: https://github.com/kamailio/kamailio/commit/05577d19f21eeeaa416c17e4fd554df… --- diff --git a/src/modules/tm/t_lookup.c b/src/modules/tm/t_lookup.c index 4ccdee7574..1ee57c995c 100644 --- a/src/modules/tm/t_lookup.c +++ b/src/modules/tm/t_lookup.c @@ -1818,6 +1818,9 @@ int t_set_fr(struct sip_msg* msg, unsigned int fr_inv_to, unsigned int fr_to) set_msgid_val(user_fr_inv_timeout, msg->id, int, (int)fr_inv); set_msgid_val(user_fr_timeout, msg->id, int, (int)fr); }else{ +#ifdef TIMER_DEBUG + LM_DBG("changing default FR timeout values: (\"fr_inv_timeout\": %d, \"fr_timeout\": %d)\n", fr_inv, fr); +#endif change_fr(t, fr_inv, fr); /* change running uac timers */ } return 1; @@ -1880,6 +1883,9 @@ int t_set_retr(struct sip_msg* msg, unsigned int t1_ms, unsigned int t2_ms) set_msgid_val(user_rt_t1_timeout_ms, msg->id, int, (int)t1_ms); set_msgid_val(user_rt_t2_timeout_ms, msg->id, int, (int)t2_ms); }else{ +#ifdef TIMER_DEBUG + LM_DBG("changing default RETR timeout values to: (\"retr_t1_interval\": %d, \"retr_t2_interval\": %d)\n", t1_ms, t2_ms); +#endif change_retr(t, 1, t1_ms, t2_ms); /* change running uac timers */ } return 1; diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 306ed8f872..509cbcb950 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -2718,6 +2718,9 @@ int reply_received( struct sip_msg *p_msg ) ( (last_uac_status<msg_status) && ((msg_status>=180) || (last_uac_status==0)) ) ) ) { /* provisional now */ +#ifdef TIMER_DEBUG + LM_DBG("updating FR/RETR timers, \"fr_inv_timeout\": %d\n", t->fr_inv_timeout); +#endif restart_rb_fr(& uac->request, t->fr_inv_timeout); uac->request.flags|=F_RB_FR_INV; /* mark fr_inv */ } /* provisional replies */ diff --git a/src/modules/tm/t_suspend.c b/src/modules/tm/t_suspend.c index 826307d20a..bae9747282 100644 --- a/src/modules/tm/t_suspend.c +++ b/src/modules/tm/t_suspend.c @@ -486,6 +486,9 @@ int t_continue_helper(unsigned int hash_index, unsigned int label, ( (last_uac_status<msg_status) && ((msg_status>=180) || (last_uac_status==0)) ) ) ) { /* provisional now */ +#ifdef TIMER_DEBUG + LM_DBG("updating FR/RETR timers, \"fr_inv_timeout\": %d\n", t->fr_inv_timeout); +#endif restart_rb_fr(& t->uac[branch].request, t->fr_inv_timeout); t->uac[branch].request.flags|=F_RB_FR_INV; /* mark fr_inv */ } diff --git a/src/modules/tm/timer.c b/src/modules/tm/timer.c index 26734df2ee..a662920cab 100644 --- a/src/modules/tm/timer.c +++ b/src/modules/tm/timer.c @@ -510,6 +510,13 @@ ticks_t retr_buf_handler(ticks_t ticks, struct timer_ln *tl, void *p) a little race risk, but nothing bad would happen */ rbuf->flags |= F_RB_TIMEOUT; +#ifdef TIMER_DEBUG + if (rbuf->flags & F_RB_FR_INV) { + LM_DBG("reached the \"fr_inv_timeout\"\n"); + } else { + LM_DBG("reached the \"fr_timeout\"\n"); + } +#endif /* WARNING: the next line depends on taking care not to start the * wait timer before finishing with t (if this is not * guaranteed then comment the timer_allow_del() line) */ diff --git a/src/modules/tm/timer.h b/src/modules/tm/timer.h index 10a6e952a4..fa96beb90e 100644 --- a/src/modules/tm/timer.h +++ b/src/modules/tm/timer.h @@ -168,6 +168,10 @@ inline static int _set_fr_retr(struct retr_buf *rb, unsigned retr_ms) ticks_t retr_ticks; int ret; +#ifdef TIMER_DEBUG + LM_DBG("starting FR/RETR timers\n"); +#endif + ticks = get_ticks_raw(); timeout = rb->my_T->fr_timeout; eol = rb->my_T->end_of_life;

1 0

git:master:dd632331: modules: readme files regenerated - sqlops ... [skip ci]
by Kamailio Dev 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: dd632331315801f9d1d22c42881b07fd005b8f47 URL: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-11T18:16:13+02:00 modules: readme files regenerated - sqlops ... [skip ci] --- Modified: src/modules/sqlops/README --- Diff: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… Patch: https://github.com/kamailio/kamailio/commit/dd632331315801f9d1d22c42881b07f… --- diff --git a/src/modules/sqlops/README b/src/modules/sqlops/README index ed2bf0279d..d840f9e85a 100644 --- a/src/modules/sqlops/README +++ b/src/modules/sqlops/README @@ -216,7 +216,7 @@ modparam("sqlops", "connect_mode", 1) Example 1.5. Set results_maxsize parameter ... -modparam("sqlops", "results_maxsize", 4096) +modparam("sqlops", "results_maxsize", 64) ... 4. Functions

1 0

git:master:606679fc: sqlops: use a better value in the result_maxsize parameter example
by Henning Westerholt 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 606679fc195825db1f8c74c8225f936fb8b79faa URL: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2021-08-11T16:10:57Z sqlops: use a better value in the result_maxsize parameter example --- Modified: src/modules/sqlops/doc/sqlops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… Patch: https://github.com/kamailio/kamailio/commit/606679fc195825db1f8c74c8225f936… --- diff --git a/src/modules/sqlops/doc/sqlops_admin.xml b/src/modules/sqlops/doc/sqlops_admin.xml index ef7756b9a5..8d92c60c8e 100644 --- a/src/modules/sqlops/doc/sqlops_admin.xml +++ b/src/modules/sqlops/doc/sqlops_admin.xml @@ -236,7 +236,7 @@ modparam("sqlops", "connect_mode", 1) <title>Set <varname>results_maxsize</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("sqlops", "results_maxsize", 4096) +modparam("sqlops", "results_maxsize", 64) ... </programlisting> </example>

1 0

[kamailio/kamailio] ruxc automatic retry (#2820)
by Tim Chubb 11 Aug '21

11 Aug '21

### Description Could a module parameter be added to retry a request _n_ number of times in the event of a connection or server failure, without having to write a tedious bit of boiler plate config to catch failure response codes and retry. ### Expected behavior A http(s) post or get is performed and the returned code is < 0 but > -20 (null url return code in libruxc) or is a 5xx or 6xx http error code. The module will reattempt the request up to the number of attempts defined in a module parameter. By default this behaviour is disabled and would require explicitly defining the module parameter to enable it. Requests could be exempted from automatic retries by either adding an additional argument to the function called in config, or a http header could be supplied `X-RUXC-NORETRY` for example using the existing function signature to exclude the request. The header name could also be defined as a module parameter. -- 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/2820

2 5

[kamailio/kamailio] ruxc connection debugging messages (#2819)
by Tim Chubb 11 Aug '21

11 Aug '21

### Description Would it be possible to have the debug messages from libruxc entered into the kamailio logs, as thats much more useful than -1 for diagnosing connection failures, as well as the uri of the failing request? ### Expected behavior Some diagnostic data passed up from libruxc detailing connection failure. #### Actual observed behavior `ERROR: ruxc [ruxc_mod.c:151]: ki_ruxc_http_get_helper(): failed to perform http get - retcode: -1 uri: https://someservice.somewhere.com` -- 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/2819

2 2

[kamailio/kamailio] filter_body() fails when there isn't a space after "Content-Type:" (#2748)
by duarterocha91 11 Aug '21

11 Aug '21

I've made some testing and found that filter_body() fails when body is something like "Content-Type:application\/sdp\r\n\r\n". If i use this correction to add a space the filter works correctly : replace_body_all("Content-Type:application\/sdp\r\n\r\n","Content-Type: application/sdp\r\n\r\n"); #Makes the changes to the message persistent, returns 1 if sucessful, 0 if it fails if(msg_apply_changes()) { xnotice("Kamailio_Log : reply_route : Changes to message applied"); } I looked into the textops.c and found this line which i think might be the problem : while (find_line_start("Content-Type: ", 14, &start, &len)) If more info is needed please let me know. Cheers -- 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/2748

2 21

git:master:1c9fa445: modules: readme files regenerated - tlsa ... [skip ci]
by Kamailio Dev 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 1c9fa44521106968a0c68b2dba96a421ad523fda URL: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-11T10:16:23+02:00 modules: readme files regenerated - tlsa ... [skip ci] --- Modified: src/modules/tlsa/README --- Diff: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… Patch: https://github.com/kamailio/kamailio/commit/1c9fa44521106968a0c68b2dba96a42… --- diff --git a/src/modules/tlsa/README b/src/modules/tlsa/README index 100da0fed4..ed29072e58 100644 --- a/src/modules/tlsa/README +++ b/src/modules/tlsa/README @@ -53,3 +53,8 @@ Chapter 1. Admin Guide not support same static linking options. Also, some operating systems may provide only dynamic libssl and libcrypto libraries via their packages. + + NOTE: edit the Makefile in the module folder and update it accordingly + to set the path to libssl and libcrypto libraries specific to own + system when not wanting to use "pkg-config" (e.g., when having these + libraries compiled from sources).

1 0

git:master:db77d45e: tls: docs - note about path to libraries in the Makefile
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: db77d45e03792f73982861dcf30bad8d94bd7453 URL: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T10:05:31+02:00 tls: docs - note about path to libraries in the Makefile --- Modified: src/modules/tlsa/doc/tlsa.xml --- Diff: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… Patch: https://github.com/kamailio/kamailio/commit/db77d45e03792f73982861dcf30bad8… --- diff --git a/src/modules/tlsa/doc/tlsa.xml b/src/modules/tlsa/doc/tlsa.xml index eecc5f9ab1..d17c509813 100644 --- a/src/modules/tlsa/doc/tlsa.xml +++ b/src/modules/tlsa/doc/tlsa.xml @@ -72,6 +72,12 @@ systems may provide only dynamic libssl and libcrypto libraries via their packages. </para> + <para> + NOTE: edit the Makefile in the module folder and update it accordingly + to set the path to libssl and libcrypto libraries specific to own + system when not wanting to use "pkg-config" (e.g., when having + these libraries compiled from sources). + </para> </section> </chapter> </book>

1 0

git:master:162c1d8f: tlsa: Makefile - comment to set lib path to installation folder
by Daniel-Constantin Mierla 11 Aug '21

11 Aug '21

Module: kamailio Branch: master Commit: 162c1d8f1d3522fa937bc1869fe65ad87d4e3680 URL: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-11T09:59:40+02:00 tlsa: Makefile - comment to set lib path to installation folder - GH #2815 --- Modified: src/modules/tlsa/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… Patch: https://github.com/kamailio/kamailio/commit/162c1d8f1d3522fa937bc1869fe65ad… --- diff --git a/src/modules/tlsa/Makefile b/src/modules/tlsa/Makefile index eb01df99aa..9295898aad 100644 --- a/src/modules/tlsa/Makefile +++ b/src/modules/tlsa/Makefile @@ -12,6 +12,8 @@ NAME=tlsa.so LIBSSL_STATIC_SRCLIB ?= no # set to the path of the folder with static libraries compiled from source LIBSSL_STATIC_SRCPATH ?= /usr/local/src/openssl +# or set to the path where the static libraries are installed, for example: +# LIBSSL_STATIC_SRCPATH ?= /usr/lib/x86_64-linux-gnu/ ifeq ($(CROSS_COMPILE),) SSL_BUILDER=$(shell \

1 0

[kamailio/kamailio] TLS module missing from 5.5 Debian repository (#2816)
by Simone de Blasiis 11 Aug '21

11 Aug '21

### Description I've installed Kamailio 5.5 from the Debian 10 repository and added the WITH_TLS flag to default config file but Kamailio refuses to start. Looking at the logs I found out that the tls.so file in the modules folder is missing. I checked the docs and it seems that the package has been compiled with the right flags but I'm no Kamailio expert so I decided to open this issue to have it checked. #### Log Messages ``` kamailio kamailio: ERROR: <core> [core/sr_module.c:504]: ksr_locate_module(): could not find module <tls> in </usr/lib/x86_64-linux-gnu/kamailio/modules> ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.5.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_BLOCKLIST, 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**: ``` No LSB modules are available. Distributor ID: Debian Description: Debian GNU/Linux 10 (buster) Release: 10 Codename: buster Linux kamailio 4.19.0-17-amd64 #1 SMP Debian 4.19.194-3 (2021-07-18) 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/2816

3 3

[kamailio/kamailio] tm: enhance fr/retr timers logging (#2817)
by Maksym Rudenko 10 Aug '21

10 Aug '21

- Mention when FR timeout is reached, and which of FR timers expired - Log when starting FR/RETR timers - log when changing default timeouts to user set values - log when resetting fr/retr timers on provisional replies   #### 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  The main reason for these changes is that we haven't found any possibility to distinguish which of `fr` timeouts expires. The rest of the logs are also helpful, but secondary. As they all are under `ifdef TIMEOUT_DEBUG` I hope it is not a big deal. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2817 -- Commit Summary -- * tm: enhance fr/retr timers logging -- File Changes -- M src/modules/tm/t_lookup.c (6) M src/modules/tm/t_reply.c (3) M src/modules/tm/t_suspend.c (3) M src/modules/tm/timer.c (7) M src/modules/tm/timer.h (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2817.patch https://github.com/kamailio/kamailio/pull/2817.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/2817

1 1

git:master:28c0e78f: pv: removed unused code in parsing paramlist transformation name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 28c0e78f8f866c971172d0cdc55cfd963a0d29be URL: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:36:00+02:00 pv: removed unused code in parsing paramlist transformation name --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… Patch: https://github.com/kamailio/kamailio/commit/28c0e78f8f866c971172d0cdc55cfd9… --- diff --git a/src/modules/pv/pv_trans.c b/src/modules/pv/pv_trans.c index 9a9a66bb47..b63ad022f8 100644 --- a/src/modules/pv/pv_trans.c +++ b/src/modules/pv/pv_trans.c @@ -3460,8 +3460,6 @@ char* tr_parse_paramlist(str* in, trans_t *t) LM_ERR("unknown transformation: %.*s/%.*s!\n", in->len, in->s, name.len, name.s); error: - if(tp) - tr_param_free(tp); if(spec) pv_spec_free(spec); return NULL;

1 0

git:master:52cb53b2: nathelper: better condition for no more params in handle_ruri_alias_mode()
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 52cb53b29a5a624031a7d06504afecca7c25511e URL: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:31:10+02:00 nathelper: better condition for no more params in handle_ruri_alias_mode() --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… Patch: https://github.com/kamailio/kamailio/commit/52cb53b29a5a624031a7d06504afecc… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index bdf1b7777a..bd71eaafc4 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -1156,9 +1156,9 @@ static int ki_handle_ruri_alias_mode(struct sip_msg *msg, int mode) rest_len = rest_len - ALIAS_LEN; } sep = memchr(rest, 59 /* ; */, rest_len); - if(sep == NULL && start == NULL) { - LM_DBG("no alias param\n"); - return 2; + if(sep == NULL) { + /* no other parameters */ + break; } else { rest_len = rest_len - (sep - rest + 1); rest = sep + 1;

1 0

git:master:0046f35f: pv: added breaks in case of mismatching via var name
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 0046f35f37a84afef9999e53c122dafa42876c69 URL: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-10T10:11:16+02:00 pv: added breaks in case of mismatching via var name --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… Patch: https://github.com/kamailio/kamailio/commit/0046f35f37a84afef9999e53c122daf… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 44cc551212..352114d259 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -4488,6 +4488,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(in->s[0]=='i') sp->pvp.pvn.u.isname.name.n = 7; else goto error; + break; case 4: if(strncmp(in->s, "host", 4)==0) sp->pvp.pvn.u.isname.name.n = 0; @@ -4511,6 +4512,7 @@ int pv_parse_via_name(pv_spec_p sp, str *in) if(strncmp(in->s, "protoid", 7)==0) sp->pvp.pvn.u.isname.name.n = 3; else goto error; + break; case 8: if(strncmp(in->s, "received", 8)==0) sp->pvp.pvn.u.isname.name.n = 6;

1 0

git:master:d4d6fd43: ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details
by GitHub 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: d4d6fd431adb94f591e6035f2fa76eff8f728a8f URL: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2021-08-10T09:16:17+02:00 ISSUE_TEMPLATE/bug_report.md: list lsb_release -a in comments for OS details --- Modified: .github/ISSUE_TEMPLATE/bug_report.md --- Diff: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… Patch: https://github.com/kamailio/kamailio/commit/d4d6fd431adb94f591e6035f2fa76ef… --- diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 8132d74350..50a94c08bc 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -95,7 +95,7 @@ If you found a solution or workaround for the issue, describe it. Ideally, provi  ```

1 0

git:master:4e5c1ddd: textopsx: kemi functions to get body line iterator value
by Daniel-Constantin Mierla 10 Aug '21

10 Aug '21

Module: kamailio Branch: master Commit: 4e5c1ddd996d60382fd6a2d549cb18e2a1657b0d URL: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-09T20:54:32+02:00 textopsx: kemi functions to get body line iterator value --- Modified: src/modules/textopsx/textopsx.c --- Diff: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… Patch: https://github.com/kamailio/kamailio/commit/4e5c1ddd996d60382fd6a2d549cb18e… --- diff --git a/src/modules/textopsx/textopsx.c b/src/modules/textopsx/textopsx.c index 8d106a0704..5e62546fcd 100644 --- a/src/modules/textopsx/textopsx.c +++ b/src/modules/textopsx/textopsx.c @@ -2718,6 +2718,32 @@ static int w_bl_iterator_insert(sip_msg_t *msg, char *piname, char *ptext) return ki_bl_iterator_insert(msg, &iname, &text); } +/** + * + */ +static sr_kemi_xval_t _sr_kemi_bl_iterator_xval = {0}; + +/** + * + */ +static sr_kemi_xval_t* ki_bl_iterator_value(sip_msg_t *msg, str *iname) +{ + int k; + + memset(&_sr_kemi_bl_iterator_xval, 0, sizeof(sr_kemi_xval_t)); + k = ki_bl_iterator_index(msg, iname); + if(k<0 || _bl_iterators[k].it.s==NULL || _bl_iterators[k].it.len<=0) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + if(_bl_iterators[k].it.s==NULL) { + sr_kemi_xval_null(&_sr_kemi_bl_iterator_xval, 0); + return &_sr_kemi_bl_iterator_xval; + } + _sr_kemi_bl_iterator_xval.vtype = SR_KEMIP_STR; + _sr_kemi_bl_iterator_xval.v.s = _bl_iterators[k].it; + return &_sr_kemi_bl_iterator_xval; +} /** * @@ -3351,6 +3377,11 @@ static sr_kemi_t sr_kemi_textopsx_exports[] = { { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("textopsx"), str_init("bl_iterator_value"), + SR_KEMIP_XVAL, ki_bl_iterator_value, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } };

1 0

git:master:51a77408: modules: readme files regenerated - ruxc ... [skip ci]
by Kamailio Dev 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 51a774089c59a3861063ee4e9b4e21051c2bf192 URL: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-06T09:01:22+02:00 modules: readme files regenerated - ruxc ... [skip ci] --- Modified: src/modules/ruxc/README --- Diff: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… Patch: https://github.com/kamailio/kamailio/commit/51a774089c59a3861063ee4e9b4e210… --- diff --git a/src/modules/ruxc/README b/src/modules/ruxc/README index e437234139..45b80a85c5 100644 --- a/src/modules/ruxc/README +++ b/src/modules/ruxc/README @@ -131,6 +131,10 @@ modparam("ruxc", "http_tlsmode", 1) (and TLS handshake) when all requests are performed against the same HTTP/S server. + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + Default value is 0 (new connection for each request). Example 1.3. Set http_reuse parameter

1 0

git:master:21b187f5: ruxc: docs for reuse mode 2
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: 21b187f57a092f8ed9f51a62786a98c910b1febf URL: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:54:29+02:00 ruxc: docs for reuse mode 2 --- Modified: src/modules/ruxc/doc/ruxc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… Patch: https://github.com/kamailio/kamailio/commit/21b187f57a092f8ed9f51a62786a98c… --- diff --git a/src/modules/ruxc/doc/ruxc_admin.xml b/src/modules/ruxc/doc/ruxc_admin.xml index e07c05c9f1..794301bc06 100644 --- a/src/modules/ruxc/doc/ruxc_admin.xml +++ b/src/modules/ruxc/doc/ruxc_admin.xml @@ -106,6 +106,11 @@ modparam("ruxc", "http_tlsmode", 1) handshake) when all requests are performed against the same HTTP/S server. </para> <para> + Set to 2 in order to keep connections per base URL (scheme://host:port) + indexed in a hash map. Useful when doing HTTP/S requests to many + servers. + </para> + <para> <emphasis> Default value is 0 (new connection for each request). </emphasis>

1 0

git:master:fa728b90: ruxc: Makefile - set local paths for include and libs
by Daniel-Constantin Mierla 06 Aug '21

06 Aug '21

Module: kamailio Branch: master Commit: fa728b906ec2667891fb964e21785b12a68c0173 URL: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-06T08:26:29+02:00 ruxc: Makefile - set local paths for include and libs --- Modified: src/modules/ruxc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… Patch: https://github.com/kamailio/kamailio/commit/fa728b906ec2667891fb964e21785b1… --- diff --git a/src/modules/ruxc/Makefile b/src/modules/ruxc/Makefile index ae33b008bb..d11e7758e2 100644 --- a/src/modules/ruxc/Makefile +++ b/src/modules/ruxc/Makefile @@ -18,8 +18,8 @@ endif endif ifeq ($(BUILDER),) - DEFS+= -I. - LIBS = -L. -lruxc + DEFS+= -I. -I$(LOCALBASE)/include -I$(SYSBASE)/include + LIBS = -L. -L$(LOCALBASE)/lib -lruxc else DEFS+= $(shell pkg-config --cflags libruxc) LIBS = $(shell pkg-config --libs libruxc)

1 0

Usage of /proc/net/tcp
by Helio 04 Aug '21

04 Aug '21

Hello, I noticed that some Kamailio modules use /proc/net/tcp for statistics (ratelimit, pipelimit, snmpstats) but it seems to be deprecated (See https://www.kernel.org/doc/html/latest/networking/proc_net_tcp.html). Is the data from that reliable? My question is because we used the module ratelimit for a long time and after Kernel upgrades it was verified that the network limit is triggering with low traffic. Thanks

1 0

git:master:e3875c01: misc/tools/protoshoot: removed svn id and history
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: e3875c01adf576f179374a926e69e99c0094e5b4 URL: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T14:15:38+02:00 misc/tools/protoshoot: removed svn id and history --- Modified: misc/tools/protoshoot/protoshoot.c --- Diff: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… Patch: https://github.com/kamailio/kamailio/commit/e3875c01adf576f179374a926e69e99… --- diff --git a/misc/tools/protoshoot/protoshoot.c b/misc/tools/protoshoot/protoshoot.c index 352e1018a6..6eced5fc2b 100644 --- a/misc/tools/protoshoot/protoshoot.c +++ b/misc/tools/protoshoot/protoshoot.c @@ -1,4 +1,3 @@ -/* $Id$ */ /* * * Copyright (C) 2001-2003 FhG Fokus @@ -20,14 +19,10 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -/* - * History: - * 2005-09-09 basic tcp support added (andrei) - */ @@ -50,7 +45,6 @@ #include <signal.h> -static char *id="$Id$"; static char *version="protoshoot 0.4"; static char* help_msg="\ Usage: protoshoot -f file -d address -p port -c count [-v]\n\ @@ -87,7 +81,7 @@ int main (int argc, char** argv) char buf[BUF_SIZE]; struct hostent* he; struct sockaddr_in addr; - + int count; int verbose; char *fname; @@ -104,7 +98,7 @@ int main (int argc, char** argv) struct linger t_linger; int k; int err; - + /* init */ count=1; verbose=0; @@ -190,7 +184,6 @@ int main (int argc, char** argv) break; case 'V': printf("version: %s\n", version); - printf("%s\n",id); exit(0); break; case 'h': @@ -213,7 +206,7 @@ int main (int argc, char** argv) abort(); } } - + /* check if all the required params are present */ if (fname==0){ fprintf(stderr, "Missing -f file\n"); @@ -238,13 +231,13 @@ int main (int argc, char** argv) exit(-1); } if (proto==PROTO_UDP || (proto==PROTO_SCTP && !sctp_o2o)) con_no=1; - + /* ignore sigpipe */ if (signal(SIGPIPE, SIG_IGN)==SIG_ERR){ fprintf(stderr, "failed to ignore SIGPIPE: %s\n", strerror(errno)); exit(-1); } - + /* open packet file */ fd=open(fname, O_RDONLY); if (fd<0){ @@ -274,7 +267,7 @@ int main (int argc, char** argv) addr.sin_len=sizeof(struct sockaddr_in); #endif memcpy(&addr.sin_addr.s_addr, he->h_addr_list[0], he->h_length); - + for (k=0; k<con_no; k++){ switch(proto){ case PROTO_UDP: @@ -285,7 +278,7 @@ int main (int argc, char** argv) break; #ifdef USE_SCTP case PROTO_SCTP: - sock = socket(he->h_addrtype, + sock = socket(he->h_addrtype, sctp_o2o?SOCK_STREAM:SOCK_SEQPACKET, IPPROTO_SCTP); break; @@ -333,8 +326,7 @@ int main (int argc, char** argv) fprintf(stderr, "ERROR: connect: %s\n", strerror(errno)); goto error; } - - + /* flood loop */ t=throttle; for (r=0; r<count; r++){ @@ -366,7 +358,7 @@ int main (int argc, char** argv) } } } - + close(sock); if ((verbose) && (k%1000==999)) { putchar('#'); fflush(stdout); } }

1 0

new master branch compiler warnings (Debian Buster)
by Juha Heinanen 04 Aug '21

04 Aug '21

C (gcc) [M outbound.so] outbound_mod.o outbound_mod.c: In function 'mod_init': outbound_mod.c:112:25: warning: pointer targets in passing argument 1 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~~~~~~~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'const unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~ outbound_mod.c:112:58: warning: pointer targets in passing argument 3 of 'SHA1' differ in signedness [-Wpointer-sign] SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); ~~~~~~^~ In file included from outbound_mod.c:28: /usr/include/openssl/sha.h:44:16: note: expected 'unsigned char *' but argument is of type 'char *' unsigned char *SHA1(const unsigned char *d, size_t n, unsigned char *md); ^~~~

2 2

[kamailio/kamailio] outbound: fix compiler warning on SHA1() call (#2812)
by Michael Furmur 04 Aug '21

04 Aug '21

#### 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 explicit types cast to fix compiler warning: https://lists.kamailio.org/pipermail/sr-dev/2021-August/063482.html You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2812 -- Commit Summary -- * outbound: fix compiler warning on SHA1() call -- File Changes -- M src/modules/outbound/outbound_mod.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2812.patch https://github.com/kamailio/kamailio/pull/2812.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/2812

2 2

git:master:3297e99c: outbound: fix compiler warning on SHA1() call
by Daniel-Constantin Mierla 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: 3297e99c1ed5d3cbd2ada5597ab2a123dce4b44d URL: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Author: Michael Furmur <furmur(a)pm.me> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-08-04T10:35:46+02:00 outbound: fix compiler warning on SHA1() call --- Modified: src/modules/outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… Patch: https://github.com/kamailio/kamailio/commit/3297e99c1ed5d3cbd2ada5597ab2a12… --- diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index ada7062454..df9538aace 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -109,7 +109,7 @@ static int mod_init(void) if(flow_token_secret.s) { assert(ob_key.len == SHA_DIGEST_LENGTH); LM_DBG("flow_token_secret mod param set. use persistent ob_key"); - SHA1(flow_token_secret.s, flow_token_secret.len, ob_key.s); + SHA1((const unsigned char *)flow_token_secret.s, flow_token_secret.len, (unsigned char *)ob_key.s); } else { if (RAND_bytes((unsigned char *) ob_key.s, ob_key.len) == 0) {

1 0

git:master:fc313c17: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 04 Aug '21

04 Aug '21

Module: kamailio Branch: master Commit: fc313c17e5846ab0e9e594dd50ca156a2bd71534 URL: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-08-04T09:31:21+02:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… Patch: https://github.com/kamailio/kamailio/commit/fc313c17e5846ab0e9e594dd50ca156… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index a805644ef1..0712afd04a 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -45,6 +45,8 @@ Daniel-Constantin Mierla 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -80,7 +82,9 @@ Daniel-Constantin Mierla 1.24. bl_iterator_end usage 1.25. bl_iterator_next usage 1.26. bl_iterator_rm usage - 1.27. @hf_value select usage + 1.27. bl_iterator_append usage + 1.28. bl_iterator_insert usage + 1.29. @hf_value select usage Chapter 1. Admin Guide @@ -115,6 +119,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 3. Selects @@ -160,6 +166,8 @@ Chapter 1. Admin Guide 2.24. bl_iterator_end(iname) 2.25. textopsx.f.bl_iterator_next(iname) 2.26. bl_iterator_rm(iname) + 2.27. bl_iterator_append(iname, text) + 2.28. bl_iterator_insert(iname, text) 2.1. msg_apply_changes() @@ -653,6 +661,46 @@ bl_iterator_end("b1"); bl_iterator_end("b1"); ... +2.27. bl_iterator_append(iname, text) + + Add text after the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.27. bl_iterator_append usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_append("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + +2.28. bl_iterator_insert(iname, text) + + Add text before the line at the current iterator possition. + + The parameters can be dynamic strings with variables. + + This function can be used from ANY_ROUTE. + + Example 1.28. bl_iterator_insert usage +... + bl_iterator_start("b1"); + while(bl_iterator_next("b1")) { + if($blitval(b1)=~"^a=info:xyz") { + bl_iterator_insert("b1", "a=info:abc\r\n"); + break; + } + } + bl_iterator_end("b1"); +... + 3. Selects 3.1. @hf_value @@ -688,7 +736,7 @@ bl_iterator_end("b1"); * IDX - Value index, negative value counts from bottom * PARAM_NAME - name of parameter - Example 1.27. @hf_value select usage + Example 1.29. @hf_value select usage ... $a = @hf_value.my_header[1].my_param; xplog("L_ERR", "$sel((a)hf_value.via[-1]), $sel((a)hf_value.from.tag)\n");

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev