- sr-dev - kamailio.org

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

09 Sep '21

Module: kamailio Branch: 5.5 Commit: d96e3527c20791cb2291aa91685d5bc85606eb56 URL: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-09-09T10:33:21+02:00 tm: skip body operation on empty string for uac building (cherry picked from commit 34b61d3f1d6b5a0d4425f8edfa69d707cfa058b7) --- Modified: src/modules/tm/t_msgbuilder.c --- Diff: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… Patch: https://github.com/kamailio/kamailio/commit/d96e3527c20791cb2291aa91685d5bc… --- 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: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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev