- sr-dev - kamailio.org

git:master:9775841f: core: new option for json logging to print message in json format
by Daniel-Constantin Mierla 12 Nov '21

12 Nov '21

Module: kamailio Branch: master Commit: 9775841f5f821b37395504a5d2a9026eaceacb61 URL: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T10:38:04+01:00 core: new option for json logging to print message in json format - option 'j' - if the log message starts with '{' and ends with '}', then it is expected to be a json document, printed as it is in the message value, otherwise it is printed as field "text" --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026… Patch: https://github.com/kamailio/kamailio/commit/9775841f5f821b37395504a5d2a9026…

1 0

git:master:9b7bfb32: acc: simplify index shifting for adding time variants in db accounting
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: master Commit: 9b7bfb3243a2e372b266e993647162767f3edcf5 URL: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T20:39:10+01:00 acc: simplify index shifting for adding time variants in db accounting --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… Patch: https://github.com/kamailio/kamailio/commit/9b7bfb3243a2e372b266e9936471627… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index d1e8bf1480..b75e155743 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -429,18 +429,19 @@ int acc_db_request( struct sip_msg *rq) for(i=0; i<m; i++) VAL_STR(db_vals+i) = val_arr[i]; /* time value */ - VAL_TIME(db_vals+(m++)) = acc_env.ts; + VAL_TIME(db_vals+m) = acc_env.ts; + m++; /* extra time value */ if(acc_time_mode==1) { - VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_sec; - i++; - VAL_INT(db_vals+(m++)) = (int)acc_env.tv.tv_usec; - i++; + VAL_INT(db_vals+m) = (int)acc_env.tv.tv_sec; + m++; + VAL_INT(db_vals+m) = (int)acc_env.tv.tv_usec; + m++; } else if(acc_time_mode==2) { dtime = (double)acc_env.tv.tv_usec; dtime = (dtime / 1000000) + (double)acc_env.tv.tv_sec; - VAL_DOUBLE(db_vals+(m++)) = dtime; - i++; + VAL_DOUBLE(db_vals+m) = dtime; + m++; } else if(acc_time_mode==3 || acc_time_mode==4) { if(acc_time_mode==3) { localtime_r(&acc_env.ts, &t); @@ -451,19 +452,21 @@ int acc_db_request( struct sip_msg *rq) acc_time_format, &t)<=0) { acc_time_format_buf[0] = '\0'; } - VAL_STRING(db_vals+(m++)) = acc_time_format_buf; - i++; + VAL_STRING(db_vals+m) = acc_time_format_buf; + m++; } + i = m; /* extra columns */ o = extra2strar( db_extra, rq, val_arr+m, int_arr+m, type_arr+m); m += o; - for( i++ ; i<m; i++) { + for( ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { + LM_DBG("attr[%d] is STR\n", i); VAL_STR(db_vals+i) = val_arr[i]; } }

1 0

git:master:4bd77f1d: acc: debug messages to print the type of extra acc attrs
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: master Commit: 4bd77f1dae2eeacbe7384ac2838c691f76e077f1 URL: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:59:11+01:00 acc: debug messages to print the type of extra acc attrs --- Modified: src/modules/acc/acc.c Modified: src/modules/acc/acc_extra.c --- Diff: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… Patch: https://github.com/kamailio/kamailio/commit/4bd77f1dae2eeacbe7384ac2838c691… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index 9d3ba67359..d1e8bf1480 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -461,6 +461,7 @@ int acc_db_request( struct sip_msg *rq) for( i++ ; i<m; i++) { if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { + LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { VAL_STR(db_vals+i) = val_arr[i]; diff --git a/src/modules/acc/acc_extra.c b/src/modules/acc/acc_extra.c index d6fff91fde..5c29cc7a04 100644 --- a/src/modules/acc/acc_extra.c +++ b/src/modules/acc/acc_extra.c @@ -252,6 +252,7 @@ int extra2strar(struct acc_extra *extra, struct sip_msg *rq, str *val_arr, type_arr[n] = TYPE_STR; } } + LM_DBG("type of the extra attr[%d] set to: %d\n", n, type_arr[n]); n++; extra = extra->next;

1 0

git:5.5:8c71683d: Revert "pv: handle case when var value ha flag str but null pointer"
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: 5.5 Commit: 8c71683d21498669a79515aad8e2565a6e081754 URL: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:17:42+01:00 Revert "pv: handle case when var value ha flag str but null pointer" This reverts commit 2b432d35f0691d9ef6b12908909d809dbb1fa57b. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… Patch: https://github.com/kamailio/kamailio/commit/8c71683d21498669a79515aad8e2565… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..255f9f2040 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if(value==NULL) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:5.5:6f6b469b: Revert "pv: fix condition in detecting the null string value when setting $var(...)"
by Daniel-Constantin Mierla 11 Nov '21

11 Nov '21

Module: kamailio Branch: 5.5 Commit: 6f6b469b257fa41d78c3fe006d3dd3b19b7296e5 URL: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-11T18:17:31+01:00 Revert "pv: fix condition in detecting the null string value when setting $var(...)" This reverts commit 2532b5f5fc71d3828e1185c55ad6a6546df312d3. --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… Patch: https://github.com/kamailio/kamailio/commit/6f6b469b257fa41d78c3fe006d3dd3b… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 5f4626b8d6..456e21963a 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

[kamailio/kamailio] device keeps deregister (Issue #2929)
by Riccardo Speggiorin 11 Nov '21

11 Nov '21

I have a Kazoo installation with Kamailio. I have to VM, one with +700 devices regged and the other with +300 devices. The problem is that the devices registered on the first machine keeps randomly unregistered. I have 3 unregistrations happening every minute. If I reboot the machine the problem get solve fora couples of days and after that starts again. What I should check? -- 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/2929

2 2

DMQ userloc data not replicated after restarting the receiver service.
by Hardik Patel 11 Nov '21

11 Nov '21

Hello Team, We are using Kamailio 5.5.2 (DMQ + usrloc) modules. We want to replicate all users from server-2(Registration) to server-1(Proxy) . Replication worked perfectly fine but we noticed that after restarting the receiver (Proxy node) data has not been replicated automatically. If we re-register the users it is replicating to the receiver side but the old data is not replicated. Can you please guide us where we made the mistake? Please find the configuration SERVER-1 (Proxy) ======================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.187:5060") modparam("dmq", "notification_address", "sip:10.128.77.188:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) #modparam("dmq", "worker_usleep", 0) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[KMDQ_SAVE_LOCATION] { if(is_method("KDMQ")) { dmq_handle_message(); } if (dmq_is_from_node()) { if(!save("location")) xlogl("L_ERR", "Error saving contact\n"); } } SERVER-2 (Registration) ====================== #--- dmq db param ---- modparam("dmq","server_address","sip:10.128.77.188:5060") modparam("dmq", "notification_address", "sip:10.128.77.187:5060") modparam("dmq", "num_workers", 6) modparam("dmq", "multi_notify", 1) modparam("dmq", "ping_interval", 60) #--- dmq usrloc db param ---- modparam("dmq_usrloc", "enable", 1) modparam("dmq_usrloc", "replicate_socket_info", 1) modparam("dmq_usrloc", "sync", 1) modparam("dmq_usrloc", "batch_size", 2000) modparam("dmq_usrloc", "batch_usleep", 1000) route[SAVE_LOCATION]{ save("location"); } version: kamailio 5.5.2 (x86_64/linux) e2b6cc 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: e2b6cc -- Hardik Patel

2 4

[kamailio/kamailio] Get log formatting a way to add metadata into it's JSON (Issue #2927)
by Fernando H. E. Bellincanta 11 Nov '21

11 Nov '21

We currently can output our logs in a JSON format which gives us the ability to pump that into ELK just fine. The thing is those logs would be a lot more useful if we were able to inject more context metadata into it, i.e.: - Request original IP - Request original User Agent - Other request/response miscellaneous headers This would be appliable to get a dashboard built for Pike rate limiting and it's blocked IPs, or mapping out geolocations based on general requests IPs. -- 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/2927

2 2

git:master:378a2dc9: ctl: use unsigned literals for left bit shifting
by Daniel-Constantin Mierla 10 Nov '21

10 Nov '21

Module: kamailio Branch: master Commit: 378a2dc98beddaa08e192c0854f43929ed7076a7 URL: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-10T20:09:24+01:00 ctl: use unsigned literals for left bit shifting --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… Patch: https://github.com/kamailio/kamailio/commit/378a2dc98beddaa08e192c0854f4392… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index 3642a0015b..bd7e2cb9c5 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -188,7 +188,7 @@ struct binrpc_val{ inline static int binrpc_get_int_len(int i) { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); return size; } @@ -216,7 +216,7 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, { int size; - for (size=4; size && ((i & (0xff<<24))==0); i<<=8, size--); + for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ *p=(unsigned char)(i>>24);

1 0

[kamailio/kamailio] working with a file. (Issue #2924)
by ihsinme 09 Nov '21

09 Nov '21

Good afternoon. Do I understand correctly that the file is opened without restricting access rights (0666). https://github.com/kamailio/kamailio/blob/4e827b30dfc393caf17e2fce28b5eea46… it might be worth limiting them to at least 0644. thanks for taking the time to answer -- 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/2924

3 3

git:5.5:2532b5f5: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: 5.5 Commit: 2532b5f5fc71d3828e1185c55ad6a6546df312d3 URL: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:11:15+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit (cherry picked from commit ffe311939ebf58e7418940ec6c71bfaf9b21afad) --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… Patch: https://github.com/kamailio/kamailio/commit/2532b5f5fc71d3828e1185c55ad6a65… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:ffe31193: pv: fix condition in detecting the null string value when setting $var(...)
by Daniel-Constantin Mierla 09 Nov '21

09 Nov '21

Module: kamailio Branch: master Commit: ffe311939ebf58e7418940ec6c71bfaf9b21afad URL: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-09T19:04:16+01:00 pv: fix condition in detecting the null string value when setting $var(...) - issue introduced in previous commit --- Modified: src/modules/pv/pv_svar.c --- Diff: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… Patch: https://github.com/kamailio/kamailio/commit/ffe311939ebf58e7418940ec6c71bfa… --- diff --git a/src/modules/pv/pv_svar.c b/src/modules/pv/pv_svar.c index 456e21963a..5f4626b8d6 100644 --- a/src/modules/pv/pv_svar.c +++ b/src/modules/pv/pv_svar.c @@ -90,7 +90,7 @@ script_var_t* set_var_value(script_var_t* var, int_str *value, int flags) { if(var==0) return 0; - if((value==NULL) || ((flags&VAR_VAL_STR) && (var->v.value.s.s==NULL))) + if((value==NULL) || ((flags&VAR_VAL_STR) && (value->s.s==NULL))) { if(var->v.flags&VAR_VAL_STR) {

1 0

git:master:4e827b30: modules: readme files regenerated - posops ... [skip ci]
by Kamailio Dev 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 4e827b30dfc393caf17e2fce28b5eea460aa51f7 URL: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-08T13:01:18+01:00 modules: readme files regenerated - posops ... [skip ci] --- Modified: src/modules/posops/README --- Diff: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea… Patch: https://github.com/kamailio/kamailio/commit/4e827b30dfc393caf17e2fce28b5eea…

1 0

git:master:b9e8e09f: posops: docs for pos_set_char()
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: b9e8e09fd56b9cd2f1bd926edb6faf421b2893a1 URL: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T12:46:53+01:00 posops: docs for pos_set_char() --- Modified: src/modules/posops/doc/posops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… Patch: https://github.com/kamailio/kamailio/commit/b9e8e09fd56b9cd2f1bd926edb6faf4… --- diff --git a/src/modules/posops/doc/posops_admin.xml b/src/modules/posops/doc/posops_admin.xml index fcfd23ac12..1a38b85c67 100644 --- a/src/modules/posops/doc/posops_admin.xml +++ b/src/modules/posops/doc/posops_admin.xml @@ -156,6 +156,32 @@ pos_insert("100", "kamailio-$si"); <programlisting format="linespecific"> ... pos_insert("100", "10"); +... + </programlisting> + </example> + </section> + <section id="posops.f.pos_set_char"> + <title> + <function moreinfo="none">pos_set_char(idx, val)</function> + </title> + <para> + Set the char at position index to first character in val. + </para> + <para> + The idx can be an integer value or a variable holding an integer. If + the value is negative, the position is counted from the end of the buffer. + </para> + <para> + The val can be a static string or variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pos_set_char()</function> usage</title> + <programlisting format="linespecific"> +... +pos_set_char("100", "x"); ... </programlisting> </example>

1 0

git:master:531c78c4: posops: added posops_set_char() function
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 531c78c455ef679050c0ae8103a9b1913c2c225a URL: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-08T09:17:21+01:00 posops: added posops_set_char() function --- Modified: src/modules/posops/posops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… Patch: https://github.com/kamailio/kamailio/commit/531c78c455ef679050c0ae8103a9b19… --- diff --git a/src/modules/posops/posops_mod.c b/src/modules/posops/posops_mod.c index 465d6490ed..d71368cfc0 100644 --- a/src/modules/posops/posops_mod.c +++ b/src/modules/posops/posops_mod.c @@ -41,6 +41,7 @@ static void mod_destroy(void); static int w_posops_pos_append(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_insert(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len); +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val); static int w_posops_pos_headers_start(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_headers_end(sip_msg_t* msg, char* p1, char* p2); static int w_posops_pos_body_start(sip_msg_t* msg, char* p1, char* p2); @@ -83,6 +84,8 @@ static cmd_export_t cmds[]={ fixup_free_igp_spve, ANY_ROUTE}, {"pos_rm", (cmd_function)w_posops_pos_rm, 2, fixup_igp_igp, fixup_free_igp_igp, ANY_ROUTE}, + {"pos_set_char", (cmd_function)w_posops_pos_set_char, 2, fixup_igp_spve, + fixup_free_igp_spve, ANY_ROUTE}, {"pos_headers_start", (cmd_function)w_posops_pos_headers_start, 0, 0, 0, ANY_ROUTE}, {"pos_headers_end", (cmd_function)w_posops_pos_headers_end, 0, 0, @@ -342,6 +345,56 @@ static int w_posops_pos_rm(sip_msg_t* msg, char* p1idx, char* p2len) return ki_posops_pos_rm(msg, idx, len); } +/** + * + */ +static int ki_posops_pos_set_char(sip_msg_t *msg, int idx, str *val) +{ + int offset; + + posops_data_init(); + if(val==NULL || val->s==NULL || val->len<=0) { + LM_ERR("invalid val parameter\n"); + return -1; + } + + if(idx<0) { + offset = msg->len + idx; + } else { + offset = idx; + } + if(offset>msg->len) { + LM_ERR("offset invalid: %d (msg-len: %d)\n", offset, msg->len); + return -1; + } + + msg->buf[offset] = val->s[0]; + + return 1; +} + +/** + * + */ +static int w_posops_pos_set_char(sip_msg_t* msg, char* p1idx, char* p2val) +{ + int idx = 0; + str val = STR_NULL; + + posops_data_init(); + if(fixup_get_ivalue(msg, (gparam_t*)p1idx, &idx)!=0) { + LM_ERR("unable to get idx parameter\n"); + return -1; + } + + if(fixup_get_svalue(msg, (gparam_t*)p2val, &val)!=0) { + LM_ERR("unable to get val parameter\n"); + return -1; + } + + return ki_posops_pos_set_char(msg, idx, &val); +} + /** * */ @@ -878,6 +931,11 @@ static sr_kemi_t sr_kemi_posops_exports[] = { { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("posops"), str_init("pos_set_char"), + SR_KEMIP_INT, ki_posops_pos_set_char, + { SR_KEMIP_INT, SR_KEMIP_STR, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init("posops"), str_init("pos_headers_start"), SR_KEMIP_INT, ki_posops_pos_headers_start, { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE,

1 0

git:master:6f401a7a: kamctl: srv modules subcommand
by Daniel-Constantin Mierla 08 Nov '21

08 Nov '21

Module: kamailio Branch: master Commit: 6f401a7aab1bc846aaebe50e0f451d7c16e2c55e URL: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-06T22:11:37+01:00 kamctl: srv modules subcommand - list the loaded modules --- Modified: utils/kamctl/kamctl Modified: utils/kamctl/kamctl.base --- Diff: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… Patch: https://github.com/kamailio/kamailio/commit/6f401a7aab1bc846aaebe50e0f451d7… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index a5a1d34714..a83720fcde 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -1799,6 +1799,11 @@ ksr_srv() { ctl_cmd_run corex.debug $2 fi ;; + modules) + require_ctlengine + mecho "list loaded modules" + ctl_cmd_run core.modules + ;; version) require_ctlengine mecho "list server version" diff --git a/utils/kamctl/kamctl.base b/utils/kamctl/kamctl.base index 47747be85a..f3b9e1f667 100644 --- a/utils/kamctl/kamctl.base +++ b/utils/kamctl/kamctl.base @@ -556,6 +556,7 @@ cat <<EOF srv aliases ................... show the list of server aliases srv rpclist ................... show the list of server rpc commands srv debug [<level>] ........... control the server debug level + srv modules ................... show the list of loaded modules srv version ................... show the server version EOF }

1 0

[kamailio/kamailio] asan: load of misaligned address (Issue #2914)
by sergey-safarov 07 Nov '21

07 Nov '21

### Description I fave compiled Kamailio with ASAN and enabled alignment checks (`-fno-sanitize=alignment` do not used). And get error ``` core/cfg/cfg_script.c:120:10: runtime error: load of misaligned address 0xffff96900cdc for type 'struct cfg_script_var_t *', which requires 8 byte alignment 0xffff96900cdc: note: pointer points here 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 04 00 00 00 00 00 00 00 00 00 00 00 ``` I do not aware this is important or not. Leave it for your review. ### Additional Information Compiled 375f86b69e11cf835ae919873d3cd56f32d589c8 Arch aarch64 -- 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/2914

2 3

Packaging NATS module
by Olle E. Johansson 06 Nov '21

06 Nov '21

Hi! The NATS module which is getting a publisher update soon, depends on libuv and the nats.c library. Question for our heroes - the packagers! Will it be possible to package this module in your distro? I see that debian has libuv1, but fail to find nats.c libs. Cheers, /O

2 1

git:master:dd1b3ccb: pkg/kamailio/obs: packaged nats module
by Sergey Safarov 06 Nov '21

06 Nov '21

Module: kamailio Branch: master Commit: dd1b3ccbc9e4674b28e420d97fe96bbe028fa009 URL: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2021-11-06T18:43:39+03:00 pkg/kamailio/obs: packaged nats module --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… Patch: https://github.com/kamailio/kamailio/commit/dd1b3ccbc9e4674b28e420d97fe96bb… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5e15376879..5b87a501bc 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -18,6 +18,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -51,6 +52,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_with python3 @@ -85,6 +87,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_with nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -129,6 +132,7 @@ %bcond_without kazoo %bcond_without memcached %bcond_without mongodb +%bcond_without nats %bcond_without perl %bcond_without phonenum %bcond_without python3 @@ -156,6 +160,7 @@ %bcond_with kazoo %bcond_without memcached %bcond_with mongodb +%bcond_with nats %bcond_without perl %bcond_with phonenum %bcond_without python3 @@ -216,8 +221,9 @@ Conflicts: kamailio-dialplan < %ver, kamailio-dnssec < %ver Conflicts: kamailio-geoip < %ver, kamailio-gzcompress < %ver Conflicts: kamailio-http_client < %ver Conflicts: kamailio-ims < %ver, kamailio-java < %ver, kamailio-json < %ver -Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver Conflicts: kamailio-kazoo < %ver +Conflicts: kamailio-lcr < %ver, kamailio-ldap < %ver, kamailio-lost < %ver, kamailio-lua < %ver +Conflicts: kamailio-nats < %ver Conflicts: kamailio-rabbitmq < %ver Conflicts: kamailio-memcached < %ver, kamailio-mongodb < %ver, kamailio-mysql < %ver Conflicts: kamailio-outbound < %ver, kamailio-perl < %ver @@ -687,6 +693,18 @@ BuildRequires: mysql-devel MySQL database connectivity for Kamailio. +%if %{with nats} +%package nats +Summary: NATS consumer for Kamailio +Group: %{PKGGROUP} +Requires: libnats, kamailio = %ver +BuildRequires: libnats-devel + +%description nats +The module provides an NATS consumer for Kamailio. NATS is a real time distributed messaging platform, more details about it can be found at nats.io. +%endif + + %package outbound Summary: Outbound (RFC 5626) support for Kamailio Group: %{PKGGROUP} @@ -1210,6 +1228,9 @@ make every-module skip_modules="app_mono db_cassandra db_oracle iptrtpproxy \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1308,6 +1329,9 @@ make install-modules-all skip_modules="app_mono db_cassandra db_oracle \ kmongodb \ %endif kmysql koutbound \ +%if %{with nats} + knats \ +%endif %if %{with perl} kperl \ %endif @@ -1997,6 +2021,14 @@ fi %{_datadir}/kamailio/mysql/* +%if %{with nats} +%files nats +%defattr(-,root,root) +%doc %{_docdir}/kamailio/modules/README.nats +%{_libdir}/kamailio/modules/nats.so +%endif + + %files outbound %defattr(-,root,root) %doc %{_docdir}/kamailio/modules/README.outbound

1 0

[kamailio/kamailio] cannot pase IPv6 Via (Issue #2898)
by sergey-safarov 05 Nov '21

05 Nov '21

### Description Kamailio cannot parse Via header with full IPv6 address. And generate errors like ``` ERROR: <core> [core/parser/msg_parser.c:340]: parse_headers(): bad header field [Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK02cc.edc691e200000000000000] ``` #### SIP Traffic OPTIONS messages cannot be parsed ``` OPTIONS sip:example.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2a00:1370:8131:ffdf:4398:8903:f613:58b6];branch=z9hG4bK0241.2e5db116000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=ecfe220eb77cee2ab0369a33b85d6b69-54b37dee CSeq: 10 OPTIONS Call-ID: 0d2146aa2a479f0d-2232(a)192.168.1.6 Max-Forwards: 70 Content-Length: 0 ``` OPTIONS messages parsed successfully. ``` OPTIONS sip:example.com.com:5080;transport=tcp SIP/2.0 Via: SIP/2.0/TCP [2600:1f1c:6d5:aa00::6];branch=z9hG4bK67a6.b0578ab2000000000000000000000000.0 To: <sip:example.com:5080;transport=tcp> From: <sip:proxy@example.com>;tag=c9c2897ae0601f24edc14b3f5f65b7e4-02fff025 CSeq: 10 OPTIONS Call-ID: 3555c29958953393-581752(a)3.101.84.6 Max-Forwards: 70 Content-Length: 0 ``` ### Additional Information compiled commit 1483ddb735c3fa3ea77b6e2d54ec67584e56e15b * **Operating System**: lsb_release -a ``` [safarov@safarov-dell config]$ lsb_release -a LSB Version: :core-4.1-amd64:core-4.1-noarch Distributor ID: Fedora Description: Fedora release 33 (Thirty Three) Release: 33 Codename: ThirtyThree ``` uname -a ``` [root@safarov-dell kamailio]# uname -a Linux safarov-dell.home 5.14.9-100.fc33.x86_64 #1 SMP Thu Sep 30 12:45:49 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/2898

2 4

git:master:63a34963: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 63a34963c8376a2c17b7919847f7723fde6434f5 URL: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2021-11-05T11:46:16+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… Patch: https://github.com/kamailio/kamailio/commit/63a34963c8376a2c17b7919847f7723… --- diff --git a/src/modules/acc/README b/src/modules/acc/README index 540bd20d4d..7c31188ac7 100644 --- a/src/modules/acc/README +++ b/src/modules/acc/README @@ -1331,10 +1331,11 @@ modparam("acc", "cdr_on_failed", 0) 6.49. acc_extra_size (int) - This parameter is meant to replace MAX_ACC_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. Example 1.49. acc_extra_size ... @@ -1343,10 +1344,11 @@ modparam("acc", "acc_extra_size", 100) 6.50. cdr_extra_size (int) - This parameter is meant to replace MAX_CDR_EXTRA fixed size with - desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. Example 1.50. cdr_extra_size ...

1 0

git:master:9d65e090: acc: updated docs for acc_extra_size and cdr_extra_size
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: 9d65e09056c89d5a1391a2c29458005929516ce0 URL: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:37:41+01:00 acc: updated docs for acc_extra_size and cdr_extra_size --- Modified: src/modules/acc/doc/acc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… Patch: https://github.com/kamailio/kamailio/commit/9d65e09056c89d5a1391a2c29458005… --- diff --git a/src/modules/acc/doc/acc_admin.xml b/src/modules/acc/doc/acc_admin.xml index 0fd643c7a7..036163da14 100644 --- a/src/modules/acc/doc/acc_admin.xml +++ b/src/modules/acc/doc/acc_admin.xml @@ -1447,10 +1447,12 @@ modparam("acc", "cdr_on_failed", 0) <section id="acc.p.acc_extra_size"> <title><varname>acc_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_ACC_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + accounting record (event accounting record). It is related to log_extra + and db_extra module parameters. </para> <para> - Default value is 64 (MAX_ACC_EXTRA). + Default value is 64. </para> <example> <title>acc_extra_size</title> @@ -1465,10 +1467,12 @@ modparam("acc", "acc_extra_size", 100) <section id="acc.p.cdr_extra_size"> <title><varname>cdr_extra_size</varname> (int)</title> <para> - This parameter is meant to replace MAX_CDR_EXTRA fixed size with desired size. + Set the maximum number of extra attributes that can be stored in the + call data record (cdr by dialog module). It is related to cdr_extra + module parameter. </para> <para> - Default value is 64 (MAX_CDR_EXTRA). + Default value is 64. </para> <example> <title>cdr_extra_size</title>

1 0

[kamailio/kamailio] build: detect GCC 11 (PR #2917)
by aalba6675 05 Nov '21

05 Nov '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 Increase largest version of GCC detected to 11 from 10. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2917 -- Commit Summary -- * <a href="https://github.com/kamailio/kamailio/pull/2917/commits/4d11948402ae315c94ff…">build: detect GCC 11</a> -- File Changes -- M src/Makefile.defs (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2917.patch https://github.com/kamailio/kamailio/pull/2917.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/2917

2 2

git:master:bf8a989f: build: detect GCC 11
by Daniel-Constantin Mierla 05 Nov '21

05 Nov '21

Module: kamailio Branch: master Commit: bf8a989f54b1006cae6c764f4064998daa6fe0c0 URL: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-05T11:23:40+01:00 build: detect GCC 11 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… Patch: https://github.com/kamailio/kamailio/commit/bf8a989f54b1006cae6c764f4064998… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5d76fbe2cc..cde1faa6df 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -308,7 +308,9 @@ ifneq (,$(findstring gcc, $(CC_LONGVER))) -e 's/9\.[0-9]\..*/9.0+/' \ -e 's/9\.[0-9]$$/9.0+/' \ -e 's/10\.[0-9]\..*/9.0+/' \ - -e 's/10\.[0-9]$$/9.0+/') + -e 's/10\.[0-9]$$/9.0+/' \ + -e 's/11\.[0-9]\..*/9.0+/' \ + -e 's/11\.[0-9]$$/9.0+/') ifeq (,$(strip $(filter-out 3.0 3.4 4.x 4.2+ 4.5+ 5.0+ 6.0+ 7.0+ 8.0+ 9.0+,$(CC_SHORTVER)))) # dependencies can be generated on-the-fly while compiling *.c CC_MKDEP_OPTS=-MMD -MP

1 0

git:5.4:d84a89db: app_python3: for Python >= 3.7 call pre-fork hook
by Anthony Alba 05 Nov '21

05 Nov '21

Module: kamailio Branch: 5.4 Commit: d84a89dba261d7a75ec35125174fe6723cf13295 URL: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Author: Anthony Alba <ascanio.alba7(a)gmail.com> Committer: Anthony Alba <ascanio.alba7(a)gmail.com> Date: 2021-11-05T18:17:36+08:00 app_python3: for Python >= 3.7 call pre-fork hook (cherry picked from commit 138ef5630402448ea2643097a3d25d4dcead6d70) --- Modified: src/modules/app_python3/app_python3_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… Patch: https://github.com/kamailio/kamailio/commit/d84a89dba261d7a75ec35125174fe67… --- diff --git a/src/modules/app_python3/app_python3_mod.c b/src/modules/app_python3/app_python3_mod.c index 0ce93b71cd..8ec252039c 100644 --- a/src/modules/app_python3/app_python3_mod.c +++ b/src/modules/app_python3/app_python3_mod.c @@ -175,6 +175,17 @@ static int mod_init(void) static int child_init(int rank) { if(rank==PROC_INIT) { + /* + * this is called before any process is forked + * so the Python internal state handler + * should be called now. + * + * TODO: is PyOS_AfterFork_Parent() necesary + * in the main process? + */ +#if PY_VERSION_HEX >= 0x03070000 + PyOS_BeforeFork() ; +#endif return 0; } _apy_process_rank = rank;

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev