sr-dev November 2021

sr-dev@lists.kamailio.org

20 participants
310 discussions

git:master:b3e8d030: ctl: use unsigned int for bit left shifting

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: b3e8d03038402dec78b4845255f34862407983c9 URL: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T20:23:08+01:00 ctl: use unsigned int for bit left shifting - deal with runtime error: left shift of X by N places cannot be represented in type 'int' --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… Patch: https://github.com/kamailio/kamailio/commit/b3e8d03038402dec78b4845255f3486… --- diff --git a/src/modules/ctl/binrpc.h b/src/modules/ctl/binrpc.h index bd7e2cb9c5..cb7204fffd 100644 --- a/src/modules/ctl/binrpc.h +++ b/src/modules/ctl/binrpc.h @@ -215,12 +215,15 @@ inline static unsigned char* binrpc_write_int( unsigned char* p, int i, int *len) { int size; + unsigned int u; - for (size=4; size && ((i & (0xffu<<24))==0); i<<=8, size--); + u = (unsigned int)i; + + for (size=4; size && ((u & (0xffu<<24))==0); u<<=8, size--); *len=size; for(; (p<end) && (size); p++, size--){ - *p=(unsigned char)(i>>24); - i<<=8; + *p=(unsigned char)(u>>24); + u<<=8; } return p; } @@ -515,24 +518,28 @@ static inline int binrpc_addfault( struct binrpc_pkt* pkt, static inline unsigned char* binrpc_read_int( int* i, int len, - unsigned char* s, + unsigned char* s, unsigned char* end, int *err ) { unsigned char* start; - + unsigned int u; + start=s; *i=0; + u = 0; *err=0; for(;len>0; len--, s++){ if (s>=end){ *err=E_BINRPC_MORE_DATA; + *i = (int)u; return start; } - *i<<=8; - *i|=*s; + u<<=8; + u|=*s; }; + *i = (int)u; return s; }

3 years

git:master:908ca872: acc: set again the type of db vals

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 908ca872bec956d5f755a1b51df781bf66ad3866 URL: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-14T10:31:38+01:00 acc: set again the type of db vals - work properly when nullable modparam is set and var can be null on some transactions --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… Patch: https://github.com/kamailio/kamailio/commit/908ca872bec956d5f755a1b51df781b… --- diff --git a/src/modules/acc/acc.c b/src/modules/acc/acc.c index b75e155743..dce7ee0a8b 100644 --- a/src/modules/acc/acc.c +++ b/src/modules/acc/acc.c @@ -466,7 +466,9 @@ int acc_db_request( struct sip_msg *rq) LM_DBG("attr[%d] is NULL\n", i); VAL_NULL(db_vals + i) = 1; } else { - LM_DBG("attr[%d] is STR\n", i); + LM_DBG("attr[%d] is STR len=%d\n", i, val_arr[i].len); + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i) = val_arr[i]; } } @@ -502,6 +504,8 @@ int acc_db_request( struct sip_msg *rq) if (acc_extra_nullable == 1 && type_arr[i] == TYPE_NULL) { VAL_NULL(db_vals + i) = 1; } else { + VAL_NULL(db_vals+i) = 0; + VAL_TYPE(db_vals+i)=DB1_STR; VAL_STR(db_vals+i)=val_arr[i]; } }

3 years

git:master:c4c9e6f5: core: json logging - apply j flag for prefix field

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c4c9e6f50306addd12ccf9fa03743c664e5442f1 URL: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T14:17:18+01:00 core: json logging - apply j flag for prefix field --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6… Patch: https://github.com/kamailio/kamailio/commit/c4c9e6f50306addd12ccf9fa03743c6…

3 years

get Received interface name

by Patrick Karton

Hello, i declare my interfaces like that in configuration listen=udp:SIP_EXTERNAL_IP:5060 name "external" listen=udp:SIP_INTERNAL_IP:5060 name "internal" how do i get the inferface name where the request was received ? i saw some pseudo variables that deals with received interface but it is always about ip or port or proto but not the interface name ( external or internal like mentioned in the configuration file ). Thanks

3 years

match e2e proxied ACK Request when INVITE Transaction is still in memory

by Patrick Karton

Hello , i want to know how can i match e2e ACK when the INVITE TRansaction is still in memory. t_check_trans() normally return 1 if we receive e2e ACK but i always get 0 even when the INVITE transaction is still in memory ( wt_timer param of tm module ). Thanks.

3 years

git:master:9775841f: core: new option for json logging to print message in json format

by Daniel-Constantin Mierla

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…

3 years

git:master:4608914c: core: io wait - remove log level string from debug message

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 4608914cf9d3878c79560730ddad8e0800c38397 URL: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2021-11-12T10:15:07+01:00 core: io wait - remove log level string from debug message --- Modified: src/core/io_wait.h --- Diff: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… Patch: https://github.com/kamailio/kamailio/commit/4608914cf9d3878c79560730ddad8e0… --- diff --git a/src/core/io_wait.h b/src/core/io_wait.h index d9791c3c85..5e823fb76f 100644 --- a/src/core/io_wait.h +++ b/src/core/io_wait.h @@ -371,7 +371,7 @@ inline static int io_watch_add( io_wait_h* h, LM_CRIT("maximum fd number exceeded: %d/%d\n", h->fd_no, h->max_fd_no); goto error; } - DBG("DBG: io_watch_add(%p, %d, %d, %p), fd_no=%d\n", + DBG("processing io_watch_add(%p, %d, %d, %p) - fd_no=%d\n", h, fd, type, data, h->fd_no); /* hash sanity check */ e=get_fd_map(h, fd);

3 years

git:master:9b7bfb32: acc: simplify index shifting for adding time variants in db accounting

by Daniel-Constantin Mierla

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

3 years

git:master:4bd77f1d: acc: debug messages to print the type of extra acc attrs

by Daniel-Constantin Mierla

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;

3 years

git:5.5:8c71683d: Revert "pv: handle case when var value ha flag str but null pointer"

by Daniel-Constantin Mierla

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

3 years

← Newer
1
...
20
21
22
23
24
25
26
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2021