sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

git:5.3:b9dac63c: textops: docs - proper example for append_body_part() with headers
by Daniel-Constantin Mierla 23 Jan '20

23 Jan '20

Module: kamailio Branch: 5.3 Commit: b9dac63cf660bc454b21297a1e987a400841205d URL: https://github.com/kamailio/kamailio/commit/b9dac63cf660bc454b21297a1e987a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-23T10:10:51+01:00 textops: docs - proper example for append_body_part() with headers (cherry picked from commit 79592144c3ba99ccbb4883910eeda3a7dbe5c89d) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b9dac63cf660bc454b21297a1e987a4… Patch: https://github.com/kamailio/kamailio/commit/b9dac63cf660bc454b21297a1e987a4… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8f6ee2583b..fecaa059f2 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1725,8 +1725,8 @@ Content-Disposition: signal;handling=required <title><function>append_body_part</function> with headers</title> <programlisting format="linespecific"> ... -$var(b) = "<info>active</info>"; -append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; +append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext\r\nX-Header: xyz", "signal;handling=required"); msg_apply_changes(); ... @@ -1734,6 +1734,7 @@ msg_apply_changes(); ... Content-Type: application/vnd.cirpack.isdn-ext +X-Header: xyz Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c

1 0

git:master:79592144: textops: docs - proper example for append_body_part() with headers
by Daniel-Constantin Mierla 23 Jan '20

23 Jan '20

Module: kamailio Branch: master Commit: 79592144c3ba99ccbb4883910eeda3a7dbe5c89d URL: https://github.com/kamailio/kamailio/commit/79592144c3ba99ccbb4883910eeda3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-01-23T10:05:56+01:00 textops: docs - proper example for append_body_part() with headers --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/79592144c3ba99ccbb4883910eeda3a… Patch: https://github.com/kamailio/kamailio/commit/79592144c3ba99ccbb4883910eeda3a… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 8f6ee2583b..fecaa059f2 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1725,8 +1725,8 @@ Content-Disposition: signal;handling=required <title><function>append_body_part</function> with headers</title> <programlisting format="linespecific"> ... -$var(b) = "<info>active</info>"; -append_body_part("$var(b)", "application/xml\r\nX-Header: xyz"); +$var(b) = "7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c"; +append_body_part("$var(b)", "application/vnd.cirpack.isdn-ext\r\nX-Header: xyz", "signal;handling=required"); msg_apply_changes(); ... @@ -1734,6 +1734,7 @@ msg_apply_changes(); ... Content-Type: application/vnd.cirpack.isdn-ext +X-Header: xyz Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c

1 0

git:5.2:4fb3ef30: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 4fb3ef304ba9ace8e276978d893a05bbcb76fde4 URL: https://github.com/kamailio/kamailio/commit/4fb3ef304ba9ace8e276978d893a05b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-22T23:16:30+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/seas/README --- Diff: https://github.com/kamailio/kamailio/commit/4fb3ef304ba9ace8e276978d893a05b… Patch: https://github.com/kamailio/kamailio/commit/4fb3ef304ba9ace8e276978d893a05b… --- diff --git a/src/modules/seas/README b/src/modules/seas/README index 2a93361aa8..6acbd8accf 100644 --- a/src/modules/seas/README +++ b/src/modules/seas/README @@ -754,9 +754,7 @@ loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/seas.so" -loadmodule "/usr/local/lib/kamailio/modules/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("usrloc", "db_mode", 0) modparam("rr", "enable_full_lr", 1) modparam("seas", "listen_sockets", "127.0.0.1:5080"); @@ -820,9 +818,7 @@ mpath="/home/elias/src/sipservlet/seas" loadmodule "modules/tm/tm.so" loadmodule "modules/seas/seas.so" -loadmodule "modules/mi_fifo/mi_fifo.so" -modparam("mi_fifo", "fifo_name", "/tmp/openser_fifo") modparam("seas", "listen_sockets","127.0.0.1:5080") route{

1 0

git:5.2:a9df08d4: auth_xkeys: proper debug log messages on valid match
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: a9df08d48297fbaf2690b5035314d8f4093ab315 URL: https://github.com/kamailio/kamailio/commit/a9df08d48297fbaf2690b5035314d8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:08:46+01:00 auth_xkeys: proper debug log messages on valid match (cherry picked from commit 39802fd2efad4b710072244f360741312a7164f2) --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/a9df08d48297fbaf2690b5035314d8f… Patch: https://github.com/kamailio/kamailio/commit/a9df08d48297fbaf2690b5035314d8f… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index 53b7325dff..6ce8f9d25c 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -352,7 +352,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha256(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha256 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha256 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; } @@ -364,7 +364,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha384(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha384 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha384 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; } @@ -376,7 +376,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } compute_sha512(xout, (u_int8_t*)xdata.s, xdata.len); if(strncasecmp(xout, hbody.s, hbody.len)==0) { - LM_DBG("no digest sha512 matched for key [%.*s:%.*s]\n", + LM_DBG("digest sha512 matched for key [%.*s:%.*s]\n", key->len, key->s, itc->kname.len, itc->kname.s); return 0; }

1 0

git:5.2:2d610122: core: more details on error log on failed comp_num() expression
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 2d6101227365f1f21b39ec4806b09f1c44df6348 URL: https://github.com/kamailio/kamailio/commit/2d6101227365f1f21b39ec4806b09f1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:05:22+01:00 core: more details on error log on failed comp_num() expression (cherry picked from commit a85bdf58e3f1933a4a1d231b5de4fd9cf1393366) --- Modified: src/core/route.c --- Diff: https://github.com/kamailio/kamailio/commit/2d6101227365f1f21b39ec4806b09f1… Patch: https://github.com/kamailio/kamailio/commit/2d6101227365f1f21b39ec4806b09f1… --- diff --git a/src/core/route.c b/src/core/route.c index aa814007f0..30ac12eaf6 100644 --- a/src/core/route.c +++ b/src/core/route.c @@ -1199,7 +1199,8 @@ inline static int comp_num(int op, long left, int rtype, union exp_op* r, } break; default: - LM_CRIT("Invalid right operand (%d)\n", rtype); + LM_CRIT("Invalid right operand (rtype: %d expr-op: %d lval: %ld)\n", + rtype, op, left); return E_BUG; }

1 0

git:5.2:27de46c5: htable: make ht_dmq_init_sync variable extern in ht_dmq.c
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 27de46c506dc7cc9bdc6ce8f249176f6df0221f4 URL: https://github.com/kamailio/kamailio/commit/27de46c506dc7cc9bdc6ce8f249176f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:05:01+01:00 htable: make ht_dmq_init_sync variable extern in ht_dmq.c - avoiding redeclaration, it is set via modparam (cherry picked from commit 02bff604ec70a51a5ba9faae38e946e556763e08) --- Modified: src/modules/htable/ht_dmq.c Modified: src/modules/htable/ht_dmq.h Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/27de46c506dc7cc9bdc6ce8f249176f… Patch: https://github.com/kamailio/kamailio/commit/27de46c506dc7cc9bdc6ce8f249176f… --- diff --git a/src/modules/htable/ht_dmq.c b/src/modules/htable/ht_dmq.c index 26c6eb859a..ccb67e30d8 100644 --- a/src/modules/htable/ht_dmq.c +++ b/src/modules/htable/ht_dmq.c @@ -48,7 +48,7 @@ static str dmq_500_rpl = str_init("Server Internal Error"); static int dmq_cell_group_empty_size = 12; // {"cells":[]} static int dmq_cell_group_max_size = 60000; static ht_dmq_jdoc_cell_group_t ht_dmq_jdoc_cell_group; -int ht_dmq_init_sync; +extern int ht_dmq_init_sync; dmq_api_t ht_dmqb; dmq_peer_t* ht_dmq_peer = NULL; diff --git a/src/modules/htable/ht_dmq.h b/src/modules/htable/ht_dmq.h index be11d4dc49..014dffbc6a 100644 --- a/src/modules/htable/ht_dmq.h +++ b/src/modules/htable/ht_dmq.h @@ -31,8 +31,6 @@ extern dmq_api_t ht_dmqb; extern dmq_peer_t* ht_dmq_peer; extern dmq_resp_cback_t ht_dmq_resp_callback; -int ht_dmq_init_sync; - typedef enum { HT_DMQ_NONE, HT_DMQ_SET_CELL, diff --git a/src/modules/htable/htable.c b/src/modules/htable/htable.c index e48d1d4415..1bc3c67aec 100644 --- a/src/modules/htable/htable.c +++ b/src/modules/htable/htable.c @@ -220,7 +220,7 @@ static int mod_init(void) } } - if (ht_enable_dmq>0 && ht_dmq_initialize(ht_dmq_init_sync)!=0) { + if (ht_enable_dmq>0 && ht_dmq_initialize()!=0) { LM_ERR("failed to initialize dmq integration\n"); return -1; }

1 0

git:5.2:045641ce: corex: declare nio specific globals in c file
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 045641ce82ba6150c72a3a25f967fea9a9e551f1 URL: https://github.com/kamailio/kamailio/commit/045641ce82ba6150c72a3a25f967fea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:04:11+01:00 corex: declare nio specific globals in c file (cherry picked from commit 512f89bec0b6ebd2b3c7c16b115f15dbd6de9a39) --- Modified: src/modules/corex/corex_nio.c Modified: src/modules/corex/corex_nio.h --- Diff: https://github.com/kamailio/kamailio/commit/045641ce82ba6150c72a3a25f967fea… Patch: https://github.com/kamailio/kamailio/commit/045641ce82ba6150c72a3a25f967fea… --- diff --git a/src/modules/corex/corex_nio.c b/src/modules/corex/corex_nio.c index 6b79fcc648..2e5cdff449 100644 --- a/src/modules/corex/corex_nio.c +++ b/src/modules/corex/corex_nio.c @@ -18,6 +18,14 @@ #include "corex_nio.h" +int nio_route_no; +int nio_min_msg_len; +int nio_is_incoming; + +str nio_msg_avp_param; +int_str nio_msg_avp_name; +unsigned short nio_msg_avp_type; + /** * init nio function */ diff --git a/src/modules/corex/corex_nio.h b/src/modules/corex/corex_nio.h index ec0bbc5ae9..008fcdd7de 100644 --- a/src/modules/corex/corex_nio.h +++ b/src/modules/corex/corex_nio.h @@ -32,13 +32,13 @@ #include "../../core/tcp_options.h" #include "../../core/msg_translator.h" -int nio_route_no; -int nio_min_msg_len; -int nio_is_incoming; +extern int nio_route_no; +extern int nio_min_msg_len; +extern int nio_is_incoming; -str nio_msg_avp_param; -int_str nio_msg_avp_name; -unsigned short nio_msg_avp_type; +extern str nio_msg_avp_param; +extern int_str nio_msg_avp_name; +extern unsigned short nio_msg_avp_type; int nio_msg_received(sr_event_param_t *evp); int nio_msg_sent(sr_event_param_t *evp);

1 0

git:5.2:f96b99f0: pipelimit: make error log debug in rpc command when pipe not found
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: f96b99f09af56921e42322b0e63194b4d1b45939 URL: https://github.com/kamailio/kamailio/commit/f96b99f09af56921e42322b0e63194b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:03:46+01:00 pipelimit: make error log debug in rpc command when pipe not found - error code is returned to rpc command (cherry picked from commit 5a607cabc34d16fe3770f273241b667fea470dc9) --- Modified: src/modules/pipelimit/pl_ht.c --- Diff: https://github.com/kamailio/kamailio/commit/f96b99f09af56921e42322b0e63194b… Patch: https://github.com/kamailio/kamailio/commit/f96b99f09af56921e42322b0e63194b… --- diff --git a/src/modules/pipelimit/pl_ht.c b/src/modules/pipelimit/pl_ht.c index a9283e8e55..1f666b89f3 100644 --- a/src/modules/pipelimit/pl_ht.c +++ b/src/modules/pipelimit/pl_ht.c @@ -516,7 +516,7 @@ void rpc_pl_list(rpc_t *rpc, void *c) if(pipeid.len>0) { it = pl_pipe_get(&pipeid, 1); if (it==NULL) { - LM_ERR("no pipe: %.*s\n", pipeid.len, pipeid.s); + LM_DBG("no pipe: %.*s\n", pipeid.len, pipeid.s); rpc->fault(c, 400, "Unknown pipe id %.*s", pipeid.len, pipeid.s); return; }

1 0

git:5.2:669266e7: tls: proper match of config profile by server id
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 669266e775197760644c56be73a632db365f3d97 URL: https://github.com/kamailio/kamailio/commit/669266e775197760644c56be73a632d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:03:37+01:00 tls: proper match of config profile by server id (cherry picked from commit 40f87b7e46714a114e7c98be7e677b20f1deb694) --- Modified: src/modules/tls/tls_domain.c --- Diff: https://github.com/kamailio/kamailio/commit/669266e775197760644c56be73a632d… Patch: https://github.com/kamailio/kamailio/commit/669266e775197760644c56be73a632d… --- diff --git a/src/modules/tls/tls_domain.c b/src/modules/tls/tls_domain.c index 1ca62ff200..8de30c4a81 100644 --- a/src/modules/tls/tls_domain.c +++ b/src/modules/tls/tls_domain.c @@ -1533,7 +1533,7 @@ tls_domain_t* tls_lookup_cfg(tls_domains_cfg_t* cfg, int type, p->server_id.len, ZSW(p->server_id.s), srvid->len, ZSW(srvid->s)); if(p->server_id.s && p->server_id.len==srvid->len - && strncasecmp(p->server_name.s, srvid->s, srvid->len)==0) { + && strncasecmp(p->server_id.s, srvid->s, srvid->len)==0) { LM_DBG("TLS config found by server id\n"); return p; }

1 0

git:5.2:4e6345bb: sipdump: small whitespace fixes
by Henning Westerholt 22 Jan '20

22 Jan '20

Module: kamailio Branch: 5.2 Commit: 4e6345bbd0ca9b484b3031a4177040d524868a5c URL: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-22T23:03:10+01:00 sipdump: small whitespace fixes (cherry picked from commit 5d523e81c2a6ad1394254a36e9e143cb04e0171b) --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… Patch: https://github.com/kamailio/kamailio/commit/4e6345bbd0ca9b484b3031a4177040d… --- diff --git a/src/modules/sipdump/sipdump_mod.c b/src/modules/sipdump/sipdump_mod.c index 3714eb39e9..bf2c90c20f 100644 --- a/src/modules/sipdump/sipdump_mod.c +++ b/src/modules/sipdump/sipdump_mod.c @@ -206,7 +206,7 @@ int ki_sipdump_send(sip_msg_t *msg, str *stag) if(!sipdump_enabled()) return 1; - + memset(&sdi, 0, sizeof(sipdump_info_t)); sdi.buf.s = msg->buf; @@ -267,14 +267,14 @@ static int w_sipdump_send(sip_msg_t *msg, char *ptag, char *str2) } /** - * + * */ int sipdump_msg_received(sr_event_param_t *evp) { str wdata; sipdump_info_t sdi; char srcip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0; @@ -319,7 +319,7 @@ int sipdump_msg_received(sr_event_param_t *evp) } /** - * + * */ int sipdump_msg_sent(sr_event_param_t *evp) { @@ -327,7 +327,7 @@ int sipdump_msg_sent(sr_event_param_t *evp) sipdump_info_t sdi; ip_addr_t ip; char dstip_buf[IP_ADDR_MAX_STRZ_SIZE]; - + if(!sipdump_enabled()) return 0;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
42
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020